diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git')
1006 files changed, 57858 insertions, 146045 deletions
diff --git a/third_party/git/.cirrus.yml b/third_party/git/.cirrus.yml deleted file mode 100644 index c2f5fe385a..0000000000 --- a/third_party/git/.cirrus.yml +++ /dev/null @@ -1,15 +0,0 @@ -env: - CIRRUS_CLONE_DEPTH: 1 - -freebsd_12_task: - freebsd_instance: - image: freebsd-12-1-release-amd64 - install_script: - pkg install -y gettext gmake perl5 - create_user_script: - - pw useradd git - - chown -R git:git . - build_script: - - su git -c gmake - test_script: - - su git -c 'gmake test' diff --git a/third_party/git/.editorconfig b/third_party/git/.editorconfig index f9d819623d..42cdc4bbfb 100644 --- a/third_party/git/.editorconfig +++ b/third_party/git/.editorconfig @@ -4,7 +4,7 @@ insert_final_newline = true # The settings for C (*.c and *.h) files are mirrored in .clang-format. Keep # them in sync. -[*.{c,h,sh,perl,pl,pm,txt}] +[*.{c,h,sh,perl,pl,pm}] indent_style = tab tab_width = 8 diff --git a/third_party/git/.gitignore b/third_party/git/.gitignore index aebe7c0908..521d8f4fb4 100644 --- a/third_party/git/.gitignore +++ b/third_party/git/.gitignore @@ -158,7 +158,6 @@ /git-show-branch /git-show-index /git-show-ref -/git-sparse-checkout /git-stage /git-stash /git-status @@ -217,7 +216,6 @@ /tags /TAGS /cscope* -*.hcc *.obj *.lib *.res @@ -233,6 +231,7 @@ *.ipdb *.dll .vs/ +*.manifest Debug/ Release/ /UpgradeLog*.htm diff --git a/third_party/git/.mailmap b/third_party/git/.mailmap index bde7aba756..9a5ff04753 100644 --- a/third_party/git/.mailmap +++ b/third_party/git/.mailmap @@ -18,7 +18,6 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru> Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com> Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com> Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu> -Andrey Mazo <ahippo@yandex.com> Mazo, Andrey <amazo@checkvideo.com> Aneesh Kumar K.V <aneesh.kumar@gmail.com> Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu> Amos Waterland <apw@debian.org> <apw@us.ibm.com> @@ -31,7 +30,6 @@ Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil> Brandon Williams <bwilliams.eng@gmail.com> <bmwill@google.com> brian m. carlson <sandals@crustytoothpaste.net> brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx> -brian m. carlson <sandals@crustytoothpaste.net> <bk2204@github.com> Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com> Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com> Cheng Renquan <crquan@gmail.com> @@ -60,9 +58,7 @@ David S. Miller <davem@davemloft.net> David Turner <novalis@novalis.org> <dturner@twopensource.com> David Turner <novalis@novalis.org> <dturner@twosigma.com> Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com> -Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com> Deskin Miller <deskinm@umich.edu> -Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh Dirk Süsserott <newsletter@dirk.my1.cc> Eric Blake <eblake@redhat.com> <ebb9@byu.net> Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net> @@ -111,7 +107,6 @@ Jim Meyering <jim@meyering.net> <meyering@redhat.com> Joachim Berdal Haga <cjhaga@fys.uio.no> Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com> Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de> -Johannes Schindelin <Johannes.Schindelin@gmx.de> Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com> Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net> Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at> @@ -290,7 +285,6 @@ William Pursell <bill.pursell@gmail.com> YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx> YONETANI Tomokazu <y0n3t4n1@gmail.com> <y0netan1@dragonflybsd.org> YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> -Yi-Jyun Pan <pan93412@gmail.com> # the two anonymous contributors are different persons: anonymous <linux@horizon.com> anonymous <linux@horizon.net> diff --git a/third_party/git/.tsan-suppressions b/third_party/git/.tsan-suppressions index 5ba86d6845..8c85014a0a 100644 --- a/third_party/git/.tsan-suppressions +++ b/third_party/git/.tsan-suppressions @@ -8,9 +8,3 @@ # in practice it (hopefully!) doesn't matter. race:^want_color$ race:^transfer_debug$ - -# A boolean value, which tells whether the replace_map has been initialized or -# not, is read racily with an update. As this variable is written to only once, -# and it's OK if the value change right after reading it, this shouldn't be a -# problem. -race:^lookup_replace_object$ diff --git a/third_party/git/CODE_OF_CONDUCT.md b/third_party/git/CODE_OF_CONDUCT.md deleted file mode 100644 index fc4645d5c0..0000000000 --- a/third_party/git/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,93 +0,0 @@ -# Git Code of Conduct - -This code of conduct outlines our expectations for participants within -the Git community, as well as steps for reporting unacceptable behavior. -We are committed to providing a welcoming and inspiring community for -all and expect our code of conduct to be honored. Anyone who violates -this code of conduct may be banned from the community. - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to make participation in our project and -our community a harassment-free experience for everyone, regardless of age, -body size, disability, ethnicity, sex characteristics, gender identity and -expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies within all project spaces, and it also applies -when an individual is representing the project or its community in public -spaces. Examples of representing a project or community include using an -official project e-mail address, posting via an official social media account, -or acting as an appointed representative at an online or offline event. -Representation of a project may be further defined and clarified by project -maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at git@sfconservancy.org. All -complaints will be reviewed and investigated and will result in a response -that is deemed necessary and appropriate to the circumstances. The project -team is obligated to maintain confidentiality with regard to the reporter of -an incident. Further details of specific enforcement policies may be posted -separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - -The project leadership team can be contacted by email as a whole at -git@sfconservancy.org, or individually: - - - Ævar Arnfjörð Bjarmason <avarab@gmail.com> - - Christian Couder <christian.couder@gmail.com> - - Jeff King <peff@peff.net> - - Junio C Hamano <gitster@pobox.com> - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see -https://www.contributor-covenant.org/faq diff --git a/third_party/git/Documentation/CodingGuidelines b/third_party/git/Documentation/CodingGuidelines index ed4e443a3c..f45db5b727 100644 --- a/third_party/git/Documentation/CodingGuidelines +++ b/third_party/git/Documentation/CodingGuidelines @@ -75,7 +75,7 @@ For shell scripts specifically (not exhaustive): - If you want to find out if a command is available on the user's $PATH, you should use 'type <command>', instead of 'which <command>'. - The output of 'which' is not machine parsable and its exit code + The output of 'which' is not machine parseable and its exit code is not reliable across platforms. - We use POSIX compliant parameter substitutions and avoid bashisms; @@ -203,7 +203,7 @@ For C programs: . since early 2012 with e1327023ea, we have been using an enum definition whose last element is followed by a comma. This, like an array initializer that ends with a trailing comma, can be used - to reduce the patch noise when adding a new identifier at the end. + to reduce the patch noise when adding a new identifer at the end. . since mid 2017 with cbc0f81d, we have been using designated initializers for struct (e.g. "struct t v = { .val = 'a' };"). diff --git a/third_party/git/Documentation/Makefile b/third_party/git/Documentation/Makefile index 8fe829cc1b..76f2ecfc1b 100644 --- a/third_party/git/Documentation/Makefile +++ b/third_party/git/Documentation/Makefile @@ -77,7 +77,6 @@ API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technica SP_ARTICLES += $(API_DOCS) TECH_DOCS += MyFirstContribution -TECH_DOCS += MyFirstObjectWalk TECH_DOCS += SubmittingPatches TECH_DOCS += technical/hash-function-transition TECH_DOCS += technical/http-protocol @@ -124,8 +123,7 @@ ASCIIDOC_HTML = xhtml11 ASCIIDOC_DOCBOOK = docbook ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ - -amanversion=$(GIT_VERSION) \ - -amanmanual='Git Manual' -amansource='Git' + -agit_version=$(GIT_VERSION) TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -199,13 +197,11 @@ ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor ASCIIDOC_CONF = ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook5 +ASCIIDOC_DOCBOOK = docbook45 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' DBLATEX_COMMON = -XMLTO_EXTRA += --skip-validation -XMLTO_EXTRA += -x manpage.xsl endif SHELL_PATH ?= $(SHELL) diff --git a/third_party/git/Documentation/MyFirstContribution.txt b/third_party/git/Documentation/MyFirstContribution.txt index 427274df4d..f8670379c0 100644 --- a/third_party/git/Documentation/MyFirstContribution.txt +++ b/third_party/git/Documentation/MyFirstContribution.txt @@ -23,42 +23,6 @@ useful additional context: - `Documentation/SubmittingPatches` - `Documentation/howto/new-command.txt` -[[getting-help]] -=== Getting Help - -If you get stuck, you can seek help in the following places. - -==== git@vger.kernel.org - -This is the main Git project mailing list where code reviews, version -announcements, design discussions, and more take place. Those interested in -contributing are welcome to post questions here. The Git list requires -plain-text-only emails and prefers inline and bottom-posting when replying to -mail; you will be CC'd in all replies to you. Optionally, you can subscribe to -the list by sending an email to majordomo@vger.kernel.org with "subscribe git" -in the body. The https://lore.kernel.org/git[archive] of this mailing list is -available to view in a browser. - -==== https://groups.google.com/forum/#!forum/git-mentoring[git-mentoring@googlegroups.com] - -This mailing list is targeted to new contributors and was created as a place to -post questions and receive answers outside of the public eye of the main list. -Veteran contributors who are especially interested in helping mentor newcomers -are present on the list. In order to avoid search indexers, group membership is -required to view messages; anyone can join and no approval is required. - -==== https://webchat.freenode.net/#git-devel[#git-devel] on Freenode - -This IRC channel is for conversations between Git contributors. If someone is -currently online and knows the answer to your question, you can receive help -in real time. Otherwise, you can read the -https://colabti.org/irclogger/irclogger_logs/git-devel[scrollback] to see -whether someone answered you. IRC does not allow offline private messaging, so -if you try to private message someone and then log out of IRC, they cannot -respond to you. It's better to ask your questions in the channel so that you -can be answered if you disconnect and so that others can learn from the -conversation. - [[getting-started]] == Getting Started @@ -74,26 +38,6 @@ $ git clone https://github.com/git/git git $ cd git ---- -[[dependencies]] -=== Installing Dependencies - -To build Git from source, you need to have a handful of dependencies installed -on your system. For a hint of what's needed, you can take a look at -`INSTALL`, paying close attention to the section about Git's dependencies on -external programs and libraries. That document mentions a way to "test-drive" -our freshly built Git without installing; that's the method we'll be using in -this tutorial. - -Make sure that your environment has everything you need by building your brand -new clone of Git from the above step: - ----- -$ make ----- - -NOTE: The Git build is parallelizable. `-j#` is not included above but you can -use it as you prefer, here and elsewhere. - [[identify-problem]] === Identify Problem to Solve @@ -153,8 +97,8 @@ int cmd_psuh(int argc, const char **argv, const char *prefix) ---- We'll also need to add the declaration of psuh; open up `builtin.h`, find the -declaration for `cmd_pull`, and add a new line for `psuh` immediately before it, -in order to keep the declarations alphabetically sorted: +declaration for `cmd_push`, and add a new line for `psuh` immediately before it, +in order to keep the declarations sorted: ---- int cmd_psuh(int argc, const char **argv, const char *prefix); @@ -179,7 +123,7 @@ int cmd_psuh(int argc, const char **argv, const char *prefix) } ---- -Let's try to build it. Open `Makefile`, find where `builtin/pull.o` is added +Let's try to build it. Open `Makefile`, find where `builtin/push.o` is added to `BUILTIN_OBJS`, and add `builtin/psuh.o` in the same way next to it in alphabetical order. Once you've done so, move to the top-level directory and build simply with `make`. Also add the `DEVELOPER=1` variable to turn on @@ -194,6 +138,9 @@ NOTE: When you are developing the Git project, it's preferred that you use the `DEVELOPER` flag; if there's some reason it doesn't work for you, you can turn it off, but it's a good idea to mention the problem to the mailing list. +NOTE: The Git build is parallelizable. `-j#` is not included above but you can +use it as you prefer, here and elsewhere. + Great, now your new command builds happily on its own. But nobody invokes it. Let's change that. @@ -202,7 +149,7 @@ a `cmd_struct` to the `commands[]` array. `struct cmd_struct` takes a string with the command name, a function pointer to the command implementation, and a setup option flag. For now, let's keep mimicking `push`. Find the line where `cmd_push` is registered, copy it, and modify it for `cmd_psuh`, placing the new -line in alphabetical order (immediately before `cmd_pull`). +line in alphabetical order. The options are documented in `builtin.h` under "Adding a new built-in." Since we hope to print some data about the user's current workspace context later, @@ -220,7 +167,7 @@ Check it out! You've got a command! Nice work! Let's commit this. `git status` reveals modified `Makefile`, `builtin.h`, and `git.c` as well as untracked `builtin/psuh.c` and `git-psuh`. First, let's take care of the binary, -which should be ignored. Open `.gitignore` in your editor, find `/git-pull`, and +which should be ignored. Open `.gitignore` in your editor, find `/git-push`, and add an entry for your new command in alphabetical order: ---- @@ -587,28 +534,6 @@ you want to pass as a parameter something which would usually be interpreted as a flag.) `parse_options()` will terminate parsing when it reaches `--` and give you the rest of the options afterwards, untouched. -Now that you have a usage hint, you can teach Git how to show it in the general -command list shown by `git help git` or `git help -a`, which is generated from -`command-list.txt`. Find the line for 'git-pull' so you can add your 'git-psuh' -line above it in alphabetical order. Now, we can add some attributes about the -command which impacts where it shows up in the aforementioned help commands. The -top of `command-list.txt` shares some information about what each attribute -means; in those help pages, the commands are sorted according to these -attributes. `git psuh` is user-facing, or porcelain - so we will mark it as -"mainporcelain". For "mainporcelain" commands, the comments at the top of -`command-list.txt` indicate we can also optionally add an attribute from another -list; since `git psuh` shows some information about the user's workspace but -doesn't modify anything, let's mark it as "info". Make sure to keep your -attributes in the same style as the rest of `command-list.txt` using spaces to -align and delineate them: - ----- -git-prune-packed plumbingmanipulators -git-psuh mainporcelain info -git-pull mainporcelain remote -git-push mainporcelain remote ----- - Build again. Now, when you run with `-h`, you should see your usage printed and your command terminated before anything else interesting happens. Great! @@ -821,14 +746,6 @@ will automatically run your PRs through the CI even without the permission given but you will not be able to `/submit` your changes until someone allows you to use the tool. -NOTE: You can typically find someone who can `/allow` you on GitGitGadget by -either examining recent pull requests where someone has been granted `/allow` -(https://github.com/gitgitgadget/git/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+%22%2Fallow%22[Search: -is:pr is:open "/allow"]), in which case both the author and the person who -granted the `/allow` can now `/allow` you, or by inquiring on the -https://webchat.freenode.net/#git-devel[#git-devel] IRC channel on Freenode -linking your pull request and asking for someone to `/allow` you. - If the CI fails, you can update your changes with `git rebase -i` and push your branch again: @@ -1053,7 +970,7 @@ reviewers the changes you've made that may not be as visible. You will also need to go and find the Message-Id of your previous cover letter. You can either note it when you send the first series, from the output of `git send-email`, or you can look it up on the -https://lore.kernel.org/git[mailing list]. Find your cover letter in the +https://public-inbox.org/git[mailing list]. Find your cover letter in the archives, click on it, then click "permalink" or "raw" to reveal the Message-Id header. It should match: diff --git a/third_party/git/Documentation/MyFirstObjectWalk.txt b/third_party/git/Documentation/MyFirstObjectWalk.txt deleted file mode 100644 index aa828dfdc4..0000000000 --- a/third_party/git/Documentation/MyFirstObjectWalk.txt +++ /dev/null @@ -1,905 +0,0 @@ -= My First Object Walk - -== What's an Object Walk? - -The object walk is a key concept in Git - this is the process that underpins -operations like object transfer and fsck. Beginning from a given commit, the -list of objects is found by walking parent relationships between commits (commit -X based on commit W) and containment relationships between objects (tree Y is -contained within commit X, and blob Z is located within tree Y, giving our -working tree for commit X something like `y/z.txt`). - -A related concept is the revision walk, which is focused on commit objects and -their parent relationships and does not delve into other object types. The -revision walk is used for operations like `git log`. - -=== Related Reading - -- `Documentation/user-manual.txt` under "Hacking Git" contains some coverage of - the revision walker in its various incarnations. -- `revision.h` -- https://eagain.net/articles/git-for-computer-scientists/[Git for Computer Scientists] - gives a good overview of the types of objects in Git and what your object - walk is really describing. - -== Setting Up - -Create a new branch from `master`. - ----- -git checkout -b revwalk origin/master ----- - -We'll put our fiddling into a new command. For fun, let's name it `git walken`. -Open up a new file `builtin/walken.c` and set up the command handler: - ----- -/* - * "git walken" - * - * Part of the "My First Object Walk" tutorial. - */ - -#include "builtin.h" - -int cmd_walken(int argc, const char **argv, const char *prefix) -{ - trace_printf(_("cmd_walken incoming...\n")); - return 0; -} ----- - -NOTE: `trace_printf()` differs from `printf()` in that it can be turned on or -off at runtime. For the purposes of this tutorial, we will write `walken` as -though it is intended for use as a "plumbing" command: that is, a command which -is used primarily in scripts, rather than interactively by humans (a "porcelain" -command). So we will send our debug output to `trace_printf()` instead. When -running, enable trace output by setting the environment variable `GIT_TRACE`. - -Add usage text and `-h` handling, like all subcommands should consistently do -(our test suite will notice and complain if you fail to do so). - ----- -int cmd_walken(int argc, const char **argv, const char *prefix) -{ - const char * const walken_usage[] = { - N_("git walken"), - NULL, - } - struct option options[] = { - OPT_END() - }; - - argc = parse_options(argc, argv, prefix, options, walken_usage, 0); - - ... -} ----- - -Also add the relevant line in `builtin.h` near `cmd_whatchanged()`: - ----- -int cmd_walken(int argc, const char **argv, const char *prefix); ----- - -Include the command in `git.c` in `commands[]` near the entry for `whatchanged`, -maintaining alphabetical ordering: - ----- -{ "walken", cmd_walken, RUN_SETUP }, ----- - -Add it to the `Makefile` near the line for `builtin/worktree.o`: - ----- -BUILTIN_OBJS += builtin/walken.o ----- - -Build and test out your command, without forgetting to ensure the `DEVELOPER` -flag is set, and with `GIT_TRACE` enabled so the debug output can be seen: - ----- -$ echo DEVELOPER=1 >>config.mak -$ make -$ GIT_TRACE=1 ./bin-wrappers/git walken ----- - -NOTE: For a more exhaustive overview of the new command process, take a look at -`Documentation/MyFirstContribution.txt`. - -NOTE: A reference implementation can be found at -https://github.com/nasamuffin/git/tree/revwalk. - -=== `struct rev_cmdline_info` - -The definition of `struct rev_cmdline_info` can be found in `revision.h`. - -This struct is contained within the `rev_info` struct and is used to reflect -parameters provided by the user over the CLI. - -`nr` represents the number of `rev_cmdline_entry` present in the array. - -`alloc` is used by the `ALLOC_GROW` macro. Check `cache.h` - this variable is -used to track the allocated size of the list. - -Per entry, we find: - -`item` is the object provided upon which to base the object walk. Items in Git -can be blobs, trees, commits, or tags. (See `Documentation/gittutorial-2.txt`.) - -`name` is the object ID (OID) of the object - a hex string you may be familiar -with from using Git to organize your source in the past. Check the tutorial -mentioned above towards the top for a discussion of where the OID can come -from. - -`whence` indicates some information about what to do with the parents of the -specified object. We'll explore this flag more later on; take a look at -`Documentation/revisions.txt` to get an idea of what could set the `whence` -value. - -`flags` are used to hint the beginning of the revision walk and are the first -block under the `#include`s in `revision.h`. The most likely ones to be set in -the `rev_cmdline_info` are `UNINTERESTING` and `BOTTOM`, but these same flags -can be used during the walk, as well. - -=== `struct rev_info` - -This one is quite a bit longer, and many fields are only used during the walk -by `revision.c` - not configuration options. Most of the configurable flags in -`struct rev_info` have a mirror in `Documentation/rev-list-options.txt`. It's a -good idea to take some time and read through that document. - -== Basic Commit Walk - -First, let's see if we can replicate the output of `git log --oneline`. We'll -refer back to the implementation frequently to discover norms when performing -an object walk of our own. - -To do so, we'll first find all the commits, in order, which preceded the current -commit. We'll extract the name and subject of the commit from each. - -Ideally, we will also be able to find out which ones are currently at the tip of -various branches. - -=== Setting Up - -Preparing for your object walk has some distinct stages. - -1. Perform default setup for this mode, and others which may be invoked. -2. Check configuration files for relevant settings. -3. Set up the `rev_info` struct. -4. Tweak the initialized `rev_info` to suit the current walk. -5. Prepare the `rev_info` for the walk. -6. Iterate over the objects, processing each one. - -==== Default Setups - -Before examining configuration files which may modify command behavior, set up -default state for switches or options your command may have. If your command -utilizes other Git components, ask them to set up their default states as well. -For instance, `git log` takes advantage of `grep` and `diff` functionality, so -its `init_log_defaults()` sets its own state (`decoration_style`) and asks -`grep` and `diff` to initialize themselves by calling each of their -initialization functions. - -For our first example within `git walken`, we don't intend to use any other -components within Git, and we don't have any configuration to do. However, we -may want to add some later, so for now, we can add an empty placeholder. Create -a new function in `builtin/walken.c`: - ----- -static void init_walken_defaults(void) -{ - /* - * We don't actually need the same components `git log` does; leave this - * empty for now. - */ -} ----- - -Make sure to add a line invoking it inside of `cmd_walken()`. - ----- -int cmd_walken(int argc, const char **argv, const char *prefix) -{ - init_walken_defaults(); -} ----- - -==== Configuring From `.gitconfig` - -Next, we should have a look at any relevant configuration settings (i.e., -settings readable and settable from `git config`). This is done by providing a -callback to `git_config()`; within that callback, you can also invoke methods -from other components you may need that need to intercept these options. Your -callback will be invoked once per each configuration value which Git knows about -(global, local, worktree, etc.). - -Similarly to the default values, we don't have anything to do here yet -ourselves; however, we should call `git_default_config()` if we aren't calling -any other existing config callbacks. - -Add a new function to `builtin/walken.c`: - ----- -static int git_walken_config(const char *var, const char *value, void *cb) -{ - /* - * For now, we don't have any custom configuration, so fall back to - * the default config. - */ - return git_default_config(var, value, cb); -} ----- - -Make sure to invoke `git_config()` with it in your `cmd_walken()`: - ----- -int cmd_walken(int argc, const char **argv, const char *prefix) -{ - ... - - git_config(git_walken_config, NULL); - - ... -} ----- - -==== Setting Up `rev_info` - -Now that we've gathered external configuration and options, it's time to -initialize the `rev_info` object which we will use to perform the walk. This is -typically done by calling `repo_init_revisions()` with the repository you intend -to target, as well as the `prefix` argument of `cmd_walken` and your `rev_info` -struct. - -Add the `struct rev_info` and the `repo_init_revisions()` call: ----- -int cmd_walken(int argc, const char **argv, const char *prefix) -{ - /* This can go wherever you like in your declarations.*/ - struct rev_info rev; - ... - - /* This should go after the git_config() call. */ - repo_init_revisions(the_repository, &rev, prefix); - - ... -} ----- - -==== Tweaking `rev_info` For the Walk - -We're getting close, but we're still not quite ready to go. Now that `rev` is -initialized, we can modify it to fit our needs. This is usually done within a -helper for clarity, so let's add one: - ----- -static void final_rev_info_setup(struct rev_info *rev) -{ - /* - * We want to mimic the appearance of `git log --oneline`, so let's - * force oneline format. - */ - get_commit_format("oneline", rev); - - /* Start our object walk at HEAD. */ - add_head_to_pending(rev); -} ----- - -[NOTE] -==== -Instead of using the shorthand `add_head_to_pending()`, you could do -something like this: ----- - struct setup_revision_opt opt; - - memset(&opt, 0, sizeof(opt)); - opt.def = "HEAD"; - opt.revarg_opt = REVARG_COMMITTISH; - setup_revisions(argc, argv, rev, &opt); ----- -Using a `setup_revision_opt` gives you finer control over your walk's starting -point. -==== - -Then let's invoke `final_rev_info_setup()` after the call to -`repo_init_revisions()`: - ----- -int cmd_walken(int argc, const char **argv, const char *prefix) -{ - ... - - final_rev_info_setup(&rev); - - ... -} ----- - -Later, we may wish to add more arguments to `final_rev_info_setup()`. But for -now, this is all we need. - -==== Preparing `rev_info` For the Walk - -Now that `rev` is all initialized and configured, we've got one more setup step -before we get rolling. We can do this in a helper, which will both prepare the -`rev_info` for the walk, and perform the walk itself. Let's start the helper -with the call to `prepare_revision_walk()`, which can return an error without -dying on its own: - ----- -static void walken_commit_walk(struct rev_info *rev) -{ - if (prepare_revision_walk(rev)) - die(_("revision walk setup failed")); -} ----- - -NOTE: `die()` prints to `stderr` and exits the program. Since it will print to -`stderr` it's likely to be seen by a human, so we will localize it. - -==== Performing the Walk! - -Finally! We are ready to begin the walk itself. Now we can see that `rev_info` -can also be used as an iterator; we move to the next item in the walk by using -`get_revision()` repeatedly. Add the listed variable declarations at the top and -the walk loop below the `prepare_revision_walk()` call within your -`walken_commit_walk()`: - ----- -static void walken_commit_walk(struct rev_info *rev) -{ - struct commit *commit; - struct strbuf prettybuf = STRBUF_INIT; - - ... - - while ((commit = get_revision(rev))) { - if (!commit) - continue; - - strbuf_reset(&prettybuf); - pp_commit_easy(CMIT_FMT_ONELINE, commit, &prettybuf); - puts(prettybuf.buf); - } - strbuf_release(&prettybuf); -} ----- - -NOTE: `puts()` prints a `char*` to `stdout`. Since this is the part of the -command we expect to be machine-parsed, we're sending it directly to stdout. - -Give it a shot. - ----- -$ make -$ ./bin-wrappers/git walken ----- - -You should see all of the subject lines of all the commits in -your tree's history, in order, ending with the initial commit, "Initial revision -of "git", the information manager from hell". Congratulations! You've written -your first revision walk. You can play with printing some additional fields -from each commit if you're curious; have a look at the functions available in -`commit.h`. - -=== Adding a Filter - -Next, let's try to filter the commits we see based on their author. This is -equivalent to running `git log --author=<pattern>`. We can add a filter by -modifying `rev_info.grep_filter`, which is a `struct grep_opt`. - -First some setup. Add `init_grep_defaults()` to `init_walken_defaults()` and add -`grep_config()` to `git_walken_config()`: - ----- -static void init_walken_defaults(void) -{ - init_grep_defaults(the_repository); -} - -... - -static int git_walken_config(const char *var, const char *value, void *cb) -{ - grep_config(var, value, cb); - return git_default_config(var, value, cb); -} ----- - -Next, we can modify the `grep_filter`. This is done with convenience functions -found in `grep.h`. For fun, we're filtering to only commits from folks using a -`gmail.com` email address - a not-very-precise guess at who may be working on -Git as a hobby. Since we're checking the author, which is a specific line in the -header, we'll use the `append_header_grep_pattern()` helper. We can use -the `enum grep_header_field` to indicate which part of the commit header we want -to search. - -In `final_rev_info_setup()`, add your filter line: - ----- -static void final_rev_info_setup(int argc, const char **argv, - const char *prefix, struct rev_info *rev) -{ - ... - - append_header_grep_pattern(&rev->grep_filter, GREP_HEADER_AUTHOR, - "gmail"); - compile_grep_patterns(&rev->grep_filter); - - ... -} ----- - -`append_header_grep_pattern()` adds your new "gmail" pattern to `rev_info`, but -it won't work unless we compile it with `compile_grep_patterns()`. - -NOTE: If you are using `setup_revisions()` (for example, if you are passing a -`setup_revision_opt` instead of using `add_head_to_pending()`), you don't need -to call `compile_grep_patterns()` because `setup_revisions()` calls it for you. - -NOTE: We could add the same filter via the `append_grep_pattern()` helper if we -wanted to, but `append_header_grep_pattern()` adds the `enum grep_context` and -`enum grep_pat_token` for us. - -=== Changing the Order - -There are a few ways that we can change the order of the commits during a -revision walk. Firstly, we can use the `enum rev_sort_order` to choose from some -typical orderings. - -`topo_order` is the same as `git log --topo-order`: we avoid showing a parent -before all of its children have been shown, and we avoid mixing commits which -are in different lines of history. (`git help log`'s section on `--topo-order` -has a very nice diagram to illustrate this.) - -Let's see what happens when we run with `REV_SORT_BY_COMMIT_DATE` as opposed to -`REV_SORT_BY_AUTHOR_DATE`. Add the following: - ----- -static void final_rev_info_setup(int argc, const char **argv, - const char *prefix, struct rev_info *rev) -{ - ... - - rev->topo_order = 1; - rev->sort_order = REV_SORT_BY_COMMIT_DATE; - - ... -} ----- - -Let's output this into a file so we can easily diff it with the walk sorted by -author date. - ----- -$ make -$ ./bin-wrappers/git walken > commit-date.txt ----- - -Then, let's sort by author date and run it again. - ----- -static void final_rev_info_setup(int argc, const char **argv, - const char *prefix, struct rev_info *rev) -{ - ... - - rev->topo_order = 1; - rev->sort_order = REV_SORT_BY_AUTHOR_DATE; - - ... -} ----- - ----- -$ make -$ ./bin-wrappers/git walken > author-date.txt ----- - -Finally, compare the two. This is a little less helpful without object names or -dates, but hopefully we get the idea. - ----- -$ diff -u commit-date.txt author-date.txt ----- - -This display indicates that commits can be reordered after they're written, for -example with `git rebase`. - -Let's try one more reordering of commits. `rev_info` exposes a `reverse` flag. -Set that flag somewhere inside of `final_rev_info_setup()`: - ----- -static void final_rev_info_setup(int argc, const char **argv, const char *prefix, - struct rev_info *rev) -{ - ... - - rev->reverse = 1; - - ... -} ----- - -Run your walk again and note the difference in order. (If you remove the grep -pattern, you should see the last commit this call gives you as your current -HEAD.) - -== Basic Object Walk - -So far we've been walking only commits. But Git has more types of objects than -that! Let's see if we can walk _all_ objects, and find out some information -about each one. - -We can base our work on an example. `git pack-objects` prepares all kinds of -objects for packing into a bitmap or packfile. The work we are interested in -resides in `builtins/pack-objects.c:get_object_list()`; examination of that -function shows that the all-object walk is being performed by -`traverse_commit_list()` or `traverse_commit_list_filtered()`. Those two -functions reside in `list-objects.c`; examining the source shows that, despite -the name, these functions traverse all kinds of objects. Let's have a look at -the arguments to `traverse_commit_list_filtered()`, which are a superset of the -arguments to the unfiltered version. - -- `struct list_objects_filter_options *filter_options`: This is a struct which - stores a filter-spec as outlined in `Documentation/rev-list-options.txt`. -- `struct rev_info *revs`: This is the `rev_info` used for the walk. -- `show_commit_fn show_commit`: A callback which will be used to handle each - individual commit object. -- `show_object_fn show_object`: A callback which will be used to handle each - non-commit object (so each blob, tree, or tag). -- `void *show_data`: A context buffer which is passed in turn to `show_commit` - and `show_object`. -- `struct oidset *omitted`: A linked-list of object IDs which the provided - filter caused to be omitted. - -It looks like this `traverse_commit_list_filtered()` uses callbacks we provide -instead of needing us to call it repeatedly ourselves. Cool! Let's add the -callbacks first. - -For the sake of this tutorial, we'll simply keep track of how many of each kind -of object we find. At file scope in `builtin/walken.c` add the following -tracking variables: - ----- -static int commit_count; -static int tag_count; -static int blob_count; -static int tree_count; ----- - -Commits are handled by a different callback than other objects; let's do that -one first: - ----- -static void walken_show_commit(struct commit *cmt, void *buf) -{ - commit_count++; -} ----- - -The `cmt` argument is fairly self-explanatory. But it's worth mentioning that -the `buf` argument is actually the context buffer that we can provide to the -traversal calls - `show_data`, which we mentioned a moment ago. - -Since we have the `struct commit` object, we can look at all the same parts that -we looked at in our earlier commit-only walk. For the sake of this tutorial, -though, we'll just increment the commit counter and move on. - -The callback for non-commits is a little different, as we'll need to check -which kind of object we're dealing with: - ----- -static void walken_show_object(struct object *obj, const char *str, void *buf) -{ - switch (obj->type) { - case OBJ_TREE: - tree_count++; - break; - case OBJ_BLOB: - blob_count++; - break; - case OBJ_TAG: - tag_count++; - break; - case OBJ_COMMIT: - BUG("unexpected commit object in walken_show_object\n"); - default: - BUG("unexpected object type %s in walken_show_object\n", - type_name(obj->type)); - } -} ----- - -Again, `obj` is fairly self-explanatory, and we can guess that `buf` is the same -context pointer that `walken_show_commit()` receives: the `show_data` argument -to `traverse_commit_list()` and `traverse_commit_list_filtered()`. Finally, -`str` contains the name of the object, which ends up being something like -`foo.txt` (blob), `bar/baz` (tree), or `v1.2.3` (tag). - -To help assure us that we aren't double-counting commits, we'll include some -complaining if a commit object is routed through our non-commit callback; we'll -also complain if we see an invalid object type. Since those two cases should be -unreachable, and would only change in the event of a semantic change to the Git -codebase, we complain by using `BUG()` - which is a signal to a developer that -the change they made caused unintended consequences, and the rest of the -codebase needs to be updated to understand that change. `BUG()` is not intended -to be seen by the public, so it is not localized. - -Our main object walk implementation is substantially different from our commit -walk implementation, so let's make a new function to perform the object walk. We -can perform setup which is applicable to all objects here, too, to keep separate -from setup which is applicable to commit-only walks. - -We'll start by enabling all types of objects in the `struct rev_info`. We'll -also turn on `tree_blobs_in_commit_order`, which means that we will walk a -commit's tree and everything it points to immediately after we find each commit, -as opposed to waiting for the end and walking through all trees after the commit -history has been discovered. With the appropriate settings configured, we are -ready to call `prepare_revision_walk()`. - ----- -static void walken_object_walk(struct rev_info *rev) -{ - rev->tree_objects = 1; - rev->blob_objects = 1; - rev->tag_objects = 1; - rev->tree_blobs_in_commit_order = 1; - - if (prepare_revision_walk(rev)) - die(_("revision walk setup failed")); - - commit_count = 0; - tag_count = 0; - blob_count = 0; - tree_count = 0; ----- - -Let's start by calling just the unfiltered walk and reporting our counts. -Complete your implementation of `walken_object_walk()`: - ----- - traverse_commit_list(rev, walken_show_commit, walken_show_object, NULL); - - printf("commits %d\nblobs %d\ntags %d\ntrees %d\n", commit_count, - blob_count, tag_count, tree_count); -} ----- - -NOTE: This output is intended to be machine-parsed. Therefore, we are not -sending it to `trace_printf()`, and we are not localizing it - we need scripts -to be able to count on the formatting to be exactly the way it is shown here. -If we were intending this output to be read by humans, we would need to localize -it with `_()`. - -Finally, we'll ask `cmd_walken()` to use the object walk instead. Discussing -command line options is out of scope for this tutorial, so we'll just hardcode -a branch we can change at compile time. Where you call `final_rev_info_setup()` -and `walken_commit_walk()`, instead branch like so: - ----- - if (1) { - add_head_to_pending(&rev); - walken_object_walk(&rev); - } else { - final_rev_info_setup(argc, argv, prefix, &rev); - walken_commit_walk(&rev); - } ----- - -NOTE: For simplicity, we've avoided all the filters and sorts we applied in -`final_rev_info_setup()` and simply added `HEAD` to our pending queue. If you -want, you can certainly use the filters we added before by moving -`final_rev_info_setup()` out of the conditional and removing the call to -`add_head_to_pending()`. - -Now we can try to run our command! It should take noticeably longer than the -commit walk, but an examination of the output will give you an idea why. Your -output should look similar to this example, but with different counts: - ----- -Object walk completed. Found 55733 commits, 100274 blobs, 0 tags, and 104210 trees. ----- - -This makes sense. We have more trees than commits because the Git project has -lots of subdirectories which can change, plus at least one tree per commit. We -have no tags because we started on a commit (`HEAD`) and while tags can point to -commits, commits can't point to tags. - -NOTE: You will have different counts when you run this yourself! The number of -objects grows along with the Git project. - -=== Adding a Filter - -There are a handful of filters that we can apply to the object walk laid out in -`Documentation/rev-list-options.txt`. These filters are typically useful for -operations such as creating packfiles or performing a partial clone. They are -defined in `list-objects-filter-options.h`. For the purposes of this tutorial we -will use the "tree:1" filter, which causes the walk to omit all trees and blobs -which are not directly referenced by commits reachable from the commit in -`pending` when the walk begins. (`pending` is the list of objects which need to -be traversed during a walk; you can imagine a breadth-first tree traversal to -help understand. In our case, that means we omit trees and blobs not directly -referenced by `HEAD` or `HEAD`'s history, because we begin the walk with only -`HEAD` in the `pending` list.) - -First, we'll need to `#include "list-objects-filter-options.h`" and set up the -`struct list_objects_filter_options` at the top of the function. - ----- -static void walken_object_walk(struct rev_info *rev) -{ - struct list_objects_filter_options filter_options = {}; - - ... ----- - -For now, we are not going to track the omitted objects, so we'll replace those -parameters with `NULL`. For the sake of simplicity, we'll add a simple -build-time branch to use our filter or not. Replace the line calling -`traverse_commit_list()` with the following, which will remind us which kind of -walk we've just performed: - ----- - if (0) { - /* Unfiltered: */ - trace_printf(_("Unfiltered object walk.\n")); - traverse_commit_list(rev, walken_show_commit, - walken_show_object, NULL); - } else { - trace_printf( - _("Filtered object walk with filterspec 'tree:1'.\n")); - parse_list_objects_filter(&filter_options, "tree:1"); - - traverse_commit_list_filtered(&filter_options, rev, - walken_show_commit, walken_show_object, NULL, NULL); - } ----- - -`struct list_objects_filter_options` is usually built directly from a command -line argument, so the module provides an easy way to build one from a string. -Even though we aren't taking user input right now, we can still build one with -a hardcoded string using `parse_list_objects_filter()`. - -With the filter spec "tree:1", we are expecting to see _only_ the root tree for -each commit; therefore, the tree object count should be less than or equal to -the number of commits. (For an example of why that's true: `git commit --revert` -points to the same tree object as its grandparent.) - -=== Counting Omitted Objects - -We also have the capability to enumerate all objects which were omitted by a -filter, like with `git log --filter=<spec> --filter-print-omitted`. Asking -`traverse_commit_list_filtered()` to populate the `omitted` list means that our -object walk does not perform any better than an unfiltered object walk; all -reachable objects are walked in order to populate the list. - -First, add the `struct oidset` and related items we will use to iterate it: - ----- -static void walken_object_walk( - ... - - struct oidset omitted; - struct oidset_iter oit; - struct object_id *oid = NULL; - int omitted_count = 0; - oidset_init(&omitted, 0); - - ... ----- - -Modify the call to `traverse_commit_list_filtered()` to include your `omitted` -object: - ----- - ... - - traverse_commit_list_filtered(&filter_options, rev, - walken_show_commit, walken_show_object, NULL, &omitted); - - ... ----- - -Then, after your traversal, the `oidset` traversal is pretty straightforward. -Count all the objects within and modify the print statement: - ----- - /* Count the omitted objects. */ - oidset_iter_init(&omitted, &oit); - - while ((oid = oidset_iter_next(&oit))) - omitted_count++; - - printf("commits %d\nblobs %d\ntags %d\ntrees%d\nomitted %d\n", - commit_count, blob_count, tag_count, tree_count, omitted_count); ----- - -By running your walk with and without the filter, you should find that the total -object count in each case is identical. You can also time each invocation of -the `walken` subcommand, with and without `omitted` being passed in, to confirm -to yourself the runtime impact of tracking all omitted objects. - -=== Changing the Order - -Finally, let's demonstrate that you can also reorder walks of all objects, not -just walks of commits. First, we'll make our handlers chattier - modify -`walken_show_commit()` and `walken_show_object()` to print the object as they -go: - ----- -static void walken_show_commit(struct commit *cmt, void *buf) -{ - trace_printf("commit: %s\n", oid_to_hex(&cmt->object.oid)); - commit_count++; -} - -static void walken_show_object(struct object *obj, const char *str, void *buf) -{ - trace_printf("%s: %s\n", type_name(obj->type), oid_to_hex(&obj->oid)); - - ... -} ----- - -NOTE: Since we will be examining this output directly as humans, we'll use -`trace_printf()` here. Additionally, since this change introduces a significant -number of printed lines, using `trace_printf()` will allow us to easily silence -those lines without having to recompile. - -(Leave the counter increment logic in place.) - -With only that change, run again (but save yourself some scrollback): - ----- -$ GIT_TRACE=1 ./bin-wrappers/git walken | head -n 10 ----- - -Take a look at the top commit with `git show` and the object ID you printed; it -should be the same as the output of `git show HEAD`. - -Next, let's change a setting on our `struct rev_info` within -`walken_object_walk()`. Find where you're changing the other settings on `rev`, -such as `rev->tree_objects` and `rev->tree_blobs_in_commit_order`, and add the -`reverse` setting at the bottom: - ----- - ... - - rev->tree_objects = 1; - rev->blob_objects = 1; - rev->tag_objects = 1; - rev->tree_blobs_in_commit_order = 1; - rev->reverse = 1; - - ... ----- - -Now, run again, but this time, let's grab the last handful of objects instead -of the first handful: - ----- -$ make -$ GIT_TRACE=1 ./bin-wrappers git walken | tail -n 10 ----- - -The last commit object given should have the same OID as the one we saw at the -top before, and running `git show <oid>` with that OID should give you again -the same results as `git show HEAD`. Furthermore, if you run and examine the -first ten lines again (with `head` instead of `tail` like we did before applying -the `reverse` setting), you should see that now the first commit printed is the -initial commit, `e83c5163`. - -== Wrapping Up - -Let's review. In this tutorial, we: - -- Built a commit walk from the ground up -- Enabled a grep filter for that commit walk -- Changed the sort order of that filtered commit walk -- Built an object walk (tags, commits, trees, and blobs) from the ground up -- Learned how to add a filter-spec to an object walk -- Changed the display order of the filtered object walk diff --git a/third_party/git/Documentation/RelNotes/1.5.0.txt b/third_party/git/Documentation/RelNotes/1.5.0.txt index d6d42f3183..daf4bdb0d7 100644 --- a/third_party/git/Documentation/RelNotes/1.5.0.txt +++ b/third_party/git/Documentation/RelNotes/1.5.0.txt @@ -251,7 +251,7 @@ Updates in v1.5.0 since v1.4.4 series the repository when that happens. -* Cruft removal +* Crufts removal - We used to say "old commits are retrievable using reflog and 'master@{yesterday}' syntax as long as you haven't run @@ -379,7 +379,7 @@ Updates in v1.5.0 since v1.4.4 series - The value of i18n.commitencoding in the originating repository is recorded in the commit object on the "encoding" header, if it is not UTF-8. git-log and friends notice this, - and re-encodes the message to the log output encoding when + and reencodes the message to the log output encoding when displaying, if they are different. The log output encoding is determined by "git log --encoding=<encoding>", i18n.logoutputencoding configuration, or i18n.commitencoding diff --git a/third_party/git/Documentation/RelNotes/1.6.2.txt b/third_party/git/Documentation/RelNotes/1.6.2.txt index 980adfb315..ad060f4f89 100644 --- a/third_party/git/Documentation/RelNotes/1.6.2.txt +++ b/third_party/git/Documentation/RelNotes/1.6.2.txt @@ -11,7 +11,7 @@ push running this release will issue a big warning when the configuration variable is missing. Please refer to: http://git.or.cz/gitwiki/GitFaq#non-bare - https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 for more details on the reason why this change is needed and the transition plan. diff --git a/third_party/git/Documentation/RelNotes/1.6.3.txt b/third_party/git/Documentation/RelNotes/1.6.3.txt index 4bcff945e0..418c685cf8 100644 --- a/third_party/git/Documentation/RelNotes/1.6.3.txt +++ b/third_party/git/Documentation/RelNotes/1.6.3.txt @@ -11,7 +11,7 @@ push running this release will issue a big warning when the configuration variable is missing. Please refer to: http://git.or.cz/gitwiki/GitFaq#non-bare - https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 for more details on the reason why this change is needed and the transition plan. diff --git a/third_party/git/Documentation/RelNotes/1.6.4.txt b/third_party/git/Documentation/RelNotes/1.6.4.txt index a2a34b43a7..7a904419f7 100644 --- a/third_party/git/Documentation/RelNotes/1.6.4.txt +++ b/third_party/git/Documentation/RelNotes/1.6.4.txt @@ -11,7 +11,7 @@ push running this release will issue a big warning when the configuration variable is missing. Please refer to: http://git.or.cz/gitwiki/GitFaq#non-bare - https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 for more details on the reason why this change is needed and the transition plan. diff --git a/third_party/git/Documentation/RelNotes/1.6.5.4.txt b/third_party/git/Documentation/RelNotes/1.6.5.4.txt index 344333de66..d3a2a3e712 100644 --- a/third_party/git/Documentation/RelNotes/1.6.5.4.txt +++ b/third_party/git/Documentation/RelNotes/1.6.5.4.txt @@ -10,7 +10,7 @@ Fixes since v1.6.5.3 * "git prune-packed" gave progress output even when its standard error is not connected to a terminal; this caused cron jobs that run it to - produce cruft. + produce crufts. * "git pack-objects --all-progress" is an option to ask progress output from write-object phase _if_ progress output were to be produced, and diff --git a/third_party/git/Documentation/RelNotes/1.6.5.txt b/third_party/git/Documentation/RelNotes/1.6.5.txt index 6c7f7da7eb..ee141c19ad 100644 --- a/third_party/git/Documentation/RelNotes/1.6.5.txt +++ b/third_party/git/Documentation/RelNotes/1.6.5.txt @@ -22,7 +22,7 @@ push running this release will issue a big warning when the configuration variable is missing. Please refer to: http://git.or.cz/gitwiki/GitFaq#non-bare - https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 for more details on the reason why this change is needed and the transition plan. diff --git a/third_party/git/Documentation/RelNotes/1.6.6.txt b/third_party/git/Documentation/RelNotes/1.6.6.txt index 3ed1e01433..c50b59c495 100644 --- a/third_party/git/Documentation/RelNotes/1.6.6.txt +++ b/third_party/git/Documentation/RelNotes/1.6.6.txt @@ -64,7 +64,7 @@ users will fare this time. Please refer to: http://git.or.cz/gitwiki/GitFaq#non-bare - https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/ + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 for more details on the reason why this change is needed and the transition process that already took place so far. diff --git a/third_party/git/Documentation/RelNotes/1.7.0.2.txt b/third_party/git/Documentation/RelNotes/1.7.0.2.txt index 73ed2b5278..fcb46ca6a4 100644 --- a/third_party/git/Documentation/RelNotes/1.7.0.2.txt +++ b/third_party/git/Documentation/RelNotes/1.7.0.2.txt @@ -34,7 +34,7 @@ Fixes since v1.7.0.1 * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series to speed up scanning of large working tree. - * "gitweb" did not diagnose parsing errors properly while reading its configuration + * "gitweb" did not diagnose parsing errors properly while reading tis configuration file. And other minor fixes and documentation updates. diff --git a/third_party/git/Documentation/RelNotes/1.7.10.4.txt b/third_party/git/Documentation/RelNotes/1.7.10.4.txt index 57597f2bf3..326670df6e 100644 --- a/third_party/git/Documentation/RelNotes/1.7.10.4.txt +++ b/third_party/git/Documentation/RelNotes/1.7.10.4.txt @@ -7,7 +7,7 @@ Fixes since v1.7.10.3 * The message file for Swedish translation has been updated a bit. * A name taken from mailmap was copied into an internal buffer - incorrectly and could overrun the buffer if it is too long. + incorrectly and could overun the buffer if it is too long. * A malformed commit object that has a header line chomped in the middle could kill git with a NULL pointer dereference. diff --git a/third_party/git/Documentation/RelNotes/1.7.12.3.txt b/third_party/git/Documentation/RelNotes/1.7.12.3.txt index 4b822976b8..ecda427a35 100644 --- a/third_party/git/Documentation/RelNotes/1.7.12.3.txt +++ b/third_party/git/Documentation/RelNotes/1.7.12.3.txt @@ -25,7 +25,7 @@ Fixes since v1.7.12.2 its Accept-Encoding header. * "git receive-pack" (the counterpart to "git push") did not give - progress output while processing objects it received to the user + progress output while processing objects it received to the puser when run over the smart-http protocol. * "git status" honored the ignore=dirty settings in .gitmodules but diff --git a/third_party/git/Documentation/RelNotes/1.7.5.3.txt b/third_party/git/Documentation/RelNotes/1.7.5.3.txt index 1d24edcf2f..9c03353af2 100644 --- a/third_party/git/Documentation/RelNotes/1.7.5.3.txt +++ b/third_party/git/Documentation/RelNotes/1.7.5.3.txt @@ -22,7 +22,7 @@ Fixes since v1.7.5.2 * "git log --stdin path" with an input that has additional pathspec used to corrupt memory. - * "git send-pack" (hence "git push") over smart-HTTP protocol could + * "git send-pack" (hence "git push") over smalt-HTTP protocol could deadlock when the client side pack-object died early. * Compressed tarball gitweb generates used to be made with the timestamp diff --git a/third_party/git/Documentation/RelNotes/1.8.0.txt b/third_party/git/Documentation/RelNotes/1.8.0.txt index 63d6e4afa4..43883c14f0 100644 --- a/third_party/git/Documentation/RelNotes/1.8.0.txt +++ b/third_party/git/Documentation/RelNotes/1.8.0.txt @@ -233,7 +233,7 @@ to them for details). together, misdetected branches. * "git receive-pack" (the counterpart to "git push") did not give - progress output while processing objects it received to the user + progress output while processing objects it received to the puser when run over the smart-http protocol. * When you misspell the command name you give to the "exec" action in diff --git a/third_party/git/Documentation/RelNotes/1.8.4.1.txt b/third_party/git/Documentation/RelNotes/1.8.4.1.txt index c257beb114..96090ef599 100644 --- a/third_party/git/Documentation/RelNotes/1.8.4.1.txt +++ b/third_party/git/Documentation/RelNotes/1.8.4.1.txt @@ -15,7 +15,7 @@ Fixes since v1.8.4 in 1.8.4-rc1). * "git rebase -i" and other scripted commands were feeding a - random, data dependent error message to 'echo' and expecting it + random, data dependant error message to 'echo' and expecting it to come out literally. * Setting the "submodule.<name>.path" variable to the empty diff --git a/third_party/git/Documentation/RelNotes/1.8.4.txt b/third_party/git/Documentation/RelNotes/1.8.4.txt index 255e185af6..02f681b710 100644 --- a/third_party/git/Documentation/RelNotes/1.8.4.txt +++ b/third_party/git/Documentation/RelNotes/1.8.4.txt @@ -58,7 +58,7 @@ Foreign interfaces, subsystems and ports. credential helper interface from Git.pm. * Update build for Cygwin 1.[57]. Torsten Bögershausen reports that - this is fine with Cygwin 1.7 (cf. <51A606A0.5060101@web.de>) so let's try moving it + this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it ahead. * The credential helper to talk to keychain on OS X (in contrib/) has diff --git a/third_party/git/Documentation/RelNotes/2.1.3.txt b/third_party/git/Documentation/RelNotes/2.1.3.txt index 0dfb17c4fc..acc9ebb886 100644 --- a/third_party/git/Documentation/RelNotes/2.1.3.txt +++ b/third_party/git/Documentation/RelNotes/2.1.3.txt @@ -13,7 +13,7 @@ Git v2.1.3 Release Notes they are new enough to support the `--output` option. * "git pack-objects" forgot to disable the codepath to generate - object reachability bitmap when it needs to split the resulting + object recheability bitmap when it needs to split the resulting pack. * "gitweb" used deprecated CGI::startfrom, which was removed from diff --git a/third_party/git/Documentation/RelNotes/2.10.0.txt b/third_party/git/Documentation/RelNotes/2.10.0.txt index 3792b7d03d..f4da28ab66 100644 --- a/third_party/git/Documentation/RelNotes/2.10.0.txt +++ b/third_party/git/Documentation/RelNotes/2.10.0.txt @@ -478,7 +478,7 @@ notes for details). * One part of "git am" had an oddball helper function that called stuff from outside "his" as opposed to calling what we have "ours", which was not gender-neutral and also inconsistent with the rest of - the system where outside stuff is usually called "theirs" in + the system where outside stuff is usuall called "theirs" in contrast to "ours". * "git blame file" allowed the lineage of lines in the uncommitted, diff --git a/third_party/git/Documentation/RelNotes/2.10.2.txt b/third_party/git/Documentation/RelNotes/2.10.2.txt index abbd331508..c4d4397023 100644 --- a/third_party/git/Documentation/RelNotes/2.10.2.txt +++ b/third_party/git/Documentation/RelNotes/2.10.2.txt @@ -86,7 +86,7 @@ Fixes since v2.10.1 by refusing to check out a branch that is already checked out in another worktree. However, this also prevented checking out a branch, which is designated as the primary branch of a bare - repository, in a worktree that is connected to the bare + reopsitory, in a worktree that is connected to the bare repository. The check has been corrected to allow it. * "git rebase" immediately after "git clone" failed to find the fork diff --git a/third_party/git/Documentation/RelNotes/2.11.1.txt b/third_party/git/Documentation/RelNotes/2.11.1.txt index 7d35cf186d..9cd14c8197 100644 --- a/third_party/git/Documentation/RelNotes/2.11.1.txt +++ b/third_party/git/Documentation/RelNotes/2.11.1.txt @@ -104,7 +104,7 @@ Fixes since v2.11 "git difftool --dir-diff" from a subdirectory never worked. This has been fixed. - * "git p4" that tracks multiple p4 paths imported a single changelist + * "git p4" that tracks multile p4 paths imported a single changelist that touches files in these multiple paths as one commit, followed by many empty commits. This has been fixed. diff --git a/third_party/git/Documentation/RelNotes/2.12.0.txt b/third_party/git/Documentation/RelNotes/2.12.0.txt index d2f6a83614..ef8b97da9b 100644 --- a/third_party/git/Documentation/RelNotes/2.12.0.txt +++ b/third_party/git/Documentation/RelNotes/2.12.0.txt @@ -315,7 +315,7 @@ notes for details). "git difftool --dir-diff" from a subdirectory never worked. This has been fixed. - * "git p4" that tracks multiple p4 paths imported a single changelist + * "git p4" that tracks multile p4 paths imported a single changelist that touches files in these multiple paths as one commit, followed by many empty commits. This has been fixed. diff --git a/third_party/git/Documentation/RelNotes/2.13.0.txt b/third_party/git/Documentation/RelNotes/2.13.0.txt index 2a47b4cb0c..aa99d4b3ce 100644 --- a/third_party/git/Documentation/RelNotes/2.13.0.txt +++ b/third_party/git/Documentation/RelNotes/2.13.0.txt @@ -177,7 +177,7 @@ UI, Workflows & Features been changed to enable "--decorate". * The output from "git status --short" has been extended to show - various kinds of dirtiness in submodules differently; instead of to + various kinds of dirtyness in submodules differently; instead of to "M" for modified, 'm' and '?' can be shown to signal changes only to the working tree of the submodule but not the commit that is checked out. diff --git a/third_party/git/Documentation/RelNotes/2.13.3.txt b/third_party/git/Documentation/RelNotes/2.13.3.txt index 384e4de265..5d76ad5310 100644 --- a/third_party/git/Documentation/RelNotes/2.13.3.txt +++ b/third_party/git/Documentation/RelNotes/2.13.3.txt @@ -25,7 +25,7 @@ Fixes since v2.13.2 * The code to pick up and execute command alias definition from the configuration used to switch to the top of the working tree and then come back when the expanded alias was executed, which was - unnecessarily complex. Attempt to simplify the logic by using the + unnecessarilyl complex. Attempt to simplify the logic by using the early-config mechanism that does not chdir around. * "git add -p" were updated in 2.12 timeframe to cope with custom @@ -35,7 +35,7 @@ Fixes since v2.13.2 * Fix a recent regression to "git rebase -i" and add tests that would have caught it and others. - * An unaligned 32-bit access in pack-bitmap code has been corrected. + * An unaligned 32-bit access in pack-bitmap code ahs been corrected. * Tighten error checks for invalid "git apply" input. diff --git a/third_party/git/Documentation/RelNotes/2.14.0.txt b/third_party/git/Documentation/RelNotes/2.14.0.txt index 2711a2529d..4246c68ff5 100644 --- a/third_party/git/Documentation/RelNotes/2.14.0.txt +++ b/third_party/git/Documentation/RelNotes/2.14.0.txt @@ -141,7 +141,7 @@ Performance, Internal Implementation, Development Support etc. * Some platforms have ulong that is smaller than time_t, and our historical use of ulong for timestamp would mean they cannot represent some timestamp that the platform allows. Invent a - separate and dedicated timestamp_t (so that we can distinguish + separate and dedicated timestamp_t (so that we can distingiuish timestamps and a vanilla ulongs, which along is already a good move), and then declare uintmax_t is the type to be used as the timestamp_t. @@ -442,7 +442,7 @@ notes for details). * The code to pick up and execute command alias definition from the configuration used to switch to the top of the working tree and then come back when the expanded alias was executed, which was - unnecessarily complex. Attempt to simplify the logic by using the + unnecessarilyl complex. Attempt to simplify the logic by using the early-config mechanism that does not chdir around. * Fix configuration codepath to pay proper attention to commondir diff --git a/third_party/git/Documentation/RelNotes/2.14.6.txt b/third_party/git/Documentation/RelNotes/2.14.6.txt deleted file mode 100644 index 72b7af6799..0000000000 --- a/third_party/git/Documentation/RelNotes/2.14.6.txt +++ /dev/null @@ -1,54 +0,0 @@ -Git v2.14.6 Release Notes -========================= - -This release addresses the security issues CVE-2019-1348, -CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, -CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387. - -Fixes since v2.14.5 -------------------- - - * CVE-2019-1348: - The --export-marks option of git fast-import is exposed also via - the in-stream command feature export-marks=... and it allows - overwriting arbitrary paths. - - * CVE-2019-1349: - When submodules are cloned recursively, under certain circumstances - Git could be fooled into using the same Git directory twice. We now - require the directory to be empty. - - * CVE-2019-1350: - Incorrect quoting of command-line arguments allowed remote code - execution during a recursive clone in conjunction with SSH URLs. - - * CVE-2019-1351: - While the only permitted drive letters for physical drives on - Windows are letters of the US-English alphabet, this restriction - does not apply to virtual drives assigned via subst <letter>: - <path>. Git mistook such paths for relative paths, allowing writing - outside of the worktree while cloning. - - * CVE-2019-1352: - Git was unaware of NTFS Alternate Data Streams, allowing files - inside the .git/ directory to be overwritten during a clone. - - * CVE-2019-1353: - When running Git in the Windows Subsystem for Linux (also known as - "WSL") while accessing a working directory on a regular Windows - drive, none of the NTFS protections were active. - - * CVE-2019-1354: - Filenames on Linux/Unix can contain backslashes. On Windows, - backslashes are directory separators. Git did not use to refuse to - write out tracked files with such filenames. - - * CVE-2019-1387: - Recursive clones are currently affected by a vulnerability that is - caused by too-lax validation of submodule names, allowing very - targeted attacks via remote code execution in recursive clones. - -Credit for finding these vulnerabilities goes to Microsoft Security -Response Center, in particular to Nicolas Joly. The `fast-import` -fixes were provided by Jeff King, the other fixes by Johannes -Schindelin with help from Garima Singh. diff --git a/third_party/git/Documentation/RelNotes/2.15.4.txt b/third_party/git/Documentation/RelNotes/2.15.4.txt deleted file mode 100644 index dc241cba34..0000000000 --- a/third_party/git/Documentation/RelNotes/2.15.4.txt +++ /dev/null @@ -1,11 +0,0 @@ -Git v2.15.4 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6 to address -the security issues CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, -CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and -CVE-2019-1387; see the release notes for that version for details. - -In conjunction with a vulnerability that was fixed in v2.20.2, -`.gitmodules` is no longer allowed to contain entries of the form -`submodule.<name>.update=!command`. diff --git a/third_party/git/Documentation/RelNotes/2.16.0.txt b/third_party/git/Documentation/RelNotes/2.16.0.txt index b474781ed8..0c81c5915f 100644 --- a/third_party/git/Documentation/RelNotes/2.16.0.txt +++ b/third_party/git/Documentation/RelNotes/2.16.0.txt @@ -407,7 +407,7 @@ Fixes since v2.15 (merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint). * Amending commits in git-gui broke the author name that is non-ascii - due to incorrect encoding conversion. + due to incorrect enconding conversion. * Recent update to the submodule configuration code broke "diff-tree" by accidentally stopping to read from the index upfront. diff --git a/third_party/git/Documentation/RelNotes/2.16.3.txt b/third_party/git/Documentation/RelNotes/2.16.3.txt index f0121a8f2d..64a0bcb0d2 100644 --- a/third_party/git/Documentation/RelNotes/2.16.3.txt +++ b/third_party/git/Documentation/RelNotes/2.16.3.txt @@ -24,7 +24,7 @@ Fixes since v2.16.2 * The http tracing code, often used to debug connection issues, learned to redact potentially sensitive information from its output - so that it can be more safely shareable. + so that it can be more safely sharable. * Crash fix for a corner case where an error codepath tried to unlock what it did not acquire lock on. diff --git a/third_party/git/Documentation/RelNotes/2.16.6.txt b/third_party/git/Documentation/RelNotes/2.16.6.txt deleted file mode 100644 index 438306e60b..0000000000 --- a/third_party/git/Documentation/RelNotes/2.16.6.txt +++ /dev/null @@ -1,8 +0,0 @@ -Git v2.16.6 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6 and in -v2.15.4 addressing the security issues CVE-2019-1348, CVE-2019-1349, -CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, -CVE-2019-1354, and CVE-2019-1387; see the release notes for those -versions for details. diff --git a/third_party/git/Documentation/RelNotes/2.17.0.txt b/third_party/git/Documentation/RelNotes/2.17.0.txt index 8b17c26033..c2cf891f71 100644 --- a/third_party/git/Documentation/RelNotes/2.17.0.txt +++ b/third_party/git/Documentation/RelNotes/2.17.0.txt @@ -216,7 +216,7 @@ Fixes since v2.16 * The http tracing code, often used to debug connection issues, learned to redact potentially sensitive information from its output - so that it can be more safely shareable. + so that it can be more safely sharable. (merge 8ba18e6fa4 jt/http-redact-cookies later to maint). * Crash fix for a corner case where an error codepath tried to unlock diff --git a/third_party/git/Documentation/RelNotes/2.17.3.txt b/third_party/git/Documentation/RelNotes/2.17.3.txt deleted file mode 100644 index 5a46c94271..0000000000 --- a/third_party/git/Documentation/RelNotes/2.17.3.txt +++ /dev/null @@ -1,12 +0,0 @@ -Git v2.17.3 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6 and in -v2.15.4 addressing the security issues CVE-2019-1348, CVE-2019-1349, -CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, -CVE-2019-1354, and CVE-2019-1387; see the release notes for those -versions for details. - -In addition, `git fsck` was taught to identify `.gitmodules` entries -of the form `submodule.<name>.update=!command`, which have been -disallowed in v2.15.4. diff --git a/third_party/git/Documentation/RelNotes/2.17.4.txt b/third_party/git/Documentation/RelNotes/2.17.4.txt deleted file mode 100644 index 7d794ca01a..0000000000 --- a/third_party/git/Documentation/RelNotes/2.17.4.txt +++ /dev/null @@ -1,16 +0,0 @@ -Git v2.17.4 Release Notes -========================= - -This release is to address the security issue: CVE-2020-5260 - -Fixes since v2.17.3 -------------------- - - * With a crafted URL that contains a newline in it, the credential - helper machinery can be fooled to give credential information for - a wrong host. The attack has been made impossible by forbidding - a newline character in any value passed via the credential - protocol. - -Credit for finding the vulnerability goes to Felix Wilhelm of Google -Project Zero. diff --git a/third_party/git/Documentation/RelNotes/2.17.5.txt b/third_party/git/Documentation/RelNotes/2.17.5.txt deleted file mode 100644 index 2abb821a73..0000000000 --- a/third_party/git/Documentation/RelNotes/2.17.5.txt +++ /dev/null @@ -1,22 +0,0 @@ -Git v2.17.5 Release Notes -========================= - -This release is to address a security issue: CVE-2020-11008 - -Fixes since v2.17.4 -------------------- - - * With a crafted URL that contains a newline or empty host, or lacks - a scheme, the credential helper machinery can be fooled into - providing credential information that is not appropriate for the - protocol in use and host being contacted. - - Unlike the vulnerability CVE-2020-5260 fixed in v2.17.4, the - credentials are not for a host of the attacker's choosing; instead, - they are for some unspecified host (based on how the configured - credential helper handles an absent "host" parameter). - - The attack has been made impossible by refusing to work with - under-specified credential patterns. - -Credit for finding the vulnerability goes to Carlo Arenas. diff --git a/third_party/git/Documentation/RelNotes/2.18.0.txt b/third_party/git/Documentation/RelNotes/2.18.0.txt index 6c8a0e97c1..3ea280cf68 100644 --- a/third_party/git/Documentation/RelNotes/2.18.0.txt +++ b/third_party/git/Documentation/RelNotes/2.18.0.txt @@ -179,7 +179,7 @@ Performance, Internal Implementation, Development Support etc. (merge 00a3da2a13 nd/remove-ignore-env-field later to maint). * Code to find the length to uniquely abbreviate object names based - on packfile content, which is a relatively recent addition, has been + on packfile content, which is a relatively recent addtion, has been optimized to use the same fan-out table. * The mechanism to use parse-options API to automate the command line diff --git a/third_party/git/Documentation/RelNotes/2.18.2.txt b/third_party/git/Documentation/RelNotes/2.18.2.txt deleted file mode 100644 index 98b168aade..0000000000 --- a/third_party/git/Documentation/RelNotes/2.18.2.txt +++ /dev/null @@ -1,8 +0,0 @@ -Git v2.18.2 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6, v2.15.4 -and in v2.17.3, addressing the security issues CVE-2019-1348, -CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, -CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes -for those versions for details. diff --git a/third_party/git/Documentation/RelNotes/2.18.3.txt b/third_party/git/Documentation/RelNotes/2.18.3.txt deleted file mode 100644 index 25143f0cec..0000000000 --- a/third_party/git/Documentation/RelNotes/2.18.3.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.18.3 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.18.4.txt b/third_party/git/Documentation/RelNotes/2.18.4.txt deleted file mode 100644 index e8ef858a00..0000000000 --- a/third_party/git/Documentation/RelNotes/2.18.4.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.18.4 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.19.0.txt b/third_party/git/Documentation/RelNotes/2.19.0.txt index 891c79b9cb..a06ccf6e2a 100644 --- a/third_party/git/Documentation/RelNotes/2.19.0.txt +++ b/third_party/git/Documentation/RelNotes/2.19.0.txt @@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc. * The conversion to pass "the_repository" and then "a_repository" throughout the object access API continues. - * Continuing with the idea to programmatically enumerate various + * Continuing with the idea to programatically enumerate various pieces of data required for command line completion, teach the codebase to report the list of configuration variables subcommands care about to help complete them. diff --git a/third_party/git/Documentation/RelNotes/2.19.3.txt b/third_party/git/Documentation/RelNotes/2.19.3.txt deleted file mode 100644 index 92d7f89de6..0000000000 --- a/third_party/git/Documentation/RelNotes/2.19.3.txt +++ /dev/null @@ -1,8 +0,0 @@ -Git v2.19.3 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6, v2.15.4 -and in v2.17.3, addressing the security issues CVE-2019-1348, -CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, -CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes -for those versions for details. diff --git a/third_party/git/Documentation/RelNotes/2.19.4.txt b/third_party/git/Documentation/RelNotes/2.19.4.txt deleted file mode 100644 index 35d0ae561b..0000000000 --- a/third_party/git/Documentation/RelNotes/2.19.4.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.19.4 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.19.5.txt b/third_party/git/Documentation/RelNotes/2.19.5.txt deleted file mode 100644 index 18a4dcbfd6..0000000000 --- a/third_party/git/Documentation/RelNotes/2.19.5.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.19.5 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.20.0.txt b/third_party/git/Documentation/RelNotes/2.20.0.txt index 3dd7e6e1fc..e71fe3dee1 100644 --- a/third_party/git/Documentation/RelNotes/2.20.0.txt +++ b/third_party/git/Documentation/RelNotes/2.20.0.txt @@ -119,7 +119,7 @@ UI, Workflows & Features alias expansion. * The documentation of "git gc" has been updated to mention that it - is no longer limited to "pruning away cruft" but also updates + is no longer limited to "pruning away crufts" but also updates ancillary files like commit-graph as a part of repository optimization. diff --git a/third_party/git/Documentation/RelNotes/2.20.2.txt b/third_party/git/Documentation/RelNotes/2.20.2.txt deleted file mode 100644 index 8e680cb9fb..0000000000 --- a/third_party/git/Documentation/RelNotes/2.20.2.txt +++ /dev/null @@ -1,18 +0,0 @@ -Git v2.20.2 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6, v2.15.4 -and in v2.17.3, addressing the security issues CVE-2019-1348, -CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, -CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes -for those versions for details. - -The change to disallow `submodule.<name>.update=!command` entries in -`.gitmodules` which was introduced v2.15.4 (and for which v2.17.3 -added explicit fsck checks) fixes the vulnerability in v2.20.x where a -recursive clone followed by a submodule update could execute code -contained within the repository without the user explicitly having -asked for that (CVE-2019-19604). - -Credit for finding this vulnerability goes to Joern Schneeweisz, -credit for the fixes goes to Jonathan Nieder. diff --git a/third_party/git/Documentation/RelNotes/2.20.3.txt b/third_party/git/Documentation/RelNotes/2.20.3.txt deleted file mode 100644 index f6eccd103b..0000000000 --- a/third_party/git/Documentation/RelNotes/2.20.3.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.20.3 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.20.4.txt b/third_party/git/Documentation/RelNotes/2.20.4.txt deleted file mode 100644 index 5a9e24e470..0000000000 --- a/third_party/git/Documentation/RelNotes/2.20.4.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.20.4 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.21.1.txt b/third_party/git/Documentation/RelNotes/2.21.1.txt deleted file mode 100644 index b7594151e4..0000000000 --- a/third_party/git/Documentation/RelNotes/2.21.1.txt +++ /dev/null @@ -1,12 +0,0 @@ -Git v2.21.1 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6, v2.15.4, -v2.17.3 and in v2.20.2, addressing the security issues CVE-2019-1348, -CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, -CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and CVE-2019-19604; -see the release notes for those versions for details. - -Additionally, this version also includes a couple of fixes for the -Windows-specific quoting of command-line arguments when Git executes -a Unix shell on Windows. diff --git a/third_party/git/Documentation/RelNotes/2.21.2.txt b/third_party/git/Documentation/RelNotes/2.21.2.txt deleted file mode 100644 index a0fb83bb53..0000000000 --- a/third_party/git/Documentation/RelNotes/2.21.2.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.21.2 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.21.3.txt b/third_party/git/Documentation/RelNotes/2.21.3.txt deleted file mode 100644 index 2ca0aa5c62..0000000000 --- a/third_party/git/Documentation/RelNotes/2.21.3.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.21.3 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.22.2.txt b/third_party/git/Documentation/RelNotes/2.22.2.txt deleted file mode 100644 index 940a23f0d9..0000000000 --- a/third_party/git/Documentation/RelNotes/2.22.2.txt +++ /dev/null @@ -1,8 +0,0 @@ -Git v2.22.2 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6, v2.15.4, -v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues -CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, -CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and -CVE-2019-19604; see the release notes for those versions for details. diff --git a/third_party/git/Documentation/RelNotes/2.22.3.txt b/third_party/git/Documentation/RelNotes/2.22.3.txt deleted file mode 100644 index 57296f6d17..0000000000 --- a/third_party/git/Documentation/RelNotes/2.22.3.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.22.3 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.22.4.txt b/third_party/git/Documentation/RelNotes/2.22.4.txt deleted file mode 100644 index 8b5f3e3f37..0000000000 --- a/third_party/git/Documentation/RelNotes/2.22.4.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.22.4 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.23.1.txt b/third_party/git/Documentation/RelNotes/2.23.1.txt deleted file mode 100644 index 2083b492ce..0000000000 --- a/third_party/git/Documentation/RelNotes/2.23.1.txt +++ /dev/null @@ -1,8 +0,0 @@ -Git v2.23.1 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6, v2.15.4, -v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues -CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, -CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and -CVE-2019-19604; see the release notes for those versions for details. diff --git a/third_party/git/Documentation/RelNotes/2.23.2.txt b/third_party/git/Documentation/RelNotes/2.23.2.txt deleted file mode 100644 index b697cbe0e3..0000000000 --- a/third_party/git/Documentation/RelNotes/2.23.2.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.23.2 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.23.3.txt b/third_party/git/Documentation/RelNotes/2.23.3.txt deleted file mode 100644 index 2e35490137..0000000000 --- a/third_party/git/Documentation/RelNotes/2.23.3.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.23.3 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.24.0.txt b/third_party/git/Documentation/RelNotes/2.24.0.txt deleted file mode 100644 index bde154124c..0000000000 --- a/third_party/git/Documentation/RelNotes/2.24.0.txt +++ /dev/null @@ -1,398 +0,0 @@ -Git 2.24 Release Notes -====================== - -Updates since v2.23 -------------------- - -Backward compatibility note - - * "filter-branch" is showing its age and alternatives are available. - From this release, we started to discourage its use and hint - people about filter-repo. - -UI, Workflows & Features - - * We now have an active interim maintainer for the Git-Gui part of - the system. Praise and thank Pratyush Yadav for volunteering. - - * The command line parser learned "--end-of-options" notation; the - standard convention for scripters to have hardcoded set of options - first on the command line, and force the command to treat end-user - input as non-options, has been to use "--" as the delimiter, but - that would not work for commands that use "--" as a delimiter - between revs and pathspec. - - * A mechanism to affect the default setting for a (related) group of - configuration variables is introduced. - - * "git fetch" learned "--set-upstream" option to help those who first - clone from their private fork they intend to push to, add the true - upstream via "git remote add" and then "git fetch" from it. - - * Device-tree files learned their own userdiff patterns. - (merge 3c81760bc6 sb/userdiff-dts later to maint). - - * "git rebase --rebase-merges" learned to drive different merge - strategies and pass strategy specific options to them. - - * A new "pre-merge-commit" hook has been introduced. - - * Command line completion updates for "git -c var.name=val" have been - added. - - * The lazy clone machinery has been taught that there can be more - than one promisor remote and consult them in order when downloading - missing objects on demand. - - * The list-objects-filter API (used to create a sparse/lazy clone) - learned to take a combined filter specification. - - * The documentation and tests for "git format-patch" have been - cleaned up. - - * On Windows, the root level of UNC share is now allowed to be used - just like any other directory. - - * The command line completion support (in contrib/) learned about the - "--skip" option of "git revert" and "git cherry-pick". - - * "git rebase --keep-base <upstream>" tries to find the original base - of the topic being rebased and rebase on top of that same base, - which is useful when running the "git rebase -i" (and its limited - variant "git rebase -x"). - - The command also has learned to fast-forward in more cases where it - can instead of replaying to recreate identical commits. - - * A configuration variable tells "git fetch" to write the commit - graph after finishing. - - * "git add -i" has been taught to show the total number of hunks and - the hunks that has been processed so far when showing prompts. - - * "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching - submodules, but this did not apply to "git fetch --multiple" that - fetches from multiple remote repositories. It now does. - - * The installation instruction for zsh completion script (in - contrib/) has been a bit improved. - - -Performance, Internal Implementation, Development Support etc. - - * The code to write commit-graph over given commit object names has - been made a bit more robust. - - * The first line of verbose output from each test piece now carries - the test name and number to help scanning with eyeballs. - - * Further clean-up of the initialization code. - - * xmalloc() used to have a mechanism to ditch memory and address - space resources as the last resort upon seeing an allocation - failure from the underlying malloc(), which made the code complex - and thread-unsafe with dubious benefit, as major memory resource - users already do limit their uses with various other mechanisms. - It has been simplified away. - - * Unnecessary full-tree diff in "git log -L" machinery has been - optimized away. - - * The http transport lacked some optimization the native transports - learned to avoid unnecessary ref advertisement, which has been - corrected. - - * Preparation for SHA-256 upgrade continues in the test department. - (merge 0c37c41d13 bc/hash-independent-tests-part-5 later to maint). - - * The memory ownership model of the "git fast-import" got - straightened out. - - * Output from trace2 subsystem is formatted more prettily now. - - * The internal code originally invented for ".gitignore" processing - got reshuffled and renamed to make it less tied to "excluding" and - stress more that it is about "matching", as it has been reused for - things like sparse checkout specification that want to check if a - path is "included". - - * "git stash" learned to write refreshed index back to disk. - - * Coccinelle checks are done on more source files than before now. - - * The cache-tree code has been taught to be less aggressive in - attempting to see if a tree object it computed already exists in - the repository. - - * The code to parse and use the commit-graph file has been made more - robust against corrupted input. - - * The hg-to-git script (in contrib/) has been updated to work with - Python 3. - - * Update the way build artifacts in t/helper/ directory are ignored. - - * Preparation for SHA-256 upgrade continues. - - * "git log --graph" for an octopus merge is sometimes colored - incorrectly, which is demonstrated and documented but not yet - fixed. - - * The trace2 output, when sending them to files in a designated - directory, can populate the directory with too many files; a - mechanism is introduced to set the maximum number of files and - discard further logs when the maximum is reached. - - * We have adopted a Code-of-conduct document. - (merge 3f9ef874a7 jk/coc later to maint). - - -Fixes since v2.23 ------------------ - - * "git grep --recurse-submodules" that looks at the working tree - files looked at the contents in the index in submodules, instead of - files in the working tree. - (merge 6a289d45c0 mt/grep-submodules-working-tree later to maint). - - * Codepaths to walk tree objects have been audited for integer - overflows and hardened. - (merge 5aa02f9868 jk/tree-walk-overflow later to maint). - - * "git pack-refs" can lose refs that are created while running, which - is getting corrected. - (merge a613d4f817 sc/pack-refs-deletion-racefix later to maint). - - * "git checkout" and "git restore" to re-populate the index from a - tree-ish (typically HEAD) did not work correctly for a path that - was removed and then added again with the intent-to-add bit, when - the corresponding working tree file was empty. This has been - corrected. - - * Compilation fix. - (merge 70597e8386 rs/nedalloc-fixlets later to maint). - - * "git gui" learned to call the clean-up procedure before exiting. - (merge 0d88f3d2c5 py/git-gui-do-quit later to maint). - - * We promoted the "indent heuristics" that decides where to split - diff hunks from experimental to the default a few years ago, but - some stale documentation still marked it as experimental, which has - been corrected. - (merge 64e5e1fba1 sg/diff-indent-heuristic-non-experimental later to maint). - - * Fix a mismerge that happened in 2.22 timeframe. - (merge acb7da05ac en/checkout-mismerge-fix later to maint). - - * "git archive" recorded incorrect length in extended pax header in - some corner cases, which has been corrected. - (merge 71d41ff651 rs/pax-extended-header-length-fix later to maint). - - * On-demand object fetching in lazy clone incorrectly tried to fetch - commits from submodule projects, while still working in the - superproject, which has been corrected. - (merge a63694f523 jt/diff-lazy-fetch-submodule-fix later to maint). - - * Prepare get_short_oid() codepath to be thread-safe. - (merge 7cfcb16b0e rs/sort-oid-array-thread-safe later to maint). - - * "for-each-ref" and friends that show refs did not protect themselves - against ancient tags that did not record tagger names when asked to - show "%(taggername)", which have been corrected. - (merge 8b3f33ef11 mp/for-each-ref-missing-name-or-email later to maint). - - * The "git am" based backend of "git rebase" ignored the result of - updating ".gitattributes" done in one step when replaying - subsequent steps. - (merge 2c65d90f75 bc/reread-attributes-during-rebase later to maint). - - * Tell cURL library to use the same malloc() implementation, with the - xmalloc() wrapper, as the rest of the system, for consistency. - (merge 93b980e58f cb/curl-use-xmalloc later to maint). - - * Build fix to adjust .gitignore to unignore a path that we started to track. - (merge aac6ff7b5b js/visual-studio later to maint). - - * A few implementation fixes in the notes API. - (merge 60fe477a0b mh/notes-duplicate-entries later to maint). - - * Fix an earlier regression to "git push --all" which should have - been forbidden when the target remote repository is set to be a - mirror. - (merge 8e4c8af058 tg/push-all-in-mirror-forbidden later to maint). - - * Fix an earlier regression in the test suite, which mistakenly - stopped running HTTPD tests. - (merge 3960290675 sg/git-test-boolean later to maint). - - * "git rebase --autostash <upstream> <branch>", when <branch> is - different from the current branch, incorrectly moved the tip of the - current branch, which has been corrected. - (merge bf1e28e0ad bw/rebase-autostash-keep-current-branch later to maint). - - * Update support for Asciidoctor documentation toolchain. - (merge 83b0b8953e ma/asciidoctor-refmiscinfo later to maint). - - * Start using DocBook 5 (instead of DocBook 4.5) as Asciidoctor 2.0 - no longer works with the older one. - (merge f6461b82b9 bc/doc-use-docbook-5 later to maint). - - * The markup used in user-manual has been updated to work better with - asciidoctor. - (merge c4d2f6143a ma/user-manual-markup-update later to maint). - - * Make sure the grep machinery does not abort when seeing a payload - that is not UTF-8 even when JIT is not in use with PCRE1. - (merge ad7c543e3b cb/skip-utf8-check-with-pcre1 later to maint). - - * The name of the blob object that stores the filter specification - for sparse cloning/fetching was interpreted in a wrong place in the - code, causing Git to abort. - - * "git log --decorate-refs-exclude=<pattern>" was incorrectly - overruled when the "--simplify-by-decoration" option is used, which - has been corrected. - (merge 0cc7380d88 rs/simplify-by-deco-with-deco-refs-exclude later to maint). - - * The "upload-pack" (the counterpart of "git fetch") needs to disable - commit-graph when responding to a shallow clone/fetch request, but - the way this was done made Git panic, which has been corrected. - - * The object traversal machinery has been optimized not to load tree - objects when we are only interested in commit history. - (merge 72ed80c784 jk/list-objects-optim-wo-trees later to maint). - - * The object name parser for "Nth parent" syntax has been made more - robust against integer overflows. - (merge 59fa5f5a25 rs/nth-parent-parse later to maint). - - * The code used in following tags in "git fetch" has been optimized. - (merge b7e2d8bca5 ms/fetch-follow-tag-optim later to maint). - - * Regression fix for progress output. - (merge 2bb74b53a4 sg/progress-fix later to maint). - - * A bug in merge-recursive code that triggers when a branch with a - symbolic link is merged with a branch that replaces it with a - directory has been fixed. - (merge 83e3ad3b12 jt/merge-recursive-symlink-is-not-a-dir-in-way later to maint). - - * The rename detection logic sorts a list of rename source candidates - by similarity to pick the best candidate, which means that a tie - between sources with the same similarity is broken by the original - location in the original candidate list (which is sorted by path). - Force the sorting by similarity done with a stable sort, which is - not promised by system supplied qsort(3), to ensure consistent - results across platforms. - (merge 2049b8dc65 js/diff-rename-force-stable-sort later to maint). - - * The code to skip "UTF" and "UTF-" prefix, when computing an advice - message, did not work correctly when the prefix was "UTF", which - has been fixed. - (merge b181676ce9 rs/convert-fix-utf-without-dash later to maint). - - * The author names taken from SVN repositories may have extra leading - or trailing whitespaces, which are now munged away. - (merge 4ddd4bddb1 tk/git-svn-trim-author-name later to maint). - - * "git rebase -i" showed a wrong HEAD while "reword" open the editor. - (merge b0a3186140 pw/rebase-i-show-HEAD-to-reword later to maint). - - * A few simplification and bugfixes to PCRE interface. - (merge c581e4a749 ab/pcre-jit-fixes later to maint). - - * PCRE fixes. - (merge ff61681b46 cb/pcre1-cleanup later to maint). - - * "git range-diff" segfaulted when diff.noprefix configuration was - used, as it blindly expected the patch it internally generates to - have the standard a/ and b/ prefixes. The command now forces the - internal patch to be built without any prefix, not to be affected - by any end-user configuration. - (merge 937b76ed49 js/range-diff-noprefix later to maint). - - * "git stash apply" in a subdirectory of a secondary worktree failed - to access the worktree correctly, which has been corrected. - (merge dfd557c978 js/stash-apply-in-secondary-worktree later to maint). - - * The merge-recursive machinery is one of the most complex parts of - the system that accumulated cruft over time. This large series - cleans up the implementation quite a bit. - (merge b657047719 en/merge-recursive-cleanup later to maint). - - * Pretty-printed command line formatter (used in e.g. reporting the - command being run by the tracing API) had a bug that lost an - argument that is an empty string, which has been corrected. - (merge ce2d7ed2fd gs/sq-quote-buf-pretty later to maint). - - * "git range-diff" failed to handle mode-only change, which has been - corrected. - (merge 2b6a9b13ca tg/range-diff-output-update later to maint). - - * Dev support update. - (merge 4f3c1dc5d6 dl/allow-running-cocci-verbosely later to maint). - - * "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>" - not "mkdir -p <outdir>", which was corrected. - - * "git stash save" lost local changes to submodules, which has been - corrected. - (merge 556895d0c8 jj/stash-reset-only-toplevel later to maint). - - * The atomic push over smart HTTP transport did not work, which has - been corrected. - (merge 6f1194246a bc/smart-http-atomic-push later to maint). - - * Other code cleanup, docfix, build fix, etc. - (merge d1387d3895 en/fast-import-merge-doc later to maint). - (merge 1c24a54ea4 bm/repository-layout-typofix later to maint). - (merge 415b770b88 ds/midx-expire-repack later to maint). - (merge 19800bdc3f nd/diff-parseopt later to maint). - (merge 58166c2e9d tg/t0021-racefix later to maint). - (merge 7027f508c7 dl/compat-cleanup later to maint). - (merge e770fbfeff jc/test-cleanup later to maint). - (merge 1fd881d404 rs/trace2-dst-warning later to maint). - (merge 7e92756751 mh/http-urlmatch-cleanup later to maint). - (merge 9784f97321 mh/release-commit-memory-fix later to maint). - (merge 60d198d022 tb/banned-vsprintf-namefix later to maint). - (merge 80e3658647 rs/help-unknown-ref-does-not-return later to maint). - (merge 0a8bc7068f dt/remote-helper-doc-re-lock-option later to maint). - (merge 27fd1e4ea7 en/merge-options-ff-and-friends later to maint). - (merge 502c386ff9 sg/clean-nested-repo-with-ignored later to maint). - (merge 26e3d1cbea am/mailmap-andrey-mazo later to maint). - (merge 47b27c96fa ss/get-time-cleanup later to maint). - (merge dd2e50a84e jk/commit-graph-cleanup later to maint). - (merge 4fd39c76e6 cs/pretty-formats-doc-typofix later to maint). - (merge 40e747e89d dl/submodule-set-branch later to maint). - (merge 689a146c91 rs/commit-graph-use-list-count later to maint). - (merge 0eb7c37a8a js/doc-patch-text later to maint). - (merge 4b3aa170d1 rs/nth-switch-code-simplification later to maint). - (merge 0d4304c124 ah/doc-submodule-ignore-submodules later to maint). - (merge af78249463 cc/svn-fe-py-shebang later to maint). - (merge 7bd97d6dff rs/alias-use-copy-array later to maint). - (merge c46ebc2496 sg/travis-help-debug later to maint). - (merge 24c681794f ps/my-first-contribution-alphasort later to maint). - (merge 75b2c15435 cb/do-not-use-test-cmp-with-a later to maint). - (merge cda0d497e3 bw/submodule-helper-usage-fix later to maint). - (merge fe0ed5d5e9 am/visual-studio-config-fix later to maint). - (merge 2e09c01232 sg/name-rev-cutoff-underflow-fix later to maint). - (merge ddb3c856f3 as/shallow-slab-use-fix later to maint). - (merge 71f4960b91 js/mingw-spawn-with-spaces-in-path later to maint). - (merge 53d687bf5f ah/cleanups later to maint). - (merge f537485fa5 rs/test-remove-useless-debugging-cat later to maint). - (merge 11a3d3aadd dl/rev-list-doc-cleanup later to maint). - (merge d928a8388a am/t0028-utf16-tests later to maint). - (merge b05b40930e dl/t0000-skip-test-test later to maint). - (merge 03d3b1297c js/xdiffi-comment-updates later to maint). - (merge 57d8f4b4c7 js/doc-stash-save later to maint). - (merge 8c1cfd58e3 ta/t1308-typofix later to maint). - (merge fa364ad790 bb/utf8-wcwidth-cleanup later to maint). - (merge 68b69211b2 bb/compat-util-comment-fix later to maint). - (merge 5cc6a4be11 rs/http-push-simplify later to maint). - (merge a81e42d235 rs/column-use-utf8-strnwidth later to maint). - (merge 062a309d36 rs/remote-curl-use-argv-array later to maint). - (merge 3b3c79f6c9 nr/diff-highlight-indent-fix later to maint). - (merge 3444ec2eb2 wb/fsmonitor-bitmap-fix later to maint). - (merge 10da030ab7 cb/pcre2-chartables-leakfix later to maint). - (merge 60e6569a12 js/mingw-needs-hiding-fix later to maint). - (merge 52bd3e4657 rl/gitweb-blame-prev-fix later to maint). diff --git a/third_party/git/Documentation/RelNotes/2.24.1.txt b/third_party/git/Documentation/RelNotes/2.24.1.txt deleted file mode 100644 index 18104850fe..0000000000 --- a/third_party/git/Documentation/RelNotes/2.24.1.txt +++ /dev/null @@ -1,8 +0,0 @@ -Git v2.24.1 Release Notes -========================= - -This release merges up the fixes that appear in v2.14.6, v2.15.4, -v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues -CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, -CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and -CVE-2019-19604; see the release notes for those versions for details. diff --git a/third_party/git/Documentation/RelNotes/2.24.2.txt b/third_party/git/Documentation/RelNotes/2.24.2.txt deleted file mode 100644 index 0049f65503..0000000000 --- a/third_party/git/Documentation/RelNotes/2.24.2.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.24.2 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.24.3.txt b/third_party/git/Documentation/RelNotes/2.24.3.txt deleted file mode 100644 index 5302e0f73b..0000000000 --- a/third_party/git/Documentation/RelNotes/2.24.3.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.24.3 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.25.0.txt b/third_party/git/Documentation/RelNotes/2.25.0.txt deleted file mode 100644 index 91ceb34927..0000000000 --- a/third_party/git/Documentation/RelNotes/2.25.0.txt +++ /dev/null @@ -1,370 +0,0 @@ -Git 2.25 Release Notes -====================== - -Updates since v2.24 -------------------- - -Backward compatibility notes - - -UI, Workflows & Features - - * A tutorial on object enumeration has been added. - - * The branch description ("git branch --edit-description") has been - used to fill the body of the cover letters by the format-patch - command; this has been enhanced so that the subject can also be - filled. - - * "git rebase --preserve-merges" has been marked as deprecated; this - release stops advertising it in the "git rebase -h" output. - - * The code to generate multi-pack index learned to show (or not to - show) progress indicators. - - * "git apply --3way" learned to honor merge.conflictStyle - configuration variable, like merges would. - - * The custom format for "git log --format=<format>" learned the l/L - placeholder that is similar to e/E that fills in the e-mail - address, but only the local part on the left side of '@'. - - * Documentation pages for "git shortlog" now list commit limiting - options explicitly. - - * The patterns to detect function boundary for Elixir language has - been added. - - * The completion script (in contrib/) learned that the "--onto" - option of "git rebase" can take its argument as the value of the - option. - - * The userdiff machinery has been taught that "async def" is another - way to begin a "function" in Python. - - * "git range-diff" learned to take the "--notes=<ref>" and the - "--no-notes" options to control the commit notes included in the - log message that gets compared. - - * "git rev-parse --show-toplevel" run outside of any working tree did - not error out, which has been corrected. - - * A few commands learned to take the pathspec from the standard input - or a named file, instead of taking it as the command line - arguments, with the "--pathspec-from-file" option. - - * "git submodule" learned a subcommand "set-url". - - * "git log" family learned "--pretty=reference" that gives the name - of a commit in the format that is often used to refer to it in log - messages. - - * The interaction between "git clone --recurse-submodules" and - alternate object store was ill-designed. The documentation and - code have been taught to make more clear recommendations when the - users see failures. - - * Management of sparsely checked-out working tree has gained a - dedicated "sparse-checkout" command. - - * Miscellaneous small UX improvements on "git-p4". - - * "git sparse-checkout list" subcommand learned to give its output in - a more concise form when the "cone" mode is in effect. - - -Performance, Internal Implementation, Development Support etc. - - * Debugging support for lazy cloning has been a bit improved. - - * Move the definition of a set of bitmask constants from 0ctal - literal to (1U<<count) notation. - - * Test updates to prepare for SHA-2 transition continues. - - * Crufty code and logic accumulated over time around the object - parsing and low-level object access used in "git fsck" have been - cleaned up. - - * The implementation of "git log --graph" got refactored and then its - output got simplified. - - * Follow recent push to move API docs from Documentation/ to header - files and update config.h - - * "git bundle" has been taught to use the parse options API. "git - bundle verify" learned "--quiet" and "git bundle create" learned - options to control the progress output. - - * Handling of commit objects that use non UTF-8 encoding during - "rebase -i" has been improved. - - * The beginning of rewriting "git add -i" in C. - - * A label used in the todo list that are generated by "git rebase - --rebase-merges" is used as a part of a refname; the logic to come - up with the label has been tightened to avoid names that cannot be - used as such. - - * The logic to avoid duplicate label names generated by "git rebase - --rebase-merges" forgot that the machinery itself uses "onto" as a - label name, which must be avoided by auto-generated labels, which - has been corrected. - - * We have had compatibility fallback macro definitions for "PRIuMAX", - "PRIu32", etc. but did not for "PRIdMAX", while the code used the - last one apparently without any hiccup reported recently. The - fallback macro definitions for these <inttypes.h> macros that must - appear in C99 systems have been removed. - - * Recently we have declared that GIT_TEST_* variables take the - usual boolean values (it used to be that some used "non-empty - means true" and taking GIT_TEST_VAR=YesPlease as true); make - sure we notice and fail when non-bool strings are given to - these variables. - - * Users of oneway_merge() (like "reset --hard") learned to take - advantage of fsmonitor to avoid unnecessary lstat(2) calls. - - * Performance tweak on "git push" into a repository with many refs - that point at objects we have never heard of. - - * PerfTest fix to avoid stale result mixed up with the latest round - of test results. - - * Hide lower-level verify_signed-buffer() API as a pure helper to - implement the public check_signature() function, in order to - encourage new callers to use the correct and more strict - validation. - - * Unnecessary reading of state variables back from the disk during - sequencer operation has been reduced. - - * The code has been made to avoid gmtime() and localtime() and prefer - their reentrant counterparts. - - * In a repository with many packfiles, the cost of the procedure that - avoids registering the same packfile twice was unnecessarily high - by using an inefficient search algorithm, which has been corrected. - - * Redo "git name-rev" to avoid recursive calls. - - * FreeBSD CI support via Cirrus-CI has been added. - - -Fixes since v2.24 ------------------ - - * "rebase -i" ceased to run post-commit hook by mistake in an earlier - update, which has been corrected. - - * "git notes copy $original" ought to copy the notes attached to the - original object to HEAD, but a mistaken tightening to command line - parameter validation made earlier disabled that feature by mistake. - - * When all files from some subdirectory were renamed to the root - directory, the directory rename heuristics would fail to detect that - as a rename/merge of the subdirectory to the root directory, which has - been corrected. - - * Code clean-up and a bugfix in the logic used to tell worktree local - and repository global refs apart. - (merge f45f88b2e4 sg/dir-trie-fixes later to maint). - - * "git stash save" in a working tree that is sparsely checked out - mistakenly removed paths that are outside the area of interest. - (merge 4a58c3d7f7 js/update-index-ignore-removal-for-skip-worktree later to maint). - - * "git rev-parse --git-path HEAD.lock" did not give the right path - when run in a secondary worktree. - (merge 76a53d640f js/git-path-head-dot-lock-fix later to maint). - - * "git merge --no-commit" needs "--no-ff" if you do not want to move - HEAD, which has been corrected in the manual page for "git bisect". - (merge 8dd327b246 ma/bisect-doc-sample-update later to maint). - - * "git worktree add" internally calls "reset --hard" that should not - descend into submodules, even when submodule.recurse configuration - is set, but it was affected. This has been corrected. - (merge 4782cf2ab6 pb/no-recursive-reset-hard-in-worktree-add later to maint). - - * Messages from die() etc. can be mixed up from multiple processes - without even line buffering on Windows, which has been worked - around. - (merge 116d1fa6c6 js/vreportf-wo-buffering later to maint). - - * HTTP transport had possible allocator/deallocator mismatch, which - has been corrected. - - * The watchman integration for fsmonitor was racy, which has been - corrected to be more conservative. - (merge dd0b61f577 kw/fsmonitor-watchman-fix later to maint). - - * Fetching from multiple remotes into the same repository in parallel - had a bad interaction with the recent change to (optionally) update - the commit-graph after a fetch job finishes, as these parallel - fetches compete with each other. Which has been corrected. - - * Recent update to "git stash pop" made the command empty the index - when run with the "--quiet" option, which has been corrected. - - * "git fetch" codepath had a big "do not lazily fetch missing objects - when I ask if something exists" switch. This has been corrected by - marking the "does this thing exist?" calls with "if not please do not - lazily fetch it" flag. - - * Test update to avoid wasted cycles. - (merge e0316695ec sg/skip-skipped-prereq later to maint). - - * Error handling after "git push" finishes sending the packdata and - waits for the response to the remote side has been improved. - (merge ad7a403268 jk/send-pack-remote-failure later to maint). - - * Some codepaths in "gitweb" that forgot to escape URLs generated - based on end-user input have been corrected. - (merge a376e37b2c jk/gitweb-anti-xss later to maint). - - * CI jobs for macOS has been made less chatty when updating perforce - package used during testing. - (merge 0dbc4a0edf jc/azure-ci-osx-fix-fix later to maint). - - * "git unpack-objects" used to show progress based only on the number - of received and unpacked objects, which stalled when it has to - handle an unusually large object. It now shows the throughput as - well. - (merge bae60ba7e9 sg/unpack-progress-throughput later to maint). - - * The sequencer machinery compared the HEAD and the state it is - attempting to commit to decide if the result would be a no-op - commit, even when amending a commit, which was incorrect, and - has been corrected. - - * The code to parse GPG output used to assume incorrectly that the - finterprint for the primary key would always be present for a valid - signature, which has been corrected. - (merge 67a6ea6300 hi/gpg-optional-pkfp-fix later to maint). - - * "git submodule status" and "git submodule status --cached" show - different things, but the documentation did not cover them - correctly, which has been corrected. - (merge 8d483c8408 mg/doc-submodule-status-cached later to maint). - - * "git reset --patch $object" without any pathspec should allow a - tree object to be given, but incorrectly required a committish, - which has been corrected. - - * "git submodule status" that is run from a subdirectory of the - superproject did not work well, which has been corrected. - (merge 1f3aea22c7 mg/submodule-status-from-a-subdirectory later to maint). - - * The revision walking machinery uses resources like per-object flag - bits that need to be reset before a new iteration of walking - begins, but the resources related to topological walk were not - cleared correctly, which has been corrected. - (merge 0aa0c2b2ec mh/clear-topo-walk-upon-reset later to maint). - - * TravisCI update. - (merge 176441bfb5 sg/osx-force-gcc-9 later to maint). - - * While running "revert" or "cherry-pick --edit" for multiple - commits, a recent regression incorrectly detected "nothing to - commit, working tree clean", instead of replaying the commits, - which has been corrected. - (merge befd4f6a81 sg/assume-no-todo-update-in-cherry-pick later to maint). - - * Work around a issue where a FD that is left open when spawning a - child process and is kept open in the child can interfere with the - operation in the parent process on Windows. - - * One kind of progress messages were always given during commit-graph - generation, instead of following the "if it takes more than two - seconds, show progress" pattern, which has been corrected. - - * "git rebase" did not work well when format.useAutoBase - configuration variable is set, which has been corrected. - - * The "diff" machinery learned not to lose added/removed blank lines - in the context when --ignore-blank-lines and --function-context are - used at the same time. - (merge 0bb313a552 rs/xdiff-ignore-ws-w-func-context later to maint). - - * The test on "fast-import" used to get stuck when "fast-import" died - in the middle. - (merge 0d9b0d7885 sg/t9300-robustify later to maint). - - * "git format-patch" can take a set of configured format.notes values - to specify which notes refs to use in the log message part of the - output. The behaviour of this was not consistent with multiple - --notes command line options, which has been corrected. - (merge e0f9095aaa dl/format-patch-notes-config-fixup later to maint). - - * "git p4" used to ignore lfs.storage configuration variable, which - has been corrected. - (merge ea94b16fb8 rb/p4-lfs later to maint). - - * Assorted fixes to the directory traversal API. - (merge 6836d2fe06 en/fill-directory-fixes later to maint). - - * Forbid pathnames that the platform's filesystem cannot represent on - MinGW. - (merge 4dc42c6c18 js/mingw-reserved-filenames later to maint). - - * "git rebase --signoff" stopped working when the command was written - in C, which has been corrected. - (merge 4fe7e43c53 en/rebase-signoff-fix later to maint). - - * An earlier update to Git for Windows declared that a tree object is - invalid if it has a path component with backslash in it, which was - overly strict, which has been corrected. The only protection the - Windows users need is to prevent such path (or any path that their - filesystem cannot check out) from entering the index. - (merge 224c7d70fa js/mingw-loosen-overstrict-tree-entry-checks later to maint). - - * The code to write split commit-graph file(s) upon fetching computed - bogus value for the parameter used in splitting the resulting - files, which has been corrected. - (merge 63020f175f ds/commit-graph-set-size-mult later to maint). - - * Other code cleanup, docfix, build fix, etc. - (merge 80736d7c5e jc/am-show-current-patch-docfix later to maint). - (merge 8b656572ca sg/commit-graph-usage-fix later to maint). - (merge 6c02042139 mr/clone-dir-exists-to-path-exists later to maint). - (merge 44ae131e38 sg/blame-indent-heuristics-is-now-the-default later to maint). - (merge 0115e5d929 dl/doc-diff-no-index-implies-exit-code later to maint). - (merge 270de6acbe en/t6024-style later to maint). - (merge 14c4776d75 ns/test-desc-typofix later to maint). - (merge 68d40f30c4 dj/typofix-merge-strat later to maint). - (merge f66e0401ab jk/optim-in-pack-idx-conversion later to maint). - (merge 169bed7421 rs/parse-options-dup-null-fix later to maint). - (merge 51bd6be32d rs/use-copy-array-in-mingw-shell-command-preparation later to maint). - (merge b018719927 ma/t7004 later to maint). - (merge 932757b0cc ar/install-doc-update-cmds-needing-the-shell later to maint). - (merge 46efd28be1 ep/guard-kset-tar-headers later to maint). - (merge 9e5afdf997 ec/fetch-mark-common-refs-trace2 later to maint). - (merge f0e58b3fe8 pb/submodule-update-fetches later to maint). - (merge 2a02262078 dl/t5520-cleanup later to maint). - (merge a4fb016ba1 js/pkt-line-h-typofix later to maint). - (merge 54a7a64613 rs/simplify-prepare-cmd later to maint). - (merge 3eae30e464 jk/lore-is-the-archive later to maint). - (merge 14b7664df8 dl/lore-is-the-archive later to maint). - (merge 0e40a73a4c po/bundle-doc-clonable later to maint). - (merge e714b898c6 as/t7812-missing-redirects-fix later to maint). - (merge 528d9e6d01 jk/perf-wo-git-dot-pm later to maint). - (merge fc42f20e24 sg/test-squelch-noise-in-commit-bulk later to maint). - (merge c64368e3a2 bc/t9001-zsh-in-posix-emulation-mode later to maint). - (merge 11de8dd7ef dr/branch-usage-casefix later to maint). - (merge e05e8cf074 rs/archive-zip-code-cleanup later to maint). - (merge 147ee35558 rs/commit-export-env-simplify later to maint). - (merge 4507ecc771 rs/patch-id-use-oid-to-hex later to maint). - (merge 51a0a4ed95 mr/bisect-use-after-free later to maint). - (merge cc2bd5c45d pb/submodule-doc-xref later to maint). - (merge df5be01669 ja/doc-markup-cleanup later to maint). - (merge 7c5cea7242 mr/bisect-save-pointer-to-const-string later to maint). - (merge 20a67e8ce9 js/use-test-tool-on-path later to maint). - (merge 4e61b2214d ew/packfile-syscall-optim later to maint). - (merge ace0f86c7f pb/clarify-line-log-doc later to maint). - (merge 763a59e71c en/merge-recursive-oid-eq-simplify later to maint). - (merge 4e2c4c0d4f do/gitweb-typofix-in-comments later to maint). - (merge 421c0ffb02 jb/doc-multi-pack-idx-fix later to maint). - (merge f8740c586b pm/am-in-body-header-doc-update later to maint). - (merge 5814d44d9b tm/doc-submodule-absorb-fix later to maint). diff --git a/third_party/git/Documentation/RelNotes/2.25.1.txt b/third_party/git/Documentation/RelNotes/2.25.1.txt deleted file mode 100644 index cd869b02bb..0000000000 --- a/third_party/git/Documentation/RelNotes/2.25.1.txt +++ /dev/null @@ -1,55 +0,0 @@ -Git 2.25.1 Release Notes -======================== - -Fixes since v2.25 ------------------ - - * "git commit" gives output similar to "git status" when there is - nothing to commit, but without honoring the advise.statusHints - configuration variable, which has been corrected. - - * has_object_file() said "no" given an object registered to the - system via pretend_object_file(), making it inconsistent with - read_object_file(), causing lazy fetch to attempt fetching an - empty tree from promisor remotes. - - * The code that tries to skip over the entries for the paths in a - single directory using the cache-tree was not careful enough - against corrupt index file. - - * Complete an update to tutorial that encourages "git switch" over - "git checkout" that was done only half-way. - - * Reduce unnecessary round-trip when running "ls-remote" over the - stateless RPC mechanism. - - * "git restore --staged" did not correctly update the cache-tree - structure, resulting in bogus trees to be written afterwards, which - has been corrected. - - * The code recently added to move to the entry beyond the ones in the - same directory in the index in the sparse-cone mode did not count - the number of entries to skip over incorrectly, which has been - corrected. - - * Work around test breakages caused by custom regex engine used in - libasan, when address sanitizer is used with more recent versions - of gcc and clang. - - * "git fetch --refmap=" option has got a better documentation. - - * Corner case bugs in "git clean" that stems from a (necessarily for - performance reasons) awkward calling convention in the directory - enumeration API has been corrected. - - * "git grep --no-index" should not get affected by the contents of - the .gitmodules file but when "--recurse-submodules" is given or - the "submodule.recurse" variable is set, it did. Now these - settings are ignored in the "--no-index" mode. - - * Technical details of the bundle format has been documented. - - * Unhelpful warning messages during documentation build have been - squelched. - -Also contains various documentation updates, code clean-ups and minor fixups. diff --git a/third_party/git/Documentation/RelNotes/2.25.2.txt b/third_party/git/Documentation/RelNotes/2.25.2.txt deleted file mode 100644 index 303c53a17f..0000000000 --- a/third_party/git/Documentation/RelNotes/2.25.2.txt +++ /dev/null @@ -1,60 +0,0 @@ -Git 2.25.2 Release Notes -======================== - -Fixes since v2.25.1 -------------------- - - * Minor bugfixes to "git add -i" that has recently been rewritten in C. - - * An earlier update to show the location of working tree in the error - message did not consider the possibility that a git command may be - run in a bare repository, which has been corrected. - - * The "--recurse-submodules" option of various subcommands did not - work well when run in an alternate worktree, which has been - corrected. - - * Running "git rm" on a submodule failed unnecessarily when - .gitmodules is only cache-dirty, which has been corrected. - - * "git rebase -i" identifies existing commits in its todo file with - their abbreviated object name, which could become ambigous as it - goes to create new commits, and has a mechanism to avoid ambiguity - in the main part of its execution. A few other cases however were - not covered by the protection against ambiguity, which has been - corrected. - - * The index-pack code now diagnoses a bad input packstream that - records the same object twice when it is used as delta base; the - code used to declare a software bug when encountering such an - input, but it is an input error. - - * The code to automatically shrink the fan-out in the notes tree had - an off-by-one bug, which has been killed. - - * "git check-ignore" did not work when the given path is explicitly - marked as not ignored with a negative entry in the .gitignore file. - - * The merge-recursive machinery failed to refresh the cache entry for - a merge result in a couple of places, resulting in an unnecessary - merge failure, which has been fixed. - - * Fix for a bug revealed by a recent change to make the protocol v2 - the default. - - * "git merge signed-tag" while lacking the public key started to say - "No signature", which was utterly wrong. This regression has been - reverted. - - * MinGW's poll() emulation has been improved. - - * "git show" and others gave an object name in raw format in its - error output, which has been corrected to give it in hex. - - * Both "git ls-remote -h" and "git grep -h" give short usage help, - like any other Git subcommand, but it is not unreasonable to expect - that the former would behave the same as "git ls-remote --head" - (there is no other sensible behaviour for the latter). The - documentation has been updated in an attempt to clarify this. - -Also contains various documentation updates, code clean-ups and minor fixups. diff --git a/third_party/git/Documentation/RelNotes/2.25.3.txt b/third_party/git/Documentation/RelNotes/2.25.3.txt deleted file mode 100644 index 15f7f21f10..0000000000 --- a/third_party/git/Documentation/RelNotes/2.25.3.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.25.3 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.25.4.txt b/third_party/git/Documentation/RelNotes/2.25.4.txt deleted file mode 100644 index 0dbb5daeec..0000000000 --- a/third_party/git/Documentation/RelNotes/2.25.4.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.25.4 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.26.0.txt b/third_party/git/Documentation/RelNotes/2.26.0.txt deleted file mode 100644 index 3a7a734c26..0000000000 --- a/third_party/git/Documentation/RelNotes/2.26.0.txt +++ /dev/null @@ -1,341 +0,0 @@ -Git 2.26 Release Notes -====================== - -Updates since v2.25 -------------------- - -Backward compatibility notes - - * "git rebase" uses a different backend that is based on the 'merge' - machinery by default. There are a few known differences in the - behaviour from the traditional machinery based on patch+apply. - - If your workflow is negatively affected by this change, please - report it to git@vger.kernel.org so that we can take a look into - it. After doing so, you can set the 'rebase.backend' configuration - variable to 'apply', in order to use the old default behaviour in - the meantime. - - -UI, Workflows & Features - - * Sample credential helper for using .netrc has been updated to work - out of the box. - - * gpg.minTrustLevel configuration variable has been introduced to - tell various signature verification codepaths the required minimum - trust level. - - * The command line completion (in contrib/) learned to complete - subcommands and arguments to "git worktree". - - * Disambiguation logic to tell revisions and pathspec apart has been - tweaked so that backslash-escaped glob special characters do not - count in the "wildcards are pathspec" rule. - - * One effect of specifying where the GIT_DIR is (either with the - environment variable, or with the "git --git-dir=<where> cmd" - option) is to disable the repository discovery. This has been - placed a bit more stress in the documentation, as new users often - get confused. - - * Two help messages given when "git add" notices the user gave it - nothing to add have been updated to use advise() API. - - * A new version of fsmonitor-watchman hook has been introduced, to - avoid races. - - * "git config" learned to show in which "scope", in addition to in - which file, each config setting comes from. - - * The basic 7 colors learned the brighter counterparts - (e.g. "brightred"). - - * "git sparse-checkout" learned a new "add" subcommand. - - * A configuration element used for credential subsystem can now use - wildcard pattern to specify for which set of URLs the entry - applies. - - * "git clone --recurse-submodules --single-branch" now uses the same - single-branch option when cloning the submodules. - - * "git rm" and "git stash" learns the new "--pathspec-from-file" - option. - - * "git am --show-current-patch" is a way to show the piece of e-mail - for the stopped step, which is not suitable to directly feed "git - apply" (it is designed to be a good "git am" input). It learned a - new option to show only the patch part. - - * Handling of conflicting renames in merge-recursive have further - been made consistent with how existing codepaths try to mimic what - is done to add/add conflicts. - - -Performance, Internal Implementation, Development Support etc. - - * Tell .editorconfig that in this project, *.txt files are indented - with tabs. - - * The test-lint machinery knew to check "VAR=VAL shell_function" - construct, but did not check "VAR= shell_function", which has been - corrected. - - * Replace "git config --bool" calls with "git config --type=bool" in - sample templates. - - * The effort to move "git-add--interactive" to C continues. - - * Improve error message generation for "git submodule add". - - * Preparation of test scripts for the day when the object names will - use SHA-256 continues. - - * Warn programmers about pretend_object_file() that allows the code - to tentatively use in-core objects. - - * The way "git pack-objects" reuses objects stored in existing pack - to generate its result has been improved. - - * The transport protocol version 2 becomes the default one. - - * Traditionally, we avoided threaded grep while searching in objects - (as opposed to files in the working tree) as accesses to the object - layer is not thread-safe. This limitation is getting lifted. - - * "git rebase -i" (and friends) used to unnecessarily check out the - tip of the branch to be rebased, which has been corrected. - - * A low-level API function get_oid(), that accepts various ways to - name an object, used to issue end-user facing error messages - without l10n, which has been updated to be translatable. - - * Unneeded connectivity check is now disabled in a partial clone when - fetching into it. - - * Some rough edges in the sparse-checkout feature, especially around - the cone mode, have been cleaned up. - - * The diff-* plumbing family of subcommands now pay attention to the - diff.wsErrorHighlight configuration, which has been ignored before; - this allows "git add -p" to also show the whitespace problems to - the end user. - - * Some codepaths were given a repository instance as a parameter to - work in the repository, but passed the_repository instance to its - callees, which has been cleaned up (somewhat). - - * Memory footprint and performance of "git name-rev" has been - improved. - - * The object reachability bitmap machinery and the partial cloning - machinery were not prepared to work well together, because some - object-filtering criteria that partial clones use inherently rely - on object traversal, but the bitmap machinery is an optimization - to bypass that object traversal. There however are some cases - where they can work together, and they were taught about them. - - * "git rebase" has learned to use the merge backend (i.e. the - machinery that drives "rebase -i") by default, while allowing - "--apply" option to use the "apply" backend (e.g. the moral - equivalent of "format-patch piped to am"). The rebase.backend - configuration variable can be set to customize. - - * Underlying machinery of "git bisect--helper" is being refactored - into pieces that are more easily reused. - - -Fixes since v2.25 ------------------ - - * "git commit" gives output similar to "git status" when there is - nothing to commit, but without honoring the advise.statusHints - configuration variable, which has been corrected. - - * has_object_file() said "no" given an object registered to the - system via pretend_object_file(), making it inconsistent with - read_object_file(), causing lazy fetch to attempt fetching an - empty tree from promisor remotes. - - * Complete an update to tutorial that encourages "git switch" over - "git checkout" that was done only half-way. - - * C pedantry ;-) fix. - - * The code that tries to skip over the entries for the paths in a - single directory using the cache-tree was not careful enough - against corrupt index file. - - * Reduce unnecessary round-trip when running "ls-remote" over the - stateless RPC mechanism. - - * "git restore --staged" did not correctly update the cache-tree - structure, resulting in bogus trees to be written afterwards, which - has been corrected. - - * The code recently added to move to the entry beyond the ones in the - same directory in the index in the sparse-cone mode did not count - the number of entries to skip over incorrectly, which has been - corrected. - - * Rendering by "git log --graph" of ancestry lines leading to a merge - commit were made suboptimal to waste vertical space a bit with a - recent update, which has been corrected. - - * Work around test breakages caused by custom regex engine used in - libasan, when address sanitizer is used with more recent versions - of gcc and clang. - - * Minor bugfixes to "git add -i" that has recently been rewritten in C. - - * "git fetch --refmap=" option has got a better documentation. - - * "git checkout X" did not correctly fail when X is not a local - branch but could name more than one remote-tracking branches - (i.e. to be dwimmed as the starting point to create a corresponding - local branch), which has been corrected. - (merge fa74180d08 am/checkout-file-and-ref-ref-ambiguity later to maint). - - * Corner case bugs in "git clean" that stems from a (necessarily for - performance reasons) awkward calling convention in the directory - enumeration API has been corrected. - - * A fetch that is told to recursively fetch updates in submodules - inevitably produces reams of output, and it becomes hard to spot - error messages. The command has been taught to enumerate - submodules that had errors at the end of the operation. - (merge 0222540827 es/fetch-show-failed-submodules-atend later to maint). - - * The "--recurse-submodules" option of various subcommands did not - work well when run in an alternate worktree, which has been - corrected. - - * Futureproofing a test not to depend on the current implementation - detail. - - * Running "git rm" on a submodule failed unnecessarily when - .gitmodules is only cache-dirty, which has been corrected. - - * C pedantry ;-) fix. - - * "git grep --no-index" should not get affected by the contents of - the .gitmodules file but when "--recurse-submodules" is given or - the "submodule.recurse" variable is set, it did. Now these - settings are ignored in the "--no-index" mode. - - * Technical details of the bundle format has been documented. - - * Unhelpful warning messages during documentation build have been squelched. - - * "git rebase -i" identifies existing commits in its todo file with - their abbreviated object name, which could become ambiguous as it - goes to create new commits, and has a mechanism to avoid ambiguity - in the main part of its execution. A few other cases however were - not covered by the protection against ambiguity, which has been - corrected. - - * Allow the rebase.missingCommitsCheck configuration to kick in when - "rebase --edit-todo" and "rebase --continue" restarts the procedure. - (merge 5a5445d878 ag/edit-todo-drop-check later to maint). - - * The way "git submodule status" reports an initialized but not yet - populated submodule has not been reimplemented correctly when a - part of the "git submodule" command was rewritten in C, which has - been corrected. - (merge f38c92452d pk/status-of-uncloned-submodule later to maint). - - * The code to automatically shrink the fan-out in the notes tree had - an off-by-one bug, which has been killed. - - * The index-pack code now diagnoses a bad input packstream that - records the same object twice when it is used as delta base; the - code used to declare a software bug when encountering such an - input, but it is an input error. - - - * The code to compute the commit-graph has been taught to use a more - robust way to tell if two object directories refer to the same - thing. - (merge a7df60cac8 tb/commit-graph-object-dir later to maint). - - * "git remote rename X Y" needs to adjust configuration variables - (e.g. branch.<name>.remote) whose value used to be X to Y. - branch.<name>.pushRemote is now also updated. - - * Update to doc-diff. - - * Doc markup fix. - - * "git check-ignore" did not work when the given path is explicitly - marked as not ignored with a negative entry in the .gitignore file. - - * The merge-recursive machinery failed to refresh the cache entry for - a merge result in a couple of places, resulting in an unnecessary - merge failure, which has been fixed. - - * Fix for a bug revealed by a recent change to make the protocol v2 - the default. - - * In rare cases "git worktree add <path>" could think that <path> - was already a registered worktree even when it wasn't and refuse - to add the new worktree. This has been corrected. - (merge bb69b3b009 es/worktree-avoid-duplication-fix later to maint). - - * "git push" should stop from updating a branch that is checked out - when receive.denyCurrentBranch configuration is set, but it failed - to pay attention to checkouts in secondary worktrees. This has - been corrected. - (merge 4d864895a2 hv/receive-denycurrent-everywhere later to maint). - - * "git rebase BASE BRANCH" rebased/updated the tip of BRANCH and - checked it out, even when the BRANCH is checked out in a different - worktree. This has been corrected. - (merge b5cabb4a96 es/do-not-let-rebase-switch-to-protected-branch later to maint). - - * "git describe" in a repository with multiple root commits sometimes - gave up looking for the best tag to describe a given commit with - too early, which has been adjusted. - - * "git merge signed-tag" while lacking the public key started to say - "No signature", which was utterly wrong. This regression has been - reverted. - - * MinGW's poll() emulation has been improved. - - * "git show" and others gave an object name in raw format in its - error output, which has been corrected to give it in hex. - - * "git fetch" over HTTP walker protocol did not show any progress - output. We inherently do not know how much work remains, but still - we can show something not to bore users. - (merge 7655b4119d rs/show-progress-in-dumb-http-fetch later to maint). - - * Both "git ls-remote -h" and "git grep -h" give short usage help, - like any other Git subcommand, but it is not unreasonable to expect - that the former would behave the same as "git ls-remote --head" - (there is no other sensible behaviour for the latter). The - documentation has been updated in an attempt to clarify this. - - * Other code cleanup, docfix, build fix, etc. - (merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint). - (merge f94f7bd00d am/test-pathspec-f-f-error-cases later to maint). - (merge c513a958b6 ss/t6025-modernize later to maint). - (merge b441717256 dl/test-must-fail-fixes later to maint). - (merge d031049da3 mt/sparse-checkout-doc-update later to maint). - (merge 145136a95a jc/skip-prefix later to maint). - (merge 5290d45134 jk/alloc-cleanups later to maint). - (merge 7a9f8ca805 rs/parse-options-concat-dup later to maint). - (merge 517b60564e rs/strbuf-insertstr later to maint). - (merge f696a2b1c8 jk/mailinfo-cleanup later to maint). - (merge de26f02db1 js/test-avoid-pipe later to maint). - (merge a2dc43414c es/doc-mentoring later to maint). - (merge 02bbbe9df9 es/worktree-cleanup later to maint). - (merge 2ce6d075fa rs/micro-cleanups later to maint). - (merge 27f182b3fc rs/blame-typefix-for-fingerprint later to maint). - (merge 3c29e21eb0 ma/test-cleanup later to maint). - (merge 240fc04f81 ag/rebase-remove-redundant-code later to maint). - (merge d68ce906c7 rs/commit-graph-code-simplification later to maint). - (merge a51d9e8f07 rj/t1050-use-test-path-is-file later to maint). - (merge fd0bc17557 kk/complete-diff-color-moved later to maint). - (merge 65bf820d0e en/test-cleanup later to maint). diff --git a/third_party/git/Documentation/RelNotes/2.26.1.txt b/third_party/git/Documentation/RelNotes/2.26.1.txt deleted file mode 100644 index 1b4ecb3fdc..0000000000 --- a/third_party/git/Documentation/RelNotes/2.26.1.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.26.1 Release Notes -========================= - -This release merges the security fix that appears in v2.17.4; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.26.2.txt b/third_party/git/Documentation/RelNotes/2.26.2.txt deleted file mode 100644 index d434d0c695..0000000000 --- a/third_party/git/Documentation/RelNotes/2.26.2.txt +++ /dev/null @@ -1,5 +0,0 @@ -Git v2.26.2 Release Notes -========================= - -This release merges the security fix that appears in v2.17.5; see -the release notes for that version for details. diff --git a/third_party/git/Documentation/RelNotes/2.3.3.txt b/third_party/git/Documentation/RelNotes/2.3.3.txt index 850dc68ede..5ef12644c2 100644 --- a/third_party/git/Documentation/RelNotes/2.3.3.txt +++ b/third_party/git/Documentation/RelNotes/2.3.3.txt @@ -12,7 +12,7 @@ Fixes since v2.3.2 * Description given by "grep -h" for its --exclude-standard option was phrased poorly. - * Documentation for "git remote add" mentioned "--tags" and + * Documentaton for "git remote add" mentioned "--tags" and "--no-tags" and it was not clear that fetch from the remote in the future will use the default behaviour when neither is given to override it. diff --git a/third_party/git/Documentation/RelNotes/2.3.7.txt b/third_party/git/Documentation/RelNotes/2.3.7.txt index 5769184081..fc95812cb3 100644 --- a/third_party/git/Documentation/RelNotes/2.3.7.txt +++ b/third_party/git/Documentation/RelNotes/2.3.7.txt @@ -4,7 +4,7 @@ Git v2.3.7 Release Notes Fixes since v2.3.6 ------------------ - * An earlier update to the parser that dissects a URL broke an + * An earlier update to the parser that disects a URL broke an address, followed by a colon, followed by an empty string (instead of the port number), e.g. ssh://example.com:/path/to/repo. diff --git a/third_party/git/Documentation/RelNotes/2.4.3.txt b/third_party/git/Documentation/RelNotes/2.4.3.txt index 422e930aa2..914d2c1860 100644 --- a/third_party/git/Documentation/RelNotes/2.4.3.txt +++ b/third_party/git/Documentation/RelNotes/2.4.3.txt @@ -66,7 +66,7 @@ Fixes since v2.4.3 * Some time ago, "git blame" (incorrectly) lost the convert_to_git() call when synthesizing a fake "tip" commit that represents the state in the working tree, which broke folks who record the history - with LF line ending to make their project portable across + with LF line ending to make their project portabile across platforms while terminating lines in their working tree files with CRLF for their platform. diff --git a/third_party/git/Documentation/RelNotes/2.5.0.txt b/third_party/git/Documentation/RelNotes/2.5.0.txt index 84723f912a..87044504c5 100644 --- a/third_party/git/Documentation/RelNotes/2.5.0.txt +++ b/third_party/git/Documentation/RelNotes/2.5.0.txt @@ -172,8 +172,7 @@ Performance, Internal Implementation, Development Support etc. incorrect patch text to "git apply". Add tests to demonstrate this. - I have a slight suspicion that this may be - cf. <7vtzf77wjp.fsf@gitster.siamese.dyndns.org> coming back + I have a slight suspicion that this may be $gmane/87202 coming back and biting us (I seem to have said "let's run with this and see what happens" back then). diff --git a/third_party/git/Documentation/RelNotes/2.7.0.txt b/third_party/git/Documentation/RelNotes/2.7.0.txt index e3cbf3a73c..563dadc57e 100644 --- a/third_party/git/Documentation/RelNotes/2.7.0.txt +++ b/third_party/git/Documentation/RelNotes/2.7.0.txt @@ -40,7 +40,7 @@ UI, Workflows & Features * "git interpret-trailers" can now run outside of a Git repository. - * "git p4" learned to re-encode the pathname it uses to communicate + * "git p4" learned to reencode the pathname it uses to communicate with the p4 depot with a new option. * Give progress meter to "git filter-branch". diff --git a/third_party/git/Documentation/RelNotes/2.7.1.txt b/third_party/git/Documentation/RelNotes/2.7.1.txt index 6323feaf64..6553d69e33 100644 --- a/third_party/git/Documentation/RelNotes/2.7.1.txt +++ b/third_party/git/Documentation/RelNotes/2.7.1.txt @@ -10,7 +10,7 @@ Fixes since v2.7 setting GIT_WORK_TREE environment themselves. * The "exclude_list" structure has the usual "alloc, nr" pair of - fields to be used by ALLOC_GROW(), but clear_pattern_list() forgot + fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot to reset 'alloc' to 0 when it cleared 'nr' to discard the managed array. diff --git a/third_party/git/Documentation/RelNotes/2.7.3.txt b/third_party/git/Documentation/RelNotes/2.7.3.txt index f618d71efd..6adf038915 100644 --- a/third_party/git/Documentation/RelNotes/2.7.3.txt +++ b/third_party/git/Documentation/RelNotes/2.7.3.txt @@ -20,7 +20,7 @@ Fixes since v2.7.2 tests. * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a - rev, i.e. the object named by the pathname with wildcard + rev, i.e. the object named by the the pathname with wildcard characters in a tree object. * "git rev-parse --git-common-dir" used in the worktree feature diff --git a/third_party/git/Documentation/RelNotes/2.8.0.txt b/third_party/git/Documentation/RelNotes/2.8.0.txt index 27320b6a9f..25079710fa 100644 --- a/third_party/git/Documentation/RelNotes/2.8.0.txt +++ b/third_party/git/Documentation/RelNotes/2.8.0.txt @@ -189,7 +189,7 @@ Performance, Internal Implementation, Development Support etc. * Some calls to strcpy(3) triggers a false warning from static analyzers that are less intelligent than humans, and reducing the number of these false hits helps us notice real issues. A few - calls to strcpy(3) in a couple of programs that are already safe + calls to strcpy(3) in a couple of protrams that are already safe has been rewritten to avoid false warnings. * The "name_path" API was an attempt to reduce the need to construct @@ -270,7 +270,7 @@ notes for details). setting GIT_WORK_TREE environment themselves. * The "exclude_list" structure has the usual "alloc, nr" pair of - fields to be used by ALLOC_GROW(), but clear_pattern_list() forgot + fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot to reset 'alloc' to 0 when it cleared 'nr' to discard the managed array. diff --git a/third_party/git/Documentation/RelNotes/2.8.3.txt b/third_party/git/Documentation/RelNotes/2.8.3.txt index a63825ed87..fedd9968e5 100644 --- a/third_party/git/Documentation/RelNotes/2.8.3.txt +++ b/third_party/git/Documentation/RelNotes/2.8.3.txt @@ -55,8 +55,8 @@ Fixes since v2.8.2 This is necessary to use Git on Windows shared directories, and is already enabled for the MinGW and plain Windows builds. It also has been used in Cygwin packaged versions of Git for quite a while. - See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/ - and https://lore.kernel.org/git/20150811100527.GW14466@dinwoodie.org/. + See http://thread.gmane.org/gmane.comp.version-control.git/291853 + and http://thread.gmane.org/gmane.comp.version-control.git/275680. * "git replace -e" did not honour "core.editor" configuration. diff --git a/third_party/git/Documentation/RelNotes/2.9.0.txt b/third_party/git/Documentation/RelNotes/2.9.0.txt index 991640119a..b61d36712f 100644 --- a/third_party/git/Documentation/RelNotes/2.9.0.txt +++ b/third_party/git/Documentation/RelNotes/2.9.0.txt @@ -368,7 +368,7 @@ notes for details). This is necessary to use Git on Windows shared directories, and is already enabled for the MinGW and plain Windows builds. It also has been used in Cygwin packaged versions of Git for quite a while. - See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/ + See http://thread.gmane.org/gmane.comp.version-control.git/291853 * "merge-octopus" strategy did not ensure that the index is clean when merge begins. diff --git a/third_party/git/Documentation/RelNotes/2.9.3.txt b/third_party/git/Documentation/RelNotes/2.9.3.txt index 305e08062b..695b86f612 100644 --- a/third_party/git/Documentation/RelNotes/2.9.3.txt +++ b/third_party/git/Documentation/RelNotes/2.9.3.txt @@ -36,7 +36,7 @@ Fixes since v2.9.2 * One part of "git am" had an oddball helper function that called stuff from outside "his" as opposed to calling what we have "ours", which was not gender-neutral and also inconsistent with the rest of - the system where outside stuff is usually called "theirs" in + the system where outside stuff is usuall called "theirs" in contrast to "ours". * The test framework learned a new helper test_match_signal to diff --git a/third_party/git/Documentation/SubmittingPatches b/third_party/git/Documentation/SubmittingPatches index 4515cab519..6d589e118c 100644 --- a/third_party/git/Documentation/SubmittingPatches +++ b/third_party/git/Documentation/SubmittingPatches @@ -142,25 +142,19 @@ archive, summarize the relevant points of the discussion. [[commit-reference]] If you want to reference a previous commit in the history of a stable -branch, use the format "abbreviated hash (subject, date)", like this: +branch, use the format "abbreviated sha1 (subject, date)", +with the subject enclosed in a pair of double-quotes, like this: .... - Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30) + Commit f86a374 ("pack-bitmap.c: fix a memleak", 2015-03-30) noticed that ... .... The "Copy commit summary" command of gitk can be used to obtain this -format (with the subject enclosed in a pair of double-quotes), or this -invocation of `git show`: +format, or this invocation of `git show`: .... - git show -s --pretty=reference <commit> -.... - -or, on an older version of Git without support for --pretty=reference: - -.... - git show -s --date=short --pretty='format:%h (%s, %ad)' <commit> + git show -s --date=short --pretty='format:%h ("%s", %ad)' <commit> .... [[git-tools]] @@ -378,9 +372,9 @@ such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:". Some parts of the system have dedicated maintainers with their own repositories. -- `git-gui/` comes from git-gui project, maintained by Pratyush Yadav: +- `git-gui/` comes from git-gui project, maintained by Pat Thoyts: - https://github.com/prati0100/git-gui.git + git://repo.or.cz/git-gui.git - `gitk-git/` comes from Paul Mackerras's gitk project: diff --git a/third_party/git/Documentation/asciidoc.conf b/third_party/git/Documentation/asciidoc.conf index 8fc4b67081..2c16c536ba 100644 --- a/third_party/git/Documentation/asciidoc.conf +++ b/third_party/git/Documentation/asciidoc.conf @@ -78,9 +78,9 @@ template::[header-declarations] <refmeta> <refentrytitle>{mantitle}</refentrytitle> <manvolnum>{manvolnum}</manvolnum> -<refmiscinfo class="source">{mansource}</refmiscinfo> -<refmiscinfo class="version">{manversion}</refmiscinfo> -<refmiscinfo class="manual">{manmanual}</refmiscinfo> +<refmiscinfo class="source">Git</refmiscinfo> +<refmiscinfo class="version">{git_version}</refmiscinfo> +<refmiscinfo class="manual">Git Manual</refmiscinfo> </refmeta> <refnamediv> <refname>{manname}</refname> diff --git a/third_party/git/Documentation/asciidoctor-extensions.rb b/third_party/git/Documentation/asciidoctor-extensions.rb index d906a00803..0089e0cfb8 100644 --- a/third_party/git/Documentation/asciidoctor-extensions.rb +++ b/third_party/git/Documentation/asciidoctor-extensions.rb @@ -9,11 +9,8 @@ module Git named :chrome def process(parent, target, attrs) - prefix = parent.document.attr('git-relative-html-prefix') - if parent.document.doctype == 'book' - "<ulink url=\"#{prefix}#{target}.html\">" \ - "#{target}(#{attrs[1]})</ulink>" - elsif parent.document.basebackend? 'html' + if parent.document.basebackend? 'html' + prefix = parent.document.attr('git-relative-html-prefix') %(<a href="#{prefix}#{target}.html">#{target}(#{attrs[1]})</a>) elsif parent.document.basebackend? 'docbook' "<citerefentry>\n" \ @@ -23,26 +20,9 @@ module Git end end end - - class DocumentPostProcessor < Asciidoctor::Extensions::Postprocessor - def process document, output - if document.basebackend? 'docbook' - mansource = document.attributes['mansource'] - manversion = document.attributes['manversion'] - manmanual = document.attributes['manmanual'] - new_tags = "" \ - "<refmiscinfo class=\"source\">#{mansource}</refmiscinfo>\n" \ - "<refmiscinfo class=\"version\">#{manversion}</refmiscinfo>\n" \ - "<refmiscinfo class=\"manual\">#{manmanual}</refmiscinfo>\n" - output = output.sub(/<\/refmeta>/, new_tags + "</refmeta>") - end - output - end - end end end Asciidoctor::Extensions.register do inline_macro Git::Documentation::LinkGitProcessor, :linkgit - postprocessor Git::Documentation::DocumentPostProcessor end diff --git a/third_party/git/Documentation/config.txt b/third_party/git/Documentation/config.txt index 08b13ba72b..e3f5bc3396 100644 --- a/third_party/git/Documentation/config.txt +++ b/third_party/git/Documentation/config.txt @@ -142,7 +142,7 @@ refer to linkgit:gitignore[5] for details. For convenience: `gitdir/i`:: This is the same as `gitdir` except that matching is done - case-insensitively (e.g. on case-insensitive file systems) + case-insensitively (e.g. on case-insensitive file sytems) `onbranch`:: The data that follows the keyword `onbranch:` is taken to be a @@ -178,49 +178,47 @@ to either specify only the realpath version, or both versions. Example ~~~~~~~ ----- -# Core variables -[core] - ; Don't trust file modes - filemode = false - -# Our diff algorithm -[diff] - external = /usr/local/bin/diff-wrapper - renames = true - -[branch "devel"] - remote = origin - merge = refs/heads/devel - -# Proxy settings -[core] - gitProxy="ssh" for "kernel.org" - gitProxy=default-proxy ; for the rest - -[include] - path = /path/to/foo.inc ; include by absolute path - path = foo.inc ; find "foo.inc" relative to the current file - path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory - -; include if $GIT_DIR is /path/to/foo/.git -[includeIf "gitdir:/path/to/foo/.git"] - path = /path/to/foo.inc - -; include for all repositories inside /path/to/group -[includeIf "gitdir:/path/to/group/"] - path = /path/to/foo.inc - -; include for all repositories inside $HOME/to/group -[includeIf "gitdir:~/to/group/"] - path = /path/to/foo.inc - -; relative paths are always relative to the including -; file (if the condition is true); their location is not -; affected by the condition -[includeIf "gitdir:/path/to/group/"] - path = foo.inc ----- + # Core variables + [core] + ; Don't trust file modes + filemode = false + + # Our diff algorithm + [diff] + external = /usr/local/bin/diff-wrapper + renames = true + + [branch "devel"] + remote = origin + merge = refs/heads/devel + + # Proxy settings + [core] + gitProxy="ssh" for "kernel.org" + gitProxy=default-proxy ; for the rest + + [include] + path = /path/to/foo.inc ; include by absolute path + path = foo.inc ; find "foo.inc" relative to the current file + path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory + + ; include if $GIT_DIR is /path/to/foo/.git + [includeIf "gitdir:/path/to/foo/.git"] + path = /path/to/foo.inc + + ; include for all repositories inside /path/to/group + [includeIf "gitdir:/path/to/group/"] + path = /path/to/foo.inc + + ; include for all repositories inside $HOME/to/group + [includeIf "gitdir:~/to/group/"] + path = /path/to/foo.inc + + ; relative paths are always relative to the including + ; file (if the condition is true); their location is not + ; affected by the condition + [includeIf "gitdir:/path/to/group/"] + path = foo.inc ; include only if we are in a worktree where foo-branch is ; currently checked out @@ -263,9 +261,7 @@ color:: + The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the -foreground; the second is the background. All the basic colors except -`normal` have a bright variant that can be speficied by prefixing the -color with `bright`, like `brightred`. +foreground; the second is the background. + Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If @@ -349,8 +345,6 @@ include::config/difftool.txt[] include::config/fastimport.txt[] -include::config/feature.txt[] - include::config/fetch.txt[] include::config/format.txt[] diff --git a/third_party/git/Documentation/config/add.txt b/third_party/git/Documentation/config/add.txt index c9f748f81c..4d753f006e 100644 --- a/third_party/git/Documentation/config/add.txt +++ b/third_party/git/Documentation/config/add.txt @@ -5,8 +5,3 @@ add.ignore-errors (deprecated):: option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, as it does not follow the usual naming convention for configuration variables. - -add.interactive.useBuiltin:: - [EXPERIMENTAL] Set to `true` to use the experimental built-in - implementation of the interactive version of linkgit:git-add[1] - instead of the Perl script version. Is `false` by default. diff --git a/third_party/git/Documentation/config/advice.txt b/third_party/git/Documentation/config/advice.txt index bdd37c3eaa..6aaa360202 100644 --- a/third_party/git/Documentation/config/advice.txt +++ b/third_party/git/Documentation/config/advice.txt @@ -107,13 +107,4 @@ advice.*:: editor input from the user. nestedTag:: Advice shown if a user attempts to recursively tag a tag object. - submoduleAlternateErrorStrategyDie:: - Advice shown when a submodule.alternateErrorStrategy option - configured to "die" causes a fatal error. - addIgnoredFile:: - Advice shown if a user attempts to add an ignored file to - the index. - addEmptyPathspec:: - Advice shown if a user runs the add command without providing - the pathspec parameter. -- diff --git a/third_party/git/Documentation/config/branch.txt b/third_party/git/Documentation/config/branch.txt index cc5f3249fc..a592d522a7 100644 --- a/third_party/git/Documentation/config/branch.txt +++ b/third_party/git/Documentation/config/branch.txt @@ -81,16 +81,15 @@ branch.<name>.rebase:: "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner. + -When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase' +When `merges`, pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When `preserve` (or just 'p', deprecated in favor of `merges`), also pass +When `preserve` (deprecated in favor of `merges`), also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. + -When the value is `interactive` (or just 'i'), the rebase is run in interactive -mode. +When the value is `interactive`, the rebase is run in interactive mode. + *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] diff --git a/third_party/git/Documentation/config/core.txt b/third_party/git/Documentation/config/core.txt index 74619a9c03..75538d27e7 100644 --- a/third_party/git/Documentation/config/core.txt +++ b/third_party/git/Documentation/config/core.txt @@ -68,17 +68,6 @@ core.fsmonitor:: avoiding unnecessary processing of files that have not changed. See the "fsmonitor-watchman" section of linkgit:githooks[5]. -core.fsmonitorHookVersion:: - Sets the version of hook that is to be used when calling fsmonitor. - There are currently versions 1 and 2. When this is not set, - version 2 will be tried first and if it fails then version 1 - will be tried. Version 1 uses a timestamp as input to determine - which files have changes since that time but some monitors - like watchman have race conditions when used with a timestamp. - Version 2 uses an opaque string so that the monitor can return - something that can be used to determine what files have changed - without race conditions. - core.trustctime:: If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time @@ -97,9 +86,7 @@ core.untrackedCache:: it will automatically be removed, if set to `false`. Before setting it to `true`, you should check that mtime is working properly on your system. - See linkgit:git-update-index[1]. `keep` by default, unless - `feature.manyFiles` is enabled which sets this setting to - `true` by default. + See linkgit:git-update-index[1]. `keep` by default. core.checkStat:: When missing or is set to `default`, many fields in the stat @@ -570,12 +557,6 @@ core.unsetenvvars:: Defaults to `PERL5LIB` to account for the fact that Git for Windows insists on using its own Perl interpreter. -core.restrictinheritedhandles:: - Windows-only: override whether spawned processes inherit only standard - file handles (`stdin`, `stdout` and `stderr`) or all handles. Can be - `auto`, `true` or `false`. Defaults to `auto`, which means `true` on - Windows 7 and later, and `false` on older Windows versions. - core.createObject:: You can set this to 'link', in which case a hardlink followed by a delete of the source are used to make sure that object creation @@ -596,7 +577,7 @@ the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]. core.commitGraph:: If true, then git will read the commit-graph file (if it exists) - to parse the graph structure of commits. Defaults to true. See + to parse the graph structure of commits. Defaults to false. See linkgit:git-commit-graph[1] for more information. core.useReplaceRefs:: @@ -610,14 +591,8 @@ core.multiPackIndex:: multi-pack-index design document]. core.sparseCheckout:: - Enable "sparse checkout" feature. See linkgit:git-sparse-checkout[1] - for more information. - -core.sparseCheckoutCone:: - Enables the "cone mode" of the sparse checkout feature. When the - sparse-checkout file contains a limited set of patterns, then this - mode provides significant performance advantages. See - linkgit:git-sparse-checkout[1] for more information. + Enable "sparse checkout" feature. See section "Sparse checkout" in + linkgit:git-read-tree[1] for more information. core.abbrev:: Set the length object names are abbreviated to. If diff --git a/third_party/git/Documentation/config/diff.txt b/third_party/git/Documentation/config/diff.txt index ff09f1cf73..5afb5a2cbc 100644 --- a/third_party/git/Documentation/config/diff.txt +++ b/third_party/git/Documentation/config/diff.txt @@ -189,7 +189,7 @@ diff.guitool:: include::../mergetools-diff.txt[] diff.indentHeuristic:: - Set this option to `false` to disable the default heuristics + Set this option to `true` to enable experimental heuristics that shift diff hunk boundaries to make patches easier to read. diff.algorithm:: diff --git a/third_party/git/Documentation/config/feature.txt b/third_party/git/Documentation/config/feature.txt deleted file mode 100644 index 875f8c8a66..0000000000 --- a/third_party/git/Documentation/config/feature.txt +++ /dev/null @@ -1,37 +0,0 @@ -feature.*:: - The config settings that start with `feature.` modify the defaults of - a group of other config settings. These groups are created by the Git - developer community as recommended defaults and are subject to change. - In particular, new config options may be added with different defaults. - -feature.experimental:: - Enable config options that are new to Git, and are being considered for - future defaults. Config settings included here may be added or removed - with each release, including minor version updates. These settings may - have unintended interactions since they are so new. Please enable this - setting if you are interested in providing feedback on experimental - features. The new default values are: -+ -* `pack.useSparse=true` uses a new algorithm when constructing a pack-file -which can improve `git push` performance in repos with many files. -+ -* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by -skipping more commits at a time, reducing the number of round trips. -+ -* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch` -command that downloads a pack-file from a remote. Using the `--split` option, -most executions will create a very small commit-graph file on top of the -existing commit-graph file(s). Occasionally, these files will merge and the -write may take longer. Having an updated commit-graph file helps performance -of many Git commands, including `git merge-base`, `git push -f`, and -`git log --graph`. - -feature.manyFiles:: - Enable config options that optimize for repos with many files in the - working directory. With many files, commands such as `git status` and - `git checkout` may be slow and these new defaults improve performance: -+ -* `index.version=4` enables path-prefix compression in the index. -+ -* `core.untrackedCache=true` enables the untracked cache. This setting assumes -that mtime is working on your machine. diff --git a/third_party/git/Documentation/config/fetch.txt b/third_party/git/Documentation/config/fetch.txt index f11940280f..ba890b5884 100644 --- a/third_party/git/Documentation/config/fetch.txt +++ b/third_party/git/Documentation/config/fetch.txt @@ -59,8 +59,7 @@ fetch.negotiationAlgorithm:: effort to converge faster, but may result in a larger-than-necessary packfile; The default is "default" which instructs Git to use the default algorithm that never skips commits (unless the server has acknowledged it or one - of its descendants). If `feature.experimental` is enabled, then this - setting defaults to "skipping". + of its descendants). Unknown values will cause 'git fetch' to error out. + See also the `--negotiation-tip` option for linkgit:git-fetch[1]. @@ -69,23 +68,3 @@ fetch.showForcedUpdates:: Set to false to enable `--no-show-forced-updates` in linkgit:git-fetch[1] and linkgit:git-pull[1] commands. Defaults to true. - -fetch.parallel:: - Specifies the maximal number of fetch operations to be run in parallel - at a time (submodules, or remotes when the `--multiple` option of - linkgit:git-fetch[1] is in effect). -+ -A value of 0 will give some reasonable default. If unset, it defaults to 1. -+ -For submodules, this setting can be overridden using the `submodule.fetchJobs` -config setting. - -fetch.writeCommitGraph:: - Set to true to write a commit-graph after every `git fetch` command - that downloads a pack-file from a remote. Using the `--split` option, - most executions will create a very small commit-graph file on top of - the existing commit-graph file(s). Occasionally, these files will - merge and the write may take longer. Having an updated commit-graph - file helps performance of many Git commands, including `git merge-base`, - `git push -f`, and `git log --graph`. Defaults to false, unless - `feature.experimental` is true. diff --git a/third_party/git/Documentation/config/format.txt b/third_party/git/Documentation/config/format.txt index 45c7bd5a8f..414a5a8a9d 100644 --- a/third_party/git/Documentation/config/format.txt +++ b/third_party/git/Documentation/config/format.txt @@ -36,12 +36,6 @@ format.subjectPrefix:: The default for format-patch is to output files with the '[PATCH]' subject prefix. Use this variable to change that prefix. -format.coverFromDescription:: - The default mode for format-patch to determine which parts of - the cover letter will be populated using the branch's - description. See the `--cover-from-description` option in - linkgit:git-format-patch[1]. - format.signature:: The default for format-patch is to output a signature containing the Git version number. Use this variable to change that default. @@ -83,11 +77,10 @@ format.coverLetter:: A boolean that controls whether to generate a cover-letter when format-patch is invoked, but in addition can be set to "auto", to generate a cover-letter only when there's more than one patch. - Default is false. format.outputDirectory:: Set a custom directory to store the resulting files instead of the - current working directory. All directory components will be created. + current working directory. format.useAutoBase:: A boolean value which lets you enable the `--base=auto` option of @@ -106,20 +99,4 @@ If one wishes to use the ref `ref/notes/true`, please use that literal instead. + This configuration can be specified multiple times in order to allow -multiple notes refs to be included. In that case, it will behave -similarly to multiple `--[no-]notes[=]` options passed in. That is, a -value of `true` will show the default notes, a value of `<ref>` will -also show notes from that notes ref and a value of `false` will negate -previous configurations and not show notes. -+ -For example, -+ ------------- -[format] - notes = true - notes = foo - notes = false - notes = bar ------------- -+ -will only show notes from `refs/notes/bar`. +multiple notes refs to be included. diff --git a/third_party/git/Documentation/config/gc.txt b/third_party/git/Documentation/config/gc.txt index 00ea0a678e..02b92b18b5 100644 --- a/third_party/git/Documentation/config/gc.txt +++ b/third_party/git/Documentation/config/gc.txt @@ -63,7 +63,7 @@ gc.writeCommitGraph:: If true, then gc will rewrite the commit-graph file when linkgit:git-gc[1] is run. When using `git gc --auto` the commit-graph will be updated if housekeeping is - required. Default is true. See linkgit:git-commit-graph[1] + required. Default is false. See linkgit:git-commit-graph[1] for details. gc.logExpiry:: diff --git a/third_party/git/Documentation/config/gpg.txt b/third_party/git/Documentation/config/gpg.txt index d94025cb36..cce2c89245 100644 --- a/third_party/git/Documentation/config/gpg.txt +++ b/third_party/git/Documentation/config/gpg.txt @@ -18,18 +18,3 @@ gpg.<format>.program:: chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm". - -gpg.minTrustLevel:: - Specifies a minimum trust level for signature verification. If - this option is unset, then signature verification for merge - operations require a key with at least `marginal` trust. Other - operations that perform signature verification require a key - with at least `undefined` trust. Setting this option overrides - the required trust-level for all operations. Supported values, - in increasing order of significance: -+ -* `undefined` -* `never` -* `marginal` -* `fully` -* `ultimate` diff --git a/third_party/git/Documentation/config/http.txt b/third_party/git/Documentation/config/http.txt index e806033aab..5a32f5b0a5 100644 --- a/third_party/git/Documentation/config/http.txt +++ b/third_party/git/Documentation/config/http.txt @@ -71,7 +71,7 @@ http.saveCookies:: http.version:: Use the specified HTTP protocol version when communicating with a server. If you want to force the default. The available and default version depend - on libcurl. Currently the possible values of + on libcurl. Actually the possible values of this option are: - HTTP/2 @@ -84,7 +84,7 @@ http.sslVersion:: particular configuration of the crypto library in use. Internally this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl documentation for more details on the format of this option and - for the ssl version supported. Currently the possible values of + for the ssl version supported. Actually the possible values of this option are: - sslv2 @@ -199,14 +199,6 @@ http.postBuffer:: Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests. -+ -Note that raising this limit is only effective for disabling chunked -transfer encoding and therefore should be used only where the remote -server or a proxy only supports HTTP/1.0 or is noncompliant with the -HTTP standard. Raising this is not, in general, an effective solution -for most push problems, but can increase memory consumption -significantly since the entire buffer is allocated even for small -pushes. http.lowSpeedLimit, http.lowSpeedTime:: If the HTTP transfer speed is less than 'http.lowSpeedLimit' diff --git a/third_party/git/Documentation/config/index.txt b/third_party/git/Documentation/config/index.txt index 7cb50b37e9..f181503041 100644 --- a/third_party/git/Documentation/config/index.txt +++ b/third_party/git/Documentation/config/index.txt @@ -24,4 +24,3 @@ index.threads:: index.version:: Specify the version with which new index files should be initialized. This does not affect existing repositories. - If `feature.manyFiles` is enabled, then the default is 4. diff --git a/third_party/git/Documentation/config/pack.txt b/third_party/git/Documentation/config/pack.txt index 0dac580581..9cdcfa7324 100644 --- a/third_party/git/Documentation/config/pack.txt +++ b/third_party/git/Documentation/config/pack.txt @@ -27,13 +27,6 @@ Note that changing the compression level will not automatically recompress all existing objects. You can force recompression by passing the -F option to linkgit:git-repack[1]. -pack.allowPackReuse:: - When true, and when reachability bitmaps are enabled, - pack-objects will try to send parts of the bitmapped packfile - verbatim. This can reduce memory and CPU usage to serve fetches, - but might result in sending a slightly larger pack. Defaults to - true. - pack.island:: An extended regular expression configuring a set of delta islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1] @@ -119,8 +112,7 @@ pack.useSparse:: objects. This can have significant performance benefits when computing a pack to send a small change. However, it is possible that extra objects are added to the pack-file if the included - commits contain certain types of direct renames. Default is `false` - unless `feature.experimental` is enabled. + commits contain certain types of direct renames. pack.writeBitmaps (deprecated):: This is a deprecated synonym for `repack.writeBitmaps`. diff --git a/third_party/git/Documentation/config/protocol.txt b/third_party/git/Documentation/config/protocol.txt index 756591d77b..bfccc07491 100644 --- a/third_party/git/Documentation/config/protocol.txt +++ b/third_party/git/Documentation/config/protocol.txt @@ -45,10 +45,11 @@ The protocol names currently used by git are: -- protocol.version:: - If set, clients will attempt to communicate with a server - using the specified protocol version. If the server does - not support it, communication falls back to version 0. - If unset, the default is `2`. + Experimental. If set, clients will attempt to communicate with a + server using the specified protocol version. If unset, no + attempt will be made by the client to communicate using a + particular protocol version, this results in protocol version 0 + being used. Supported versions: + -- diff --git a/third_party/git/Documentation/config/pull.txt b/third_party/git/Documentation/config/pull.txt index 5404830609..b87cab31b3 100644 --- a/third_party/git/Documentation/config/pull.txt +++ b/third_party/git/Documentation/config/pull.txt @@ -14,16 +14,15 @@ pull.rebase:: pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis. + -When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase' +When `merges`, pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When `preserve` (or just 'p', deprecated in favor of `merges`), also pass +When `preserve` (deprecated in favor of `merges`), also pass `--preserve-merges` along to 'git rebase' so that locally committed merge commits will not be flattened by running 'git pull'. + -When the value is `interactive` (or just 'i'), the rebase is run in interactive -mode. +When the value is `interactive`, the rebase is run in interactive mode. + *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] diff --git a/third_party/git/Documentation/config/push.txt b/third_party/git/Documentation/config/push.txt index 0a7aa322a9..0a0e000569 100644 --- a/third_party/git/Documentation/config/push.txt +++ b/third_party/git/Documentation/config/push.txt @@ -1,7 +1,6 @@ push.default:: Defines the action `git push` should take if no refspec is - given (whether from the command-line, config, or elsewhere). - Different values are well-suited for + explicitly given. Different values are well-suited for specific workflows; for instance, in a purely central workflow (i.e. the fetch source is equal to the push destination), `upstream` is probably what you want. Possible values are: @@ -9,7 +8,7 @@ push.default:: -- * `nothing` - do not push anything (error out) unless a refspec is - given. This is primarily meant for people who want to + explicitly given. This is primarily meant for people who want to avoid mistakes by always being explicit. * `current` - push the current branch to update a branch with the same @@ -80,7 +79,7 @@ higher priority configuration file (e.g. `.git/config` in a repository) to clear the values inherited from a lower priority configuration files (e.g. `$HOME/.gitconfig`). + ----- +-- Example: @@ -97,7 +96,7 @@ repo/.git/config This will result in only b (a and c are cleared). ----- +-- push.recurseSubmodules:: Make sure all submodule commits used by the revisions to be pushed diff --git a/third_party/git/Documentation/config/rebase.txt b/third_party/git/Documentation/config/rebase.txt index 7f7a07d22f..d98e32d812 100644 --- a/third_party/git/Documentation/config/rebase.txt +++ b/third_party/git/Documentation/config/rebase.txt @@ -5,12 +5,6 @@ rebase.useBuiltin:: is always used. Setting this will emit a warning, to alert any remaining users that setting this now does nothing. -rebase.backend:: - Default backend to use for rebasing. Possible choices are - 'apply' or 'merge'. In the future, if the merge backend gains - all remaining capabilities of the apply backend, this setting - may become unused. - rebase.stat:: Whether to show a diffstat of what changed upstream since the last rebase. False by default. diff --git a/third_party/git/Documentation/config/remote.txt b/third_party/git/Documentation/config/remote.txt index a8e6437a90..6c4cad83a2 100644 --- a/third_party/git/Documentation/config/remote.txt +++ b/third_party/git/Documentation/config/remote.txt @@ -76,11 +76,3 @@ remote.<name>.pruneTags:: + See also `remote.<name>.prune` and the PRUNING section of linkgit:git-fetch[1]. - -remote.<name>.promisor:: - When set to true, this remote will be used to fetch promisor - objects. - -remote.<name>.partialclonefilter:: - The filter that will be applied when fetching from this - promisor remote. diff --git a/third_party/git/Documentation/config/submodule.txt b/third_party/git/Documentation/config/submodule.txt index b33177151c..0a1293b051 100644 --- a/third_party/git/Documentation/config/submodule.txt +++ b/third_party/git/Documentation/config/submodule.txt @@ -79,6 +79,4 @@ submodule.alternateLocation:: submodule.alternateErrorStrategy:: Specifies how to treat errors with the alternates for a submodule as computed via `submodule.alternateLocation`. Possible values are - `ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore` - or `info`, and if there is an error with the computed alternate, the - clone proceeds as if no alternate was specified. + `ignore`, `info`, `die`. Default is `die`. diff --git a/third_party/git/Documentation/config/tag.txt b/third_party/git/Documentation/config/tag.txt index 6d9110d84c..ef5adb3f42 100644 --- a/third_party/git/Documentation/config/tag.txt +++ b/third_party/git/Documentation/config/tag.txt @@ -13,7 +13,7 @@ tag.gpgSign:: Use of this option when running in an automated script can result in a large number of tags being signed. It is therefore convenient to use an agent to avoid typing your gpg passphrase - several times. Note that this option doesn't affect tag signing + several times. Note that this option doesn't affects tag signing behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options. tar.umask:: diff --git a/third_party/git/Documentation/config/trace2.txt b/third_party/git/Documentation/config/trace2.txt index 4ce0b9a6d1..2edbfb02fe 100644 --- a/third_party/git/Documentation/config/trace2.txt +++ b/third_party/git/Documentation/config/trace2.txt @@ -54,9 +54,3 @@ trace2.destinationDebug:: By default, these errors are suppressed and tracing is silently disabled. May be overridden by the `GIT_TRACE2_DST_DEBUG` environment variable. - -trace2.maxFiles:: - Integer. When writing trace files to a target directory, do not - write additional traces if we would exceed this many files. Instead, - write a sentinel file that will block further tracing to this - directory. Defaults to 0, which disables this check. diff --git a/third_party/git/Documentation/config/user.txt b/third_party/git/Documentation/config/user.txt index 59aec7c3ae..0557cbbceb 100644 --- a/third_party/git/Documentation/config/user.txt +++ b/third_party/git/Documentation/config/user.txt @@ -13,12 +13,7 @@ committer.email:: Also, all of these can be overridden by the `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`, `GIT_COMMITTER_EMAIL` and `EMAIL` environment variables. -+ -Note that the `name` forms of these variables conventionally refer to -some form of a personal name. See linkgit:git-commit[1] and the -environment variables section of linkgit:git[1] for more information on -these settings and the `credential.username` option if you're looking -for authentication credentials instead. + See linkgit:git-commit-tree[1] for more information. user.useConfigOnly:: Instruct Git to avoid trying to guess defaults for `user.email` diff --git a/third_party/git/Documentation/diff-format.txt b/third_party/git/Documentation/diff-format.txt index fbbd410a84..4d846d7346 100644 --- a/third_party/git/Documentation/diff-format.txt +++ b/third_party/git/Documentation/diff-format.txt @@ -61,7 +61,7 @@ Possible status letters are: - R: renaming of a file - T: change in the type of the file - U: file is unmerged (you must complete the merge before it can - be committed) +be committed) - X: "unknown" change type (most probably a bug, please report it) Status letters C and R are always followed by a score (denoting the diff --git a/third_party/git/Documentation/diff-generate-patch.txt b/third_party/git/Documentation/diff-generate-patch.txt index e8ed6470fb..f10ca410ad 100644 --- a/third_party/git/Documentation/diff-generate-patch.txt +++ b/third_party/git/Documentation/diff-generate-patch.txt @@ -1,15 +1,11 @@ -Generating patch text with -p ------------------------------ - -Running -linkgit:git-diff[1], -linkgit:git-log[1], -linkgit:git-show[1], -linkgit:git-diff-index[1], -linkgit:git-diff-tree[1], or -linkgit:git-diff-files[1] -with the `-p` option produces patch text. -You can customize the creation of patch text via the +Generating patches with -p +-------------------------- + +When "git-diff-index", "git-diff-tree", or "git-diff-files" are run +with a `-p` option, "git diff" without the `--raw` option, or +"git log" with the "-p" option, they +do not produce the output described above; instead they produce a +patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables. What the -p option produces is slightly different from the traditional @@ -53,7 +49,7 @@ similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one. + -The index line includes the blob object names before and after the change. +The index line includes the SHA-1 checksum before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode. @@ -74,7 +70,7 @@ separate lines indicate the old and the new mode. rename to a -Combined diff format +combined diff format -------------------- Any diff-generating command can take the `-c` or `--cc` option to @@ -84,7 +80,7 @@ linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge. -A "combined diff" format looks like this: +A 'combined diff' format looks like this: ------------ diff --combined describe.c @@ -117,11 +113,11 @@ index fabadb8,cc95eb0..4866510 ------------ 1. It is preceded with a "git diff" header, that looks like - this (when the `-c` option is used): + this (when `-c` option is used): diff --combined file + -or like this (when the `--cc` option is used): +or like this (when `--cc` option is used): diff --cc file @@ -164,7 +160,7 @@ parents. 4. Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not - meant to be applied. The change is similar to the change in the + meant for apply. The change is similar to the change in the extended 'index' header: @@@ <from-file-range> <from-file-range> <to-file-range> @@@ diff --git a/third_party/git/Documentation/diff-options.txt b/third_party/git/Documentation/diff-options.txt index bb31f0c42b..09faee3b44 100644 --- a/third_party/git/Documentation/diff-options.txt +++ b/third_party/git/Documentation/diff-options.txt @@ -567,13 +567,13 @@ To illustrate the difference between `-S<regex> --pickaxe-regex` and file: + ---- -+ return frotz(nitfol, two->ptr, 1, 0); ++ return !regexec(regexp, two->ptr, 1, ®match, 0); ... -- hit = frotz(nitfol, mf2.ptr, 1, 0); +- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0); ---- + -While `git log -G"frotz\(nitfol"` will show this commit, `git log --S"frotz\(nitfol" --pickaxe-regex` will not (because the number of +While `git log -G"regexec\(regexp"` will show this commit, `git log +-S"regexec\(regexp" --pickaxe-regex` will not (because the number of occurrences of that string did not change). + Unless `--text` is supplied patches of binary files without a textconv diff --git a/third_party/git/Documentation/doc-diff b/third_party/git/Documentation/doc-diff index 1694300e50..3355be4798 100755 --- a/third_party/git/Documentation/doc-diff +++ b/third_party/git/Documentation/doc-diff @@ -21,7 +21,7 @@ asciidoc use asciidoc with both commits to-asciidoc use asciidoc with the 'to'-commit to-asciidoctor use asciidoctor with the 'to'-commit asciidoctor use asciidoctor with both commits -cut-footer cut away footer +cut-header-footer cut away header and footer " SUBDIRECTORY_OK=1 . "$(git --exec-path)/git-sh-setup" @@ -31,7 +31,7 @@ force= clean= from_program= to_program= -cut_footer= +cut_header_footer= while test $# -gt 0 do case "$1" in @@ -55,8 +55,8 @@ do --asciidoc) from_program=-asciidoc to_program=-asciidoc ;; - --cut-footer) - cut_footer=-cut-footer ;; + --cut-header-footer) + cut_header_footer=-cut-header-footer ;; --) shift; break ;; *) @@ -118,8 +118,8 @@ construct_makemanflags () { from_makemanflags=$(construct_makemanflags "$from_program") && to_makemanflags=$(construct_makemanflags "$to_program") && -from_dir=$from_oid$from_program$cut_footer && -to_dir=$to_oid$to_program$cut_footer && +from_dir=$from_oid$from_program$cut_header_footer && +to_dir=$to_oid$to_program$cut_header_footer && # generate_render_makefile <srcdir> <dstdir> generate_render_makefile () { @@ -127,7 +127,7 @@ generate_render_makefile () { while read src do dst=$2/${src#$1/} - printf 'all: %s\n' "$dst" + printf 'all:: %s\n' "$dst" printf '%s: %s\n' "$dst" "$src" printf '\t@echo >&2 " RENDER $(notdir $@)" && \\\n' printf '\tmkdir -p $(dir $@) && \\\n' @@ -169,11 +169,12 @@ render_tree () { make -j$parallel -f - && mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname" - if test "$cut_footer" = "-cut-footer" + if test "$cut_header_footer" = "-cut-header-footer" then for f in $(find "$tmp/rendered/$dname" -type f) do - head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" && + tail -n +3 "$f" | head -n -2 | + sed -e '1{/^$/d}' -e '${/^$/d}' >"$f+" && mv "$f+" "$f" || return 1 done diff --git a/third_party/git/Documentation/fetch-options.txt b/third_party/git/Documentation/fetch-options.txt index a115a1ae0e..3c9b4f9e09 100644 --- a/third_party/git/Documentation/fetch-options.txt +++ b/third_party/git/Documentation/fetch-options.txt @@ -92,10 +92,6 @@ ifndef::git-pull[] Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default. ---[no-]write-commit-graph:: - Write a commit-graph after fetching. This overrides the config - setting `fetch.writeCommitGraph`. - -p:: --prune:: Before fetching, remove any remote-tracking references that no @@ -139,10 +135,7 @@ ifndef::git-pull[] specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote - repository. Providing an empty `<refspec>` to the - `--refmap` option causes Git to ignore the configured - refspecs and rely entirely on the refspecs supplied as - command-line arguments. See section on "Configured Remote-tracking + repository. See section on "Configured Remote-tracking Branches" for details. -t:: @@ -167,27 +160,15 @@ ifndef::git-pull[] -j:: --jobs=<n>:: - Number of parallel children to be used for all forms of fetching. -+ -If the `--multiple` option was specified, the different remotes will be fetched -in parallel. If multiple submodules are fetched, they will be fetched in -parallel. To control them independently, use the config settings -`fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1]). -+ -Typically, parallel recursive and multi-remote fetches will be faster. By -default fetches are performed sequentially, not in parallel. + Number of parallel children to be used for fetching submodules. + Each will fetch from different submodules, such that fetching many + submodules will be faster. By default submodules will be fetched + one at a time. --no-recurse-submodules:: Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option). ---set-upstream:: - If the remote is fetched successfully, pull and add upstream - (tracking) reference, used by argument-less - linkgit:git-pull[1] and other commands. For more information, - see `branch.<name>.merge` and `branch.<name>.remote` in - linkgit:git-config[1]. - --submodule-prefix=<path>:: Prepend <path> to paths printed in informative messages such as "Fetching submodule foo". This option is used diff --git a/third_party/git/Documentation/git-add.txt b/third_party/git/Documentation/git-add.txt index be5e3ac54b..8b0e4c7fa8 100644 --- a/third_party/git/Documentation/git-add.txt +++ b/third_party/git/Documentation/git-add.txt @@ -11,8 +11,7 @@ SYNOPSIS 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p] [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize] - [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]] - [--] [<pathspec>...] + [--chmod=(+|-)x] [--] [<pathspec>...] DESCRIPTION ----------- @@ -188,19 +187,6 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files. bit is only changed in the index, the files on disk are left unchanged. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be - quoted as explained for the configuration variable `core.quotePath` - (see linkgit:git-config[1]). See also `--pathspec-file-nul` and - global `--literal-pathspecs`. - ---pathspec-file-nul:: - Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken - literally (including newlines and quotes). - \--:: This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken diff --git a/third_party/git/Documentation/git-am.txt b/third_party/git/Documentation/git-am.txt index ab5754e05d..fc3b993c33 100644 --- a/third_party/git/Documentation/git-am.txt +++ b/third_party/git/Documentation/git-am.txt @@ -16,7 +16,7 @@ SYNOPSIS [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [(<mbox> | <Maildir>)...] -'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch) DESCRIPTION ----------- @@ -176,11 +176,9 @@ default. You can use `--no-utf8` to override this. Abort the patching operation but keep HEAD and the index untouched. ---show-current-patch[=(diff|raw)]:: - Show the message at which `git am` has stopped due to - conflicts. If `raw` is specified, show the raw contents of - the e-mail message; if `diff`, show the diff portion only. - Defaults to `raw`. +--show-current-patch:: + Show the patch being applied when "git am" is stopped because + of conflicts. DISCUSSION ---------- @@ -192,8 +190,8 @@ the commit, after stripping common prefix "[PATCH <anything>]". The "Subject: " line is supposed to concisely describe what the commit is about in one line of text. -"From: ", "Date: ", and "Subject: " lines starting the body override the -respective commit author name and title values taken from the headers. +"From: " and "Subject: " lines starting the body override the respective +commit author name and title values taken from the headers. The commit message is formed by the title taken from the "Subject: ", a blank line and the body of the message up to diff --git a/third_party/git/Documentation/git-bisect-lk2009.txt b/third_party/git/Documentation/git-bisect-lk2009.txt index 3ba49e85b7..e99925184d 100644 --- a/third_party/git/Documentation/git-bisect-lk2009.txt +++ b/third_party/git/Documentation/git-bisect-lk2009.txt @@ -158,7 +158,7 @@ Test suites are very nice. But when they are used alone, they are supposed to be used so that all the tests are checked after each commit. This means that they are not very efficient, because many tests are run for no interesting result, and they suffer from -combinatorial explosion. +combinational explosion. In fact the problem is that big software often has many different configuration options and that each test case should pass for each @@ -1350,9 +1350,9 @@ References - [[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'. Nist Planning Report 02-3], see Executive Summary and Chapter 8. - [[[2]]] http://www.oracle.com/technetwork/java/codeconvtoc-136057.html['Code Conventions for the Java Programming Language'. Sun Microsystems.] - [[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Software maintenance'. Wikipedia.] -- [[[4]]] https://lore.kernel.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.] +- [[[4]]] https://public-inbox.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.] - [[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Fully automated bisecting with "git bisect run"'. LWN.net.] - [[[6]]] https://lwn.net/Articles/277872/[Jonathan Corbet. 'Bisection divides users and developers'. LWN.net.] -- [[[7]]] https://lore.kernel.org/lkml/20071207113734.GA14598@elte.hu/[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.] +- [[[7]]] http://marc.info/?l=linux-kernel&m=119702753411680&w=2[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.] - [[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html[Junio C Hamano and the git-list. 'git-bisect(1) Manual Page'. Linux Kernel Archives.] - [[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.] diff --git a/third_party/git/Documentation/git-bisect.txt b/third_party/git/Documentation/git-bisect.txt index 7586c5a843..4b45d837a7 100644 --- a/third_party/git/Documentation/git-bisect.txt +++ b/third_party/git/Documentation/git-bisect.txt @@ -413,7 +413,7 @@ $ cat ~/test.sh # tweak the working tree by merging the hot-fix branch # and then attempt a build -if git merge --no-commit --no-ff hot-fix && +if git merge --no-commit hot-fix && make then # run project specific test and report its status diff --git a/third_party/git/Documentation/git-bundle.txt b/third_party/git/Documentation/git-bundle.txt index d34b0964be..7d6c9dcd17 100644 --- a/third_party/git/Documentation/git-bundle.txt +++ b/third_party/git/Documentation/git-bundle.txt @@ -9,8 +9,8 @@ git-bundle - Move objects and refs by archive SYNOPSIS -------- [verse] -'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args> -'git bundle' verify [-q | --quiet] <file> +'git bundle' create <file> <git-rev-list-args> +'git bundle' verify <file> 'git bundle' list-heads <file> [<refname>...] 'git bundle' unbundle <file> [<refname>...] @@ -20,14 +20,11 @@ DESCRIPTION Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive Git protocols (git, -ssh, http) cannot be used. - -The 'git bundle' command packages objects and references in an archive -at the originating machine, which can then be imported into another -repository using 'git fetch', 'git pull', or 'git clone', -after moving the archive by some means (e.g., by sneakernet). - -As no +ssh, http) cannot be used. This command provides support for +'git fetch' and 'git pull' to operate by packaging objects and references +in an archive at the originating machine, then importing those into +another repository using 'git fetch' and 'git pull' +after moving the archive by some means (e.g., by sneakernet). As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the @@ -36,11 +33,9 @@ destination repository. OPTIONS ------- -create [options] <file> <git-rev-list-args>:: +create <file>:: Used to create a bundle named 'file'. This requires the - '<git-rev-list-args>' arguments to define the bundle contents. - 'options' contains the options specific to the 'git bundle create' - subcommand. + 'git-rev-list-args' arguments to define the bundle contents. verify <file>:: Used to check that a bundle file is valid and will apply @@ -80,33 +75,6 @@ unbundle <file>:: necessarily everything in the pack (in this case, 'git bundle' acts like 'git fetch-pack'). ---progress:: - Progress status is reported on the standard error stream - by default when it is attached to a terminal, unless -q - is specified. This flag forces progress status even if - the standard error stream is not directed to a terminal. - ---all-progress:: - When --stdout is specified then progress report is - displayed during the object count and compression phases - but inhibited during the write-out phase. The reason is - that in some cases the output stream is directly linked - to another command which may wish to display progress - status of its own as it processes incoming pack data. - This flag is like --progress except that it forces progress - report for the write-out phase as well even if --stdout is - used. - ---all-progress-implied:: - This is used to imply --all-progress whenever progress display - is activated. Unlike --all-progress this flag doesn't actually - force any progress display by itself. - --q:: ---quiet:: - This flag makes the command not to report its progress - on the standard error stream. - SPECIFYING REFERENCES --------------------- @@ -124,14 +92,6 @@ It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination. -`git clone` can use any bundle created without negative refspecs -(e.g., `new`, but not `old..new`). -If you want to match `git clone --mirror`, which would include your -refs such as `refs/remotes/*`, use `--all`. -If you want to provide the same set of refs that a clone directly -from the source repository would get, use `--branches --tags` for -the `<git-rev-list-args>`. - EXAMPLES -------- diff --git a/third_party/git/Documentation/git-check-attr.txt b/third_party/git/Documentation/git-check-attr.txt index 84f41a8e82..3c0578217b 100644 --- a/third_party/git/Documentation/git-check-attr.txt +++ b/third_party/git/Documentation/git-check-attr.txt @@ -32,7 +32,7 @@ OPTIONS instead of from the command-line. -z:: - The output format is modified to be machine-parsable. + The output format is modified to be machine-parseable. If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character. diff --git a/third_party/git/Documentation/git-check-ignore.txt b/third_party/git/Documentation/git-check-ignore.txt index 0c3924a63d..8b42cb3fb2 100644 --- a/third_party/git/Documentation/git-check-ignore.txt +++ b/third_party/git/Documentation/git-check-ignore.txt @@ -30,22 +30,16 @@ OPTIONS valid with a single pathname. -v, --verbose:: - Instead of printing the paths that are excluded, for each path - that matches an exclude pattern, print the exclude pattern - together with the path. (Matching an exclude pattern usually - means the path is excluded, but if the pattern begins with '!' - then it is a negated pattern and matching it means the path is - NOT excluded.) -+ -For precedence rules within and between exclude sources, see -linkgit:gitignore[5]. + Also output details about the matching pattern (if any) + for each given pathname. For precedence rules within and + between exclude sources, see linkgit:gitignore[5]. --stdin:: Read pathnames from the standard input, one per line, instead of from the command-line. -z:: - The output format is modified to be machine-parsable (see + The output format is modified to be machine-parseable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character. diff --git a/third_party/git/Documentation/git-checkout.txt b/third_party/git/Documentation/git-checkout.txt index c8fb995fa7..cf3cac0a2b 100644 --- a/third_party/git/Documentation/git-checkout.txt +++ b/third_party/git/Documentation/git-checkout.txt @@ -12,14 +12,14 @@ SYNOPSIS 'git checkout' [-q] [-f] [-m] --detach [<branch>] 'git checkout' [-q] [-f] [-m] [--detach] <commit> 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>] -'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>... -'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul] -'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...] +'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>... +'git checkout' [<tree-ish>] [--] <pathspec>... +'git checkout' (-p|--patch) [<tree-ish>] [--] [<paths>...] DESCRIPTION ----------- Updates files in the working tree to match the version in the index -or the specified tree. If no pathspec was given, 'git checkout' will +or the specified tree. If no paths are given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch. @@ -79,14 +79,13 @@ be used to detach `HEAD` at the tip of the branch (`git checkout + Omitting `<branch>` detaches `HEAD` at the tip of the current branch. -'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...:: -'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]:: +'git checkout' [<tree-ish>] [--] <pathspec>...:: - Overwrite the contents of the files that match the pathspec. - When the `<tree-ish>` (most often a commit) is not given, - overwrite working tree with the contents in the index. - When the `<tree-ish>` is given, overwrite both the index and - the working tree with the contents at the `<tree-ish>`. + Overwrite paths in the working tree by replacing with the + contents in the index or in the `<tree-ish>` (most often a + commit). When a `<tree-ish>` is given, the paths that + match the `<pathspec>` are updated both in the index and in + the working tree. + The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the @@ -97,10 +96,12 @@ using `--ours` or `--theirs`. With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result. 'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]:: - This is similar to the previous mode, but lets you use the - interactive interface to show the "diff" output and choose which - hunks to use in the result. See below for the description of - `--patch` option. + This is similar to the "check out paths to the working tree + from either the index or from a tree-ish" mode described + above, but lets you use the interactive interface to show + the "diff" output and choose which hunks to use in the + result. See below for the description of `--patch` option. + OPTIONS ------- @@ -308,19 +309,6 @@ Note that this option uses the no overlay mode by default (see also working tree, but not in `<tree-ish>` are removed, to make them match `<tree-ish>` exactly. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be - quoted as explained for the configuration variable `core.quotePath` - (see linkgit:git-config[1]). See also `--pathspec-file-nul` and - global `--literal-pathspecs`. - ---pathspec-file-nul:: - Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken - literally (including newlines and quotes). - <branch>:: Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with "refs/heads/", is a valid ref), then that @@ -351,13 +339,7 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`. Tree to checkout from (when paths are given). If not specified, the index will be used. -\--:: - Do not interpret any more arguments as options. -<pathspec>...:: - Limits the paths affected by the operation. -+ -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. DETACHED HEAD ------------- diff --git a/third_party/git/Documentation/git-clean.txt b/third_party/git/Documentation/git-clean.txt index a7f309dff5..0028ff12d1 100644 --- a/third_party/git/Documentation/git-clean.txt +++ b/third_party/git/Documentation/git-clean.txt @@ -26,20 +26,18 @@ are affected. OPTIONS ------- -d:: - Normally, when no <path> is specified, git clean will not - recurse into untracked directories to avoid removing too much. - Specify -d to have it recurse into such directories as well. - If any paths are specified, -d is irrelevant; all untracked - files matching the specified paths (with exceptions for nested - git directories mentioned under `--force`) will be removed. + Remove untracked directories in addition to untracked files. + If an untracked directory is managed by a different Git + repository, it is not removed by default. Use -f option twice + if you really want to remove such a directory. -f:: --force:: If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories - unless given -f or -i. Git will refuse to modify untracked - nested git repositories (directories with a .git subdirectory) - unless a second -f is given. + unless given -f, -n or -i. Git will refuse to delete directories + with .git sub directory or file unless a second -f + is given. -i:: --interactive:: diff --git a/third_party/git/Documentation/git-clone.txt b/third_party/git/Documentation/git-clone.txt index bf24f1813a..34011c2940 100644 --- a/third_party/git/Documentation/git-clone.txt +++ b/third_party/git/Documentation/git-clone.txt @@ -15,7 +15,7 @@ SYNOPSIS [--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] [--] <repository> + [--[no-]remote-submodules] [--jobs <n>] [--] <repository> [<directory>] DESCRIPTION @@ -156,12 +156,6 @@ objects from the source repository into a pack in the cloned repository. used, neither remote-tracking branches nor the related configuration variables are created. ---sparse:: - Initialize the sparse-checkout file so the working - directory starts with only the files in the root - of the repository. The sparse-checkout file can be - modified to grow the working directory as needed. - --mirror:: Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the @@ -268,9 +262,9 @@ or `--mirror` is given) All submodules which are cloned will be shallow with a depth of 1. --[no-]remote-submodules:: - All submodules which are cloned will use the status of the submodule's + All submodules which are cloned will use the status of the submodule’s remote-tracking branch to update the submodule, rather than the - superproject's recorded SHA-1. Equivalent to passing `--remote` to + superproject’s recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`. --separate-git-dir=<git dir>:: diff --git a/third_party/git/Documentation/git-commit-graph.txt b/third_party/git/Documentation/git-commit-graph.txt index 28d1fee505..eb5e7865f0 100644 --- a/third_party/git/Documentation/git-commit-graph.txt +++ b/third_party/git/Documentation/git-commit-graph.txt @@ -9,8 +9,9 @@ git-commit-graph - Write and verify Git commit-graph files SYNOPSIS -------- [verse] -'git commit-graph verify' [--object-dir <dir>] [--shallow] [--[no-]progress] -'git commit-graph write' <options> [--object-dir <dir>] [--[no-]progress] +'git commit-graph read' [--object-dir <dir>] +'git commit-graph verify' [--object-dir <dir>] [--shallow] +'git commit-graph write' <options> [--object-dir <dir>] DESCRIPTION @@ -26,14 +27,8 @@ OPTIONS file. This parameter exists to specify the location of an alternate that only has the objects directory, not a full `.git` directory. The commit-graph file is expected to be in the `<dir>/info` directory and - the packfiles are expected to be in `<dir>/pack`. If the directory - could not be made into an absolute path, or does not match any known - object directory, `git commit-graph ...` will exit with non-zero - status. + the packfiles are expected to be in `<dir>/pack`. ---[no-]progress:: - Turn progress on/off explicitly. If neither is specified, progress is - shown if standard error is connected to a terminal. COMMANDS -------- @@ -76,6 +71,11 @@ Finally, if `--expire-time=<datetime>` is not specified, let `datetime` be the current time. After writing the split commit-graph, delete all unused commit-graph whose modified times are older than `datetime`. +'read':: + +Read the commit-graph file and output basic details about it. +Used for debugging purposes. + 'verify':: Read the commit-graph file and verify its contents against the object @@ -115,6 +115,12 @@ $ git show-ref -s | git commit-graph write --stdin-commits $ git rev-parse HEAD | git commit-graph write --stdin-commits --append ------------------------------------------------ +* Read basic information from the commit-graph file. ++ +------------------------------------------------ +$ git commit-graph read +------------------------------------------------ + GIT --- diff --git a/third_party/git/Documentation/git-commit-tree.txt b/third_party/git/Documentation/git-commit-tree.txt index ec15ee8d6f..4b90b9c12a 100644 --- a/third_party/git/Documentation/git-commit-tree.txt +++ b/third_party/git/Documentation/git-commit-tree.txt @@ -69,6 +69,7 @@ OPTIONS Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line. + Commit Information ------------------ @@ -78,6 +79,26 @@ A commit encapsulates: - author name, email and date - committer name and email and the commit time. +While parent object ids are provided on the command line, author and +committer information is taken from the following environment variables, +if set: + + GIT_AUTHOR_NAME + GIT_AUTHOR_EMAIL + GIT_AUTHOR_DATE + GIT_COMMITTER_NAME + GIT_COMMITTER_EMAIL + GIT_COMMITTER_DATE + +(nb "<", ">" and "\n"s are stripped) + +In case (some of) these environment variables are not set, the information +is taken from the configuration items user.name and user.email, or, if not +present, the environment variable EMAIL, or, if that is not set, +system user name and the hostname used for outgoing mail (taken +from `/etc/mailname` and falling back to the fully qualified hostname when +that file does not exist). + A commit comment is read from stdin. If a changelog entry is not provided via "<" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D. @@ -96,7 +117,6 @@ FILES SEE ALSO -------- linkgit:git-write-tree[1] -linkgit:git-commit[1] GIT --- diff --git a/third_party/git/Documentation/git-commit.txt b/third_party/git/Documentation/git-commit.txt index 13f653989f..7628193284 100644 --- a/third_party/git/Documentation/git-commit.txt +++ b/third_party/git/Documentation/git-commit.txt @@ -13,8 +13,7 @@ SYNOPSIS [-F <file> | -m <msg>] [--reset-author] [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--date=<date>] [--cleanup=<mode>] [--[no-]status] - [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]] - [-S[<keyid>]] [--] [<pathspec>...] + [-i | -o] [-S[<keyid>]] [--] [<file>...] DESCRIPTION ----------- @@ -279,37 +278,22 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].) already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be - quoted as explained for the configuration variable `core.quotePath` - (see linkgit:git-config[1]). See also `--pathspec-file-nul` and - global `--literal-pathspecs`. - ---pathspec-file-nul:: - Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken - literally (including newlines and quotes). - -u[<mode>]:: --untracked-files[=<mode>]:: Show untracked files. + --- The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories. - ++ The possible options are: - ++ - 'no' - Show no untracked files - 'normal' - Shows untracked files and directories - 'all' - Also shows individual files in untracked directories. - ++ The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]. --- -v:: --verbose:: @@ -359,13 +343,15 @@ changes to tracked files. \--:: Do not interpret any more arguments as options. -<pathspec>...:: - When pathspec is given on the command line, commit the contents of - the files that match the pathspec without recording the changes - already added to the index. The contents of these files are also - staged for the next commit on top of what have been staged before. -+ -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. +<file>...:: + When files are given on the command line, the command + commits the contents of the named files, without + recording the changes already staged. The contents of + these files are also staged for the next commit on top + of what have been staged before. + +:git-commit: 1 +include::date-formats.txt[] EXAMPLES -------- @@ -460,43 +446,6 @@ alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option). -COMMIT INFORMATION ------------------- - -Author and committer information is taken from the following environment -variables, if set: - - GIT_AUTHOR_NAME - GIT_AUTHOR_EMAIL - GIT_AUTHOR_DATE - GIT_COMMITTER_NAME - GIT_COMMITTER_EMAIL - GIT_COMMITTER_DATE - -(nb "<", ">" and "\n"s are stripped) - -The author and committer names are by convention some form of a personal name -(that is, the name by which other humans refer to you), although Git does not -enforce or require any particular form. Arbitrary Unicode may be used, subject -to the constraints listed above. This name has no effect on authentication; for -that, see the `credential.username` variable in linkgit:git-config[1]. - -In case (some of) these environment variables are not set, the information -is taken from the configuration items `user.name` and `user.email`, or, if not -present, the environment variable EMAIL, or, if that is not set, -system user name and the hostname used for outgoing mail (taken -from `/etc/mailname` and falling back to the fully qualified hostname when -that file does not exist). - -The `author.name` and `committer.name` and their corresponding email options -override `user.name` and `user.email` if set and are overridden themselves by -the environment variables. - -The typical usage is to set just the `user.name` and `user.email` variables; -the other options are provided for more complex use cases. - -:git-commit: 1 -include::date-formats.txt[] DISCUSSION ---------- diff --git a/third_party/git/Documentation/git-config.txt b/third_party/git/Documentation/git-config.txt index 7573160f21..ff9310f958 100644 --- a/third_party/git/Documentation/git-config.txt +++ b/third_party/git/Documentation/git-config.txt @@ -9,18 +9,18 @@ git-config - Get and set repository or global options SYNOPSIS -------- [verse] -'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]] +'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]] 'git config' [<file-option>] [--type=<type>] --add name value 'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex] -'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex] -'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex] -'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex] +'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex] +'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex] +'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex] 'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL 'git config' [<file-option>] --unset name [value_regex] 'git config' [<file-option>] --unset-all name [value_regex] 'git config' [<file-option>] --rename-section old_name new_name 'git config' [<file-option>] --remove-section name -'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list +'git config' [<file-option>] [--show-origin] [-z|--null] [--name-only] -l | --list 'git config' [<file-option>] --get-color name [default] 'git config' [<file-option>] --get-colorbool name [stdout-is-tty] 'git config' [<file-option>] -e | --edit @@ -222,11 +222,6 @@ Valid `<type>`'s include: the actual origin (config file path, ref, or blob id if applicable). ---show-scope:: - Similar to `--show-origin` in that it augments the output of - all queried config options with the scope of that value - (local, global, system, command). - --get-colorbool name [stdout-is-tty]:: Find the color setting for `name` (e.g. `color.diff`) and output @@ -344,35 +339,33 @@ EXAMPLES Given a .git/config like this: ------------- -# -# This is the config file, and -# a '#' or ';' character indicates -# a comment -# - -; core variables -[core] - ; Don't trust file modes - filemode = false - -; Our diff algorithm -[diff] - external = /usr/local/bin/diff-wrapper - renames = true - -; Proxy settings -[core] - gitproxy=proxy-command for kernel.org - gitproxy=default-proxy ; for all the rest - -; HTTP -[http] - sslVerify -[http "https://weak.example.com"] - sslVerify = false - cookieFile = /tmp/cookie.txt ------------- + # + # This is the config file, and + # a '#' or ';' character indicates + # a comment + # + + ; core variables + [core] + ; Don't trust file modes + filemode = false + + ; Our diff algorithm + [diff] + external = /usr/local/bin/diff-wrapper + renames = true + + ; Proxy settings + [core] + gitproxy=proxy-command for kernel.org + gitproxy=default-proxy ; for all the rest + + ; HTTP + [http] + sslVerify + [http "https://weak.example.com"] + sslVerify = false + cookieFile = /tmp/cookie.txt you can set the filemode to true with diff --git a/third_party/git/Documentation/git-credential.txt b/third_party/git/Documentation/git-credential.txt index 6f0c7ca80f..b211440373 100644 --- a/third_party/git/Documentation/git-credential.txt +++ b/third_party/git/Documentation/git-credential.txt @@ -19,7 +19,8 @@ from system-specific helpers, as well as prompting the user for usernames and passwords. The git-credential command exposes this interface to scripts which may want to retrieve, store, or prompt for credentials in the same manner as Git. The design of this scriptable -interface models the internal C API; see credential.h for more +interface models the internal C API; see +link:technical/api-credentials.html[the Git credential API] for more background on the concepts. git-credential takes an "action" option on the command-line (one of diff --git a/third_party/git/Documentation/git-cvsserver.txt b/third_party/git/Documentation/git-cvsserver.txt index 1b1c71ad9d..79e22b1f3a 100644 --- a/third_party/git/Documentation/git-cvsserver.txt +++ b/third_party/git/Documentation/git-cvsserver.txt @@ -294,7 +294,7 @@ In `dbDriver` and `dbUser` you can use the following variables: Git directory name %g:: Git directory name, where all characters except for - alphanumeric ones, `.`, and `-` are replaced with + alpha-numeric ones, `.`, and `-` are replaced with `_` (this should make it easier to use the directory name in a filename if wanted) %m:: diff --git a/third_party/git/Documentation/git-diff.txt b/third_party/git/Documentation/git-diff.txt index 37781cf175..72179d993c 100644 --- a/third_party/git/Documentation/git-diff.txt +++ b/third_party/git/Documentation/git-diff.txt @@ -36,7 +36,7 @@ two blob objects, or changes between two files on disk. running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree - controlled by Git. This form implies `--exit-code`. + controlled by Git. 'git diff' [<options>] --cached [<commit>] [--] [<path>...]:: diff --git a/third_party/git/Documentation/git-fast-export.txt b/third_party/git/Documentation/git-fast-export.txt index e8950de3ba..cc940eb9ad 100644 --- a/third_party/git/Documentation/git-fast-export.txt +++ b/third_party/git/Documentation/git-fast-export.txt @@ -17,9 +17,9 @@ This program dumps the given revisions in a form suitable to be piped into 'git fast-import'. You can use it as a human-readable bundle replacement (see -linkgit:git-bundle[1]), or as a format that can be edited before being -fed to 'git fast-import' in order to do history rewrites (an ability -relied on by tools like 'git filter-repo'). +linkgit:git-bundle[1]), or as a kind of an interactive +'git filter-branch'. + OPTIONS ------- @@ -75,20 +75,11 @@ produced incorrect results if you gave these options. Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. - ---mark-tags:: - In addition to labelling blobs and commits with mark ids, also - label tags. This is useful in conjunction with - `--export-marks` and `--import-marks`, and is also useful (and - necessary) for exporting of nested tags. It does not hurt - other cases and would be the default, but many fast-import - frontends are not prepared to accept tags with mark - identifiers. + -Any commits (or tags) that have already been marked will not be -exported again. If the backend uses a similar --import-marks file, -this allows for incremental bidirectional exporting of the repository -by keeping the marks the same across runs. +Any commits that have already been marked will not be exported again. +If the backend uses a similar --import-marks file, this allows for +incremental bidirectional exporting of the repository by keeping the +marks the same across runs. --fake-missing-tagger:: Some old repositories have tags without a tagger. The @@ -142,7 +133,7 @@ by keeping the marks the same across runs. Specify how to handle `encoding` header in commit objects. When asking to 'abort' (which is the default), this program will die when encountering such a commit object. With 'yes', the commit - message will be re-encoded into UTF-8. With 'no', the original + message will be reencoded into UTF-8. With 'no', the original encoding will be preserved. --refspec:: diff --git a/third_party/git/Documentation/git-fast-import.txt b/third_party/git/Documentation/git-fast-import.txt index 7889f95940..fad327aecc 100644 --- a/third_party/git/Documentation/git-fast-import.txt +++ b/third_party/git/Documentation/git-fast-import.txt @@ -51,21 +51,6 @@ OPTIONS memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet. ---allow-unsafe-features:: - Many command-line options can be provided as part of the - fast-import stream itself by using the `feature` or `option` - commands. However, some of these options are unsafe (e.g., - allowing fast-import to access the filesystem outside of the - repository). These options are disabled by default, but can be - allowed by providing this option on the command line. This - currently impacts only the `export-marks`, `import-marks`, and - `import-marks-if-exists` feature commands. -+ - Only enable this option if you trust the program generating the - fast-import stream! This option is enabled automatically for - remote-helpers that use the `import` capability, as they are - already trusted to run their own code. - Options for Frontends ~~~~~~~~~~~~~~~~~~~~~ @@ -352,13 +337,6 @@ and control the current import process. More detailed discussion `commit` command. This command is optional and is not needed to perform an import. -`alias`:: - Record that a mark refers to a given object without first - creating any new object. Using --import-marks and referring - to missing marks will cause fast-import to fail, so aliases - can provide a way to set otherwise pruned commits to a valid - value (e.g. the nearest non-pruned ancestor). - `checkpoint`:: Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. @@ -413,7 +391,7 @@ change to the project. ('encoding' SP <encoding>)? data ('from' SP <commit-ish> LF)? - ('merge' SP <commit-ish> LF)* + ('merge' SP <commit-ish> LF)? (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* LF? .... @@ -796,7 +774,6 @@ lightweight (non-annotated) tags see the `reset` command below. .... 'tag' SP <name> LF - mark? 'from' SP <commit-ish> LF original-oid? 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF @@ -936,21 +913,6 @@ a data chunk which does not have an LF as its last byte. + The `LF` after `<delim> LF` is optional (it used to be required). -`alias` -~~~~~~~ -Record that a mark refers to a given object without first creating any -new object. - -.... - 'alias' LF - mark - 'to' SP <commit-ish> LF - LF? -.... - -For a detailed description of `<commit-ish>` see above under `from`. - - `checkpoint` ~~~~~~~~~~~~ Forces fast-import to close the current packfile, start a new one, and to diff --git a/third_party/git/Documentation/git-filter-branch.txt b/third_party/git/Documentation/git-filter-branch.txt index 40ba4aa3e6..6b53dd7e06 100644 --- a/third_party/git/Documentation/git-filter-branch.txt +++ b/third_party/git/Documentation/git-filter-branch.txt @@ -16,19 +16,6 @@ SYNOPSIS [--original <namespace>] [-d <directory>] [-f | --force] [--state-branch <branch>] [--] [<rev-list options>...] -WARNING -------- -'git filter-branch' has a plethora of pitfalls that can produce non-obvious -manglings of the intended history rewrite (and can leave you with little -time to investigate such problems since it has such abysmal performance). -These safety and performance issues cannot be backward compatibly fixed and -as such, its use is not recommended. Please use an alternative history -filtering tool such as https://github.com/newren/git-filter-repo/[git -filter-repo]. If you still need to use 'git filter-branch', please -carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land -mines of filter-branch, and then vigilantly avoid as many of the hazards -listed there as reasonably possible. - DESCRIPTION ----------- Lets you rewrite Git revision history by rewriting the branches mentioned @@ -458,245 +445,36 @@ warned. (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead). -[[PERFORMANCE]] -PERFORMANCE ------------ - -The performance of git-filter-branch is glacially slow; its design makes it -impossible for a backward-compatible implementation to ever be fast: - -* In editing files, git-filter-branch by design checks out each and - every commit as it existed in the original repo. If your repo has - `10^5` files and `10^5` commits, but each commit only modifies five - files, then git-filter-branch will make you do `10^10` modifications, - despite only having (at most) `5*10^5` unique blobs. - -* If you try and cheat and try to make git-filter-branch only work on - files modified in a commit, then two things happen - - ** you run into problems with deletions whenever the user is simply - trying to rename files (because attempting to delete files that - don't exist looks like a no-op; it takes some chicanery to remap - deletes across file renames when the renames happen via arbitrary - user-provided shell) - - ** even if you succeed at the map-deletes-for-renames chicanery, you - still technically violate backward compatibility because users - are allowed to filter files in ways that depend upon topology of - commits instead of filtering solely based on file contents or - names (though this has not been observed in the wild). - -* Even if you don't need to edit files but only want to e.g. rename or - remove some and thus can avoid checking out each file (i.e. you can - use --index-filter), you still are passing shell snippets for your - filters. This means that for every commit, you have to have a - prepared git repo where those filters can be run. That's a - significant setup. - -* Further, several additional files are created or updated per commit - by git-filter-branch. Some of these are for supporting the - convenience functions provided by git-filter-branch (such as map()), - while others are for keeping track of internal state (but could have - also been accessed by user filters; one of git-filter-branch's - regression tests does so). This essentially amounts to using the - filesystem as an IPC mechanism between git-filter-branch and the - user-provided filters. Disks tend to be a slow IPC mechanism, and - writing these files also effectively represents a forced - synchronization point between separate processes that we hit with - every commit. - -* The user-provided shell commands will likely involve a pipeline of - commands, resulting in the creation of many processes per commit. - Creating and running another process takes a widely varying amount - of time between operating systems, but on any platform it is very - slow relative to invoking a function. - -* git-filter-branch itself is written in shell, which is kind of slow. - This is the one performance issue that could be backward-compatibly - fixed, but compared to the above problems that are intrinsic to the - design of git-filter-branch, the language of the tool itself is a - relatively minor issue. - - ** Side note: Unfortunately, people tend to fixate on the - written-in-shell aspect and periodically ask if git-filter-branch - could be rewritten in another language to fix the performance - issues. Not only does that ignore the bigger intrinsic problems - with the design, it'd help less than you'd expect: if - git-filter-branch itself were not shell, then the convenience - functions (map(), skip_commit(), etc) and the `--setup` argument - could no longer be executed once at the beginning of the program - but would instead need to be prepended to every user filter (and - thus re-executed with every commit). - -The https://github.com/newren/git-filter-repo/[git filter-repo] tool is -an alternative to git-filter-branch which does not suffer from these -performance problems or the safety problems (mentioned below). For those -with existing tooling which relies upon git-filter-branch, 'git -repo-filter' also provides -https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], -a drop-in git-filter-branch replacement (with a few caveats). While -filter-lamely suffers from all the same safety issues as -git-filter-branch, it at least ameliorates the performance issues a -little. - -[[SAFETY]] -SAFETY ------- - -git-filter-branch is riddled with gotchas resulting in various ways to -easily corrupt repos or end up with a mess worse than what you started -with: - -* Someone can have a set of "working and tested filters" which they - document or provide to a coworker, who then runs them on a different - OS where the same commands are not working/tested (some examples in - the git-filter-branch manpage are also affected by this). - BSD vs. GNU userland differences can really bite. If lucky, error - messages are spewed. But just as likely, the commands either don't - do the filtering requested, or silently corrupt by making some - unwanted change. The unwanted change may only affect a few commits, - so it's not necessarily obvious either. (The fact that problems - won't necessarily be obvious means they are likely to go unnoticed - until the rewritten history is in use for quite a while, at which - point it's really hard to justify another flag-day for another - rewrite.) - -* Filenames with spaces are often mishandled by shell snippets since - they cause problems for shell pipelines. Not everyone is familiar - with find -print0, xargs -0, git-ls-files -z, etc. Even people who - are familiar with these may assume such flags are not relevant - because someone else renamed any such files in their repo back - before the person doing the filtering joined the project. And - often, even those familiar with handling arguments with spaces may - not do so just because they aren't in the mindset of thinking about - everything that could possibly go wrong. - -* Non-ascii filenames can be silently removed despite being in a - desired directory. Keeping only wanted paths is often done using - pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`. - ls-files will only quote filenames if needed, so folks may not - notice that one of the files didn't match the regex (at least not - until it's much too late). Yes, someone who knows about - core.quotePath can avoid this (unless they have other special - characters like \t, \n, or "), and people who use ls-files -z with - something other than grep can avoid this, but that doesn't mean they - will. - -* Similarly, when moving files around, one can find that filenames - with non-ascii or special characters end up in a different - directory, one that includes a double quote character. (This is - technically the same issue as above with quoting, but perhaps an - interesting different way that it can and has manifested as a - problem.) - -* It's far too easy to accidentally mix up old and new history. It's - still possible with any tool, but git-filter-branch almost - invites it. If lucky, the only downside is users getting frustrated - that they don't know how to shrink their repo and remove the old - stuff. If unlucky, they merge old and new history and end up with - multiple "copies" of each commit, some of which have unwanted or - sensitive files and others which don't. This comes about in - multiple different ways: - - ** the default to only doing a partial history rewrite ('--all' is not - the default and few examples show it) - - ** the fact that there's no automatic post-run cleanup - - ** the fact that --tag-name-filter (when used to rename tags) doesn't - remove the old tags but just adds new ones with the new name - - ** the fact that little educational information is provided to inform - users of the ramifications of a rewrite and how to avoid mixing old - and new history. For example, this man page discusses how users - need to understand that they need to rebase their changes for all - their branches on top of new history (or delete and reclone), but - that's only one of multiple concerns to consider. See the - "DISCUSSION" section of the git filter-repo manual page for more - details. - -* Annotated tags can be accidentally converted to lightweight tags, - due to either of two issues: - - ** Someone can do a history rewrite, realize they messed up, restore - from the backups in refs/original/, and then redo their - git-filter-branch command. (The backup in refs/original/ is not a - real backup; it dereferences tags first.) - - ** Running git-filter-branch with either --tags or --all in your - <rev-list options>. In order to retain annotated tags as - annotated, you must use --tag-name-filter (and must not have - restored from refs/original/ in a previously botched rewrite). - -* Any commit messages that specify an encoding will become corrupted - by the rewrite; git-filter-branch ignores the encoding, takes the - original bytes, and feeds it to commit-tree without telling it the - proper encoding. (This happens whether or not --msg-filter is - used.) - -* Commit messages (even if they are all UTF-8) by default become - corrupted due to not being updated -- any references to other commit - hashes in commit messages will now refer to no-longer-extant - commits. - -* There are no facilities for helping users find what unwanted crud - they should delete, which means they are much more likely to have - incomplete or partial cleanups that sometimes result in confusion - and people wasting time trying to understand. (For example, folks - tend to just look for big files to delete instead of big directories - or extensions, and once they do so, then sometime later folks using - the new repository who are going through history will notice a build - artifact directory that has some files but not others, or a cache of - dependencies (node_modules or similar) which couldn't have ever been - functional since it's missing some files.) - -* If --prune-empty isn't specified, then the filtering process can - create hoards of confusing empty commits - -* If --prune-empty is specified, then intentionally placed empty - commits from before the filtering operation are also pruned instead - of just pruning commits that became empty due to filtering rules. - -* If --prune-empty is specified, sometimes empty commits are missed - and left around anyway (a somewhat rare bug, but it happens...) - -* A minor issue, but users who have a goal to update all names and - emails in a repository may be led to --env-filter which will only - update authors and committers, missing taggers. - -* If the user provides a --tag-name-filter that maps multiple tags to - the same name, no warning or error is provided; git-filter-branch - simply overwrites each tag in some undocumented pre-defined order - resulting in only one tag at the end. (A git-filter-branch - regression test requires this surprising behavior.) - -Also, the poor performance of git-filter-branch often leads to safety -issues: - -* Coming up with the correct shell snippet to do the filtering you - want is sometimes difficult unless you're just doing a trivial - modification such as deleting a couple files. Unfortunately, people - often learn if the snippet is right or wrong by trying it out, but - the rightness or wrongness can vary depending on special - circumstances (spaces in filenames, non-ascii filenames, funny - author names or emails, invalid timezones, presence of grafts or - replace objects, etc.), meaning they may have to wait a long time, - hit an error, then restart. The performance of git-filter-branch is - so bad that this cycle is painful, reducing the time available to - carefully re-check (to say nothing about what it does to the - patience of the person doing the rewrite even if they do technically - have more time available). This problem is extra compounded because - errors from broken filters may not be shown for a long time and/or - get lost in a sea of output. Even worse, broken filters often just - result in silent incorrect rewrites. - -* To top it all off, even when users finally find working commands, - they naturally want to share them. But they may be unaware that - their repo didn't have some special cases that someone else's does. - So, when someone else with a different repository runs the same - commands, they get hit by the problems above. Or, the user just - runs commands that really were vetted for special cases, but they - run it on a different OS where it doesn't work, as noted above. +NOTES +----- + +git-filter-branch allows you to make complex shell-scripted rewrites +of your Git history, but you probably don't need this flexibility if +you're simply _removing unwanted data_ like large files or passwords. +For those operations you may want to consider +http://rtyley.github.io/bfg-repo-cleaner/[The BFG Repo-Cleaner], +a JVM-based alternative to git-filter-branch, typically at least +10-50x faster for those use-cases, and with quite different +characteristics: + +* Any particular version of a file is cleaned exactly _once_. The BFG, + unlike git-filter-branch, does not give you the opportunity to + handle a file differently based on where or when it was committed + within your history. This constraint gives the core performance + benefit of The BFG, and is well-suited to the task of cleansing bad + data - you don't care _where_ the bad data is, you just want it + _gone_. + +* By default The BFG takes full advantage of multi-core machines, + cleansing commit file-trees in parallel. git-filter-branch cleans + commits sequentially (i.e. in a single-threaded manner), though it + _is_ possible to write filters that include their own parallelism, + in the scripts executed against each commit. + +* The http://rtyley.github.io/bfg-repo-cleaner/#examples[command options] + are much more restrictive than git-filter branch, and dedicated just + to the tasks of removing unwanted data- e.g: + `--strip-blobs-bigger-than 1M`. GIT --- diff --git a/third_party/git/Documentation/git-format-patch.txt b/third_party/git/Documentation/git-format-patch.txt index 0d4f8951bb..b9b97e63ae 100644 --- a/third_party/git/Documentation/git-format-patch.txt +++ b/third_party/git/Documentation/git-format-patch.txt @@ -17,10 +17,9 @@ SYNOPSIS [--signature-file=<file>] [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files] - [--in-reply-to=<message id>] [--suffix=.<sfx>] + [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] - [--cover-from-description=<mode>] - [--rfc] [--subject-prefix=<subject prefix>] + [--rfc] [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] @@ -67,8 +66,7 @@ they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option. The `-o` option takes precedence over `format.outputDirectory`. To store patches in the current working directory even when -`format.outputDirectory` points elsewhere, use `-o .`. All directory -components will be created. +`format.outputDirectory` points elsewhere, use `-o .`. By default, the subject of a single patch is "[PATCH] " followed by the concatenation of lines from the commit message up to the first blank @@ -161,9 +159,9 @@ Beware that the default for 'git send-email' is to thread emails itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`. ---in-reply-to=<message id>:: +--in-reply-to=Message-Id:: Make the first mail (or all the mails with `--no-thread`) appear as a - reply to the given <message id>, which avoids breaking threads to + reply to the given Message-Id, which avoids breaking threads to provide a new patch series. --ignore-if-in-upstream:: @@ -173,29 +171,9 @@ will want to ensure that threading is disabled for `git send-email`. patches being generated, and any patch that matches is ignored. ---cover-from-description=<mode>:: - Controls which parts of the cover letter will be automatically - populated using the branch's description. -+ -If `<mode>` is `message` or `default`, the cover letter subject will be -populated with placeholder text. The body of the cover letter will be -populated with the branch's description. This is the default mode when -no configuration nor command line option is specified. -+ -If `<mode>` is `subject`, the first paragraph of the branch description will -populate the cover letter subject. The remainder of the description will -populate the body of the cover letter. -+ -If `<mode>` is `auto`, if the first paragraph of the branch description -is greater than 100 bytes, then the mode will be `message`, otherwise -`subject` will be used. -+ -If `<mode>` is `none`, both the cover letter subject and body will be -populated with placeholder text. - ---subject-prefix=<subject prefix>:: +--subject-prefix=<Subject-Prefix>:: Instead of the standard '[PATCH]' prefix in the subject - line, instead use '[<subject prefix>]'. This + line, instead use '[<Subject-Prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option. @@ -333,12 +311,10 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`. Output an all-zero hash in each patch's From header instead of the hash of the commit. ---[no-]base[=<commit>]:: +--base=<commit>:: Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section - below for details. If <commit> is "auto", a base commit is - automatically chosen. The `--no-base` option overrides a - `format.useAutoBase` configuration. + below for details. --root:: Treat the revision argument as a <revision range>, even if it @@ -354,9 +330,8 @@ CONFIGURATION ------------- You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when -outputting more than one patch, add "To:" or "Cc:" headers, configure -attachments, change the patch output directory, and sign off patches -with configuration variables. +outputting more than one patch, add "To" or "Cc:" headers, configure +attachments, and sign off patches with configuration variables. ------------ [format] @@ -368,9 +343,7 @@ with configuration variables. cc = <email> attach [ = mime-boundary-string ] signOff = true - outputDirectory = <directory> - coverLetter = auto - coverFromDescription = auto + coverletter = auto ------------ diff --git a/third_party/git/Documentation/git-gc.txt b/third_party/git/Documentation/git-gc.txt index 0c114ad1ca..247f765604 100644 --- a/third_party/git/Documentation/git-gc.txt +++ b/third_party/git/Documentation/git-gc.txt @@ -115,14 +115,15 @@ NOTES ----- 'git gc' tries very hard not to delete objects that are referenced -anywhere in your repository. In particular, it will keep not only -objects referenced by your current set of branches and tags, but also -objects referenced by the index, remote-tracking branches, notes saved -by 'git notes' under refs/notes/, reflogs (which may reference commits -in branches that were later amended or rewound), and anything else in -the refs/* namespace. If you are expecting some objects to be deleted -and they aren't, check all of those locations and decide whether it -makes sense in your case to remove those references. +anywhere in your repository. In +particular, it will keep not only objects referenced by your current set +of branches and tags, but also objects referenced by the index, +remote-tracking branches, refs saved by 'git filter-branch' in +refs/original/, reflogs (which may reference commits in branches +that were later amended or rewound), and anything else in the refs/* namespace. +If you are expecting some objects to be deleted and they aren't, check +all of those locations and decide whether it makes sense in your case to +remove those references. On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using diff --git a/third_party/git/Documentation/git-grep.txt b/third_party/git/Documentation/git-grep.txt index ddb6acc025..2d27969057 100644 --- a/third_party/git/Documentation/git-grep.txt +++ b/third_party/git/Documentation/git-grep.txt @@ -59,8 +59,8 @@ grep.extendedRegexp:: other than 'default'. grep.threads:: - Number of grep worker threads to use. If unset (or set to 0), Git will - use as many threads as the number of logical cores available. + Number of grep worker threads to use. If unset (or set to 0), + 8 threads are used by default (for now). grep.fullName:: If set to true, enable `--full-name` option by default. @@ -96,8 +96,7 @@ OPTIONS Recursively search in each submodule that has been initialized and checked out in the repository. When used in combination with the <tree> option the prefix of all submodule output will be the name of - the parent project's <tree> object. This option has no effect - if `--no-index` is given. + the parent project's <tree> object. -a:: --text:: @@ -272,23 +271,6 @@ providing this option will cause it to die. -f <file>:: Read patterns from <file>, one per line. -+ -Passing the pattern via <file> allows for providing a search pattern -containing a \0. -+ -Not all pattern types support patterns containing \0. Git will error -out if a given pattern type can't support such a pattern. The -`--perl-regexp` pattern type when compiled against the PCRE v2 backend -has the widest support for these types of patterns. -+ -In versions of Git before 2.23.0 patterns containing \0 would be -silently considered fixed. This was never documented, there were also -odd and undocumented interactions between e.g. non-ASCII patterns -containing \0 and `--ignore-case`. -+ -In future versions we may learn to support patterns containing \0 for -more search backends, until then we'll die when the pattern type in -question doesn't support them. -e:: The next parameter is the pattern. This option has to be @@ -348,17 +330,6 @@ EXAMPLES `git grep solution -- :^Documentation`:: Looks for `solution`, excluding files in `Documentation`. -NOTES ON THREADS ----------------- - -The `--threads` option (and the grep.threads configuration) will be ignored when -`--open-files-in-pager` is used, forcing a single-threaded execution. - -When grepping the object store (with `--cached` or giving tree objects), running -with multiple threads might perform slower than single threaded if `--textconv` -is given and there're too many text conversions. So if you experience low -performance in this case, it might be desirable to use `--threads=1`. - GIT --- Part of the linkgit:git[1] suite diff --git a/third_party/git/Documentation/git-gui.txt b/third_party/git/Documentation/git-gui.txt index c9d7e96214..5f93f8003d 100644 --- a/third_party/git/Documentation/git-gui.txt +++ b/third_party/git/Documentation/git-gui.txt @@ -112,9 +112,15 @@ Other versions are distributed as part of the Git suite for the convenience of end users. -The official repository of the 'git gui' project can be found at: +A 'git gui' development repository can be obtained from: - https://github.com/prati0100/git-gui.git/ + git clone git://repo.or.cz/git-gui.git + +or + + git clone http://repo.or.cz/r/git-gui.git + +or browsed online at http://repo.or.cz/w/git-gui.git/[]. GIT --- diff --git a/third_party/git/Documentation/git-log.txt b/third_party/git/Documentation/git-log.txt index bed09bb09e..b406bc4c48 100644 --- a/third_party/git/Documentation/git-log.txt +++ b/third_party/git/Documentation/git-log.txt @@ -76,12 +76,8 @@ produced by `--stat`, etc. (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only - give zero or one positive revision arguments, and - <start> and <end> (or <funcname>) must exist in the starting revision. - You can specify this option more than once. Implies `--patch`. - Patch output can be suppressed using `--no-patch`, but other diff formats - (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, - `--name-only`, `--name-status`, `--check`) are not currently implemented. + give zero or one positive revision arguments. + You can specify this option more than once. + include::line-range-format.txt[] diff --git a/third_party/git/Documentation/git-ls-remote.txt b/third_party/git/Documentation/git-ls-remote.txt index 0a5c8b7d49..0b057cbb10 100644 --- a/third_party/git/Documentation/git-ls-remote.txt +++ b/third_party/git/Documentation/git-ls-remote.txt @@ -28,9 +28,7 @@ OPTIONS Limit to only refs/heads and refs/tags, respectively. These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are - displayed. Note that `git ls-remote -h` used without - anything else on the command line gives help, consistent - with other git subcommands. + displayed. --refs:: Do not show peeled tags or pseudorefs like `HEAD` in the output. @@ -94,23 +92,21 @@ OPTIONS EXAMPLES -------- ----- -$ git ls-remote --tags ./. -d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99 -f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1 -7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3 -c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 -0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub -$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc -5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master -c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu -$ git remote add korg http://www.kernel.org/pub/scm/git/git.git -$ git ls-remote --tags korg v\* -d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99 -f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1 -c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 -7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3 ----- + $ git ls-remote --tags ./. + d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99 + f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1 + 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3 + c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 + 0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub + $ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc + 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master + c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu + $ git remote add korg http://www.kernel.org/pub/scm/git/git.git + $ git ls-remote --tags korg v\* + d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99 + f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1 + c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 + 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3 SEE ALSO -------- diff --git a/third_party/git/Documentation/git-merge-base.txt b/third_party/git/Documentation/git-merge-base.txt index 2d944e0851..261d5c1164 100644 --- a/third_party/git/Documentation/git-merge-base.txt +++ b/third_party/git/Documentation/git-merge-base.txt @@ -80,11 +80,9 @@ which is reachable from both 'A' and 'B' through the parent relationship. For example, with this topology: -.... - o---o---o---B - / ----o---1---o---o---o---A -.... + o---o---o---B + / + ---o---1---o---o---o---A the merge base between 'A' and 'B' is '1'. @@ -92,25 +90,21 @@ Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology: -.... - o---o---o---o---C - / - / o---o---o---B - / / ----2---1---o---o---o---A -.... + o---o---o---o---C + / + / o---o---o---B + / / + ---2---1---o---o---o---A the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is: -.... - o---o---o---o---o - / \ - / o---o---o---o---M - / / ----2---1---o---o---o---A -.... + o---o---o---o---o + / \ + / o---o---o---o---M + / / + ---2---1---o---o---o---A and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, @@ -122,13 +116,11 @@ the best common ancestor of all commits. When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology: -.... ----1---o---A - \ / - X - / \ ----2---o---o---B -.... + ---1---o---A + \ / + X + / \ + ---2---o---o---B both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, @@ -139,22 +131,18 @@ and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts. -.... -A=$(git rev-parse --verify A) -if test "$A" = "$(git merge-base A B)" -then - ... A is an ancestor of B ... -fi -.... + A=$(git rev-parse --verify A) + if test "$A" = "$(git merge-base A B)" + then + ... A is an ancestor of B ... + fi In modern git, you can say this in a more direct way: -.... -if git merge-base --is-ancestor A B -then - ... A is an ancestor of B ... -fi -.... + if git merge-base --is-ancestor A B + then + ... A is an ancestor of B ... + fi instead. @@ -166,15 +154,13 @@ topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape: -.... - o---B2 - / ----o---o---B1--o---o---o---B (origin/master) - \ - B0 - \ - D0---D1---D (topic) -.... + o---B2 + / + ---o---o---B1--o---o---o---B (origin/master) + \ + B0 + \ + D0---D1---D (topic) where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back @@ -207,15 +193,13 @@ will find B0, and will replay D0, D1 and D on top of B to create a new history of this shape: -.... - o---B2 - / ----o---o---B1--o---o---o---B (origin/master) - \ \ - B0 D0'--D1'--D' (topic - updated) - \ - D0---D1---D (topic - old) -.... + o---B2 + / + ---o---o---B1--o---o---o---B (origin/master) + \ \ + B0 D0'--D1'--D' (topic - updated) + \ + D0---D1---D (topic - old) A caveat is that older reflog entries in your repository may be expired by `git gc`. If B0 no longer appears in the reflog of the diff --git a/third_party/git/Documentation/git-merge-index.txt b/third_party/git/Documentation/git-merge-index.txt index 2ab84a91e5..02676fb391 100644 --- a/third_party/git/Documentation/git-merge-index.txt +++ b/third_party/git/Documentation/git-merge-index.txt @@ -54,24 +54,20 @@ original is first. But the argument order to the 3-way merge program Examples: ----- -torvalds@ppc970:~/merge-test> git merge-index cat MM -This is MM from the original tree. # original -This is modified MM in the branch A. # merge1 -This is modified MM in the branch B. # merge2 -This is modified MM in the branch B. # current contents ----- + torvalds@ppc970:~/merge-test> git merge-index cat MM + This is MM from the original tree. # original + This is modified MM in the branch A. # merge1 + This is modified MM in the branch B. # merge2 + This is modified MM in the branch B. # current contents or ----- -torvalds@ppc970:~/merge-test> git merge-index cat AA MM -cat: : No such file or directory -This is added AA in the branch A. -This is added AA in the branch B. -This is added AA in the branch B. -fatal: merge program failed ----- + torvalds@ppc970:~/merge-test> git merge-index cat AA MM + cat: : No such file or directory + This is added AA in the branch A. + This is added AA in the branch B. + This is added AA in the branch B. + fatal: merge program failed where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error diff --git a/third_party/git/Documentation/git-merge.txt b/third_party/git/Documentation/git-merge.txt index 092529c619..01fd52dc70 100644 --- a/third_party/git/Documentation/git-merge.txt +++ b/third_party/git/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] + [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] 'git merge' (--continue | --abort | --quit) diff --git a/third_party/git/Documentation/git-multi-pack-index.txt b/third_party/git/Documentation/git-multi-pack-index.txt index 642d9ac5b7..233b2b7862 100644 --- a/third_party/git/Documentation/git-multi-pack-index.txt +++ b/third_party/git/Documentation/git-multi-pack-index.txt @@ -9,7 +9,7 @@ git-multi-pack-index - Write and verify multi-pack-indexes SYNOPSIS -------- [verse] -'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress] <subcommand> +'git multi-pack-index' [--object-dir=<dir>] <subcommand> DESCRIPTION ----------- @@ -23,10 +23,6 @@ OPTIONS `<dir>/packs/multi-pack-index` for the current MIDX file, and `<dir>/packs` for the pack-files to index. ---[no-]progress:: - Turn progress on/off explicitly. If neither is specified, progress is - shown if standard error is connected to a terminal. - The following subcommands are available: write:: diff --git a/third_party/git/Documentation/git-notes.txt b/third_party/git/Documentation/git-notes.txt index ced2e8280e..f56a5a9197 100644 --- a/third_party/git/Documentation/git-notes.txt +++ b/third_party/git/Documentation/git-notes.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git notes' [list [<object>]] 'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] -'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] ) +'git notes' copy [-f] ( --stdin | <from-object> <to-object> ) 'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>] 'git notes' edit [--allow-empty] [<object>] 'git notes' show [<object>] @@ -68,8 +68,8 @@ add:: subcommand). copy:: - Copy the notes for the first object onto the second object (defaults to - HEAD). Abort if the second object already has notes, or if the first + Copy the notes for the first object onto the second object. + Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>` diff --git a/third_party/git/Documentation/git-range-diff.txt b/third_party/git/Documentation/git-range-diff.txt index 9701c1e5fd..8a6ea2c6c5 100644 --- a/third_party/git/Documentation/git-range-diff.txt +++ b/third_party/git/Documentation/git-range-diff.txt @@ -57,10 +57,6 @@ to revert to color all lines according to the outer diff markers See the ``Algorithm`` section below for an explanation why this is needed. ---[no-]notes[=<ref>]:: - This flag is passed to the `git log` program - (see linkgit:git-log[1]) that generates the patches. - <range1> <range2>:: Compare the commits specified by the two ranges, where `<range1>` is considered an older version of `<range2>`. @@ -79,7 +75,7 @@ to revert to color all lines according to the outer diff markers linkgit:git-diff[1]), most notably the `--color=[<when>]` and `--no-color` options. These options are used when generating the "diff between patches", i.e. to compare the author, commit message and diff of -corresponding old/new commits. There is currently no means to tweak most of the +corresponding old/new commits. There is currently no means to tweak the diff options passed to `git log` when generating those patches. OUTPUT STABILITY @@ -246,7 +242,7 @@ corresponding. The overall time needed to compute this algorithm is the time needed to compute n+m commit diffs and then n*m diffs of patches, plus the time -needed to compute the least-cost assignment between n and m diffs. Git +needed to compute the least-cost assigment between n and m diffs. Git uses an implementation of the Jonker-Volgenant algorithm to solve the assignment problem, which has cubic runtime complexity. The matching found in this case will look like this: diff --git a/third_party/git/Documentation/git-read-tree.txt b/third_party/git/Documentation/git-read-tree.txt index da33f84f33..d271842608 100644 --- a/third_party/git/Documentation/git-read-tree.txt +++ b/third_party/git/Documentation/git-read-tree.txt @@ -436,7 +436,7 @@ support. SEE ALSO -------- linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; -linkgit:gitignore[5]; linkgit:git-sparse-checkout[1]; +linkgit:gitignore[5] GIT --- diff --git a/third_party/git/Documentation/git-rebase.txt b/third_party/git/Documentation/git-rebase.txt index f7a6033607..6156609cf7 100644 --- a/third_party/git/Documentation/git-rebase.txt +++ b/third_party/git/Documentation/git-rebase.txt @@ -8,8 +8,8 @@ git-rebase - Reapply commits on top of another base tip SYNOPSIS -------- [verse] -'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] - [--onto <newbase> | --keep-base] [<upstream> [<branch>]] +'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>] + [<upstream> [<branch>]] 'git rebase' [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>] --root [<branch>] 'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch) @@ -217,24 +217,6 @@ As a special case, you may use "A\...B" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD. ---keep-base:: - Set the starting point at which to create the new commits to the - merge base of <upstream> <branch>. Running - 'git rebase --keep-base <upstream> <branch>' is equivalent to - running 'git rebase --onto <upstream>... <upstream>'. -+ -This option is useful in the case where one is developing a feature on -top of an upstream branch. While the feature is being worked on, the -upstream branch may advance and it may not be the best idea to keep -rebasing on top of the upstream but to keep the base commit as-is. -+ -Although both this option and --fork-point find the merge base between -<upstream> and <branch>, this option uses the merge base as the _starting -point_ on which new commits will be created, whereas --fork-point uses -the merge base to determine the _set of commits_ which will be rebased. -+ -See also INCOMPATIBLE OPTIONS below. - <upstream>:: Upstream branch to compare against. May be any valid commit, not just an existing branch name. Defaults to the configured @@ -258,45 +240,16 @@ See also INCOMPATIBLE OPTIONS below. original branch. The index and working tree are also left unchanged as a result. ---apply: - Use applying strategies to rebase (calling `git-am` - internally). This option may become a no-op in the future - once the merge backend handles everything the apply one does. -+ -See also INCOMPATIBLE OPTIONS below. - ---empty={drop,keep,ask}:: - How to handle commits that are not empty to start and are not - clean cherry-picks of any upstream commit, but which become - empty after rebasing (because they contain a subset of already - upstream changes). With drop (the default), commits that - become empty are dropped. With keep, such commits are kept. - With ask (implied by --interactive), the rebase will halt when - an empty commit is applied allowing you to choose whether to - drop it, edit files more, or just commit the empty changes. - Other options, like --exec, will use the default of drop unless - -i/--interactive is explicitly specified. -+ -Note that commits which start empty are kept, and commits which are -clean cherry-picks (as determined by `git log --cherry-mark ...`) are -always dropped. -+ -See also INCOMPATIBLE OPTIONS below. - --keep-empty:: - No-op. Rebasing commits that started empty (had no change - relative to their parent) used to fail and this option would - override that behavior, allowing commits with empty changes to - be rebased. Now commits with no changes do not cause rebasing - to halt. + Keep the commits that do not change anything from its + parents in the result. + -See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below. +See also INCOMPATIBLE OPTIONS below. --allow-empty-message:: - No-op. Rebasing commits with an empty message used to fail - and this option would override that behavior, allowing commits - with empty messages to be rebased. Now commits with an empty - message do not cause rebasing to halt. + By default, rebasing commits with an empty message will fail. + This option overrides that behavior, allowing commits with empty + messages to be rebased. + See also INCOMPATIBLE OPTIONS below. @@ -315,7 +268,7 @@ See also INCOMPATIBLE OPTIONS below. --merge:: Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the - upstream side. This is the default. + upstream side. + Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch. Because of this, when a merge @@ -385,7 +338,7 @@ See also INCOMPATIBLE OPTIONS below. Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is - ever ignored. Implies --apply. + ever ignored. + See also INCOMPATIBLE OPTIONS below. @@ -416,16 +369,11 @@ ends up being empty, the <upstream> will be used as a fallback. + If either <upstream> or --root is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`. -+ -If your branch was based on <upstream> but <upstream> was rewound and -your branch contains commits which were dropped, this option can be used -with `--keep-base` in order to drop those commits from your branch. --ignore-whitespace:: --whitespace=<option>:: - These flags are passed to the 'git apply' program + These flag are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. - Implies --apply. + See also INCOMPATIBLE OPTIONS below. @@ -473,8 +421,8 @@ the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified). + The `--rebase-merges` mode is similar in spirit to the deprecated -`--preserve-merges` but works with interactive rebases, -where commits can be reordered, inserted and dropped at will. +`--preserve-merges`, but in contrast to that option works well in interactive +rebases: commits can be reordered, inserted and dropped at will. + It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via @@ -569,11 +517,10 @@ INCOMPATIBLE OPTIONS The following options: - * --apply * --committer-date-is-author-date * --ignore-date - * --ignore-whitespace * --whitespace + * --ignore-whitespace * -C are incompatible with the following options: @@ -588,7 +535,6 @@ are incompatible with the following options: * --interactive * --exec * --keep-empty - * --empty= * --edit-todo * --root when used in combination with --onto @@ -597,137 +543,33 @@ In addition, the following pairs of options are incompatible: * --preserve-merges and --interactive * --preserve-merges and --signoff * --preserve-merges and --rebase-merges - * --preserve-merges and --empty= - * --keep-base and --onto - * --keep-base and --root + * --rebase-merges and --strategy + * --rebase-merges and --strategy-option BEHAVIORAL DIFFERENCES ----------------------- -git rebase has two primary backends: apply and merge. (The apply -backend used to known as the 'am' backend, but the name led to -confusion as it looks like a verb instead of a noun. Also, the merge -backend used to be known as the interactive backend, but it is now -used for non-interactive cases as well. Both were renamed based on -lower-level functionality that underpinned each.) There are some -subtle differences in how these two backends behave: +There are some subtle differences how the backends behave. Empty commits ~~~~~~~~~~~~~ -The apply backend unfortunately drops intentionally empty commits, i.e. -commits that started empty, though these are rare in practice. It -also drops commits that become empty and has no option for controlling -this behavior. +The am backend drops any "empty" commits, regardless of whether the +commit started empty (had no changes relative to its parent to +start with) or ended empty (all changes were already applied +upstream in other commits). -The merge backend keeps intentionally empty commits. Similar to the -apply backend, by default the merge backend drops commits that become -empty unless -i/--interactive is specified (in which case it stops and -asks the user what to do). The merge backend also has an ---empty={drop,keep,ask} option for changing the behavior of handling -commits that become empty. +The interactive backend drops commits by default that +started empty and halts if it hits a commit that ended up empty. +The `--keep-empty` option exists for the interactive backend to allow +it to keep commits that started empty. Directory rename detection ~~~~~~~~~~~~~~~~~~~~~~~~~~ -Due to the lack of accurate tree information (arising from -constructing fake ancestors with the limited information available in -patches), directory rename detection is disabled in the apply backend. -Disabled directory rename detection means that if one side of history -renames a directory and the other adds new files to the old directory, -then the new files will be left behind in the old directory without -any warning at the time of rebasing that you may want to move these -files into the new directory. - -Directory rename detection works with the merge backend to provide you -warnings in such cases. - -Context -~~~~~~~ - -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 -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 -areas of the code have the same surrounding lines of context, the -wrong one can be picked. There are real-world cases where this has -caused commits to be reapplied incorrectly with no conflicts reported. -Setting diff.context to a larger value may prevent such types of -problems, but increases the chance of spurious conflicts (since it -will require more lines of matching context to apply). - -The merge backend works with a full copy of each relevant file, -insulating it from these types of problems. - -Labelling of conflicts markers -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -When there are content conflicts, the merge machinery tries to -annotate each side's conflict markers with the commits where the -content came from. Since the apply backend drops the original -information about the rebased commits and their parents (and instead -generates new fake commits based off limited information in the -generated patches), those commits cannot be identified; instead it has -to fall back to a commit summary. Also, when merge.conflictStyle is -set to diff3, the apply backend will use "constructed merge base" to -label the content from the merge base, and thus provide no information -about the merge base commit whatsoever. - -The merge backend works with the full commits on both sides of history -and thus has no such limitations. - -Hooks -~~~~~ - -The apply backend has not traditionally called the post-commit hook, -while the merge backend has. However, this was by accident of -implementation rather than by design. Both backends should have the -same behavior, though it is not clear which one is correct. - -Interruptability -~~~~~~~~~~~~~~~~ - -The apply backend has safety problems with an ill-timed interrupt; if -the user presses Ctrl-C at the wrong time to try to abort the rebase, -the rebase can enter a state where it cannot be aborted with a -subsequent `git rebase --abort`. The merge backend does not appear to -suffer from the same shortcoming. (See -https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for -details.) - -Commit Rewording -~~~~~~~~~~~~~~~~ - -When a conflict occurs while rebasing, rebase stops and asks the user -to resolve. Since the user may need to make notable changes while -resolving conflicts, after conflicts are resolved and the user has run -`git rebase --continue`, the rebase should open an editor and ask the -user to update the commit message. The merge backend does this, while -the apply backend blindly applies the original commit message. - -Miscellaneous differences -~~~~~~~~~~~~~~~~~~~~~~~~~ - -There are a few more behavioral differences that most folks would -probably consider inconsequential but which are mentioned for -completeness: - -* Reflog: The two backends will use different wording when describing - the changes made in the reflog, though both will make use of the - word "rebase". - -* Progress, informational, and error messages: The two backends - provide slightly different progress and informational messages. - Also, the apply backend writes error messages (such as "Your files - would be overwritten...") to stdout, while the merge backend writes - them to stderr. - -* State directories: The two backends keep their state in different - directories under .git/ +Directory rename heuristics are enabled in the merge and interactive +backends. Due to the lack of accurate tree information, directory +rename detection is disabled in the am backend. include::merge-strategies.txt[] @@ -990,8 +832,7 @@ Hard case: The changes are not the same.:: This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or - a full history rewriting command like - https://github.com/newren/git-filter-repo[`filter-repo`]. + `filter-branch`. The easy case @@ -1029,7 +870,7 @@ NOTE: While an "easy case recovery" sometimes appears to be successful --interactive` will be **resurrected**! The idea is to manually tell 'git rebase' "where the old 'subsystem' -ended and your 'topic' began", that is, what the old merge base +ended and your 'topic' began", that is, what the old merge-base between them was. You will have to find a way to name the last commit of the old 'subsystem', for example: diff --git a/third_party/git/Documentation/git-receive-pack.txt b/third_party/git/Documentation/git-receive-pack.txt index 25702ed730..dedf97efbb 100644 --- a/third_party/git/Documentation/git-receive-pack.txt +++ b/third_party/git/Documentation/git-receive-pack.txt @@ -165,31 +165,29 @@ ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service: ----- -#!/bin/sh -# mail out commit update information. -while read oval nval ref -do - if expr "$oval" : '0*$' >/dev/null + #!/bin/sh + # mail out commit update information. + while read oval nval ref + do + if expr "$oval" : '0*$' >/dev/null + then + echo "Created a new ref, with the following commits:" + git rev-list --pretty "$nval" + else + echo "New commits:" + git rev-list --pretty "$nval" "^$oval" + fi | + mail -s "Changes to ref $ref" commit-list@mydomain + done + # log signed push certificate, if any + if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G then - echo "Created a new ref, with the following commits:" - git rev-list --pretty "$nval" - else - echo "New commits:" - git rev-list --pretty "$nval" "^$oval" - fi | - mail -s "Changes to ref $ref" commit-list@mydomain -done -# log signed push certificate, if any -if test -n "${GIT_PUSH_CERT-}" && test ${GIT_PUSH_CERT_STATUS} = G -then - ( - echo expected nonce is ${GIT_PUSH_NONCE} - git cat-file blob ${GIT_PUSH_CERT} - ) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain -fi -exit 0 ----- + ( + echo expected nonce is ${GIT_PUSH_NONCE} + git cat-file blob ${GIT_PUSH_CERT} + ) | mail -s "push certificate from $GIT_PUSH_CERT_SIGNER" push-log@mydomain + fi + exit 0 The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message. @@ -214,10 +212,8 @@ anyway. This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport. ----- -#!/bin/sh -exec git update-server-info ----- + #!/bin/sh + exec git update-server-info QUARANTINE ENVIRONMENT diff --git a/third_party/git/Documentation/git-replace.txt b/third_party/git/Documentation/git-replace.txt index f271d758c3..246dc9943c 100644 --- a/third_party/git/Documentation/git-replace.txt +++ b/third_party/git/Documentation/git-replace.txt @@ -123,10 +123,10 @@ The following format are available: CREATING REPLACEMENT OBJECTS ---------------------------- -linkgit:git-hash-object[1], linkgit:git-rebase[1], and -https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to -create replacement objects from existing objects. The `--edit` option -can also be used with 'git replace' to create a replacement object by +linkgit:git-filter-branch[1], linkgit:git-hash-object[1] and +linkgit:git-rebase[1], among other git commands, can be used to create +replacement objects from existing objects. The `--edit` option can +also be used with 'git replace' to create a replacement object by editing an existing object. If you want to replace many blobs, trees or commits that are part of a @@ -148,13 +148,13 @@ pending objects. SEE ALSO -------- linkgit:git-hash-object[1] +linkgit:git-filter-branch[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] -https://github.com/newren/git-filter-repo[git-filter-repo] GIT --- diff --git a/third_party/git/Documentation/git-reset.txt b/third_party/git/Documentation/git-reset.txt index 932080c55d..97e0544d9e 100644 --- a/third_party/git/Documentation/git-reset.txt +++ b/third_party/git/Documentation/git-reset.txt @@ -8,36 +8,34 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [-q] [<tree-ish>] [--] <pathspec>... -'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>] -'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...] +'git reset' [-q] [<tree-ish>] [--] <paths>... +'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...] 'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION ----------- -In the first three forms, copy entries from `<tree-ish>` to the index. -In the last form, set the current branch head (`HEAD`) to `<commit>`, +In the first and second form, copy entries from `<tree-ish>` to the index. +In the third form, set the current branch head (`HEAD`) to `<commit>`, optionally modifying index and working tree to match. The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms. -'git reset' [-q] [<tree-ish>] [--] <pathspec>...:: -'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]:: - These forms reset the index entries for all paths that match the - `<pathspec>` to their state at `<tree-ish>`. (It does not affect - the working tree or the current branch.) +'git reset' [-q] [<tree-ish>] [--] <paths>...:: + This form resets the index entries for all `<paths>` to their + state at `<tree-ish>`. (It does not affect the working tree or + the current branch.) + -This means that `git reset <pathspec>` is the opposite of `git add -<pathspec>`. This command is equivalent to -`git restore [--source=<tree-ish>] --staged <pathspec>...`. +This means that `git reset <paths>` is the opposite of `git add +<paths>`. This command is equivalent to +`git restore [--source=<tree-ish>] --staged <paths>...`. + -After running `git reset <pathspec>` to update the index entry, you can +After running `git reset <paths>` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go. -'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]:: +'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]:: Interactively select hunks in the difference between the index and `<tree-ish>` (defaults to `HEAD`). The chosen hunks are applied in reverse to the index. @@ -103,26 +101,6 @@ OPTIONS `reset.quiet` config option. `--quiet` and `--no-quiet` will override the default behavior. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be - quoted as explained for the configuration variable `core.quotePath` - (see linkgit:git-config[1]). See also `--pathspec-file-nul` and - global `--literal-pathspecs`. - ---pathspec-file-nul:: - Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken - literally (including newlines and quotes). - -\--:: - Do not interpret any more arguments as options. - -<pathspec>...:: - Limits the paths affected by the operation. -+ -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. EXAMPLES -------- diff --git a/third_party/git/Documentation/git-restore.txt b/third_party/git/Documentation/git-restore.txt index 5bf60d4943..1ab2e40ea9 100644 --- a/third_party/git/Documentation/git-restore.txt +++ b/third_party/git/Documentation/git-restore.txt @@ -8,9 +8,8 @@ git-restore - Restore working tree files SYNOPSIS -------- [verse] -'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>... -'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul] -'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...] +'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>... +'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...] DESCRIPTION ----------- @@ -114,27 +113,6 @@ in linkgit:git-checkout[1] for details. appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be - quoted as explained for the configuration variable `core.quotePath` - (see linkgit:git-config[1]). See also `--pathspec-file-nul` and - global `--literal-pathspecs`. - ---pathspec-file-nul:: - Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken - literally (including newlines and quotes). - -\--:: - Do not interpret any more arguments as options. - -<pathspec>...:: - Limits the paths affected by the operation. -+ -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. - EXAMPLES -------- diff --git a/third_party/git/Documentation/git-rev-list.txt b/third_party/git/Documentation/git-rev-list.txt index 025c911436..9392760b25 100644 --- a/third_party/git/Documentation/git-rev-list.txt +++ b/third_party/git/Documentation/git-rev-list.txt @@ -9,7 +9,59 @@ git-rev-list - Lists commit objects in reverse chronological order SYNOPSIS -------- [verse] -'git rev-list' [<options>] <commit>... [[--] <path>...] +'git rev-list' [ --max-count=<number> ] + [ --skip=<number> ] + [ --max-age=<timestamp> ] + [ --min-age=<timestamp> ] + [ --sparse ] + [ --merges ] + [ --no-merges ] + [ --min-parents=<number> ] + [ --no-min-parents ] + [ --max-parents=<number> ] + [ --no-max-parents ] + [ --first-parent ] + [ --remove-empty ] + [ --full-history ] + [ --not ] + [ --all ] + [ --branches[=<pattern>] ] + [ --tags[=<pattern>] ] + [ --remotes[=<pattern>] ] + [ --glob=<glob-pattern> ] + [ --ignore-missing ] + [ --stdin ] + [ --quiet ] + [ --topo-order ] + [ --parents ] + [ --timestamp ] + [ --left-right ] + [ --left-only ] + [ --right-only ] + [ --cherry-mark ] + [ --cherry-pick ] + [ --encoding=<encoding> ] + [ --(author|committer|grep)=<pattern> ] + [ --regexp-ignore-case | -i ] + [ --extended-regexp | -E ] + [ --fixed-strings | -F ] + [ --date=<format>] + [ [ --objects | --objects-edge | --objects-edge-aggressive ] + [ --unpacked ] + [ --object-names | --no-object-names ] + [ --filter=<filter-spec> [ --filter-print-omitted ] ] ] + [ --missing=<missing-action> ] + [ --pretty | --header ] + [ --bisect ] + [ --bisect-vars ] + [ --bisect-all ] + [ --merge ] + [ --reverse ] + [ --walk-reflogs ] + [ --no-walk ] [ --do-walk ] + [ --count ] + [ --use-bitmap-index ] + <commit>... [ \-- <paths>... ] DESCRIPTION ----------- diff --git a/third_party/git/Documentation/git-rev-parse.txt b/third_party/git/Documentation/git-rev-parse.txt index 19b12b6d43..e72d332b83 100644 --- a/third_party/git/Documentation/git-rev-parse.txt +++ b/third_party/git/Documentation/git-rev-parse.txt @@ -262,8 +262,7 @@ print a message to stderr and exit with nonzero status. directory. --show-toplevel:: - Show the absolute path of the top-level directory of the working - tree. If there is no working tree, report an error. + Show the absolute path of the top-level directory. --show-superproject-working-tree:: Show the absolute path of the root of the superproject's @@ -275,13 +274,6 @@ print a message to stderr and exit with nonzero status. Show the path to the shared index file in split index mode, or empty if not in split-index mode. ---show-object-format[=(storage|input|output)]:: - Show the object format (hash algorithm) used for the repository - for storage inside the `.git` directory, input, or output. For - input, multiple algorithms may be printed, space-separated. - If not specified, the default is "storage". - - Other Options ~~~~~~~~~~~~~ diff --git a/third_party/git/Documentation/git-rm.txt b/third_party/git/Documentation/git-rm.txt index ab750367fd..b5c46223c4 100644 --- a/third_party/git/Documentation/git-rm.txt +++ b/third_party/git/Documentation/git-rm.txt @@ -8,18 +8,16 @@ git-rm - Remove files from the working tree and from the index SYNOPSIS -------- [verse] -'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] - [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]] - [--] [<pathspec>...] +'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>... DESCRIPTION ----------- -Remove files matching pathspec from the index, or from the working tree -and the index. `git rm` will not remove a file from just your working -directory. (There is no option to remove a file only from the working -tree and yet keep it in the index; use `/bin/rm` if you want to do -that.) The files being removed have to be identical to the tip of the -branch, and no updates to their contents can be staged in the index, +Remove files from the index, or from the working tree and the index. +`git rm` will not remove a file from just your working directory. +(There is no option to remove a file only from the working tree +and yet keep it in the index; use `/bin/rm` if you want to do that.) +The files being removed have to be identical to the tip of the branch, +and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, @@ -28,20 +26,15 @@ allowing the file to be removed from just the index. OPTIONS ------- -<pathspec>...:: - Files to remove. A leading directory name (e.g. `dir` to remove - `dir/file1` and `dir/file2`) can be given to remove all files in - the directory, and recursively all sub-directories, but this - requires the `-r` option to be explicitly given. -+ -The command removes only the paths that are known to Git. -+ -File globbing matches across directory boundaries. Thus, given two -directories `d` and `d2`, there is a difference between using -`git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all -of directory `d2`. -+ -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. +<file>...:: + Files to remove. Fileglobs (e.g. `*.c`) can be given to + remove all matching files. If you want Git to expand + file glob characters, you may need to shell-escape them. + A leading directory name + (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be + given to remove all files in the directory, and recursively + all sub-directories, + but this requires the `-r` option to be explicitly given. -f:: --force:: @@ -75,19 +68,19 @@ For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. `git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output. ---pathspec-from-file=<file>:: - Pathspec is passed in `<file>` instead of commandline args. If - `<file>` is exactly `-` then standard input is used. Pathspec - elements are separated by LF or CR/LF. Pathspec elements can be - quoted as explained for the configuration variable `core.quotePath` - (see linkgit:git-config[1]). See also `--pathspec-file-nul` and - global `--literal-pathspecs`. ---pathspec-file-nul:: - Only meaningful with `--pathspec-from-file`. Pathspec elements are - separated with NUL character and all other characters are taken - literally (including newlines and quotes). +DISCUSSION +---------- + +The <file> list given to the command can be exact pathnames, +file glob patterns, or leading directory names. The command +removes only the paths that are known to Git. Giving the name of +a file that you have not told Git about does not remove that file. +File globbing matches across directory boundaries. Thus, given +two directories `d` and `d2`, there is a difference between +using `git rm 'd*'` and `git rm 'd/*'`, as the former will +also remove all of directory `d2`. REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM -------------------------------------------------------- diff --git a/third_party/git/Documentation/git-send-email.txt b/third_party/git/Documentation/git-send-email.txt index 0a69810147..d93e5d0f58 100644 --- a/third_party/git/Documentation/git-send-email.txt +++ b/third_party/git/Documentation/git-send-email.txt @@ -486,13 +486,11 @@ Use gmail as the smtp server To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings: ----- -[sendemail] - smtpEncryption = tls - smtpServer = smtp.gmail.com - smtpUser = yourname@gmail.com - smtpServerPort = 587 ----- + [sendemail] + smtpEncryption = tls + smtpServer = smtp.gmail.com + smtpUser = yourname@gmail.com + smtpServerPort = 587 If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit diff --git a/third_party/git/Documentation/git-shortlog.txt b/third_party/git/Documentation/git-shortlog.txt index a72ea7f7ba..bc80905a8a 100644 --- a/third_party/git/Documentation/git-shortlog.txt +++ b/third_party/git/Documentation/git-shortlog.txt @@ -76,9 +76,6 @@ them. Paths may need to be prefixed with `--` to separate them from options or the revision range, when confusion arises. -:git-shortlog: 1 -include::rev-list-options.txt[] - MAPPING AUTHORS --------------- diff --git a/third_party/git/Documentation/git-sparse-checkout.txt b/third_party/git/Documentation/git-sparse-checkout.txt deleted file mode 100644 index c0342e5393..0000000000 --- a/third_party/git/Documentation/git-sparse-checkout.txt +++ /dev/null @@ -1,207 +0,0 @@ -git-sparse-checkout(1) -====================== - -NAME ----- -git-sparse-checkout - Initialize and modify the sparse-checkout -configuration, which reduces the checkout to a set of paths -given by a list of patterns. - - -SYNOPSIS --------- -[verse] -'git sparse-checkout <subcommand> [options]' - - -DESCRIPTION ------------ - -Initialize and modify the sparse-checkout configuration, which reduces -the checkout to a set of paths given by a list of patterns. - -THIS COMMAND IS EXPERIMENTAL. ITS BEHAVIOR, AND THE BEHAVIOR OF OTHER -COMMANDS IN THE PRESENCE OF SPARSE-CHECKOUTS, WILL LIKELY CHANGE IN -THE FUTURE. - - -COMMANDS --------- -'list':: - Describe the patterns in the sparse-checkout file. - -'init':: - Enable the `core.sparseCheckout` setting. If the - sparse-checkout file does not exist, then populate it with - patterns that match every file in the root directory and - no other directories, then will remove all directories tracked - by Git. Add patterns to the sparse-checkout file to - repopulate the working directory. -+ -To avoid interfering with other worktrees, it first enables the -`extensions.worktreeConfig` setting and makes sure to set the -`core.sparseCheckout` setting in the worktree-specific config file. -+ -When `--cone` is provided, the `core.sparseCheckoutCone` setting is -also set, allowing for better performance with a limited set of -patterns (see 'CONE PATTERN SET' below). - -'set':: - Write a set of patterns to the sparse-checkout file, as given as - a list of arguments following the 'set' subcommand. Update the - working directory to match the new patterns. Enable the - core.sparseCheckout config setting if it is not already enabled. -+ -When the `--stdin` option is provided, the patterns are read from -standard in as a newline-delimited list instead of from the arguments. -+ -When `core.sparseCheckoutCone` is enabled, the input list is considered a -list of directories instead of sparse-checkout patterns. The command writes -patterns to the sparse-checkout file to include all files contained in those -directories (recursively) as well as files that are siblings of ancestor -directories. The input format matches the output of `git ls-tree --name-only`. -This includes interpreting pathnames that begin with a double quote (") as -C-style quoted strings. - -'add':: - Update the sparse-checkout file to include additional patterns. - By default, these patterns are read from the command-line arguments, - but they can be read from stdin using the `--stdin` option. When - `core.sparseCheckoutCone` is enabled, the given patterns are interpreted - as directory names as in the 'set' subcommand. - -'disable':: - Disable the `core.sparseCheckout` config setting, and restore the - working directory to include all files. Leaves the sparse-checkout - file intact so a later 'git sparse-checkout init' command may - return the working directory to the same state. - -SPARSE CHECKOUT ---------------- - -"Sparse checkout" allows populating the working directory sparsely. -It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell -Git whether a file in the working directory is worth looking at. If -the skip-worktree bit is set, then the file is ignored in the working -directory. Git will not populate the contents of those files, which -makes a sparse checkout helpful when working in a repository with many -files, but only a few are important to the current user. - -The `$GIT_DIR/info/sparse-checkout` file is used to define the -skip-worktree reference bitmap. When Git updates the working -directory, it updates the skip-worktree bits in the index based -on this file. The files matching the patterns in the file will -appear in the working directory, and the rest will not. - -To enable the sparse-checkout feature, run `git sparse-checkout init` to -initialize a simple sparse-checkout file and enable the `core.sparseCheckout` -config setting. Then, run `git sparse-checkout set` to modify the patterns in -the sparse-checkout file. - -To repopulate the working directory with all files, use the -`git sparse-checkout disable` command. - - -FULL PATTERN SET ----------------- - -By default, the sparse-checkout file uses the same syntax as `.gitignore` -files. - -While `$GIT_DIR/info/sparse-checkout` is usually used to specify what -files are included, you can also specify what files are _not_ included, -using negative patterns. For example, to remove the file `unwanted`: - ----------------- -/* -!unwanted ----------------- - - -CONE PATTERN SET ----------------- - -The full pattern set allows for arbitrary pattern matches and complicated -inclusion/exclusion rules. These can result in O(N*M) pattern matches when -updating the index, where N is the number of patterns and M is the number -of paths in the index. To combat this performance issue, a more restricted -pattern set is allowed when `core.sparseCheckoutCone` is enabled. - -The accepted patterns in the cone pattern set are: - -1. *Recursive:* All paths inside a directory are included. - -2. *Parent:* All files immediately inside a directory are included. - -In addition to the above two patterns, we also expect that all files in the -root directory are included. If a recursive pattern is added, then all -leading directories are added as parent patterns. - -By default, when running `git sparse-checkout init`, the root directory is -added as a parent pattern. At this point, the sparse-checkout file contains -the following patterns: - ----------------- -/* -!/*/ ----------------- - -This says "include everything in root, but nothing two levels below root." - -When in cone mode, the `git sparse-checkout set` subcommand takes a list of -directories instead of a list of sparse-checkout patterns. In this mode, -the command `git sparse-checkout set A/B/C` sets the directory `A/B/C` as -a recursive pattern, the directories `A` and `A/B` are added as parent -patterns. The resulting sparse-checkout file is now - ----------------- -/* -!/*/ -/A/ -!/A/*/ -/A/B/ -!/A/B/*/ -/A/B/C/ ----------------- - -Here, order matters, so the negative patterns are overridden by the positive -patterns that appear lower in the file. - -If `core.sparseCheckoutCone=true`, then Git will parse the sparse-checkout file -expecting patterns of these types. Git will warn if the patterns do not match. -If the patterns do match the expected format, then Git will use faster hash- -based algorithms to compute inclusion in the sparse-checkout. - -In the cone mode case, the `git sparse-checkout list` subcommand will list the -directories that define the recursive patterns. For the example sparse-checkout -file above, the output is as follows: - --------------------------- -$ git sparse-checkout list -A/B/C --------------------------- - -If `core.ignoreCase=true`, then the pattern-matching algorithm will use a -case-insensitive check. This corrects for case mismatched filenames in the -'git sparse-checkout set' command to reflect the expected cone in the working -directory. - - -SUBMODULES ----------- - -If your repository contains one or more submodules, then those submodules will -appear based on which you initialized with the `git submodule` command. If -your sparse-checkout patterns exclude an initialized submodule, then that -submodule will still appear in your working directory. - - -SEE ALSO --------- - -linkgit:git-read-tree[1] -linkgit:gitignore[5] - -GIT ---- -Part of the linkgit:git[1] suite diff --git a/third_party/git/Documentation/git-stash.txt b/third_party/git/Documentation/git-stash.txt index 31f1beb65b..8fbe12c66c 100644 --- a/third_party/git/Documentation/git-stash.txt +++ b/third_party/git/Documentation/git-stash.txt @@ -15,7 +15,6 @@ SYNOPSIS 'git stash' branch <branchname> [<stash>] 'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] [-u|--include-untracked] [-a|--all] [-m|--message <message>] - [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]] 'git stash' clear 'git stash' create [<message>] @@ -44,10 +43,10 @@ created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`). -COMMANDS --------- +OPTIONS +------- -push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]:: +push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]:: Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). @@ -57,15 +56,39 @@ push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q For quickly making a snapshot, you can omit "push". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this -are `stash -p` which acts as alias for `stash push -p` and pathspec elements, +are `stash -p` which acts as alias for `stash push -p` and pathspecs, which are allowed after a double hyphen `--` for disambiguation. ++ +When pathspec is given to 'git stash push', the new stash entry records the +modified states only for the files that match the pathspec. The index +entries and working tree files are then rolled back to the state in +HEAD only for these files, too, leaving files that do not match the +pathspec intact. ++ +If the `--keep-index` option is used, all changes already added to the +index are left intact. ++ +If the `--include-untracked` option is used, all untracked files are also +stashed and then cleaned up with `git clean`, leaving the working directory +in a very clean state. If the `--all` option is used instead then the +ignored files are stashed and cleaned in addition to the untracked files. ++ +With `--patch`, you can interactively select hunks from the diff +between HEAD and the working tree to be stashed. The stash entry is +constructed such that its index state is the same as the index state +of your repository, and its worktree contains only the changes you +selected interactively. The selected changes are then rolled back +from your worktree. See the ``Interactive Mode'' section of +linkgit:git-add[1] to learn how to operate the `--patch` mode. ++ +The `--patch` option implies `--keep-index`. You can use +`--no-keep-index` to override this. save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]:: This option is deprecated in favour of 'git stash push'. It - differs from "stash push" in that it cannot take pathspec. - Instead, all non-option arguments are concatenated to form the stash - message. + differs from "stash push" in that it cannot take pathspecs, + and any non-option arguments form the message. list [<options>]:: @@ -87,7 +110,7 @@ show [<options>] [<stash>]:: Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first - created. + created. When no `<stash>` is given, it shows the latest one. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). @@ -104,6 +127,14 @@ pop [--index] [-q|--quiet] [<stash>]:: Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards. ++ +If the `--index` option is used, then tries to reinstate not only the working +tree's changes, but also the index's ones. However, this can fail, when you +have conflicts (which are stored in the index, where you therefore can no +longer apply the changes as they were originally). ++ +When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must +be a reference of the form `stash@{<revision>}`. apply [--index] [-q|--quiet] [<stash>]:: @@ -117,7 +148,8 @@ branch <branchname> [<stash>]:: the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form - `stash@{<revision>}`, it then drops the `<stash>`. + `stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>` + is given, applies the latest one. + This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since @@ -133,6 +165,9 @@ clear:: drop [-q|--quiet] [<stash>]:: Remove a single stash entry from the list of stash entries. + When no `<stash>` is given, it removes the latest one. + i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash + log reference of the form `stash@{<revision>}`. create:: @@ -149,98 +184,6 @@ store:: reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see "push" above. -OPTIONS -------- --a:: ---all:: - This option is only valid for `push` and `save` commands. -+ -All ignored and untracked files are also stashed and then cleaned -up with `git clean`. - --u:: ---include-untracked:: - This option is only valid for `push` and `save` commands. -+ -All untracked files are also stashed and then cleaned up with -`git clean`. - ---index:: - This option is only valid for `pop` and `apply` commands. -+ -Tries to reinstate not only the working tree's changes, but also -the index's ones. However, this can fail, when you have conflicts -(which are stored in the index, where you therefore can no longer -apply the changes as they were originally). - --k:: ---keep-index:: ---no-keep-index:: - This option is only valid for `push` and `save` commands. -+ -All changes already added to the index are left intact. - --p:: ---patch:: - This option is only valid for `push` and `save` commands. -+ -Interactively select hunks from the diff between HEAD and the -working tree to be stashed. The stash entry is constructed such -that its index state is the same as the index state of your -repository, and its worktree contains only the changes you selected -interactively. The selected changes are then rolled back from your -worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] -to learn how to operate the `--patch` mode. -+ -The `--patch` option implies `--keep-index`. You can use -`--no-keep-index` to override this. - ---pathspec-from-file=<file>:: - This option is only valid for `push` command. -+ -Pathspec is passed in `<file>` instead of commandline args. If -`<file>` is exactly `-` then standard input is used. Pathspec -elements are separated by LF or CR/LF. Pathspec elements can be -quoted as explained for the configuration variable `core.quotePath` -(see linkgit:git-config[1]). See also `--pathspec-file-nul` and -global `--literal-pathspecs`. - ---pathspec-file-nul:: - This option is only valid for `push` command. -+ -Only meaningful with `--pathspec-from-file`. Pathspec elements are -separated with NUL character and all other characters are taken -literally (including newlines and quotes). - --q:: ---quiet:: - This option is only valid for `apply`, `drop`, `pop`, `push`, - `save`, `store` commands. -+ -Quiet, suppress feedback messages. - -\--:: - This option is only valid for `push` command. -+ -Separates pathspec from options for disambiguation purposes. - -<pathspec>...:: - This option is only valid for `push` command. -+ -The new stash entry records the modified states only for the files -that match the pathspec. The index entries and working tree files -are then rolled back to the state in HEAD only for these files, -too, leaving files that do not match the pathspec intact. -+ -For more details, see the 'pathspec' entry in linkgit:gitglossary[7]. - -<stash>:: - This option is only valid for `apply`, `branch`, `drop`, `pop`, - `show` commands. -+ -A reference of the form `stash@{<revision>}`. When no `<stash>` is -given, the latest stash is assumed (that is, `stash@{0}`). - DISCUSSION ---------- diff --git a/third_party/git/Documentation/git-status.txt b/third_party/git/Documentation/git-status.txt index 7731b45f07..d4e8f24f0c 100644 --- a/third_party/git/Documentation/git-status.txt +++ b/third_party/git/Documentation/git-status.txt @@ -59,17 +59,16 @@ This is optional and defaults to the original version 'v1' format. --untracked-files[=<mode>]:: Show untracked files. + --- The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`). - ++ The possible options are: - ++ - 'no' - Show no untracked files. - 'normal' - Shows untracked files and directories. - 'all' - Also shows individual files in untracked directories. - ++ When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work @@ -79,10 +78,9 @@ Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files. - ++ The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]. --- --ignore-submodules[=<when>]:: Ignore changes to submodules when looking for changes. <when> can be @@ -102,12 +100,11 @@ configuration variable documented in linkgit:git-config[1]. --ignored[=<mode>]:: Show ignored files as well. + --- The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'. - ++ The possible options are: - ++ - 'traditional' - Shows ignored files and directories, unless --untracked-files=all is specified, in which case individual files in ignored directories are @@ -115,13 +112,12 @@ The possible options are: - 'no' - Show no ignored files. - 'matching' - Shows ignored files and directories matching an ignore pattern. - ++ When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown. --- -z:: Terminate entries with NUL, instead of LF. This implies diff --git a/third_party/git/Documentation/git-submodule.txt b/third_party/git/Documentation/git-submodule.txt index c9ed2bf3d5..0ed5c24dc1 100644 --- a/third_party/git/Documentation/git-submodule.txt +++ b/third_party/git/Documentation/git-submodule.txt @@ -16,7 +16,6 @@ SYNOPSIS 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...) 'git submodule' [--quiet] update [<options>] [--] [<path>...] 'git submodule' [--quiet] set-branch [<options>] [--] <path> -'git submodule' [--quiet] set-url [--] <path> <newurl> 'git submodule' [--quiet] summary [<options>] [--] [<path>...] 'git submodule' [--quiet] foreach [--recursive] <command> 'git submodule' [--quiet] sync [--recursive] [--] [<path>...] @@ -81,9 +80,6 @@ status [--cached] [--recursive] [--] [<path>...]:: does not match the SHA-1 found in the index of the containing repository and `U` if the submodule has merge conflicts. + -If `--cached` is specified, this command will instead print the SHA-1 -recorded in the superproject for each submodule. -+ If `--recursive` is specified, this command will recurse into nested submodules, and show their status as well. + @@ -133,12 +129,11 @@ If you really want to remove a submodule from the repository and commit that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal options. -update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]:: +update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]:: + -- Update the registered submodules to match what the superproject -expects by cloning missing submodules, fetching missing commits -in submodules and updating the working tree of +expects by cloning missing submodules and updating the working tree of the submodules. The "updating" can be done in several ways depending on command line options and the value of `submodule.<name>.update` configuration variable. The command line option takes precedence over @@ -178,18 +173,12 @@ submodule with the `--init` option. If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within. -- -set-branch (-b|--branch) <branch> [--] <path>:: -set-branch (-d|--default) [--] <path>:: +set-branch ((-d|--default)|(-b|--branch <branch>)) [--] <path>:: Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'. -set-url [--] <path> <newurl>:: - Sets the URL of the specified submodule to <newurl>. Then, it will - automatically synchronize the submodule's new remote URL - configuration. - summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]:: Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits @@ -229,7 +218,7 @@ As an example, the command below will show the path and currently checked out commit for each submodule: + -------------- -git submodule foreach 'echo $sm_path `git rev-parse HEAD`' +git submodule foreach 'echo $path `git rev-parse HEAD`' -------------- sync [--recursive] [--] [<path>...]:: @@ -248,7 +237,7 @@ registered submodules, and sync any nested submodules within. absorbgitdirs:: If a git directory of a submodule is inside the submodule, - move the git directory of the submodule into its superproject's + move the git directory of the submodule into its superprojects `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the @@ -430,10 +419,6 @@ options carefully. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option. ---[no-]single-branch:: - This option is only valid for the update command. - Clone only one branch during update: HEAD or one specified by --branch. - <path>...:: Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. diff --git a/third_party/git/Documentation/git-svn.txt b/third_party/git/Documentation/git-svn.txt index 6624a14fbd..30711625fd 100644 --- a/third_party/git/Documentation/git-svn.txt +++ b/third_party/git/Documentation/git-svn.txt @@ -677,8 +677,7 @@ config key: svn.authorsProg -s<strategy>:: --strategy=<strategy>:: -p:: ---rebase-merges:: ---preserve-merges (DEPRECATED):: +--preserve-merges:: These are only used with the 'dcommit' and 'rebase' commands. + Passed directly to 'git rebase' when using 'dcommit' if a @@ -770,11 +769,11 @@ option for (hopefully) obvious reasons. + This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug -reports, and archives. If you plan to eventually migrate from SVN to -Git and are certain about dropping SVN history, consider -https://github.com/newren/git-filter-repo[git-filter-repo] instead. -filter-repo also allows reformatting of metadata for ease-of-reading -and rewriting authorship info for non-"svn.authorsFile" users. +reports and archives. If you plan to eventually migrate from SVN to Git +and are certain about dropping SVN history, consider +linkgit:git-filter-branch[1] instead. filter-branch also allows +reformatting of metadata for ease-of-reading and rewriting authorship +info for non-"svn.authorsFile" users. svn.useSvmProps:: svn-remote.<name>.useSvmProps:: diff --git a/third_party/git/Documentation/git-tag.txt b/third_party/git/Documentation/git-tag.txt index f6d9791780..2e5599a67f 100644 --- a/third_party/git/Documentation/git-tag.txt +++ b/third_party/git/Documentation/git-tag.txt @@ -65,7 +65,7 @@ OPTIONS --sign:: Make a GPG-signed tag, using the default e-mail address's key. The default behavior of tag GPG-signing is controlled by `tag.gpgSign` - configuration variable if it exists, or disabled otherwise. + configuration variable if it exists, or disabled oder otherwise. See linkgit:git-config[1]. --no-sign:: diff --git a/third_party/git/Documentation/git-update-index.txt b/third_party/git/Documentation/git-update-index.txt index 1489cb09a0..1c4d146a41 100644 --- a/third_party/git/Documentation/git-update-index.txt +++ b/third_party/git/Documentation/git-update-index.txt @@ -16,7 +16,6 @@ SYNOPSIS [--chmod=(+|-)x] [--[no-]assume-unchanged] [--[no-]skip-worktree] - [--[no-]ignore-skip-worktree-entries] [--[no-]fsmonitor-valid] [--ignore-submodules] [--[no-]split-index] @@ -114,11 +113,6 @@ you will need to handle the situation manually. set and unset the "skip-worktree" bit for the paths. See section "Skip-worktree bit" below for more information. - ---[no-]ignore-skip-worktree-entries:: - Do not remove skip-worktree (AKA "index-only") entries even when - the `--remove` option was specified. - --[no-]fsmonitor-valid:: When one of these flags is specified, the object name recorded for the paths are not updated. Instead, these options @@ -432,7 +426,7 @@ specified by the splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1]). To avoid deleting a shared index file that is still used, its -modification time is updated to the current time every time a new split +modification time is updated to the current time everytime a new split index based on the shared index file is either created or read from. UNTRACKED CACHE @@ -549,22 +543,6 @@ The untracked cache extension can be enabled by the `core.untrackedCache` configuration variable (see linkgit:git-config[1]). -NOTES ------ - -Users often try to use the assume-unchanged and skip-worktree bits -to tell Git to ignore changes to files that are tracked. This does not -work as expected, since Git may still check working tree files against -the index when performing certain operations. In general, Git does not -provide a way to ignore changes to tracked files, so alternate solutions -are recommended. - -For example, if the file you want to change is some sort of config file, -the repository can include a sample config file that can then be copied -into the ignored name and modified. The repository can even include a -script to treat the sample file as a template, modifying and copying it -automatically. - SEE ALSO -------- linkgit:git-config[1], diff --git a/third_party/git/Documentation/git.txt b/third_party/git/Documentation/git.txt index b0672bd806..9b82564d1a 100644 --- a/third_party/git/Documentation/git.txt +++ b/third_party/git/Documentation/git.txt @@ -110,23 +110,9 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config Do not pipe Git output into a pager. --git-dir=<path>:: - Set the path to the repository (".git" directory). This can also be - controlled by setting the `GIT_DIR` environment variable. It can be - an absolute path or relative path to current working directory. -+ -Specifying the location of the ".git" directory using this -option (or `GIT_DIR` environment variable) turns off the -repository discovery that tries to find a directory with -".git" subdirectory (which is how the repository and the -top-level of the working tree are discovered), and tells Git -that you are at the top level of the working tree. If you -are not at the top-level directory of the working tree, you -should tell Git where the top-level of the working tree is, -with the `--work-tree=<path>` option (or `GIT_WORK_TREE` -environment variable) -+ -If you just want to run git as if it was started in `<path>` then use -`git -C <path>`. + Set the path to the repository. This can also be controlled by + setting the `GIT_DIR` environment variable. It can be an absolute + path or relative path to current working directory. --work-tree=<path>:: Set the path to the working tree. It can be an absolute path @@ -285,8 +271,8 @@ In general, the interrogate commands do not touch the files in the working tree. -Syncing repositories -~~~~~~~~~~~~~~~~~~~~ +Synching repositories +~~~~~~~~~~~~~~~~~~~~~ include::cmds-synchingrepositories.txt[] @@ -496,36 +482,13 @@ double-quotes and respecting backslash escapes. E.g., the value Git Commits ~~~~~~~~~~~ `GIT_AUTHOR_NAME`:: - The human-readable name used in the author identity when creating commit or - tag objects, or when writing reflogs. Overrides the `user.name` and - `author.name` configuration settings. - `GIT_AUTHOR_EMAIL`:: - The email address used in the author identity when creating commit or - tag objects, or when writing reflogs. Overrides the `user.email` and - `author.email` configuration settings. - `GIT_AUTHOR_DATE`:: - The date used for the author identity when creating commit or tag objects, or - when writing reflogs. See linkgit:git-commit[1] for valid formats. - `GIT_COMMITTER_NAME`:: - The human-readable name used in the committer identity when creating commit or - tag objects, or when writing reflogs. Overrides the `user.name` and - `committer.name` configuration settings. - `GIT_COMMITTER_EMAIL`:: - The email address used in the author identity when creating commit or - tag objects, or when writing reflogs. Overrides the `user.email` and - `committer.email` configuration settings. - `GIT_COMMITTER_DATE`:: - The date used for the committer identity when creating commit or tag objects, or - when writing reflogs. See linkgit:git-commit[1] for valid formats. - -`EMAIL`:: - The email address used in the author and committer identities if no other - relevant environment variable or configuration setting has been set. +'EMAIL':: + see linkgit:git-commit-tree[1] Git Diffs ~~~~~~~~~ @@ -581,10 +544,6 @@ other a pager. See also the `core.pager` option in linkgit:git-config[1]. -`GIT_PROGRESS_DELAY`:: - A number controlling how many seconds to delay before showing - optional progress indicators. Defaults to 2. - `GIT_EDITOR`:: This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by several Git commands when, on interactive mode, @@ -969,7 +928,7 @@ Reporting Bugs Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done. You do not have to be subscribed to the list to send a message there. See the list archive -at https://lore.kernel.org/git for previous bug reports and other +at https://public-inbox.org/git for previous bug reports and other discussions. Issues which are security relevant should be disclosed privately to diff --git a/third_party/git/Documentation/gitattributes.txt b/third_party/git/Documentation/gitattributes.txt index 508fe713c4..fb1d188d44 100644 --- a/third_party/git/Documentation/gitattributes.txt +++ b/third_party/git/Documentation/gitattributes.txt @@ -293,10 +293,10 @@ web front ends do not visualize the contents of these files by default. In these cases you can tell Git the encoding of a file in the working directory with the `working-tree-encoding` attribute. If a file with this -attribute is added to Git, then Git re-encodes the content from the +attribute is added to Git, then Git reencodes the content from the specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded content in its internal data structure (called "the index"). On checkout -the content is re-encoded back to the specified encoding. +the content is reencoded back to the specified encoding. Please note that using the `working-tree-encoding` attribute may have a number of pitfalls: @@ -498,7 +498,7 @@ command. This is achieved by using the long-running process protocol When Git encounters the first file that needs to be cleaned or smudged, it starts the filter and performs the handshake. In the handshake, the welcome message sent by Git is "git-filter-client", only version 2 is -supported, and the supported capabilities are "clean", "smudge", and +suppported, and the supported capabilities are "clean", "smudge", and "delay". Afterwards Git sends a list of "key=value" pairs terminated with @@ -810,10 +810,6 @@ patterns are available: - `css` suitable for cascading style sheets. -- `dts` suitable for devicetree (DTS) files. - -- `elixir` suitable for source code in the Elixir language. - - `fortran` suitable for source code in the Fortran language. - `fountain` suitable for Fountain documents. diff --git a/third_party/git/Documentation/gitcli.txt b/third_party/git/Documentation/gitcli.txt index 92e4ba6a2f..1ed3ca33b7 100644 --- a/third_party/git/Documentation/gitcli.txt +++ b/third_party/git/Documentation/gitcli.txt @@ -37,12 +37,6 @@ arguments. Here are the rules: file called HEAD in your work tree, `git diff HEAD` is ambiguous, and you have to say either `git diff HEAD --` or `git diff -- HEAD` to disambiguate. - - * Because `--` disambiguates revisions and paths in some commands, it - cannot be used for those commands to separate options and revisions. - You can use `--end-of-options` for this (it also works for commands - that do not distinguish between revisions in paths, in which case it - is simply an alias for `--`). + When writing a script that is expected to handle random user-input, it is a good practice to make it explicit which arguments are which by placing @@ -126,11 +120,6 @@ usage: git describe [<options>] <commit-ish>* --long always use long format --abbrev[=<n>] use <n> digits to display SHA-1s --------------------------------------------- -+ -Note that some subcommand (e.g. `git grep`) may behave differently -when there are things on the command line other than `-h`, but `git -subcmd -h` without anything else on the command line is meant to -consistently give the usage. --help-all:: Some Git commands take options that are only used for plumbing or that @@ -216,8 +205,8 @@ only affects the files in the working tree, but with entries, and with `--cached`, it modifies only the index entries. -See also https://lore.kernel.org/git/7v64clg5u9.fsf@assigned-by-dhcp.cox.net/ and -https://lore.kernel.org/git/7vy7ej9g38.fsf@gitster.siamese.dyndns.org/ for further +See also http://marc.info/?l=git&m=116563135620359 and +http://marc.info/?l=git&m=119150393620273 for further information. Some other commands that also work on files in the working tree and/or diff --git a/third_party/git/Documentation/gitcore-tutorial.txt b/third_party/git/Documentation/gitcore-tutorial.txt index c0b95256cc..f880d21dfb 100644 --- a/third_party/git/Documentation/gitcore-tutorial.txt +++ b/third_party/git/Documentation/gitcore-tutorial.txt @@ -751,7 +751,7 @@ to it. ================================================ If you make the decision to start your new branch at some other point in the history than the current `HEAD`, you can do so by -just telling 'git switch' what the base of the checkout would be. +just telling 'git checkout' what the base of the checkout would be. In other words, if you have an earlier tag or branch, you'd just do ------------ diff --git a/third_party/git/Documentation/gitcredentials.txt b/third_party/git/Documentation/gitcredentials.txt index 1814d2d23c..adc759612d 100644 --- a/third_party/git/Documentation/gitcredentials.txt +++ b/third_party/git/Documentation/gitcredentials.txt @@ -131,9 +131,7 @@ context would not match: because the hostnames differ. Nor would it match `foo.example.com`; Git compares hostnames exactly, without considering whether two hosts are part of the same domain. Likewise, a config entry for `http://example.com` would not -match: Git compares the protocols exactly. However, you may use wildcards in -the domain name and other pattern matching techniques as with the `http.<url>.*` -options. +match: Git compares the protocols exactly. If the "pattern" URL does include a path component, then this too must match exactly: the context `https://example.com/bar/baz.git` will match a config @@ -188,94 +186,8 @@ CUSTOM HELPERS -------------- You can write your own custom helpers to interface with any system in -which you keep credentials. - -Credential helpers are programs executed by Git to fetch or save -credentials from and to long-term storage (where "long-term" is simply -longer than a single Git process; e.g., credentials may be stored -in-memory for a few minutes, or indefinitely on disk). - -Each helper is specified by a single string in the configuration -variable `credential.helper` (and others, see linkgit:git-config[1]). -The string is transformed by Git into a command to be executed using -these rules: - - 1. If the helper string begins with "!", it is considered a shell - snippet, and everything after the "!" becomes the command. - - 2. Otherwise, if the helper string begins with an absolute path, the - verbatim helper string becomes the command. - - 3. Otherwise, the string "git credential-" is prepended to the helper - string, and the result becomes the command. - -The resulting command then has an "operation" argument appended to it -(see below for details), and the result is executed by the shell. - -Here are some example specifications: - ----------------------------------------------------- -# run "git credential-foo" -foo - -# same as above, but pass an argument to the helper -foo --bar=baz - -# the arguments are parsed by the shell, so use shell -# quoting if necessary -foo --bar="whitespace arg" - -# you can also use an absolute path, which will not use the git wrapper -/path/to/my/helper --with-arguments - -# or you can specify your own shell snippet -!f() { echo "password=`cat $HOME/.secret`"; }; f ----------------------------------------------------- - -Generally speaking, rule (3) above is the simplest for users to specify. -Authors of credential helpers should make an effort to assist their -users by naming their program "git-credential-$NAME", and putting it in -the `$PATH` or `$GIT_EXEC_PATH` during installation, which will allow a -user to enable it with `git config credential.helper $NAME`. - -When a helper is executed, it will have one "operation" argument -appended to its command line, which is one of: - -`get`:: - - Return a matching credential, if any exists. - -`store`:: - - Store the credential, if applicable to the helper. - -`erase`:: - - Remove a matching credential, if any, from the helper's storage. - -The details of the credential will be provided on the helper's stdin -stream. The exact format is the same as the input/output format of the -`git credential` plumbing command (see the section `INPUT/OUTPUT -FORMAT` in linkgit:git-credential[1] for a detailed specification). - -For a `get` operation, the helper should produce a list of attributes on -stdout in the same format (see linkgit:git-credential[1] for common -attributes). A helper is free to produce a subset, or even no values at -all if it has nothing useful to provide. Any provided attributes will -overwrite those already known about by Git. If a helper outputs a -`quit` attribute with a value of `true` or `1`, no further helpers will -be consulted, nor will the user be prompted (if no credential has been -provided, the operation will then fail). - -For a `store` or `erase` operation, the helper's output is ignored. -If it fails to perform the requested operation, it may complain to -stderr to inform the user. If it does not support the requested -operation (e.g., a read-only store), it should silently ignore the -request. - -If a helper receives any other operation, it should silently ignore the -request. This leaves room for future operations to be added (older -helpers will just ignore the new requests). +which you keep credentials. See the documentation for Git's +link:technical/api-credentials.html[credentials API] for details. GIT --- diff --git a/third_party/git/Documentation/githooks.txt b/third_party/git/Documentation/githooks.txt index 3dccab5375..82cd573776 100644 --- a/third_party/git/Documentation/githooks.txt +++ b/third_party/git/Documentation/githooks.txt @@ -103,28 +103,6 @@ The default 'pre-commit' hook, when enabled--and with the `hooks.allownonascii` config option unset or set to false--prevents the use of non-ASCII filenames. -pre-merge-commit -~~~~~~~~~~~~~~~~ - -This hook is invoked by linkgit:git-merge[1], and can be bypassed -with the `--no-verify` option. It takes no parameters, and is -invoked after the merge has been carried out successfully and before -obtaining the proposed commit log message to -make a commit. Exiting with a non-zero status from this script -causes the `git merge` command to abort before creating a commit. - -The default 'pre-merge-commit' hook, when enabled, runs the -'pre-commit' hook, if the latter is enabled. - -This hook is invoked with the environment variable -`GIT_EDITOR=:` if the command will not bring up an editor -to modify the commit message. - -If the merge cannot be carried out automatically, the conflicts -need to be resolved and the result committed separately (see -linkgit:git-merge[1]). At that point, this hook will not be executed, -but the 'pre-commit' hook will, if it is enabled. - prepare-commit-msg ~~~~~~~~~~~~~~~~~~ @@ -447,12 +425,10 @@ post-rewrite This hook is invoked by commands that rewrite commits (linkgit:git-commit[1] when called with `--amend` and -linkgit:git-rebase[1]; however, full-history (re)writing tools like -linkgit:git-fast-import[1] or -https://github.com/newren/git-filter-repo[git-filter-repo] typically -do not call it!). Its first argument denotes the command it was -invoked by: currently one of `amend` or `rebase`. Further -command-dependent arguments may be passed in the future. +linkgit:git-rebase[1]; currently `git filter-branch` does 'not' call +it!). Its first argument denotes the command it was invoked by: +currently one of `amend` or `rebase`. Further command-dependent +arguments may be passed in the future. The hook receives a list of the rewritten commits on stdin, in the format @@ -490,16 +466,9 @@ fsmonitor-watchman ~~~~~~~~~~~~~~~~~~ This hook is invoked when the configuration option `core.fsmonitor` is -set to `.git/hooks/fsmonitor-watchman` or `.git/hooks/fsmonitor-watchmanv2` -depending on the version of the hook to use. - -Version 1 takes two arguments, a version (1) and the time in elapsed -nanoseconds since midnight, January 1, 1970. - -Version 2 takes two arguments, a version (2) and a token that is used -for identifying changes since the token. For watchman this would be -a clock id. This version must output to stdout the new token followed -by a NUL before the list of files. +set to `.git/hooks/fsmonitor-watchman`. It takes two arguments, a version +(currently 1) and the time in elapsed nanoseconds since midnight, +January 1, 1970. The hook should output to stdout the list of all files in the working directory that may have changed since the requested time. The logic diff --git a/third_party/git/Documentation/gitk.txt b/third_party/git/Documentation/gitk.txt index c653ebb6a8..1eabb0aaf3 100644 --- a/third_party/git/Documentation/gitk.txt +++ b/third_party/git/Documentation/gitk.txt @@ -105,12 +105,8 @@ linkgit:git-rev-list[1] for a complete list. (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only - give zero or one positive revision arguments, and - <start> and <end> (or <funcname>) must exist in the starting revision. - You can specify this option more than once. Implies `--patch`. - Patch output can be suppressed using `--no-patch`, but other diff formats - (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, - `--name-only`, `--name-status`, `--check`) are not currently implemented. + give zero or one positive revision arguments. + You can specify this option more than once. + *Note:* gitk (unlike linkgit:git-log[1]) currently only understands this option if you specify it "glued together" with its argument. Do diff --git a/third_party/git/Documentation/gitmodules.txt b/third_party/git/Documentation/gitmodules.txt index 67275fd187..a66e95b70c 100644 --- a/third_party/git/Documentation/gitmodules.txt +++ b/third_party/git/Documentation/gitmodules.txt @@ -44,8 +44,9 @@ submodule.<name>.update:: submodule init` to initialize the configuration variable of the same name. Allowed values here are 'checkout', 'rebase', 'merge' or 'none'. See description of 'update' command in - linkgit:git-submodule[1] for their meaning. For security - reasons, the '!command' form is not accepted here. + linkgit:git-submodule[1] for their meaning. Note that the + '!command' form is intentionally ignored here for security + reasons. submodule.<name>.branch:: A remote branch name for tracking updates in the upstream submodule. @@ -80,7 +81,7 @@ submodule.<name>.ignore:: Committed differences and modifications to tracked files will show up. - none;; No modifications to submodules are ignored, all of committed + none;; No modifiations to submodules are ignored, all of committed differences, and modifications to tracked and untracked files are shown. This is the default option. @@ -89,7 +90,7 @@ of the superproject, the setting there will override the one found in .gitmodules. Both settings can be overridden on the command line by using the -"--ignore-submodules" option. The 'git submodule' commands are not +"--ignore-submodule" option. The 'git submodule' commands are not affected by this setting. -- @@ -104,15 +105,14 @@ EXAMPLES Consider the following .gitmodules file: ----- -[submodule "libfoo"] - path = include/foo - url = git://foo.com/git/lib.git + [submodule "libfoo"] + path = include/foo + url = git://foo.com/git/lib.git + + [submodule "libbar"] + path = include/bar + url = git://bar.com/git/lib.git -[submodule "libbar"] - path = include/bar - url = git://bar.com/git/lib.git ----- This defines two submodules, `libfoo` and `libbar`. These are expected to be checked out in the paths `include/foo` and `include/bar`, and for both @@ -120,7 +120,7 @@ submodules a URL is specified which can be used for cloning the submodules. SEE ALSO -------- -linkgit:git-submodule[1], linkgit:gitsubmodules[7], linkgit:git-config[1] +linkgit:git-submodule[1] linkgit:git-config[1] GIT --- diff --git a/third_party/git/Documentation/gitremote-helpers.txt b/third_party/git/Documentation/gitremote-helpers.txt index f48a031dc3..43f80c8068 100644 --- a/third_party/git/Documentation/gitremote-helpers.txt +++ b/third_party/git/Documentation/gitremote-helpers.txt @@ -297,13 +297,9 @@ Supported if the helper has the "option" capability. same batch are complete. Only objects which were reported in the output of 'list' with a sha1 may be fetched this way. + -Optionally may output a 'lock <file>' line indicating the full path of -a file under `$GIT_DIR/objects/pack` which is keeping a pack until -refs can be suitably updated. The path must end with `.keep`. This is -a mechanism to name a <pack,idx,keep> tuple by giving only the keep -component. The kept pack will not be deleted by a concurrent repack, -even though its objects may not be referenced until the fetch completes. -The `.keep` file will be deleted at the conclusion of the fetch. +Optionally may output a 'lock <file>' line indicating a file under +GIT_DIR/objects/pack which is keeping a pack until refs can be +suitably updated. + If option 'check-connectivity' is requested, the helper must output 'connectivity-ok' if the clone is self-contained and connected. @@ -509,11 +505,6 @@ set by Git if the remote helper has the 'option' capability. Indicate that only the objects wanted need to be fetched, not their dependents. -'option atomic' {'true'|'false'}:: - When pushing, request the remote server to update refs in a single atomic - transaction. If successful, all refs will be updated, or none will. If the - remote side does not support this capability, the push will fail. - SEE ALSO -------- linkgit:git-remote[1] diff --git a/third_party/git/Documentation/gitrepository-layout.txt b/third_party/git/Documentation/gitrepository-layout.txt index 1a2ef4c150..216b11ee88 100644 --- a/third_party/git/Documentation/gitrepository-layout.txt +++ b/third_party/git/Documentation/gitrepository-layout.txt @@ -59,7 +59,7 @@ objects/[0-9a-f][0-9a-f]:: here are often called 'unpacked' (or 'loose') objects. objects/pack:: - Packs (files that store many objects in compressed form, + Packs (files that store many object in compressed form, along with index files to allow them to be randomly accessed) are found in this directory. @@ -96,9 +96,9 @@ refs:: directory. The 'git prune' command knows to preserve objects reachable from refs found in this directory and its subdirectories. - This directory is ignored (except refs/bisect, - refs/rewritten and refs/worktree) if $GIT_COMMON_DIR is - set and "$GIT_COMMON_DIR/refs" will be used instead. + This directory is ignored (except refs/bisect and + refs/worktree) if $GIT_COMMON_DIR is set and + "$GIT_COMMON_DIR/refs" will be used instead. refs/heads/`name`:: records tip-of-the-tree commit objects of branch `name` @@ -240,8 +240,8 @@ remotes:: logs:: Records of changes made to refs are stored in this directory. See linkgit:git-update-ref[1] for more information. This - directory is ignored (except logs/HEAD) if $GIT_COMMON_DIR is - set and "$GIT_COMMON_DIR/logs" will be used instead. + directory is ignored if $GIT_COMMON_DIR is set and + "$GIT_COMMON_DIR/logs" will be used instead. logs/refs/heads/`name`:: Records all changes made to the branch tip named `name`. diff --git a/third_party/git/Documentation/gitsubmodules.txt b/third_party/git/Documentation/gitsubmodules.txt index c476f891b5..0a890205b8 100644 --- a/third_party/git/Documentation/gitsubmodules.txt +++ b/third_party/git/Documentation/gitsubmodules.txt @@ -3,7 +3,7 @@ gitsubmodules(7) NAME ---- -gitsubmodules - Mounting one repository inside another +gitsubmodules - mounting one repository inside another SYNOPSIS -------- diff --git a/third_party/git/Documentation/gitweb.conf.txt b/third_party/git/Documentation/gitweb.conf.txt index 7963a79ba9..35317e71c8 100644 --- a/third_party/git/Documentation/gitweb.conf.txt +++ b/third_party/git/Documentation/gitweb.conf.txt @@ -786,9 +786,9 @@ forks:: subdirectories of project root (basename) to be forks of existing projects. For each project +$projname.git+, projects in the +$projname/+ directory and its subdirectories will not be - shown in the main projects list. Instead, a \'+' mark is shown - next to `$projname`, which links to a "forks" view that lists all - the forks (all projects in `$projname/` subdirectory). Additionally + shown in the main projects list. Instead, a \'\+' mark is shown + next to +$projname+, which links to a "forks" view that lists all + the forks (all projects in +$projname/+ subdirectory). Additionally a "forks" view for a project is linked from project summary page. + If the project list is taken from a file (+$projects_list+ points to a diff --git a/third_party/git/Documentation/howto/separating-topic-branches.txt b/third_party/git/Documentation/howto/separating-topic-branches.txt index 81be0d6115..bd1027433b 100644 --- a/third_party/git/Documentation/howto/separating-topic-branches.txt +++ b/third_party/git/Documentation/howto/separating-topic-branches.txt @@ -81,7 +81,7 @@ After I am done, I'd try a pretend-merge between "topicA" and o---o---o---o---o---o The last diff better not to show anything other than cleanups -for cruft. Then I can finally clean things up: +for crufts. Then I can finally clean things up: $ git branch -D topic $ git reset --hard HEAD^ ;# nuke pretend merge diff --git a/third_party/git/Documentation/manpage-bold-literal.xsl b/third_party/git/Documentation/manpage-bold-literal.xsl index 94d6c1b545..608eb5df62 100644 --- a/third_party/git/Documentation/manpage-bold-literal.xsl +++ b/third_party/git/Documentation/manpage-bold-literal.xsl @@ -1,13 +1,12 @@ <!-- manpage-bold-literal.xsl: special formatting for manpages rendered from asciidoc+docbook --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:d="http://docbook.org/ns/docbook" version="1.0"> <!-- render literal text as bold (instead of plain or monospace); this makes literal text easier to distinguish in manpages viewed on a tty --> -<xsl:template match="literal|d:literal"> +<xsl:template match="literal"> <xsl:value-of select="$git.docbook.backslash"/> <xsl:text>fB</xsl:text> <xsl:apply-templates/> diff --git a/third_party/git/Documentation/manpage.xsl b/third_party/git/Documentation/manpage.xsl deleted file mode 100644 index ef64bab17a..0000000000 --- a/third_party/git/Documentation/manpage.xsl +++ /dev/null @@ -1,3 +0,0 @@ -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl" /> -</xsl:stylesheet> diff --git a/third_party/git/Documentation/merge-options.txt b/third_party/git/Documentation/merge-options.txt index 40dc4f5e8c..79a00d2a4a 100644 --- a/third_party/git/Documentation/merge-options.txt +++ b/third_party/git/Documentation/merge-options.txt @@ -34,30 +34,26 @@ set to `no` at the beginning of them. --cleanup=<mode>:: This option determines how the merge message will be cleaned up before - committing. See linkgit:git-commit[1] for more details. In addition, if + commiting. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict. --ff:: + When the merge resolves as a fast-forward, only update the branch + pointer, without creating a merge commit. This is the default + behavior. + --no-ff:: + Create a merge commit even when the merge resolves as a + fast-forward. This is the default behaviour when merging an + annotated (and possibly signed) tag that is not stored in + its natural place in 'refs/tags/' hierarchy. + --ff-only:: - Specifies how a merge is handled when the merged-in history is - already a descendant of the current history. `--ff` is the - default unless merging an annotated (and possibly signed) tag - that is not stored in its natural place in the `refs/tags/` - hierarchy, in which case `--no-ff` is assumed. -+ -With `--ff`, when possible resolve the merge as a fast-forward (only -update the branch pointer to match the merged branch; do not create a -merge commit). When not possible (when the merged-in history is not a -descendant of the current history), create a merge commit. -+ -With `--no-ff`, create a merge commit in all cases, even when the merge -could instead be resolved as a fast-forward. -+ -With `--ff-only`, resolve the merge as a fast-forward when possible. -When not possible, refuse to merge and exit with a non-zero status. + Refuse to merge and exit with a non-zero status unless the + current `HEAD` is already up to date or the merge can be + resolved as a fast-forward. -S[<keyid>]:: --gpg-sign[=<keyid>]:: @@ -109,10 +105,6 @@ option can be used to override --squash. + With --squash, --commit is not allowed, and will fail. ---no-verify:: - This option bypasses the pre-merge and commit-msg hooks. - See also linkgit:githooks[5]. - -s <strategy>:: --strategy=<strategy>:: Use the given merge strategy; can be supplied more than diff --git a/third_party/git/Documentation/merge-strategies.txt b/third_party/git/Documentation/merge-strategies.txt index 2912de706b..aa66cbe41e 100644 --- a/third_party/git/Documentation/merge-strategies.txt +++ b/third_party/git/Documentation/merge-strategies.txt @@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options: ours;; This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version. Changes from the other tree that do not - conflict with our side are reflected in the merge result. + conflict with our side are reflected to the merge result. For a binary file, the entire contents are taken from our side. + This should not be confused with the 'ours' merge strategy, which does not diff --git a/third_party/git/Documentation/pretty-formats.txt b/third_party/git/Documentation/pretty-formats.txt index a4b6f49186..079598307a 100644 --- a/third_party/git/Documentation/pretty-formats.txt +++ b/third_party/git/Documentation/pretty-formats.txt @@ -4,7 +4,7 @@ PRETTY FORMATS If the commit is a merge, and if the pretty-format is not 'oneline', 'email' or 'raw', an additional line is inserted before the 'Author:' line. This line begins with -"Merge: " and the hashes of ancestral commits are printed, +"Merge: " and the sha1s of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the *direct* parent commits if you have limited your view of history: for example, if you are @@ -20,20 +20,20 @@ built-in formats: * 'oneline' - <hash> <title line> + <sha1> <title line> + This is designed to be as compact as possible. * 'short' - commit <hash> + commit <sha1> Author: <author> <title line> * 'medium' - commit <hash> + commit <sha1> Author: <author> Date: <author date> @@ -43,7 +43,7 @@ This is designed to be as compact as possible. * 'full' - commit <hash> + commit <sha1> Author: <author> Commit: <committer> @@ -53,7 +53,7 @@ This is designed to be as compact as possible. * 'fuller' - commit <hash> + commit <sha1> Author: <author> AuthorDate: <author date> Commit: <committer> @@ -63,20 +63,9 @@ This is designed to be as compact as possible. <full commit message> -* 'reference' - - <abbrev hash> (<title line>, <short author date>) -+ -This format is used to refer to another commit in a commit message and -is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default, -the date is formatted with `--date=short` unless another `--date` option -is explicitly specified. As with any `format:` with format -placeholders, its output is not affected by other options like -`--decorate` and `--walk-reflogs`. - * 'email' - From <hash> <date> + From <sha1> <date> From: <author> Date: <author date> Subject: [PATCH] <title line> @@ -86,7 +75,7 @@ placeholders, its output is not affected by other options like * 'raw' + The 'raw' format shows the entire commit exactly as -stored in the commit object. Notably, the hashes are +stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the true parent commits, without taking grafts or history @@ -174,32 +163,24 @@ The placeholders are: '%ae':: author email '%aE':: author email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) -'%al':: author email local-part (the part before the '@' sign) -'%aL':: author local-part (see '%al') respecting .mailmap, see - linkgit:git-shortlog[1] or linkgit:git-blame[1]) '%ad':: author date (format respects --date= option) '%aD':: author date, RFC2822 style '%ar':: author date, relative '%at':: author date, UNIX timestamp '%ai':: author date, ISO 8601-like format '%aI':: author date, strict ISO 8601 format -'%as':: author date, short format (`YYYY-MM-DD`) '%cn':: committer name '%cN':: committer name (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) '%ce':: committer email '%cE':: committer email (respecting .mailmap, see linkgit:git-shortlog[1] or linkgit:git-blame[1]) -'%cl':: author email local-part (the part before the '@' sign) -'%cL':: author local-part (see '%cl') respecting .mailmap, see - linkgit:git-shortlog[1] or linkgit:git-blame[1]) '%cd':: committer date (format respects --date= option) '%cD':: committer date, RFC2822 style '%cr':: committer date, relative '%ct':: committer date, UNIX timestamp '%ci':: committer date, ISO 8601-like format '%cI':: committer date, strict ISO 8601 format -'%cs':: committer date, short format (`YYYY-MM-DD`) '%d':: ref names, like the --decorate option of linkgit:git-log[1] '%D':: ref names without the " (", ")" wrapping. '%S':: ref name given on the command line by which the commit was reached @@ -226,9 +207,8 @@ endif::git-rev-list[] '%GF':: show the fingerprint of the key used to sign a signed commit '%GP':: show the fingerprint of the primary key whose subkey was used to sign a signed commit -'%GT':: show the trust level for the key used to sign a signed commit '%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 - minutes ago}`; the format follows the rules described for the + minutes ago`}; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`). diff --git a/third_party/git/Documentation/pretty-options.txt b/third_party/git/Documentation/pretty-options.txt index 7a6da6db78..e44fc8f738 100644 --- a/third_party/git/Documentation/pretty-options.txt +++ b/third_party/git/Documentation/pretty-options.txt @@ -3,7 +3,7 @@ Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', - 'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>' + 'full', 'fuller', 'email', 'raw', 'format:<string>' and 'tformat:<string>'. When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given. @@ -57,7 +57,7 @@ message by 4 spaces (i.e. 'medium', which is the default, 'full', and 'fuller'). ifndef::git-rev-list[] ---notes[=<ref>]:: +--notes[=<treeish>]:: Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when @@ -68,8 +68,8 @@ By default, the notes shown are from the notes refs listed in the `core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details. + -With an optional '<ref>' argument, use the ref to find the notes -to display. The ref can specify the full refname when it begins +With an optional '<treeish>' argument, use the treeish to find the notes +to display. The treeish can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref. + @@ -85,7 +85,7 @@ being displayed. Examples: "--notes=foo" will show only notes from "--notes --notes=foo --no-notes --notes=bar" will only show notes from "refs/notes/bar". ---show-notes[=<ref>]:: +--show-notes[=<treeish>]:: --[no-]standard-notes:: These options are deprecated. Use the above --notes/--no-notes options instead. diff --git a/third_party/git/Documentation/rev-list-options.txt b/third_party/git/Documentation/rev-list-options.txt index 0d49eb448f..fa4e70f511 100644 --- a/third_party/git/Documentation/rev-list-options.txt +++ b/third_party/git/Documentation/rev-list-options.txt @@ -58,7 +58,7 @@ endif::git-rev-list[] `--all-match`). ifndef::git-rev-list[] + -When `--notes` is in effect, the message from the notes is +When `--show-notes` is in effect, the message from the notes is matched as if it were part of the log message. endif::git-rev-list[] @@ -269,7 +269,7 @@ list. exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\...commit2' notations cannot be used). + -With `--pretty` format other than `oneline` and `reference` (for obvious reasons), +With `--pretty` format other than `oneline` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the @@ -293,8 +293,6 @@ Under `--pretty=oneline`, the commit message is prefixed with this information on the same line. This option cannot be combined with `--reverse`. See also linkgit:git-reflog[1]. -+ -Under `--pretty=reference`, this information will not be shown at all. --merge:: After a failed merge, show refs that touch files having a @@ -581,7 +579,6 @@ above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away). -ifndef::git-shortlog[] ifdef::git-rev-list[] Bisection Helpers ~~~~~~~~~~~~~~~~~ @@ -637,9 +634,8 @@ This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone. endif::git-rev-list[] -endif::git-shortlog[] -ifndef::git-shortlog[] + Commit Ordering ~~~~~~~~~~~~~~~ @@ -681,9 +677,7 @@ together. Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`. -endif::git-shortlog[] -ifndef::git-shortlog[] Object Traversal ~~~~~~~~~~~~~~~~ @@ -762,22 +756,6 @@ explicitly-given commit or tree. Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons. -+ -Multiple '--filter=' flags can be specified to combine filters. Only -objects which are accepted by every filter are included. -+ -The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be -used to combined several filters, but this is harder than just repeating -the '--filter' flag and is usually not necessary. Filters are joined by -'{plus}' and individual filters are %-encoded (i.e. URL-encoded). -Besides the '{plus}' and '%' characters, the following characters are -reserved and also must be encoded: `~!@#$^&*()[]{}\;",<>?`+'`+ -as well as all characters with ASCII code <= `0x20`, which includes -space and newline. -+ -Other arbitrary characters can also be encoded. For instance, -'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are -equivalent. --no-filter:: Turn off any previous `--filter=` argument. @@ -823,9 +801,7 @@ endif::git-rev-list[] --do-walk:: Overrides a previous `--no-walk`. -endif::git-shortlog[] -ifndef::git-shortlog[] Commit Formatting ~~~~~~~~~~~~~~~~~ @@ -984,9 +960,7 @@ ifdef::git-rev-list[] counts and print the count for equivalent commits separated by a tab. endif::git-rev-list[] -endif::git-shortlog[] -ifndef::git-shortlog[] ifndef::git-rev-list[] Diff Formatting ~~~~~~~~~~~~~~~ @@ -1029,4 +1003,3 @@ options may be given. See linkgit:git-diff-files[1] for more options. -t:: Show the tree objects in the diff output. This implies `-r`. endif::git-rev-list[] -endif::git-shortlog[] diff --git a/third_party/git/Documentation/technical/api-allocation-growing.txt b/third_party/git/Documentation/technical/api-allocation-growing.txt new file mode 100644 index 0000000000..5a59b54844 --- /dev/null +++ b/third_party/git/Documentation/technical/api-allocation-growing.txt @@ -0,0 +1,39 @@ +allocation growing API +====================== + +Dynamically growing an array using realloc() is error prone and boring. + +Define your array with: + +* a pointer (`item`) that points at the array, initialized to `NULL` + (although please name the variable based on its contents, not on its + type); + +* an integer variable (`alloc`) that keeps track of how big the current + allocation is, initialized to `0`; + +* another integer variable (`nr`) to keep track of how many elements the + array currently has, initialized to `0`. + +Then before adding `n`th element to the item, call `ALLOC_GROW(item, n, +alloc)`. This ensures that the array can hold at least `n` elements by +calling `realloc(3)` and adjusting `alloc` variable. + +------------ +sometype *item; +size_t nr; +size_t alloc + +for (i = 0; i < nr; i++) + if (we like item[i] already) + return; + +/* we did not like any existing one, so add one */ +ALLOC_GROW(item, nr + 1, alloc); +item[nr++] = value you like; +------------ + +You are responsible for updating the `nr` variable. + +If you need to specify the number of elements to allocate explicitly +then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`. diff --git a/third_party/git/Documentation/technical/api-argv-array.txt b/third_party/git/Documentation/technical/api-argv-array.txt new file mode 100644 index 0000000000..870c8edbfb --- /dev/null +++ b/third_party/git/Documentation/technical/api-argv-array.txt @@ -0,0 +1,65 @@ +argv-array API +============== + +The argv-array API allows one to dynamically build and store +NULL-terminated lists. An argv-array maintains the invariant that the +`argv` member always points to a non-NULL array, and that the array is +always NULL-terminated at the element pointed to by `argv[argc]`. This +makes the result suitable for passing to functions expecting to receive +argv from main(), or the link:api-run-command.html[run-command API]. + +The string-list API (documented in string-list.h) is similar, but cannot be +used for these purposes; instead of storing a straight string pointer, +it contains an item structure with a `util` field that is not compatible +with the traditional argv interface. + +Each `argv_array` manages its own memory. Any strings pushed into the +array are duplicated, and all memory is freed by argv_array_clear(). + +Data Structures +--------------- + +`struct argv_array`:: + + A single array. This should be initialized by assignment from + `ARGV_ARRAY_INIT`, or by calling `argv_array_init`. The `argv` + member contains the actual array; the `argc` member contains the + number of elements in the array, not including the terminating + NULL. + +Functions +--------- + +`argv_array_init`:: + Initialize an array. This is no different than assigning from + `ARGV_ARRAY_INIT`. + +`argv_array_push`:: + Push a copy of a string onto the end of the array. + +`argv_array_pushl`:: + Push a list of strings onto the end of the array. The arguments + should be a list of `const char *` strings, terminated by a NULL + argument. + +`argv_array_pushf`:: + Format a string and push it onto the end of the array. This is a + convenience wrapper combining `strbuf_addf` and `argv_array_push`. + +`argv_array_pushv`:: + Push a null-terminated array of strings onto the end of the array. + +`argv_array_pop`:: + Remove the final element from the array. If there are no + elements in the array, do nothing. + +`argv_array_clear`:: + Free all memory associated with the array and return it to the + initial, empty state. + +`argv_array_detach`:: + Disconnect the `argv` member from the `argv_array` struct and + return it. The caller is responsible for freeing the memory used + by the array, and by the strings it references. After detaching, + the `argv_array` is in a reinitialized state and can be pushed + into again. diff --git a/third_party/git/Documentation/technical/api-config.txt b/third_party/git/Documentation/technical/api-config.txt new file mode 100644 index 0000000000..7d20716c32 --- /dev/null +++ b/third_party/git/Documentation/technical/api-config.txt @@ -0,0 +1,319 @@ +config API +========== + +The config API gives callers a way to access Git configuration files +(and files which have the same syntax). See linkgit:git-config[1] for a +discussion of the config file syntax. + +General Usage +------------- + +Config files are parsed linearly, and each variable found is passed to a +caller-provided callback function. The callback function is responsible +for any actions to be taken on the config option, and is free to ignore +some options. It is not uncommon for the configuration to be parsed +several times during the run of a Git program, with different callbacks +picking out different variables useful to themselves. + +A config callback function takes three parameters: + +- the name of the parsed variable. This is in canonical "flat" form: the + section, subsection, and variable segments will be separated by dots, + and the section and variable segments will be all lowercase. E.g., + `core.ignorecase`, `diff.SomeType.textconv`. + +- the value of the found variable, as a string. If the variable had no + value specified, the value will be NULL (typically this means it + should be interpreted as boolean true). + +- a void pointer passed in by the caller of the config API; this can + contain callback-specific data + +A config callback should return 0 for success, or -1 if the variable +could not be parsed properly. + +Basic Config Querying +--------------------- + +Most programs will simply want to look up variables in all config files +that Git knows about, using the normal precedence rules. To do this, +call `git_config` with a callback function and void data pointer. + +`git_config` will read all config sources in order of increasing +priority. Thus a callback should typically overwrite previously-seen +entries with new ones (e.g., if both the user-wide `~/.gitconfig` and +repo-specific `.git/config` contain `color.ui`, the config machinery +will first feed the user-wide one to the callback, and then the +repo-specific one; by overwriting, the higher-priority repo-specific +value is left at the end). + +The `config_with_options` function lets the caller examine config +while adjusting some of the default behavior of `git_config`. It should +almost never be used by "regular" Git code that is looking up +configuration variables. It is intended for advanced callers like +`git-config`, which are intentionally tweaking the normal config-lookup +process. It takes two extra parameters: + +`config_source`:: +If this parameter is non-NULL, it specifies the source to parse for +configuration, rather than looking in the usual files. See `struct +git_config_source` in `config.h` for details. Regular `git_config` defaults +to `NULL`. + +`opts`:: +Specify options to adjust the behavior of parsing config files. See `struct +config_options` in `config.h` for details. As an example: regular `git_config` +sets `opts.respect_includes` to `1` by default. + +Reading Specific Files +---------------------- + +To read a specific file in git-config format, use +`git_config_from_file`. This takes the same callback and data parameters +as `git_config`. + +Querying For Specific Variables +------------------------------- + +For programs wanting to query for specific variables in a non-callback +manner, the config API provides two functions `git_config_get_value` +and `git_config_get_value_multi`. They both read values from an internal +cache generated previously from reading the config files. + +`int git_config_get_value(const char *key, const char **value)`:: + + Finds the highest-priority value for the configuration variable `key`, + stores the pointer to it in `value` and returns 0. When the + configuration variable `key` is not found, returns 1 without touching + `value`. The caller should not free or modify `value`, as it is owned + by the cache. + +`const struct string_list *git_config_get_value_multi(const char *key)`:: + + Finds and returns the value list, sorted in order of increasing priority + for the configuration variable `key`. When the configuration variable + `key` is not found, returns NULL. The caller should not free or modify + the returned pointer, as it is owned by the cache. + +`void git_config_clear(void)`:: + + Resets and invalidates the config cache. + +The config API also provides type specific API functions which do conversion +as well as retrieval for the queried variable, including: + +`int git_config_get_int(const char *key, int *dest)`:: + + Finds and parses the value to an integer for the configuration variable + `key`. Dies on error; otherwise, stores the value of the parsed integer in + `dest` and returns 0. When the configuration variable `key` is not found, + returns 1 without touching `dest`. + +`int git_config_get_ulong(const char *key, unsigned long *dest)`:: + + Similar to `git_config_get_int` but for unsigned longs. + +`int git_config_get_bool(const char *key, int *dest)`:: + + Finds and parses the value into a boolean value, for the configuration + variable `key` respecting keywords like "true" and "false". Integer + values are converted into true/false values (when they are non-zero or + zero, respectively). Other values cause a die(). If parsing is successful, + stores the value of the parsed result in `dest` and returns 0. When the + configuration variable `key` is not found, returns 1 without touching + `dest`. + +`int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest)`:: + + Similar to `git_config_get_bool`, except that integers are copied as-is, + and `is_bool` flag is unset. + +`int git_config_get_maybe_bool(const char *key, int *dest)`:: + + Similar to `git_config_get_bool`, except that it returns -1 on error + rather than dying. + +`int git_config_get_string_const(const char *key, const char **dest)`:: + + Allocates and copies the retrieved string into the `dest` parameter for + the configuration variable `key`; if NULL string is given, prints an + error message and returns -1. When the configuration variable `key` is + not found, returns 1 without touching `dest`. + +`int git_config_get_string(const char *key, char **dest)`:: + + Similar to `git_config_get_string_const`, except that retrieved value + copied into the `dest` parameter is a mutable string. + +`int git_config_get_pathname(const char *key, const char **dest)`:: + + Similar to `git_config_get_string`, but expands `~` or `~user` into + the user's home directory when found at the beginning of the path. + +`git_die_config(const char *key, const char *err, ...)`:: + + First prints the error message specified by the caller in `err` and then + dies printing the line number and the file name of the highest priority + value for the configuration variable `key`. + +`void git_die_config_linenr(const char *key, const char *filename, int linenr)`:: + + Helper function which formats the die error message according to the + parameters entered. Used by `git_die_config()`. It can be used by callers + handling `git_config_get_value_multi()` to print the correct error message + for the desired value. + +See test-config.c for usage examples. + +Value Parsing Helpers +--------------------- + +To aid in parsing string values, the config API provides callbacks with +a number of helper functions, including: + +`git_config_int`:: +Parse the string to an integer, including unit factors. Dies on error; +otherwise, returns the parsed result. + +`git_config_ulong`:: +Identical to `git_config_int`, but for unsigned longs. + +`git_config_bool`:: +Parse a string into a boolean value, respecting keywords like "true" and +"false". Integer values are converted into true/false values (when they +are non-zero or zero, respectively). Other values cause a die(). If +parsing is successful, the return value is the result. + +`git_config_bool_or_int`:: +Same as `git_config_bool`, except that integers are returned as-is, and +an `is_bool` flag is unset. + +`git_parse_maybe_bool`:: +Same as `git_config_bool`, except that it returns -1 on error rather +than dying. + +`git_config_string`:: +Allocates and copies the value string into the `dest` parameter; if no +string is given, prints an error message and returns -1. + +`git_config_pathname`:: +Similar to `git_config_string`, but expands `~` or `~user` into the +user's home directory when found at the beginning of the path. + +Include Directives +------------------ + +By default, the config parser does not respect include directives. +However, a caller can use the special `git_config_include` wrapper +callback to support them. To do so, you simply wrap your "real" callback +function and data pointer in a `struct config_include_data`, and pass +the wrapper to the regular config-reading functions. For example: + +------------------------------------------- +int read_file_with_include(const char *file, config_fn_t fn, void *data) +{ + struct config_include_data inc = CONFIG_INCLUDE_INIT; + inc.fn = fn; + inc.data = data; + return git_config_from_file(git_config_include, file, &inc); +} +------------------------------------------- + +`git_config` respects includes automatically. The lower-level +`git_config_from_file` does not. + +Custom Configsets +----------------- + +A `config_set` can be used to construct an in-memory cache for +config-like files that the caller specifies (i.e., files like `.gitmodules`, +`~/.gitconfig` etc.). For example, + +---------------------------------------- +struct config_set gm_config; +git_configset_init(&gm_config); +int b; +/* we add config files to the config_set */ +git_configset_add_file(&gm_config, ".gitmodules"); +git_configset_add_file(&gm_config, ".gitmodules_alt"); + +if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) { + /* hack hack hack */ +} + +/* when we are done with the configset */ +git_configset_clear(&gm_config); +---------------------------------------- + +Configset API provides functions for the above mentioned work flow, including: + +`void git_configset_init(struct config_set *cs)`:: + + Initializes the config_set `cs`. + +`int git_configset_add_file(struct config_set *cs, const char *filename)`:: + + Parses the file and adds the variable-value pairs to the `config_set`, + dies if there is an error in parsing the file. Returns 0 on success, or + -1 if the file does not exist or is inaccessible. The user has to decide + if he wants to free the incomplete configset or continue using it when + the function returns -1. + +`int git_configset_get_value(struct config_set *cs, const char *key, const char **value)`:: + + Finds the highest-priority value for the configuration variable `key` + and config set `cs`, stores the pointer to it in `value` and returns 0. + When the configuration variable `key` is not found, returns 1 without + touching `value`. The caller should not free or modify `value`, as it + is owned by the cache. + +`const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key)`:: + + Finds and returns the value list, sorted in order of increasing priority + for the configuration variable `key` and config set `cs`. When the + configuration variable `key` is not found, returns NULL. The caller + should not free or modify the returned pointer, as it is owned by the cache. + +`void git_configset_clear(struct config_set *cs)`:: + + Clears `config_set` structure, removes all saved variable-value pairs. + +In addition to above functions, the `config_set` API provides type specific +functions in the vein of `git_config_get_int` and family but with an extra +parameter, pointer to struct `config_set`. +They all behave similarly to the `git_config_get*()` family described in +"Querying For Specific Variables" above. + +Writing Config Files +-------------------- + +Git gives multiple entry points in the Config API to write config values to +files namely `git_config_set_in_file` and `git_config_set`, which write to +a specific config file or to `.git/config` respectively. They both take a +key/value pair as parameter. +In the end they both call `git_config_set_multivar_in_file` which takes four +parameters: + +- the name of the file, as a string, to which key/value pairs will be written. + +- the name of key, as a string. This is in canonical "flat" form: the section, + subsection, and variable segments will be separated by dots, and the section + and variable segments will be all lowercase. + E.g., `core.ignorecase`, `diff.SomeType.textconv`. + +- the value of the variable, as a string. If value is equal to NULL, it will + remove the matching key from the config file. + +- the value regex, as a string. It will disregard key/value pairs where value + does not match. + +- a multi_replace value, as an int. If value is equal to zero, nothing or only + one matching key/value is replaced, else all matching key/values (regardless + how many) are removed, before the new pair is written. + +It returns 0 on success. + +Also, there are functions `git_config_rename_section` and +`git_config_rename_section_in_file` with parameters `old_name` and `new_name` +for renaming or removing sections in the config files. If NULL is passed +through `new_name` parameter, the section will be removed from the config file. diff --git a/third_party/git/Documentation/technical/api-credentials.txt b/third_party/git/Documentation/technical/api-credentials.txt new file mode 100644 index 0000000000..75368f26ca --- /dev/null +++ b/third_party/git/Documentation/technical/api-credentials.txt @@ -0,0 +1,271 @@ +credentials API +=============== + +The credentials API provides an abstracted way of gathering username and +password credentials from the user (even though credentials in the wider +world can take many forms, in this document the word "credential" always +refers to a username and password pair). + +This document describes two interfaces: the C API that the credential +subsystem provides to the rest of Git, and the protocol that Git uses to +communicate with system-specific "credential helpers". If you are +writing Git code that wants to look up or prompt for credentials, see +the section "C API" below. If you want to write your own helper, see +the section on "Credential Helpers" below. + +Typical setup +------------- + +------------ ++-----------------------+ +| Git code (C) |--- to server requiring ---> +| | authentication +|.......................| +| C credential API |--- prompt ---> User ++-----------------------+ + ^ | + | pipe | + | v ++-----------------------+ +| Git credential helper | ++-----------------------+ +------------ + +The Git code (typically a remote-helper) will call the C API to obtain +credential data like a login/password pair (credential_fill). The +API will itself call a remote helper (e.g. "git credential-cache" or +"git credential-store") that may retrieve credential data from a +store. If the credential helper cannot find the information, the C API +will prompt the user. Then, the caller of the API takes care of +contacting the server, and does the actual authentication. + +C API +----- + +The credential C API is meant to be called by Git code which needs to +acquire or store a credential. It is centered around an object +representing a single credential and provides three basic operations: +fill (acquire credentials by calling helpers and/or prompting the user), +approve (mark a credential as successfully used so that it can be stored +for later use), and reject (mark a credential as unsuccessful so that it +can be erased from any persistent storage). + +Data Structures +~~~~~~~~~~~~~~~ + +`struct credential`:: + + This struct represents a single username/password combination + along with any associated context. All string fields should be + heap-allocated (or NULL if they are not known or not applicable). + The meaning of the individual context fields is the same as + their counterparts in the helper protocol; see the section below + for a description of each field. ++ +The `helpers` member of the struct is a `string_list` of helpers. Each +string specifies an external helper which will be run, in order, to +either acquire or store credentials. See the section on credential +helpers below. This list is filled-in by the API functions +according to the corresponding configuration variables before +consulting helpers, so there usually is no need for a caller to +modify the helpers field at all. ++ +This struct should always be initialized with `CREDENTIAL_INIT` or +`credential_init`. + + +Functions +~~~~~~~~~ + +`credential_init`:: + + Initialize a credential structure, setting all fields to empty. + +`credential_clear`:: + + Free any resources associated with the credential structure, + returning it to a pristine initialized state. + +`credential_fill`:: + + Instruct the credential subsystem to fill the username and + password fields of the passed credential struct by first + consulting helpers, then asking the user. After this function + returns, the username and password fields of the credential are + guaranteed to be non-NULL. If an error occurs, the function will + die(). + +`credential_reject`:: + + Inform the credential subsystem that the provided credentials + have been rejected. This will cause the credential subsystem to + notify any helpers of the rejection (which allows them, for + example, to purge the invalid credentials from storage). It + will also free() the username and password fields of the + credential and set them to NULL (readying the credential for + another call to `credential_fill`). Any errors from helpers are + ignored. + +`credential_approve`:: + + Inform the credential subsystem that the provided credentials + were successfully used for authentication. This will cause the + credential subsystem to notify any helpers of the approval, so + that they may store the result to be used again. Any errors + from helpers are ignored. + +`credential_from_url`:: + + Parse a URL into broken-down credential fields. + +Example +~~~~~~~ + +The example below shows how the functions of the credential API could be +used to login to a fictitious "foo" service on a remote host: + +----------------------------------------------------------------------- +int foo_login(struct foo_connection *f) +{ + int status; + /* + * Create a credential with some context; we don't yet know the + * username or password. + */ + + struct credential c = CREDENTIAL_INIT; + c.protocol = xstrdup("foo"); + c.host = xstrdup(f->hostname); + + /* + * Fill in the username and password fields by contacting + * helpers and/or asking the user. The function will die if it + * fails. + */ + credential_fill(&c); + + /* + * Otherwise, we have a username and password. Try to use it. + */ + status = send_foo_login(f, c.username, c.password); + switch (status) { + case FOO_OK: + /* It worked. Store the credential for later use. */ + credential_accept(&c); + break; + case FOO_BAD_LOGIN: + /* Erase the credential from storage so we don't try it + * again. */ + credential_reject(&c); + break; + default: + /* + * Some other error occurred. We don't know if the + * credential is good or bad, so report nothing to the + * credential subsystem. + */ + } + + /* Free any associated resources. */ + credential_clear(&c); + + return status; +} +----------------------------------------------------------------------- + + +Credential Helpers +------------------ + +Credential helpers are programs executed by Git to fetch or save +credentials from and to long-term storage (where "long-term" is simply +longer than a single Git process; e.g., credentials may be stored +in-memory for a few minutes, or indefinitely on disk). + +Each helper is specified by a single string in the configuration +variable `credential.helper` (and others, see linkgit:git-config[1]). +The string is transformed by Git into a command to be executed using +these rules: + + 1. If the helper string begins with "!", it is considered a shell + snippet, and everything after the "!" becomes the command. + + 2. Otherwise, if the helper string begins with an absolute path, the + verbatim helper string becomes the command. + + 3. Otherwise, the string "git credential-" is prepended to the helper + string, and the result becomes the command. + +The resulting command then has an "operation" argument appended to it +(see below for details), and the result is executed by the shell. + +Here are some example specifications: + +---------------------------------------------------- +# run "git credential-foo" +foo + +# same as above, but pass an argument to the helper +foo --bar=baz + +# the arguments are parsed by the shell, so use shell +# quoting if necessary +foo --bar="whitespace arg" + +# you can also use an absolute path, which will not use the git wrapper +/path/to/my/helper --with-arguments + +# or you can specify your own shell snippet +!f() { echo "password=`cat $HOME/.secret`"; }; f +---------------------------------------------------- + +Generally speaking, rule (3) above is the simplest for users to specify. +Authors of credential helpers should make an effort to assist their +users by naming their program "git-credential-$NAME", and putting it in +the $PATH or $GIT_EXEC_PATH during installation, which will allow a user +to enable it with `git config credential.helper $NAME`. + +When a helper is executed, it will have one "operation" argument +appended to its command line, which is one of: + +`get`:: + + Return a matching credential, if any exists. + +`store`:: + + Store the credential, if applicable to the helper. + +`erase`:: + + Remove a matching credential, if any, from the helper's storage. + +The details of the credential will be provided on the helper's stdin +stream. The exact format is the same as the input/output format of the +`git credential` plumbing command (see the section `INPUT/OUTPUT +FORMAT` in linkgit:git-credential[1] for a detailed specification). + +For a `get` operation, the helper should produce a list of attributes +on stdout in the same format. A helper is free to produce a subset, or +even no values at all if it has nothing useful to provide. Any provided +attributes will overwrite those already known about by Git. If a helper +outputs a `quit` attribute with a value of `true` or `1`, no further +helpers will be consulted, nor will the user be prompted (if no +credential has been provided, the operation will then fail). + +For a `store` or `erase` operation, the helper's output is ignored. +If it fails to perform the requested operation, it may complain to +stderr to inform the user. If it does not support the requested +operation (e.g., a read-only store), it should silently ignore the +request. + +If a helper receives any other operation, it should silently ignore the +request. This leaves room for future operations to be added (older +helpers will just ignore the new requests). + +See also +-------- + +linkgit:gitcredentials[7] + +linkgit:git-config[1] (See configuration variables `credential.*`) diff --git a/third_party/git/Documentation/technical/api-diff.txt b/third_party/git/Documentation/technical/api-diff.txt new file mode 100644 index 0000000000..30fc0e9c93 --- /dev/null +++ b/third_party/git/Documentation/technical/api-diff.txt @@ -0,0 +1,174 @@ +diff API +======== + +The diff API is for programs that compare two sets of files (e.g. two +trees, one tree and the index) and present the found difference in +various ways. The calling program is responsible for feeding the API +pairs of files, one from the "old" set and the corresponding one from +"new" set, that are different. The library called through this API is +called diffcore, and is responsible for two things. + +* finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and + changes that touch a string (`-S`), as specified by the caller. + +* outputting the differences in various formats, as specified by the + caller. + +Calling sequence +---------------- + +* Prepare `struct diff_options` to record the set of diff options, and + then call `repo_diff_setup()` to initialize this structure. This + sets up the vanilla default. + +* Fill in the options structure to specify desired output format, rename + detection, etc. `diff_opt_parse()` can be used to parse options given + from the command line in a way consistent with existing git-diff + family of programs. + +* Call `diff_setup_done()`; this inspects the options set up so far for + internal consistency and make necessary tweaking to it (e.g. if + textual patch output was asked, recursive behaviour is turned on); + the callback set_default in diff_options can be used to tweak this more. + +* As you find different pairs of files, call `diff_change()` to feed + modified files, `diff_addremove()` to feed created or deleted files, + or `diff_unmerge()` to feed a file whose state is 'unmerged' to the + API. These are thin wrappers to a lower-level `diff_queue()` function + that is flexible enough to record any of these kinds of changes. + +* Once you finish feeding the pairs of files, call `diffcore_std()`. + This will tell the diffcore library to go ahead and do its work. + +* Calling `diff_flush()` will produce the output. + + +Data structures +--------------- + +* `struct diff_filespec` + +This is the internal representation for a single file (blob). It +records the blob object name (if known -- for a work tree file it +typically is a NUL SHA-1), filemode and pathname. This is what the +`diff_addremove()`, `diff_change()` and `diff_unmerge()` synthesize and +feed `diff_queue()` function with. + +* `struct diff_filepair` + +This records a pair of `struct diff_filespec`; the filespec for a file +in the "old" set (i.e. preimage) is called `one`, and the filespec for a +file in the "new" set (i.e. postimage) is called `two`. A change that +represents file creation has NULL in `one`, and file deletion has NULL +in `two`. + +A `filepair` starts pointing at `one` and `two` that are from the same +filename, but `diffcore_std()` can break pairs and match component +filespecs with other filespecs from a different filepair to form new +filepair. This is called 'rename detection'. + +* `struct diff_queue` + +This is a collection of filepairs. Notable members are: + +`queue`:: + + An array of pointers to `struct diff_filepair`. This + dynamically grows as you add filepairs; + +`alloc`:: + + The allocated size of the `queue` array; + +`nr`:: + + The number of elements in the `queue` array. + + +* `struct diff_options` + +This describes the set of options the calling program wants to affect +the operation of diffcore library with. + +Notable members are: + +`output_format`:: + The output format used when `diff_flush()` is run. + +`context`:: + Number of context lines to generate in patch output. + +`break_opt`, `detect_rename`, `rename-score`, `rename_limit`:: + Affects the way detection logic for complete rewrites, renames + and copies. + +`abbrev`:: + Number of hexdigits to abbreviate raw format output to. + +`pickaxe`:: + A constant string (can and typically does contain newlines to + look for a block of text, not just a single line) to filter out + the filepairs that do not change the number of strings contained + in its preimage and postimage of the diff_queue. + +`flags`:: + This is mostly a collection of boolean options that affects the + operation, but some do not have anything to do with the diffcore + library. + +`touched_flags`:: + Records whether a flag has been changed due to user request + (rather than just set/unset by default). + +`set_default`:: + Callback which allows tweaking the options in diff_setup_done(). + +BINARY, TEXT;; + Affects the way how a file that is seemingly binary is treated. + +FULL_INDEX;; + Tells the patch output format not to use abbreviated object + names on the "index" lines. + +FIND_COPIES_HARDER;; + Tells the diffcore library that the caller is feeding unchanged + filepairs to allow copies from unmodified files be detected. + +COLOR_DIFF;; + Output should be colored. + +COLOR_DIFF_WORDS;; + Output is a colored word-diff. + +NO_INDEX;; + Tells diff-files that the input is not tracked files but files + in random locations on the filesystem. + +ALLOW_EXTERNAL;; + Tells output routine that it is Ok to call user specified patch + output routine. Plumbing disables this to ensure stable output. + +QUIET;; + Do not show any output. + +REVERSE_DIFF;; + Tells the library that the calling program is feeding the + filepairs reversed; `one` is two, and `two` is one. + +EXIT_WITH_STATUS;; + For communication between the calling program and the options + parser; tell the calling program to signal the presence of + difference using program exit code. + +HAS_CHANGES;; + Internal; used for optimization to see if there is any change. + +SILENT_ON_REMOVE;; + Affects if diff-files shows removed files. + +RECURSIVE, TREE_IN_RECURSIVE;; + Tells if tree traversal done by tree-diff should recursively + descend into a tree object pair that are different in preimage + and postimage set. + +(JC) diff --git a/third_party/git/Documentation/technical/api-directory-listing.txt b/third_party/git/Documentation/technical/api-directory-listing.txt new file mode 100644 index 0000000000..5abb8e8b1f --- /dev/null +++ b/third_party/git/Documentation/technical/api-directory-listing.txt @@ -0,0 +1,130 @@ +directory listing API +===================== + +The directory listing API is used to enumerate paths in the work tree, +optionally taking `.git/info/exclude` and `.gitignore` files per +directory into account. + +Data structure +-------------- + +`struct dir_struct` structure is used to pass directory traversal +options to the library and to record the paths discovered. A single +`struct dir_struct` is used regardless of whether or not the traversal +recursively descends into subdirectories. + +The notable options are: + +`exclude_per_dir`:: + + The name of the file to be read in each directory for excluded + files (typically `.gitignore`). + +`flags`:: + + A bit-field of options: + +`DIR_SHOW_IGNORED`::: + + Return just ignored files in `entries[]`, not untracked + files. This flag is mutually exclusive with + `DIR_SHOW_IGNORED_TOO`. + +`DIR_SHOW_IGNORED_TOO`::: + + Similar to `DIR_SHOW_IGNORED`, but return ignored files in + `ignored[]` in addition to untracked files in + `entries[]`. This flag is mutually exclusive with + `DIR_SHOW_IGNORED`. + +`DIR_KEEP_UNTRACKED_CONTENTS`::: + + Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is set, the + untracked contents of untracked directories are also returned in + `entries[]`. + +`DIR_SHOW_IGNORED_TOO_MODE_MATCHING`::: + + Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if + this is set, returns ignored files and directories that match + an exclude pattern. If a directory matches an exclude pattern, + then the directory is returned and the contained paths are + not. A directory that does not match an exclude pattern will + not be returned even if all of its contents are ignored. In + this case, the contents are returned as individual entries. ++ +If this is set, files and directories that explicitly match an ignore +pattern are reported. Implicitly ignored directories (directories that +do not match an ignore pattern, but whose contents are all ignored) +are not reported, instead all of the contents are reported. + +`DIR_COLLECT_IGNORED`::: + + Special mode for git-add. Return ignored files in `ignored[]` and + untracked files in `entries[]`. Only returns ignored files that match + pathspec exactly (no wildcards). Does not recurse into ignored + directories. + +`DIR_SHOW_OTHER_DIRECTORIES`::: + + Include a directory that is not tracked. + +`DIR_HIDE_EMPTY_DIRECTORIES`::: + + Do not include a directory that is not tracked and is empty. + +`DIR_NO_GITLINKS`::: + + If set, recurse into a directory that looks like a Git + directory. Otherwise it is shown as a directory. + +The result of the enumeration is left in these fields: + +`entries[]`:: + + An array of `struct dir_entry`, each element of which describes + a path. + +`nr`:: + + The number of members in `entries[]` array. + +`alloc`:: + + Internal use; keeps track of allocation of `entries[]` array. + +`ignored[]`:: + + An array of `struct dir_entry`, used for ignored paths with the + `DIR_SHOW_IGNORED_TOO` and `DIR_COLLECT_IGNORED` flags. + +`ignored_nr`:: + + The number of members in `ignored[]` array. + +Calling sequence +---------------- + +Note: index may be looked at for .gitignore files that are CE_SKIP_WORKTREE +marked. If you to exclude files, make sure you have loaded index first. + +* Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0, + sizeof(dir))`. + +* To add single exclude pattern, call `add_exclude_list()` and then + `add_exclude()`. + +* To add patterns from a file (e.g. `.git/info/exclude`), call + `add_excludes_from_file()` , and/or set `dir.exclude_per_dir`. A + short-hand function `setup_standard_excludes()` can be used to set + up the standard set of exclude settings. + +* Set options described in the Data Structure section above. + +* Call `read_directory()`. + +* Use `dir.entries[]`. + +* Call `clear_directory()` when none of the contained elements are no longer in use. + +(JC) diff --git a/third_party/git/Documentation/technical/api-gitattributes.txt b/third_party/git/Documentation/technical/api-gitattributes.txt new file mode 100644 index 0000000000..45f0df600f --- /dev/null +++ b/third_party/git/Documentation/technical/api-gitattributes.txt @@ -0,0 +1,154 @@ +gitattributes API +================= + +gitattributes mechanism gives a uniform way to associate various +attributes to set of paths. + + +Data Structure +-------------- + +`struct git_attr`:: + + An attribute is an opaque object that is identified by its name. + Pass the name to `git_attr()` function to obtain the object of + this type. The internal representation of this structure is + of no interest to the calling programs. The name of the + attribute can be retrieved by calling `git_attr_name()`. + +`struct attr_check_item`:: + + This structure represents one attribute and its value. + +`struct attr_check`:: + + This structure represents a collection of `attr_check_item`. + It is passed to `git_check_attr()` function, specifying the + attributes to check, and receives their values. + + +Attribute Values +---------------- + +An attribute for a path can be in one of four states: Set, Unset, +Unspecified or set to a string, and `.value` member of `struct +attr_check_item` records it. There are three macros to check these: + +`ATTR_TRUE()`:: + + Returns true if the attribute is Set for the path. + +`ATTR_FALSE()`:: + + Returns true if the attribute is Unset for the path. + +`ATTR_UNSET()`:: + + Returns true if the attribute is Unspecified for the path. + +If none of the above returns true, `.value` member points at a string +value of the attribute for the path. + + +Querying Specific Attributes +---------------------------- + +* Prepare `struct attr_check` using attr_check_initl() + function, enumerating the names of attributes whose values you are + interested in, terminated with a NULL pointer. Alternatively, an + empty `struct attr_check` can be prepared by calling + `attr_check_alloc()` function and then attributes you want to + ask about can be added to it with `attr_check_append()` + function. + +* Call `git_check_attr()` to check the attributes for the path. + +* Inspect `attr_check` structure to see how each of the + attribute in the array is defined for the path. + + +Example +------- + +To see how attributes "crlf" and "ident" are set for different paths. + +. Prepare a `struct attr_check` with two elements (because + we are checking two attributes): + +------------ +static struct attr_check *check; +static void setup_check(void) +{ + if (check) + return; /* already done */ + check = attr_check_initl("crlf", "ident", NULL); +} +------------ + +. Call `git_check_attr()` with the prepared `struct attr_check`: + +------------ + const char *path; + + setup_check(); + git_check_attr(path, check); +------------ + +. Act on `.value` member of the result, left in `check->items[]`: + +------------ + const char *value = check->items[0].value; + + if (ATTR_TRUE(value)) { + The attribute is Set, by listing only the name of the + attribute in the gitattributes file for the path. + } else if (ATTR_FALSE(value)) { + The attribute is Unset, by listing the name of the + attribute prefixed with a dash - for the path. + } else if (ATTR_UNSET(value)) { + The attribute is neither set nor unset for the path. + } else if (!strcmp(value, "input")) { + If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is + true, the value is a string set in the gitattributes + file for the path by saying "attr=value". + } else if (... other check using value as string ...) { + ... + } +------------ + +To see how attributes in argv[] are set for different paths, only +the first step in the above would be different. + +------------ +static struct attr_check *check; +static void setup_check(const char **argv) +{ + check = attr_check_alloc(); + while (*argv) { + struct git_attr *attr = git_attr(*argv); + attr_check_append(check, attr); + argv++; + } +} +------------ + + +Querying All Attributes +----------------------- + +To get the values of all attributes associated with a file: + +* Prepare an empty `attr_check` structure by calling + `attr_check_alloc()`. + +* Call `git_all_attrs()`, which populates the `attr_check` + with the attributes attached to the path. + +* Iterate over the `attr_check.items[]` array to examine + the attribute names and values. The name of the attribute + described by an `attr_check.items[]` object can be retrieved via + `git_attr_name(check->items[i].attr)`. (Please note that no items + will be returned for unset attributes, so `ATTR_UNSET()` will return + false for all returned `attr_check.items[]` objects.) + +* Free the `attr_check` struct by calling `attr_check_free()`. diff --git a/third_party/git/Documentation/technical/api-grep.txt b/third_party/git/Documentation/technical/api-grep.txt new file mode 100644 index 0000000000..a69cc8964d --- /dev/null +++ b/third_party/git/Documentation/technical/api-grep.txt @@ -0,0 +1,8 @@ +grep API +======== + +Talk about <grep.h>, things like: + +* grep_buffer() + +(JC) diff --git a/third_party/git/Documentation/technical/api-history-graph.txt b/third_party/git/Documentation/technical/api-history-graph.txt new file mode 100644 index 0000000000..d0d1707c8c --- /dev/null +++ b/third_party/git/Documentation/technical/api-history-graph.txt @@ -0,0 +1,173 @@ +history graph API +================= + +The graph API is used to draw a text-based representation of the commit +history. The API generates the graph in a line-by-line fashion. + +Functions +--------- + +Core functions: + +* `graph_init()` creates a new `struct git_graph` + +* `graph_update()` moves the graph to a new commit. + +* `graph_next_line()` outputs the next line of the graph into a strbuf. It + does not add a terminating newline. + +* `graph_padding_line()` outputs a line of vertical padding in the graph. It + is similar to `graph_next_line()`, but is guaranteed to never print the line + containing the current commit. Where `graph_next_line()` would print the + commit line next, `graph_padding_line()` prints a line that simply extends + all branch lines downwards one row, leaving their positions unchanged. + +* `graph_is_commit_finished()` determines if the graph has output all lines + necessary for the current commit. If `graph_update()` is called before all + lines for the current commit have been printed, the next call to + `graph_next_line()` will output an ellipsis, to indicate that a portion of + the graph was omitted. + +The following utility functions are wrappers around `graph_next_line()` and +`graph_is_commit_finished()`. They always print the output to stdout. +They can all be called with a NULL graph argument, in which case no graph +output will be printed. + +* `graph_show_commit()` calls `graph_next_line()` and + `graph_is_commit_finished()` until one of them return non-zero. This prints + all graph lines up to, and including, the line containing this commit. + Output is printed to stdout. The last line printed does not contain a + terminating newline. + +* `graph_show_oneline()` calls `graph_next_line()` and prints the result to + stdout. The line printed does not contain a terminating newline. + +* `graph_show_padding()` calls `graph_padding_line()` and prints the result to + stdout. The line printed does not contain a terminating newline. + +* `graph_show_remainder()` calls `graph_next_line()` until + `graph_is_commit_finished()` returns non-zero. Output is printed to stdout. + The last line printed does not contain a terminating newline. Returns 1 if + output was printed, and 0 if no output was necessary. + +* `graph_show_strbuf()` prints the specified strbuf to stdout, prefixing all + lines but the first with a graph line. The caller is responsible for + ensuring graph output for the first line has already been printed to stdout. + (This can be done with `graph_show_commit()` or `graph_show_oneline()`.) If + a NULL graph is supplied, the strbuf is printed as-is. + +* `graph_show_commit_msg()` is similar to `graph_show_strbuf()`, but it also + prints the remainder of the graph, if more lines are needed after the strbuf + ends. It is better than directly calling `graph_show_strbuf()` followed by + `graph_show_remainder()` since it properly handles buffers that do not end in + a terminating newline. The output printed by `graph_show_commit_msg()` will + end in a newline if and only if the strbuf ends in a newline. + +Data structure +-------------- +`struct git_graph` is an opaque data type used to store the current graph +state. + +Calling sequence +---------------- + +* Create a `struct git_graph` by calling `graph_init()`. When using the + revision walking API, this is done automatically by `setup_revisions()` if + the '--graph' option is supplied. + +* Use the revision walking API to walk through a group of contiguous commits. + The `get_revision()` function automatically calls `graph_update()` each time + it is invoked. + +* For each commit, call `graph_next_line()` repeatedly, until + `graph_is_commit_finished()` returns non-zero. Each call to + `graph_next_line()` will output a single line of the graph. The resulting + lines will not contain any newlines. `graph_next_line()` returns 1 if the + resulting line contains the current commit, or 0 if this is merely a line + needed to adjust the graph before or after the current commit. This return + value can be used to determine where to print the commit summary information + alongside the graph output. + +Limitations +----------- + +* `graph_update()` must be called with commits in topological order. It should + not be called on a commit if it has already been invoked with an ancestor of + that commit, or the graph output will be incorrect. + +* `graph_update()` must be called on a contiguous group of commits. If + `graph_update()` is called on a particular commit, it should later be called + on all parents of that commit. Parents must not be skipped, or the graph + output will appear incorrect. ++ +`graph_update()` may be used on a pruned set of commits only if the parent list +has been rewritten so as to include only ancestors from the pruned set. + +* The graph API does not currently support reverse commit ordering. In + order to implement reverse ordering, the graphing API needs an + (efficient) mechanism to find the children of a commit. + +Sample usage +------------ + +------------ +struct commit *commit; +struct git_graph *graph = graph_init(opts); + +while ((commit = get_revision(opts)) != NULL) { + while (!graph_is_commit_finished(graph)) + { + struct strbuf sb; + int is_commit_line; + + strbuf_init(&sb, 0); + is_commit_line = graph_next_line(graph, &sb); + fputs(sb.buf, stdout); + + if (is_commit_line) + log_tree_commit(opts, commit); + else + putchar(opts->diffopt.line_termination); + } +} +------------ + +Sample output +------------- + +The following is an example of the output from the graph API. This output does +not include any commit summary information--callers are responsible for +outputting that information, if desired. + +------------ +* +* +* +|\ +* | +| | * +| \ \ +| \ \ +*-. \ \ +|\ \ \ \ +| | * | | +| | | | | * +| | | | | * +| | | | | * +| | | | | |\ +| | | | | | * +| * | | | | | +| | | | | * \ +| | | | | |\ | +| | | | * | | | +| | | | * | | | +* | | | | | | | +| |/ / / / / / +|/| / / / / / +* | | | | | | +|/ / / / / / +* | | | | | +| | | | | * +| | | | |/ +| | | | * +------------ diff --git a/third_party/git/Documentation/technical/api-merge.txt b/third_party/git/Documentation/technical/api-merge.txt index 487d4d83ff..9dc1bed768 100644 --- a/third_party/git/Documentation/technical/api-merge.txt +++ b/third_party/git/Documentation/technical/api-merge.txt @@ -28,9 +28,77 @@ and `diff.c` for examples. * `struct ll_merge_options` -Check ll-merge.h for details. +This describes the set of options the calling program wants to affect +the operation of a low-level (single file) merge. Some options: + +`virtual_ancestor`:: + Behave as though this were part of a merge between common + ancestors in a recursive merge. + If a helper program is specified by the + `[merge "<driver>"] recursive` configuration, it will + be used (see linkgit:gitattributes[5]). + +`variant`:: + Resolve local conflicts automatically in favor + of one side or the other (as in 'git merge-file' + `--ours`/`--theirs`/`--union`). Can be `0`, + `XDL_MERGE_FAVOR_OURS`, `XDL_MERGE_FAVOR_THEIRS`, or + `XDL_MERGE_FAVOR_UNION`. + +`renormalize`:: + Resmudge and clean the "base", "theirs" and "ours" files + before merging. Use this when the merge is likely to have + overlapped with a change in smudge/clean or end-of-line + normalization rules. Low-level (single file) merge ----------------------------- -Check ll-merge.h for details. +`ll_merge`:: + + Perform a three-way single-file merge in core. This is + a thin wrapper around `xdl_merge` that takes the path and + any merge backend specified in `.gitattributes` or + `.git/info/attributes` into account. Returns 0 for a + clean merge. + +Calling sequence: + +* Prepare a `struct ll_merge_options` to record options. + If you have no special requests, skip this and pass `NULL` + as the `opts` parameter to use the default options. + +* Allocate an mmbuffer_t variable for the result. + +* Allocate and fill variables with the file's original content + and two modified versions (using `read_mmfile`, for example). + +* Call `ll_merge()`. + +* Read the merged content from `result_buf.ptr` and `result_buf.size`. + +* Release buffers when finished. A simple + `free(ancestor.ptr); free(ours.ptr); free(theirs.ptr); + free(result_buf.ptr);` will do. + +If the modifications do not merge cleanly, `ll_merge` will return a +nonzero value and `result_buf` will generally include a description of +the conflict bracketed by markers such as the traditional `<<<<<<<` +and `>>>>>>>`. + +The `ancestor_label`, `our_label`, and `their_label` parameters are +used to label the different sides of a conflict if the merge driver +supports this. + +Everything else +--------------- + +Talk about <merge-recursive.h> and merge_file(): + + - merge_trees() to merge with rename detection + - merge_recursive() for ancestor consolidation + - try_merge_command() for other strategies + - conflict format + - merge options + +(Daniel, Miklos, Stephan, JC) diff --git a/third_party/git/Documentation/technical/api-object-access.txt b/third_party/git/Documentation/technical/api-object-access.txt new file mode 100644 index 0000000000..5b29622d00 --- /dev/null +++ b/third_party/git/Documentation/technical/api-object-access.txt @@ -0,0 +1,15 @@ +object access API +================= + +Talk about <sha1-file.c> and <object.h> family, things like + +* read_sha1_file() +* read_object_with_reference() +* has_sha1_file() +* write_sha1_file() +* pretend_object_file() +* lookup_{object,commit,tag,blob,tree} +* parse_{object,commit,tag,blob,tree} +* Use of object flags + +(JC, Shawn, Daniel, Dscho, Linus) diff --git a/third_party/git/Documentation/technical/api-oid-array.txt b/third_party/git/Documentation/technical/api-oid-array.txt new file mode 100644 index 0000000000..c97428c2c3 --- /dev/null +++ b/third_party/git/Documentation/technical/api-oid-array.txt @@ -0,0 +1,90 @@ +oid-array API +============== + +The oid-array API provides storage and manipulation of sets of object +identifiers. The emphasis is on storage and processing efficiency, +making them suitable for large lists. Note that the ordering of items is +not preserved over some operations. + +Data Structures +--------------- + +`struct oid_array`:: + + A single array of object IDs. This should be initialized by + assignment from `OID_ARRAY_INIT`. The `oid` member contains + the actual data. The `nr` member contains the number of items in + the set. The `alloc` and `sorted` members are used internally, + and should not be needed by API callers. + +Functions +--------- + +`oid_array_append`:: + Add an item to the set. The object ID will be placed at the end of + the array (but note that some operations below may lose this + ordering). + +`oid_array_lookup`:: + Perform a binary search of the array for a specific object ID. + If found, returns the offset (in number of elements) of the + object ID. If not found, returns a negative integer. If the array + is not sorted, this function has the side effect of sorting it. + +`oid_array_clear`:: + Free all memory associated with the array and return it to the + initial, empty state. + +`oid_array_for_each`:: + Iterate over each element of the list, executing the callback + function for each one. Does not sort the list, so any custom + hash order is retained. If the callback returns a non-zero + value, the iteration ends immediately and the callback's + return is propagated; otherwise, 0 is returned. + +`oid_array_for_each_unique`:: + Iterate over each unique element of the list in sorted order, + but otherwise behave like `oid_array_for_each`. If the array + is not sorted, this function has the side effect of sorting + it. + +`oid_array_filter`:: + Apply the callback function `want` to each entry in the array, + retaining only the entries for which the function returns true. + Preserve the order of the entries that are retained. + +Examples +-------- + +----------------------------------------- +int print_callback(const struct object_id *oid, + void *data) +{ + printf("%s\n", oid_to_hex(oid)); + return 0; /* always continue */ +} + +void some_func(void) +{ + struct sha1_array hashes = OID_ARRAY_INIT; + struct object_id oid; + + /* Read objects into our set */ + while (read_object_from_stdin(oid.hash)) + oid_array_append(&hashes, &oid); + + /* Check if some objects are in our set */ + while (read_object_from_stdin(oid.hash)) { + if (oid_array_lookup(&hashes, &oid) >= 0) + printf("it's in there!\n"); + + /* + * Print the unique set of objects. We could also have + * avoided adding duplicate objects in the first place, + * but we would end up re-sorting the array repeatedly. + * Instead, this will sort once and then skip duplicates + * in linear time. + */ + oid_array_for_each_unique(&hashes, print_callback, NULL); +} +----------------------------------------- diff --git a/third_party/git/Documentation/technical/api-quote.txt b/third_party/git/Documentation/technical/api-quote.txt new file mode 100644 index 0000000000..e8a1bce94e --- /dev/null +++ b/third_party/git/Documentation/technical/api-quote.txt @@ -0,0 +1,10 @@ +quote API +========= + +Talk about <quote.h>, things like + +* sq_quote and unquote +* c_style quote and unquote +* quoting for foreign languages + +(JC) diff --git a/third_party/git/Documentation/technical/api-ref-iteration.txt b/third_party/git/Documentation/technical/api-ref-iteration.txt new file mode 100644 index 0000000000..ad9d019ff9 --- /dev/null +++ b/third_party/git/Documentation/technical/api-ref-iteration.txt @@ -0,0 +1,78 @@ +ref iteration API +================= + + +Iteration of refs is done by using an iterate function which will call a +callback function for every ref. The callback function has this +signature: + + int handle_one_ref(const char *refname, const struct object_id *oid, + int flags, void *cb_data); + +There are different kinds of iterate functions which all take a +callback of this type. The callback is then called for each found ref +until the callback returns nonzero. The returned value is then also +returned by the iterate function. + +Iteration functions +------------------- + +* `head_ref()` just iterates the head ref. + +* `for_each_ref()` iterates all refs. + +* `for_each_ref_in()` iterates all refs which have a defined prefix and + strips that prefix from the passed variable refname. + +* `for_each_tag_ref()`, `for_each_branch_ref()`, `for_each_remote_ref()`, + `for_each_replace_ref()` iterate refs from the respective area. + +* `for_each_glob_ref()` iterates all refs that match the specified glob + pattern. + +* `for_each_glob_ref_in()` the previous and `for_each_ref_in()` combined. + +* Use `refs_` API for accessing submodules. The submodule ref store could + be obtained with `get_submodule_ref_store()`. + +* `for_each_rawref()` can be used to learn about broken ref and symref. + +* `for_each_reflog()` iterates each reflog file. + +Submodules +---------- + +If you want to iterate the refs of a submodule you first need to add the +submodules object database. You can do this by a code-snippet like +this: + + const char *path = "path/to/submodule" + if (add_submodule_odb(path)) + die("Error submodule '%s' not populated.", path); + +`add_submodule_odb()` will return zero on success. If you +do not do this you will get an error for each ref that it does not point +to a valid object. + +Note: As a side-effect of this you cannot safely assume that all +objects you lookup are available in superproject. All submodule objects +will be available the same way as the superprojects objects. + +Example: +-------- + +---- +static int handle_remote_ref(const char *refname, + const unsigned char *sha1, int flags, void *cb_data) +{ + struct strbuf *output = cb_data; + strbuf_addf(output, "%s\n", refname); + return 0; +} + +... + + struct strbuf output = STRBUF_INIT; + for_each_remote_ref(handle_remote_ref, &output); + printf("%s", output.buf); +---- diff --git a/third_party/git/Documentation/technical/api-remote.txt b/third_party/git/Documentation/technical/api-remote.txt new file mode 100644 index 0000000000..f10941b2e8 --- /dev/null +++ b/third_party/git/Documentation/technical/api-remote.txt @@ -0,0 +1,127 @@ +Remotes configuration API +========================= + +The API in remote.h gives access to the configuration related to +remotes. It handles all three configuration mechanisms historically +and currently used by Git, and presents the information in a uniform +fashion. Note that the code also handles plain URLs without any +configuration, giving them just the default information. + +struct remote +------------- + +`name`:: + + The user's nickname for the remote + +`url`:: + + An array of all of the url_nr URLs configured for the remote + +`pushurl`:: + + An array of all of the pushurl_nr push URLs configured for the remote + +`push`:: + + An array of refspecs configured for pushing, with + push_refspec being the literal strings, and push_refspec_nr + being the quantity. + +`fetch`:: + + An array of refspecs configured for fetching, with + fetch_refspec being the literal strings, and fetch_refspec_nr + being the quantity. + +`fetch_tags`:: + + The setting for whether to fetch tags (as a separate rule from + the configured refspecs); -1 means never to fetch tags, 0 + means to auto-follow tags based on the default heuristic, 1 + means to always auto-follow tags, and 2 means to fetch all + tags. + +`receivepack`, `uploadpack`:: + + The configured helper programs to run on the remote side, for + Git-native protocols. + +`http_proxy`:: + + The proxy to use for curl (http, https, ftp, etc.) URLs. + +`http_proxy_authmethod`:: + + The method used for authenticating against `http_proxy`. + +struct remotes can be found by name with remote_get(), and iterated +through with for_each_remote(). remote_get(NULL) will return the +default remote, given the current branch and configuration. + +struct refspec +-------------- + +A struct refspec holds the parsed interpretation of a refspec. If it +will force updates (starts with a '+'), force is true. If it is a +pattern (sides end with '*') pattern is true. src and dest are the +two sides (including '*' characters if present); if there is only one +side, it is src, and dst is NULL; if sides exist but are empty (i.e., +the refspec either starts or ends with ':'), the corresponding side is +"". + +An array of strings can be parsed into an array of struct refspecs +using parse_fetch_refspec() or parse_push_refspec(). + +remote_find_tracking(), given a remote and a struct refspec with +either src or dst filled out, will fill out the other such that the +result is in the "fetch" specification for the remote (note that this +evaluates patterns and returns a single result). + +struct branch +------------- + +Note that this may end up moving to branch.h + +struct branch holds the configuration for a branch. It can be looked +up with branch_get(name) for "refs/heads/{name}", or with +branch_get(NULL) for HEAD. + +It contains: + +`name`:: + + The short name of the branch. + +`refname`:: + + The full path for the branch ref. + +`remote_name`:: + + The name of the remote listed in the configuration. + +`merge_name`:: + + An array of the "merge" lines in the configuration. + +`merge`:: + + An array of the struct refspecs used for the merge lines. That + is, merge[i]->dst is a local tracking ref which should be + merged into this branch by default. + +`merge_nr`:: + + The number of merge configurations + +branch_has_merge_config() returns true if the given branch has merge +configuration given. + +Other stuff +----------- + +There is other stuff in remote.h that is related, in general, to the +process of interacting with remotes. + +(Daniel Barkalow) diff --git a/third_party/git/Documentation/technical/api-revision-walking.txt b/third_party/git/Documentation/technical/api-revision-walking.txt new file mode 100644 index 0000000000..03f9ea6ac4 --- /dev/null +++ b/third_party/git/Documentation/technical/api-revision-walking.txt @@ -0,0 +1,72 @@ +revision walking API +==================== + +The revision walking API offers functions to build a list of revisions +and then iterate over that list. + +Calling sequence +---------------- + +The walking API has a given calling sequence: first you need to +initialize a rev_info structure, then add revisions to control what kind +of revision list do you want to get, finally you can iterate over the +revision list. + +Functions +--------- + +`repo_init_revisions`:: + + Initialize a rev_info structure with default values. The third + parameter may be NULL or can be prefix path, and then the `.prefix` + variable will be set to it. This is typically the first function you + want to call when you want to deal with a revision list. After calling + this function, you are free to customize options, like set + `.ignore_merges` to 0 if you don't want to ignore merges, and so on. See + `revision.h` for a complete list of available options. + +`add_pending_object`:: + + This function can be used if you want to add commit objects as revision + information. You can use the `UNINTERESTING` object flag to indicate if + you want to include or exclude the given commit (and commits reachable + from the given commit) from the revision list. ++ +NOTE: If you have the commits as a string list then you probably want to +use setup_revisions(), instead of parsing each string and using this +function. + +`setup_revisions`:: + + Parse revision information, filling in the `rev_info` structure, and + removing the used arguments from the argument list. Returns the number + of arguments left that weren't recognized, which are also moved to the + head of the argument list. The last parameter is used in case no + parameter given by the first two arguments. + +`prepare_revision_walk`:: + + Prepares the rev_info structure for a walk. You should check if it + returns any error (non-zero return code) and if it does not, you can + start using get_revision() to do the iteration. + +`get_revision`:: + + Takes a pointer to a `rev_info` structure and iterates over it, + returning a `struct commit *` each time you call it. The end of the + revision list is indicated by returning a NULL pointer. + +`reset_revision_walk`:: + + Reset the flags used by the revision walking api. You can use + this to do multiple sequential revision walks. + +Data structures +--------------- + +Talk about <revision.h>, things like: + +* two diff_options, one for path limiting, another for output; +* remaining functions; + +(Linus, JC, Dscho) diff --git a/third_party/git/Documentation/technical/api-run-command.txt b/third_party/git/Documentation/technical/api-run-command.txt new file mode 100644 index 0000000000..8bf3e37f53 --- /dev/null +++ b/third_party/git/Documentation/technical/api-run-command.txt @@ -0,0 +1,264 @@ +run-command API +=============== + +The run-command API offers a versatile tool to run sub-processes with +redirected input and output as well as with a modified environment +and an alternate current directory. + +A similar API offers the capability to run a function asynchronously, +which is primarily used to capture the output that the function +produces in the caller in order to process it. + + +Functions +--------- + +`child_process_init`:: + + Initialize a struct child_process variable. + +`start_command`:: + + 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. + +`finish_command`:: + + Wait for the completion of a sub-process that was started with + start_command(). + +`run_command`:: + + A convenience function that encapsulates a sequence of + start_command() followed by finish_command(). Takes a pointer + to a `struct child_process` that specifies the details. + +`run_command_v_opt`, `run_command_v_opt_cd_env`:: + + Convenience functions that encapsulate a sequence of + start_command() followed by finish_command(). The argument argv + specifies the program and its arguments. The argument opt is zero + or more of the flags `RUN_COMMAND_NO_STDIN`, `RUN_GIT_CMD`, + `RUN_COMMAND_STDOUT_TO_STDERR`, or `RUN_SILENT_EXEC_FAILURE` + that correspond to the members .no_stdin, .git_cmd, + .stdout_to_stderr, .silent_exec_failure of `struct child_process`. + The argument dir corresponds the member .dir. The argument env + corresponds to the member .env. + +`child_process_clear`:: + + Release the memory associated with the struct child_process. + Most users of the run-command API don't need to call this + function explicitly because `start_command` invokes it on + failure and `finish_command` calls it automatically already. + +The functions above do the following: + +. If a system call failed, errno is set and -1 is returned. A diagnostic + is printed. + +. If the program was not found, then -1 is returned and errno is set to + ENOENT; a diagnostic is printed only if .silent_exec_failure is 0. + +. Otherwise, the program is run. If it terminates regularly, its exit + code is returned. No diagnostic is printed, even if the exit code is + non-zero. + +. If the program terminated due to a signal, then the return value is the + signal number + 128, ie. the same value that a POSIX shell's $? would + report. A diagnostic is printed. + + +`start_async`:: + + Run a function asynchronously. Takes a pointer to a `struct + async` that specifies the details and returns a set of pipe FDs + for communication with the function. See below for details. + +`finish_async`:: + + Wait for the completion of an asynchronous function that was + started with start_async(). + +`run_hook`:: + + Run a hook. + The first argument is a pathname to an index file, or NULL + if the hook uses the default index file or no index is needed. + The second argument is the name of the hook. + The further arguments correspond to the hook arguments. + The last argument has to be NULL to terminate the arguments list. + If the hook does not exist or is not executable, the return + value will be zero. + If it is executable, the hook will be executed and the exit + status of the hook is returned. + On execution, .stdout_to_stderr and .no_stdin will be set. + (See below.) + + +Data structures +--------------- + +* `struct child_process` + +This describes the arguments, redirections, and environment of a +command to run in a sub-process. + +The caller: + +1. allocates and clears (using child_process_init() or + CHILD_PROCESS_INIT) a struct child_process variable; +2. initializes the members; +3. calls start_command(); +4. processes the data; +5. closes file descriptors (if necessary; see below); +6. calls finish_command(). + +The .argv member is set up as an array of string pointers (NULL +terminated), of which .argv[0] is the program name to run (usually +without a path). If the command to run is a git command, set argv[0] to +the command name without the 'git-' prefix and set .git_cmd = 1. + +Note that the ownership of the memory pointed to by .argv stays with the +caller, but it should survive until `finish_command` completes. If the +.argv member is NULL, `start_command` will point it at the .args +`argv_array` (so you may use one or the other, but you must use exactly +one). The memory in .args will be cleaned up automatically during +`finish_command` (or during `start_command` when it is unsuccessful). + +The members .in, .out, .err are used to redirect stdin, stdout, +stderr as follows: + +. Specify 0 to request no special redirection. No new file descriptor + is allocated. The child process simply inherits the channel from the + parent. + +. Specify -1 to have a pipe allocated; start_command() replaces -1 + by the pipe FD in the following way: + + .in: Returns the writable pipe end into which the caller writes; + the readable end of the pipe becomes the child's stdin. + + .out, .err: Returns the readable pipe end from which the caller + reads; the writable end of the pipe end becomes child's + stdout/stderr. + + The caller of start_command() must close the so returned FDs + after it has completed reading from/writing to it! + +. Specify a file descriptor > 0 to be used by the child: + + .in: The FD must be readable; it becomes child's stdin. + .out: The FD must be writable; it becomes child's stdout. + .err: The FD must be writable; it becomes child's stderr. + + The specified FD is closed by start_command(), even if it fails to + run the sub-process! + +. Special forms of redirection are available by setting these members + to 1: + + .no_stdin, .no_stdout, .no_stderr: The respective channel is + redirected to /dev/null. + + .stdout_to_stderr: stdout of the child is redirected to its + stderr. This happens after stderr is itself redirected. + So stdout will follow stderr to wherever it is + redirected. + +To modify the environment of the sub-process, specify an array of +string pointers (NULL terminated) in .env: + +. If the string is of the form "VAR=value", i.e. it contains '=' + the variable is added to the child process's environment. + +. If the string does not contain '=', it names an environment + variable that will be removed from the child process's environment. + +If the .env member is NULL, `start_command` will point it at the +.env_array `argv_array` (so you may use one or the other, but not both). +The memory in .env_array will be cleaned up automatically during +`finish_command` (or during `start_command` when it is unsuccessful). + +To specify a new initial working directory for the sub-process, +specify it in the .dir member. + +If the program cannot be found, the functions return -1 and set +errno to ENOENT. Normally, an error message is printed, but if +.silent_exec_failure is set to 1, no message is printed for this +special error condition. + + +* `struct async` + +This describes a function to run asynchronously, whose purpose is +to produce output that the caller reads. + +The caller: + +1. allocates and clears (memset(&asy, 0, sizeof(asy));) a + struct async variable; +2. initializes .proc and .data; +3. calls start_async(); +4. processes communicates with proc through .in and .out; +5. closes .in and .out; +6. calls finish_async(). + +The members .in, .out are used to provide a set of fd's for +communication between the caller and the callee as follows: + +. Specify 0 to have no file descriptor passed. The callee will + receive -1 in the corresponding argument. + +. Specify < 0 to have a pipe allocated; start_async() replaces + with the pipe FD in the following way: + + .in: Returns the writable pipe end into which the caller + writes; the readable end of the pipe becomes the function's + in argument. + + .out: Returns the readable pipe end from which the caller + reads; the writable end of the pipe becomes the function's + out argument. + + The caller of start_async() must close the returned FDs after it + has completed reading from/writing from them. + +. Specify a file descriptor > 0 to be used by the function: + + .in: The FD must be readable; it becomes the function's in. + .out: The FD must be writable; it becomes the function's out. + + The specified FD is closed by start_async(), even if it fails to + run the function. + +The function pointer in .proc has the following signature: + + int proc(int in, int out, void *data); + +. in, out specifies a set of file descriptors to which the function + must read/write the data that it needs/produces. The function + *must* close these descriptors before it returns. A descriptor + may be -1 if the caller did not configure a descriptor for that + direction. + +. data is the value that the caller has specified in the .data member + of struct async. + +. The return value of the function is 0 on success and non-zero + on failure. If the function indicates failure, finish_async() will + report failure as well. + + +There are serious restrictions on what the asynchronous function can do +because this facility is implemented by a thread in the same address +space on most platforms (when pthreads is available), but by a pipe to +a forked process otherwise: + +. It cannot change the program's state (global variables, environment, + etc.) in a way that the caller notices; in other words, .in and .out + are the only communication channels to the caller. + +. It must not change the program's state that the caller of the + facility also uses. diff --git a/third_party/git/Documentation/technical/api-setup.txt b/third_party/git/Documentation/technical/api-setup.txt new file mode 100644 index 0000000000..eb1fa9853e --- /dev/null +++ b/third_party/git/Documentation/technical/api-setup.txt @@ -0,0 +1,47 @@ +setup API +========= + +Talk about + +* setup_git_directory() +* setup_git_directory_gently() +* is_inside_git_dir() +* is_inside_work_tree() +* setup_work_tree() + +(Dscho) + +Pathspec +-------- + +See glossary-context.txt for the syntax of pathspec. In memory, a +pathspec set is represented by "struct pathspec" and is prepared by +parse_pathspec(). This function takes several arguments: + +- magic_mask specifies what features that are NOT supported by the + following code. If a user attempts to use such a feature, + parse_pathspec() can reject it early. + +- flags specifies other things that the caller wants parse_pathspec to + perform. + +- prefix and args come from cmd_* functions + +parse_pathspec() helps catch unsupported features and reject them +politely. At a lower level, different pathspec-related functions may +not support the same set of features. Such pathspec-sensitive +functions are guarded with GUARD_PATHSPEC(), which will die in an +unfriendly way when an unsupported feature is requested. + +The command designers are supposed to make sure that GUARD_PATHSPEC() +never dies. They have to make sure all unsupported features are caught +by parse_pathspec(), not by GUARD_PATHSPEC. grepping GUARD_PATHSPEC() +should give the designers all pathspec-sensitive codepaths and what +features they support. + +A similar process is applied when a new pathspec magic is added. The +designer lifts the GUARD_PATHSPEC restriction in the functions that +support the new magic. At the same time (s)he has to make sure this +new feature will be caught at parse_pathspec() in commands that cannot +handle the new magic in some cases. grepping parse_pathspec() should +help. diff --git a/third_party/git/Documentation/technical/api-sigchain.txt b/third_party/git/Documentation/technical/api-sigchain.txt new file mode 100644 index 0000000000..9e1189ef01 --- /dev/null +++ b/third_party/git/Documentation/technical/api-sigchain.txt @@ -0,0 +1,41 @@ +sigchain API +============ + +Code often wants to set a signal handler to clean up temporary files or +other work-in-progress when we die unexpectedly. For multiple pieces of +code to do this without conflicting, each piece of code must remember +the old value of the handler and restore it either when: + + 1. The work-in-progress is finished, and the handler is no longer + necessary. The handler should revert to the original behavior + (either another handler, SIG_DFL, or SIG_IGN). + + 2. The signal is received. We should then do our cleanup, then chain + to the next handler (or die if it is SIG_DFL). + +Sigchain is a tiny library for keeping a stack of handlers. Your handler +and installation code should look something like: + +------------------------------------------ + void clean_foo_on_signal(int sig) + { + clean_foo(); + sigchain_pop(sig); + raise(sig); + } + + void other_func() + { + sigchain_push_common(clean_foo_on_signal); + mess_up_foo(); + clean_foo(); + } +------------------------------------------ + +Handlers are given the typedef of sigchain_fun. This is the same type +that is given to signal() or sigaction(). It is perfectly reasonable to +push SIG_DFL or SIG_IGN onto the stack. + +You can sigchain_push and sigchain_pop individual signals. For +convenience, sigchain_push_common will push the handler onto the stack +for many common signals. diff --git a/third_party/git/Documentation/technical/api-submodule-config.txt b/third_party/git/Documentation/technical/api-submodule-config.txt new file mode 100644 index 0000000000..fb06089393 --- /dev/null +++ b/third_party/git/Documentation/technical/api-submodule-config.txt @@ -0,0 +1,66 @@ +submodule config cache API +========================== + +The submodule config cache API allows to read submodule +configurations/information from specified revisions. Internally +information is lazily read into a cache that is used to avoid +unnecessary parsing of the same .gitmodules files. Lookups can be done by +submodule path or name. + +Usage +----- + +To initialize the cache with configurations from the worktree the caller +typically first calls `gitmodules_config()` to read values from the +worktree .gitmodules and then to overlay the local git config values +`parse_submodule_config_option()` from the config parsing +infrastructure. + +The caller can look up information about submodules by using the +`submodule_from_path()` or `submodule_from_name()` functions. They return +a `struct submodule` which contains the values. The API automatically +initializes and allocates the needed infrastructure on-demand. If the +caller does only want to lookup values from revisions the initialization +can be skipped. + +If the internal cache might grow too big or when the caller is done with +the API, all internally cached values can be freed with submodule_free(). + +Data Structures +--------------- + +`struct submodule`:: + + This structure is used to return the information about one + submodule for a certain revision. It is returned by the lookup + functions. + +Functions +--------- + +`void submodule_free(struct repository *r)`:: + + Use these to free the internally cached values. + +`int parse_submodule_config_option(const char *var, const char *value)`:: + + Can be passed to the config parsing infrastructure to parse + local (worktree) submodule configurations. + +`const struct submodule *submodule_from_path(const unsigned char *treeish_name, const char *path)`:: + + Given a tree-ish in the superproject and a path, return the + submodule that is bound at the path in the named tree. + +`const struct submodule *submodule_from_name(const unsigned char *treeish_name, const char *name)`:: + + The same as above but lookup by name. + +Whenever a submodule configuration is parsed in `parse_submodule_config_option` +via e.g. `gitmodules_config()`, it will overwrite the null_sha1 entry. +So in the normal case, when HEAD:.gitmodules is parsed first and then overlayed +with the repository configuration, the null_sha1 entry contains the local +configuration of a submodule (e.g. consolidated values from local git +configuration and the .gitmodules file in the worktree). + +For an example usage see test-submodule-config.c. diff --git a/third_party/git/Documentation/technical/api-trace.txt b/third_party/git/Documentation/technical/api-trace.txt new file mode 100644 index 0000000000..fadb5979c4 --- /dev/null +++ b/third_party/git/Documentation/technical/api-trace.txt @@ -0,0 +1,140 @@ +trace API +========= + +The trace API can be used to print debug messages to stderr or a file. Trace +code is inactive unless explicitly enabled by setting `GIT_TRACE*` environment +variables. + +The trace implementation automatically adds `timestamp file:line ... \n` to +all trace messages. E.g.: + +------------ +23:59:59.123456 git.c:312 trace: built-in: git 'foo' +00:00:00.000001 builtin/foo.c:99 foo: some message +------------ + +Data Structures +--------------- + +`struct trace_key`:: + + Defines a trace key (or category). The default (for API functions that + don't take a key) is `GIT_TRACE`. ++ +E.g. to define a trace key controlled by environment variable `GIT_TRACE_FOO`: ++ +------------ +static struct trace_key trace_foo = TRACE_KEY_INIT(FOO); + +static void trace_print_foo(const char *message) +{ + trace_printf_key(&trace_foo, "%s", message); +} +------------ ++ +Note: don't use `const` as the trace implementation stores internal state in +the `trace_key` structure. + +Functions +--------- + +`int trace_want(struct trace_key *key)`:: + + Checks whether the trace key is enabled. Used to prevent expensive + string formatting before calling one of the printing APIs. + +`void trace_disable(struct trace_key *key)`:: + + Disables tracing for the specified key, even if the environment + variable was set. + +`void trace_printf(const char *format, ...)`:: +`void trace_printf_key(struct trace_key *key, const char *format, ...)`:: + + Prints a formatted message, similar to printf. + +`void trace_argv_printf(const char **argv, const char *format, ...)``:: + + Prints a formatted message, followed by a quoted list of arguments. + +`void trace_strbuf(struct trace_key *key, const struct strbuf *data)`:: + + Prints the strbuf, without additional formatting (i.e. doesn't + choke on `%` or even `\0`). + +`uint64_t getnanotime(void)`:: + + Returns nanoseconds since the epoch (01/01/1970), typically used + for performance measurements. ++ +Currently there are high precision timer implementations for Linux (using +`clock_gettime(CLOCK_MONOTONIC)`) and Windows (`QueryPerformanceCounter`). +Other platforms use `gettimeofday` as time source. + +`void trace_performance(uint64_t nanos, const char *format, ...)`:: +`void trace_performance_since(uint64_t start, const char *format, ...)`:: + + Prints the elapsed time (in nanoseconds), or elapsed time since + `start`, followed by a formatted message. Enabled via environment + variable `GIT_TRACE_PERFORMANCE`. Used for manual profiling, e.g.: ++ +------------ +uint64_t start = getnanotime(); +/* code section to measure */ +trace_performance_since(start, "foobar"); +------------ ++ +------------ +uint64_t t = 0; +for (;;) { + /* ignore */ + t -= getnanotime(); + /* code section to measure */ + t += getnanotime(); + /* ignore */ +} +trace_performance(t, "frotz"); +------------ + +Bugs & Caveats +-------------- + +GIT_TRACE_* environment variables can be used to tell Git to show +trace output to its standard error stream. Git can often spawn a pager +internally to run its subcommand and send its standard output and +standard error to it. + +Because GIT_TRACE_PERFORMANCE trace is generated only at the very end +of the program with atexit(), which happens after the pager exits, it +would not work well if you send its log to the standard error output +and let Git spawn the pager at the same time. + +As a work around, you can for example use '--no-pager', or set +GIT_TRACE_PERFORMANCE to another file descriptor which is redirected +to stderr, or set GIT_TRACE_PERFORMANCE to a file specified by its +absolute path. + +For example instead of the following command which by default may not +print any performance information: + +------------ +GIT_TRACE_PERFORMANCE=2 git log -1 +------------ + +you may want to use: + +------------ +GIT_TRACE_PERFORMANCE=2 git --no-pager log -1 +------------ + +or: + +------------ +GIT_TRACE_PERFORMANCE=3 3>&2 git log -1 +------------ + +or: + +------------ +GIT_TRACE_PERFORMANCE=/path/to/log/file git log -1 +------------ diff --git a/third_party/git/Documentation/technical/api-trace2.txt b/third_party/git/Documentation/technical/api-trace2.txt index 4f07ceadcb..71eb081fed 100644 --- a/third_party/git/Documentation/technical/api-trace2.txt +++ b/third_party/git/Documentation/technical/api-trace2.txt @@ -128,7 +128,7 @@ yields ------------ $ cat ~/log.event -{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"2","exe":"2.20.1.155.g426c96fcdb"} +{"event":"version","sid":"sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.620713Z","file":"common-main.c","line":38,"evt":"1","exe":"2.20.1.155.g426c96fcdb"} {"event":"start","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621027Z","file":"common-main.c","line":39,"t_abs":0.001173,"argv":["git","version"]} {"event":"cmd_name","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621122Z","file":"git.c","line":432,"name":"version","hierarchy":"version"} {"event":"exit","sid":"20190408T191610.507018Z-H9b68c35f-P000059a8","thread":"main","time":"2019-01-16T17:28:42.621236Z","file":"git.c","line":662,"t_abs":0.001227,"code":0} @@ -142,9 +142,10 @@ system or global config value to one of the following: include::../trace2-target-values.txt[] -When trace files are written to a target directory, they will be named according -to the last component of the SID (optionally followed by a counter to avoid -filename collisions). +If the target already exists and is a directory, the traces will be +written to files (one per process) underneath the given directory. They +will be named according to the last component of the SID (optionally +followed by a counter to avoid filename collisions). == Trace2 API @@ -178,7 +179,7 @@ describe the simplified forms. == Public API -All Trace2 API functions send a message to all of the active +All Trace2 API functions send a messsage to all of the active Trace2 Targets. This section describes the set of available messages. @@ -188,36 +189,261 @@ purposes. === Basic Command Messages These are concerned with the lifetime of the overall git process. -e.g: `void trace2_initialize_clock()`, `void trace2_initialize()`, -`int trace2_is_enabled()`, `void trace2_cmd_start(int argc, const char **argv)`. + +`void trace2_initialize_clock()`:: + + Initialize the Trace2 start clock and nothing else. This should + be called at the very top of main() to capture the process start + time and reduce startup order dependencies. + +`void trace2_initialize()`:: + + Determines if any Trace2 Targets should be enabled and + initializes the Trace2 facility. This includes setting up the + Trace2 thread local storage (TLS). ++ +This function emits a "version" message containing the version of git +and the Trace2 protocol. ++ +This function should be called from `main()` as early as possible in +the life of the process after essential process initialization. + +`int trace2_is_enabled()`:: + + Returns 1 if Trace2 is enabled (at least one target is + active). + +`void trace2_cmd_start(int argc, const char **argv)`:: + + Emits a "start" message containing the process command line + arguments. + +`int trace2_cmd_exit(int exit_code)`:: + + Emits an "exit" message containing the process exit-code and + elapsed time. ++ +Returns the exit-code. + +`void trace2_cmd_error(const char *fmt, va_list ap)`:: + + Emits an "error" message containing a formatted error message. + +`void trace2_cmd_path(const char *pathname)`:: + + Emits a "cmd_path" message with the full pathname of the + current process. === Command Detail Messages These are concerned with describing the specific Git command after the command line, config, and environment are inspected. -e.g: `void trace2_cmd_name(const char *name)`, -`void trace2_cmd_mode(const char *mode)`. + +`void trace2_cmd_name(const char *name)`:: + + Emits a "cmd_name" message with the canonical name of the + command, for example "status" or "checkout". + +`void trace2_cmd_mode(const char *mode)`:: + + Emits a "cmd_mode" message with a qualifier name to further + describe the current git command. ++ +This message is intended to be used with git commands having multiple +major modes. For example, a "checkout" command can checkout a new +branch or it can checkout a single file, so the checkout code could +emit a cmd_mode message of "branch" or "file". + +`void trace2_cmd_alias(const char *alias, const char **argv_expansion)`:: + + Emits an "alias" message containing the alias used and the + argument expansion. + +`void trace2_def_param(const char *parameter, const char *value)`:: + + Emits a "def_param" message containing a key/value pair. ++ +This message is intended to report some global aspect of the current +command, such as a configuration setting or command line switch that +significantly affects program performance or behavior, such as +`core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`. + +`void trace2_cmd_list_config()`:: + + Emits a "def_param" messages for "important" configuration + settings. ++ +The environment variable `GIT_TRACE2_CONFIG_PARAMS` or the `trace2.configParams` +config value can be set to a +list of patterns of important configuration settings, for example: +`core.*,remote.*.url`. This function will iterate over all config +settings and emit a "def_param" message for each match. + +`void trace2_cmd_set_config(const char *key, const char *value)`:: + + Emits a "def_param" message for a new or updated key/value + pair IF `key` is considered important. ++ +This is used to hook into `git_config_set()` and catch any +configuration changes and update a value previously reported by +`trace2_cmd_list_config()`. + +`void trace2_def_repo(struct repository *repo)`:: + + Registers a repository with the Trace2 layer. Assigns a + unique "repo-id" to `repo->trace2_repo_id`. ++ +Emits a "worktree" messages containing the repo-id and the worktree +pathname. ++ +Region and data messages (described later) may refer to this repo-id. ++ +The main/top-level repository will have repo-id value 1 (aka "r1"). ++ +The repo-id field is in anticipation of future in-proc submodule +repositories. === Child Process Messages These are concerned with the various spawned child processes, including shell scripts, git commands, editors, pagers, and hooks. -e.g: `void trace2_child_start(struct child_process *cmd)`. +`void trace2_child_start(struct child_process *cmd)`:: + + Emits a "child_start" message containing the "child-id", + "child-argv", and "child-classification". ++ +Before calling this, set `cmd->trace2_child_class` to a name +describing the type of child process, for example "editor". ++ +This function assigns a unique "child-id" to `cmd->trace2_child_id`. +This field is used later during the "child_exit" message to associate +it with the "child_start" message. ++ +This function should be called before spawning the child process. + +`void trace2_child_exit(struct child_proess *cmd, int child_exit_code)`:: + + Emits a "child_exit" message containing the "child-id", + the child's elapsed time and exit-code. ++ +The reported elapsed time includes the process creation overhead and +time spend waiting for it to exit, so it may be slightly longer than +the time reported by the child itself. ++ +This function should be called after reaping the child process. + +`int trace2_exec(const char *exe, const char **argv)`:: + + Emits a "exec" message containing the "exec-id" and the + argv of the new process. ++ +This function should be called before calling one of the `exec()` +variants, such as `execvp()`. ++ +This function returns a unique "exec-id". This value is used later +if the exec() fails and a "exec-result" message is necessary. + +`void trace2_exec_result(int exec_id, int error_code)`:: + + Emits a "exec_result" message containing the "exec-id" + and the error code. ++ +On Unix-based systems, `exec()` does not return if successful. +This message is used to indicate that the `exec()` failed and +that the current program is continuing. === Git Thread Messages These messages are concerned with Git thread usage. -e.g: `void trace2_thread_start(const char *thread_name)`. +`void trace2_thread_start(const char *thread_name)`:: + + Emits a "thread_start" message. ++ +The `thread_name` field should be a descriptive name, such as the +unique name of the thread-proc. A unique "thread-id" will be added +to the name to uniquely identify thread instances. ++ +Region and data messages (described later) may refer to this thread +name. ++ +This function must be called by the thread-proc of the new thread +(so that TLS data is properly initialized) and not by the caller +of `pthread_create()`. + +`void trace2_thread_exit()`:: + + Emits a "thread_exit" message containing the thread name + and the thread elapsed time. ++ +This function must be called by the thread-proc before it returns +(so that the coorect TLS data is used and cleaned up. It should +not be called by the caller of `pthread_join()`. === Region and Data Messages These are concerned with recording performance data -over regions or spans of code. e.g: -`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`. +over regions or spans of code. + +`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`:: + +`void trace2_region_enter_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`:: + +`void trace2_region_enter_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`:: + + Emits a thread-relative "region_enter" message with optional + printf string. ++ +This function pushes a new region nesting stack level on the current +thread and starts a clock for the new stack frame. ++ +The `category` field is an arbitrary category name used to classify +regions by feature area, such as "status" or "index". At this time +it is only just printed along with the rest of the message. It may +be used in the future to filter messages. ++ +The `label` field is an arbitrary label used to describe the activity +being started, such as "read_recursive" or "do_read_index". ++ +The `repo` field, if set, will be used to get the "repo-id", so that +recursive oerations can be attributed to the correct repository. + +`void trace2_region_leave(const char *category, const char *label, const struct repository *repo)`:: + +`void trace2_region_leave_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`:: + +`void trace2_region_leave_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`:: + + Emits a thread-relative "region_leave" message with optional + printf string. ++ +This function pops the region nesting stack on the current thread +and reports the elapsed time of the stack frame. ++ +The `category`, `label`, and `repo` fields are the same as above. +The `category` and `label` do not need to match the correpsonding +"region_enter" message, but it makes the data stream easier to +understand. + +`void trace2_data_string(const char *category, const struct repository *repo, const char *key, const char * value)`:: + +`void trace2_data_intmax(const char *category, const struct repository *repo, const char *key, intmax value)`:: + +`void trace2_data_json(const char *category, const struct repository *repo, const char *key, const struct json_writer *jw)`:: -Refer to trace2.h for details about all trace2 functions. + Emits a region- and thread-relative "data" or "data_json" message. ++ +This is a key/value pair message containing information about the +current thread, region stack, and repository. This could be used +to print the number of files in a directory during a multi-threaded +recursive tree walk. + +`void trace2_printf(const char *fmt, ...)`:: + +`void trace2_printf_va(const char *fmt, va_list ap)`:: + + Emits a region- and thread-relative "printf" message. == Trace2 Target Formats @@ -379,35 +605,17 @@ only present on the "start" and "atexit" events. ==== Event-Specific Key/Value Pairs `"version"`:: - This event gives the version of the executable and the EVENT format. It - should always be the first event in a trace session. The EVENT format - version will be incremented if new event types are added, if existing - fields are removed, or if there are significant changes in - interpretation of existing events or fields. Smaller changes, such as - adding a new field to an existing event, will not require an increment - to the EVENT format version. + This event gives the version of the executable and the EVENT format. + ------------ { "event":"version", ... - "evt":"2", # EVENT format version + "evt":"1", # EVENT format version "exe":"2.20.1.155.g426c96fcdb" # git version } ------------ -`"discard"`:: - This event is written to the git-trace2-discard sentinel file if there - are too many files in the target trace directory (see the - trace2.maxFiles config option). -+ ------------- -{ - "event":"discard", - ... -} ------------- - `"start"`:: This event contains the complete argv received by main(). + @@ -591,7 +799,7 @@ with "?". Note that the session-id of the child process is not available to the current/spawning process, so the child's PID is reported here as a hint for post-processing. (But it is only a hint because the child -process may be a shell script which doesn't have a session-id.) +proces may be a shell script which doesn't have a session-id.) + Note that the `t_rel` field contains the observed run time in seconds for the child process (starting before the fork/exec/spawn and @@ -951,7 +1159,7 @@ d0 | main | atexit | | 0.028809 | | + Regions may be nested. This causes messages to be indented in the PERF target, for example. -Elapsed times are relative to the start of the corresponding nesting +Elapsed times are relative to the start of the correpsonding nesting level as expected. For example, if we add region message to: + ---------------- @@ -1146,7 +1354,7 @@ d0 | main | atexit | | 0.030027 | | In this example, the preload region took 0.009122 seconds. The 7 threads took between 0.006069 and 0.008947 seconds to work on their portion of the index. Thread "th01" worked on 508 items at offset 0. Thread "th02" -worked on 508 items at offset 2032. Thread "th04" worked on 508 items +worked on 508 items at offset 2032. Thread "th04" worked on 508 itemts at offset 508. + This example also shows that thread names are assigned in a racy manner diff --git a/third_party/git/Documentation/technical/api-tree-walking.txt b/third_party/git/Documentation/technical/api-tree-walking.txt new file mode 100644 index 0000000000..bde18622a8 --- /dev/null +++ b/third_party/git/Documentation/technical/api-tree-walking.txt @@ -0,0 +1,147 @@ +tree walking API +================ + +The tree walking API is used to traverse and inspect trees. + +Data Structures +--------------- + +`struct name_entry`:: + + An entry in a tree. Each entry has a sha1 identifier, pathname, and + mode. + +`struct tree_desc`:: + + A semi-opaque data structure used to maintain the current state of the + walk. ++ +* `buffer` is a pointer into the memory representation of the tree. It always +points at the current entry being visited. + +* `size` counts the number of bytes left in the `buffer`. + +* `entry` points to the current entry being visited. + +`struct traverse_info`:: + + A structure used to maintain the state of a traversal. ++ +* `prev` points to the traverse_info which was used to descend into the +current tree. If this is the top-level tree `prev` will point to +a dummy traverse_info. + +* `name` is the entry for the current tree (if the tree is a subtree). + +* `pathlen` is the length of the full path for the current tree. + +* `conflicts` can be used by callbacks to maintain directory-file conflicts. + +* `fn` is a callback called for each entry in the tree. See Traversing for more +information. + +* `data` can be anything the `fn` callback would want to use. + +* `show_all_errors` tells whether to stop at the first error or not. + +Initializing +------------ + +`init_tree_desc`:: + + Initialize a `tree_desc` and decode its first entry. The buffer and + size parameters are assumed to be the same as the buffer and size + members of `struct tree`. + +`fill_tree_descriptor`:: + + Initialize a `tree_desc` and decode its first entry given the + object ID of a tree. Returns the `buffer` member if the latter + is a valid tree identifier and NULL otherwise. + +`setup_traverse_info`:: + + Initialize a `traverse_info` given the pathname of the tree to start + traversing from. The `base` argument is assumed to be the `path` + member of the `name_entry` being recursed into unless the tree is a + top-level tree in which case the empty string ("") is used. + +Walking +------- + +`tree_entry`:: + + Visit the next entry in a tree. Returns 1 when there are more entries + left to visit and 0 when all entries have been visited. This is + commonly used in the test of a while loop. + +`tree_entry_len`:: + + Calculate the length of a tree entry's pathname. This utilizes the + memory structure of a tree entry to avoid the overhead of using a + generic strlen(). + +`update_tree_entry`:: + + Walk to the next entry in a tree. This is commonly used in conjunction + with `tree_entry_extract` to inspect the current entry. + +`tree_entry_extract`:: + + Decode the entry currently being visited (the one pointed to by + `tree_desc's` `entry` member) and return the sha1 of the entry. The + `pathp` and `modep` arguments are set to the entry's pathname and mode + respectively. + +`get_tree_entry`:: + + Find an entry in a tree given a pathname and the sha1 of a tree to + search. Returns 0 if the entry is found and -1 otherwise. The third + and fourth parameters are set to the entry's sha1 and mode + respectively. + +Traversing +---------- + +`traverse_trees`:: + + Traverse `n` number of trees in parallel. The `fn` callback member of + `traverse_info` is called once for each tree entry. + +`traverse_callback_t`:: + The arguments passed to the traverse callback are as follows: ++ +* `n` counts the number of trees being traversed. + +* `mask` has its nth bit set if something exists in the nth entry. + +* `dirmask` has its nth bit set if the nth tree's entry is a directory. + +* `entry` is an array of size `n` where the nth entry is from the nth tree. + +* `info` maintains the state of the traversal. + ++ +Returning a negative value will terminate the traversal. Otherwise the +return value is treated as an update mask. If the nth bit is set the nth tree +will be updated and if the bit is not set the nth tree entry will be the +same in the next callback invocation. + +`make_traverse_path`:: + + Generate the full pathname of a tree entry based from the root of the + traversal. For example, if the traversal has recursed into another + tree named "bar" the pathname of an entry "baz" in the "bar" + tree would be "bar/baz". + +`traverse_path_len`:: + + Calculate the length of a pathname returned by `make_traverse_path`. + This utilizes the memory structure of a tree entry to avoid the + overhead of using a generic strlen(). + +Authors +------- + +Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds +<torvalds@linux-foundation.org> diff --git a/third_party/git/Documentation/technical/api-xdiff-interface.txt b/third_party/git/Documentation/technical/api-xdiff-interface.txt new file mode 100644 index 0000000000..6296ecad1d --- /dev/null +++ b/third_party/git/Documentation/technical/api-xdiff-interface.txt @@ -0,0 +1,7 @@ +xdiff interface API +=================== + +Talk about our calling convention to xdiff library, including +xdiff_emit_consume_fn. + +(Dscho, JC) diff --git a/third_party/git/Documentation/technical/bundle-format.txt b/third_party/git/Documentation/technical/bundle-format.txt deleted file mode 100644 index 0e828151a5..0000000000 --- a/third_party/git/Documentation/technical/bundle-format.txt +++ /dev/null @@ -1,48 +0,0 @@ -= Git bundle v2 format - -The Git bundle format is a format that represents both refs and Git objects. - -== Format - -We will use ABNF notation to define the Git bundle format. See -protocol-common.txt for the details. - ----- -bundle = signature *prerequisite *reference LF pack -signature = "# v2 git bundle" LF - -prerequisite = "-" obj-id SP comment LF -comment = *CHAR -reference = obj-id SP refname LF - -pack = ... ; packfile ----- - -== Semantics - -A Git bundle consists of three parts. - -* "Prerequisites" lists the objects that are NOT included in the bundle and the - reader of the bundle MUST already have, in order to use the data in the - bundle. The objects stored in the bundle may refer to prerequisite objects and - anything reachable from them (e.g. a tree object in the bundle can reference - a blob that is reachable from a prerequisite) and/or expressed as a delta - against prerequisite objects. - -* "References" record the tips of the history graph, iow, what the reader of the - bundle CAN "git fetch" from it. - -* "Pack" is the pack data stream "git fetch" would send, if you fetch from a - repository that has the references recorded in the "References" above into a - repository that has references pointing at the objects listed in - "Prerequisites" above. - -In the bundle format, there can be a comment following a prerequisite obj-id. -This is a comment and it has no specific meaning. The writer of the bundle MAY -put any string here. The reader of the bundle MUST ignore the comment. - -=== Note on the shallow clone and a Git bundle - -Note that the prerequisites does not represent a shallow-clone boundary. The -semantics of the prerequisites and the shallow-clone boundaries are different, -and the Git bundle v2 format cannot represent a shallow clone repository. diff --git a/third_party/git/Documentation/technical/commit-graph.txt b/third_party/git/Documentation/technical/commit-graph.txt index 808fa30b99..729fbcb32f 100644 --- a/third_party/git/Documentation/technical/commit-graph.txt +++ b/third_party/git/Documentation/technical/commit-graph.txt @@ -22,11 +22,11 @@ as "commit-graph" either in the .git/objects/info directory or in the info directory of an alternate. The commit-graph file stores the commit graph structure along with some -extra metadata to speed up graph walks. By listing commit OIDs in -lexicographic order, we can identify an integer position for each commit -and refer to the parents of a commit using those integer positions. We -use binary search to find initial commits and then use the integer -positions for fast lookups during the walk. +extra metadata to speed up graph walks. By listing commit OIDs in lexi- +cographic order, we can identify an integer position for each commit and +refer to the parents of a commit using those integer positions. We use +binary search to find initial commits and then use the integer positions +for fast lookups during the walk. A consumer may load the following info for a commit from the graph: @@ -85,7 +85,7 @@ have generation number represented by the macro GENERATION_NUMBER_ZERO = 0. Since the commit-graph file is closed under reachability, we can guarantee the following weaker condition on all commits: - If A and B are commits with generation numbers N and M, respectively, + If A and B are commits with generation numbers N amd M, respectively, and N < M, then A cannot reach B. Note how the strict inequality differs from the inequality when we have @@ -323,14 +323,14 @@ Related Links [0] https://bugs.chromium.org/p/git/issues/detail?id=8 Chromium work item for: Serialized Commit Graph -[1] https://lore.kernel.org/git/20110713070517.GC18566@sigill.intra.peff.net/ +[1] https://public-inbox.org/git/20110713070517.GC18566@sigill.intra.peff.net/ An abandoned patch that introduced generation numbers. -[2] https://lore.kernel.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/ +[2] https://public-inbox.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/ Discussion about generation numbers on commits and how they interact with fsck. -[3] https://lore.kernel.org/git/20170908034739.4op3w4f2ma5s65ku@sigill.intra.peff.net/ +[3] https://public-inbox.org/git/20170908034739.4op3w4f2ma5s65ku@sigill.intra.peff.net/ More discussion about generation numbers and not storing them inside commit objects. A valuable quote: @@ -342,9 +342,9 @@ Related Links commit objects (i.e., packv4 or something like the "metapacks" I proposed a few years ago)." -[4] https://lore.kernel.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u +[4] https://public-inbox.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u A patch to remove the ahead-behind calculation from 'status'. -[5] https://lore.kernel.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/ +[5] https://public-inbox.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/ A discussion of a "two-dimensional graph position" that can allow reading multiple commit-graph chains at the same time. diff --git a/third_party/git/Documentation/technical/hash-function-transition.txt b/third_party/git/Documentation/technical/hash-function-transition.txt index 5b2db3be1e..2ae8fa470a 100644 --- a/third_party/git/Documentation/technical/hash-function-transition.txt +++ b/third_party/git/Documentation/technical/hash-function-transition.txt @@ -531,7 +531,7 @@ Until Git protocol gains SHA-256 support, using SHA-256 based storage on public-facing Git servers is strongly discouraged. Once Git protocol gains SHA-256 support, SHA-256 based servers are likely not to support SHA-1 compatibility, to avoid what may be a very expensive -hash re-encode during clone and to encourage peers to modernize. +hash reencode during clone and to encourage peers to modernize. The design described here allows fetches by SHA-1 clients of a personal SHA-256 repository because it's not much more difficult than @@ -602,7 +602,7 @@ git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256} Choice of Hash -------------- -In early 2005, around the time that Git was written, Xiaoyun Wang, +In early 2005, around the time that Git was written, Xiaoyun Wang, Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1 collisions in 2^69 operations. In August they published details. Luckily, no practical demonstrations of a collision in full SHA-1 were @@ -730,7 +730,7 @@ adoption. Using hash functions in parallel ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -(e.g. https://lore.kernel.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ ) +(e.g. https://public-inbox.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ ) Objects newly created would be addressed by the new hash, but inside such an object (e.g. commit) it is still possible to address objects using the old hash function. @@ -783,7 +783,7 @@ bmwill@google.com, jonathantanmy@google.com, jrnieder@gmail.com, sbeller@google.com Initial version sent to -http://lore.kernel.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com +http://public-inbox.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com 2017-03-03 jrnieder@gmail.com Incorporated suggestions from jonathantanmy and sbeller: @@ -820,8 +820,8 @@ Later history: edits. This document history is no longer being maintained as it would now be superfluous to the commit log -[1] http://lore.kernel.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/ -[2] http://lore.kernel.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/ -[3] http://lore.kernel.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/ -[4] http://lore.kernel.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net -[5] https://lore.kernel.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/ +[1] http://public-inbox.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/ +[2] http://public-inbox.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/ +[3] http://public-inbox.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/ +[4] http://public-inbox.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net +[5] https://public-inbox.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/ diff --git a/third_party/git/Documentation/technical/index-format.txt b/third_party/git/Documentation/technical/index-format.txt index faa25c5c52..7c4d67aa6a 100644 --- a/third_party/git/Documentation/technical/index-format.txt +++ b/third_party/git/Documentation/technical/index-format.txt @@ -318,7 +318,7 @@ The remaining data of each directory block is grouped by type: == End of Index Entry The End of Index Entry (EOIE) is used to locate the end of the variable - length index entries and the beginning of the extensions. Code can take + length index entries and the begining of the extensions. Code can take advantage of this to quickly locate the index extensions without having to parse through all of the index entries. @@ -351,7 +351,7 @@ The remaining data of each directory block is grouped by type: - A number of index offset entries each consisting of: - - 32-bit offset from the beginning of the file to the first cache entry + - 32-bit offset from the begining of the file to the first cache entry in this block of entries. - 32-bit count of cache entries in this block diff --git a/third_party/git/Documentation/technical/multi-pack-index.txt b/third_party/git/Documentation/technical/multi-pack-index.txt index 4e7631437a..d7e57639f7 100644 --- a/third_party/git/Documentation/technical/multi-pack-index.txt +++ b/third_party/git/Documentation/technical/multi-pack-index.txt @@ -36,7 +36,7 @@ Design Details directory of an alternate. It refers only to packfiles in that same directory. -- The core.multiPackIndex config setting must be on to consume MIDX files. +- The pack.multiIndex config setting must be on to consume MIDX files. - The file format includes parameters for the object ID hash function, so a future change of hash algorithm does not require @@ -102,8 +102,8 @@ Related Links [0] https://bugs.chromium.org/p/git/issues/detail?id=6 Chromium work item for: Multi-Pack Index (MIDX) -[1] https://lore.kernel.org/git/20180107181459.222909-1-dstolee@microsoft.com/ +[1] https://public-inbox.org/git/20180107181459.222909-1-dstolee@microsoft.com/ An earlier RFC for the multi-pack-index feature -[2] https://lore.kernel.org/git/alpine.DEB.2.20.1803091557510.23109@alexmv-linux/ +[2] https://public-inbox.org/git/alpine.DEB.2.20.1803091557510.23109@alexmv-linux/ Git Merge 2018 Contributor's summit notes (includes discussion of MIDX) diff --git a/third_party/git/Documentation/technical/pack-format.txt b/third_party/git/Documentation/technical/pack-format.txt index d3a142c652..cab5bdd2ff 100644 --- a/third_party/git/Documentation/technical/pack-format.txt +++ b/third_party/git/Documentation/technical/pack-format.txt @@ -315,11 +315,10 @@ CHUNK DATA: Stores two 4-byte values for every object. 1: The pack-int-id for the pack storing this object. 2: The offset within the pack. - If all offsets are less than 2^32, then the large offset chunk + If all offsets are less than 2^31, then the large offset chunk will not exist and offsets are stored as in IDX v1. If there is at least one offset value larger than 2^32-1, then - the large offset chunk must exist, and offsets larger than - 2^31-1 must be stored in it instead. If the large offset chunk + the large offset chunk must exist. If the large offset chunk exists and the 31st bit is on, then removing that bit reveals the row in the large offsets containing the 8-byte offset of this object. diff --git a/third_party/git/Documentation/technical/pack-protocol.txt b/third_party/git/Documentation/technical/pack-protocol.txt index d5ce4eea8a..c73e72de0e 100644 --- a/third_party/git/Documentation/technical/pack-protocol.txt +++ b/third_party/git/Documentation/technical/pack-protocol.txt @@ -644,7 +644,7 @@ update was successful, or 'ng [refname] [error]' if the update was not. command-ok = PKT-LINE("ok" SP refname) command-fail = PKT-LINE("ng" SP refname SP error-msg) - error-msg = 1*(OCTET) ; where not "ok" + error-msg = 1*(OCTECT) ; where not "ok" ---- Updates can be unsuccessful for a number of reasons. The reference can have diff --git a/third_party/git/Documentation/technical/partial-clone.txt b/third_party/git/Documentation/technical/partial-clone.txt index b9e17e7a28..896c7b3878 100644 --- a/third_party/git/Documentation/technical/partial-clone.txt +++ b/third_party/git/Documentation/technical/partial-clone.txt @@ -30,20 +30,12 @@ advance* during clone and fetch operations and thereby reduce download times and disk usage. Missing objects can later be "demand fetched" if/when needed. -A remote that can later provide the missing objects is called a -promisor remote, as it promises to send the objects when -requested. Initially Git supported only one promisor remote, the origin -remote from which the user cloned and that was configured in the -"extensions.partialClone" config option. Later support for more than -one promisor remote has been implemented. - Use of partial clone requires that the user be online and the origin -remote or other promisor remotes be available for on-demand fetching -of missing objects. This may or may not be problematic for the user. -For example, if the user can stay within the pre-selected subset of -the source tree, they may not encounter any missing objects. -Alternatively, the user could try to pre-fetch various objects if they -know that they are going offline. +remote be available for on-demand fetching of missing objects. This may +or may not be problematic for the user. For example, if the user can +stay within the pre-selected subset of the source tree, they may not +encounter any missing objects. Alternatively, the user could try to +pre-fetch various objects if they know that they are going offline. Non-Goals @@ -108,18 +100,18 @@ or commits that reference missing trees. Handling Missing Objects ------------------------ -- An object may be missing due to a partial clone or fetch, or missing - due to repository corruption. To differentiate these cases, the - local repository specially indicates such filtered packfiles - obtained from promisor remotes as "promisor packfiles". +- An object may be missing due to a partial clone or fetch, or missing due + to repository corruption. To differentiate these cases, the local + repository specially indicates such filtered packfiles obtained from the + promisor remote as "promisor packfiles". + These promisor packfiles consist of a "<name>.promisor" file with arbitrary contents (like the "<name>.keep" files), in addition to their "<name>.pack" and "<name>.idx" files. - The local repository considers a "promisor object" to be an object that - it knows (to the best of its ability) that promisor remotes have promised - that they have, either because the local repository has that object in one of + it knows (to the best of its ability) that the promisor remote has promised + that it has, either because the local repository has that object in one of its promisor packfiles, or because another promisor object refers to it. + When Git encounters a missing object, Git can see if it is a promisor object @@ -131,12 +123,12 @@ expensive-to-modify list of missing objects.[a] - Since almost all Git code currently expects any referenced object to be present locally and because we do not want to force every command to do a dry-run first, a fallback mechanism is added to allow Git to attempt - to dynamically fetch missing objects from promisor remotes. + to dynamically fetch missing objects from the promisor remote. + When the normal object lookup fails to find an object, Git invokes -promisor_remote_get_direct() to try to get the object from a promisor -remote and then retry the object lookup. This allows objects to be -"faulted in" without complicated prediction algorithms. +fetch-object to try to get the object from the server and then retry +the object lookup. This allows objects to be "faulted in" without +complicated prediction algorithms. + For efficiency reasons, no check as to whether the missing object is actually a promisor object is performed. @@ -165,7 +157,8 @@ and prefetch those objects in bulk. + We are not happy with this global variable and would like to remove it, but that requires significant refactoring of the object code to pass an -additional flag. +additional flag. We hope that concurrent efforts to add an ODB API can +encompass this. Fetching Missing Objects @@ -189,63 +182,21 @@ has been updated to not use any object flags when the corresponding argument though they are not necessary. -Using many promisor remotes ---------------------------- - -Many promisor remotes can be configured and used. - -This allows for example a user to have multiple geographically-close -cache servers for fetching missing blobs while continuing to do -filtered `git-fetch` commands from the central server. - -When fetching objects, promisor remotes are tried one after the other -until all the objects have been fetched. - -Remotes that are considered "promisor" remotes are those specified by -the following configuration variables: - -- `extensions.partialClone = <name>` - -- `remote.<name>.promisor = true` - -- `remote.<name>.partialCloneFilter = ...` - -Only one promisor remote can be configured using the -`extensions.partialClone` config variable. This promisor remote will -be the last one tried when fetching objects. - -We decided to make it the last one we try, because it is likely that -someone using many promisor remotes is doing so because the other -promisor remotes are better for some reason (maybe they are closer or -faster for some kind of objects) than the origin, and the origin is -likely to be the remote specified by extensions.partialClone. - -This justification is not very strong, but one choice had to be made, -and anyway the long term plan should be to make the order somehow -fully configurable. - -For now though the other promisor remotes will be tried in the order -they appear in the config file. - Current Limitations ------------------- -- It is not possible to specify the order in which the promisor - remotes are tried in other ways than the order in which they appear - in the config file. +- The remote used for a partial clone (or the first partial fetch + following a regular clone) is marked as the "promisor remote". + -It is also not possible to specify an order to be used when fetching -from one remote and a different order when fetching from another -remote. - -- It is not possible to push only specific objects to a promisor - remote. +We are currently limited to a single promisor remote and only that +remote may be used for subsequent partial fetches. + -It is not possible to push at the same time to multiple promisor -remote in a specific order. +We accept this limitation because we believe initial users of this +feature will be using it on repositories with a strong single central +server. -- Dynamic object fetching will only ask promisor remotes for missing - objects. We assume that promisor remotes have a complete view of the +- Dynamic object fetching will only ask the promisor remote for missing + objects. We assume that the promisor remote has a complete view of the repository and can satisfy all such requests. - Repack essentially treats promisor and non-promisor packfiles as 2 @@ -267,17 +218,15 @@ remote in a specific order. Future Work ----------- -- Improve the way to specify the order in which promisor remotes are - tried. +- Allow more than one promisor remote and define a strategy for fetching + missing objects from specific promisor remotes or of iterating over the + set of promisor remotes until a missing object is found. + -For example this could allow to specify explicitly something like: -"When fetching from this remote, I want to use these promisor remotes -in this order, though, when pushing or fetching to that remote, I want -to use those promisor remotes in that order." - -- Allow pushing to promisor remotes. +A user might want to have multiple geographically-close cache servers +for fetching missing blobs while continuing to do filtered `git-fetch` +commands from the central server, for example. + -The user might want to work in a triangular work flow with multiple +Or the user might want to work in a triangular work flow with multiple promisor remotes that each have an incomplete view of the repository. - Allow repack to work on promisor packfiles (while keeping them distinct @@ -350,26 +299,26 @@ Related Links [0] https://crbug.com/git/2 Bug#2: Partial Clone -[1] https://lore.kernel.org/git/20170113155253.1644-1-benpeart@microsoft.com/ + +[1] https://public-inbox.org/git/20170113155253.1644-1-benpeart@microsoft.com/ + Subject: [RFC] Add support for downloading blobs on demand + Date: Fri, 13 Jan 2017 10:52:53 -0500 -[2] https://lore.kernel.org/git/cover.1506714999.git.jonathantanmy@google.com/ + +[2] https://public-inbox.org/git/cover.1506714999.git.jonathantanmy@google.com/ + Subject: [PATCH 00/18] Partial clone (from clone to lazy fetch in 18 patches) + Date: Fri, 29 Sep 2017 13:11:36 -0700 -[3] https://lore.kernel.org/git/20170426221346.25337-1-jonathantanmy@google.com/ + +[3] https://public-inbox.org/git/20170426221346.25337-1-jonathantanmy@google.com/ + Subject: Proposal for missing blob support in Git repos + Date: Wed, 26 Apr 2017 15:13:46 -0700 -[4] https://lore.kernel.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/ + +[4] https://public-inbox.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/ + Subject: [PATCH 00/10] RFC Partial Clone and Fetch + Date: Wed, 8 Mar 2017 18:50:29 +0000 -[5] https://lore.kernel.org/git/20170505152802.6724-1-benpeart@microsoft.com/ + +[5] https://public-inbox.org/git/20170505152802.6724-1-benpeart@microsoft.com/ + Subject: [PATCH v7 00/10] refactor the filter process code into a reusable module + Date: Fri, 5 May 2017 11:27:52 -0400 -[6] https://lore.kernel.org/git/20170714132651.170708-1-benpeart@microsoft.com/ + +[6] https://public-inbox.org/git/20170714132651.170708-1-benpeart@microsoft.com/ + Subject: [RFC/PATCH v2 0/1] Add support for downloading blobs on demand + Date: Fri, 14 Jul 2017 09:26:50 -0400 diff --git a/third_party/git/Documentation/technical/protocol-v2.txt b/third_party/git/Documentation/technical/protocol-v2.txt index 7e3766cafb..40f91f6b1e 100644 --- a/third_party/git/Documentation/technical/protocol-v2.txt +++ b/third_party/git/Documentation/technical/protocol-v2.txt @@ -252,7 +252,7 @@ A `fetch` request can take the following arguments: ofs-delta Indicate that the client understands PACKv2 with delta referring to its base by position in pack rather than by an oid. That is, - they can read OBJ_OFS_DELTA (aka type 6) in a packfile. + they can read OBJ_OFS_DELTA (ake type 6) in a packfile. If the 'shallow' feature is advertised the following arguments can be included in the clients request as well as the potential addition of the diff --git a/third_party/git/Documentation/technical/racy-git.txt b/third_party/git/Documentation/technical/racy-git.txt index ceda4bbfda..4a8be4d144 100644 --- a/third_party/git/Documentation/technical/racy-git.txt +++ b/third_party/git/Documentation/technical/racy-git.txt @@ -51,7 +51,7 @@ of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git only fixes the issue for file systems with exactly 1 ns or 1 s resolution. Other file systems are still broken in current Linux kernels (e.g. CEPH, CIFS, NTFS, UDF), see -https://lore.kernel.org/lkml/5577240D.7020309@gmail.com/ +https://lkml.org/lkml/2015/6/9/714 Racy Git -------- diff --git a/third_party/git/Documentation/technical/rerere.txt b/third_party/git/Documentation/technical/rerere.txt index af5f9fc24f..aa22d7ace8 100644 --- a/third_party/git/Documentation/technical/rerere.txt +++ b/third_party/git/Documentation/technical/rerere.txt @@ -117,7 +117,7 @@ early A became C or B, a late X became Y or Z". We can see there are 4 combinations of ("B or C", "C or B") x ("X or Y", "Y or X"). By sorting, the conflict is given its canonical name, namely, "an -early part became B or C, a late part became X or Y", and whenever +early part became B or C, a late part becames X or Y", and whenever any of these four patterns appear, and we can get to the same conflict and resolution that we saw earlier. diff --git a/third_party/git/Documentation/trace2-target-values.txt b/third_party/git/Documentation/trace2-target-values.txt index 3985b6d3c2..27d3c64e66 100644 --- a/third_party/git/Documentation/trace2-target-values.txt +++ b/third_party/git/Documentation/trace2-target-values.txt @@ -2,9 +2,7 @@ * `0` or `false` - Disables the target. * `1` or `true` - Writes to `STDERR`. * `[2-9]` - Writes to the already opened file descriptor. -* `<absolute-pathname>` - Writes to the file in append mode. If the target -already exists and is a directory, the traces will be written to files (one -per process) underneath the given directory. +* `<absolute-pathname>` - Writes to the file in append mode. * `af_unix:[<socket_type>:]<absolute-pathname>` - Write to a Unix DomainSocket (on platforms that support them). Socket type can be either `stream` or `dgram`; if omitted Git will diff --git a/third_party/git/Documentation/urls.txt b/third_party/git/Documentation/urls.txt index 1c229d7581..bc354fe2dc 100644 --- a/third_party/git/Documentation/urls.txt +++ b/third_party/git/Documentation/urls.txt @@ -53,9 +53,6 @@ These two syntaxes are mostly equivalent, except the former implies --local option. endif::git-clone[] -'git clone', 'git fetch' and 'git pull', but not 'git push', will also -accept a suitable bundle file. See linkgit:git-bundle[1]. - When Git doesn't know how to handle a certain transport protocol, it attempts to use the 'remote-<transport>' remote helper, if one exists. To explicitly request a remote helper, the following syntax diff --git a/third_party/git/Documentation/user-manual.txt b/third_party/git/Documentation/user-manual.txt index 833652983f..8bce75b2cf 100644 --- a/third_party/git/Documentation/user-manual.txt +++ b/third_party/git/Documentation/user-manual.txt @@ -1,4 +1,5 @@ -= Git User Manual +Git User Manual +=============== Git is a fast distributed revision control system. @@ -40,10 +41,12 @@ complete. [[repositories-and-branches]] -== Repositories and Branches +Repositories and Branches +========================= [[how-to-get-a-git-repository]] -=== How to get a Git repository +How to get a Git repository +--------------------------- It will be useful to have a Git repository to experiment with as you read this manual. @@ -70,7 +73,8 @@ top-level directory named `.git`, which contains all the information about the history of the project. [[how-to-check-out]] -=== How to check out a different version of a project +How to check out a different version of a project +------------------------------------------------- Git is best thought of as a tool for storing the history of a collection of files. It stores the history as a compressed collection of @@ -147,7 +151,8 @@ with no way to find the history it used to point to; so use this command carefully. [[understanding-commits]] -=== Understanding History: Commits +Understanding History: Commits +------------------------------ Every change in the history of a project is represented by a commit. The linkgit:git-show[1] command shows the most recent commit on the @@ -197,7 +202,8 @@ history, including file data and directory contents, is stored in an object with a name that is a hash of its contents. [[understanding-reachability]] -==== Understanding history: commits, parents, and reachability +Understanding history: commits, parents, and reachability +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Every commit (except the very first commit in a project) also has a parent commit which shows what happened before this commit. @@ -221,7 +227,8 @@ that Y is a descendant of X, or that there is a chain of parents leading from commit Y to commit X. [[history-diagrams]] -==== Understanding history: History diagrams +Understanding history: History diagrams +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We will sometimes represent Git history using diagrams like the one below. Commits are shown as "o", and the links between them with @@ -240,7 +247,8 @@ If we need to talk about a particular commit, the character "o" may be replaced with another letter or number. [[what-is-a-branch]] -==== Understanding history: What is a branch? +Understanding history: What is a branch? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ When we need to be precise, we will use the word "branch" to mean a line of development, and "branch head" (or just "head") to mean a reference @@ -253,7 +261,8 @@ However, when no confusion will result, we often just use the term "branch" both for branches and for branch heads. [[manipulating-branches]] -=== Manipulating branches +Manipulating branches +--------------------- Creating, deleting, and modifying branches is quick and easy; here's a summary of the commands: @@ -290,7 +299,8 @@ ref: refs/heads/master ------------------------------------------------ [[detached-head]] -=== Examining an old version without creating a new branch +Examining an old version without creating a new branch +------------------------------------------------------ The `git switch` command normally expects a branch head, but will also accept an arbitrary commit when invoked with --detach; for example, @@ -330,7 +340,8 @@ make up a name for the new branch. You can still create a new branch (or tag) for this version later if you decide to. [[examining-remote-branches]] -=== Examining branches from a remote repository +Examining branches from a remote repository +------------------------------------------- The "master" branch that was created at the time you cloned is a copy of the HEAD in the repository that you cloned from. That repository @@ -372,7 +383,8 @@ Note that the name "origin" is just the name that Git uses by default to refer to the repository that you cloned from. [[how-git-stores-references]] -=== Naming branches, tags, and other references +Naming branches, tags, and other references +------------------------------------------- Branches, remote-tracking branches, and tags are all references to commits. All references are named with a slash-separated path name @@ -401,7 +413,8 @@ references with the same shorthand name, see the "SPECIFYING REVISIONS" section of linkgit:gitrevisions[7]. [[Updating-a-repository-With-git-fetch]] -=== Updating a repository with git fetch +Updating a repository with git fetch +------------------------------------ After you clone a repository and commit a few changes of your own, you may wish to check the original repository for updates. @@ -412,7 +425,8 @@ repository. It will not touch any of your own branches--not even the "master" branch that was created for you on clone. [[fetching-branches]] -=== Fetching branches from other repositories +Fetching branches from other repositories +----------------------------------------- You can also track branches from repositories other than the one you cloned from, using linkgit:git-remote[1]: @@ -460,7 +474,8 @@ text editor. (See the "CONFIGURATION FILE" section of linkgit:git-config[1] for details.) [[exploring-git-history]] -== Exploring Git history +Exploring Git history +===================== Git is best thought of as a tool for storing the history of a collection of files. It does this by storing compressed snapshots of @@ -474,7 +489,8 @@ We start with one specialized tool that is useful for finding the commit that introduced a bug into a project. [[using-bisect]] -=== How to use bisect to find a regression +How to use bisect to find a regression +-------------------------------------- Suppose version 2.6.18 of your project worked, but the version at "master" crashes. Sometimes the best way to find the cause of such a @@ -556,7 +572,8 @@ linkgit:git-bisect[1] for more information about this and other `git bisect` features. [[naming-commits]] -=== Naming commits +Naming commits +-------------- We have seen several ways of naming commits already: @@ -620,7 +637,8 @@ e05db0fd4f31dde7005f075a84f96b360d05984b ------------------------------------------------- [[creating-tags]] -=== Creating tags +Creating tags +------------- We can also create a tag to refer to a particular commit; after running @@ -637,7 +655,8 @@ should create a tag object instead; see the linkgit:git-tag[1] man page for details. [[browsing-revisions]] -=== Browsing revisions +Browsing revisions +------------------ The linkgit:git-log[1] command can show lists of commits. On its own, it shows all commits reachable from the parent commit; but you @@ -678,7 +697,8 @@ multiple independent lines of development, the particular order that commits are listed in may be somewhat arbitrary. [[generating-diffs]] -=== Generating diffs +Generating diffs +---------------- You can generate diffs between any two versions using linkgit:git-diff[1]: @@ -706,7 +726,8 @@ will generate a file with a patch for each commit reachable from test but not from master. [[viewing-old-file-versions]] -=== Viewing old file versions +Viewing old file versions +------------------------- You can always view an old version of a file by just checking out the correct revision first. But sometimes it is more convenient to be @@ -721,10 +742,12 @@ Before the colon may be anything that names a commit, and after it may be any path to a file tracked by Git. [[history-examples]] -=== Examples +Examples +-------- [[counting-commits-on-a-branch]] -==== Counting the number of commits on a branch +Counting the number of commits on a branch +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suppose you want to know how many commits you've made on `mybranch` since it diverged from `origin`: @@ -742,7 +765,8 @@ $ git rev-list origin..mybranch | wc -l ------------------------------------------------- [[checking-for-equal-branches]] -==== Check whether two branches point at the same history +Check whether two branches point at the same history +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suppose you want to check whether two branches point at the same point in history. @@ -774,7 +798,8 @@ $ git log origin...master will return no commits when the two branches are equal. [[finding-tagged-descendants]] -==== Find first tagged version including a given fix +Find first tagged version including a given fix +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suppose you know that the commit e05db0fd fixed a certain problem. You'd like to find the earliest tagged release that contains that @@ -858,7 +883,8 @@ shows that e05db0fd is reachable from itself, from v1.5.0-rc1, and from v1.5.0-rc2, and not from v1.5.0-rc0. [[showing-commits-unique-to-a-branch]] -==== Showing commits unique to a given branch +Showing commits unique to a given branch +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suppose you would like to see all the commits reachable from the branch head named `master` but not from any other head in your repository. @@ -905,7 +931,8 @@ $ gitk $( git show-ref --heads ) --not $( git show-ref --tags ) syntax such as `--not`.) [[making-a-release]] -==== Creating a changelog and tarball for a software release +Creating a changelog and tarball for a software release +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The linkgit:git-archive[1] command can create a tar or zip archive from any version of a project; for example: @@ -956,7 +983,8 @@ and then he just cut-and-pastes the output commands after verifying that they look OK. [[Finding-commits-With-given-Content]] -==== Finding commits referencing a file with given content +Finding commits referencing a file with given content +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Somebody hands you a copy of a file, and asks which commits modified a file such that it contained the given content either before or after the @@ -972,10 +1000,12 @@ student. The linkgit:git-log[1], linkgit:git-diff-tree[1], and linkgit:git-hash-object[1] man pages may prove helpful. [[Developing-With-git]] -== Developing with Git +Developing with Git +=================== [[telling-git-your-name]] -=== Telling Git your name +Telling Git your name +--------------------- Before creating any commits, you should introduce yourself to Git. The easiest way to do so is to use linkgit:git-config[1]: @@ -1000,7 +1030,8 @@ also edit it with your favorite editor. [[creating-a-new-repository]] -=== Creating a new repository +Creating a new repository +------------------------- Creating a new repository from scratch is very easy: @@ -1021,7 +1052,8 @@ $ git commit ------------------------------------------------- [[how-to-make-a-commit]] -=== How to make a commit +How to make a commit +-------------------- Creating a new commit takes three steps: @@ -1116,7 +1148,8 @@ for inclusion in the index (by right-clicking on the diff hunk and choosing "Stage Hunk For Commit"). [[creating-good-commit-messages]] -=== Creating good commit messages +Creating good commit messages +----------------------------- Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the @@ -1129,7 +1162,8 @@ rest of the commit in the body. [[ignoring-files]] -=== Ignoring files +Ignoring files +-------------- A project will often generate files that you do 'not' want to track with Git. This typically includes files generated by a build process or temporary @@ -1171,7 +1205,8 @@ Some Git commands can also take exclude patterns directly on the command line. See linkgit:gitignore[5] for the details. [[how-to-merge]] -=== How to merge +How to merge +------------ You can rejoin two diverging branches of development using linkgit:git-merge[1]: @@ -1219,7 +1254,8 @@ has two parents, one pointing to the top of the current branch, and one to the top of the other branch. [[resolving-a-merge]] -=== Resolving a merge +Resolving a merge +----------------- When a merge isn't resolved automatically, Git leaves the index and the working tree in a special state that gives you all the @@ -1261,7 +1297,8 @@ The above is all you need to know to resolve a simple merge. But Git also provides more information to help resolve conflicts: [[conflict-resolution]] -==== Getting conflict-resolution help during a merge +Getting conflict-resolution help during a merge +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ All of the changes that Git was able to merge automatically are already added to the index file, so linkgit:git-diff[1] shows only @@ -1364,7 +1401,8 @@ the different stages of that file will be "collapsed", after which `git diff` will (by default) no longer show diffs for that file. [[undoing-a-merge]] -=== Undoing a merge +Undoing a merge +--------------- If you get stuck and decide to just give up and throw the whole mess away, you can always return to the pre-merge state with @@ -1385,7 +1423,8 @@ itself have been merged into another branch, as doing so may confuse further merges. [[fast-forwards]] -=== Fast-forward merges +Fast-forward merges +------------------- There is one special case not mentioned above, which is treated differently. Normally, a merge results in a merge commit, with two @@ -1399,7 +1438,8 @@ to point at the head of the merged-in branch, without any new commits being created. [[fixing-mistakes]] -=== Fixing mistakes +Fixing mistakes +--------------- If you've messed up the working tree, but haven't yet committed your mistake, you can return the entire working tree to the last committed @@ -1423,7 +1463,8 @@ fundamentally different ways to fix the problem: a branch that has had its history changed. [[reverting-a-commit]] -==== Fixing a mistake with a new commit +Fixing a mistake with a new commit +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Creating a new commit that reverts an earlier change is very easy; just pass the linkgit:git-revert[1] command a reference to the bad @@ -1449,7 +1490,8 @@ conflicts manually, just as in the case of <<resolving-a-merge, resolving a merge>>. [[fixing-a-mistake-by-rewriting-history]] -==== Fixing a mistake by rewriting history +Fixing a mistake by rewriting history +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If the problematic commit is the most recent commit, and you have not yet made that commit public, then you may just @@ -1476,7 +1518,8 @@ this is an advanced topic to be left for <<cleaning-up-history,another chapter>>. [[checkout-of-path]] -==== Checking out an old version of a file +Checking out an old version of a file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In the process of undoing a previous bad change, you may find it useful to check out an older version of a particular file using @@ -1500,7 +1543,8 @@ $ git show HEAD^:path/to/file which will display the given version of the file. [[interrupted-work]] -==== Temporarily setting aside work in progress +Temporarily setting aside work in progress +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ While you are in the middle of working on something complicated, you find an unrelated but obvious and trivial bug. You would like to fix it @@ -1531,7 +1575,8 @@ $ git stash pop [[ensuring-good-performance]] -=== Ensuring good performance +Ensuring good performance +------------------------- On large repositories, Git depends on compression to keep the history information from taking up too much space on disk or in memory. Some @@ -1542,10 +1587,12 @@ to avoid automatic compression kicking in when it is not convenient. [[ensuring-reliability]] -=== Ensuring reliability +Ensuring reliability +-------------------- [[checking-for-corruption]] -==== Checking the repository for corruption +Checking the repository for corruption +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The linkgit:git-fsck[1] command runs a number of self-consistency checks on the repository, and reports on any problems. This may take some @@ -1571,10 +1618,12 @@ You can run `git fsck --no-dangling` to suppress these messages, and still view real errors. [[recovering-lost-changes]] -==== Recovering lost changes +Recovering lost changes +~~~~~~~~~~~~~~~~~~~~~~~ [[reflogs]] -===== Reflogs +Reflogs +^^^^^^^ Say you modify a branch with <<fixing-mistakes,`git reset --hard`>>, and then realize that the branch was the only reference you had to @@ -1621,7 +1670,8 @@ same project, the reflog history is not shared: it tells you only about how the branches in your local repository have changed over time. [[dangling-object-recovery]] -===== Examining dangling objects +Examining dangling objects +^^^^^^^^^^^^^^^^^^^^^^^^^^ In some situations the reflog may not be able to save you. For example, suppose you delete a branch, then realize you need the history it @@ -1665,10 +1715,12 @@ dangling objects can arise in other situations. [[sharing-development]] -== Sharing development with others +Sharing development with others +=============================== [[getting-updates-With-git-pull]] -=== Getting updates with git pull +Getting updates with git pull +----------------------------- After you clone a repository and commit a few changes of your own, you may wish to check the original repository for updates and merge them @@ -1731,7 +1783,8 @@ $ git merge branch are roughly equivalent. [[submitting-patches]] -=== Submitting patches to a project +Submitting patches to a project +------------------------------- If you just have a few changes, the simplest way to submit them may just be to send them as patches in email: @@ -1759,7 +1812,8 @@ Consult the mailing list for your project first to determine their requirements for submitting patches. [[importing-patches]] -=== Importing patches to a project +Importing patches to a project +------------------------------ Git also provides a tool called linkgit:git-am[1] (am stands for "apply mailbox"), for importing such an emailed series of patches. @@ -1791,7 +1845,8 @@ the original mailbox, with authorship and commit log message each taken from the message containing each patch. [[public-repositories]] -=== Public Git repositories +Public Git repositories +----------------------- Another way to submit changes to a project is to tell the maintainer of that project to pull the changes from your repository using @@ -1831,22 +1886,21 @@ pull from that repository. So the flow of changes, in a situation where there is one other developer with a public repository, looks like this: -.... - you push -your personal repo ------------------> your public repo - ^ | - | | - | you pull | they pull - | | - | | - | they push V -their public repo <------------------- their repo -.... + you push + your personal repo ------------------> your public repo + ^ | + | | + | you pull | they pull + | | + | | + | they push V + their public repo <------------------- their repo We explain how to do this in the following sections. [[setting-up-a-public-repository]] -==== Setting up a public repository +Setting up a public repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Assume your personal repository is in the directory `~/proj`. We first create a new clone of the repository and tell `git daemon` that it @@ -1866,7 +1920,8 @@ public repository. You can use scp, rsync, or whatever is most convenient. [[exporting-via-git]] -==== Exporting a Git repository via the Git protocol +Exporting a Git repository via the Git protocol +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is the preferred method. @@ -1887,7 +1942,8 @@ linkgit:git-daemon[1] man page for details. (See especially the examples section.) [[exporting-via-http]] -==== Exporting a git repository via HTTP +Exporting a git repository via HTTP +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The Git protocol gives better performance and reliability, but on a host with a web server set up, HTTP exports may be simpler to set up. @@ -1919,7 +1975,8 @@ for a slightly more sophisticated setup using WebDAV which also allows pushing over HTTP.) [[pushing-changes-to-a-public-repository]] -==== Pushing changes to a public repository +Pushing changes to a public repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Note that the two techniques outlined above (exporting via <<exporting-via-http,http>> or <<exporting-via-git,git>>) allow other @@ -1978,7 +2035,8 @@ See the explanations of the `remote.<name>.url`, linkgit:git-config[1] for details. [[forcing-push]] -==== What to do when a push fails +What to do when a push fails +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ If a push would not result in a <<fast-forwards,fast-forward>> of the remote branch, then it will fail with an error like: @@ -2032,7 +2090,8 @@ pull, or by a fetch followed by a rebase; see the linkgit:gitcvs-migration[7] for more. [[setting-up-a-shared-repository]] -==== Setting up a shared repository +Setting up a shared repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Another way to collaborate is by using a model similar to that commonly used in CVS, where several developers with special rights @@ -2062,7 +2121,8 @@ advantages over the central shared repository: "out". [[setting-up-gitweb]] -==== Allowing web browsing of a repository +Allowing web browsing of a repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The gitweb cgi script provides users an easy way to browse your project's revisions, file contents and logs without having to install @@ -2078,7 +2138,8 @@ linkgit:gitweb[1] for instructions on details setting up a permanent installation with a CGI or Perl capable server. [[how-to-get-a-git-repository-with-minimal-history]] -=== How to get a Git repository with minimal history +How to get a Git repository with minimal history +------------------------------------------------ A <<def_shallow_clone,shallow clone>>, with its truncated history, is useful when one is interested only in recent history @@ -2097,10 +2158,12 @@ have to result in huge conflicts. This limitation may make such a repository unsuitable to be used in merge based workflows. [[sharing-development-examples]] -=== Examples +Examples +-------- [[maintaining-topic-branches]] -==== Maintaining topic branches for a Linux subsystem maintainer +Maintaining topic branches for a Linux subsystem maintainer +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This describes how Tony Luck uses Git in his role as maintainer of the IA64 architecture for the Linux kernel. @@ -2396,7 +2459,8 @@ done [[cleaning-up-history]] -== Rewriting history and maintaining patch series +Rewriting history and maintaining patch series +============================================== Normally commits are only added to a project, never taken away or replaced. Git is designed with this assumption, and violating it will @@ -2406,7 +2470,8 @@ However, there is a situation in which it can be useful to violate this assumption. [[patch-series]] -=== Creating the perfect patch series +Creating the perfect patch series +--------------------------------- Suppose you are a contributor to a large project, and you want to add a complicated feature, and to present it to the other developers in a way @@ -2438,7 +2503,8 @@ use them, and then explain some of the problems that can arise because you are rewriting history. [[using-git-rebase]] -=== Keeping a patch series up to date using git rebase +Keeping a patch series up to date using git rebase +-------------------------------------------------- Suppose that you create a branch `mywork` on a remote-tracking branch `origin`, and create some commits on top of it: @@ -2525,7 +2591,8 @@ the rebase. See <<interactive-rebase>> for details, and <<reordering-patch-series>> for alternatives. [[rewriting-one-commit]] -=== Rewriting a single commit +Rewriting a single commit +------------------------- We saw in <<fixing-a-mistake-by-rewriting-history>> that you can replace the most recent commit using @@ -2543,7 +2610,8 @@ If you need to amend commits from deeper in your history, you can use <<interactive-rebase,interactive rebase's `edit` instruction>>. [[reordering-patch-series]] -=== Reordering or selecting from a patch series +Reordering or selecting from a patch series +------------------------------------------- Sometimes you want to edit a commit deeper in your history. One approach is to use `git format-patch` to create a series of patches @@ -2562,7 +2630,8 @@ $ git am *.patch ------------------------------------------------- [[interactive-rebase]] -=== Using interactive rebases +Using interactive rebases +------------------------- You can also edit a patch series with an interactive rebase. This is the same as <<reordering-patch-series,reordering a patch series using @@ -2619,14 +2688,16 @@ For a more detailed discussion of the procedure and additional tips, see the "INTERACTIVE MODE" section of linkgit:git-rebase[1]. [[patch-series-tools]] -=== Other tools +Other tools +----------- There are numerous other tools, such as StGit, which exist for the purpose of maintaining a patch series. These are outside of the scope of this manual. [[problems-With-rewriting-history]] -=== Problems with rewriting history +Problems with rewriting history +------------------------------- The primary problem with rewriting the history of a branch has to do with merging. Suppose somebody fetches your branch and merges it into @@ -2674,7 +2745,8 @@ For true distributed development that supports proper merging, published branches should never be rewritten. [[bisect-merges]] -=== Why bisecting merge commits can be harder than bisecting linear history +Why bisecting merge commits can be harder than bisecting linear history +----------------------------------------------------------------------- The linkgit:git-bisect[1] command correctly handles history that includes merge commits. However, when the commit that it finds is a @@ -2739,10 +2811,12 @@ linear by rebasing against the latest upstream version before publishing. [[advanced-branch-management]] -== Advanced branch management +Advanced branch management +========================== [[fetching-individual-branches]] -=== Fetching individual branches +Fetching individual branches +---------------------------- Instead of using linkgit:git-remote[1], you can also choose just to update one branch at a time, and to store it locally under an @@ -2770,7 +2844,8 @@ already have a branch named example-master, it will attempt to master branch. In more detail: [[fetch-fast-forwards]] -=== git fetch and fast-forwards +git fetch and fast-forwards +--------------------------- In the previous example, when updating an existing branch, `git fetch` checks to make sure that the most recent commit on the remote @@ -2807,7 +2882,8 @@ unless you've already created a reference of your own pointing to them. [[forcing-fetch]] -=== Forcing git fetch to do non-fast-forward updates +Forcing git fetch to do non-fast-forward updates +------------------------------------------------ If git fetch fails because the new head of a branch is not a descendant of the old head, you may force the update with: @@ -2827,7 +2903,8 @@ Be aware that commits that the old version of example/master pointed at may be lost, as we saw in the previous section. [[remote-branch-configuration]] -=== Configuring remote-tracking branches +Configuring remote-tracking branches +------------------------------------ We saw above that `origin` is just a shortcut to refer to the repository that you originally cloned from. This information is @@ -2878,7 +2955,8 @@ the refspec syntax. [[git-concepts]] -== Git concepts +Git concepts +============ Git is built on a small number of simple but powerful ideas. While it is possible to get things done without understanding them, you will find @@ -2888,7 +2966,8 @@ We start with the most important, the <<def_object_database,object database>> and the <<def_index,index>>. [[the-object-database]] -=== The Object Database +The Object Database +------------------- We already saw in <<understanding-commits>> that all commits are stored @@ -2932,7 +3011,8 @@ There are four different types of objects: "blob", "tree", "commit", and The object types in some more detail: [[commit-object]] -==== Commit Object +Commit Object +~~~~~~~~~~~~~ The "commit" object links a physical state of a tree with a description of how we got there and why. Use the `--pretty=raw` option to @@ -2984,7 +3064,8 @@ commit whose parent is normally the current HEAD, and whose tree is taken from the content currently stored in the index. [[tree-object]] -==== Tree Object +Tree Object +~~~~~~~~~~~ The ever-versatile linkgit:git-show[1] command can also be used to examine tree objects, but linkgit:git-ls-tree[1] will give you more @@ -3023,7 +3104,8 @@ Note that the files all have mode 644 or 755: Git actually only pays attention to the executable bit. [[blob-object]] -==== Blob Object +Blob Object +~~~~~~~~~~~ You can use linkgit:git-show[1] to examine the contents of a blob; take, for example, the blob in the entry for `COPYING` from the tree above: @@ -3052,7 +3134,8 @@ sometimes be useful for browsing the contents of a tree that is not currently checked out. [[trust]] -==== Trust +Trust +~~~~~ If you receive the SHA-1 name of a blob from one source, and its contents from another (possibly untrusted) source, you can still trust that those @@ -3081,7 +3164,8 @@ like GPG/PGP. To assist in this, Git also provides the tag object... [[tag-object]] -==== Tag Object +Tag Object +~~~~~~~~~~ A tag object contains an object, object type, tag name, the name of the person ("tagger") who created the tag, and a message, which may contain @@ -3110,7 +3194,8 @@ objects. (Note that linkgit:git-tag[1] can also be used to create references whose names begin with `refs/tags/`). [[pack-files]] -==== How Git stores objects efficiently: pack files +How Git stores objects efficiently: pack files +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Newly created objects are initially created in a file named after the object's SHA-1 hash (stored in `.git/objects`). @@ -3168,7 +3253,8 @@ The linkgit:git-gc[1] command performs packing, pruning, and more for you, so is normally the only high-level command you need. [[dangling-objects]] -==== Dangling objects +Dangling objects +~~~~~~~~~~~~~~~~ The linkgit:git-fsck[1] command will sometimes complain about dangling objects. They are not a problem. @@ -3248,7 +3334,8 @@ don't want to do that while the filesystem is mounted. accesses to a repository but you might receive confusing or scary messages.) [[recovering-from-repository-corruption]] -==== Recovering from repository corruption +Recovering from repository corruption +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ By design, Git treats data trusted to it with caution. However, even in the absence of bugs in Git itself, it is still possible that hardware or @@ -3365,7 +3452,8 @@ whole thing. It's up to you--Git does *have* a lot of information, it is just missing one particular blob version. [[the-index]] -=== The index +The index +--------- The index is a binary file (generally kept in `.git/index`) containing a sorted list of path names, each with permissions and the SHA-1 of a blob @@ -3423,7 +3511,8 @@ If you blow the index away entirely, you generally haven't lost any information as long as you have the name of the tree that it described. [[submodules]] -== Submodules +Submodules +========== Large projects are often composed of smaller, self-contained modules. For example, an embedded Linux distribution's source tree would include every @@ -3609,8 +3698,8 @@ $ git push You have to run `git submodule update` after `git pull` if you want to update submodules, too. -[[pitfalls-with-submodules]] -=== Pitfalls with submodules +Pitfalls with submodules +------------------------ Always publish the submodule change before publishing the change to the superproject that references it. If you forget to publish the submodule change, @@ -3679,7 +3768,8 @@ submodule update` will not overwrite them. Instead, you get the usual warning about not being able switch from a dirty branch. [[low-level-operations]] -== Low-level Git operations +Low-level Git operations +======================== Many of the higher-level commands were originally implemented as shell scripts using a smaller core of low-level Git commands. These can still @@ -3687,7 +3777,8 @@ be useful when doing unusual things with Git, or just as a way to understand its inner workings. [[object-manipulation]] -=== Object access and manipulation +Object access and manipulation +------------------------------ The linkgit:git-cat-file[1] command can show the contents of any object, though the higher-level linkgit:git-show[1] is usually more useful. @@ -3704,7 +3795,8 @@ verified by linkgit:git-verify-tag[1], though it is normally simpler to use linkgit:git-tag[1] for both. [[the-workflow]] -=== The Workflow +The Workflow +------------ High-level operations such as linkgit:git-commit[1] and linkgit:git-restore[1] work by moving data @@ -3719,7 +3811,8 @@ the database or the working directory. Thus there are four main combinations: [[working-directory-to-index]] -==== working directory -> index +working directory -> index +~~~~~~~~~~~~~~~~~~~~~~~~~~ The linkgit:git-update-index[1] command updates the index with information from the working directory. You generally update the @@ -3755,7 +3848,8 @@ The previously introduced linkgit:git-add[1] is just a wrapper for linkgit:git-update-index[1]. [[index-to-object-database]] -==== index -> object database +index -> object database +~~~~~~~~~~~~~~~~~~~~~~~~ You write your current index file to a "tree" object with the program @@ -3770,7 +3864,8 @@ use that tree to re-generate the index at any time by going in the other direction: [[object-database-to-index]] -==== object database -> index +object database -> index +~~~~~~~~~~~~~~~~~~~~~~~~ You read a "tree" file from the object database, and use that to populate (and overwrite--don't do this if your index contains any @@ -3786,7 +3881,8 @@ earlier. However, that is only your 'index' file: your working directory contents have not been modified. [[index-to-working-directory]] -==== index -> working directory +index -> working directory +~~~~~~~~~~~~~~~~~~~~~~~~~~ You update your working directory from the index by "checking out" files. This is not a very common operation, since normally you'd just @@ -3815,7 +3911,8 @@ Finally, there are a few odds and ends which are not purely moving from one representation to the other: [[tying-it-all-together]] -==== Tying it all together +Tying it all together +~~~~~~~~~~~~~~~~~~~~~ To commit a tree you have instantiated with `git write-tree`, you'd create a "commit" object that refers to that tree and the history @@ -3889,7 +3986,8 @@ Here is a picture that illustrates how various pieces fit together: [[examining-the-data]] -=== Examining the data +Examining the data +------------------ You can examine the data represented in the object database and the index with various helper tools. For every object, you can use @@ -3924,7 +4022,8 @@ $ git cat-file commit HEAD to see what the top commit was. [[merging-multiple-trees]] -=== Merging multiple trees +Merging multiple trees +---------------------- Git can help you perform a three-way merge, which can in turn be used for a many-way merge by repeating the merge procedure several @@ -3974,7 +4073,8 @@ index file, and you can just write the result out with [[merging-multiple-trees-2]] -=== Merging multiple trees, continued +Merging multiple trees, continued +--------------------------------- Sadly, many merges aren't trivial. If there are files that have been added, moved or removed, or if both branches have modified the @@ -4044,13 +4144,15 @@ $ git merge-index git-merge-one-file hello.c and that is what higher level `git merge -s resolve` is implemented with. [[hacking-git]] -== Hacking Git +Hacking Git +=========== This chapter covers internal details of the Git implementation which probably only Git developers need to understand. [[object-details]] -=== Object storage format +Object storage format +--------------------- All objects have a statically determined "type" which identifies the format of the object (i.e. how it is used, and how it can refer to other @@ -4080,7 +4182,8 @@ of all objects, and verifies their internal consistency (in addition to just verifying their superficial consistency through the hash). [[birdview-on-the-source-code]] -=== A birds-eye view of Git's source code +A birds-eye view of Git's source code +------------------------------------- It is not always easy for new developers to find their way through Git's source code. This section gives you a little guidance to show where to @@ -4289,22 +4392,25 @@ You see, Git is actually the best tool to find out about the source of Git itself! [[glossary]] -== Git Glossary +Git Glossary +============ [[git-explained]] -=== Git explained +Git explained +------------- include::glossary-content.txt[] [[git-quick-start]] -[appendix] -== Git Quick Reference +Appendix A: Git Quick Reference +=============================== This is a quick summary of the major commands; the previous chapters explain how these work in more detail. [[quick-creating-a-new-repository]] -=== Creating a new repository +Creating a new repository +------------------------- From a tarball: @@ -4325,7 +4431,8 @@ $ cd project ----------------------------------------------- [[managing-branches]] -=== Managing branches +Managing branches +----------------- ----------------------------------------------- $ git branch # list all local branches in this repo @@ -4389,7 +4496,8 @@ $ git branch -r # list all remote branches [[exploring-history]] -=== Exploring history +Exploring history +----------------- ----------------------------------------------- $ gitk # visualize and browse history @@ -4424,7 +4532,8 @@ $ git bisect bad # if this revision is bad. ----------------------------------------------- [[making-changes]] -=== Making changes +Making changes +-------------- Make sure Git knows who to blame: @@ -4454,7 +4563,8 @@ $ git commit -a # use latest content of all tracked files ----------------------------------------------- [[merging]] -=== Merging +Merging +------- ----------------------------------------------- $ git merge test # merge branch "test" into the current branch @@ -4464,7 +4574,8 @@ $ git pull . test # equivalent to git merge test ----------------------------------------------- [[sharing-your-changes]] -=== Sharing your changes +Sharing your changes +-------------------- Importing or exporting patches: @@ -4509,7 +4620,8 @@ $ git push example test ----------------------------------------------- [[repository-maintenance]] -=== Repository maintenance +Repository maintenance +---------------------- Check for corruption: @@ -4525,11 +4637,12 @@ $ git gc [[todo]] -[appendix] -== Notes and todo list for this manual +Appendix B: Notes and todo list for this manual +=============================================== [[todo-list]] -=== Todo list +Todo list +--------- This is a work in progress. @@ -4574,5 +4687,5 @@ Write a chapter on using plumbing and writing scripts. Alternates, clone -reference, etc. More on recovery from repository corruption. See: - https://lore.kernel.org/git/Pine.LNX.4.64.0702272039540.12485@woody.linux-foundation.org/ - https://lore.kernel.org/git/Pine.LNX.4.64.0702141033400.3604@woody.linux-foundation.org/ + http://marc.info/?l=git&m=117263864820799&w=2 + http://marc.info/?l=git&m=117147855503798&w=2 diff --git a/third_party/git/GIT-VERSION-GEN b/third_party/git/GIT-VERSION-GEN index dafe6d036a..a1539a7ce6 100755 --- a/third_party/git/GIT-VERSION-GEN +++ b/third_party/git/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.26.2 +DEF_VER=v2.23.0 LF=' ' diff --git a/third_party/git/INSTALL b/third_party/git/INSTALL index 22c364f34f..c39006e8e7 100644 --- a/third_party/git/INSTALL +++ b/third_party/git/INSTALL @@ -109,15 +109,15 @@ Issues of note: - Git is reasonably self-sufficient, but does depend on a few external programs and libraries. Git can be used without most of them by adding - the appropriate "NO_<LIBRARY>=YesPlease" to the make command line or + the approriate "NO_<LIBRARY>=YesPlease" to the make command line or config.mak file. - "zlib", the compression library. Git won't build without it. - "ssh" is used to push and pull over the net. - - A POSIX-compliant shell is required to run some scripts needed - for everyday use (e.g. "bisect", "request-pull"). + - A POSIX-compliant shell is required to run many scripts needed + for everyday use (e.g. "bisect", "pull"). - "Perl" version 5.8 or later is needed to use some of the features (e.g. preparing a partial commit using "git add -i/-p", diff --git a/third_party/git/Makefile b/third_party/git/Makefile index 9804a0758b..f9255344ae 100644 --- a/third_party/git/Makefile +++ b/third_party/git/Makefile @@ -34,8 +34,13 @@ all:: # library. Support for version 1 will likely be removed in some future # release of Git, as upstream has all but abandoned it. # -# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if you want to -# disable JIT even if supported by your library. +# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if the PCRE v1 +# library is compiled without --enable-jit. We will auto-detect +# whether the version of the PCRE v1 library in use has JIT support at +# all, but we unfortunately can't auto-detect whether JIT support +# hasn't been compiled in in an otherwise JIT-supporting version. If +# you have link-time errors about a missing `pcre_jit_exec` define +# this, or recompile PCRE v1 with --enable-jit. # # Define LIBPCREDIR=/foo/bar if your PCRE header and library files are # in /foo/bar/include and /foo/bar/lib directories. Which version of @@ -481,7 +486,7 @@ all:: # # When DEVELOPER is set, DEVOPTS can be used to control compiler # options. This variable contains keywords separated by -# whitespace. The following keywords are recognized: +# whitespace. The following keywords are are recognized: # # no-error: # @@ -593,7 +598,6 @@ SCRIPT_SH = SCRIPT_LIB = TEST_BUILTINS_OBJS = TEST_PROGRAMS_NEED_X = -THIRD_PARTY_SOURCES = # Having this variable in your environment would break pipelines because # you cause "cd" to echo its destination to stdout. It can also take @@ -721,14 +725,11 @@ TEST_BUILTINS_OBJS += test-mktemp.o TEST_BUILTINS_OBJS += test-oidmap.o TEST_BUILTINS_OBJS += test-online-cpus.o TEST_BUILTINS_OBJS += test-parse-options.o -TEST_BUILTINS_OBJS += test-parse-pathspec-file.o TEST_BUILTINS_OBJS += test-path-utils.o TEST_BUILTINS_OBJS += test-pkt-line.o TEST_BUILTINS_OBJS += test-prio-queue.o -TEST_BUILTINS_OBJS += test-progress.o TEST_BUILTINS_OBJS += test-reach.o TEST_BUILTINS_OBJS += test-read-cache.o -TEST_BUILTINS_OBJS += test-read-graph.o TEST_BUILTINS_OBJS += test-read-midx.o TEST_BUILTINS_OBJS += test-ref-store.o TEST_BUILTINS_OBJS += test-regex.o @@ -817,16 +818,14 @@ VCSSVN_LIB = vcs-svn/lib.a GENERATED_H += command-list.h -LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \ +LIB_H := $(sort $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \ $(FIND) . \ -name .git -prune -o \ -name t -prune -o \ -name Documentation -prune -o \ - -name '*.h' -print))) + -name '*.h' -print)) LIB_OBJS += abspath.o -LIB_OBJS += add-interactive.o -LIB_OBJS += add-patch.o LIB_OBJS += advice.o LIB_OBJS += alias.o LIB_OBJS += alloc.o @@ -885,6 +884,7 @@ LIB_OBJS += ewah/ewah_io.o LIB_OBJS += ewah/ewah_rlw.o LIB_OBJS += exec-cmd.o LIB_OBJS += fetch-negotiator.o +LIB_OBJS += fetch-object.o LIB_OBJS += fetch-pack.o LIB_OBJS += fsck.o LIB_OBJS += fsmonitor.o @@ -948,14 +948,12 @@ LIB_OBJS += preload-index.o LIB_OBJS += pretty.o LIB_OBJS += prio-queue.o LIB_OBJS += progress.o -LIB_OBJS += promisor-remote.o LIB_OBJS += prompt.o LIB_OBJS += protocol.o LIB_OBJS += quote.o LIB_OBJS += range-diff.o LIB_OBJS += reachable.o LIB_OBJS += read-cache.o -LIB_OBJS += rebase.o LIB_OBJS += rebase-interactive.o LIB_OBJS += reflog-walk.o LIB_OBJS += refs.o @@ -967,7 +965,6 @@ LIB_OBJS += refspec.o LIB_OBJS += ref-filter.o LIB_OBJS += remote.o LIB_OBJS += replace-object.o -LIB_OBJS += repo-settings.o LIB_OBJS += repository.o LIB_OBJS += rerere.o LIB_OBJS += resolve-undo.o @@ -986,7 +983,6 @@ LIB_OBJS += shallow.o LIB_OBJS += sideband.o LIB_OBJS += sigchain.o LIB_OBJS += split-index.o -LIB_OBJS += stable-qsort.o LIB_OBJS += strbuf.o LIB_OBJS += streaming.o LIB_OBJS += string-list.o @@ -1130,7 +1126,6 @@ BUILTIN_OBJS += builtin/shortlog.o BUILTIN_OBJS += builtin/show-branch.o BUILTIN_OBJS += builtin/show-index.o BUILTIN_OBJS += builtin/show-ref.o -BUILTIN_OBJS += builtin/sparse-checkout.o BUILTIN_OBJS += builtin/stash.o BUILTIN_OBJS += builtin/stripspace.o BUILTIN_OBJS += builtin/submodule--helper.o @@ -1150,20 +1145,6 @@ BUILTIN_OBJS += builtin/verify-tag.o BUILTIN_OBJS += builtin/worktree.o BUILTIN_OBJS += builtin/write-tree.o -# THIRD_PARTY_SOURCES is a list of patterns compatible with the -# $(filter) and $(filter-out) family of functions. They specify source -# files which are taken from some third-party source where we want to be -# less strict about issues such as coding style so we don't diverge from -# upstream unnecessarily (making merging in future changes easier). -THIRD_PARTY_SOURCES += compat/inet_ntop.c -THIRD_PARTY_SOURCES += compat/inet_pton.c -THIRD_PARTY_SOURCES += compat/nedmalloc/% -THIRD_PARTY_SOURCES += compat/obstack.% -THIRD_PARTY_SOURCES += compat/poll/% -THIRD_PARTY_SOURCES += compat/regex/% -THIRD_PARTY_SOURCES += sha1collisiondetection/% -THIRD_PARTY_SOURCES += sha1dc/% - GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) EXTLIBS = @@ -1222,9 +1203,6 @@ endif ifneq ($(filter leak,$(SANITIZERS)),) BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS endif -ifneq ($(filter address,$(SANITIZERS)),) -NO_REGEX = NeededForASAN -endif endif ifndef sysconfdir @@ -1736,6 +1714,7 @@ ifdef NO_GETPAGESIZE endif ifdef INTERNAL_QSORT COMPAT_CFLAGS += -DINTERNAL_QSORT + COMPAT_OBJS += compat/qsort.o endif ifdef HAVE_ISO_QSORT_S COMPAT_CFLAGS += -DHAVE_ISO_QSORT_S @@ -1892,9 +1871,8 @@ ifndef V QUIET_MSGFMT = @echo ' ' MSGFMT $@; QUIET_GCOV = @echo ' ' GCOV $@; QUIET_SP = @echo ' ' SP $<; - QUIET_HDR = @echo ' ' HDR $(<:hcc=h); + QUIET_HDR = @echo ' ' HDR $<; QUIET_RC = @echo ' ' RC $@; - QUIET_SPATCH = @echo ' ' SPATCH $<; QUIET_SUBDIR0 = +@subdir= QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ $(MAKE) $(PRINT_DIR) -C $$subdir @@ -2621,7 +2599,6 @@ FIND_SOURCE_FILES = ( \ -o \( -name 'trash*' -type d -prune \) \ -o \( -name '*.[hcS]' -type f -print \) \ -o \( -name '*.sh' -type f -print \) \ - | sed -e 's|^\./||' \ ) $(ETAGS_TARGET): FORCE @@ -2786,20 +2763,16 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE .PHONY: sparse $(SP_OBJ) sparse: $(SP_OBJ) -EXCEPT_HDRS := command-list.h unicode-width.h compat/% xdiff/% +GEN_HDRS := command-list.h unicode-width.h +EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/% ifndef GCRYPT_SHA256 EXCEPT_HDRS += sha256/gcrypt.h endif -CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(LIB_H)) +CHK_HDRS = $(filter-out $(EXCEPT_HDRS),$(patsubst ./%,%,$(LIB_H))) HCO = $(patsubst %.h,%.hco,$(CHK_HDRS)) -HCC = $(HCO:hco=hcc) -%.hcc: %.h - @echo '#include "git-compat-util.h"' >$@ - @echo '#include "$<"' >>$@ - -$(HCO): %.hco: %.hcc FORCE - $(QUIET_HDR)$(CC) $(ALL_CFLAGS) -o /dev/null -c -xc $< +$(HCO): %.hco: %.h FORCE + $(QUIET_HDR)$(CC) -include git-compat-util.h -I. -o /dev/null -c -xc $< .PHONY: hdr-check $(HCO) hdr-check: $(HCO) @@ -2818,11 +2791,15 @@ check: command-list.h exit 1; \ fi -FOUND_C_SOURCES = $(filter %.c,$(shell $(FIND_SOURCE_FILES))) -COCCI_SOURCES = $(filter-out $(THIRD_PARTY_SOURCES),$(FOUND_C_SOURCES)) +C_SOURCES = $(patsubst %.o,%.c,$(C_OBJ)) +ifdef DC_SHA1_SUBMODULE +COCCI_SOURCES = $(filter-out sha1collisiondetection/%,$(C_SOURCES)) +else +COCCI_SOURCES = $(filter-out sha1dc/%,$(C_SOURCES)) +endif %.cocci.patch: %.cocci $(COCCI_SOURCES) - $(QUIET_SPATCH) \ + @echo ' ' SPATCH $<; \ if test $(SPATCH_BATCH_SIZE) = 0; then \ limit=; \ else \ @@ -3051,10 +3028,6 @@ rpm:: @false .PHONY: rpm -ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),) -OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll) -endif - artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \ GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \ $(MOFILES) @@ -3108,10 +3081,9 @@ clean: profile-clean coverage-clean cocciclean $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(TEST_PROGRAMS) $(RM) $(FUZZ_PROGRAMS) - $(RM) $(HCC) $(RM) -r bin-wrappers $(dep_dirs) $(RM) -r po/build/ - $(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope* + $(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope* $(RM) -r $(GIT_TARNAME) .doc-tmp-dir $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz $(RM) $(htmldocs).tar.gz $(manpages).tar.gz diff --git a/third_party/git/README.md b/third_party/git/README.md index 9d4564c8aa..e1d2b82209 100644 --- a/third_party/git/README.md +++ b/third_party/git/README.md @@ -35,7 +35,7 @@ requests, comments and patches to git@vger.kernel.org (read [Documentation/SubmittingPatches][] for instructions on patch submission). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are -available at <https://lore.kernel.org/git/>, +available at <https://public-inbox.org/git/>, <http://marc.info/?l=git> and other archival sites. Issues which are security relevant should be disclosed privately to diff --git a/third_party/git/RelNotes b/third_party/git/RelNotes index 3427be6818..248d137c43 120000 --- a/third_party/git/RelNotes +++ b/third_party/git/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.26.2.txt \ No newline at end of file +Documentation/RelNotes/2.23.0.txt \ No newline at end of file diff --git a/third_party/git/add-interactive.c b/third_party/git/add-interactive.c deleted file mode 100644 index 4a9bf85cac..0000000000 --- a/third_party/git/add-interactive.c +++ /dev/null @@ -1,1176 +0,0 @@ -#include "cache.h" -#include "add-interactive.h" -#include "color.h" -#include "config.h" -#include "diffcore.h" -#include "revision.h" -#include "refs.h" -#include "string-list.h" -#include "lockfile.h" -#include "dir.h" -#include "run-command.h" - -static void init_color(struct repository *r, struct add_i_state *s, - const char *slot_name, char *dst, - const char *default_color) -{ - char *key = xstrfmt("color.interactive.%s", slot_name); - const char *value; - - if (!s->use_color) - dst[0] = '\0'; - else if (repo_config_get_value(r, key, &value) || - color_parse(value, dst)) - strlcpy(dst, default_color, COLOR_MAXLEN); - - free(key); -} - -void init_add_i_state(struct add_i_state *s, struct repository *r) -{ - const char *value; - - s->r = r; - - if (repo_config_get_value(r, "color.interactive", &value)) - s->use_color = -1; - else - s->use_color = - git_config_colorbool("color.interactive", value); - s->use_color = want_color(s->use_color); - - init_color(r, s, "header", s->header_color, GIT_COLOR_BOLD); - init_color(r, s, "help", s->help_color, GIT_COLOR_BOLD_RED); - init_color(r, s, "prompt", s->prompt_color, GIT_COLOR_BOLD_BLUE); - init_color(r, s, "error", s->error_color, GIT_COLOR_BOLD_RED); - init_color(r, s, "reset", s->reset_color, GIT_COLOR_RESET); - init_color(r, s, "fraginfo", s->fraginfo_color, - diff_get_color(s->use_color, DIFF_FRAGINFO)); - init_color(r, s, "context", s->context_color, - diff_get_color(s->use_color, DIFF_CONTEXT)); - init_color(r, s, "old", s->file_old_color, - diff_get_color(s->use_color, DIFF_FILE_OLD)); - init_color(r, s, "new", s->file_new_color, - diff_get_color(s->use_color, DIFF_FILE_NEW)); - - FREE_AND_NULL(s->interactive_diff_filter); - git_config_get_string("interactive.difffilter", - &s->interactive_diff_filter); - - FREE_AND_NULL(s->interactive_diff_algorithm); - git_config_get_string("diff.algorithm", - &s->interactive_diff_algorithm); - - git_config_get_bool("interactive.singlekey", &s->use_single_key); -} - -void clear_add_i_state(struct add_i_state *s) -{ - FREE_AND_NULL(s->interactive_diff_filter); - FREE_AND_NULL(s->interactive_diff_algorithm); - memset(s, 0, sizeof(*s)); - s->use_color = -1; -} - -/* - * A "prefix item list" is a list of items that are identified by a string, and - * a unique prefix (if any) is determined for each item. - * - * It is implemented in the form of a pair of `string_list`s, the first one - * duplicating the strings, with the `util` field pointing at a structure whose - * first field must be `size_t prefix_length`. - * - * That `prefix_length` field will be computed by `find_unique_prefixes()`; It - * will be set to zero if no valid, unique prefix could be found. - * - * The second `string_list` is called `sorted` and does _not_ duplicate the - * strings but simply reuses the first one's, with the `util` field pointing at - * the `string_item_list` of the first `string_list`. It will be populated and - * sorted by `find_unique_prefixes()`. - */ -struct prefix_item_list { - struct string_list items; - struct string_list sorted; - int *selected; /* for multi-selections */ - size_t min_length, max_length; -}; -#define PREFIX_ITEM_LIST_INIT \ - { STRING_LIST_INIT_DUP, STRING_LIST_INIT_NODUP, NULL, 1, 4 } - -static void prefix_item_list_clear(struct prefix_item_list *list) -{ - string_list_clear(&list->items, 1); - string_list_clear(&list->sorted, 0); - FREE_AND_NULL(list->selected); -} - -static void extend_prefix_length(struct string_list_item *p, - const char *other_string, size_t max_length) -{ - size_t *len = p->util; - - if (!*len || memcmp(p->string, other_string, *len)) - return; - - for (;;) { - char c = p->string[*len]; - - /* - * Is `p` a strict prefix of `other`? Or have we exhausted the - * maximal length of the prefix? Or is the current character a - * multi-byte UTF-8 one? If so, there is no valid, unique - * prefix. - */ - if (!c || ++*len > max_length || !isascii(c)) { - *len = 0; - break; - } - - if (c != other_string[*len - 1]) - break; - } -} - -static void find_unique_prefixes(struct prefix_item_list *list) -{ - size_t i; - - if (list->sorted.nr == list->items.nr) - return; - - string_list_clear(&list->sorted, 0); - /* Avoid reallocating incrementally */ - list->sorted.items = xmalloc(st_mult(sizeof(*list->sorted.items), - list->items.nr)); - list->sorted.nr = list->sorted.alloc = list->items.nr; - - for (i = 0; i < list->items.nr; i++) { - list->sorted.items[i].string = list->items.items[i].string; - list->sorted.items[i].util = list->items.items + i; - } - - string_list_sort(&list->sorted); - - for (i = 0; i < list->sorted.nr; i++) { - struct string_list_item *sorted_item = list->sorted.items + i; - struct string_list_item *item = sorted_item->util; - size_t *len = item->util; - - *len = 0; - while (*len < list->min_length) { - char c = item->string[(*len)++]; - - if (!c || !isascii(c)) { - *len = 0; - break; - } - } - - if (i > 0) - extend_prefix_length(item, sorted_item[-1].string, - list->max_length); - if (i + 1 < list->sorted.nr) - extend_prefix_length(item, sorted_item[1].string, - list->max_length); - } -} - -static ssize_t find_unique(const char *string, struct prefix_item_list *list) -{ - int index = string_list_find_insert_index(&list->sorted, string, 1); - struct string_list_item *item; - - if (list->items.nr != list->sorted.nr) - BUG("prefix_item_list in inconsistent state (%"PRIuMAX - " vs %"PRIuMAX")", - (uintmax_t)list->items.nr, (uintmax_t)list->sorted.nr); - - if (index < 0) - item = list->sorted.items[-1 - index].util; - else if (index > 0 && - starts_with(list->sorted.items[index - 1].string, string)) - return -1; - else if (index + 1 < list->sorted.nr && - starts_with(list->sorted.items[index + 1].string, string)) - return -1; - else if (index < list->sorted.nr) - item = list->sorted.items[index].util; - else - return -1; - return item - list->items.items; -} - -struct list_options { - int columns; - const char *header; - void (*print_item)(int i, int selected, struct string_list_item *item, - void *print_item_data); - void *print_item_data; -}; - -static void list(struct add_i_state *s, struct string_list *list, int *selected, - struct list_options *opts) -{ - int i, last_lf = 0; - - if (!list->nr) - return; - - if (opts->header) - color_fprintf_ln(stdout, s->header_color, - "%s", opts->header); - - for (i = 0; i < list->nr; i++) { - opts->print_item(i, selected ? selected[i] : 0, list->items + i, - opts->print_item_data); - - if ((opts->columns) && ((i + 1) % (opts->columns))) { - putchar('\t'); - last_lf = 0; - } - else { - putchar('\n'); - last_lf = 1; - } - } - - if (!last_lf) - putchar('\n'); -} -struct list_and_choose_options { - struct list_options list_opts; - - const char *prompt; - enum { - SINGLETON = (1<<0), - IMMEDIATE = (1<<1), - } flags; - void (*print_help)(struct add_i_state *s); -}; - -#define LIST_AND_CHOOSE_ERROR (-1) -#define LIST_AND_CHOOSE_QUIT (-2) - -/* - * Returns the selected index in singleton mode, the number of selected items - * otherwise. - * - * If an error occurred, returns `LIST_AND_CHOOSE_ERROR`. Upon EOF, - * `LIST_AND_CHOOSE_QUIT` is returned. - */ -static ssize_t list_and_choose(struct add_i_state *s, - struct prefix_item_list *items, - struct list_and_choose_options *opts) -{ - int singleton = opts->flags & SINGLETON; - int immediate = opts->flags & IMMEDIATE; - - struct strbuf input = STRBUF_INIT; - ssize_t res = singleton ? LIST_AND_CHOOSE_ERROR : 0; - - if (!singleton) { - free(items->selected); - CALLOC_ARRAY(items->selected, items->items.nr); - } - - if (singleton && !immediate) - BUG("singleton requires immediate"); - - find_unique_prefixes(items); - - for (;;) { - char *p; - - strbuf_reset(&input); - - list(s, &items->items, items->selected, &opts->list_opts); - - color_fprintf(stdout, s->prompt_color, "%s", opts->prompt); - fputs(singleton ? "> " : ">> ", stdout); - fflush(stdout); - - if (strbuf_getline(&input, stdin) == EOF) { - putchar('\n'); - if (immediate) - res = LIST_AND_CHOOSE_QUIT; - break; - } - strbuf_trim(&input); - - if (!input.len) - break; - - if (!strcmp(input.buf, "?")) { - opts->print_help(s); - continue; - } - - p = input.buf; - for (;;) { - size_t sep = strcspn(p, " \t\r\n,"); - int choose = 1; - /* `from` is inclusive, `to` is exclusive */ - ssize_t from = -1, to = -1; - - if (!sep) { - if (!*p) - break; - p++; - continue; - } - - /* Input that begins with '-'; de-select */ - if (*p == '-') { - choose = 0; - p++; - sep--; - } - - if (sep == 1 && *p == '*') { - from = 0; - to = items->items.nr; - } else if (isdigit(*p)) { - char *endp; - /* - * A range can be specified like 5-7 or 5-. - * - * Note: `from` is 0-based while the user input - * is 1-based, hence we have to decrement by - * one. We do not have to decrement `to` even - * if it is 0-based because it is an exclusive - * boundary. - */ - from = strtoul(p, &endp, 10) - 1; - if (endp == p + sep) - to = from + 1; - else if (*endp == '-') { - if (isdigit(*(++endp))) - to = strtoul(endp, &endp, 10); - else - to = items->items.nr; - /* extra characters after the range? */ - if (endp != p + sep) - from = -1; - } - } - - if (p[sep]) - p[sep++] = '\0'; - if (from < 0) { - from = find_unique(p, items); - if (from >= 0) - to = from + 1; - } - - if (from < 0 || from >= items->items.nr || - (singleton && from + 1 != to)) { - color_fprintf_ln(stdout, s->error_color, - _("Huh (%s)?"), p); - break; - } else if (singleton) { - res = from; - break; - } - - if (to > items->items.nr) - to = items->items.nr; - - for (; from < to; from++) - if (items->selected[from] != choose) { - items->selected[from] = choose; - res += choose ? +1 : -1; - } - - p += sep; - } - - if ((immediate && res != LIST_AND_CHOOSE_ERROR) || - !strcmp(input.buf, "*")) - break; - } - - strbuf_release(&input); - return res; -} - -struct adddel { - uintmax_t add, del; - unsigned seen:1, unmerged:1, binary:1; -}; - -struct file_item { - size_t prefix_length; - struct adddel index, worktree; -}; - -static void add_file_item(struct string_list *files, const char *name) -{ - struct file_item *item = xcalloc(sizeof(*item), 1); - - string_list_append(files, name)->util = item; -} - -struct pathname_entry { - struct hashmap_entry ent; - const char *name; - struct file_item *item; -}; - -static int pathname_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *he1, - const struct hashmap_entry *he2, - const void *name) -{ - const struct pathname_entry *e1 = - container_of(he1, const struct pathname_entry, ent); - const struct pathname_entry *e2 = - container_of(he2, const struct pathname_entry, ent); - - return strcmp(e1->name, name ? (const char *)name : e2->name); -} - -struct collection_status { - enum { FROM_WORKTREE = 0, FROM_INDEX = 1 } mode; - - const char *reference; - - unsigned skip_unseen:1; - size_t unmerged_count, binary_count; - struct string_list *files; - struct hashmap file_map; -}; - -static void collect_changes_cb(struct diff_queue_struct *q, - struct diff_options *options, - void *data) -{ - struct collection_status *s = data; - struct diffstat_t stat = { 0 }; - int i; - - if (!q->nr) - return; - - compute_diffstat(options, &stat, q); - - for (i = 0; i < stat.nr; i++) { - const char *name = stat.files[i]->name; - int hash = strhash(name); - struct pathname_entry *entry; - struct file_item *file_item; - struct adddel *adddel, *other_adddel; - - entry = hashmap_get_entry_from_hash(&s->file_map, hash, name, - struct pathname_entry, ent); - if (!entry) { - if (s->skip_unseen) - continue; - - add_file_item(s->files, name); - - entry = xcalloc(sizeof(*entry), 1); - hashmap_entry_init(&entry->ent, hash); - entry->name = s->files->items[s->files->nr - 1].string; - entry->item = s->files->items[s->files->nr - 1].util; - hashmap_add(&s->file_map, &entry->ent); - } - - file_item = entry->item; - adddel = s->mode == FROM_INDEX ? - &file_item->index : &file_item->worktree; - other_adddel = s->mode == FROM_INDEX ? - &file_item->worktree : &file_item->index; - adddel->seen = 1; - adddel->add = stat.files[i]->added; - adddel->del = stat.files[i]->deleted; - if (stat.files[i]->is_binary) { - if (!other_adddel->binary) - s->binary_count++; - adddel->binary = 1; - } - if (stat.files[i]->is_unmerged) { - if (!other_adddel->unmerged) - s->unmerged_count++; - adddel->unmerged = 1; - } - } - free_diffstat_info(&stat); -} - -enum modified_files_filter { - NO_FILTER = 0, - WORKTREE_ONLY = 1, - INDEX_ONLY = 2, -}; - -static int get_modified_files(struct repository *r, - enum modified_files_filter filter, - struct prefix_item_list *files, - const struct pathspec *ps, - size_t *unmerged_count, - size_t *binary_count) -{ - struct object_id head_oid; - int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, - &head_oid, NULL); - struct collection_status s = { 0 }; - int i; - - if (discard_index(r->index) < 0 || - repo_read_index_preload(r, ps, 0) < 0) - return error(_("could not read index")); - - prefix_item_list_clear(files); - s.files = &files->items; - hashmap_init(&s.file_map, pathname_entry_cmp, NULL, 0); - - for (i = 0; i < 2; i++) { - struct rev_info rev; - struct setup_revision_opt opt = { 0 }; - - if (filter == INDEX_ONLY) - s.mode = (i == 0) ? FROM_INDEX : FROM_WORKTREE; - else - s.mode = (i == 0) ? FROM_WORKTREE : FROM_INDEX; - s.skip_unseen = filter && i; - - opt.def = is_initial ? - empty_tree_oid_hex() : oid_to_hex(&head_oid); - - init_revisions(&rev, NULL); - setup_revisions(0, NULL, &rev, &opt); - - rev.diffopt.output_format = DIFF_FORMAT_CALLBACK; - rev.diffopt.format_callback = collect_changes_cb; - rev.diffopt.format_callback_data = &s; - - if (ps) - copy_pathspec(&rev.prune_data, ps); - - if (s.mode == FROM_INDEX) - run_diff_index(&rev, 1); - else { - rev.diffopt.flags.ignore_dirty_submodules = 1; - run_diff_files(&rev, 0); - } - - if (ps) - clear_pathspec(&rev.prune_data); - } - hashmap_free_entries(&s.file_map, struct pathname_entry, ent); - if (unmerged_count) - *unmerged_count = s.unmerged_count; - if (binary_count) - *binary_count = s.binary_count; - - /* While the diffs are ordered already, we ran *two* diffs... */ - string_list_sort(&files->items); - - return 0; -} - -static void render_adddel(struct strbuf *buf, - struct adddel *ad, const char *no_changes) -{ - if (ad->binary) - strbuf_addstr(buf, _("binary")); - else if (ad->seen) - strbuf_addf(buf, "+%"PRIuMAX"/-%"PRIuMAX, - (uintmax_t)ad->add, (uintmax_t)ad->del); - else - strbuf_addstr(buf, no_changes); -} - -/* filters out prefixes which have special meaning to list_and_choose() */ -static int is_valid_prefix(const char *prefix, size_t prefix_len) -{ - return prefix_len && prefix && - /* - * We expect `prefix` to be NUL terminated, therefore this - * `strcspn()` call is okay, even if it might do much more - * work than strictly necessary. - */ - strcspn(prefix, " \t\r\n,") >= prefix_len && /* separators */ - *prefix != '-' && /* deselection */ - !isdigit(*prefix) && /* selection */ - (prefix_len != 1 || - (*prefix != '*' && /* "all" wildcard */ - *prefix != '?')); /* prompt help */ -} - -struct print_file_item_data { - const char *modified_fmt, *color, *reset; - struct strbuf buf, name, index, worktree; - unsigned only_names:1; -}; - -static void print_file_item(int i, int selected, struct string_list_item *item, - void *print_file_item_data) -{ - struct file_item *c = item->util; - struct print_file_item_data *d = print_file_item_data; - const char *highlighted = NULL; - - strbuf_reset(&d->index); - strbuf_reset(&d->worktree); - strbuf_reset(&d->buf); - - /* Format the item with the prefix highlighted. */ - if (c->prefix_length > 0 && - is_valid_prefix(item->string, c->prefix_length)) { - strbuf_reset(&d->name); - strbuf_addf(&d->name, "%s%.*s%s%s", d->color, - (int)c->prefix_length, item->string, d->reset, - item->string + c->prefix_length); - highlighted = d->name.buf; - } - - if (d->only_names) { - printf("%c%2d: %s", selected ? '*' : ' ', i + 1, - highlighted ? highlighted : item->string); - return; - } - - render_adddel(&d->worktree, &c->worktree, _("nothing")); - render_adddel(&d->index, &c->index, _("unchanged")); - - strbuf_addf(&d->buf, d->modified_fmt, d->index.buf, d->worktree.buf, - highlighted ? highlighted : item->string); - - printf("%c%2d: %s", selected ? '*' : ' ', i + 1, d->buf.buf); -} - -static int run_status(struct add_i_state *s, const struct pathspec *ps, - struct prefix_item_list *files, - struct list_and_choose_options *opts) -{ - if (get_modified_files(s->r, NO_FILTER, files, ps, NULL, NULL) < 0) - return -1; - - list(s, &files->items, NULL, &opts->list_opts); - putchar('\n'); - - return 0; -} - -static int run_update(struct add_i_state *s, const struct pathspec *ps, - struct prefix_item_list *files, - struct list_and_choose_options *opts) -{ - int res = 0, fd; - size_t count, i; - struct lock_file index_lock; - - if (get_modified_files(s->r, WORKTREE_ONLY, files, ps, NULL, NULL) < 0) - return -1; - - if (!files->items.nr) { - putchar('\n'); - return 0; - } - - opts->prompt = N_("Update"); - count = list_and_choose(s, files, opts); - if (count <= 0) { - putchar('\n'); - return 0; - } - - fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR); - if (fd < 0) { - putchar('\n'); - return -1; - } - - for (i = 0; i < files->items.nr; i++) { - const char *name = files->items.items[i].string; - if (files->selected[i] && - add_file_to_index(s->r->index, name, 0) < 0) { - res = error(_("could not stage '%s'"), name); - break; - } - } - - if (!res && write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0) - res = error(_("could not write index")); - - if (!res) - printf(Q_("updated %d path\n", - "updated %d paths\n", count), (int)count); - - putchar('\n'); - return res; -} - -static void revert_from_diff(struct diff_queue_struct *q, - struct diff_options *opt, void *data) -{ - int i, add_flags = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE; - - for (i = 0; i < q->nr; i++) { - struct diff_filespec *one = q->queue[i]->one; - struct cache_entry *ce; - - if (!(one->mode && !is_null_oid(&one->oid))) { - remove_file_from_index(opt->repo->index, one->path); - printf(_("note: %s is untracked now.\n"), one->path); - } else { - ce = make_cache_entry(opt->repo->index, one->mode, - &one->oid, one->path, 0, 0); - if (!ce) - die(_("make_cache_entry failed for path '%s'"), - one->path); - add_index_entry(opt->repo->index, ce, add_flags); - } - } -} - -static int run_revert(struct add_i_state *s, const struct pathspec *ps, - struct prefix_item_list *files, - struct list_and_choose_options *opts) -{ - int res = 0, fd; - size_t count, i, j; - - struct object_id oid; - int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid, - NULL); - struct lock_file index_lock; - const char **paths; - struct tree *tree; - struct diff_options diffopt = { NULL }; - - if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0) - return -1; - - if (!files->items.nr) { - putchar('\n'); - return 0; - } - - opts->prompt = N_("Revert"); - count = list_and_choose(s, files, opts); - if (count <= 0) - goto finish_revert; - - fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR); - if (fd < 0) { - res = -1; - goto finish_revert; - } - - if (is_initial) - oidcpy(&oid, s->r->hash_algo->empty_tree); - else { - tree = parse_tree_indirect(&oid); - if (!tree) { - res = error(_("Could not parse HEAD^{tree}")); - goto finish_revert; - } - oidcpy(&oid, &tree->object.oid); - } - - ALLOC_ARRAY(paths, count + 1); - for (i = j = 0; i < files->items.nr; i++) - if (files->selected[i]) - paths[j++] = files->items.items[i].string; - paths[j] = NULL; - - parse_pathspec(&diffopt.pathspec, 0, - PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, - NULL, paths); - - diffopt.output_format = DIFF_FORMAT_CALLBACK; - diffopt.format_callback = revert_from_diff; - diffopt.flags.override_submodule_config = 1; - diffopt.repo = s->r; - - if (do_diff_cache(&oid, &diffopt)) - res = -1; - else { - diffcore_std(&diffopt); - diff_flush(&diffopt); - } - free(paths); - clear_pathspec(&diffopt.pathspec); - - if (!res && write_locked_index(s->r->index, &index_lock, - COMMIT_LOCK) < 0) - res = -1; - else - res = repo_refresh_and_write_index(s->r, REFRESH_QUIET, 0, 1, - NULL, NULL, NULL); - - if (!res) - printf(Q_("reverted %d path\n", - "reverted %d paths\n", count), (int)count); - -finish_revert: - putchar('\n'); - return res; -} - -static int get_untracked_files(struct repository *r, - struct prefix_item_list *files, - const struct pathspec *ps) -{ - struct dir_struct dir = { 0 }; - size_t i; - struct strbuf buf = STRBUF_INIT; - - if (repo_read_index(r) < 0) - return error(_("could not read index")); - - prefix_item_list_clear(files); - setup_standard_excludes(&dir); - add_pattern_list(&dir, EXC_CMDL, "--exclude option"); - fill_directory(&dir, r->index, ps); - - for (i = 0; i < dir.nr; i++) { - struct dir_entry *ent = dir.entries[i]; - - if (index_name_is_other(r->index, ent->name, ent->len)) { - strbuf_reset(&buf); - strbuf_add(&buf, ent->name, ent->len); - add_file_item(&files->items, buf.buf); - } - } - - strbuf_release(&buf); - return 0; -} - -static int run_add_untracked(struct add_i_state *s, const struct pathspec *ps, - struct prefix_item_list *files, - struct list_and_choose_options *opts) -{ - struct print_file_item_data *d = opts->list_opts.print_item_data; - int res = 0, fd; - size_t count, i; - struct lock_file index_lock; - - if (get_untracked_files(s->r, files, ps) < 0) - return -1; - - if (!files->items.nr) { - printf(_("No untracked files.\n")); - goto finish_add_untracked; - } - - opts->prompt = N_("Add untracked"); - d->only_names = 1; - count = list_and_choose(s, files, opts); - d->only_names = 0; - if (count <= 0) - goto finish_add_untracked; - - fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR); - if (fd < 0) { - res = -1; - goto finish_add_untracked; - } - - for (i = 0; i < files->items.nr; i++) { - const char *name = files->items.items[i].string; - if (files->selected[i] && - add_file_to_index(s->r->index, name, 0) < 0) { - res = error(_("could not stage '%s'"), name); - break; - } - } - - if (!res && - write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0) - res = error(_("could not write index")); - - if (!res) - printf(Q_("added %d path\n", - "added %d paths\n", count), (int)count); - -finish_add_untracked: - putchar('\n'); - return res; -} - -static int run_patch(struct add_i_state *s, const struct pathspec *ps, - struct prefix_item_list *files, - struct list_and_choose_options *opts) -{ - int res = 0; - ssize_t count, i, j; - size_t unmerged_count = 0, binary_count = 0; - - if (get_modified_files(s->r, WORKTREE_ONLY, files, ps, - &unmerged_count, &binary_count) < 0) - return -1; - - if (unmerged_count || binary_count) { - for (i = j = 0; i < files->items.nr; i++) { - struct file_item *item = files->items.items[i].util; - - if (item->index.binary || item->worktree.binary) { - free(item); - free(files->items.items[i].string); - } else if (item->index.unmerged || - item->worktree.unmerged) { - color_fprintf_ln(stderr, s->error_color, - _("ignoring unmerged: %s"), - files->items.items[i].string); - free(item); - free(files->items.items[i].string); - } else - files->items.items[j++] = files->items.items[i]; - } - files->items.nr = j; - } - - if (!files->items.nr) { - if (binary_count) - fprintf(stderr, _("Only binary files changed.\n")); - else - fprintf(stderr, _("No changes.\n")); - return 0; - } - - opts->prompt = N_("Patch update"); - count = list_and_choose(s, files, opts); - if (count > 0) { - struct argv_array args = ARGV_ARRAY_INIT; - struct pathspec ps_selected = { 0 }; - - for (i = 0; i < files->items.nr; i++) - if (files->selected[i]) - argv_array_push(&args, - files->items.items[i].string); - parse_pathspec(&ps_selected, - PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL, - PATHSPEC_LITERAL_PATH, "", args.argv); - res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected); - argv_array_clear(&args); - clear_pathspec(&ps_selected); - } - - return res; -} - -static int run_diff(struct add_i_state *s, const struct pathspec *ps, - struct prefix_item_list *files, - struct list_and_choose_options *opts) -{ - int res = 0; - ssize_t count, i; - - struct object_id oid; - int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid, - NULL); - if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0) - return -1; - - if (!files->items.nr) { - putchar('\n'); - return 0; - } - - opts->prompt = N_("Review diff"); - opts->flags = IMMEDIATE; - count = list_and_choose(s, files, opts); - opts->flags = 0; - if (count > 0) { - struct argv_array args = ARGV_ARRAY_INIT; - - argv_array_pushl(&args, "git", "diff", "-p", "--cached", - oid_to_hex(!is_initial ? &oid : - s->r->hash_algo->empty_tree), - "--", NULL); - for (i = 0; i < files->items.nr; i++) - if (files->selected[i]) - argv_array_push(&args, - files->items.items[i].string); - res = run_command_v_opt(args.argv, 0); - argv_array_clear(&args); - } - - putchar('\n'); - return res; -} - -static int run_help(struct add_i_state *s, const struct pathspec *unused_ps, - struct prefix_item_list *unused_files, - struct list_and_choose_options *unused_opts) -{ - color_fprintf_ln(stdout, s->help_color, "status - %s", - _("show paths with changes")); - color_fprintf_ln(stdout, s->help_color, "update - %s", - _("add working tree state to the staged set of changes")); - color_fprintf_ln(stdout, s->help_color, "revert - %s", - _("revert staged set of changes back to the HEAD version")); - color_fprintf_ln(stdout, s->help_color, "patch - %s", - _("pick hunks and update selectively")); - color_fprintf_ln(stdout, s->help_color, "diff - %s", - _("view diff between HEAD and index")); - color_fprintf_ln(stdout, s->help_color, "add untracked - %s", - _("add contents of untracked files to the staged set of changes")); - - return 0; -} - -static void choose_prompt_help(struct add_i_state *s) -{ - color_fprintf_ln(stdout, s->help_color, "%s", - _("Prompt help:")); - color_fprintf_ln(stdout, s->help_color, "1 - %s", - _("select a single item")); - color_fprintf_ln(stdout, s->help_color, "3-5 - %s", - _("select a range of items")); - color_fprintf_ln(stdout, s->help_color, "2-3,6-9 - %s", - _("select multiple ranges")); - color_fprintf_ln(stdout, s->help_color, "foo - %s", - _("select item based on unique prefix")); - color_fprintf_ln(stdout, s->help_color, "-... - %s", - _("unselect specified items")); - color_fprintf_ln(stdout, s->help_color, "* - %s", - _("choose all items")); - color_fprintf_ln(stdout, s->help_color, " - %s", - _("(empty) finish selecting")); -} - -typedef int (*command_t)(struct add_i_state *s, const struct pathspec *ps, - struct prefix_item_list *files, - struct list_and_choose_options *opts); - -struct command_item { - size_t prefix_length; - command_t command; -}; - -struct print_command_item_data { - const char *color, *reset; -}; - -static void print_command_item(int i, int selected, - struct string_list_item *item, - void *print_command_item_data) -{ - struct print_command_item_data *d = print_command_item_data; - struct command_item *util = item->util; - - if (!util->prefix_length || - !is_valid_prefix(item->string, util->prefix_length)) - printf(" %2d: %s", i + 1, item->string); - else - printf(" %2d: %s%.*s%s%s", i + 1, - d->color, (int)util->prefix_length, item->string, - d->reset, item->string + util->prefix_length); -} - -static void command_prompt_help(struct add_i_state *s) -{ - const char *help_color = s->help_color; - color_fprintf_ln(stdout, help_color, "%s", _("Prompt help:")); - color_fprintf_ln(stdout, help_color, "1 - %s", - _("select a numbered item")); - color_fprintf_ln(stdout, help_color, "foo - %s", - _("select item based on unique prefix")); - color_fprintf_ln(stdout, help_color, " - %s", - _("(empty) select nothing")); -} - -int run_add_i(struct repository *r, const struct pathspec *ps) -{ - struct add_i_state s = { NULL }; - struct print_command_item_data data = { "[", "]" }; - struct list_and_choose_options main_loop_opts = { - { 4, N_("*** Commands ***"), print_command_item, &data }, - N_("What now"), SINGLETON | IMMEDIATE, command_prompt_help - }; - struct { - const char *string; - command_t command; - } command_list[] = { - { "status", run_status }, - { "update", run_update }, - { "revert", run_revert }, - { "add untracked", run_add_untracked }, - { "patch", run_patch }, - { "diff", run_diff }, - { "quit", NULL }, - { "help", run_help }, - }; - struct prefix_item_list commands = PREFIX_ITEM_LIST_INIT; - - struct print_file_item_data print_file_item_data = { - "%12s %12s %s", NULL, NULL, - STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT - }; - struct list_and_choose_options opts = { - { 0, NULL, print_file_item, &print_file_item_data }, - NULL, 0, choose_prompt_help - }; - struct strbuf header = STRBUF_INIT; - struct prefix_item_list files = PREFIX_ITEM_LIST_INIT; - ssize_t i; - int res = 0; - - for (i = 0; i < ARRAY_SIZE(command_list); i++) { - struct command_item *util = xcalloc(sizeof(*util), 1); - util->command = command_list[i].command; - string_list_append(&commands.items, command_list[i].string) - ->util = util; - } - - init_add_i_state(&s, r); - - /* - * When color was asked for, use the prompt color for - * highlighting, otherwise use square brackets. - */ - if (s.use_color) { - data.color = s.prompt_color; - data.reset = s.reset_color; - } - print_file_item_data.color = data.color; - print_file_item_data.reset = data.reset; - - strbuf_addstr(&header, " "); - strbuf_addf(&header, print_file_item_data.modified_fmt, - _("staged"), _("unstaged"), _("path")); - opts.list_opts.header = header.buf; - - if (discard_index(r->index) < 0 || - repo_read_index(r) < 0 || - repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1, - NULL, NULL, NULL) < 0) - warning(_("could not refresh index")); - - res = run_status(&s, ps, &files, &opts); - - for (;;) { - struct command_item *util; - - i = list_and_choose(&s, &commands, &main_loop_opts); - if (i < 0 || i >= commands.items.nr) - util = NULL; - else - util = commands.items.items[i].util; - - if (i == LIST_AND_CHOOSE_QUIT || (util && !util->command)) { - printf(_("Bye.\n")); - res = 0; - break; - } - - if (util) - res = util->command(&s, ps, &files, &opts); - } - - prefix_item_list_clear(&files); - strbuf_release(&print_file_item_data.buf); - strbuf_release(&print_file_item_data.name); - strbuf_release(&print_file_item_data.index); - strbuf_release(&print_file_item_data.worktree); - strbuf_release(&header); - prefix_item_list_clear(&commands); - clear_add_i_state(&s); - - return res; -} diff --git a/third_party/git/add-interactive.h b/third_party/git/add-interactive.h deleted file mode 100644 index 693f125e8e..0000000000 --- a/third_party/git/add-interactive.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef ADD_INTERACTIVE_H -#define ADD_INTERACTIVE_H - -#include "color.h" - -struct add_i_state { - struct repository *r; - int use_color; - char header_color[COLOR_MAXLEN]; - char help_color[COLOR_MAXLEN]; - char prompt_color[COLOR_MAXLEN]; - char error_color[COLOR_MAXLEN]; - char reset_color[COLOR_MAXLEN]; - char fraginfo_color[COLOR_MAXLEN]; - char context_color[COLOR_MAXLEN]; - char file_old_color[COLOR_MAXLEN]; - char file_new_color[COLOR_MAXLEN]; - - int use_single_key; - char *interactive_diff_filter, *interactive_diff_algorithm; -}; - -void init_add_i_state(struct add_i_state *s, struct repository *r); -void clear_add_i_state(struct add_i_state *s); - -struct repository; -struct pathspec; -int run_add_i(struct repository *r, const struct pathspec *ps); - -enum add_p_mode { - ADD_P_ADD, - ADD_P_STASH, - ADD_P_RESET, - ADD_P_CHECKOUT, - ADD_P_WORKTREE, -}; - -int run_add_p(struct repository *r, enum add_p_mode mode, - const char *revision, const struct pathspec *ps); - -#endif diff --git a/third_party/git/add-patch.c b/third_party/git/add-patch.c deleted file mode 100644 index d8dafa8168..0000000000 --- a/third_party/git/add-patch.c +++ /dev/null @@ -1,1683 +0,0 @@ -#include "cache.h" -#include "add-interactive.h" -#include "strbuf.h" -#include "run-command.h" -#include "argv-array.h" -#include "pathspec.h" -#include "color.h" -#include "diff.h" -#include "compat/terminal.h" - -enum prompt_mode_type { - PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_HUNK, - PROMPT_MODE_MAX, /* must be last */ -}; - -struct patch_mode { - /* - * The magic constant 4 is chosen such that all patch modes - * provide enough space for three command-line arguments followed by a - * trailing `NULL`. - */ - const char *diff_cmd[4], *apply_args[4], *apply_check_args[4]; - unsigned is_reverse:1, index_only:1, apply_for_checkout:1; - const char *prompt_mode[PROMPT_MODE_MAX]; - const char *edit_hunk_hint, *help_patch_text; -}; - -static struct patch_mode patch_mode_add = { - .diff_cmd = { "diff-files", NULL }, - .apply_args = { "--cached", NULL }, - .apply_check_args = { "--cached", NULL }, - .prompt_mode = { - N_("Stage mode change [y,n,q,a,d%s,?]? "), - N_("Stage deletion [y,n,q,a,d%s,?]? "), - N_("Stage this hunk [y,n,q,a,d%s,?]? ") - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for staging."), - .help_patch_text = - N_("y - stage this hunk\n" - "n - do not stage this hunk\n" - "q - quit; do not stage this hunk or any of the remaining " - "ones\n" - "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") -}; - -static struct patch_mode patch_mode_stash = { - .diff_cmd = { "diff-index", "HEAD", NULL }, - .apply_args = { "--cached", NULL }, - .apply_check_args = { "--cached", NULL }, - .prompt_mode = { - N_("Stash mode change [y,n,q,a,d%s,?]? "), - N_("Stash deletion [y,n,q,a,d%s,?]? "), - N_("Stash this hunk [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for stashing."), - .help_patch_text = - N_("y - stash this hunk\n" - "n - do not stash this hunk\n" - "q - quit; do not stash this hunk or any of the remaining " - "ones\n" - "a - stash this hunk and all later hunks in the file\n" - "d - do not stash this hunk or any of the later hunks in " - "the file\n"), -}; - -static struct patch_mode patch_mode_reset_head = { - .diff_cmd = { "diff-index", "--cached", NULL }, - .apply_args = { "-R", "--cached", NULL }, - .apply_check_args = { "-R", "--cached", NULL }, - .is_reverse = 1, - .index_only = 1, - .prompt_mode = { - N_("Unstage mode change [y,n,q,a,d%s,?]? "), - N_("Unstage deletion [y,n,q,a,d%s,?]? "), - N_("Unstage this hunk [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for unstaging."), - .help_patch_text = - N_("y - unstage this hunk\n" - "n - do not unstage this hunk\n" - "q - quit; do not unstage this hunk or any of the remaining " - "ones\n" - "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"), -}; - -static struct patch_mode patch_mode_reset_nothead = { - .diff_cmd = { "diff-index", "-R", "--cached", NULL }, - .apply_args = { "--cached", NULL }, - .apply_check_args = { "--cached", NULL }, - .index_only = 1, - .prompt_mode = { - N_("Apply mode change to index [y,n,q,a,d%s,?]? "), - N_("Apply deletion to index [y,n,q,a,d%s,?]? "), - N_("Apply this hunk to index [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for applying."), - .help_patch_text = - N_("y - apply this hunk to index\n" - "n - do not apply this hunk to index\n" - "q - quit; do not apply this hunk or any of the remaining " - "ones\n" - "a - apply this hunk and all later hunks in the file\n" - "d - do not apply this hunk or any of the later hunks in " - "the file\n"), -}; - -static struct patch_mode patch_mode_checkout_index = { - .diff_cmd = { "diff-files", NULL }, - .apply_args = { "-R", NULL }, - .apply_check_args = { "-R", NULL }, - .is_reverse = 1, - .prompt_mode = { - N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "), - N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "), - N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for discarding."), - .help_patch_text = - N_("y - discard this hunk from worktree\n" - "n - do not discard this hunk from worktree\n" - "q - quit; do not discard this hunk or any of the remaining " - "ones\n" - "a - discard this hunk and all later hunks in the file\n" - "d - do not discard this hunk or any of the later hunks in " - "the file\n"), -}; - -static struct patch_mode patch_mode_checkout_head = { - .diff_cmd = { "diff-index", NULL }, - .apply_for_checkout = 1, - .apply_check_args = { "-R", NULL }, - .is_reverse = 1, - .prompt_mode = { - N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "), - N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "), - N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for discarding."), - .help_patch_text = - N_("y - discard this hunk from index and worktree\n" - "n - do not discard this hunk from index and worktree\n" - "q - quit; do not discard this hunk or any of the remaining " - "ones\n" - "a - discard this hunk and all later hunks in the file\n" - "d - do not discard this hunk or any of the later hunks in " - "the file\n"), -}; - -static struct patch_mode patch_mode_checkout_nothead = { - .diff_cmd = { "diff-index", "-R", NULL }, - .apply_for_checkout = 1, - .apply_check_args = { NULL }, - .prompt_mode = { - N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "), - N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "), - N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for applying."), - .help_patch_text = - N_("y - apply this hunk to index and worktree\n" - "n - do not apply this hunk to index and worktree\n" - "q - quit; do not apply this hunk or any of the remaining " - "ones\n" - "a - apply this hunk and all later hunks in the file\n" - "d - do not apply this hunk or any of the later hunks in " - "the file\n"), -}; - -static struct patch_mode patch_mode_worktree_head = { - .diff_cmd = { "diff-index", NULL }, - .apply_args = { "-R", NULL }, - .apply_check_args = { "-R", NULL }, - .is_reverse = 1, - .prompt_mode = { - N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "), - N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "), - N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for discarding."), - .help_patch_text = - N_("y - discard this hunk from worktree\n" - "n - do not discard this hunk from worktree\n" - "q - quit; do not discard this hunk or any of the remaining " - "ones\n" - "a - discard this hunk and all later hunks in the file\n" - "d - do not discard this hunk or any of the later hunks in " - "the file\n"), -}; - -static struct patch_mode patch_mode_worktree_nothead = { - .diff_cmd = { "diff-index", "-R", NULL }, - .apply_args = { NULL }, - .apply_check_args = { NULL }, - .prompt_mode = { - N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "), - N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "), - N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "), - }, - .edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk " - "will immediately be marked for applying."), - .help_patch_text = - N_("y - apply this hunk to worktree\n" - "n - do not apply this hunk to worktree\n" - "q - quit; do not apply this hunk or any of the remaining " - "ones\n" - "a - apply this hunk and all later hunks in the file\n" - "d - do not apply this hunk or any of the later hunks in " - "the file\n"), -}; - -struct hunk_header { - unsigned long old_offset, old_count, new_offset, new_count; - /* - * Start/end offsets to the extra text after the second `@@` in the - * hunk header, e.g. the function signature. This is expected to - * include the newline. - */ - size_t extra_start, extra_end, colored_extra_start, colored_extra_end; -}; - -struct hunk { - size_t start, end, colored_start, colored_end, splittable_into; - ssize_t delta; - enum { UNDECIDED_HUNK = 0, SKIP_HUNK, USE_HUNK } use; - struct hunk_header header; -}; - -struct add_p_state { - struct add_i_state s; - struct strbuf answer, buf; - - /* parsed diff */ - struct strbuf plain, colored; - struct file_diff { - struct hunk head; - struct hunk *hunk; - size_t hunk_nr, hunk_alloc; - unsigned deleted:1, mode_change:1,binary:1; - } *file_diff; - size_t file_diff_nr; - - /* patch mode */ - struct patch_mode *mode; - const char *revision; -}; - -static void err(struct add_p_state *s, const char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - fputs(s->s.error_color, stderr); - vfprintf(stderr, fmt, args); - fputs(s->s.reset_color, stderr); - fputc('\n', stderr); - va_end(args); -} - -static void setup_child_process(struct add_p_state *s, - struct child_process *cp, ...) -{ - va_list ap; - const char *arg; - - va_start(ap, cp); - while ((arg = va_arg(ap, const char *))) - argv_array_push(&cp->args, arg); - va_end(ap); - - cp->git_cmd = 1; - argv_array_pushf(&cp->env_array, - INDEX_ENVIRONMENT "=%s", s->s.r->index_file); -} - -static int parse_range(const char **p, - unsigned long *offset, unsigned long *count) -{ - char *pend; - - *offset = strtoul(*p, &pend, 10); - if (pend == *p) - return -1; - if (*pend != ',') { - *count = 1; - *p = pend; - return 0; - } - *count = strtoul(pend + 1, (char **)p, 10); - return *p == pend + 1 ? -1 : 0; -} - -static int parse_hunk_header(struct add_p_state *s, struct hunk *hunk) -{ - struct hunk_header *header = &hunk->header; - const char *line = s->plain.buf + hunk->start, *p = line; - char *eol = memchr(p, '\n', s->plain.len - hunk->start); - - if (!eol) - eol = s->plain.buf + s->plain.len; - - if (!skip_prefix(p, "@@ -", &p) || - parse_range(&p, &header->old_offset, &header->old_count) < 0 || - !skip_prefix(p, " +", &p) || - parse_range(&p, &header->new_offset, &header->new_count) < 0 || - !skip_prefix(p, " @@", &p)) - return error(_("could not parse hunk header '%.*s'"), - (int)(eol - line), line); - - hunk->start = eol - s->plain.buf + (*eol == '\n'); - header->extra_start = p - s->plain.buf; - header->extra_end = hunk->start; - - if (!s->colored.len) { - header->colored_extra_start = header->colored_extra_end = 0; - return 0; - } - - /* Now find the extra text in the colored diff */ - line = s->colored.buf + hunk->colored_start; - eol = memchr(line, '\n', s->colored.len - hunk->colored_start); - if (!eol) - eol = s->colored.buf + s->colored.len; - p = memmem(line, eol - line, "@@ -", 4); - if (!p) - return error(_("could not parse colored hunk header '%.*s'"), - (int)(eol - line), line); - p = memmem(p + 4, eol - p - 4, " @@", 3); - if (!p) - return error(_("could not parse colored hunk header '%.*s'"), - (int)(eol - line), line); - hunk->colored_start = eol - s->colored.buf + (*eol == '\n'); - header->colored_extra_start = p + 3 - s->colored.buf; - header->colored_extra_end = hunk->colored_start; - - return 0; -} - -static int is_octal(const char *p, size_t len) -{ - if (!len) - return 0; - - while (len--) - if (*p < '0' || *(p++) > '7') - return 0; - return 1; -} - -static int parse_diff(struct add_p_state *s, const struct pathspec *ps) -{ - struct argv_array args = ARGV_ARRAY_INIT; - const char *diff_algorithm = s->s.interactive_diff_algorithm; - struct strbuf *plain = &s->plain, *colored = NULL; - struct child_process cp = CHILD_PROCESS_INIT; - char *p, *pend, *colored_p = NULL, *colored_pend = NULL, marker = '\0'; - size_t file_diff_alloc = 0, i, color_arg_index; - struct file_diff *file_diff = NULL; - struct hunk *hunk = NULL; - int res; - - argv_array_pushv(&args, s->mode->diff_cmd); - if (diff_algorithm) - argv_array_pushf(&args, "--diff-algorithm=%s", diff_algorithm); - if (s->revision) { - struct object_id oid; - argv_array_push(&args, - /* could be on an unborn branch */ - !strcmp("HEAD", s->revision) && - get_oid("HEAD", &oid) ? - empty_tree_oid_hex() : s->revision); - } - color_arg_index = args.argc; - /* Use `--no-color` explicitly, just in case `diff.color = always`. */ - argv_array_pushl(&args, "--no-color", "-p", "--", NULL); - for (i = 0; i < ps->nr; i++) - argv_array_push(&args, ps->items[i].original); - - setup_child_process(s, &cp, NULL); - cp.argv = args.argv; - res = capture_command(&cp, plain, 0); - if (res) { - argv_array_clear(&args); - return error(_("could not parse diff")); - } - if (!plain->len) { - argv_array_clear(&args); - return 0; - } - strbuf_complete_line(plain); - - if (want_color_fd(1, -1)) { - struct child_process colored_cp = CHILD_PROCESS_INIT; - const char *diff_filter = s->s.interactive_diff_filter; - - setup_child_process(s, &colored_cp, NULL); - xsnprintf((char *)args.argv[color_arg_index], 8, "--color"); - colored_cp.argv = args.argv; - colored = &s->colored; - res = capture_command(&colored_cp, colored, 0); - argv_array_clear(&args); - if (res) - return error(_("could not parse colored diff")); - - if (diff_filter) { - struct child_process filter_cp = CHILD_PROCESS_INIT; - - setup_child_process(s, &filter_cp, - diff_filter, NULL); - filter_cp.git_cmd = 0; - filter_cp.use_shell = 1; - strbuf_reset(&s->buf); - if (pipe_command(&filter_cp, - colored->buf, colored->len, - &s->buf, colored->len, - NULL, 0) < 0) - return error(_("failed to run '%s'"), - diff_filter); - strbuf_swap(colored, &s->buf); - } - - strbuf_complete_line(colored); - colored_p = colored->buf; - colored_pend = colored_p + colored->len; - } - argv_array_clear(&args); - - /* parse files and hunks */ - p = plain->buf; - pend = p + plain->len; - while (p != pend) { - char *eol = memchr(p, '\n', pend - p); - const char *deleted = NULL, *mode_change = NULL; - - if (!eol) - eol = pend; - - if (starts_with(p, "diff ")) { - s->file_diff_nr++; - ALLOC_GROW(s->file_diff, s->file_diff_nr, - file_diff_alloc); - file_diff = s->file_diff + s->file_diff_nr - 1; - memset(file_diff, 0, sizeof(*file_diff)); - hunk = &file_diff->head; - hunk->start = p - plain->buf; - if (colored_p) - hunk->colored_start = colored_p - colored->buf; - marker = '\0'; - } else if (p == plain->buf) - BUG("diff starts with unexpected line:\n" - "%.*s\n", (int)(eol - p), p); - else if (file_diff->deleted) - ; /* keep the rest of the file in a single "hunk" */ - else if (starts_with(p, "@@ ") || - (hunk == &file_diff->head && - skip_prefix(p, "deleted file", &deleted))) { - if (marker == '-' || marker == '+') - /* - * Should not happen; previous hunk did not end - * in a context line? Handle it anyway. - */ - hunk->splittable_into++; - - file_diff->hunk_nr++; - ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr, - file_diff->hunk_alloc); - hunk = file_diff->hunk + file_diff->hunk_nr - 1; - memset(hunk, 0, sizeof(*hunk)); - - hunk->start = p - plain->buf; - if (colored) - hunk->colored_start = colored_p - colored->buf; - - if (deleted) - file_diff->deleted = 1; - else if (parse_hunk_header(s, hunk) < 0) - return -1; - - /* - * Start counting into how many hunks this one can be - * split - */ - marker = *p; - } else if (hunk == &file_diff->head && - skip_prefix(p, "old mode ", &mode_change) && - is_octal(mode_change, eol - mode_change)) { - if (file_diff->mode_change) - BUG("double mode change?\n\n%.*s", - (int)(eol - plain->buf), plain->buf); - if (file_diff->hunk_nr++) - BUG("mode change in the middle?\n\n%.*s", - (int)(eol - plain->buf), plain->buf); - - /* - * Do *not* change `hunk`: the mode change pseudo-hunk - * is _part of_ the header "hunk". - */ - file_diff->mode_change = 1; - ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr, - file_diff->hunk_alloc); - memset(file_diff->hunk, 0, sizeof(struct hunk)); - file_diff->hunk->start = p - plain->buf; - if (colored_p) - file_diff->hunk->colored_start = - colored_p - colored->buf; - } else if (hunk == &file_diff->head && - skip_prefix(p, "new mode ", &mode_change) && - is_octal(mode_change, eol - mode_change)) { - - /* - * Extend the "mode change" pseudo-hunk to include also - * the "new mode" line. - */ - if (!file_diff->mode_change) - BUG("'new mode' without 'old mode'?\n\n%.*s", - (int)(eol - plain->buf), plain->buf); - if (file_diff->hunk_nr != 1) - BUG("mode change in the middle?\n\n%.*s", - (int)(eol - plain->buf), plain->buf); - if (p - plain->buf != file_diff->hunk->end) - BUG("'new mode' does not immediately follow " - "'old mode'?\n\n%.*s", - (int)(eol - plain->buf), plain->buf); - } else if (hunk == &file_diff->head && - starts_with(p, "Binary files ")) - file_diff->binary = 1; - - if (file_diff->deleted && file_diff->mode_change) - BUG("diff contains delete *and* a mode change?!?\n%.*s", - (int)(eol - (plain->buf + file_diff->head.start)), - plain->buf + file_diff->head.start); - - if ((marker == '-' || marker == '+') && *p == ' ') - hunk->splittable_into++; - if (marker && *p != '\\') - marker = *p; - - p = eol == pend ? pend : eol + 1; - hunk->end = p - plain->buf; - - if (colored) { - char *colored_eol = memchr(colored_p, '\n', - colored_pend - colored_p); - if (colored_eol) - colored_p = colored_eol + 1; - else if (p != pend) - /* colored shorter than non-colored? */ - goto mismatched_output; - else - colored_p = colored_pend; - - hunk->colored_end = colored_p - colored->buf; - } - - if (mode_change) { - if (file_diff->hunk_nr != 1) - BUG("mode change in hunk #%d???", - (int)file_diff->hunk_nr); - /* Adjust the end of the "mode change" pseudo-hunk */ - file_diff->hunk->end = hunk->end; - if (colored) - file_diff->hunk->colored_end = hunk->colored_end; - } - } - - if (marker == '-' || marker == '+') - /* - * Last hunk ended in non-context line (i.e. it appended lines - * to the file, so there are no trailing context lines). - */ - hunk->splittable_into++; - - /* non-colored shorter than colored? */ - if (colored_p != colored_pend) { -mismatched_output: - error(_("mismatched output from interactive.diffFilter")); - advise(_("Your filter must maintain a one-to-one correspondence\n" - "between its input and output lines.")); - return -1; - } - - return 0; -} - -static size_t find_next_line(struct strbuf *sb, size_t offset) -{ - char *eol; - - if (offset >= sb->len) - BUG("looking for next line beyond buffer (%d >= %d)\n%s", - (int)offset, (int)sb->len, sb->buf); - - eol = memchr(sb->buf + offset, '\n', sb->len - offset); - if (!eol) - return sb->len; - return eol - sb->buf + 1; -} - -static void render_hunk(struct add_p_state *s, struct hunk *hunk, - ssize_t delta, int colored, struct strbuf *out) -{ - struct hunk_header *header = &hunk->header; - - if (hunk->header.old_offset != 0 || hunk->header.new_offset != 0) { - /* - * Generate the hunk header dynamically, except for special - * hunks (such as the diff header). - */ - const char *p; - size_t len; - unsigned long old_offset = header->old_offset; - unsigned long new_offset = header->new_offset; - - if (!colored) { - p = s->plain.buf + header->extra_start; - len = header->extra_end - header->extra_start; - } else { - strbuf_addstr(out, s->s.fraginfo_color); - p = s->colored.buf + header->colored_extra_start; - len = header->colored_extra_end - - header->colored_extra_start; - } - - if (s->mode->is_reverse) - old_offset -= delta; - else - new_offset += delta; - - strbuf_addf(out, "@@ -%lu,%lu +%lu,%lu @@", - old_offset, header->old_count, - new_offset, header->new_count); - if (len) - strbuf_add(out, p, len); - else if (colored) - strbuf_addf(out, "%s\n", GIT_COLOR_RESET); - else - strbuf_addch(out, '\n'); - } - - if (colored) - strbuf_add(out, s->colored.buf + hunk->colored_start, - hunk->colored_end - hunk->colored_start); - else - strbuf_add(out, s->plain.buf + hunk->start, - hunk->end - hunk->start); -} - -static void render_diff_header(struct add_p_state *s, - struct file_diff *file_diff, int colored, - struct strbuf *out) -{ - /* - * If there was a mode change, the first hunk is a pseudo hunk that - * corresponds to the mode line in the header. If the user did not want - * to stage that "hunk", we actually have to cut it out from the header. - */ - int skip_mode_change = - file_diff->mode_change && file_diff->hunk->use != USE_HUNK; - struct hunk *head = &file_diff->head, *first = file_diff->hunk; - - if (!skip_mode_change) { - render_hunk(s, head, 0, colored, out); - return; - } - - if (colored) { - const char *p = s->colored.buf; - - strbuf_add(out, p + head->colored_start, - first->colored_start - head->colored_start); - strbuf_add(out, p + first->colored_end, - head->colored_end - first->colored_end); - } else { - const char *p = s->plain.buf; - - strbuf_add(out, p + head->start, first->start - head->start); - strbuf_add(out, p + first->end, head->end - first->end); - } -} - -/* Coalesce hunks again that were split */ -static int merge_hunks(struct add_p_state *s, struct file_diff *file_diff, - size_t *hunk_index, int use_all, struct hunk *merged) -{ - size_t i = *hunk_index, delta; - struct hunk *hunk = file_diff->hunk + i; - /* `header` corresponds to the merged hunk */ - struct hunk_header *header = &merged->header, *next; - - if (!use_all && hunk->use != USE_HUNK) - return 0; - - *merged = *hunk; - /* We simply skip the colored part (if any) when merging hunks */ - merged->colored_start = merged->colored_end = 0; - - for (; i + 1 < file_diff->hunk_nr; i++) { - hunk++; - next = &hunk->header; - - /* - * Stop merging hunks when: - * - * - the hunk is not selected for use, or - * - the hunk does not overlap with the already-merged hunk(s) - */ - if ((!use_all && hunk->use != USE_HUNK) || - header->new_offset >= next->new_offset + merged->delta || - header->new_offset + header->new_count - < next->new_offset + merged->delta) - break; - - /* - * If the hunks were not edited, and overlap, we can simply - * extend the line range. - */ - if (merged->start < hunk->start && merged->end > hunk->start) { - merged->end = hunk->end; - merged->colored_end = hunk->colored_end; - delta = 0; - } else { - const char *plain = s->plain.buf; - size_t overlapping_line_count = header->new_offset - + header->new_count - merged->delta - - next->new_offset; - size_t overlap_end = hunk->start; - size_t overlap_start = overlap_end; - size_t overlap_next, len, j; - - /* - * One of the hunks was edited: the modified hunk was - * appended to the strbuf `s->plain`. - * - * Let's ensure that at least the last context line of - * the first hunk overlaps with the corresponding line - * of the second hunk, and then merge. - */ - for (j = 0; j < overlapping_line_count; j++) { - overlap_next = find_next_line(&s->plain, - overlap_end); - - if (overlap_next > hunk->end) - BUG("failed to find %d context lines " - "in:\n%.*s", - (int)overlapping_line_count, - (int)(hunk->end - hunk->start), - plain + hunk->start); - - if (plain[overlap_end] != ' ') - return error(_("expected context line " - "#%d in\n%.*s"), - (int)(j + 1), - (int)(hunk->end - - hunk->start), - plain + hunk->start); - - overlap_start = overlap_end; - overlap_end = overlap_next; - } - len = overlap_end - overlap_start; - - if (len > merged->end - merged->start || - memcmp(plain + merged->end - len, - plain + overlap_start, len)) - return error(_("hunks do not overlap:\n%.*s\n" - "\tdoes not end with:\n%.*s"), - (int)(merged->end - merged->start), - plain + merged->start, - (int)len, plain + overlap_start); - - /* - * Since the start-end ranges are not adjacent, we - * cannot simply take the union of the ranges. To - * address that, we temporarily append the union of the - * lines to the `plain` strbuf. - */ - if (merged->end != s->plain.len) { - size_t start = s->plain.len; - - strbuf_add(&s->plain, plain + merged->start, - merged->end - merged->start); - plain = s->plain.buf; - merged->start = start; - merged->end = s->plain.len; - } - - strbuf_add(&s->plain, - plain + overlap_end, - hunk->end - overlap_end); - merged->end = s->plain.len; - merged->splittable_into += hunk->splittable_into; - delta = merged->delta; - merged->delta += hunk->delta; - } - - header->old_count = next->old_offset + next->old_count - - header->old_offset; - header->new_count = next->new_offset + delta - + next->new_count - header->new_offset; - } - - if (i == *hunk_index) - return 0; - - *hunk_index = i; - return 1; -} - -static void reassemble_patch(struct add_p_state *s, - struct file_diff *file_diff, int use_all, - struct strbuf *out) -{ - struct hunk *hunk; - size_t save_len = s->plain.len, i; - ssize_t delta = 0; - - render_diff_header(s, file_diff, 0, out); - - for (i = file_diff->mode_change; i < file_diff->hunk_nr; i++) { - struct hunk merged = { 0 }; - - hunk = file_diff->hunk + i; - if (!use_all && hunk->use != USE_HUNK) - delta += hunk->header.old_count - - hunk->header.new_count; - else { - /* merge overlapping hunks into a temporary hunk */ - if (merge_hunks(s, file_diff, &i, use_all, &merged)) - hunk = &merged; - - render_hunk(s, hunk, delta, 0, out); - - /* - * In case `merge_hunks()` used `plain` as a scratch - * pad (this happens when an edited hunk had to be - * coalesced with another hunk). - */ - strbuf_setlen(&s->plain, save_len); - - delta += hunk->delta; - } - } -} - -static int split_hunk(struct add_p_state *s, struct file_diff *file_diff, - size_t hunk_index) -{ - int colored = !!s->colored.len, first = 1; - struct hunk *hunk = file_diff->hunk + hunk_index; - size_t splittable_into; - size_t end, colored_end, current, colored_current = 0, context_line_count; - struct hunk_header remaining, *header; - char marker, ch; - - if (hunk_index >= file_diff->hunk_nr) - BUG("invalid hunk index: %d (must be >= 0 and < %d)", - (int)hunk_index, (int)file_diff->hunk_nr); - - if (hunk->splittable_into < 2) - return 0; - splittable_into = hunk->splittable_into; - - end = hunk->end; - colored_end = hunk->colored_end; - - remaining = hunk->header; - - file_diff->hunk_nr += splittable_into - 1; - ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr, file_diff->hunk_alloc); - if (hunk_index + splittable_into < file_diff->hunk_nr) - memmove(file_diff->hunk + hunk_index + splittable_into, - file_diff->hunk + hunk_index + 1, - (file_diff->hunk_nr - hunk_index - splittable_into) - * sizeof(*hunk)); - hunk = file_diff->hunk + hunk_index; - hunk->splittable_into = 1; - memset(hunk + 1, 0, (splittable_into - 1) * sizeof(*hunk)); - - header = &hunk->header; - header->old_count = header->new_count = 0; - - current = hunk->start; - if (colored) - colored_current = hunk->colored_start; - marker = '\0'; - context_line_count = 0; - - while (splittable_into > 1) { - ch = s->plain.buf[current]; - - if (!ch) - BUG("buffer overrun while splitting hunks"); - - /* - * Is this the first context line after a chain of +/- lines? - * Then record the start of the next split hunk. - */ - if ((marker == '-' || marker == '+') && ch == ' ') { - first = 0; - hunk[1].start = current; - if (colored) - hunk[1].colored_start = colored_current; - context_line_count = 0; - } - - /* - * Was the previous line a +/- one? Alternatively, is this the - * first line (and not a +/- one)? - * - * Then just increment the appropriate counter and continue - * with the next line. - */ - if (marker != ' ' || (ch != '-' && ch != '+')) { -next_hunk_line: - /* Comment lines are attached to the previous line */ - if (ch == '\\') - ch = marker ? marker : ' '; - - /* current hunk not done yet */ - if (ch == ' ') - context_line_count++; - else if (ch == '-') - header->old_count++; - else if (ch == '+') - header->new_count++; - else - BUG("unhandled diff marker: '%c'", ch); - marker = ch; - current = find_next_line(&s->plain, current); - if (colored) - colored_current = - find_next_line(&s->colored, - colored_current); - continue; - } - - /* - * We got us the start of a new hunk! - * - * This is a context line, so it is shared with the previous - * hunk, if any. - */ - - if (first) { - if (header->old_count || header->new_count) - BUG("counts are off: %d/%d", - (int)header->old_count, - (int)header->new_count); - - header->old_count = context_line_count; - header->new_count = context_line_count; - context_line_count = 0; - first = 0; - goto next_hunk_line; - } - - remaining.old_offset += header->old_count; - remaining.old_count -= header->old_count; - remaining.new_offset += header->new_count; - remaining.new_count -= header->new_count; - - /* initialize next hunk header's offsets */ - hunk[1].header.old_offset = - header->old_offset + header->old_count; - hunk[1].header.new_offset = - header->new_offset + header->new_count; - - /* add one split hunk */ - header->old_count += context_line_count; - header->new_count += context_line_count; - - hunk->end = current; - if (colored) - hunk->colored_end = colored_current; - - hunk++; - hunk->splittable_into = 1; - hunk->use = hunk[-1].use; - header = &hunk->header; - - header->old_count = header->new_count = context_line_count; - context_line_count = 0; - - splittable_into--; - marker = ch; - } - - /* last hunk simply gets the rest */ - if (header->old_offset != remaining.old_offset) - BUG("miscounted old_offset: %lu != %lu", - header->old_offset, remaining.old_offset); - if (header->new_offset != remaining.new_offset) - BUG("miscounted new_offset: %lu != %lu", - header->new_offset, remaining.new_offset); - header->old_count = remaining.old_count; - header->new_count = remaining.new_count; - hunk->end = end; - if (colored) - hunk->colored_end = colored_end; - - return 0; -} - -static void recolor_hunk(struct add_p_state *s, struct hunk *hunk) -{ - const char *plain = s->plain.buf; - size_t current, eol, next; - - if (!s->colored.len) - return; - - hunk->colored_start = s->colored.len; - for (current = hunk->start; current < hunk->end; ) { - for (eol = current; eol < hunk->end; eol++) - if (plain[eol] == '\n') - break; - next = eol + (eol < hunk->end); - if (eol > current && plain[eol - 1] == '\r') - eol--; - - strbuf_addstr(&s->colored, - plain[current] == '-' ? - s->s.file_old_color : - plain[current] == '+' ? - s->s.file_new_color : - s->s.context_color); - strbuf_add(&s->colored, plain + current, eol - current); - strbuf_addstr(&s->colored, GIT_COLOR_RESET); - if (next > eol) - strbuf_add(&s->colored, plain + eol, next - eol); - current = next; - } - hunk->colored_end = s->colored.len; -} - -static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk) -{ - size_t i; - - strbuf_reset(&s->buf); - strbuf_commented_addf(&s->buf, _("Manual hunk edit mode -- see bottom for " - "a quick guide.\n")); - render_hunk(s, hunk, 0, 0, &s->buf); - strbuf_commented_addf(&s->buf, - _("---\n" - "To remove '%c' lines, make them ' ' lines " - "(context).\n" - "To remove '%c' lines, delete them.\n" - "Lines starting with %c will be removed.\n"), - s->mode->is_reverse ? '+' : '-', - s->mode->is_reverse ? '-' : '+', - comment_line_char); - strbuf_commented_addf(&s->buf, "%s", _(s->mode->edit_hunk_hint)); - /* - * TRANSLATORS: 'it' refers to the patch mentioned in the previous - * messages. - */ - strbuf_commented_addf(&s->buf, - _("If it does not apply cleanly, you will be " - "given an opportunity to\n" - "edit again. If all lines of the hunk are " - "removed, then the edit is\n" - "aborted and the hunk is left unchanged.\n")); - - if (strbuf_edit_interactively(&s->buf, "addp-hunk-edit.diff", NULL) < 0) - return -1; - - /* strip out commented lines */ - hunk->start = s->plain.len; - for (i = 0; i < s->buf.len; ) { - size_t next = find_next_line(&s->buf, i); - - if (s->buf.buf[i] != comment_line_char) - strbuf_add(&s->plain, s->buf.buf + i, next - i); - i = next; - } - - hunk->end = s->plain.len; - if (hunk->end == hunk->start) - /* The user aborted editing by deleting everything */ - return 0; - - recolor_hunk(s, hunk); - - /* - * If the hunk header is intact, parse it, otherwise simply use the - * hunk header prior to editing (which will adjust `hunk->start` to - * skip the hunk header). - */ - if (s->plain.buf[hunk->start] == '@' && - parse_hunk_header(s, hunk) < 0) - return error(_("could not parse hunk header")); - - return 1; -} - -static ssize_t recount_edited_hunk(struct add_p_state *s, struct hunk *hunk, - size_t orig_old_count, size_t orig_new_count) -{ - struct hunk_header *header = &hunk->header; - size_t i; - - header->old_count = header->new_count = 0; - for (i = hunk->start; i < hunk->end; ) { - switch (s->plain.buf[i]) { - case '-': - header->old_count++; - break; - case '+': - header->new_count++; - break; - case ' ': case '\r': case '\n': - header->old_count++; - header->new_count++; - break; - } - - i = find_next_line(&s->plain, i); - } - - return orig_old_count - orig_new_count - - header->old_count + header->new_count; -} - -static int run_apply_check(struct add_p_state *s, - struct file_diff *file_diff) -{ - struct child_process cp = CHILD_PROCESS_INIT; - - strbuf_reset(&s->buf); - reassemble_patch(s, file_diff, 1, &s->buf); - - setup_child_process(s, &cp, - "apply", "--check", NULL); - argv_array_pushv(&cp.args, s->mode->apply_check_args); - if (pipe_command(&cp, s->buf.buf, s->buf.len, NULL, 0, NULL, 0)) - return error(_("'git apply --cached' failed")); - - return 0; -} - -static int read_single_character(struct add_p_state *s) -{ - if (s->s.use_single_key) { - int res = read_key_without_echo(&s->answer); - printf("%s\n", res == EOF ? "" : s->answer.buf); - return res; - } - - if (strbuf_getline(&s->answer, stdin) == EOF) - return EOF; - strbuf_trim_trailing_newline(&s->answer); - return 0; -} - -static int prompt_yesno(struct add_p_state *s, const char *prompt) -{ - for (;;) { - color_fprintf(stdout, s->s.prompt_color, "%s", _(prompt)); - fflush(stdout); - if (read_single_character(s) == EOF) - return -1; - switch (tolower(s->answer.buf[0])) { - case 'n': return 0; - case 'y': return 1; - } - } -} - -static int edit_hunk_loop(struct add_p_state *s, - struct file_diff *file_diff, struct hunk *hunk) -{ - size_t plain_len = s->plain.len, colored_len = s->colored.len; - struct hunk backup; - - backup = *hunk; - - for (;;) { - int res = edit_hunk_manually(s, hunk); - if (res == 0) { - /* abandonded */ - *hunk = backup; - return -1; - } - - if (res > 0) { - hunk->delta += - recount_edited_hunk(s, hunk, - backup.header.old_count, - backup.header.new_count); - if (!run_apply_check(s, file_diff)) - return 0; - } - - /* Drop edits (they were appended to s->plain) */ - strbuf_setlen(&s->plain, plain_len); - strbuf_setlen(&s->colored, colored_len); - *hunk = backup; - - /* - * TRANSLATORS: do not translate [y/n] - * The program will only accept that input at this point. - * Consider translating (saying "no" discards!) as - * (saying "n" for "no" discards!) if the translation - * of the word "no" does not start with n. - */ - res = prompt_yesno(s, _("Your edited hunk does not apply. " - "Edit again (saying \"no\" discards!) " - "[y/n]? ")); - if (res < 1) - return -1; - } -} - -static int apply_for_checkout(struct add_p_state *s, struct strbuf *diff, - int is_reverse) -{ - const char *reverse = is_reverse ? "-R" : NULL; - struct child_process check_index = CHILD_PROCESS_INIT; - struct child_process check_worktree = CHILD_PROCESS_INIT; - struct child_process apply_index = CHILD_PROCESS_INIT; - struct child_process apply_worktree = CHILD_PROCESS_INIT; - int applies_index, applies_worktree; - - setup_child_process(s, &check_index, - "apply", "--cached", "--check", reverse, NULL); - applies_index = !pipe_command(&check_index, diff->buf, diff->len, - NULL, 0, NULL, 0); - - setup_child_process(s, &check_worktree, - "apply", "--check", reverse, NULL); - applies_worktree = !pipe_command(&check_worktree, diff->buf, diff->len, - NULL, 0, NULL, 0); - - if (applies_worktree && applies_index) { - setup_child_process(s, &apply_index, - "apply", "--cached", reverse, NULL); - pipe_command(&apply_index, diff->buf, diff->len, - NULL, 0, NULL, 0); - - setup_child_process(s, &apply_worktree, - "apply", reverse, NULL); - pipe_command(&apply_worktree, diff->buf, diff->len, - NULL, 0, NULL, 0); - - return 1; - } - - if (!applies_index) { - err(s, _("The selected hunks do not apply to the index!")); - if (prompt_yesno(s, _("Apply them to the worktree " - "anyway? ")) > 0) { - setup_child_process(s, &apply_worktree, - "apply", reverse, NULL); - return pipe_command(&apply_worktree, diff->buf, - diff->len, NULL, 0, NULL, 0); - } - err(s, _("Nothing was applied.\n")); - } else - /* As a last resort, show the diff to the user */ - fwrite(diff->buf, diff->len, 1, stderr); - - return 0; -} - -#define SUMMARY_HEADER_WIDTH 20 -#define SUMMARY_LINE_WIDTH 80 -static void summarize_hunk(struct add_p_state *s, struct hunk *hunk, - struct strbuf *out) -{ - struct hunk_header *header = &hunk->header; - struct strbuf *plain = &s->plain; - size_t len = out->len, i; - - strbuf_addf(out, " -%lu,%lu +%lu,%lu ", - header->old_offset, header->old_count, - header->new_offset, header->new_count); - if (out->len - len < SUMMARY_HEADER_WIDTH) - strbuf_addchars(out, ' ', - SUMMARY_HEADER_WIDTH + len - out->len); - for (i = hunk->start; i < hunk->end; i = find_next_line(plain, i)) - if (plain->buf[i] != ' ') - break; - if (i < hunk->end) - strbuf_add(out, plain->buf + i, find_next_line(plain, i) - i); - if (out->len - len > SUMMARY_LINE_WIDTH) - strbuf_setlen(out, len + SUMMARY_LINE_WIDTH); - strbuf_complete_line(out); -} - -#define DISPLAY_HUNKS_LINES 20 -static size_t display_hunks(struct add_p_state *s, - struct file_diff *file_diff, size_t start_index) -{ - size_t end_index = start_index + DISPLAY_HUNKS_LINES; - - if (end_index > file_diff->hunk_nr) - end_index = file_diff->hunk_nr; - - while (start_index < end_index) { - struct hunk *hunk = file_diff->hunk + start_index++; - - strbuf_reset(&s->buf); - strbuf_addf(&s->buf, "%c%2d: ", hunk->use == USE_HUNK ? '+' - : hunk->use == SKIP_HUNK ? '-' : ' ', - (int)start_index); - summarize_hunk(s, hunk, &s->buf); - fputs(s->buf.buf, stdout); - } - - return end_index; -} - -static const char help_patch_remainder[] = -N_("j - leave this hunk undecided, see next undecided hunk\n" - "J - leave this hunk undecided, see next hunk\n" - "k - leave this hunk undecided, see previous undecided hunk\n" - "K - leave this hunk undecided, see previous hunk\n" - "g - select a hunk to go to\n" - "/ - search for a hunk matching the given regex\n" - "s - split the current hunk into smaller hunks\n" - "e - manually edit the current hunk\n" - "? - print help\n"); - -static int patch_update_file(struct add_p_state *s, - struct file_diff *file_diff) -{ - size_t hunk_index = 0; - ssize_t i, undecided_previous, undecided_next; - struct hunk *hunk; - char ch; - struct child_process cp = CHILD_PROCESS_INIT; - int colored = !!s->colored.len, quit = 0; - enum prompt_mode_type prompt_mode_type; - - if (!file_diff->hunk_nr) - return 0; - - strbuf_reset(&s->buf); - render_diff_header(s, file_diff, colored, &s->buf); - fputs(s->buf.buf, stdout); - for (;;) { - if (hunk_index >= file_diff->hunk_nr) - hunk_index = 0; - hunk = file_diff->hunk + hunk_index; - - undecided_previous = -1; - for (i = hunk_index - 1; i >= 0; i--) - if (file_diff->hunk[i].use == UNDECIDED_HUNK) { - undecided_previous = i; - break; - } - - undecided_next = -1; - for (i = hunk_index + 1; i < file_diff->hunk_nr; i++) - if (file_diff->hunk[i].use == UNDECIDED_HUNK) { - undecided_next = i; - break; - } - - /* Everything decided? */ - if (undecided_previous < 0 && undecided_next < 0 && - hunk->use != UNDECIDED_HUNK) - break; - - strbuf_reset(&s->buf); - render_hunk(s, hunk, 0, colored, &s->buf); - fputs(s->buf.buf, stdout); - - strbuf_reset(&s->buf); - if (undecided_previous >= 0) - strbuf_addstr(&s->buf, ",k"); - if (hunk_index) - strbuf_addstr(&s->buf, ",K"); - if (undecided_next >= 0) - strbuf_addstr(&s->buf, ",j"); - if (hunk_index + 1 < file_diff->hunk_nr) - strbuf_addstr(&s->buf, ",J"); - if (file_diff->hunk_nr > 1) - strbuf_addstr(&s->buf, ",g,/"); - if (hunk->splittable_into > 1) - strbuf_addstr(&s->buf, ",s"); - if (hunk_index + 1 > file_diff->mode_change && - !file_diff->deleted) - strbuf_addstr(&s->buf, ",e"); - - if (file_diff->deleted) - prompt_mode_type = PROMPT_DELETION; - else if (file_diff->mode_change && !hunk_index) - prompt_mode_type = PROMPT_MODE_CHANGE; - else - prompt_mode_type = PROMPT_HUNK; - - color_fprintf(stdout, s->s.prompt_color, - "(%"PRIuMAX"/%"PRIuMAX") ", - (uintmax_t)hunk_index + 1, - (uintmax_t)file_diff->hunk_nr); - color_fprintf(stdout, s->s.prompt_color, - _(s->mode->prompt_mode[prompt_mode_type]), - s->buf.buf); - fflush(stdout); - if (read_single_character(s) == EOF) - break; - - if (!s->answer.len) - continue; - ch = tolower(s->answer.buf[0]); - if (ch == 'y') { - hunk->use = USE_HUNK; -soft_increment: - hunk_index = undecided_next < 0 ? - file_diff->hunk_nr : undecided_next; - } else if (ch == 'n') { - hunk->use = SKIP_HUNK; - goto soft_increment; - } else if (ch == 'a') { - for (; hunk_index < file_diff->hunk_nr; hunk_index++) { - hunk = file_diff->hunk + hunk_index; - if (hunk->use == UNDECIDED_HUNK) - hunk->use = USE_HUNK; - } - } else if (ch == 'd' || ch == 'q') { - for (; hunk_index < file_diff->hunk_nr; hunk_index++) { - hunk = file_diff->hunk + hunk_index; - if (hunk->use == UNDECIDED_HUNK) - hunk->use = SKIP_HUNK; - } - if (ch == 'q') { - quit = 1; - break; - } - } else if (s->answer.buf[0] == 'K') { - if (hunk_index) - hunk_index--; - else - err(s, _("No previous hunk")); - } else if (s->answer.buf[0] == 'J') { - if (hunk_index + 1 < file_diff->hunk_nr) - hunk_index++; - else - err(s, _("No next hunk")); - } else if (s->answer.buf[0] == 'k') { - if (undecided_previous >= 0) - hunk_index = undecided_previous; - else - err(s, _("No previous hunk")); - } else if (s->answer.buf[0] == 'j') { - if (undecided_next >= 0) - hunk_index = undecided_next; - else - err(s, _("No next hunk")); - } else if (s->answer.buf[0] == 'g') { - char *pend; - unsigned long response; - - if (file_diff->hunk_nr < 2) { - err(s, _("No other hunks to goto")); - continue; - } - strbuf_remove(&s->answer, 0, 1); - strbuf_trim(&s->answer); - i = hunk_index - DISPLAY_HUNKS_LINES / 2; - if (i < file_diff->mode_change) - i = file_diff->mode_change; - while (s->answer.len == 0) { - i = display_hunks(s, file_diff, i); - printf("%s", i < file_diff->hunk_nr ? - _("go to which hunk (<ret> to see " - "more)? ") : _("go to which hunk? ")); - fflush(stdout); - if (strbuf_getline(&s->answer, - stdin) == EOF) - break; - strbuf_trim_trailing_newline(&s->answer); - } - - strbuf_trim(&s->answer); - response = strtoul(s->answer.buf, &pend, 10); - if (*pend || pend == s->answer.buf) - err(s, _("Invalid number: '%s'"), - s->answer.buf); - else if (0 < response && response <= file_diff->hunk_nr) - hunk_index = response - 1; - else - err(s, Q_("Sorry, only %d hunk available.", - "Sorry, only %d hunks available.", - file_diff->hunk_nr), - (int)file_diff->hunk_nr); - } else if (s->answer.buf[0] == '/') { - regex_t regex; - int ret; - - if (file_diff->hunk_nr < 2) { - err(s, _("No other hunks to search")); - continue; - } - strbuf_remove(&s->answer, 0, 1); - strbuf_trim_trailing_newline(&s->answer); - if (s->answer.len == 0) { - printf("%s", _("search for regex? ")); - fflush(stdout); - if (strbuf_getline(&s->answer, - stdin) == EOF) - break; - strbuf_trim_trailing_newline(&s->answer); - if (s->answer.len == 0) - continue; - } - ret = regcomp(®ex, s->answer.buf, - REG_EXTENDED | REG_NOSUB | REG_NEWLINE); - if (ret) { - char errbuf[1024]; - - regerror(ret, ®ex, errbuf, sizeof(errbuf)); - err(s, _("Malformed search regexp %s: %s"), - s->answer.buf, errbuf); - continue; - } - i = hunk_index; - for (;;) { - /* render the hunk into a scratch buffer */ - render_hunk(s, file_diff->hunk + i, 0, 0, - &s->buf); - if (regexec(®ex, s->buf.buf, 0, NULL, 0) - != REG_NOMATCH) - break; - i++; - if (i == file_diff->hunk_nr) - i = 0; - if (i != hunk_index) - continue; - err(s, _("No hunk matches the given pattern")); - break; - } - hunk_index = i; - } else if (s->answer.buf[0] == 's') { - size_t splittable_into = hunk->splittable_into; - if (splittable_into < 2) - err(s, _("Sorry, cannot split this hunk")); - else if (!split_hunk(s, file_diff, - hunk - file_diff->hunk)) - color_fprintf_ln(stdout, s->s.header_color, - _("Split into %d hunks."), - (int)splittable_into); - } else if (s->answer.buf[0] == 'e') { - if (hunk_index + 1 == file_diff->mode_change) - err(s, _("Sorry, cannot edit this hunk")); - else if (edit_hunk_loop(s, file_diff, hunk) >= 0) { - hunk->use = USE_HUNK; - goto soft_increment; - } - } else { - const char *p = _(help_patch_remainder), *eol = p; - - color_fprintf(stdout, s->s.help_color, "%s", - _(s->mode->help_patch_text)); - - /* - * Show only those lines of the remainder that are - * actually applicable with the current hunk. - */ - for (; *p; p = eol + (*eol == '\n')) { - eol = strchrnul(p, '\n'); - - /* - * `s->buf` still contains the part of the - * commands shown in the prompt that are not - * always available. - */ - if (*p != '?' && !strchr(s->buf.buf, *p)) - continue; - - color_fprintf_ln(stdout, s->s.help_color, - "%.*s", (int)(eol - p), p); - } - } - } - - /* Any hunk to be used? */ - for (i = 0; i < file_diff->hunk_nr; i++) - if (file_diff->hunk[i].use == USE_HUNK) - break; - - if (i < file_diff->hunk_nr) { - /* At least one hunk selected: apply */ - strbuf_reset(&s->buf); - reassemble_patch(s, file_diff, 0, &s->buf); - - discard_index(s->s.r->index); - if (s->mode->apply_for_checkout) - apply_for_checkout(s, &s->buf, - s->mode->is_reverse); - else { - setup_child_process(s, &cp, "apply", NULL); - argv_array_pushv(&cp.args, s->mode->apply_args); - if (pipe_command(&cp, s->buf.buf, s->buf.len, - NULL, 0, NULL, 0)) - error(_("'git apply' failed")); - } - if (!repo_read_index(s->s.r)) - repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0, - 1, NULL, NULL, NULL); - } - - putchar('\n'); - return quit; -} - -int run_add_p(struct repository *r, enum add_p_mode mode, - const char *revision, const struct pathspec *ps) -{ - struct add_p_state s = { - { r }, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT - }; - size_t i, binary_count = 0; - - init_add_i_state(&s.s, r); - - if (mode == ADD_P_STASH) - s.mode = &patch_mode_stash; - else if (mode == ADD_P_RESET) { - if (!revision || !strcmp(revision, "HEAD")) - s.mode = &patch_mode_reset_head; - else - s.mode = &patch_mode_reset_nothead; - } else if (mode == ADD_P_CHECKOUT) { - if (!revision) - s.mode = &patch_mode_checkout_index; - else if (!strcmp(revision, "HEAD")) - s.mode = &patch_mode_checkout_head; - else - s.mode = &patch_mode_checkout_nothead; - } else if (mode == ADD_P_WORKTREE) { - if (!revision) - s.mode = &patch_mode_checkout_index; - else if (!strcmp(revision, "HEAD")) - s.mode = &patch_mode_worktree_head; - else - s.mode = &patch_mode_worktree_nothead; - } else - s.mode = &patch_mode_add; - s.revision = revision; - - if (discard_index(r->index) < 0 || repo_read_index(r) < 0 || - (!s.mode->index_only && - repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1, - NULL, NULL, NULL) < 0) || - parse_diff(&s, ps) < 0) { - strbuf_release(&s.plain); - strbuf_release(&s.colored); - clear_add_i_state(&s.s); - return -1; - } - - for (i = 0; i < s.file_diff_nr; i++) - if (s.file_diff[i].binary && !s.file_diff[i].hunk_nr) - binary_count++; - else if (patch_update_file(&s, s.file_diff + i)) - break; - - if (s.file_diff_nr == 0) - fprintf(stderr, _("No changes.\n")); - else if (binary_count == s.file_diff_nr) - fprintf(stderr, _("Only binary files changed.\n")); - - strbuf_release(&s.answer); - strbuf_release(&s.buf); - strbuf_release(&s.plain); - strbuf_release(&s.colored); - clear_add_i_state(&s.s); - return 0; -} diff --git a/third_party/git/advice.c b/third_party/git/advice.c index 97f3f981b4..3ee0ee2d8f 100644 --- a/third_party/git/advice.c +++ b/third_party/git/advice.c @@ -30,9 +30,6 @@ int advice_waiting_for_editor = 1; int advice_graft_file_deprecated = 1; int advice_checkout_ambiguous_remote_branch_name = 1; int advice_nested_tag = 1; -int advice_submodule_alternate_error_strategy_die = 1; -int advice_add_ignored_file = 1; -int advice_add_empty_pathspec = 1; static int advice_use_color = -1; static char advice_colors[][COLOR_MAXLEN] = { @@ -92,9 +89,6 @@ static struct { { "graftFileDeprecated", &advice_graft_file_deprecated }, { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name }, { "nestedTag", &advice_nested_tag }, - { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die }, - { "addIgnoredFile", &advice_add_ignored_file }, - { "addEmptyPathspec", &advice_add_empty_pathspec }, /* make this an alias for backward compatibility */ { "pushNonFastForward", &advice_push_update_rejected } diff --git a/third_party/git/advice.h b/third_party/git/advice.h index 0e6e58d9f8..d015404843 100644 --- a/third_party/git/advice.h +++ b/third_party/git/advice.h @@ -30,9 +30,6 @@ extern int advice_waiting_for_editor; extern int advice_graft_file_deprecated; extern int advice_checkout_ambiguous_remote_branch_name; extern int advice_nested_tag; -extern int advice_submodule_alternate_error_strategy_die; -extern int advice_add_ignored_file; -extern int advice_add_empty_pathspec; int git_default_advice_config(const char *var, const char *value); __attribute__((format (printf, 1, 2))) diff --git a/third_party/git/apply.c b/third_party/git/apply.c index bdc008fae2..cde95369bb 100644 --- a/third_party/git/apply.c +++ b/third_party/git/apply.c @@ -32,7 +32,7 @@ static void git_apply_config(void) { git_config_get_string_const("apply.whitespace", &apply_default_whitespace); git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace); - git_config(git_xmerge_config, NULL); + git_config(git_default_config, NULL); } static int parse_whitespace_option(struct apply_state *state, const char *option) @@ -450,7 +450,7 @@ static char *find_name_gnu(struct strbuf *root, /* * Proposed "new-style" GNU patch/diff format; see - * https://lore.kernel.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/ + * https://public-inbox.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/ */ if (unquote_c_style(&name, line, NULL)) { strbuf_release(&name); @@ -1361,32 +1361,11 @@ int parse_git_diff_header(struct strbuf *root, if (check_header_line(*linenr, patch)) return -1; if (res > 0) - goto done; + return offset; break; } } -done: - if (!patch->old_name && !patch->new_name) { - if (!patch->def_name) { - error(Q_("git diff header lacks filename information when removing " - "%d leading pathname component (line %d)", - "git diff header lacks filename information when removing " - "%d leading pathname components (line %d)", - parse_hdr_state.p_value), - parse_hdr_state.p_value, *linenr); - return -128; - } - patch->old_name = xstrdup(patch->def_name); - patch->new_name = xstrdup(patch->def_name); - } - if ((!patch->new_name && !patch->is_delete) || - (!patch->old_name && !patch->is_new)) { - error(_("git diff header lacks filename information " - "(line %d)"), *linenr); - return -128; - } - patch->is_toplevel_relative = 1; return offset; } @@ -1567,6 +1546,26 @@ static int find_header(struct apply_state *state, return -128; if (git_hdr_len <= len) continue; + if (!patch->old_name && !patch->new_name) { + if (!patch->def_name) { + error(Q_("git diff header lacks filename information when removing " + "%d leading pathname component (line %d)", + "git diff header lacks filename information when removing " + "%d leading pathname components (line %d)", + state->p_value), + state->p_value, state->linenr); + return -128; + } + patch->old_name = xstrdup(patch->def_name); + patch->new_name = xstrdup(patch->def_name); + } + if ((!patch->new_name && !patch->is_delete) || + (!patch->old_name && !patch->is_new)) { + error(_("git diff header lacks filename information " + "(line %d)"), state->linenr); + return -128; + } + patch->is_toplevel_relative = 1; *hdrsize = git_hdr_len; return offset; } @@ -2662,16 +2661,6 @@ static int find_pos(struct apply_state *state, int backwards_lno, forwards_lno, current_lno; /* - * When running with --allow-overlap, it is possible that a hunk is - * seen that pretends to start at the beginning (but no longer does), - * and that *still* needs to match the end. So trust `match_end` more - * than `match_beginning`. - */ - if (state->allow_overlap && match_beginning && match_end && - img->nr - preimage->nr != 0) - match_beginning = 0; - - /* * If match_beginning or match_end is specified, there is no * point starting from a wrong line that will never match and * wander around and wait for a match at the specified end. @@ -3157,8 +3146,7 @@ static int apply_binary(struct apply_state *state, * See if the old one matches what the patch * applies to. */ - hash_object_file(the_hash_algo, img->buf, img->len, blob_type, - &oid); + hash_object_file(img->buf, img->len, blob_type, &oid); if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix)) return error(_("the patch applies to '%s' (%s), " "which does not match the " @@ -3203,8 +3191,7 @@ static int apply_binary(struct apply_state *state, name); /* verify that the result matches */ - hash_object_file(the_hash_algo, img->buf, img->len, blob_type, - &oid); + hash_object_file(img->buf, img->len, blob_type, &oid); if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix)) return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"), name, patch->new_oid_prefix, oid_to_hex(&oid)); @@ -4195,8 +4182,8 @@ static void show_rename_copy(struct patch *p) old_name = slash_old + 1; new_name = slash_new + 1; } - /* p->old_name through old_name is the common prefix, and old_name and - * new_name through the end of names are renames + /* p->old_name thru old_name is the common prefix, and old_name and new_name + * through the end of names are renames */ if (old_name != p->old_name) printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy, @@ -4656,7 +4643,6 @@ static int apply_patch(struct apply_state *state, struct patch *list = NULL, **listp = &list; int skipped_patch = 0; int res = 0; - int flush_attributes = 0; state->patch_input_file = filename; if (read_patch_file(&buf, fd) < 0) @@ -4684,14 +4670,6 @@ static int apply_patch(struct apply_state *state, patch_stats(state, patch); *listp = patch; listp = &patch->next; - - if ((patch->new_name && - ends_with_path_components(patch->new_name, - GITATTRIBUTES_FILE)) || - (patch->old_name && - ends_with_path_components(patch->old_name, - GITATTRIBUTES_FILE))) - flush_attributes = 1; } else { if (state->apply_verbosity > verbosity_normal) @@ -4768,8 +4746,6 @@ static int apply_patch(struct apply_state *state, if (state->summary && state->apply_verbosity > verbosity_silent) summary_patch_list(list); - if (flush_attributes) - reset_parsed_attributes(); end: free_patch_list(list); strbuf_release(&buf); diff --git a/third_party/git/apply.h b/third_party/git/apply.h index da3d95fa50..a795193435 100644 --- a/third_party/git/apply.h +++ b/third_party/git/apply.h @@ -1,7 +1,6 @@ #ifndef APPLY_H #define APPLY_H -#include "hash.h" #include "lockfile.h" #include "string-list.h" diff --git a/third_party/git/archive-tar.c b/third_party/git/archive-tar.c index 5a77701a15..3e53aac1e6 100644 --- a/third_party/git/archive-tar.c +++ b/third_party/git/archive-tar.c @@ -112,7 +112,7 @@ static void write_trailer(void) * queues up writes, so that all our write(2) calls write exactly one * full block; pads writes to RECORDSIZE */ -static int stream_blocked(struct repository *r, const struct object_id *oid) +static int stream_blocked(const struct object_id *oid) { struct git_istream *st; enum object_type type; @@ -120,7 +120,7 @@ static int stream_blocked(struct repository *r, const struct object_id *oid) char buf[BLOCKSIZE]; ssize_t readlen; - st = open_istream(r, oid, &type, &sz, NULL); + st = open_istream(oid, &type, &sz, NULL); if (!st) return error(_("cannot stream blob %s"), oid_to_hex(oid)); for (;;) { @@ -142,25 +142,19 @@ static int stream_blocked(struct repository *r, const struct object_id *oid) * string and appends it to a struct strbuf. */ static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword, - const char *value, size_t valuelen) + const char *value, unsigned int valuelen) { - size_t orig_len = sb->len; - size_t len, tmp; + int len, tmp; /* "%u %s=%s\n" */ len = 1 + 1 + strlen(keyword) + 1 + valuelen + 1; - for (tmp = 1; len / 10 >= tmp; tmp *= 10) + for (tmp = len; tmp > 9; tmp /= 10) len++; strbuf_grow(sb, len); - strbuf_addf(sb, "%"PRIuMAX" %s=", (uintmax_t)len, keyword); + strbuf_addf(sb, "%u %s=", len, keyword); strbuf_add(sb, value, valuelen); strbuf_addch(sb, '\n'); - - if (len != sb->len - orig_len) - BUG("pax extended header length miscalculated as %"PRIuMAX - ", should be %"PRIuMAX, - (uintmax_t)len, (uintmax_t)(sb->len - orig_len)); } /* @@ -324,7 +318,7 @@ static int write_tar_entry(struct archiver_args *args, if (buffer) write_blocked(buffer, size); else - err = stream_blocked(args->repo, oid); + err = stream_blocked(oid); } free(buffer); return err; diff --git a/third_party/git/archive-zip.c b/third_party/git/archive-zip.c index e9f426298b..4d66b5be6e 100644 --- a/third_party/git/archive-zip.c +++ b/third_party/git/archive-zip.c @@ -24,11 +24,6 @@ static unsigned int max_creator_version; #define ZIP_STREAM (1 << 3) #define ZIP_UTF8 (1 << 11) -enum zip_method { - ZIP_METHOD_STORE = 0, - ZIP_METHOD_DEFLATE = 8 -}; - struct zip_local_header { unsigned char magic[4]; unsigned char version[2]; @@ -296,7 +291,7 @@ static int write_zip_entry(struct archiver_args *args, unsigned long attr2; unsigned long compressed_size; unsigned long crc; - enum zip_method method; + int method; unsigned char *out; void *deflated = NULL; void *buffer; @@ -325,7 +320,7 @@ static int write_zip_entry(struct archiver_args *args, } if (S_ISDIR(mode) || S_ISGITLINK(mode)) { - method = ZIP_METHOD_STORE; + method = 0; attr2 = 16; out = NULL; size = 0; @@ -335,18 +330,17 @@ static int write_zip_entry(struct archiver_args *args, enum object_type type = oid_object_info(args->repo, oid, &size); - method = ZIP_METHOD_STORE; + method = 0; attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) : (mode & 0111) ? ((mode) << 16) : 0; if (S_ISLNK(mode) || (mode & 0111)) creator_version = 0x0317; if (S_ISREG(mode) && args->compression_level != 0 && size > 0) - method = ZIP_METHOD_DEFLATE; + method = 8; if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert && size > big_file_threshold) { - stream = open_istream(args->repo, oid, &type, &size, - NULL); + stream = open_istream(oid, &type, &size, NULL); if (!stream) return error(_("cannot stream blob %s"), oid_to_hex(oid)); @@ -364,7 +358,7 @@ static int write_zip_entry(struct archiver_args *args, buffer, size); out = buffer; } - compressed_size = (method == ZIP_METHOD_STORE) ? size : 0; + compressed_size = (method == 0) ? size : 0; } else { return error(_("unsupported file mode: 0%o (SHA1: %s)"), mode, oid_to_hex(oid)); @@ -373,13 +367,13 @@ static int write_zip_entry(struct archiver_args *args, if (creator_version > max_creator_version) max_creator_version = creator_version; - if (buffer && method == ZIP_METHOD_DEFLATE) { + if (buffer && method == 8) { out = deflated = zlib_deflate_raw(buffer, size, args->compression_level, &compressed_size); if (!out || compressed_size >= size) { out = buffer; - method = ZIP_METHOD_STORE; + method = 0; compressed_size = size; } } @@ -426,7 +420,7 @@ static int write_zip_entry(struct archiver_args *args, zip_offset += ZIP64_EXTRA_SIZE; } - if (stream && method == ZIP_METHOD_STORE) { + if (stream && method == 0) { unsigned char buf[STREAM_BUFFER_SIZE]; ssize_t readlen; @@ -449,7 +443,7 @@ static int write_zip_entry(struct archiver_args *args, zip_offset += compressed_size; write_zip_data_desc(size, compressed_size, crc); - } else if (stream && method == ZIP_METHOD_DEFLATE) { + } else if (stream && method == 8) { unsigned char buf[STREAM_BUFFER_SIZE]; ssize_t readlen; git_zstream zstream; @@ -609,18 +603,18 @@ static void write_zip_trailer(const struct object_id *oid) static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time) { time_t time; - struct tm tm; + struct tm *t; if (date_overflows(*timestamp)) die(_("timestamp too large for this system: %"PRItime), *timestamp); time = (time_t)*timestamp; - localtime_r(&time, &tm); + t = localtime(&time); *timestamp = time; - *dos_date = tm.tm_mday + (tm.tm_mon + 1) * 32 + - (tm.tm_year + 1900 - 1980) * 512; - *dos_time = tm.tm_sec / 2 + tm.tm_min * 32 + tm.tm_hour * 2048; + *dos_date = t->tm_mday + (t->tm_mon + 1) * 32 + + (t->tm_year + 1900 - 1980) * 512; + *dos_time = t->tm_sec / 2 + t->tm_min * 32 + t->tm_hour * 2048; } static int archive_zip_config(const char *var, const char *value, void *data) diff --git a/third_party/git/argv-array.c b/third_party/git/argv-array.c index 61ef8c0dfd..f352ea9357 100644 --- a/third_party/git/argv-array.c +++ b/third_party/git/argv-array.c @@ -46,7 +46,7 @@ void argv_array_pushl(struct argv_array *array, ...) const char *arg; va_start(ap, array); - while ((arg = va_arg(ap, const char *))) + while((arg = va_arg(ap, const char *))) argv_array_push(array, arg); va_end(ap); } diff --git a/third_party/git/argv-array.h b/third_party/git/argv-array.h index a7d3b10707..a39ba43f57 100644 --- a/third_party/git/argv-array.h +++ b/third_party/git/argv-array.h @@ -1,32 +1,8 @@ #ifndef ARGV_ARRAY_H #define ARGV_ARRAY_H -/** - * The argv-array API allows one to dynamically build and store - * NULL-terminated lists. An argv-array maintains the invariant that the - * `argv` member always points to a non-NULL array, and that the array is - * always NULL-terminated at the element pointed to by `argv[argc]`. This - * makes the result suitable for passing to functions expecting to receive - * argv from main(). - * - * The string-list API (documented in string-list.h) is similar, but cannot be - * used for these purposes; instead of storing a straight string pointer, - * it contains an item structure with a `util` field that is not compatible - * with the traditional argv interface. - * - * Each `argv_array` manages its own memory. Any strings pushed into the - * array are duplicated, and all memory is freed by argv_array_clear(). - */ - extern const char *empty_argv[]; -/** - * A single array. This should be initialized by assignment from - * `ARGV_ARRAY_INIT`, or by calling `argv_array_init`. The `argv` - * member contains the actual array; the `argc` member contains the - * number of elements in the array, not including the terminating - * NULL. - */ struct argv_array { const char **argv; int argc; @@ -35,55 +11,17 @@ struct argv_array { #define ARGV_ARRAY_INIT { empty_argv, 0, 0 } -/** - * Initialize an array. This is no different than assigning from - * `ARGV_ARRAY_INIT`. - */ void argv_array_init(struct argv_array *); - -/* Push a copy of a string onto the end of the array. */ const char *argv_array_push(struct argv_array *, const char *); - -/** - * Format a string and push it onto the end of the array. This is a - * convenience wrapper combining `strbuf_addf` and `argv_array_push`. - */ __attribute__((format (printf,2,3))) const char *argv_array_pushf(struct argv_array *, const char *fmt, ...); - -/** - * Push a list of strings onto the end of the array. The arguments - * should be a list of `const char *` strings, terminated by a NULL - * argument. - */ LAST_ARG_MUST_BE_NULL void argv_array_pushl(struct argv_array *, ...); - -/* Push a null-terminated array of strings onto the end of the array. */ void argv_array_pushv(struct argv_array *, const char **); - -/** - * Remove the final element from the array. If there are no - * elements in the array, do nothing. - */ void argv_array_pop(struct argv_array *); - /* Splits by whitespace; does not handle quoted arguments! */ void argv_array_split(struct argv_array *, const char *); - -/** - * Free all memory associated with the array and return it to the - * initial, empty state. - */ void argv_array_clear(struct argv_array *); - -/** - * Disconnect the `argv` member from the `argv_array` struct and - * return it. The caller is responsible for freeing the memory used - * by the array, and by the strings it references. After detaching, - * the `argv_array` is in a reinitialized state and can be pushed - * into again. - */ const char **argv_array_detach(struct argv_array *); #endif /* ARGV_ARRAY_H */ diff --git a/third_party/git/attr.c b/third_party/git/attr.c index a826b2ef1f..93dc16b59c 100644 --- a/third_party/git/attr.c +++ b/third_party/git/attr.c @@ -1,6 +1,7 @@ /* * Handle git attributes. See gitattributes(5) for a description of - * the file syntax, and attr.h for a description of the API. + * the file syntax, and Documentation/technical/api-gitattributes.txt + * for a description of the API. * * One basic design decision here is that we are not going to support * an insanely large number of attributes. @@ -61,7 +62,7 @@ static struct attr_hashmap g_attr_hashmap; /* The container for objects stored in "struct attr_hashmap" */ struct attr_hash_entry { - struct hashmap_entry ent; + struct hashmap_entry ent; /* must be the first member! */ const char *key; /* the key; memory should be owned by value */ size_t keylen; /* length of the key */ void *value; /* the stored value */ @@ -69,14 +70,12 @@ struct attr_hash_entry { /* attr_hashmap comparison function */ static int attr_hash_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct attr_hash_entry *a, *b; - - a = container_of(eptr, const struct attr_hash_entry, ent); - b = container_of(entry_or_key, const struct attr_hash_entry, ent); + const struct attr_hash_entry *a = entry; + const struct attr_hash_entry *b = entry_or_key; return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen); } @@ -99,10 +98,10 @@ static void *attr_hashmap_get(struct attr_hashmap *map, if (!map->map.tablesize) attr_hashmap_init(map); - hashmap_entry_init(&k.ent, memhash(key, keylen)); + hashmap_entry_init(&k, memhash(key, keylen)); k.key = key; k.keylen = keylen; - e = hashmap_get_entry(&map->map, &k, ent, NULL); + e = hashmap_get(&map->map, &k, NULL); return e ? e->value : NULL; } @@ -118,12 +117,12 @@ static void attr_hashmap_add(struct attr_hashmap *map, attr_hashmap_init(map); e = xmalloc(sizeof(struct attr_hash_entry)); - hashmap_entry_init(&e->ent, memhash(key, keylen)); + hashmap_entry_init(e, memhash(key, keylen)); e->key = key; e->keylen = keylen; e->value = value; - hashmap_add(&map->map, &e->ent); + hashmap_add(&map->map, e); } struct all_attrs_item { @@ -162,12 +161,12 @@ static void all_attrs_init(struct attr_hashmap *map, struct attr_check *check) if (size != check->all_attrs_nr) { struct attr_hash_entry *e; struct hashmap_iter iter; + hashmap_iter_init(&map->map, &iter); REALLOC_ARRAY(check->all_attrs, size); check->all_attrs_nr = size; - hashmap_for_each_entry(&map->map, &iter, e, - ent /* member name */) { + while ((e = hashmap_iter_next(&iter))) { const struct git_attr *a = e->value; check->all_attrs[a->attr_nr].attr = a; } @@ -260,7 +259,7 @@ struct pattern { const char *pattern; int patternlen; int nowildcardlen; - unsigned flags; /* PATTERN_FLAG_* */ + unsigned flags; /* EXC_FLAG_* */ }; /* @@ -401,11 +400,11 @@ static struct match_attr *parse_attr_line(const char *line, const char *src, char *p = (char *)&(res->state[num_attr]); memcpy(p, name, namelen); res->u.pat.pattern = p; - parse_path_pattern(&res->u.pat.pattern, + parse_exclude_pattern(&res->u.pat.pattern, &res->u.pat.patternlen, &res->u.pat.flags, &res->u.pat.nowildcardlen); - if (res->u.pat.flags & PATTERN_FLAG_NEGATIVE) { + if (res->u.pat.flags & EXC_FLAG_NEGATIVE) { warning(_("Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation.")); goto fail_return; @@ -992,10 +991,10 @@ static int path_matches(const char *pathname, int pathlen, int prefix = pat->nowildcardlen; int isdir = (pathlen && pathname[pathlen - 1] == '/'); - if ((pat->flags & PATTERN_FLAG_MUSTBEDIR) && !isdir) + if ((pat->flags & EXC_FLAG_MUSTBEDIR) && !isdir) return 0; - if (pat->flags & PATTERN_FLAG_NODIR) { + if (pat->flags & EXC_FLAG_NODIR) { return match_basename(pathname + basename_offset, pathlen - basename_offset - isdir, pattern, prefix, diff --git a/third_party/git/attr.h b/third_party/git/attr.h index 404548f028..b0378bfe5f 100644 --- a/third_party/git/attr.h +++ b/third_party/git/attr.h @@ -1,121 +1,9 @@ #ifndef ATTR_H #define ATTR_H -/** - * gitattributes mechanism gives a uniform way to associate various attributes - * to set of paths. - * - * - * Querying Specific Attributes - * ---------------------------- - * - * - Prepare `struct attr_check` using attr_check_initl() function, enumerating - * the names of attributes whose values you are interested in, terminated with - * a NULL pointer. Alternatively, an empty `struct attr_check` can be - * prepared by calling `attr_check_alloc()` function and then attributes you - * want to ask about can be added to it with `attr_check_append()` function. - * - * - Call `git_check_attr()` to check the attributes for the path. - * - * - Inspect `attr_check` structure to see how each of the attribute in the - * array is defined for the path. - * - * - * Example - * ------- - * - * To see how attributes "crlf" and "ident" are set for different paths. - * - * - Prepare a `struct attr_check` with two elements (because we are checking - * two attributes): - * - * ------------ - * static struct attr_check *check; - * static void setup_check(void) - * { - * if (check) - * return; // already done - * check = attr_check_initl("crlf", "ident", NULL); - * } - * ------------ - * - * - Call `git_check_attr()` with the prepared `struct attr_check`: - * - * ------------ - * const char *path; - * - * setup_check(); - * git_check_attr(path, check); - * ------------ - * - * - Act on `.value` member of the result, left in `check->items[]`: - * - * ------------ - * const char *value = check->items[0].value; - * - * if (ATTR_TRUE(value)) { - * The attribute is Set, by listing only the name of the - * attribute in the gitattributes file for the path. - * } else if (ATTR_FALSE(value)) { - * The attribute is Unset, by listing the name of the - * attribute prefixed with a dash - for the path. - * } else if (ATTR_UNSET(value)) { - * The attribute is neither set nor unset for the path. - * } else if (!strcmp(value, "input")) { - * If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is - * true, the value is a string set in the gitattributes - * file for the path by saying "attr=value". - * } else if (... other check using value as string ...) { - * ... - * } - * ------------ - * - * To see how attributes in argv[] are set for different paths, only - * the first step in the above would be different. - * - * ------------ - * static struct attr_check *check; - * static void setup_check(const char **argv) - * { - * check = attr_check_alloc(); - * while (*argv) { - * struct git_attr *attr = git_attr(*argv); - * attr_check_append(check, attr); - * argv++; - * } - * } - * ------------ - * - * - * Querying All Attributes - * ----------------------- - * - * To get the values of all attributes associated with a file: - * - * - Prepare an empty `attr_check` structure by calling `attr_check_alloc()`. - * - * - Call `git_all_attrs()`, which populates the `attr_check` with the - * attributes attached to the path. - * - * - Iterate over the `attr_check.items[]` array to examine the attribute - * names and values. The name of the attribute described by an - * `attr_check.items[]` object can be retrieved via - * `git_attr_name(check->items[i].attr)`. (Please note that no items will be - * returned for unset attributes, so `ATTR_UNSET()` will return false for all - * returned `attr_check.items[]` objects.) - * - * - Free the `attr_check` struct by calling `attr_check_free()`. - */ - struct index_state; -/** - * An attribute is an opaque object that is identified by its name. Pass the - * name to `git_attr()` function to obtain the object of this type. - * The internal representation of this structure is of no interest to the - * calling programs. The name of the attribute can be retrieved by calling - * `git_attr_name()`. - */ +/* An attribute is a pointer to this opaque structure */ struct git_attr; /* opaque structures used internally for attribute collection */ @@ -133,36 +21,21 @@ const struct git_attr *git_attr(const char *); extern const char git_attr__true[]; extern const char git_attr__false[]; -/** - * Attribute Values - * ---------------- - * - * An attribute for a path can be in one of four states: Set, Unset, Unspecified - * or set to a string, and `.value` member of `struct attr_check_item` records - * it. The three macros check these, if none of them returns true, `.value` - * member points at a string value of the attribute for the path. - */ - -/* Returns true if the attribute is Set for the path. */ +/* For public to check git_attr_check results */ #define ATTR_TRUE(v) ((v) == git_attr__true) - -/* Returns true if the attribute is Unset for the path. */ #define ATTR_FALSE(v) ((v) == git_attr__false) - -/* Returns true if the attribute is Unspecified for the path. */ #define ATTR_UNSET(v) ((v) == NULL) -/* This structure represents one attribute and its value. */ +/* + * Send one or more git_attr_check to git_check_attrs(), and + * each 'value' member tells what its value is. + * Unset one is returned as NULL. + */ struct attr_check_item { const struct git_attr *attr; const char *value; }; -/** - * This structure represents a collection of `attr_check_item`. It is passed to - * `git_check_attr()` function, specifying the attributes to check, and - * receives their values. - */ struct attr_check { int nr; int alloc; diff --git a/third_party/git/azure-pipelines.yml b/third_party/git/azure-pipelines.yml index 675c3a43c9..c329b7218b 100644 --- a/third_party/git/azure-pipelines.yml +++ b/third_party/git/azure-pipelines.yml @@ -1,12 +1,12 @@ -variables: - Agent.Source.Git.ShallowFetchDepth: 1 +resources: +- repo: self + fetchDepth: 1 jobs: - job: windows_build displayName: Windows Build condition: succeeded() - pool: - vmImage: windows-latest + pool: Hosted timeoutInMinutes: 240 steps: - powershell: | @@ -62,8 +62,7 @@ jobs: displayName: Windows Test dependsOn: windows_build condition: succeeded() - pool: - vmImage: windows-latest + pool: Hosted timeoutInMinutes: 240 strategy: parallel: 10 @@ -132,173 +131,10 @@ jobs: PathtoPublish: t/failed-test-artifacts ArtifactName: failed-test-artifacts -- job: vs_build - displayName: Visual Studio Build - condition: succeeded() - pool: - vmImage: windows-latest - timeoutInMinutes: 240 - steps: - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no - cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\ - } - displayName: 'Mount test-cache' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - powershell: | - $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds" - $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id - $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl - (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip") - Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force - Remove-Item git-sdk-64-minimal.zip - - # Let Git ignore the SDK and the test-cache - "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude" - displayName: 'Download git-sdk-64-minimal' - - powershell: | - & git-sdk-64-minimal\usr\bin\bash.exe -lc @" - make NDEBUG=1 DEVELOPER=1 vcxproj - "@ - if (!$?) { exit(1) } - displayName: Generate Visual Studio Solution - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - DEVELOPER: 1 - NO_PERL: 1 - GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'" - - powershell: | - $urlbase = "https://dev.azure.com/git/git/_apis/build/builds" - $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id - $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl - (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip") - Expand-Archive compat.zip -DestinationPath . -Force - Remove-Item compat.zip - displayName: 'Download vcpkg artifacts' - - task: MSBuild@1 - inputs: - solution: git.sln - platform: x64 - configuration: Release - maximumCpuCount: 4 - msbuildArguments: /p:PlatformToolset=v142 - - powershell: | - & compat\vcbuild\vcpkg_copy_dlls.bat release - if (!$?) { exit(1) } - & git-sdk-64-minimal\usr\bin\bash.exe -lc @" - mkdir -p artifacts && - eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts | grep ^tar)\" - "@ - if (!$?) { exit(1) } - displayName: Bundle artifact tar - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - DEVELOPER: 1 - NO_PERL: 1 - MSVC: 1 - VCPKG_ROOT: $(Build.SourcesDirectory)\compat\vcbuild\vcpkg - - powershell: | - $tag = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-tag.txt").content - $version = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-version.txt").content - $url = "https://github.com/git-for-windows/git/releases/download/${tag}/PortableGit-${version}-64-bit.7z.exe" - (New-Object Net.WebClient).DownloadFile($url,"PortableGit.exe") - & .\PortableGit.exe -y -oartifacts\PortableGit - # Wait until it is unpacked - while (-not @(Remove-Item -ErrorAction SilentlyContinue PortableGit.exe; $?)) { sleep 1 } - displayName: Download & extract portable Git - - task: PublishPipelineArtifact@0 - displayName: 'Publish Pipeline Artifact: MSVC test artifacts' - inputs: - artifactName: 'vs-artifacts' - targetPath: '$(Build.SourcesDirectory)\artifacts' - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - cmd /c rmdir "$(Build.SourcesDirectory)\test-cache" - } - displayName: 'Unmount test-cache' - condition: true - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - -- job: vs_test - displayName: Visual Studio Test - dependsOn: vs_build - condition: succeeded() - pool: - vmImage: windows-latest - timeoutInMinutes: 240 - strategy: - parallel: 10 - steps: - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no - cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\ - } - displayName: 'Mount test-cache' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact: VS test artifacts' - inputs: - artifactName: 'vs-artifacts' - targetPath: '$(Build.SourcesDirectory)' - - powershell: | - & PortableGit\git-cmd.exe --command=usr\bin\bash.exe -lc @" - test -f artifacts.tar.gz || { - echo No test artifacts found\; skipping >&2 - exit 0 - } - tar xf artifacts.tar.gz || exit 1 - - # Let Git ignore the SDK and the test-cache - printf '%s\n' /PortableGit/ /test-cache/ >>.git/info/exclude - - cd t && - PATH=\"`$PWD/helper:`$PATH\" && - test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \ - `$(test-tool.exe path-utils slice-tests \ - `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE t[0-9]*.sh) - "@ - if (!$?) { exit(1) } - displayName: 'Test (parallel)' - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - NO_SVN_TESTS: 1 - GIT_TEST_SKIP_REBASE_P: 1 - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - cmd /c rmdir "$(Build.SourcesDirectory)\test-cache" - } - displayName: 'Unmount test-cache' - condition: true - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'vs' - platform: Windows - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-vs-test-artifacts - - job: linux_clang displayName: linux-clang condition: succeeded() - pool: - vmImage: ubuntu-latest + pool: Hosted Ubuntu 1604 steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 @@ -336,8 +172,7 @@ jobs: - job: linux_gcc displayName: linux-gcc condition: succeeded() - pool: - vmImage: ubuntu-latest + pool: Hosted Ubuntu 1604 steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 @@ -374,8 +209,7 @@ jobs: - job: osx_clang displayName: osx-clang condition: succeeded() - pool: - vmImage: macOS-latest + pool: Hosted macOS steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 @@ -410,8 +244,7 @@ jobs: - job: osx_gcc displayName: osx-gcc condition: succeeded() - pool: - vmImage: macOS-latest + pool: Hosted macOS steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 @@ -444,8 +277,7 @@ jobs: - job: gettext_poison displayName: GETTEXT_POISON condition: succeeded() - pool: - vmImage: ubuntu-latest + pool: Hosted Ubuntu 1604 steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 @@ -482,8 +314,7 @@ jobs: - job: linux32 displayName: Linux32 condition: succeeded() - pool: - vmImage: ubuntu-latest + pool: Hosted Ubuntu 1604 steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 @@ -517,14 +348,13 @@ jobs: - job: static_analysis displayName: StaticAnalysis condition: succeeded() - pool: - vmImage: ubuntu-latest + pool: Hosted Ubuntu 1604 steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 sudo apt-get update && - sudo apt-get install -y coccinelle libcurl4-openssl-dev libssl-dev libexpat-dev gettext && + sudo apt-get install -y coccinelle && export jobname=StaticAnalysis && @@ -538,14 +368,13 @@ jobs: - job: documentation displayName: Documentation condition: succeeded() - pool: - vmImage: ubuntu-latest + pool: Hosted Ubuntu 1604 steps: - bash: | test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 sudo apt-get update && - sudo apt-get install -y asciidoc xmlto asciidoctor docbook-xsl-ns && + sudo apt-get install -y asciidoc xmlto asciidoctor && export ALREADY_HAVE_ASCIIDOCTOR=yes. && export jobname=Documentation && diff --git a/third_party/git/banned.h b/third_party/git/banned.h index 60a18d4403..447af24807 100644 --- a/third_party/git/banned.h +++ b/third_party/git/banned.h @@ -26,7 +26,7 @@ #define vsprintf(...) BANNED(vsprintf) #else #define sprintf(buf,fmt,arg) BANNED(sprintf) -#define vsprintf(buf,fmt,arg) BANNED(vsprintf) +#define vsprintf(buf,fmt,arg) BANNED(sprintf) #endif #endif /* BANNED_H */ diff --git a/third_party/git/bisect.c b/third_party/git/bisect.c index 9154f810f7..e87ac29a51 100644 --- a/third_party/git/bisect.c +++ b/third_party/git/bisect.c @@ -572,7 +572,7 @@ static int sqrti(int val) { float d, x = val; - if (!val) + if (val == 0) return 0; do { @@ -661,11 +661,11 @@ static void bisect_common(struct rev_info *revs) mark_edges_uninteresting(revs, NULL, 0); } -static enum bisect_error error_if_skipped_commits(struct commit_list *tried, +static void exit_if_skipped_commits(struct commit_list *tried, const struct object_id *bad) { if (!tried) - return BISECT_OK; + return; printf("There are only 'skip'ped commits left to test.\n" "The first %s commit could be any of:\n", term_bad); @@ -676,8 +676,7 @@ static enum bisect_error error_if_skipped_commits(struct commit_list *tried, if (bad) printf("%s\n", oid_to_hex(bad)); printf(_("We cannot bisect more!\n")); - - return BISECT_ONLY_SKIPPED_LEFT; + exit(2); } static int is_expected_rev(const struct object_id *oid) @@ -704,12 +703,11 @@ static int is_expected_rev(const struct object_id *oid) return res; } -static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout) +static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout) { char bisect_rev_hex[GIT_MAX_HEXSZ + 1]; - enum bisect_error res = BISECT_OK; - memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1); + memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1); update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); argv_checkout[2] = bisect_rev_hex; @@ -717,24 +715,14 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); } else { + int res; res = run_command_v_opt(argv_checkout, RUN_GIT_CMD); if (res) - /* - * Errors in `run_command()` itself, signaled by res < 0, - * and errors in the child process, signaled by res > 0 - * can both be treated as regular BISECT_FAILURE (-1). - */ - return -abs(res); + exit(res); } argv_show_branch[1] = bisect_rev_hex; - res = run_command_v_opt(argv_show_branch, RUN_GIT_CMD); - /* - * Errors in `run_command()` itself, signaled by res < 0, - * and errors in the child process, signaled by res > 0 - * can both be treated as regular BISECT_FAILURE (-1). - */ - return -abs(res); + return run_command_v_opt(argv_show_branch, RUN_GIT_CMD); } static struct commit *get_commit_reference(struct repository *r, @@ -761,7 +749,7 @@ static struct commit **get_bad_and_good_commits(struct repository *r, return rev; } -static enum bisect_error handle_bad_merge_base(void) +static void handle_bad_merge_base(void) { if (is_expected_rev(current_bad_oid)) { char *bad_hex = oid_to_hex(current_bad_oid); @@ -782,14 +770,14 @@ static enum bisect_error handle_bad_merge_base(void) "between %s and [%s].\n"), bad_hex, term_bad, term_good, bad_hex, good_hex); } - return BISECT_MERGE_BASE_CHECK; + exit(3); } fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n"), term_good, term_bad, term_good, term_bad); - return BISECT_FAILED; + exit(1); } static void handle_skipped_merge_base(const struct object_id *mb) @@ -811,18 +799,13 @@ static void handle_skipped_merge_base(const struct object_id *mb) * "check_merge_bases" checks that merge bases are not "bad" (or "new"). * * - If one is "bad" (or "new"), it means the user assumed something wrong - * and we must return error with a non 0 error code. + * and we must exit with a non 0 error code. * - If one is "good" (or "old"), that's good, we have nothing to do. * - If one is "skipped", we can't know but we should warn. * - If we don't know, we should check it out and ask the user to test. - * - If a merge base must be tested, on success return - * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition - * for early success, this will be converted back to 0 in - * check_good_are_ancestors_of_bad(). */ -static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout) +static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout) { - enum bisect_error res = BISECT_OK; struct commit_list *result; result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1); @@ -830,24 +813,18 @@ static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int for (; result; result = result->next) { const struct object_id *mb = &result->item->object.oid; if (oideq(mb, current_bad_oid)) { - res = handle_bad_merge_base(); - break; + handle_bad_merge_base(); } else if (0 <= oid_array_lookup(&good_revs, mb)) { continue; } else if (0 <= oid_array_lookup(&skipped_revs, mb)) { handle_skipped_merge_base(mb); } else { printf(_("Bisecting: a merge base must be tested\n")); - res = bisect_checkout(mb, no_checkout); - if (!res) - /* indicate early success */ - res = BISECT_INTERNAL_SUCCESS_MERGE_BASE; - break; + exit(bisect_checkout(mb, no_checkout)); } } free_commit_list(result); - return res; } static int check_ancestors(struct repository *r, int rev_nr, @@ -873,58 +850,43 @@ static int check_ancestors(struct repository *r, int rev_nr, * * If that's not the case, we need to check the merge bases. * If a merge base must be tested by the user, its source code will be - * checked out to be tested by the user and we will return. + * checked out to be tested by the user and we will exit. */ - -static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r, +static void check_good_are_ancestors_of_bad(struct repository *r, const char *prefix, int no_checkout) { - char *filename; + char *filename = git_pathdup("BISECT_ANCESTORS_OK"); struct stat st; int fd, rev_nr; - enum bisect_error res = BISECT_OK; struct commit **rev; if (!current_bad_oid) - return error(_("a %s revision is needed"), term_bad); - - filename = git_pathdup("BISECT_ANCESTORS_OK"); + die(_("a %s revision is needed"), term_bad); /* Check if file BISECT_ANCESTORS_OK exists. */ if (!stat(filename, &st) && S_ISREG(st.st_mode)) goto done; /* Bisecting with no good rev is ok. */ - if (!good_revs.nr) + if (good_revs.nr == 0) goto done; /* Check if all good revs are ancestor of the bad rev. */ - rev = get_bad_and_good_commits(r, &rev_nr); if (check_ancestors(r, rev_nr, rev, prefix)) - res = check_merge_bases(rev_nr, rev, no_checkout); + check_merge_bases(rev_nr, rev, no_checkout); free(rev); - if (!res) { - /* Create file BISECT_ANCESTORS_OK. */ - fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600); - if (fd < 0) - /* - * BISECT_ANCESTORS_OK file is not absolutely necessary, - * the bisection process will continue at the next - * bisection step. - * So, just signal with a warning that something - * might be wrong. - */ - warning_errno(_("could not create file '%s'"), - filename); - else - close(fd); - } + /* Create file BISECT_ANCESTORS_OK. */ + fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600); + if (fd < 0) + warning_errno(_("could not create file '%s'"), + filename); + else + close(fd); done: free(filename); - return res; } /* @@ -976,19 +938,18 @@ void read_bisect_terms(const char **read_bad, const char **read_good) } /* - * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means + * We use the convention that exiting with an exit code 10 means that * the bisection process finished successfully. - * In this case the calling function or command should not turn a - * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code. + * In this case the calling shell script should exit 0. + * * If no_checkout is non-zero, the bisection process does not * checkout the trial commit but instead simply updates BISECT_HEAD. */ -enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int no_checkout) +int bisect_next_all(struct repository *r, const char *prefix, int no_checkout) { struct rev_info revs; struct commit_list *tried; int reaches = 0, all = 0, nr, steps; - enum bisect_error res = BISECT_OK; struct object_id *bisect_rev; char *steps_msg; @@ -996,9 +957,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int if (read_bisect_refs()) die(_("reading bisect refs failed")); - res = check_good_are_ancestors_of_bad(r, prefix, no_checkout); - if (res) - return res; + check_good_are_ancestors_of_bad(r, prefix, no_checkout); bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1); revs.limited = 1; @@ -1010,45 +969,33 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix, int if (!revs.commits) { /* - * We should return error here only if the "bad" + * We should exit here only if the "bad" * commit is also a "skip" commit. */ - res = error_if_skipped_commits(tried, NULL); - if (res < 0) - return res; + exit_if_skipped_commits(tried, NULL); + printf(_("%s was both %s and %s\n"), oid_to_hex(current_bad_oid), term_good, term_bad); - - return BISECT_FAILED; + exit(1); } if (!all) { fprintf(stderr, _("No testable commit found.\n" "Maybe you started with bad path parameters?\n")); - - return BISECT_NO_TESTABLE_COMMIT; + exit(4); } bisect_rev = &revs.commits->item->object.oid; if (oideq(bisect_rev, current_bad_oid)) { - res = error_if_skipped_commits(tried, current_bad_oid); - if (res) - return res; + exit_if_skipped_commits(tried, current_bad_oid); printf("%s is the first %s commit\n", oid_to_hex(bisect_rev), term_bad); - show_diff_tree(r, prefix, revs.commits->item); - /* - * This means the bisection process succeeded. - * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) - * so that the call chain can simply check - * for negative return values for early returns up - * until the cmd_bisect__helper() caller. - */ - return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND; + /* This means the bisection process succeeded. */ + exit(10); } nr = all - reaches - 1; diff --git a/third_party/git/bisect.h b/third_party/git/bisect.h index 8bad8d8391..4e69a11ea8 100644 --- a/third_party/git/bisect.h +++ b/third_party/git/bisect.h @@ -31,34 +31,7 @@ struct rev_list_info { const char *header_prefix; }; -/* - * enum bisect_error represents the following return codes: - * BISECT_OK: success code. Internally, it means that next - * commit has been found (and possibly checked out) and it - * should be tested. - * BISECT_FAILED error code: default error code. - * BISECT_ONLY_SKIPPED_LEFT error code: only skipped - * commits left to be tested. - * BISECT_MERGE_BASE_CHECK error code: merge base check failed. - * BISECT_NO_TESTABLE_COMMIT error code: no testable commit found. - * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND early success code: - * first term_bad commit found. - * BISECT_INTERNAL_SUCCESS_MERGE_BASE early success - * code: found merge base that should be tested. - * Early success codes BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND and - * BISECT_INTERNAL_SUCCESS_MERGE_BASE should be only internal codes. - */ -enum bisect_error { - BISECT_OK = 0, - BISECT_FAILED = -1, - BISECT_ONLY_SKIPPED_LEFT = -2, - BISECT_MERGE_BASE_CHECK = -3, - BISECT_NO_TESTABLE_COMMIT = -4, - BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND = -10, - BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11 -}; - -enum bisect_error bisect_next_all(struct repository *r, +int bisect_next_all(struct repository *r, const char *prefix, int no_checkout); diff --git a/third_party/git/blame.c b/third_party/git/blame.c index 29770e5c81..36a2e7ef11 100644 --- a/third_party/git/blame.c +++ b/third_party/git/blame.c @@ -144,7 +144,7 @@ static void append_merge_parents(struct repository *r, while (!strbuf_getwholeline_fd(&line, merge_head, '\n')) { struct object_id oid; - if (get_oid_hex(line.buf, &oid)) + if (line.len < GIT_SHA1_HEXSZ || get_oid_hex(line.buf, &oid)) die("unknown line in '%s': %s", git_path_merge_head(r), line.buf); tail = append_parent(r, tail, &oid); @@ -417,15 +417,14 @@ static void get_fingerprint(struct fingerprint *result, /* Ignore whitespace pairs */ if (hash == 0) continue; - hashmap_entry_init(&entry->entry, hash); + hashmap_entry_init(entry, hash); - found_entry = hashmap_get_entry(&result->map, entry, - /* member name */ entry, NULL); + found_entry = hashmap_get(&result->map, entry, NULL); if (found_entry) { found_entry->count += 1; } else { entry->count = 1; - hashmap_add(&result->map, &entry->entry); + hashmap_add(&result->map, entry); ++entry; } } @@ -433,7 +432,7 @@ static void get_fingerprint(struct fingerprint *result, static void free_fingerprint(struct fingerprint *f) { - hashmap_free(&f->map); + hashmap_free(&f->map, 0); free(f->entries); } @@ -450,10 +449,10 @@ static int fingerprint_similarity(struct fingerprint *a, struct fingerprint *b) struct hashmap_iter iter; const struct fingerprint_entry *entry_a, *entry_b; - hashmap_for_each_entry(&b->map, &iter, entry_b, - entry /* member name */) { - entry_a = hashmap_get_entry(&a->map, entry_b, entry, NULL); - if (entry_a) { + hashmap_iter_init(&b->map, &iter); + + while ((entry_b = hashmap_iter_next(&iter))) { + if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) { intersection += entry_a->count < entry_b->count ? entry_a->count : entry_b->count; } @@ -471,12 +470,10 @@ static void fingerprint_subtract(struct fingerprint *a, struct fingerprint *b) hashmap_iter_init(&b->map, &iter); - hashmap_for_each_entry(&b->map, &iter, entry_b, - entry /* member name */) { - entry_a = hashmap_get_entry(&a->map, entry_b, entry, NULL); - if (entry_a) { + while ((entry_b = hashmap_iter_next(&iter))) { + if ((entry_a = hashmap_get(&a->map, entry_b, NULL))) { if (entry_a->count <= entry_b->count) - hashmap_remove(&a->map, &entry_b->entry, NULL); + hashmap_remove(&a->map, entry_b, NULL); else entry_a->count -= entry_b->count; } diff --git a/third_party/git/blame.h b/third_party/git/blame.h index 089b181ff2..4a9e1270b0 100644 --- a/third_party/git/blame.h +++ b/third_party/git/blame.h @@ -16,8 +16,6 @@ #define BLAME_DEFAULT_MOVE_SCORE 20 #define BLAME_DEFAULT_COPY_SCORE 40 -struct fingerprint; - /* * One blob in a commit that is being suspected */ @@ -54,7 +52,7 @@ struct blame_origin { struct blame_entry *suspects; mmfile_t file; int num_lines; - struct fingerprint *fingerprints; + void *fingerprints; struct object_id blob_oid; unsigned short mode; /* guilty gets set when shipping any suspects to the final diff --git a/third_party/git/builtin.h b/third_party/git/builtin.h index 2b25a80cde..5cf5df69f7 100644 --- a/third_party/git/builtin.h +++ b/third_party/git/builtin.h @@ -225,7 +225,6 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix); int cmd_show(int argc, const char **argv, const char *prefix); int cmd_show_branch(int argc, const char **argv, const char *prefix); int cmd_show_index(int argc, const char **argv, const char *prefix); -int cmd_sparse_checkout(int argc, const char **argv, const char *prefix); int cmd_status(int argc, const char **argv, const char *prefix); int cmd_stash(int argc, const char **argv, const char *prefix); int cmd_stripspace(int argc, const char **argv, const char *prefix); diff --git a/third_party/git/builtin/add.c b/third_party/git/builtin/add.c index 18a0881ecf..dd18e5c9b6 100644 --- a/third_party/git/builtin/add.c +++ b/third_party/git/builtin/add.c @@ -20,7 +20,6 @@ #include "bulk-checkin.h" #include "argv-array.h" #include "submodule.h" -#include "add-interactive.h" static const char * const builtin_add_usage[] = { N_("git add [<options>] [--] <pathspec>..."), @@ -29,9 +28,6 @@ static const char * const builtin_add_usage[] = { static int patch_interactive, add_interactive, edit_interactive; static int take_worktree_changes; static int add_renormalize; -static int pathspec_file_nul; -static const char *pathspec_from_file; -static int legacy_stash_p; /* support for the scripted `git stash` */ struct update_callback_data { int flags; @@ -189,34 +185,6 @@ int run_add_interactive(const char *revision, const char *patch_mode, { int status, i; struct argv_array argv = ARGV_ARRAY_INIT; - int use_builtin_add_i = - git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1); - - if (use_builtin_add_i < 0) - git_config_get_bool("add.interactive.usebuiltin", - &use_builtin_add_i); - - if (use_builtin_add_i == 1) { - enum add_p_mode mode; - - if (!patch_mode) - return !!run_add_i(the_repository, pathspec); - - if (!strcmp(patch_mode, "--patch")) - mode = ADD_P_ADD; - else if (!strcmp(patch_mode, "--patch=stash")) - mode = ADD_P_STASH; - else if (!strcmp(patch_mode, "--patch=reset")) - mode = ADD_P_RESET; - else if (!strcmp(patch_mode, "--patch=checkout")) - mode = ADD_P_CHECKOUT; - else if (!strcmp(patch_mode, "--patch=worktree")) - mode = ADD_P_WORKTREE; - else - die("'%s' not supported", patch_mode); - - return !!run_add_p(the_repository, mode, revision, pathspec); - } argv_array_push(&argv, "add--interactive"); if (patch_mode) @@ -341,10 +309,6 @@ static struct option builtin_add_options[] = { N_("override the executable bit of the listed files")), OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo, N_("warn when adding an embedded repository")), - OPT_HIDDEN_BOOL(0, "legacy-stash-p", &legacy_stash_p, - N_("backend for `git stash -p`")), - OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), - OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), OPT_END(), }; @@ -355,7 +319,6 @@ static int add_config(const char *var, const char *value, void *cb) ignore_add_errors = git_config_bool(var, value); return 0; } - return git_default_config(var, value, cb); } @@ -406,10 +369,7 @@ static int add_files(struct dir_struct *dir, int flags) fprintf(stderr, _(ignore_error)); for (i = 0; i < dir->ignored_nr; i++) fprintf(stderr, "%s\n", dir->ignored[i]->name); - if (advice_add_ignored_file) - advise(_("Use -f if you really want to add them.\n" - "Turn this message off by running\n" - "\"git config advice.addIgnoredFile false\"")); + fprintf(stderr, _("Use -f if you really want to add them.\n")); exit_status = 1; } @@ -442,28 +402,11 @@ int cmd_add(int argc, const char **argv, const char *prefix) builtin_add_usage, PARSE_OPT_KEEP_ARGV0); if (patch_interactive) add_interactive = 1; - if (add_interactive) { - if (pathspec_from_file) - die(_("--pathspec-from-file is incompatible with --interactive/--patch")); + if (add_interactive) exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive)); - } - if (legacy_stash_p) { - struct pathspec pathspec; - - parse_pathspec(&pathspec, 0, - PATHSPEC_PREFER_FULL | - PATHSPEC_SYMLINK_LEADING_PATH | - PATHSPEC_PREFIX_ORIGIN, - prefix, argv); - - return run_add_interactive(NULL, "--patch=stash", &pathspec); - } - if (edit_interactive) { - if (pathspec_from_file) - die(_("--pathspec-from-file is incompatible with --edit")); + if (edit_interactive) return(edit_patch(argc, argv, prefix)); - } argc--; argv++; @@ -475,6 +418,10 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (addremove && take_worktree_changes) die(_("-A and -u are mutually incompatible")); + if (!take_worktree_changes && addremove_explicit < 0 && argc) + /* Turn "git add pathspec..." to "git add -A pathspec..." */ + addremove = 1; + if (!show_only && ignore_missing) die(_("Option --ignore-missing can only be used together with --dry-run")); @@ -487,6 +434,19 @@ int cmd_add(int argc, const char **argv, const char *prefix) hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); + flags = ((verbose ? ADD_CACHE_VERBOSE : 0) | + (show_only ? ADD_CACHE_PRETEND : 0) | + (intent_to_add ? ADD_CACHE_INTENT : 0) | + (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) | + (!(addremove || take_worktree_changes) + ? ADD_CACHE_IGNORE_REMOVAL : 0)); + + if (require_pathspec && argc == 0) { + fprintf(stderr, _("Nothing specified, nothing added.\n")); + fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n")); + return 0; + } + /* * Check the "pathspec '%s' did not match any files" block * below before enabling new magic. @@ -496,38 +456,6 @@ int cmd_add(int argc, const char **argv, const char *prefix) PATHSPEC_SYMLINK_LEADING_PATH, prefix, argv); - if (pathspec_from_file) { - if (pathspec.nr) - die(_("--pathspec-from-file is incompatible with pathspec arguments")); - - parse_pathspec_file(&pathspec, PATHSPEC_ATTR, - PATHSPEC_PREFER_FULL | - PATHSPEC_SYMLINK_LEADING_PATH, - prefix, pathspec_from_file, pathspec_file_nul); - } else if (pathspec_file_nul) { - die(_("--pathspec-file-nul requires --pathspec-from-file")); - } - - if (require_pathspec && pathspec.nr == 0) { - fprintf(stderr, _("Nothing specified, nothing added.\n")); - if (advice_add_empty_pathspec) - advise( _("Maybe you wanted to say 'git add .'?\n" - "Turn this message off by running\n" - "\"git config advice.addEmptyPathspec false\"")); - return 0; - } - - if (!take_worktree_changes && addremove_explicit < 0 && pathspec.nr) - /* Turn "git add pathspec..." to "git add -A pathspec..." */ - addremove = 1; - - flags = ((verbose ? ADD_CACHE_VERBOSE : 0) | - (show_only ? ADD_CACHE_PRETEND : 0) | - (intent_to_add ? ADD_CACHE_INTENT : 0) | - (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) | - (!(addremove || take_worktree_changes) - ? ADD_CACHE_IGNORE_REMOVAL : 0)); - if (read_cache_preload(&pathspec) < 0) die(_("index file corrupt")); diff --git a/third_party/git/builtin/am.c b/third_party/git/builtin/am.c index e3dfd93c25..1aea657a7f 100644 --- a/third_party/git/builtin/am.c +++ b/third_party/git/builtin/am.c @@ -24,6 +24,7 @@ #include "sequencer.h" #include "revision.h" #include "merge-recursive.h" +#include "revision.h" #include "log-tree.h" #include "notes-utils.h" #include "rerere.h" @@ -81,11 +82,6 @@ enum signoff_type { SIGNOFF_EXPLICIT /* --signoff was set on the command-line */ }; -enum show_patch_type { - SHOW_PATCH_RAW = 0, - SHOW_PATCH_DIFF = 1, -}; - struct am_state { /* state directory path */ char *dir; @@ -1076,6 +1072,19 @@ static const char *msgnum(const struct am_state *state) } /** + * Refresh and write index. + */ +static void refresh_and_write_cache(void) +{ + struct lock_file lock_file = LOCK_INIT; + + hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR); + refresh_cache(REFRESH_QUIET); + if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) + die(_("unable to write index file")); +} + +/** * Dies with a user-friendly message on how to proceed after resolving the * problem. This message can be overridden with state->resolvemsg. */ @@ -1263,9 +1272,7 @@ static void get_commit_info(struct am_state *state, struct commit *commit) buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding()); ident_line = find_commit_header(buffer, "author", &ident_len); - if (!ident_line) - die(_("missing author line in commit %s"), - oid_to_hex(&commit->object.oid)); + if (split_ident_line(&id, ident_line, ident_len) < 0) die(_("invalid ident line: %.*s"), (int)ident_len, ident_line); @@ -1531,7 +1538,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa o.branch1 = "HEAD"; their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg); o.branch2 = their_tree_name; - o.detect_directory_renames = MERGE_DIRECTORY_RENAMES_NONE; + o.detect_directory_renames = 0; if (state->quiet) o.verbosity = 0; @@ -1696,8 +1703,7 @@ static void am_run(struct am_state *state, int resume) unlink(am_path(state, "dirtyindex")); - if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0) - die(_("unable to write index file")); + refresh_and_write_cache(); if (repo_index_has_changes(the_repository, NULL, &sb)) { write_state_bool(state, "dirtyindex", 1); @@ -1768,7 +1774,7 @@ static void am_run(struct am_state *state, int resume) linelen(state->msg), state->msg); if (advice_amworkdir) - advise(_("Use 'git am --show-current-patch=diff' to see the failed patch")); + advise(_("Use 'git am --show-current-patch' to see the failed patch")); die_user_resolve(state); } @@ -2066,7 +2072,7 @@ static void am_abort(struct am_state *state) am_destroy(state); } -static int show_patch(struct am_state *state, enum show_patch_type sub_mode) +static int show_patch(struct am_state *state) { struct strbuf sb = STRBUF_INIT; const char *patch_path; @@ -2083,17 +2089,7 @@ static int show_patch(struct am_state *state, enum show_patch_type sub_mode) return ret; } - switch (sub_mode) { - case SHOW_PATCH_RAW: - patch_path = am_path(state, msgnum(state)); - break; - case SHOW_PATCH_DIFF: - patch_path = am_path(state, "patch"); - break; - default: - BUG("invalid mode for --show-current-patch"); - } - + patch_path = am_path(state, msgnum(state)); len = strbuf_read_file(&sb, patch_path, 0); if (len < 0) die_errno(_("failed to read '%s'"), patch_path); @@ -2133,7 +2129,7 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int return 0; } -enum resume_type { +enum resume_mode { RESUME_FALSE = 0, RESUME_APPLY, RESUME_RESOLVED, @@ -2143,45 +2139,6 @@ enum resume_type { RESUME_SHOW_PATCH }; -struct resume_mode { - enum resume_type mode; - enum show_patch_type sub_mode; -}; - -static int parse_opt_show_current_patch(const struct option *opt, const char *arg, int unset) -{ - int *opt_value = opt->value; - struct resume_mode *resume = container_of(opt_value, struct resume_mode, mode); - - /* - * Please update $__git_showcurrentpatch in git-completion.bash - * when you add new options - */ - const char *valid_modes[] = { - [SHOW_PATCH_DIFF] = "diff", - [SHOW_PATCH_RAW] = "raw" - }; - int new_value = SHOW_PATCH_RAW; - - if (arg) { - for (new_value = 0; new_value < ARRAY_SIZE(valid_modes); new_value++) { - if (!strcmp(arg, valid_modes[new_value])) - break; - } - if (new_value >= ARRAY_SIZE(valid_modes)) - return error(_("Invalid value for --show-current-patch: %s"), arg); - } - - if (resume->mode == RESUME_SHOW_PATCH && new_value != resume->sub_mode) - return error(_("--show-current-patch=%s is incompatible with " - "--show-current-patch=%s"), - arg, valid_modes[resume->sub_mode]); - - resume->mode = RESUME_SHOW_PATCH; - resume->sub_mode = new_value; - return 0; -} - static int git_am_config(const char *k, const char *v, void *cb) { int status; @@ -2199,7 +2156,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) int binary = -1; int keep_cr = -1; int patch_format = PATCH_FORMAT_UNKNOWN; - struct resume_mode resume = { .mode = RESUME_FALSE }; + enum resume_mode resume = RESUME_FALSE; int in_progress; int ret = 0; @@ -2268,26 +2225,24 @@ int cmd_am(int argc, const char **argv, const char *prefix) PARSE_OPT_NOARG), OPT_STRING(0, "resolvemsg", &state.resolvemsg, NULL, N_("override error message when patch failure occurs")), - OPT_CMDMODE(0, "continue", &resume.mode, + OPT_CMDMODE(0, "continue", &resume, N_("continue applying patches after resolving a conflict"), RESUME_RESOLVED), - OPT_CMDMODE('r', "resolved", &resume.mode, + OPT_CMDMODE('r', "resolved", &resume, N_("synonyms for --continue"), RESUME_RESOLVED), - OPT_CMDMODE(0, "skip", &resume.mode, + OPT_CMDMODE(0, "skip", &resume, N_("skip the current patch"), RESUME_SKIP), - OPT_CMDMODE(0, "abort", &resume.mode, + OPT_CMDMODE(0, "abort", &resume, N_("restore the original branch and abort the patching operation."), RESUME_ABORT), - OPT_CMDMODE(0, "quit", &resume.mode, + OPT_CMDMODE(0, "quit", &resume, N_("abort the patching operation but keep HEAD where it is."), RESUME_QUIT), - { OPTION_CALLBACK, 0, "show-current-patch", &resume.mode, - "(diff|raw)", - N_("show the patch being applied"), - PARSE_OPT_CMDMODE | PARSE_OPT_OPTARG | PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP, - parse_opt_show_current_patch, RESUME_SHOW_PATCH }, + OPT_CMDMODE(0, "show-current-patch", &resume, + N_("show the patch being applied."), + RESUME_SHOW_PATCH), OPT_BOOL(0, "committer-date-is-author-date", &state.committer_date_is_author_date, N_("lie about committer date")), @@ -2337,12 +2292,12 @@ int cmd_am(int argc, const char **argv, const char *prefix) * intend to feed us a patch but wanted to continue * unattended. */ - if (argc || (resume.mode == RESUME_FALSE && !isatty(0))) + if (argc || (resume == RESUME_FALSE && !isatty(0))) die(_("previous rebase directory %s still exists but mbox given."), state.dir); - if (resume.mode == RESUME_FALSE) - resume.mode = RESUME_APPLY; + if (resume == RESUME_FALSE) + resume = RESUME_APPLY; if (state.signoff == SIGNOFF_EXPLICIT) am_append_signoff(&state); @@ -2356,7 +2311,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) * stray directories. */ if (file_exists(state.dir) && !state.rebasing) { - if (resume.mode == RESUME_ABORT || resume.mode == RESUME_QUIT) { + if (resume == RESUME_ABORT || resume == RESUME_QUIT) { am_destroy(&state); am_state_release(&state); return 0; @@ -2367,7 +2322,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) state.dir); } - if (resume.mode) + if (resume) die(_("Resolve operation not in progress, we are not resuming.")); for (i = 0; i < argc; i++) { @@ -2385,7 +2340,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) argv_array_clear(&paths); } - switch (resume.mode) { + switch (resume) { case RESUME_FALSE: am_run(&state, 0); break; @@ -2406,7 +2361,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) am_destroy(&state); break; case RESUME_SHOW_PATCH: - ret = show_patch(&state, resume.sub_mode); + ret = show_patch(&state); break; default: BUG("invalid resume value"); diff --git a/third_party/git/builtin/bisect--helper.c b/third_party/git/builtin/bisect--helper.c index c1c40b516d..1fbe156e67 100644 --- a/third_party/git/builtin/bisect--helper.c +++ b/third_party/git/builtin/bisect--helper.c @@ -52,8 +52,8 @@ static void set_terms(struct bisect_terms *terms, const char *bad, terms->term_bad = xstrdup(bad); } -static const char vocab_bad[] = "bad|new"; -static const char vocab_good[] = "good|old"; +static const char *vocab_bad = "bad|new"; +static const char *vocab_good = "good|old"; /* * Check whether the string `term` belongs to the set of strings @@ -169,12 +169,11 @@ static int bisect_reset(const char *commit) argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL); if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { - error(_("could not check out original" - " HEAD '%s'. Try 'git bisect" - " reset <commit>'."), branch.buf); strbuf_release(&branch); argv_array_clear(&argv); - return -1; + return error(_("could not check out original" + " HEAD '%s'. Try 'git bisect" + " reset <commit>'."), branch.buf); } argv_array_clear(&argv); } @@ -206,31 +205,31 @@ static int bisect_write(const char *state, const char *rev, struct object_id oid; struct commit *commit; FILE *fp = NULL; - int res = 0; + int retval = 0; if (!strcmp(state, terms->term_bad)) { strbuf_addf(&tag, "refs/bisect/%s", state); } else if (one_of(state, terms->term_good, "skip", NULL)) { strbuf_addf(&tag, "refs/bisect/%s-%s", state, rev); } else { - res = error(_("Bad bisect_write argument: %s"), state); + retval = error(_("Bad bisect_write argument: %s"), state); goto finish; } if (get_oid(rev, &oid)) { - res = error(_("couldn't get the oid of the rev '%s'"), rev); + retval = error(_("couldn't get the oid of the rev '%s'"), rev); goto finish; } if (update_ref(NULL, tag.buf, &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR)) { - res = -1; + retval = -1; goto finish; } fp = fopen(git_path_bisect_log(), "a"); if (!fp) { - res = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log()); + retval = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log()); goto finish; } @@ -244,7 +243,7 @@ finish: if (fp) fclose(fp); strbuf_release(&tag); - return res; + return retval; } static int check_and_set_terms(struct bisect_terms *terms, const char *cmd) @@ -282,23 +281,35 @@ static int mark_good(const char *refname, const struct object_id *oid, return 1; } -static const char need_bad_and_good_revision_warning[] = +static const char *need_bad_and_good_revision_warning = N_("You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that."); -static const char need_bisect_start_warning[] = +static const char *need_bisect_start_warning = N_("You need to start by \"git bisect start\".\n" "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."); -static int decide_next(const struct bisect_terms *terms, - const char *current_term, int missing_good, - int missing_bad) +static int bisect_next_check(const struct bisect_terms *terms, + const char *current_term) { + int missing_good = 1, missing_bad = 1, retval = 0; + const char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad); + const char *good_glob = xstrfmt("%s-*", terms->term_good); + + if (ref_exists(bad_ref)) + missing_bad = 0; + + for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/", + (void *) &missing_good); + if (!missing_good && !missing_bad) - return 0; - if (!current_term) - return -1; + goto finish; + + if (!current_term) { + retval = -1; + goto finish; + } if (missing_good && !missing_bad && !strcmp(current_term, terms->term_good)) { @@ -309,7 +320,7 @@ static int decide_next(const struct bisect_terms *terms, */ warning(_("bisecting only with a %s commit"), terms->term_bad); if (!isatty(0)) - return 0; + goto finish; /* * TRANSLATORS: Make sure to include [Y] and [n] in your * translation. The program will only accept English input @@ -317,35 +328,21 @@ static int decide_next(const struct bisect_terms *terms, */ yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO); if (starts_with(yesno, "N") || starts_with(yesno, "n")) - return -1; - return 0; + retval = -1; + goto finish; + } + if (!is_empty_or_missing_file(git_path_bisect_start())) { + retval = error(_(need_bad_and_good_revision_warning), + vocab_bad, vocab_good, vocab_bad, vocab_good); + } else { + retval = error(_(need_bisect_start_warning), + vocab_good, vocab_bad, vocab_good, vocab_bad); } - if (!is_empty_or_missing_file(git_path_bisect_start())) - return error(_(need_bad_and_good_revision_warning), - vocab_bad, vocab_good, vocab_bad, vocab_good); - else - return error(_(need_bisect_start_warning), - vocab_good, vocab_bad, vocab_good, vocab_bad); -} - -static int bisect_next_check(const struct bisect_terms *terms, - const char *current_term) -{ - int missing_good = 1, missing_bad = 1; - char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad); - char *good_glob = xstrfmt("%s-*", terms->term_good); - - if (ref_exists(bad_ref)) - missing_bad = 0; - - for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/", - (void *) &missing_good); - - free(good_glob); - free(bad_ref); - - return decide_next(terms, current_term, missing_good, missing_bad); +finish: + free((void *) good_glob); + free((void *) bad_ref); + return retval; } static int get_terms(struct bisect_terms *terms) @@ -399,7 +396,7 @@ static int bisect_terms(struct bisect_terms *terms, const char *option) static int bisect_append_log_quoted(const char **argv) { - int res = 0; + int retval = 0; FILE *fp = fopen(git_path_bisect_log(), "a"); struct strbuf orig_args = STRBUF_INIT; @@ -407,25 +404,25 @@ static int bisect_append_log_quoted(const char **argv) return -1; if (fprintf(fp, "git bisect start") < 1) { - res = -1; + retval = -1; goto finish; } sq_quote_argv(&orig_args, argv); if (fprintf(fp, "%s\n", orig_args.buf) < 1) - res = -1; + retval = -1; finish: fclose(fp); strbuf_release(&orig_args); - return res; + return retval; } static int bisect_start(struct bisect_terms *terms, int no_checkout, const char **argv, int argc) { int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0; - int flags, pathspec_pos, res = 0; + int flags, pathspec_pos, retval = 0; struct string_list revs = STRING_LIST_INIT_DUP; struct string_list states = STRING_LIST_INIT_DUP; struct strbuf start_head = STRBUF_INIT; @@ -526,7 +523,7 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, argv_array_pushl(&argv, "checkout", start_head.buf, "--", NULL); if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { - res = error(_("checking out '%s' failed." + retval = error(_("checking out '%s' failed." " Try 'git bisect start " "<valid-branch>'."), start_head.buf); @@ -574,12 +571,12 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, if (no_checkout) { if (get_oid(start_head.buf, &oid) < 0) { - res = error(_("invalid ref: '%s'"), start_head.buf); + retval = error(_("invalid ref: '%s'"), start_head.buf); goto finish; } if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR)) { - res = -1; + retval = -1; goto finish; } } @@ -591,26 +588,26 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout, for (i = 0; i < states.nr; i++) if (bisect_write(states.items[i].string, revs.items[i].string, terms, 1)) { - res = -1; + retval = -1; goto finish; } if (must_write_terms && write_terms(terms->term_bad, terms->term_good)) { - res = -1; + retval = -1; goto finish; } - res = bisect_append_log_quoted(argv); - if (res) - res = -1; + retval = bisect_append_log_quoted(argv); + if (retval) + retval = -1; finish: string_list_clear(&revs, 0); string_list_clear(&states, 0); strbuf_release(&start_head); strbuf_release(&bisect_names); - return res; + return retval; } int cmd_bisect__helper(int argc, const char **argv, const char *prefix) @@ -666,8 +663,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) switch (cmdmode) { case NEXT_ALL: - res = bisect_next_all(the_repository, prefix, no_checkout); - break; + return bisect_next_all(the_repository, prefix, no_checkout); case WRITE_TERMS: if (argc != 2) return error(_("--write-terms requires two arguments")); @@ -714,13 +710,5 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix) return error("BUG: unknown subcommand '%d'", cmdmode); } free_terms(&terms); - - /* - * Handle early success - * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all - */ - if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) - res = BISECT_OK; - - return abs(res); + return !!res; } diff --git a/third_party/git/builtin/blame.c b/third_party/git/builtin/blame.c index edd4bf7e3b..7ebd51ae4d 100644 --- a/third_party/git/builtin/blame.c +++ b/third_party/git/builtin/blame.c @@ -26,6 +26,7 @@ #include "progress.h" #include "object-store.h" #include "blame.h" +#include "string-list.h" #include "refs.h" static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"); @@ -319,18 +320,18 @@ static const char *format_time(timestamp_t time, const char *tz_str, return time_buf.buf; } -#define OUTPUT_ANNOTATE_COMPAT (1U<<0) -#define OUTPUT_LONG_OBJECT_NAME (1U<<1) -#define OUTPUT_RAW_TIMESTAMP (1U<<2) -#define OUTPUT_PORCELAIN (1U<<3) -#define OUTPUT_SHOW_NAME (1U<<4) -#define OUTPUT_SHOW_NUMBER (1U<<5) -#define OUTPUT_SHOW_SCORE (1U<<6) -#define OUTPUT_NO_AUTHOR (1U<<7) -#define OUTPUT_SHOW_EMAIL (1U<<8) -#define OUTPUT_LINE_PORCELAIN (1U<<9) -#define OUTPUT_COLOR_LINE (1U<<10) -#define OUTPUT_SHOW_AGE_WITH_COLOR (1U<<11) +#define OUTPUT_ANNOTATE_COMPAT 001 +#define OUTPUT_LONG_OBJECT_NAME 002 +#define OUTPUT_RAW_TIMESTAMP 004 +#define OUTPUT_PORCELAIN 010 +#define OUTPUT_SHOW_NAME 020 +#define OUTPUT_SHOW_NUMBER 040 +#define OUTPUT_SHOW_SCORE 0100 +#define OUTPUT_NO_AUTHOR 0200 +#define OUTPUT_SHOW_EMAIL 0400 +#define OUTPUT_LINE_PORCELAIN 01000 +#define OUTPUT_COLOR_LINE 02000 +#define OUTPUT_SHOW_AGE_WITH_COLOR 04000 static void emit_porcelain_details(struct blame_origin *suspect, int repeat) { @@ -459,7 +460,7 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int for (cnt = 0; cnt < ent->num_lines; cnt++) { char ch; - int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? the_hash_algo->hexsz : abbrev; + int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? GIT_SHA1_HEXSZ : abbrev; if (opt & OUTPUT_COLOR_LINE) { if (cnt > 0) { @@ -861,6 +862,14 @@ int cmd_blame(int argc, const char **argv, const char *prefix) OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("Ignore revisions from <file>")), OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE), OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR), + + /* + * The following two options are parsed by parse_revision_opt() + * and are only included here to get included in the "-h" + * output: + */ + { OPTION_LOWLEVEL_CALLBACK, 0, "indent-heuristic", NULL, NULL, N_("Use an experimental heuristic to improve diffs"), PARSE_OPT_NOARG, NULL, 0, parse_opt_unknown_cb }, + OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL), OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")), OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")), @@ -876,7 +885,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix) struct range_set ranges; unsigned int range_i; long anchor; - const int hexsz = the_hash_algo->hexsz; setup_default_color_by_age(); git_config(git_blame_config, &output_option); @@ -923,11 +931,11 @@ parse_done: } else if (show_progress < 0) show_progress = isatty(2); - if (0 < abbrev && abbrev < hexsz) + if (0 < abbrev && abbrev < GIT_SHA1_HEXSZ) /* one more abbrev length is needed for the boundary commit */ abbrev++; else if (!abbrev) - abbrev = hexsz; + abbrev = GIT_SHA1_HEXSZ; if (revs_file && read_ancestry(revs_file)) die_errno("reading graft file '%s' failed", revs_file); diff --git a/third_party/git/builtin/branch.c b/third_party/git/builtin/branch.c index d8297f80ff..2ef214632f 100644 --- a/third_party/git/builtin/branch.c +++ b/third_party/git/builtin/branch.c @@ -624,7 +624,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_SET_INT_F(0, "set-upstream", &track, N_("do not use"), BRANCH_TRACK_OVERRIDE, PARSE_OPT_HIDDEN), OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")), - OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("unset the upstream info")), + OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")), OPT__COLOR(&branch_use_color, N_("use colored output")), OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"), FILTER_REFS_REMOTES), diff --git a/third_party/git/builtin/bundle.c b/third_party/git/builtin/bundle.c index f049d27a14..1ea4bfdfc1 100644 --- a/third_party/git/builtin/bundle.c +++ b/third_party/git/builtin/bundle.c @@ -1,6 +1,4 @@ #include "builtin.h" -#include "argv-array.h" -#include "parse-options.h" #include "cache.h" #include "bundle.h" @@ -11,184 +9,59 @@ * bundle supporting "fetch", "pull", and "ls-remote". */ -static const char * const builtin_bundle_usage[] = { - N_("git bundle create [<options>] <file> <git-rev-list args>"), - N_("git bundle verify [<options>] <file>"), - N_("git bundle list-heads <file> [<refname>...]"), - N_("git bundle unbundle <file> [<refname>...]"), - NULL -}; +static const char builtin_bundle_usage[] = + "git bundle create <file> <git-rev-list args>\n" + " or: git bundle verify <file>\n" + " or: git bundle list-heads <file> [<refname>...]\n" + " or: git bundle unbundle <file> [<refname>...]"; -static const char * const builtin_bundle_create_usage[] = { - N_("git bundle create [<options>] <file> <git-rev-list args>"), - NULL -}; - -static const char * const builtin_bundle_verify_usage[] = { - N_("git bundle verify [<options>] <file>"), - NULL -}; - -static const char * const builtin_bundle_list_heads_usage[] = { - N_("git bundle list-heads <file> [<refname>...]"), - NULL -}; - -static const char * const builtin_bundle_unbundle_usage[] = { - N_("git bundle unbundle <file> [<refname>...]"), - NULL -}; - -static int verbose; - -static int parse_options_cmd_bundle(int argc, - const char **argv, - const char* prefix, - const char * const usagestr[], - const struct option options[], - const char **bundle_file) { - int newargc; - newargc = parse_options(argc, argv, NULL, options, usagestr, - PARSE_OPT_STOP_AT_NON_OPTION); - if (argc < 1) - usage_with_options(usagestr, options); - *bundle_file = prefix_filename(prefix, argv[0]); - return newargc; -} - -static int cmd_bundle_create(int argc, const char **argv, const char *prefix) { - int all_progress_implied = 0; - int progress = isatty(STDERR_FILENO); - struct argv_array pack_opts; - - struct option options[] = { - OPT_SET_INT('q', "quiet", &progress, - N_("do not show progress meter"), 0), - OPT_SET_INT(0, "progress", &progress, - N_("show progress meter"), 1), - OPT_SET_INT(0, "all-progress", &progress, - N_("show progress meter during object writing phase"), 2), - OPT_BOOL(0, "all-progress-implied", - &all_progress_implied, - N_("similar to --all-progress when progress meter is shown")), - OPT_END() - }; - const char* bundle_file; - - argc = parse_options_cmd_bundle(argc, argv, prefix, - builtin_bundle_create_usage, options, &bundle_file); - /* bundle internals use argv[1] as further parameters */ - - argv_array_init(&pack_opts); - if (progress == 0) - argv_array_push(&pack_opts, "--quiet"); - else if (progress == 1) - argv_array_push(&pack_opts, "--progress"); - else if (progress == 2) - argv_array_push(&pack_opts, "--all-progress"); - if (progress && all_progress_implied) - argv_array_push(&pack_opts, "--all-progress-implied"); - - if (!startup_info->have_repository) - die(_("Need a repository to create a bundle.")); - return !!create_bundle(the_repository, bundle_file, argc, argv, &pack_opts); -} - -static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) { - struct bundle_header header; - int bundle_fd = -1; - int quiet = 0; - - struct option options[] = { - OPT_BOOL('q', "quiet", &quiet, - N_("do not show bundle details")), - OPT_END() - }; - const char* bundle_file; - - argc = parse_options_cmd_bundle(argc, argv, prefix, - builtin_bundle_verify_usage, options, &bundle_file); - /* bundle internals use argv[1] as further parameters */ - - memset(&header, 0, sizeof(header)); - if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0) - return 1; - close(bundle_fd); - if (verify_bundle(the_repository, &header, !quiet)) - return 1; - fprintf(stderr, _("%s is okay\n"), bundle_file); - return 0; -} - -static int cmd_bundle_list_heads(int argc, const char **argv, const char *prefix) { - struct bundle_header header; - int bundle_fd = -1; - - struct option options[] = { - OPT_END() - }; - const char* bundle_file; - - argc = parse_options_cmd_bundle(argc, argv, prefix, - builtin_bundle_list_heads_usage, options, &bundle_file); - /* bundle internals use argv[1] as further parameters */ - - memset(&header, 0, sizeof(header)); - if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0) - return 1; - close(bundle_fd); - return !!list_bundle_refs(&header, argc, argv); -} - -static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix) { +int cmd_bundle(int argc, const char **argv, const char *prefix) +{ struct bundle_header header; + const char *cmd, *bundle_file; int bundle_fd = -1; - struct option options[] = { - OPT_END() - }; - const char* bundle_file; + if (argc < 3) + usage(builtin_bundle_usage); - argc = parse_options_cmd_bundle(argc, argv, prefix, - builtin_bundle_unbundle_usage, options, &bundle_file); - /* bundle internals use argv[1] as further parameters */ + cmd = argv[1]; + bundle_file = prefix_filename(prefix, argv[2]); + argc -= 2; + argv += 2; memset(&header, 0, sizeof(header)); - if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0) + if (strcmp(cmd, "create") && (bundle_fd = + read_bundle_header(bundle_file, &header)) < 0) return 1; - if (!startup_info->have_repository) - die(_("Need a repository to unbundle.")); - return !!unbundle(the_repository, &header, bundle_fd, 0) || - list_bundle_refs(&header, argc, argv); -} - -int cmd_bundle(int argc, const char **argv, const char *prefix) -{ - struct option options[] = { - OPT__VERBOSE(&verbose, N_("be verbose; must be placed before a subcommand")), - OPT_END() - }; - int result; - - argc = parse_options(argc, argv, prefix, options, builtin_bundle_usage, - PARSE_OPT_STOP_AT_NON_OPTION); - - packet_trace_identity("bundle"); - if (argc < 2) - usage_with_options(builtin_bundle_usage, options); - - else if (!strcmp(argv[0], "create")) - result = cmd_bundle_create(argc, argv, prefix); - else if (!strcmp(argv[0], "verify")) - result = cmd_bundle_verify(argc, argv, prefix); - else if (!strcmp(argv[0], "list-heads")) - result = cmd_bundle_list_heads(argc, argv, prefix); - else if (!strcmp(argv[0], "unbundle")) - result = cmd_bundle_unbundle(argc, argv, prefix); - else { - error(_("Unknown subcommand: %s"), argv[0]); - usage_with_options(builtin_bundle_usage, options); + if (!strcmp(cmd, "verify")) { + close(bundle_fd); + if (argc != 1) { + usage(builtin_bundle_usage); + return 1; + } + if (verify_bundle(the_repository, &header, 1)) + return 1; + fprintf(stderr, _("%s is okay\n"), bundle_file); + return 0; + } + if (!strcmp(cmd, "list-heads")) { + close(bundle_fd); + return !!list_bundle_refs(&header, argc, argv); } - return result ? 1 : 0; + if (!strcmp(cmd, "create")) { + if (argc < 2) { + usage(builtin_bundle_usage); + return 1; + } + if (!startup_info->have_repository) + die(_("Need a repository to create a bundle.")); + return !!create_bundle(the_repository, bundle_file, argc, argv); + } else if (!strcmp(cmd, "unbundle")) { + if (!startup_info->have_repository) + die(_("Need a repository to unbundle.")); + return !!unbundle(the_repository, &header, bundle_fd, 0) || + list_bundle_refs(&header, argc, argv); + } else + usage(builtin_bundle_usage); } diff --git a/third_party/git/builtin/cat-file.c b/third_party/git/builtin/cat-file.c index 272f9fc6d7..995d47c85a 100644 --- a/third_party/git/builtin/cat-file.c +++ b/third_party/git/builtin/cat-file.c @@ -15,7 +15,6 @@ #include "sha1-array.h" #include "packfile.h" #include "object-store.h" -#include "promisor-remote.h" struct batch_options { int enabled; @@ -262,7 +261,7 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len, strbuf_addstr(sb, data->rest); } else if (is_atom("deltabase", atom, len)) { if (data->mark_query) - data->info.delta_base_oid = &data->delta_base_oid; + data->info.delta_base_sha1 = data->delta_base_oid.hash; else strbuf_addstr(sb, oid_to_hex(&data->delta_base_oid)); @@ -525,8 +524,8 @@ static int batch_objects(struct batch_options *opt) if (opt->all_objects) { struct object_cb_data cb; - if (has_promisor_remote()) - warning("This repository uses promisor remotes. Some objects may not be loaded."); + if (repository_format_partial_clone) + warning("This repository has extensions.partialClone set. Some objects may not be loaded."); cb.opt = opt; cb.expand = &data; diff --git a/third_party/git/builtin/check-ignore.c b/third_party/git/builtin/check-ignore.c index ea5d0ae3a6..599097304b 100644 --- a/third_party/git/builtin/check-ignore.c +++ b/third_party/git/builtin/check-ignore.c @@ -32,19 +32,19 @@ static const struct option check_ignore_options[] = { OPT_END() }; -static void output_pattern(const char *path, struct path_pattern *pattern) +static void output_exclude(const char *path, struct exclude *exclude) { - char *bang = (pattern && pattern->flags & PATTERN_FLAG_NEGATIVE) ? "!" : ""; - char *slash = (pattern && pattern->flags & PATTERN_FLAG_MUSTBEDIR) ? "/" : ""; + char *bang = (exclude && exclude->flags & EXC_FLAG_NEGATIVE) ? "!" : ""; + char *slash = (exclude && exclude->flags & EXC_FLAG_MUSTBEDIR) ? "/" : ""; if (!nul_term_line) { if (!verbose) { write_name_quoted(path, stdout, '\n'); } else { - if (pattern) { - quote_c_style(pattern->pl->src, NULL, stdout, 0); + if (exclude) { + quote_c_style(exclude->el->src, NULL, stdout, 0); printf(":%d:%s%s%s\t", - pattern->srcpos, - bang, pattern->pattern, slash); + exclude->srcpos, + bang, exclude->pattern, slash); } else { printf("::\t"); @@ -56,11 +56,11 @@ static void output_pattern(const char *path, struct path_pattern *pattern) if (!verbose) { printf("%s%c", path, '\0'); } else { - if (pattern) + if (exclude) printf("%s%c%d%c%s%s%s%c%s%c", - pattern->pl->src, '\0', - pattern->srcpos, '\0', - bang, pattern->pattern, slash, '\0', + exclude->el->src, '\0', + exclude->srcpos, '\0', + bang, exclude->pattern, slash, '\0', path, '\0'); else printf("%c%c%c%s%c", '\0', '\0', '\0', path, '\0'); @@ -74,7 +74,7 @@ static int check_ignore(struct dir_struct *dir, const char *full_path; char *seen; int num_ignored = 0, i; - struct path_pattern *pattern; + struct exclude *exclude; struct pathspec pathspec; if (!argc) { @@ -103,18 +103,15 @@ static int check_ignore(struct dir_struct *dir, seen = find_pathspecs_matching_against_index(&pathspec, &the_index); for (i = 0; i < pathspec.nr; i++) { full_path = pathspec.items[i].match; - pattern = NULL; + exclude = NULL; if (!seen[i]) { int dtype = DT_UNKNOWN; - pattern = last_matching_pattern(dir, &the_index, + exclude = last_exclude_matching(dir, &the_index, full_path, &dtype); - if (!verbose && pattern && - pattern->flags & PATTERN_FLAG_NEGATIVE) - pattern = NULL; } - if (!quiet && (pattern || show_non_matching)) - output_pattern(pathspec.items[i].original, pattern); - if (pattern) + if (!quiet && (exclude || show_non_matching)) + output_exclude(pathspec.items[i].original, exclude); + if (exclude) num_ignored++; } free(seen); diff --git a/third_party/git/builtin/checkout.c b/third_party/git/builtin/checkout.c index d6773818b8..6123f732a2 100644 --- a/third_party/git/builtin/checkout.c +++ b/third_party/git/builtin/checkout.c @@ -70,8 +70,6 @@ struct checkout_opts { int checkout_worktree; const char *ignore_unmerged_opt; int ignore_unmerged; - int pathspec_file_nul; - const char *pathspec_from_file; const char *new_branch; const char *new_branch_force; @@ -128,7 +126,6 @@ static int update_some(const struct object_id *oid, struct strbuf *base, if (pos >= 0) { struct cache_entry *old = active_cache[pos]; if (ce->ce_mode == old->ce_mode && - !ce_intent_to_add(old) && oideq(&ce->oid, &old->oid)) { old->ce_flags |= CE_UPDATE; discard_cache_entry(ce); @@ -524,8 +521,6 @@ static int checkout_paths(const struct checkout_opts *opts, /* Now we are committed to check them out */ if (opts->checkout_worktree) errs |= checkout_worktree(opts); - else - remove_marked_cache_entries(&the_index, 1); /* * Allow updating the index when checking out from the index. @@ -713,11 +708,11 @@ static int merge_working_tree(const struct checkout_opts *opts, * give up or do a real merge, depending on * whether the merge flag was used. */ + struct tree *result; struct tree *work; struct tree *old_tree; struct merge_options o; struct strbuf sb = STRBUF_INIT; - struct strbuf old_commit_shortname = STRBUF_INIT; if (!opts->merge) return 1; @@ -735,6 +730,13 @@ static int merge_working_tree(const struct checkout_opts *opts, "the following files:\n%s"), sb.buf); strbuf_release(&sb); + if (repo_index_has_changes(the_repository, + get_commit_tree(old_branch_info->commit), + &sb)) + warning(_("staged changes in the following files may be lost: %s"), + sb.buf); + strbuf_release(&sb); + /* Do more real merge */ /* @@ -758,7 +760,7 @@ static int merge_working_tree(const struct checkout_opts *opts, */ init_merge_options(&o, the_repository); o.verbosity = 0; - work = write_in_core_index_as_tree(the_repository); + work = write_tree_from_memory(&o); ret = reset_tree(new_tree, opts, 1, @@ -766,25 +768,19 @@ static int merge_working_tree(const struct checkout_opts *opts, if (ret) return ret; o.ancestor = old_branch_info->name; - if (old_branch_info->name == NULL) { - strbuf_add_unique_abbrev(&old_commit_shortname, - &old_branch_info->commit->object.oid, - DEFAULT_ABBREV); - o.ancestor = old_commit_shortname.buf; - } o.branch1 = new_branch_info->name; o.branch2 = "local"; ret = merge_trees(&o, new_tree, work, - old_tree); + old_tree, + &result); if (ret < 0) exit(128); ret = reset_tree(new_tree, opts, 0, writeout_error); strbuf_release(&o.obuf); - strbuf_release(&old_commit_shortname); if (ret) return ret; } @@ -865,7 +861,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts, strbuf_addf(&msg, "checkout: moving from %s to %s", old_desc ? old_desc : "(invalid)", new_branch_info->name); else - strbuf_insertstr(&msg, 0, reflog_msg); + strbuf_insert(&msg, 0, reflog_msg, strlen(reflog_msg)); if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) { /* Nothing to do. */ @@ -1117,43 +1113,12 @@ static void setup_new_branch_info_and_source_tree( } } -static const char *parse_remote_branch(const char *arg, - struct object_id *rev, - int could_be_checkout_paths) -{ - int num_matches = 0; - const char *remote = unique_tracking_name(arg, rev, &num_matches); - - if (remote && could_be_checkout_paths) { - die(_("'%s' could be both a local file and a tracking branch.\n" - "Please use -- (and optionally --no-guess) to disambiguate"), - arg); - } - - if (!remote && num_matches > 1) { - if (advice_checkout_ambiguous_remote_branch_name) { - advise(_("If you meant to check out a remote tracking branch on, e.g. 'origin',\n" - "you can do so by fully qualifying the name with the --track option:\n" - "\n" - " git checkout --track origin/<name>\n" - "\n" - "If you'd like to always have checkouts of an ambiguous <name> prefer\n" - "one remote, e.g. the 'origin' remote, consider setting\n" - "checkout.defaultRemote=origin in your config.")); - } - - die(_("'%s' matched multiple (%d) remote tracking branches"), - arg, num_matches); - } - - return remote; -} - static int parse_branchname_arg(int argc, const char **argv, int dwim_new_local_branch_ok, struct branch_info *new_branch_info, struct checkout_opts *opts, - struct object_id *rev) + struct object_id *rev, + int *dwim_remotes_matched) { const char **new_branch = &opts->new_branch; int argcount = 0; @@ -1258,9 +1223,13 @@ static int parse_branchname_arg(int argc, const char **argv, recover_with_dwim = 0; if (recover_with_dwim) { - const char *remote = parse_remote_branch(arg, rev, - could_be_checkout_paths); + const char *remote = unique_tracking_name(arg, rev, + dwim_remotes_matched); if (remote) { + if (could_be_checkout_paths) + die(_("'%s' could be both a local file and a tracking branch.\n" + "Please use -- (and optionally --no-guess) to disambiguate"), + arg); *new_branch = arg; arg = remote; /* DWIMmed to create local branch, case (3).(b) */ @@ -1511,8 +1480,6 @@ static struct option *add_checkout_path_options(struct checkout_opts *opts, OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")), OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree, N_("do not limit pathspecs to sparse entries only")), - OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file), - OPT_PATHSPEC_FILE_NUL(&opts->pathspec_file_nul), OPT_END() }; struct option *newopts = parse_options_concat(prevopts, options); @@ -1525,6 +1492,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix, const char * const usagestr[]) { struct branch_info new_branch_info; + int dwim_remotes_matched = 0; int parseopt_flags = 0; memset(&new_branch_info, 0, sizeof(new_branch_info)); @@ -1632,7 +1600,8 @@ static int checkout_main(int argc, const char **argv, const char *prefix, opts->track == BRANCH_TRACK_UNSPECIFIED && !opts->new_branch; int n = parse_branchname_arg(argc, argv, dwim_ok, - &new_branch_info, opts, &rev); + &new_branch_info, opts, &rev, + &dwim_remotes_matched); argv += n; argc -= n; } else if (!opts->accept_ref && opts->from_treeish) { @@ -1649,6 +1618,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix, die(_("reference is not a tree: %s"), opts->from_treeish); } + if (opts->accept_pathspec && !opts->empty_pathspec_ok && !argc && + !opts->patch_mode) /* patch mode is special */ + die(_("you must specify path(s) to restore")); + if (argc) { parse_pathspec(&opts->pathspec, 0, opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0, @@ -1668,33 +1641,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix, if (opts->force_detach) die(_("git checkout: --detach does not take a path argument '%s'"), argv[0]); - } - if (opts->pathspec_from_file) { - if (opts->pathspec.nr) - die(_("--pathspec-from-file is incompatible with pathspec arguments")); - - if (opts->force_detach) - die(_("--pathspec-from-file is incompatible with --detach")); - - if (opts->patch_mode) - die(_("--pathspec-from-file is incompatible with --patch")); - - parse_pathspec_file(&opts->pathspec, 0, - 0, - prefix, opts->pathspec_from_file, opts->pathspec_file_nul); - } else if (opts->pathspec_file_nul) { - die(_("--pathspec-file-nul requires --pathspec-from-file")); - } - - if (opts->pathspec.nr) { if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge) die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index.")); - } else { - if (opts->accept_pathspec && !opts->empty_pathspec_ok && - !opts->patch_mode) /* patch mode is special */ - die(_("you must specify path(s) to restore")); } if (opts->new_branch) { @@ -1709,10 +1659,28 @@ static int checkout_main(int argc, const char **argv, const char *prefix, } UNLEAK(opts); - if (opts->patch_mode || opts->pathspec.nr) - return checkout_paths(opts, new_branch_info.name); - else + if (opts->patch_mode || opts->pathspec.nr) { + int ret = checkout_paths(opts, new_branch_info.name); + if (ret && dwim_remotes_matched > 1 && + advice_checkout_ambiguous_remote_branch_name) + advise(_("'%s' matched more than one remote tracking branch.\n" + "We found %d remotes with a reference that matched. So we fell back\n" + "on trying to resolve the argument as a path, but failed there too!\n" + "\n" + "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" + "you can do so by fully qualifying the name with the --track option:\n" + "\n" + " git checkout --track origin/<name>\n" + "\n" + "If you'd like to always have checkouts of an ambiguous <name> prefer\n" + "one remote, e.g. the 'origin' remote, consider setting\n" + "checkout.defaultRemote=origin in your config."), + argv[0], + dwim_remotes_matched); + return ret; + } else { return checkout_branch(opts, &new_branch_info); + } } int cmd_checkout(int argc, const char **argv, const char *prefix) @@ -1746,15 +1714,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) opts.checkout_index = -2; /* default on */ opts.checkout_worktree = -2; /* default on */ - if (argc == 3 && !strcmp(argv[1], "-b")) { - /* - * User ran 'git checkout -b <branch>' and expects - * the same behavior as 'git switch -c <branch>'. - */ - opts.switch_branch_doing_nothing_is_ok = 0; - opts.only_merge_on_switching_branches = 1; - } - options = parse_options_dup(checkout_options); options = add_common_options(&opts, options); options = add_common_switch_branch_options(&opts, options); diff --git a/third_party/git/builtin/clean.c b/third_party/git/builtin/clean.c index 5abf087e7c..d5579da716 100644 --- a/third_party/git/builtin/clean.c +++ b/third_party/git/builtin/clean.c @@ -158,8 +158,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, *dir_gone = 1; - if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) && - is_nonbare_repository_dir(path)) { + if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) && is_nonbare_repository_dir(path)) { if (!quiet) { quote_path_relative(path->buf, prefix, "ed); printf(dry_run ? _(msg_would_skip_git_dir) : _(msg_skip_git_dir), @@ -649,7 +648,7 @@ static int filter_by_patterns_cmd(void) struct strbuf confirm = STRBUF_INIT; struct strbuf **ignore_list; struct string_list_item *item; - struct pattern_list *pl; + struct exclude_list *el; int changed = -1, i; for (;;) { @@ -672,7 +671,7 @@ static int filter_by_patterns_cmd(void) break; memset(&dir, 0, sizeof(dir)); - pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude"); + el = add_exclude_list(&dir, EXC_CMDL, "manual exclude"); ignore_list = strbuf_split_max(&confirm, ' ', 0); for (i = 0; ignore_list[i]; i++) { @@ -680,7 +679,7 @@ static int filter_by_patterns_cmd(void) if (!ignore_list[i]->len) continue; - add_pattern(ignore_list[i]->buf, "", 0, pl, -(i+1)); + add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1)); } changed = 0; @@ -902,7 +901,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) struct pathspec pathspec; struct strbuf buf = STRBUF_INIT; struct string_list exclude_list = STRING_LIST_INIT_NODUP; - struct pattern_list *pl; + struct exclude_list *el; struct string_list_item *item; const char *qname; struct option options[] = { @@ -947,19 +946,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (force > 1) rm_flags = 0; - else - dir.flags |= DIR_SKIP_NESTED_GIT; dir.flags |= DIR_SHOW_OTHER_DIRECTORIES; - if (argc) { - /* - * Remaining args implies pathspecs specified, and we should - * recurse within those. - */ - remove_directories = 1; - } - if (remove_directories) dir.flags |= DIR_SHOW_IGNORED_TOO | DIR_KEEP_UNTRACKED_CONTENTS; @@ -969,9 +958,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!ignored) setup_standard_excludes(&dir); - pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option"); + el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) - add_pattern(exclude_list.items[i].string, "", 0, pl, -(i+1)); + add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1)); parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, @@ -1018,7 +1007,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix) for_each_string_list_item(item, &del_list) { struct stat st; - strbuf_reset(&abs_path); if (prefix) strbuf_addstr(&abs_path, prefix); @@ -1052,6 +1040,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname); } } + strbuf_reset(&abs_path); } strbuf_release(&abs_path); diff --git a/third_party/git/builtin/clone.c b/third_party/git/builtin/clone.c index 1ad26f4d8c..f665b28ccc 100644 --- a/third_party/git/builtin/clone.c +++ b/third_party/git/builtin/clone.c @@ -32,6 +32,7 @@ #include "connected.h" #include "packfile.h" #include "list-objects-filter-options.h" +#include "object-store.h" /* * Overall FIXMEs: @@ -59,7 +60,6 @@ static const char *real_git_dir; static char *option_upload_pack = "git-upload-pack"; static int option_verbosity; static int option_progress = -1; -static int option_sparse_checkout; static enum transport_family family; static struct string_list option_config = STRING_LIST_INIT_NODUP; static struct string_list option_required_reference = STRING_LIST_INIT_NODUP; @@ -147,8 +147,6 @@ static struct option builtin_clone_options[] = { OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options), OPT_BOOL(0, "remote-submodules", &option_remote_submodules, N_("any cloned submodules will use their remote-tracking branch")), - OPT_BOOL(0, "sparse", &option_sparse_checkout, - N_("initialize sparse-checkout file to include only files at root")), OPT_END() }; @@ -673,7 +671,7 @@ static void update_remote_refs(const struct ref *refs, const char *msg, struct transport *transport, int check_connectivity, - int check_refs_are_promisor_objects_only) + int check_refs_only) { const struct ref *rm = mapped_refs; @@ -682,8 +680,7 @@ static void update_remote_refs(const struct ref *refs, opt.transport = transport; opt.progress = transport->progress; - opt.check_refs_are_promisor_objects_only = - !!check_refs_are_promisor_objects_only; + opt.check_refs_only = !!check_refs_only; if (check_connected(iterate_ref_map, &rm, &opt)) die(_("remote did not send all necessary objects")); @@ -737,27 +734,6 @@ static void update_head(const struct ref *our, const struct ref *remote, } } -static int git_sparse_checkout_init(const char *repo) -{ - struct argv_array argv = ARGV_ARRAY_INIT; - int result = 0; - argv_array_pushl(&argv, "-C", repo, "sparse-checkout", "init", NULL); - - /* - * We must apply the setting in the current process - * for the later checkout to use the sparse-checkout file. - */ - core_apply_sparse_checkout = 1; - - if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { - error(_("failed to initialize sparse-checkout")); - result = 1; - } - - argv_array_clear(&argv); - return result; -} - static int checkout(int submodule_progress) { struct object_id oid; @@ -809,12 +785,12 @@ static int checkout(int submodule_progress) if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); - err |= run_hook_le(NULL, "post-checkout", oid_to_hex(&null_oid), + err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1), oid_to_hex(&oid), "1", NULL); if (!err && (option_recurse_submodules.nr > 0)) { struct argv_array args = ARGV_ARRAY_INIT; - argv_array_pushl(&args, "submodule", "update", "--require-init", "--recursive", NULL); + argv_array_pushl(&args, "submodule", "update", "--init", "--recursive", NULL); if (option_shallow_submodules == 1) argv_array_push(&args, "--depth=1"); @@ -833,11 +809,6 @@ static int checkout(int submodule_progress) argv_array_push(&args, "--no-fetch"); } - if (option_single_branch >= 0) - argv_array_push(&args, option_single_branch ? - "--single-branch" : - "--no-single-branch"); - err = run_command_v_opt(args.argv, RUN_GIT_CMD); argv_array_clear(&args); } @@ -929,7 +900,7 @@ static void dissociate_from_references(void) free(alternates); } -static int path_exists(const char *path) +static int dir_exists(const char *path) { struct stat sb; return !stat(path, &sb); @@ -957,6 +928,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) struct argv_array ref_prefixes = ARGV_ARRAY_INIT; + fetch_if_missing = 0; + packet_trace_identity("clone"); argc = parse_options(argc, argv, prefix, builtin_clone_options, builtin_clone_usage, 0); @@ -1009,7 +982,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) dir = guess_dir_name(repo_name, is_bundle, option_bare); strip_trailing_slashes(dir); - dest_exists = path_exists(dir); + dest_exists = dir_exists(dir); if (dest_exists && !is_empty_dir(dir)) die(_("destination path '%s' already exists and is not " "an empty directory."), dir); @@ -1020,7 +993,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) work_tree = NULL; else { work_tree = getenv("GIT_WORK_TREE"); - if (work_tree && path_exists(work_tree)) + if (work_tree && dir_exists(work_tree)) die(_("working tree '%s' already exists."), work_tree); } @@ -1048,7 +1021,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) } if (real_git_dir) { - if (path_exists(real_git_dir)) + if (dir_exists(real_git_dir)) junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL; junk_git_dir = real_git_dir; } else { @@ -1134,9 +1107,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (option_required_reference.nr || option_optional_reference.nr) setup_reference(); - if (option_sparse_checkout && git_sparse_checkout_init(dir)) - return 1; - remote = remote_get(option_origin); strbuf_addf(&default_refspec, "+%s*:%s*", src_ref_prefix, @@ -1190,11 +1160,13 @@ int cmd_clone(int argc, const char **argv, const char *prefix) transport->server_options = &server_options; if (filter_options.choice) { - const char *spec = - expand_list_objects_filter_spec(&filter_options); + struct strbuf expanded_filter_spec = STRBUF_INIT; + expand_list_objects_filter_spec(&filter_options, + &expanded_filter_spec); transport_set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, - spec); + expanded_filter_spec.buf); transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); + strbuf_release(&expanded_filter_spec); } if (transport->smart_options && !deepen && !filter_options.choice) @@ -1296,6 +1268,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) } junk_mode = JUNK_LEAVE_REPO; + fetch_if_missing = 1; err = checkout(submodule_progress); strbuf_release(&reflog_msg); diff --git a/third_party/git/builtin/commit-graph.c b/third_party/git/builtin/commit-graph.c index 4a70b33fb5..38027b83d9 100644 --- a/third_party/git/builtin/commit-graph.c +++ b/third_party/git/builtin/commit-graph.c @@ -8,18 +8,25 @@ #include "object-store.h" static char const * const builtin_commit_graph_usage[] = { - N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"), - N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"), + N_("git commit-graph [--object-dir <objdir>]"), + N_("git commit-graph read [--object-dir <objdir>]"), + N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"), + N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"), NULL }; static const char * const builtin_commit_graph_verify_usage[] = { - N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"), + N_("git commit-graph verify [--object-dir <objdir>] [--shallow]"), + NULL +}; + +static const char * const builtin_commit_graph_read_usage[] = { + N_("git commit-graph read [--object-dir <objdir>]"), NULL }; static const char * const builtin_commit_graph_write_usage[] = { - N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"), + N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>"), NULL }; @@ -31,32 +38,11 @@ static struct opts_commit_graph { int append; int split; int shallow; - int progress; } opts; -static struct object_directory *find_odb(struct repository *r, - const char *obj_dir) -{ - struct object_directory *odb; - char *obj_dir_real = real_pathdup(obj_dir, 1); - - prepare_alt_odb(r); - for (odb = r->objects->odb; odb; odb = odb->next) { - if (!strcmp(obj_dir_real, real_path(odb->path))) - break; - } - - free(obj_dir_real); - - if (!odb) - die(_("could not find object directory matching %s"), obj_dir); - return odb; -} - static int graph_verify(int argc, const char **argv) { struct commit_graph *graph = NULL; - struct object_directory *odb = NULL; char *graph_name; int open_ok; int fd; @@ -69,13 +55,9 @@ static int graph_verify(int argc, const char **argv) N_("The object directory to store the graph")), OPT_BOOL(0, "shallow", &opts.shallow, N_("if the commit-graph is split, only verify the tip file")), - OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")), OPT_END(), }; - trace2_cmd_mode("verify"); - - opts.progress = isatty(2); argc = parse_options(argc, argv, NULL, builtin_commit_graph_verify_options, builtin_commit_graph_verify_usage, 0); @@ -84,11 +66,8 @@ static int graph_verify(int argc, const char **argv) opts.obj_dir = get_object_directory(); if (opts.shallow) flags |= COMMIT_GRAPH_VERIFY_SHALLOW; - if (opts.progress) - flags |= COMMIT_GRAPH_WRITE_PROGRESS; - odb = find_odb(the_repository, opts.obj_dir); - graph_name = get_commit_graph_filename(odb); + graph_name = get_commit_graph_filename(opts.obj_dir); open_ok = open_commit_graph(graph_name, &fd, &st); if (!open_ok && errno != ENOENT) die_errno(_("Could not open commit-graph '%s'"), graph_name); @@ -96,9 +75,9 @@ static int graph_verify(int argc, const char **argv) FREE_AND_NULL(graph_name); if (open_ok) - graph = load_commit_graph_one_fd_st(fd, &st, odb); - else - graph = read_commit_graph_one(the_repository, odb); + graph = load_commit_graph_one_fd_st(fd, &st); + else + graph = read_commit_graph_one(the_repository, opts.obj_dir); /* Return failure if open_ok predicted success */ if (!graph) @@ -108,6 +87,64 @@ static int graph_verify(int argc, const char **argv) return verify_commit_graph(the_repository, graph, flags); } +static int graph_read(int argc, const char **argv) +{ + struct commit_graph *graph = NULL; + char *graph_name; + int open_ok; + int fd; + struct stat st; + + static struct option builtin_commit_graph_read_options[] = { + OPT_STRING(0, "object-dir", &opts.obj_dir, + N_("dir"), + N_("The object directory to store the graph")), + OPT_END(), + }; + + argc = parse_options(argc, argv, NULL, + builtin_commit_graph_read_options, + builtin_commit_graph_read_usage, 0); + + if (!opts.obj_dir) + opts.obj_dir = get_object_directory(); + + graph_name = get_commit_graph_filename(opts.obj_dir); + + open_ok = open_commit_graph(graph_name, &fd, &st); + if (!open_ok) + die_errno(_("Could not open commit-graph '%s'"), graph_name); + + graph = load_commit_graph_one_fd_st(fd, &st); + if (!graph) + return 1; + + FREE_AND_NULL(graph_name); + + printf("header: %08x %d %d %d %d\n", + ntohl(*(uint32_t*)graph->data), + *(unsigned char*)(graph->data + 4), + *(unsigned char*)(graph->data + 5), + *(unsigned char*)(graph->data + 6), + *(unsigned char*)(graph->data + 7)); + printf("num_commits: %u\n", graph->num_commits); + printf("chunks:"); + + if (graph->chunk_oid_fanout) + printf(" oid_fanout"); + if (graph->chunk_oid_lookup) + printf(" oid_lookup"); + if (graph->chunk_commit_data) + printf(" commit_metadata"); + if (graph->chunk_extra_edges) + printf(" extra_edges"); + printf("\n"); + + UNLEAK(graph); + + return 0; +} + extern int read_replace_refs; static struct split_commit_graph_opts split_opts; @@ -115,10 +152,9 @@ static int graph_write(int argc, const char **argv) { struct string_list *pack_indexes = NULL; struct string_list *commit_hex = NULL; - struct object_directory *odb = NULL; struct string_list lines; int result = 0; - enum commit_graph_write_flags flags = 0; + unsigned int flags = COMMIT_GRAPH_PROGRESS; static struct option builtin_commit_graph_write_options[] = { OPT_STRING(0, "object-dir", &opts.obj_dir, @@ -132,7 +168,6 @@ static int graph_write(int argc, const char **argv) N_("start walk at commits listed by stdin")), OPT_BOOL(0, "append", &opts.append, N_("include all commits already in the commit-graph file")), - OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")), OPT_BOOL(0, "split", &opts.split, N_("allow writing an incremental commit-graph file")), OPT_INTEGER(0, "max-commits", &split_opts.max_commits, @@ -144,13 +179,10 @@ static int graph_write(int argc, const char **argv) OPT_END(), }; - opts.progress = isatty(2); split_opts.size_multiple = 2; split_opts.max_commits = 0; split_opts.expire_time = 0; - trace2_cmd_mode("write"); - argc = parse_options(argc, argv, NULL, builtin_commit_graph_write_options, builtin_commit_graph_write_usage, 0); @@ -160,17 +192,14 @@ static int graph_write(int argc, const char **argv) if (!opts.obj_dir) opts.obj_dir = get_object_directory(); if (opts.append) - flags |= COMMIT_GRAPH_WRITE_APPEND; + flags |= COMMIT_GRAPH_APPEND; if (opts.split) - flags |= COMMIT_GRAPH_WRITE_SPLIT; - if (opts.progress) - flags |= COMMIT_GRAPH_WRITE_PROGRESS; + flags |= COMMIT_GRAPH_SPLIT; read_replace_refs = 0; - odb = find_odb(the_repository, opts.obj_dir); if (opts.reachable) { - if (write_commit_graph_reachable(odb, flags, &split_opts)) + if (write_commit_graph_reachable(opts.obj_dir, flags, &split_opts)) return 1; return 0; } @@ -184,15 +213,13 @@ static int graph_write(int argc, const char **argv) if (opts.stdin_packs) pack_indexes = &lines; - if (opts.stdin_commits) { + if (opts.stdin_commits) commit_hex = &lines; - flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS; - } UNLEAK(buf); } - if (write_commit_graph(odb, + if (write_commit_graph(opts.obj_dir, pack_indexes, commit_hex, flags, @@ -222,9 +249,9 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix) builtin_commit_graph_usage, PARSE_OPT_STOP_AT_NON_OPTION); - save_commit_buffer = 0; - if (argc > 0) { + if (!strcmp(argv[0], "read")) + return graph_read(argc, argv); if (!strcmp(argv[0], "verify")) return graph_verify(argc, argv); if (!strcmp(argv[0], "write")) diff --git a/third_party/git/builtin/commit.c b/third_party/git/builtin/commit.c index 7ba33a3bec..ae7aaf6dc6 100644 --- a/third_party/git/builtin/commit.c +++ b/third_party/git/builtin/commit.c @@ -107,9 +107,9 @@ static int all, also, interactive, patch_interactive, only, amend, signoff; static int edit_flag = -1; /* unspecified */ static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship; static int config_commit_verbose = -1; /* unspecified */ -static int no_post_rewrite, allow_empty_message, pathspec_file_nul; +static int no_post_rewrite, allow_empty_message; static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg; -static char *sign_commit, *pathspec_from_file; +static char *sign_commit; /* * The default commit message cleanup mode will remove the lines @@ -343,31 +343,11 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix PATHSPEC_PREFER_FULL, prefix, argv); - if (pathspec_from_file) { - if (interactive) - die(_("--pathspec-from-file is incompatible with --interactive/--patch")); - - if (all) - die(_("--pathspec-from-file with -a does not make sense")); - - if (pathspec.nr) - die(_("--pathspec-from-file is incompatible with pathspec arguments")); - - parse_pathspec_file(&pathspec, 0, - PATHSPEC_PREFER_FULL, - prefix, pathspec_from_file, pathspec_file_nul); - } else if (pathspec_file_nul) { - die(_("--pathspec-file-nul requires --pathspec-from-file")); - } - - if (!pathspec.nr && (also || (only && !amend && !allow_empty))) - die(_("No paths with --include/--only does not make sense.")); - if (read_cache_preload(&pathspec) < 0) die(_("index file corrupt")); if (interactive) { - char *old_index_env = NULL, *old_repo_index_file; + char *old_index_env = NULL; hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR); refresh_cache_or_die(refresh_flags); @@ -375,16 +355,12 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix if (write_locked_index(&the_index, &index_lock, 0)) die(_("unable to create temporary index")); - old_repo_index_file = the_repository->index_file; - the_repository->index_file = - (char *)get_lock_file_path(&index_lock); old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT)); - setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1); + setenv(INDEX_ENVIRONMENT, get_lock_file_path(&index_lock), 1); if (interactive_add(argc, argv, prefix, patch_interactive) != 0) die(_("interactive add failed")); - the_repository->index_file = old_repo_index_file; if (old_index_env && *old_index_env) setenv(INDEX_ENVIRONMENT, old_index_env, 1); else @@ -534,7 +510,7 @@ static int run_status(FILE *fp, const char *index_file, const char *prefix, int s->nowarn = nowarn; s->is_initial = get_oid(s->reference, &oid) ? 1 : 0; if (!s->is_initial) - oidcpy(&s->oid_commit, &oid); + hashcpy(s->sha1_commit, oid.hash); s->status_format = status_format; s->ignore_submodule_arg = ignore_submodule_arg; @@ -561,7 +537,7 @@ static void export_one(const char *var, const char *s, const char *e, int hack) struct strbuf buf = STRBUF_INIT; if (hack) strbuf_addch(&buf, hack); - strbuf_add(&buf, s, e - s); + strbuf_addf(&buf, "%.*s", (int)(e - s), s); setenv(var, buf.buf, 1); strbuf_release(&buf); } @@ -968,7 +944,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix, */ if (!committable && whence != FROM_MERGE && !allow_empty && !(amend && is_a_merge(current_head))) { - s->hints = advice_status_hints; s->display_comment_prefix = old_display_comment_prefix; run_status(stdout, index_file, prefix, 0, s); if (amend) @@ -1223,6 +1198,8 @@ static int parse_and_validate_options(int argc, const char *argv[], if (also + only + all + interactive > 1) die(_("Only one of --include/--only/--all/--interactive/--patch can be used.")); + if (argc == 0 && (also || (only && !amend && !allow_empty))) + die(_("No paths with --include/--only does not make sense.")); cleanup_mode = get_cleanup_mode(cleanup_arg, use_editor); handle_untracked_files_arg(s); @@ -1429,7 +1406,7 @@ int cmd_status(int argc, const char **argv, const char *prefix) s.is_initial = get_oid(s.reference, &oid) ? 1 : 0; if (!s.is_initial) - oidcpy(&s.oid_commit, &oid); + hashcpy(s.sha1_commit, oid.hash); s.ignore_submodule_arg = ignore_submodule_arg; s.status_format = status_format; @@ -1486,6 +1463,28 @@ static int git_commit_config(const char *k, const char *v, void *cb) return git_status_config(k, v, s); } +int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...) +{ + struct argv_array hook_env = ARGV_ARRAY_INIT; + va_list args; + int ret; + + argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file); + + /* + * Let the hook know that no editor will be launched. + */ + if (!editor_is_used) + argv_array_push(&hook_env, "GIT_EDITOR=:"); + + va_start(args, name); + ret = run_hook_ve(hook_env.argv,name, args); + va_end(args); + argv_array_clear(&hook_env); + + return ret; +} + int cmd_commit(int argc, const char **argv, const char *prefix) { const char *argv_gc_auto[] = {"gc", "--auto", NULL}; @@ -1536,8 +1535,6 @@ int cmd_commit(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "amend", &amend, N_("amend previous commit")), OPT_BOOL(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")), { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, - OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), - OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), /* end commit contents options */ OPT_HIDDEN_BOOL(0, "allow-empty", &allow_empty, @@ -1693,7 +1690,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) "not exceeded, and then \"git restore --staged :/\" to recover.")); if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - write_commit_graph_reachable(the_repository->objects->odb, 0, NULL)) + write_commit_graph_reachable(get_object_directory(), 0, NULL)) return 1; repo_rerere(the_repository, 0); diff --git a/third_party/git/builtin/config.c b/third_party/git/builtin/config.c index ee4aef6a35..98d65bc0ad 100644 --- a/third_party/git/builtin/config.c +++ b/third_party/git/builtin/config.c @@ -29,11 +29,10 @@ static int use_worktree_config; static struct git_config_source given_config_source; static int actions, type; static char *default_value; -static int end_nul; +static int end_null; static int respect_includes_opt = -1; static struct config_options config_options; static int show_origin; -static int show_scope; #define ACTION_GET (1<<0) #define ACTION_GET_ALL (1<<1) @@ -152,11 +151,10 @@ static struct option builtin_config_options[] = { OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH), OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE), OPT_GROUP(N_("Other")), - OPT_BOOL('z', "null", &end_nul, N_("terminate values with NUL byte")), + OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")), OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")), OPT_BOOL(0, "includes", &respect_includes_opt, N_("respect include directives on lookup")), OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config (file, standard input, blob, command line)")), - OPT_BOOL(0, "show-scope", &show_scope, N_("show scope of config (worktree, local, global, system, command)")), OPT_STRING(0, "default", &default_value, N_("value"), N_("with --get, use default value when missing entry")), OPT_END(), }; @@ -180,34 +178,22 @@ static void check_argc(int argc, int min, int max) static void show_config_origin(struct strbuf *buf) { - const char term = end_nul ? '\0' : '\t'; + const char term = end_null ? '\0' : '\t'; strbuf_addstr(buf, current_config_origin_type()); strbuf_addch(buf, ':'); - if (end_nul) + if (end_null) strbuf_addstr(buf, current_config_name()); else quote_c_style(current_config_name(), buf, NULL, 0); strbuf_addch(buf, term); } -static void show_config_scope(struct strbuf *buf) -{ - const char term = end_nul ? '\0' : '\t'; - const char *scope = config_scope_name(current_config_scope()); - - strbuf_addstr(buf, N_(scope)); - strbuf_addch(buf, term); -} - static int show_all_config(const char *key_, const char *value_, void *cb) { - if (show_origin || show_scope) { + if (show_origin) { struct strbuf buf = STRBUF_INIT; - if (show_scope) - show_config_scope(&buf); - if (show_origin) - show_config_origin(&buf); + show_config_origin(&buf); /* Use fwrite as "buf" can contain \0's if "end_null" is set. */ fwrite(buf.buf, 1, buf.len, stdout); strbuf_release(&buf); @@ -227,8 +213,6 @@ struct strbuf_list { static int format_config(struct strbuf *buf, const char *key_, const char *value_) { - if (show_scope) - show_config_scope(buf); if (show_origin) show_config_origin(buf); if (show_keys) @@ -638,7 +622,6 @@ int cmd_config(int argc, const char **argv, const char *prefix) !strcmp(given_config_source.file, "-")) { given_config_source.file = NULL; given_config_source.use_stdin = 1; - given_config_source.scope = CONFIG_SCOPE_COMMAND; } if (use_global_config) { @@ -654,8 +637,6 @@ int cmd_config(int argc, const char **argv, const char *prefix) */ die(_("$HOME not set")); - given_config_source.scope = CONFIG_SCOPE_GLOBAL; - if (access_or_warn(user_config, R_OK, 0) && xdg_config && !access_or_warn(xdg_config, R_OK, 0)) { given_config_source.file = xdg_config; @@ -665,13 +646,11 @@ int cmd_config(int argc, const char **argv, const char *prefix) free(xdg_config); } } - else if (use_system_config) { + else if (use_system_config) given_config_source.file = git_etc_gitconfig(); - given_config_source.scope = CONFIG_SCOPE_SYSTEM; - } else if (use_local_config) { + else if (use_local_config) given_config_source.file = git_pathdup("config"); - given_config_source.scope = CONFIG_SCOPE_LOCAL; - } else if (use_worktree_config) { + else if (use_worktree_config) { struct worktree **worktrees = get_worktrees(0); if (repository_format_worktree_config) given_config_source.file = git_pathdup("config.worktree"); @@ -683,18 +662,13 @@ int cmd_config(int argc, const char **argv, const char *prefix) "section in \"git help worktree\" for details")); else given_config_source.file = git_pathdup("config"); - given_config_source.scope = CONFIG_SCOPE_LOCAL; free_worktrees(worktrees); } else if (given_config_source.file) { if (!is_absolute_path(given_config_source.file) && prefix) given_config_source.file = prefix_filename(prefix, given_config_source.file); - given_config_source.scope = CONFIG_SCOPE_COMMAND; - } else if (given_config_source.blob) { - given_config_source.scope = CONFIG_SCOPE_COMMAND; } - if (respect_includes_opt == -1) config_options.respect_includes = !given_config_source.file; else @@ -704,7 +678,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) config_options.git_dir = get_git_dir(); } - if (end_nul) { + if (end_null) { term = '\0'; delim = '\n'; key_delim = '\n'; diff --git a/third_party/git/builtin/describe.c b/third_party/git/builtin/describe.c index 420f4c6401..200154297d 100644 --- a/third_party/git/builtin/describe.c +++ b/third_party/git/builtin/describe.c @@ -15,6 +15,7 @@ #include "argv-array.h" #include "run-command.h" #include "object-store.h" +#include "revision.h" #include "list-objects.h" #include "commit-slab.h" @@ -63,22 +64,19 @@ static const char *prio_names[] = { }; static int commit_name_neq(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *peeled) { - const struct commit_name *cn1, *cn2; - - cn1 = container_of(eptr, const struct commit_name, entry); - cn2 = container_of(entry_or_key, const struct commit_name, entry); + const struct commit_name *cn1 = entry; + const struct commit_name *cn2 = entry_or_key; return !oideq(&cn1->peeled, peeled ? peeled : &cn2->peeled); } static inline struct commit_name *find_commit_name(const struct object_id *peeled) { - return hashmap_get_entry_from_hash(&names, oidhash(peeled), peeled, - struct commit_name, entry); + return hashmap_get_from_hash(&names, oidhash(peeled), peeled); } static int replace_name(struct commit_name *e, @@ -125,8 +123,8 @@ static void add_to_known_names(const char *path, if (!e) { e = xmalloc(sizeof(struct commit_name)); oidcpy(&e->peeled, peeled); - hashmap_entry_init(&e->entry, oidhash(peeled)); - hashmap_add(&names, &e->entry); + hashmap_entry_init(e, oidhash(peeled)); + hashmap_add(&names, e); e->path = NULL; } e->tag = tag; @@ -315,7 +313,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) */ append_name(n, dst); if (longformat) - append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst); + append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst); if (suffix) strbuf_addstr(dst, suffix); return; @@ -332,8 +330,8 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) struct commit_name *n; init_commit_names(&commit_names); - hashmap_for_each_entry(&names, &iter, n, - entry /* member name */) { + n = hashmap_iter_first(&names, &iter); + for (; n; n = hashmap_iter_next(&iter)) { c = lookup_commit_reference_gently(the_repository, &n->peeled, 1); if (c) @@ -376,25 +374,11 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) if (!(c->object.flags & t->flag_within)) t->depth++; } - /* Stop if last remaining path already covered by best candidate(s) */ if (annotated_cnt && !list) { - int best_depth = INT_MAX; - unsigned best_within = 0; - for (cur_match = 0; cur_match < match_cnt; cur_match++) { - struct possible_tag *t = &all_matches[cur_match]; - if (t->depth < best_depth) { - best_depth = t->depth; - best_within = t->flag_within; - } else if (t->depth == best_depth) { - best_within |= t->flag_within; - } - } - if ((c->object.flags & best_within) == best_within) { - if (debug) - fprintf(stderr, _("finished search at %s\n"), - oid_to_hex(&c->object.oid)); - break; - } + if (debug) + fprintf(stderr, _("finished search at %s\n"), + oid_to_hex(&c->object.oid)); + break; } while (parents) { struct commit *p = parents->item; diff --git a/third_party/git/builtin/difftool.c b/third_party/git/builtin/difftool.c index c280e682b2..16eb8b70ea 100644 --- a/third_party/git/builtin/difftool.c +++ b/third_party/git/builtin/difftool.c @@ -125,15 +125,12 @@ struct working_tree_entry { }; static int working_tree_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct working_tree_entry *a, *b; - - a = container_of(eptr, const struct working_tree_entry, entry); - b = container_of(entry_or_key, const struct working_tree_entry, entry); - + const struct working_tree_entry *a = entry; + const struct working_tree_entry *b = entry_or_key; return strcmp(a->path, b->path); } @@ -148,14 +145,12 @@ struct pair_entry { }; static int pair_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct pair_entry *a, *b; - - a = container_of(eptr, const struct pair_entry, entry); - b = container_of(entry_or_key, const struct pair_entry, entry); + const struct pair_entry *a = entry; + const struct pair_entry *b = entry_or_key; return strcmp(a->path, b->path); } @@ -166,14 +161,14 @@ static void add_left_or_right(struct hashmap *map, const char *path, struct pair_entry *e, *existing; FLEX_ALLOC_STR(e, path, path); - hashmap_entry_init(&e->entry, strhash(path)); - existing = hashmap_get_entry(map, e, entry, NULL); + hashmap_entry_init(e, strhash(path)); + existing = hashmap_get(map, e, NULL); if (existing) { free(e); e = existing; } else { e->left[0] = e->right[0] = '\0'; - hashmap_add(map, &e->entry); + hashmap_add(map, e); } strlcpy(is_right ? e->right : e->left, content, PATH_MAX); } @@ -184,14 +179,12 @@ struct path_entry { }; static int path_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *key) { - const struct path_entry *a, *b; - - a = container_of(eptr, const struct path_entry, entry); - b = container_of(entry_or_key, const struct path_entry, entry); + const struct path_entry *a = entry; + const struct path_entry *b = entry_or_key; return strcmp(a->path, key ? key : b->path); } @@ -241,8 +234,8 @@ static void changed_files(struct hashmap *result, const char *index_path, while (!strbuf_getline_nul(&buf, fp)) { struct path_entry *entry; FLEX_ALLOC_STR(entry, path, buf.buf); - hashmap_entry_init(&entry->entry, strhash(buf.buf)); - hashmap_add(result, &entry->entry); + hashmap_entry_init(entry, strhash(buf.buf)); + hashmap_add(result, entry); } fclose(fp); if (finish_command(&diff_files)) @@ -468,13 +461,12 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, /* Avoid duplicate working_tree entries */ FLEX_ALLOC_STR(entry, path, dst_path); - hashmap_entry_init(&entry->entry, strhash(dst_path)); - if (hashmap_get(&working_tree_dups, &entry->entry, - NULL)) { + hashmap_entry_init(entry, strhash(dst_path)); + if (hashmap_get(&working_tree_dups, entry, NULL)) { free(entry); continue; } - hashmap_add(&working_tree_dups, &entry->entry); + hashmap_add(&working_tree_dups, entry); if (!use_wt_file(workdir, dst_path, &roid)) { if (checkout_path(rmode, &roid, dst_path, @@ -538,8 +530,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, * temporary file to both the left and right directories to show the * change in the recorded SHA1 for the submodule. */ - hashmap_for_each_entry(&submodules, &iter, entry, - entry /* member name */) { + hashmap_iter_init(&submodules, &iter); + while ((entry = hashmap_iter_next(&iter))) { if (*entry->left) { add_path(&ldir, ldir_len, entry->path); ensure_leading_directories(ldir.buf); @@ -557,8 +549,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, * shows only the link itself, not the contents of the link target. * This loop replicates that behavior. */ - hashmap_for_each_entry(&symlinks2, &iter, entry, - entry /* member name */) { + hashmap_iter_init(&symlinks2, &iter); + while ((entry = hashmap_iter_next(&iter))) { if (*entry->left) { add_path(&ldir, ldir_len, entry->path); ensure_leading_directories(ldir.buf); diff --git a/third_party/git/builtin/fast-export.c b/third_party/git/builtin/fast-export.c index 85868162ee..f541f55d33 100644 --- a/third_party/git/builtin/fast-export.c +++ b/third_party/git/builtin/fast-export.c @@ -40,7 +40,6 @@ static int no_data; static int full_tree; static int reference_excluded_commits; static int show_original_ids; -static int mark_tags; static struct string_list extra_refs = STRING_LIST_INIT_NODUP; static struct string_list tag_refs = STRING_LIST_INIT_NODUP; static struct refspec refspecs = REFSPEC_INIT_FETCH; @@ -127,15 +126,10 @@ struct anonymized_entry { }; static int anonymized_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *va, const void *vb, const void *unused_keydata) { - const struct anonymized_entry *a, *b; - - a = container_of(eptr, const struct anonymized_entry, hash); - b = container_of(entry_or_key, const struct anonymized_entry, hash); - + const struct anonymized_entry *a = va, *b = vb; return a->orig_len != b->orig_len || memcmp(a->orig, b->orig, a->orig_len); } @@ -154,10 +148,10 @@ static const void *anonymize_mem(struct hashmap *map, if (!map->cmpfn) hashmap_init(map, anonymized_entry_cmp, NULL, 0); - hashmap_entry_init(&key.hash, memhash(orig, *len)); + hashmap_entry_init(&key, memhash(orig, *len)); key.orig = orig; key.orig_len = *len; - ret = hashmap_get_entry(map, &key, hash, NULL); + ret = hashmap_get(map, &key, NULL); if (!ret) { ret = xmalloc(sizeof(*ret)); @@ -166,7 +160,7 @@ static const void *anonymize_mem(struct hashmap *map, ret->orig_len = *len; ret->anon = generate(orig, len); ret->anon_len = *len; - hashmap_put(map, &ret->hash); + hashmap_put(map, ret); } *len = ret->anon_len; @@ -293,8 +287,7 @@ static void export_blob(const struct object_id *oid) buf = read_object_file(oid, &type, &size); if (!buf) die("could not read blob %s", oid_to_hex(oid)); - if (check_object_signature(the_repository, oid, buf, size, - type_name(type)) < 0) + if (check_object_signature(oid, buf, size, type_name(type)) < 0) die("oid mismatch in blob %s", oid_to_hex(oid)); object = parse_object_buffer(the_repository, oid, type, size, buf, &eaten); @@ -849,39 +842,25 @@ static void handle_tag(const char *name, struct tag *tag) free(buf); return; case REWRITE: - if (tagged->type == OBJ_TAG && !mark_tags) { - die(_("Error: Cannot export nested tags unless --mark-tags is specified.")); - } else if (tagged->type == OBJ_COMMIT) { - p = rewrite_commit((struct commit *)tagged); - if (!p) { - printf("reset %s\nfrom %s\n\n", - name, oid_to_hex(&null_oid)); - free(buf); - return; - } - tagged_mark = get_object_mark(&p->object); - } else { - /* tagged->type is either OBJ_BLOB or OBJ_TAG */ - tagged_mark = get_object_mark(tagged); + if (tagged->type != OBJ_COMMIT) { + die("tag %s tags unexported %s!", + oid_to_hex(&tag->object.oid), + type_name(tagged->type)); + } + p = rewrite_commit((struct commit *)tagged); + if (!p) { + printf("reset %s\nfrom %s\n\n", + name, oid_to_hex(&null_oid)); + free(buf); + return; } + tagged_mark = get_object_mark(&p->object); } } - if (tagged->type == OBJ_TAG) { - printf("reset %s\nfrom %s\n\n", - name, oid_to_hex(&null_oid)); - } - skip_prefix(name, "refs/tags/", &name); - printf("tag %s\n", name); - if (mark_tags) { - mark_next_object(&tag->object); - printf("mark :%"PRIu32"\n", last_idnum); - } - if (tagged_mark) - printf("from :%d\n", tagged_mark); - else - printf("from %s\n", oid_to_hex(&tagged->oid)); - + if (starts_with(name, "refs/tags/")) + name += 10; + printf("tag %s\nfrom :%d\n", name, tagged_mark); if (show_original_ids) printf("original-oid %s\n", oid_to_hex(&tag->object.oid)); printf("%.*s%sdata %d\n%.*s\n", @@ -1068,16 +1047,11 @@ static void export_marks(char *file) error("Unable to write marks file %s.", file); } -static void import_marks(char *input_file, int check_exists) +static void import_marks(char *input_file) { char line[512]; - FILE *f; - struct stat sb; - - if (check_exists && stat(input_file, &sb)) - return; + FILE *f = xfopen(input_file, "r"); - f = xfopen(input_file, "r"); while (fgets(line, sizeof(line), f)) { uint32_t mark; char *line_end, *mark_end; @@ -1141,9 +1115,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) struct rev_info revs; struct object_array commits = OBJECT_ARRAY_INIT; struct commit *commit; - char *export_filename = NULL, - *import_filename = NULL, - *import_filename_if_exists = NULL; + char *export_filename = NULL, *import_filename = NULL; uint32_t lastimportid; struct string_list refspecs_list = STRING_LIST_INIT_NODUP; struct string_list paths_of_changed_objects = STRING_LIST_INIT_DUP; @@ -1163,10 +1135,6 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) N_("Dump marks to this file")), OPT_STRING(0, "import-marks", &import_filename, N_("file"), N_("Import marks from this file")), - OPT_STRING(0, "import-marks-if-exists", - &import_filename_if_exists, - N_("file"), - N_("Import marks from this file if it exists")), OPT_BOOL(0, "fake-missing-tagger", &fake_missing_tagger, N_("Fake a tagger when tags lack one")), OPT_BOOL(0, "full-tree", &full_tree, @@ -1181,8 +1149,6 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) &reference_excluded_commits, N_("Reference parents which are not in fast-export stream by object id")), OPT_BOOL(0, "show-original-ids", &show_original_ids, N_("Show original object ids of blobs/commits")), - OPT_BOOL(0, "mark-tags", &mark_tags, - N_("Label tags with mark ids")), OPT_END() }; @@ -1216,12 +1182,8 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) if (use_done_feature) printf("feature done\n"); - if (import_filename && import_filename_if_exists) - die(_("Cannot pass both --import-marks and --import-marks-if-exists")); if (import_filename) - import_marks(import_filename, 0); - else if (import_filename_if_exists) - import_marks(import_filename_if_exists, 1); + import_marks(import_filename); lastimportid = last_idnum; if (import_filename && revs.prune_data.nr) diff --git a/third_party/git/builtin/fetch.c b/third_party/git/builtin/fetch.c index bf6bab80fa..717dd14e89 100644 --- a/third_party/git/builtin/fetch.c +++ b/third_party/git/builtin/fetch.c @@ -7,7 +7,6 @@ #include "refs.h" #include "refspec.h" #include "object-store.h" -#include "oidset.h" #include "commit.h" #include "builtin.h" #include "string-list.h" @@ -24,9 +23,6 @@ #include "packfile.h" #include "list-objects-filter-options.h" #include "commit-reach.h" -#include "branch.h" -#include "promisor-remote.h" -#include "commit-graph.h" #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000) @@ -54,13 +50,11 @@ static int fetch_prune_tags_config = -1; /* unspecified */ static int prune_tags = -1; /* unspecified */ #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */ -static int all, append, dry_run, force, keep, multiple, update_head_ok; -static int verbosity, deepen_relative, set_upstream; +static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative; static int progress = -1; static int enable_auto_gc = 1; static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen; -static int max_jobs = -1, submodule_fetch_jobs_config = -1; -static int fetch_parallel_config = 1; +static int max_children = 1; static enum transport_family family; static const char *depth; static const char *deepen_since; @@ -77,7 +71,6 @@ static struct refspec refmap = REFSPEC_INIT_FETCH; static struct list_objects_filter_options filter_options; static struct string_list server_options = STRING_LIST_INIT_DUP; static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP; -static int fetch_write_commit_graph = -1; static int git_fetch_config(const char *k, const char *v, void *cb) { @@ -103,20 +96,13 @@ static int git_fetch_config(const char *k, const char *v, void *cb) } if (!strcmp(k, "submodule.fetchjobs")) { - submodule_fetch_jobs_config = parse_submodule_fetchjobs(k, v); + max_children = parse_submodule_fetchjobs(k, v); return 0; } else if (!strcmp(k, "fetch.recursesubmodules")) { recurse_submodules = parse_fetch_recurse_submodules_arg(k, v); return 0; } - if (!strcmp(k, "fetch.parallel")) { - fetch_parallel_config = git_config_int(k, v); - if (fetch_parallel_config < 0) - die(_("fetch.parallel cannot be negative")); - return 0; - } - return git_default_config(k, v, cb); } @@ -137,8 +123,6 @@ static struct option builtin_fetch_options[] = { OPT__VERBOSITY(&verbosity), OPT_BOOL(0, "all", &all, N_("fetch from all remotes")), - OPT_BOOL(0, "set-upstream", &set_upstream, - N_("set upstream for git pull/fetch")), OPT_BOOL('a', "append", &append, N_("append to .git/FETCH_HEAD instead of overwriting")), OPT_STRING(0, "upload-pack", &upload_pack, N_("path"), @@ -150,7 +134,7 @@ static struct option builtin_fetch_options[] = { N_("fetch all tags and associated objects"), TAGS_SET), OPT_SET_INT('n', NULL, &tags, N_("do not fetch all tags (--no-tags)"), TAGS_UNSET), - OPT_INTEGER('j', "jobs", &max_jobs, + OPT_INTEGER('j', "jobs", &max_children, N_("number of submodules fetched in parallel")), OPT_BOOL('p', "prune", &prune, N_("prune remote-tracking branches no longer on remote")), @@ -199,8 +183,6 @@ static struct option builtin_fetch_options[] = { N_("run 'gc --auto' after fetching")), OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates, N_("check for forced-updates on all updated branches")), - OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph, - N_("write the commit-graph after fetching")), OPT_END() }; @@ -257,31 +239,32 @@ static void add_merge_config(struct ref **head, } } -static void create_fetch_oidset(struct ref **head, struct oidset *out) +static int will_fetch(struct ref **head, const unsigned char *sha1) { struct ref *rm = *head; while (rm) { - oidset_insert(out, &rm->old_oid); + if (hasheq(rm->old_oid.hash, sha1)) + return 1; rm = rm->next; } + return 0; } struct refname_hash_entry { - struct hashmap_entry ent; + struct hashmap_entry ent; /* must be the first member */ struct object_id oid; int ignore; char refname[FLEX_ARRAY]; }; static int refname_hash_entry_cmp(const void *hashmap_cmp_fn_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *e1_, + const void *e2_, const void *keydata) { - const struct refname_hash_entry *e1, *e2; + const struct refname_hash_entry *e1 = e1_; + const struct refname_hash_entry *e2 = e2_; - e1 = container_of(eptr, const struct refname_hash_entry, ent); - e2 = container_of(entry_or_key, const struct refname_hash_entry, ent); return strcmp(e1->refname, keydata ? keydata : e2->refname); } @@ -293,9 +276,9 @@ static struct refname_hash_entry *refname_hash_add(struct hashmap *map, size_t len = strlen(refname); FLEX_ALLOC_MEM(ent, refname, refname, len); - hashmap_entry_init(&ent->ent, strhash(refname)); + hashmap_entry_init(ent, strhash(refname)); oidcpy(&ent->oid, oid); - hashmap_add(map, &ent->ent); + hashmap_add(map, ent); return ent; } @@ -330,16 +313,13 @@ static void find_non_local_tags(const struct ref *refs, { struct hashmap existing_refs; struct hashmap remote_refs; - struct oidset fetch_oids = OIDSET_INIT; struct string_list remote_refs_list = STRING_LIST_INIT_NODUP; struct string_list_item *remote_ref_item; const struct ref *ref; struct refname_hash_entry *item = NULL; - const int quick_flags = OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT; refname_hash_init(&existing_refs); refname_hash_init(&remote_refs); - create_fetch_oidset(head, &fetch_oids); for_each_ref(add_one_refname, &existing_refs); for (ref = refs; ref; ref = ref->next) { @@ -354,10 +334,11 @@ static void find_non_local_tags(const struct ref *refs, */ if (ends_with(ref->name, "^{}")) { if (item && - !has_object_file_with_flags(&ref->old_oid, quick_flags) && - !oidset_contains(&fetch_oids, &ref->old_oid) && - !has_object_file_with_flags(&item->oid, quick_flags) && - !oidset_contains(&fetch_oids, &item->oid)) + !has_object_file_with_flags(&ref->old_oid, + OBJECT_INFO_QUICK) && + !will_fetch(head, ref->old_oid.hash) && + !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && + !will_fetch(head, item->oid.hash)) clear_item(item); item = NULL; continue; @@ -370,8 +351,8 @@ static void find_non_local_tags(const struct ref *refs, * fetch. */ if (item && - !has_object_file_with_flags(&item->oid, quick_flags) && - !oidset_contains(&fetch_oids, &item->oid)) + !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && + !will_fetch(head, item->oid.hash)) clear_item(item); item = NULL; @@ -384,15 +365,15 @@ static void find_non_local_tags(const struct ref *refs, item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid); string_list_insert(&remote_refs_list, ref->name); } - hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); + hashmap_free(&existing_refs, 1); /* * We may have a final lightweight tag that needs to be * checked to see if it needs fetching. */ if (item && - !has_object_file_with_flags(&item->oid, quick_flags) && - !oidset_contains(&fetch_oids, &item->oid)) + !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) && + !will_fetch(head, item->oid.hash)) clear_item(item); /* @@ -402,10 +383,8 @@ static void find_non_local_tags(const struct ref *refs, for_each_string_list_item(remote_ref_item, &remote_refs_list) { const char *refname = remote_ref_item->string; struct ref *rm; - unsigned int hash = strhash(refname); - item = hashmap_get_entry_from_hash(&remote_refs, hash, refname, - struct refname_hash_entry, ent); + item = hashmap_get_from_hash(&remote_refs, strhash(refname), refname); if (!item) BUG("unseen remote ref?"); @@ -419,9 +398,8 @@ static void find_non_local_tags(const struct ref *refs, **tail = rm; *tail = &rm->next; } - hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent); + hashmap_free(&remote_refs, 1); string_list_clear(&remote_refs_list, 0); - oidset_clear(&fetch_oids); } static struct ref *get_ref_map(struct remote *remote, @@ -538,18 +516,17 @@ static struct ref *get_ref_map(struct remote *remote, if (rm->peer_ref) { const char *refname = rm->peer_ref->name; struct refname_hash_entry *peer_item; - unsigned int hash = strhash(refname); - peer_item = hashmap_get_entry_from_hash(&existing_refs, - hash, refname, - struct refname_hash_entry, ent); + peer_item = hashmap_get_from_hash(&existing_refs, + strhash(refname), + refname); if (peer_item) { struct object_id *old_oid = &peer_item->oid; oidcpy(&rm->peer_ref->old_oid, old_oid); } } } - hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent); + hashmap_free(&existing_refs, 1); return ref_map; } @@ -906,17 +883,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, url = xstrdup("foreign"); if (!connectivity_checked) { - struct check_connected_options opt = CHECK_CONNECTED_INIT; - - if (filter_options.choice) - /* - * Since a filter is specified, objects indirectly - * referenced by refs are allowed to be absent. - */ - opt.check_refs_are_promisor_objects_only = 1; - rm = ref_map; - if (check_connected(iterate_ref_map, &rm, &opt)) { + if (check_connected(iterate_ref_map, &rm, NULL)) { rc = error(_("%s did not send all necessary objects\n"), url); goto abort; } @@ -966,12 +934,18 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, kind = ""; what = ""; } - else if (skip_prefix(rm->name, "refs/heads/", &what)) + else if (starts_with(rm->name, "refs/heads/")) { kind = "branch"; - else if (skip_prefix(rm->name, "refs/tags/", &what)) + what = rm->name + 11; + } + else if (starts_with(rm->name, "refs/tags/")) { kind = "tag"; - else if (skip_prefix(rm->name, "refs/remotes/", &what)) + what = rm->name + 10; + } + else if (starts_with(rm->name, "refs/remotes/")) { kind = "remote-tracking branch"; + what = rm->name + 13; + } else { kind = ""; what = rm->name; @@ -1080,8 +1054,7 @@ static int check_exist_and_connected(struct ref *ref_map) * we need all direct targets to exist. */ for (r = rm; r; r = r->next) { - if (!has_object_file_with_flags(&r->old_oid, - OBJECT_INFO_SKIP_FETCH_OBJECT)) + if (!has_object_file(&r->old_oid)) return -1; } @@ -1092,11 +1065,8 @@ static int check_exist_and_connected(struct ref *ref_map) static int fetch_refs(struct transport *transport, struct ref *ref_map) { int ret = check_exist_and_connected(ref_map); - if (ret) { - trace2_region_enter("fetch", "fetch_refs", the_repository); + if (ret) ret = transport_fetch_refs(transport, ref_map); - trace2_region_leave("fetch", "fetch_refs", the_repository); - } if (!ret) /* * Keep the new pack's ".keep" file around to allow the caller @@ -1112,14 +1082,11 @@ static int consume_refs(struct transport *transport, struct ref *ref_map) { int connectivity_checked = transport->smart_options ? transport->smart_options->connectivity_checked : 0; - int ret; - trace2_region_enter("fetch", "consume_refs", the_repository); - ret = store_updated_refs(transport->url, - transport->remote->name, - connectivity_checked, - ref_map); + int ret = store_updated_refs(transport->url, + transport->remote->name, + connectivity_checked, + ref_map); transport_unlock_pack(transport); - trace2_region_leave("fetch", "consume_refs", the_repository); return ret; } @@ -1271,10 +1238,13 @@ static struct transport *prepare_transport(struct remote *remote, int deepen) if (update_shallow) set_option(transport, TRANS_OPT_UPDATE_SHALLOW, "yes"); if (filter_options.choice) { - const char *spec = - expand_list_objects_filter_spec(&filter_options); - set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, spec); + struct strbuf expanded_filter_spec = STRBUF_INIT; + expand_list_objects_filter_spec(&filter_options, + &expanded_filter_spec); + set_option(transport, TRANS_OPT_LIST_OBJECTS_FILTER, + expanded_filter_spec.buf); set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); + strbuf_release(&expanded_filter_spec); } if (negotiation_tip.nr) { if (transport->smart_options) @@ -1364,11 +1334,9 @@ static int do_fetch(struct transport *transport, argv_array_push(&ref_prefixes, "refs/tags/"); } - if (must_list_refs) { - trace2_region_enter("fetch", "remote_refs", the_repository); + if (must_list_refs) remote_refs = transport_get_remote_refs(transport, &ref_prefixes); - trace2_region_leave("fetch", "remote_refs", the_repository); - } else + else remote_refs = NULL; argv_array_clear(&ref_prefixes); @@ -1399,51 +1367,6 @@ static int do_fetch(struct transport *transport, retcode = 1; goto cleanup; } - - if (set_upstream) { - struct branch *branch = branch_get("HEAD"); - struct ref *rm; - struct ref *source_ref = NULL; - - /* - * We're setting the upstream configuration for the - * current branch. The relevant upstream is the - * fetched branch that is meant to be merged with the - * current one, i.e. the one fetched to FETCH_HEAD. - * - * When there are several such branches, consider the - * request ambiguous and err on the safe side by doing - * nothing and just emit a warning. - */ - for (rm = ref_map; rm; rm = rm->next) { - if (!rm->peer_ref) { - if (source_ref) { - warning(_("multiple branches detected, incompatible with --set-upstream")); - goto skip; - } else { - source_ref = rm; - } - } - } - if (source_ref) { - if (!strcmp(source_ref->name, "HEAD") || - starts_with(source_ref->name, "refs/heads/")) - install_branch_config(0, - branch->name, - transport->remote->name, - source_ref->name); - else if (starts_with(source_ref->name, "refs/remotes/")) - warning(_("not setting upstream for a remote remote-tracking branch")); - else if (starts_with(source_ref->name, "refs/tags/")) - warning(_("not setting upstream for a remote tag")); - else - warning(_("unknown branch type")); - } else { - warning(_("no source branch found.\n" - "you need to specify exactly one branch with the --set-upstream option.")); - } - } - skip: free_refs(ref_map); /* if neither --no-tags nor --tags was specified, do automated tag @@ -1540,62 +1463,7 @@ static void add_options_to_argv(struct argv_array *argv) } -/* Fetch multiple remotes in parallel */ - -struct parallel_fetch_state { - const char **argv; - struct string_list *remotes; - int next, result; -}; - -static int fetch_next_remote(struct child_process *cp, struct strbuf *out, - void *cb, void **task_cb) -{ - struct parallel_fetch_state *state = cb; - char *remote; - - if (state->next < 0 || state->next >= state->remotes->nr) - return 0; - - remote = state->remotes->items[state->next++].string; - *task_cb = remote; - - argv_array_pushv(&cp->args, state->argv); - argv_array_push(&cp->args, remote); - cp->git_cmd = 1; - - if (verbosity >= 0) - printf(_("Fetching %s\n"), remote); - - return 1; -} - -static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb) -{ - struct parallel_fetch_state *state = cb; - const char *remote = task_cb; - - state->result = error(_("Could not fetch %s"), remote); - - return 0; -} - -static int fetch_finished(int result, struct strbuf *out, - void *cb, void *task_cb) -{ - struct parallel_fetch_state *state = cb; - const char *remote = task_cb; - - if (result) { - strbuf_addf(out, _("could not fetch '%s' (exit code: %d)\n"), - remote, result); - state->result = -1; - } - - return 0; -} - -static int fetch_multiple(struct string_list *list, int max_children) +static int fetch_multiple(struct string_list *list) { int i, result = 0; struct argv_array argv = ARGV_ARRAY_INIT; @@ -1606,38 +1474,23 @@ static int fetch_multiple(struct string_list *list, int max_children) return errcode; } - argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", - "--no-write-commit-graph", NULL); + argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL); add_options_to_argv(&argv); - if (max_children != 1 && list->nr != 1) { - struct parallel_fetch_state state = { argv.argv, list, 0, 0 }; - - argv_array_push(&argv, "--end-of-options"); - result = run_processes_parallel_tr2(max_children, - &fetch_next_remote, - &fetch_failed_to_start, - &fetch_finished, - &state, - "fetch", "parallel/fetch"); - - if (!result) - result = state.result; - } else - for (i = 0; i < list->nr; i++) { - const char *name = list->items[i].string; - argv_array_push(&argv, name); - if (verbosity >= 0) - printf(_("Fetching %s\n"), name); - if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { - error(_("Could not fetch %s"), name); - result = 1; - } - argv_array_pop(&argv); + for (i = 0; i < list->nr; i++) { + const char *name = list->items[i].string; + argv_array_push(&argv, name); + if (verbosity >= 0) + printf(_("Fetching %s\n"), name); + if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { + error(_("Could not fetch %s"), name); + result = 1; } + argv_array_pop(&argv); + } argv_array_clear(&argv); - return !!result; + return result; } /* @@ -1657,27 +1510,37 @@ static inline void fetch_one_setup_partial(struct remote *remote) * If no prior partial clone/fetch and the current fetch DID NOT * request a partial-fetch, do a normal fetch. */ - if (!has_promisor_remote() && !filter_options.choice) + if (!repository_format_partial_clone && !filter_options.choice) return; /* - * If this is a partial-fetch request, we enable partial on - * this repo if not already enabled and remember the given - * filter-spec as the default for subsequent fetches to this - * remote. + * If this is the FIRST partial-fetch request, we enable partial + * on this repo and remember the given filter-spec as the default + * for subsequent fetches to this remote. */ - if (filter_options.choice) { + if (!repository_format_partial_clone && filter_options.choice) { partial_clone_register(remote->name, &filter_options); return; } /* + * We are currently limited to only ONE promisor remote and only + * allow partial-fetches from the promisor remote. + */ + if (strcmp(remote->name, repository_format_partial_clone)) { + if (filter_options.choice) + die(_("--filter can only be used with the remote " + "configured in extensions.partialClone")); + return; + } + + /* * Do a partial-fetch from the promisor remote using either the * explicitly given filter-spec or inherit the filter-spec from * the config. */ if (!filter_options.choice) - partial_clone_get_default_filter_spec(&filter_options, remote->name); + partial_clone_get_default_filter_spec(&filter_options); return; } @@ -1763,13 +1626,14 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) packet_trace_identity("fetch"); + fetch_if_missing = 0; + /* Record the command line for the reflog */ strbuf_addstr(&default_rla, "fetch"); for (i = 1; i < argc; i++) strbuf_addf(&default_rla, " %s", argv[i]); - fetch_config_from_gitmodules(&submodule_fetch_jobs_config, - &recurse_submodules); + fetch_config_from_gitmodules(&max_children, &recurse_submodules); git_config(git_fetch_config, NULL); argc = parse_options(argc, argv, prefix, @@ -1797,7 +1661,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) if (depth || deepen_since || deepen_not.nr) deepen = 1; - if (filter_options.choice && !has_promisor_remote()) + if (filter_options.choice && !repository_format_partial_clone) die("--filter can only be used when extensions.partialClone is set"); if (all) { @@ -1831,31 +1695,19 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) } if (remote) { - if (filter_options.choice || has_promisor_remote()) + if (filter_options.choice || repository_format_partial_clone) fetch_one_setup_partial(remote); result = fetch_one(remote, argc, argv, prune_tags_ok); } else { - int max_children = max_jobs; - if (filter_options.choice) die(_("--filter can only be used with the remote " "configured in extensions.partialclone")); - - if (max_children < 0) - max_children = fetch_parallel_config; - /* TODO should this also die if we have a previous partial-clone? */ - result = fetch_multiple(&list, max_children); + result = fetch_multiple(&list); } if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { struct argv_array options = ARGV_ARRAY_INIT; - int max_children = max_jobs; - - if (max_children < 0) - max_children = submodule_fetch_jobs_config; - if (max_children < 0) - max_children = fetch_parallel_config; add_options_to_argv(&options); result = fetch_populated_submodules(the_repository, @@ -1870,20 +1722,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) string_list_clear(&list, 0); - prepare_repo_settings(the_repository); - if (fetch_write_commit_graph > 0 || - (fetch_write_commit_graph < 0 && - the_repository->settings.fetch_write_commit_graph)) { - int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT; - - if (progress) - commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS; - - write_commit_graph_reachable(the_repository->objects->odb, - commit_graph_flags, - NULL); - } - close_object_store(the_repository->objects); if (enable_auto_gc) { diff --git a/third_party/git/builtin/fmt-merge-msg.c b/third_party/git/builtin/fmt-merge-msg.c index 736f666f64..a4615587fd 100644 --- a/third_party/git/builtin/fmt-merge-msg.c +++ b/third_party/git/builtin/fmt-merge-msg.c @@ -106,7 +106,7 @@ static int handle_line(char *line, struct merge_parents *merge_parents) int i, len = strlen(line); struct origin_data *origin_data; char *src; - const char *origin, *tag_name; + const char *origin; struct src_data *src_data; struct string_list_item *item; int pulling_head = 0; @@ -162,13 +162,14 @@ static int handle_line(char *line, struct merge_parents *merge_parents) if (pulling_head) { origin = src; src_data->head_status |= 1; - } else if (skip_prefix(line, "branch ", &origin)) { + } else if (starts_with(line, "branch ")) { origin_data->is_local_branch = 1; + origin = line + 7; string_list_append(&src_data->branch, origin); src_data->head_status |= 2; - } else if (skip_prefix(line, "tag ", &tag_name)) { + } else if (starts_with(line, "tag ")) { origin = line; - string_list_append(&src_data->tag, tag_name); + string_list_append(&src_data->tag, origin + 4); src_data->head_status |= 2; } else if (skip_prefix(line, "remote-tracking branch ", &origin)) { string_list_append(&src_data->r_branch, origin); diff --git a/third_party/git/builtin/fsck.c b/third_party/git/builtin/fsck.c index 8d13794b14..18403a94fa 100644 --- a/third_party/git/builtin/fsck.c +++ b/third_party/git/builtin/fsck.c @@ -50,20 +50,40 @@ static int name_objects; #define ERROR_REFS 010 #define ERROR_COMMIT_GRAPH 020 -static const char *describe_object(const struct object_id *oid) +static const char *describe_object(struct object *obj) { - return fsck_describe_object(&fsck_walk_options, oid); + static struct strbuf bufs[] = { + STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT + }; + static int b = 0; + struct strbuf *buf; + char *name = NULL; + + if (name_objects) + name = lookup_decoration(fsck_walk_options.object_names, obj); + + buf = bufs + b; + b = (b + 1) % ARRAY_SIZE(bufs); + strbuf_reset(buf); + strbuf_addstr(buf, oid_to_hex(&obj->oid)); + if (name) + strbuf_addf(buf, " (%s)", name); + + return buf->buf; } -static const char *printable_type(const struct object_id *oid, - enum object_type type) +static const char *printable_type(struct object *obj) { const char *ret; - if (type == OBJ_NONE) - type = oid_object_info(the_repository, oid, NULL); + if (obj->type == OBJ_NONE) { + enum object_type type = oid_object_info(the_repository, + &obj->oid, NULL); + if (type > 0) + object_as_type(the_repository, obj, type, 0); + } - ret = type_name(type); + ret = type_name(obj->type); if (!ret) ret = _("unknown"); @@ -98,32 +118,26 @@ static int objerror(struct object *obj, const char *err) errors_found |= ERROR_OBJECT; /* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */ fprintf_ln(stderr, _("error in %s %s: %s"), - printable_type(&obj->oid, obj->type), - describe_object(&obj->oid), err); + printable_type(obj), describe_object(obj), err); return -1; } static int fsck_error_func(struct fsck_options *o, - const struct object_id *oid, - enum object_type object_type, - int msg_type, const char *message) + struct object *obj, int type, const char *message) { - switch (msg_type) { + switch (type) { case FSCK_WARN: /* TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> */ fprintf_ln(stderr, _("warning in %s %s: %s"), - printable_type(oid, object_type), - describe_object(oid), message); + printable_type(obj), describe_object(obj), message); return 0; case FSCK_ERROR: /* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */ fprintf_ln(stderr, _("error in %s %s: %s"), - printable_type(oid, object_type), - describe_object(oid), message); + printable_type(obj), describe_object(obj), message); return 1; default: - BUG("%d (FSCK_IGNORE?) should never trigger this callback", - msg_type); + BUG("%d (FSCK_IGNORE?) should never trigger this callback", type); } } @@ -141,8 +155,7 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt if (!obj) { /* ... these references to parent->fld are safe here */ printf_ln(_("broken link from %7s %s"), - printable_type(&parent->oid, parent->type), - describe_object(&parent->oid)); + printable_type(parent), describe_object(parent)); printf_ln(_("broken link from %7s %s"), (type == OBJ_ANY ? _("unknown") : type_name(type)), _("unknown")); @@ -170,10 +183,10 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt if (parent && !has_object_file(&obj->oid)) { printf_ln(_("broken link from %7s %s\n" " to %7s %s"), - printable_type(&parent->oid, parent->type), - describe_object(&parent->oid), - printable_type(&obj->oid, obj->type), - describe_object(&obj->oid)); + printable_type(parent), + describe_object(parent), + printable_type(obj), + describe_object(obj)); errors_found |= ERROR_REACHABLE; } return 1; @@ -279,9 +292,8 @@ static void check_reachable_object(struct object *obj) return; if (has_object_pack(&obj->oid)) return; /* it is in pack - forget about it */ - printf_ln(_("missing %s %s"), - printable_type(&obj->oid, obj->type), - describe_object(&obj->oid)); + printf_ln(_("missing %s %s"), printable_type(obj), + describe_object(obj)); errors_found |= ERROR_REACHABLE; return; } @@ -306,9 +318,8 @@ static void check_unreachable_object(struct object *obj) * since this is something that is prunable. */ if (show_unreachable) { - printf_ln(_("unreachable %s %s"), - printable_type(&obj->oid, obj->type), - describe_object(&obj->oid)); + printf_ln(_("unreachable %s %s"), printable_type(obj), + describe_object(obj)); return; } @@ -326,13 +337,12 @@ static void check_unreachable_object(struct object *obj) */ if (!(obj->flags & USED)) { if (show_dangling) - printf_ln(_("dangling %s %s"), - printable_type(&obj->oid, obj->type), - describe_object(&obj->oid)); + printf_ln(_("dangling %s %s"), printable_type(obj), + describe_object(obj)); if (write_lost_and_found) { char *filename = git_pathdup("lost-found/%s/%s", obj->type == OBJ_COMMIT ? "commit" : "other", - describe_object(&obj->oid)); + describe_object(obj)); FILE *f; if (safe_create_leading_directories_const(filename)) { @@ -345,7 +355,7 @@ static void check_unreachable_object(struct object *obj) if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1)) die_errno(_("could not write '%s'"), filename); } else - fprintf(f, "%s\n", describe_object(&obj->oid)); + fprintf(f, "%s\n", describe_object(obj)); if (fclose(f)) die_errno(_("could not finish '%s'"), filename); @@ -364,7 +374,7 @@ static void check_unreachable_object(struct object *obj) static void check_object(struct object *obj) { if (verbose) - fprintf_ln(stderr, _("Checking %s"), describe_object(&obj->oid)); + fprintf_ln(stderr, _("Checking %s"), describe_object(obj)); if (obj->flags & REACHABLE) check_reachable_object(obj); @@ -422,8 +432,7 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size) if (verbose) fprintf_ln(stderr, _("Checking %s %s"), - printable_type(&obj->oid, obj->type), - describe_object(&obj->oid)); + printable_type(obj), describe_object(obj)); if (fsck_walk(obj, NULL, &fsck_obj_options)) objerror(obj, _("broken links")); @@ -436,7 +445,7 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size) if (!commit->parents && show_root) printf_ln(_("root %s"), - describe_object(&commit->object.oid)); + describe_object(&commit->object)); } if (obj->type == OBJ_TAG) { @@ -444,10 +453,10 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size) if (show_tags && tag->tagged) { printf_ln(_("tagged %s %s (%s) in %s"), - printable_type(&tag->tagged->oid, tag->tagged->type), - describe_object(&tag->tagged->oid), + printable_type(tag->tagged), + describe_object(tag->tagged), tag->tag, - describe_object(&tag->object.oid)); + describe_object(&tag->object)); } } @@ -490,10 +499,10 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid, if (!is_null_oid(oid)) { obj = lookup_object(the_repository, oid); if (obj && (obj->flags & HAS_OBJ)) { - if (timestamp) - fsck_put_object_name(&fsck_walk_options, oid, - "%s@{%"PRItime"}", - refname, timestamp); + if (timestamp && name_objects) + add_decoration(fsck_walk_options.object_names, + obj, + xstrfmt("%s@{%"PRItime"}", refname, timestamp)); obj->flags |= USED; mark_object_reachable(obj); } else if (!is_promisor_object(oid)) { @@ -557,8 +566,9 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid, } default_refs++; obj->flags |= USED; - fsck_put_object_name(&fsck_walk_options, - oid, "%s", refname); + if (name_objects) + add_decoration(fsck_walk_options.object_names, + obj, xstrdup(refname)); mark_object_reachable(obj); return 0; @@ -732,7 +742,9 @@ static int fsck_cache_tree(struct cache_tree *it) return 1; } obj->flags |= USED; - fsck_put_object_name(&fsck_walk_options, &it->oid, ":"); + if (name_objects) + add_decoration(fsck_walk_options.object_names, + obj, xstrdup(":")); mark_object_reachable(obj); if (obj->type != OBJ_TREE) err |= objerror(obj, _("non-tree in cache-tree")); @@ -818,7 +830,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } if (name_objects) - fsck_enable_object_names(&fsck_walk_options); + fsck_walk_options.object_names = + xcalloc(1, sizeof(struct decoration)); git_config(fsck_config, NULL); @@ -877,8 +890,9 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } obj->flags |= USED; - fsck_put_object_name(&fsck_walk_options, &oid, - "%s", arg); + if (name_objects) + add_decoration(fsck_walk_options.object_names, + obj, xstrdup(arg)); mark_object_reachable(obj); continue; } @@ -914,8 +928,10 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) continue; obj = &blob->object; obj->flags |= USED; - fsck_put_object_name(&fsck_walk_options, &obj->oid, - ":%s", active_cache[i]->name); + if (name_objects) + add_decoration(fsck_walk_options.object_names, + obj, + xstrfmt(":%s", active_cache[i]->name)); mark_object_reachable(obj); } if (active_cache_tree) diff --git a/third_party/git/builtin/gc.c b/third_party/git/builtin/gc.c index 8e0b9cf41b..c18efadda5 100644 --- a/third_party/git/builtin/gc.c +++ b/third_party/git/builtin/gc.c @@ -27,7 +27,6 @@ #include "pack-objects.h" #include "blob.h" #include "tree.h" -#include "promisor-remote.h" #define FAILED_RUN "failed to run %s" @@ -42,6 +41,7 @@ static int aggressive_depth = 50; static int aggressive_window = 250; static int gc_auto_threshold = 6700; static int gc_auto_pack_limit = 50; +static int gc_write_commit_graph; static int detach_auto = 1; static timestamp_t gc_log_expire_time; static const char *gc_log_expire = "1.day.ago"; @@ -148,6 +148,7 @@ static void gc_config(void) git_config_get_int("gc.aggressivedepth", &aggressive_depth); git_config_get_int("gc.auto", &gc_auto_threshold); git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit); + git_config_get_bool("gc.writecommitgraph", &gc_write_commit_graph); git_config_get_bool("gc.autodetach", &detach_auto); git_config_get_expiry("gc.pruneexpire", &prune_expire); git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire); @@ -458,7 +459,7 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid) /* * Returns 0 if there was no previous error and gc can proceed, 1 if * gc should not proceed due to an error in the last run. Prints a - * message and returns -1 if an error occurred while reading gc.log + * message and returns -1 if an error occured while reading gc.log */ static int report_last_gc_error(void) { @@ -601,7 +602,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) if (detach_auto) { int ret = report_last_gc_error(); if (ret < 0) - /* an I/O error occurred, already reported */ + /* an I/O error occured, already reported */ exit(128); if (ret == 1) /* Last gc --auto failed. Skip this one. */ @@ -660,7 +661,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix) argv_array_push(&prune, prune_expire); if (quiet) argv_array_push(&prune, "--no-progress"); - if (has_promisor_remote()) + if (repository_format_partial_clone) argv_array_push(&prune, "--exclude-promisor-objects"); if (run_command_v_opt(prune.argv, RUN_GIT_CMD)) @@ -684,11 +685,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix) clean_pack_garbage(); } - prepare_repo_settings(the_repository); - if (the_repository->settings.gc_write_commit_graph == 1) - write_commit_graph_reachable(the_repository->objects->odb, - !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0, - NULL); + if (gc_write_commit_graph && + write_commit_graph_reachable(get_object_directory(), + !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0, + NULL)) + return 1; if (auto_gc && too_many_loose_objects()) warning(_("There are too many unreachable loose objects; " diff --git a/third_party/git/builtin/grep.c b/third_party/git/builtin/grep.c index 99e2685090..560051784e 100644 --- a/third_party/git/builtin/grep.c +++ b/third_party/git/builtin/grep.c @@ -24,7 +24,6 @@ #include "submodule.h" #include "submodule-config.h" #include "object-store.h" -#include "packfile.h" static char const * const grep_usage[] = { N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"), @@ -33,6 +32,7 @@ static char const * const grep_usage[] = { static int recurse_submodules; +#define GREP_NUM_THREADS_DEFAULT 8 static int num_threads; static pthread_t *threads; @@ -91,11 +91,8 @@ static pthread_cond_t cond_result; static int skip_first_line; -static void add_work(struct grep_opt *opt, struct grep_source *gs) +static void add_work(struct grep_opt *opt, const struct grep_source *gs) { - if (opt->binary != GREP_BINARY_TEXT) - grep_source_load_driver(gs, opt->repo->index); - grep_lock(); while ((todo_end+1) % ARRAY_SIZE(todo) == todo_done) { @@ -103,6 +100,9 @@ static void add_work(struct grep_opt *opt, struct grep_source *gs) } todo[todo_end].source = *gs; + if (opt->binary != GREP_BINARY_TEXT) + grep_source_load_driver(&todo[todo_end].source, + opt->repo->index); todo[todo_end].done = 0; strbuf_reset(&todo[todo_end].out); todo_end = (todo_end + 1) % ARRAY_SIZE(todo); @@ -200,12 +200,12 @@ static void start_threads(struct grep_opt *opt) int i; pthread_mutex_init(&grep_mutex, NULL); + pthread_mutex_init(&grep_read_mutex, NULL); pthread_mutex_init(&grep_attr_mutex, NULL); pthread_cond_init(&cond_add, NULL); pthread_cond_init(&cond_write, NULL); pthread_cond_init(&cond_result, NULL); grep_use_locks = 1; - enable_obj_read_lock(); for (i = 0; i < ARRAY_SIZE(todo); i++) { strbuf_init(&todo[i].out, 0); @@ -257,12 +257,12 @@ static int wait_all(void) free(threads); pthread_mutex_destroy(&grep_mutex); + pthread_mutex_destroy(&grep_read_mutex); pthread_mutex_destroy(&grep_attr_mutex); pthread_cond_destroy(&cond_add); pthread_cond_destroy(&cond_write); pthread_cond_destroy(&cond_result); grep_use_locks = 0; - disable_obj_read_lock(); return hit; } @@ -295,6 +295,16 @@ static int grep_cmd_config(const char *var, const char *value, void *cb) return st; } +static void *lock_and_read_oid_file(const struct object_id *oid, enum object_type *type, unsigned long *size) +{ + void *data; + + grep_read_lock(); + data = read_object_file(oid, type, size); + grep_read_unlock(); + return data; +} + static int grep_oid(struct grep_opt *opt, const struct object_id *oid, const char *filename, int tree_name_len, const char *path) @@ -393,32 +403,34 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, static int grep_submodule(struct grep_opt *opt, const struct pathspec *pathspec, const struct object_id *oid, - const char *filename, const char *path, int cached) + const char *filename, const char *path) { struct repository subrepo; struct repository *superproject = opt->repo; - const struct submodule *sub; + const struct submodule *sub = submodule_from_path(superproject, + &null_oid, path); struct grep_opt subopt; int hit; - sub = submodule_from_path(superproject, &null_oid, path); + /* + * NEEDSWORK: submodules functions need to be protected because they + * access the object store via config_from_gitmodules(): the latter + * uses get_oid() which, for now, relies on the global the_repository + * object. + */ + grep_read_lock(); - if (!is_submodule_active(superproject, path)) + if (!is_submodule_active(superproject, path)) { + grep_read_unlock(); return 0; + } - if (repo_submodule_init(&subrepo, superproject, sub)) + if (repo_submodule_init(&subrepo, superproject, sub)) { + grep_read_unlock(); return 0; + } - /* - * NEEDSWORK: repo_read_gitmodules() might call - * add_to_alternates_memory() via config_from_gitmodules(). This - * operation causes a race condition with concurrent object readings - * performed by the worker threads. That's why we need obj_read_lock() - * here. It should be removed once it's no longer necessary to add the - * subrepo's odbs to the in-memory alternates list. - */ - obj_read_lock(); - repo_read_gitmodules(&subrepo, 0); + repo_read_gitmodules(&subrepo); /* * NEEDSWORK: This adds the submodule's object directory to the list of @@ -431,7 +443,7 @@ static int grep_submodule(struct grep_opt *opt, * object. */ add_to_alternates_memory(subrepo.objects->odb->path); - obj_read_unlock(); + grep_read_unlock(); memcpy(&subopt, opt, sizeof(subopt)); subopt.repo = &subrepo; @@ -443,12 +455,14 @@ static int grep_submodule(struct grep_opt *opt, unsigned long size; struct strbuf base = STRBUF_INIT; - obj_read_lock(); object = parse_object_or_die(oid, oid_to_hex(oid)); - obj_read_unlock(); + + grep_read_lock(); data = read_object_with_reference(&subrepo, &object->oid, tree_type, &size, NULL); + grep_read_unlock(); + if (!data) die(_("unable to read tree (%s)"), oid_to_hex(&object->oid)); @@ -461,7 +475,7 @@ static int grep_submodule(struct grep_opt *opt, strbuf_release(&base); free(data); } else { - hit = grep_cache(&subopt, pathspec, cached); + hit = grep_cache(&subopt, pathspec, 1); } repo_clear(&subrepo); @@ -509,8 +523,7 @@ static int grep_cache(struct grep_opt *opt, } } else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) && submodule_path_match(repo->index, pathspec, name.buf, NULL)) { - hit |= grep_submodule(opt, pathspec, NULL, ce->name, - ce->name, cached); + hit |= grep_submodule(opt, pathspec, NULL, ce->name, ce->name); } else { continue; } @@ -573,7 +586,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, void *data; unsigned long size; - data = read_object_file(&entry.oid, &type, &size); + data = lock_and_read_oid_file(&entry.oid, &type, &size); if (!data) die(_("unable to read tree (%s)"), oid_to_hex(&entry.oid)); @@ -585,8 +598,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec, free(data); } else if (recurse_submodules && S_ISGITLINK(entry.mode)) { hit |= grep_submodule(opt, pathspec, &entry.oid, - base->buf, base->buf + tn_len, - 1); /* ignored */ + base->buf, base->buf + tn_len); } strbuf_setlen(base, old_baselen); @@ -611,9 +623,12 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec, struct strbuf base; int hit, len; + grep_read_lock(); data = read_object_with_reference(opt->repo, &obj->oid, tree_type, &size, NULL); + grep_read_unlock(); + if (!data) die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid)); @@ -642,18 +657,13 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec, for (i = 0; i < nr; i++) { struct object *real_obj; - - obj_read_lock(); real_obj = deref_tag(opt->repo, list->objects[i].item, NULL, 0); - obj_read_unlock(); /* load the gitmodules file for this rev */ if (recurse_submodules) { submodule_free(opt->repo); - obj_read_lock(); gitmodules_config_oid(&real_obj->oid); - obj_read_unlock(); } if (grep_object(opt, pathspec, real_obj, list->objects[i].name, list->objects[i].path)) { @@ -946,9 +956,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix) /* die the same way as if we did it at the beginning */ setup_git_directory(); } - /* Ignore --recurse-submodules if --no-index is given or implied */ - if (!use_index) - recurse_submodules = 0; /* * skip a -- separator; we know it cannot be @@ -1053,10 +1060,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) pathspec.recursive = 1; pathspec.recurse_submodules = !!recurse_submodules; - if (recurse_submodules && untracked) - die(_("--untracked not supported with --recurse-submodules")); - - if (show_in_pager) { + if (list.nr || cached || show_in_pager) { if (num_threads > 1) warning(_("invalid option combination, ignoring --threads")); num_threads = 1; @@ -1066,7 +1070,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) } else if (num_threads < 0) die(_("invalid number of threads specified (%d)"), num_threads); else if (num_threads == 0) - num_threads = HAVE_THREADS ? online_cpus() : 1; + num_threads = HAVE_THREADS ? GREP_NUM_THREADS_DEFAULT : 1; if (num_threads > 1) { if (!HAVE_THREADS) @@ -1075,17 +1079,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix) && (opt.pre_context || opt.post_context || opt.file_break || opt.funcbody)) skip_first_line = 1; - - /* - * Pre-read gitmodules (if not read already) and force eager - * initialization of packed_git to prevent racy lazy - * reading/initialization once worker threads are started. - */ - if (recurse_submodules) - repo_read_gitmodules(the_repository, 1); - if (startup_info->have_repository) - (void)get_packed_git(the_repository); - start_threads(&opt); } else { /* @@ -1115,11 +1108,14 @@ int cmd_grep(int argc, const char **argv, const char *prefix) strbuf_addf(&buf, "+/%s%s", strcmp("less", pager) ? "" : "*", opt.pattern_list->pattern); - string_list_append(&path_list, - strbuf_detach(&buf, NULL)); + string_list_append(&path_list, buf.buf); + strbuf_detach(&buf, NULL); } } + if (recurse_submodules && (!use_index || untracked)) + die(_("option not supported with --recurse-submodules")); + if (!show_in_pager && !opt.status_only) setup_pager(); @@ -1149,6 +1145,5 @@ int cmd_grep(int argc, const char **argv, const char *prefix) run_pager(&opt, prefix); clear_pathspec(&pathspec); free_grep_patterns(&opt); - grep_destroy(); return !hit; } diff --git a/third_party/git/builtin/index-pack.c b/third_party/git/builtin/index-pack.c index d967d188a3..0d55f73b0b 100644 --- a/third_party/git/builtin/index-pack.c +++ b/third_party/git/builtin/index-pack.c @@ -14,7 +14,7 @@ #include "thread-utils.h" #include "packfile.h" #include "object-store.h" -#include "promisor-remote.h" +#include "fetch-object.h" static const char index_pack_usage[] = "git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; @@ -757,8 +757,7 @@ static int check_collison(struct object_entry *entry) memset(&data, 0, sizeof(data)); data.entry = entry; - data.st = open_istream(the_repository, &entry->idx.oid, &type, &size, - NULL); + data.st = open_istream(&entry->idx.oid, &type, &size, NULL); if (!data.st) return -1; if (size != entry->size || type != entry->type) @@ -949,7 +948,7 @@ static void resolve_delta(struct object_entry *delta_obj, free(delta_data); if (!result->data) bad_object(delta_obj->idx.offset, _("failed to apply delta")); - hash_object_file(the_hash_algo, result->data, result->size, + hash_object_file(result->data, result->size, type_name(delta_obj->real_type), &delta_obj->idx.oid); sha1_object(result->data, NULL, result->size, delta_obj->real_type, &delta_obj->idx.oid); @@ -1004,9 +1003,7 @@ static struct base_data *find_unresolved_deltas_1(struct base_data *base, if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA, base->obj->real_type)) - die("REF_DELTA at offset %"PRIuMAX" already resolved (duplicate base %s?)", - (uintmax_t)child->idx.offset, - oid_to_hex(&base->obj->idx.oid)); + BUG("child->real_type != OBJ_REF_DELTA"); resolve_delta(child, base, result); if (base->ref_first == base->ref_last && base->ofs_last == -1) @@ -1355,7 +1352,7 @@ static void fix_unresolved_deltas(struct hashfile *f) sorted_by_pos[i] = &ref_deltas[i]; QSORT(sorted_by_pos, nr_ref_deltas, delta_pos_compare); - if (has_promisor_remote()) { + if (repository_format_partial_clone) { /* * Prefetch the delta bases. */ @@ -1369,8 +1366,8 @@ static void fix_unresolved_deltas(struct hashfile *f) oid_array_append(&to_fetch, &d->oid); } if (to_fetch.nr) - promisor_remote_get_direct(the_repository, - to_fetch.oid, to_fetch.nr); + fetch_objects(repository_format_partial_clone, + to_fetch.oid, to_fetch.nr); oid_array_clear(&to_fetch); } @@ -1386,9 +1383,8 @@ static void fix_unresolved_deltas(struct hashfile *f) if (!base_obj->data) continue; - if (check_object_signature(the_repository, &d->oid, - base_obj->data, base_obj->size, - type_name(type))) + if (check_object_signature(&d->oid, base_obj->data, + base_obj->size, type_name(type))) die(_("local object %s is corrupt"), oid_to_hex(&d->oid)); base_obj->obj = append_obj_to_pack(f, d->oid.hash, base_obj->data, base_obj->size, type); @@ -1494,11 +1490,11 @@ static void final(const char *final_pack_name, const char *curr_pack_name, } if (!from_stdin) { - printf("%s\n", hash_to_hex(hash)); + printf("%s\n", sha1_to_hex(hash)); } else { struct strbuf buf = STRBUF_INIT; - strbuf_addf(&buf, "%s\t%s\n", report, hash_to_hex(hash)); + strbuf_addf(&buf, "%s\t%s\n", report, sha1_to_hex(hash)); write_or_die(1, buf.buf, buf.len); strbuf_release(&buf); diff --git a/third_party/git/builtin/log.c b/third_party/git/builtin/log.c index 83a4a6188e..44b10b3415 100644 --- a/third_party/git/builtin/log.c +++ b/third_party/git/builtin/log.c @@ -37,7 +37,6 @@ #include "range-diff.h" #define MAIL_DEFAULT_WRAP 72 -#define COVER_FROM_AUTO_MAX_SUBJECT_LEN 100 /* Set a default date-time format for git log ("log.date" config variable) */ static const char *default_date_mode = NULL; @@ -208,7 +207,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, if (!rev->show_notes_given && (!rev->pretty_given || w.notes)) rev->show_notes = 1; if (rev->show_notes) - load_display_notes(&rev->notes_opt); + init_display_notes(&rev->notes_opt); if ((rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) || rev->diffopt.filter || rev->diffopt.flags.follow_renames) @@ -628,7 +627,6 @@ int cmd_show(int argc, const char **argv, const char *prefix) break; case OBJ_TAG: { struct tag *t = (struct tag *)o; - struct object_id *oid = get_tagged_oid(t); if (rev.shown_one) putchar('\n'); @@ -640,10 +638,10 @@ int cmd_show(int argc, const char **argv, const char *prefix) rev.shown_one = 1; if (ret) break; - o = parse_object(the_repository, oid); + o = parse_object(the_repository, &t->tagged->oid); if (!o) ret = error(_("could not read object %s"), - oid_to_hex(oid)); + oid_to_hex(&t->tagged->oid)); objects[i].item = o; i--; break; @@ -766,56 +764,28 @@ static void add_header(const char *value) item->string[len] = '\0'; } -enum cover_setting { - COVER_UNSET, - COVER_OFF, - COVER_ON, - COVER_AUTO -}; - -enum thread_level { - THREAD_UNSET, - THREAD_SHALLOW, - THREAD_DEEP -}; - -enum cover_from_description { - COVER_FROM_NONE, - COVER_FROM_MESSAGE, - COVER_FROM_SUBJECT, - COVER_FROM_AUTO -}; - -static enum thread_level thread; +#define THREAD_SHALLOW 1 +#define THREAD_DEEP 2 +static int thread; static int do_signoff; static int base_auto; static char *from; static const char *signature = git_version_string; static const char *signature_file; -static enum cover_setting config_cover_letter; +static int config_cover_letter; static const char *config_output_directory; -static enum cover_from_description cover_from_description_mode = COVER_FROM_MESSAGE; -static int show_notes; -static struct display_notes_opt notes_opt; -static enum cover_from_description parse_cover_from_description(const char *arg) -{ - if (!arg || !strcmp(arg, "default")) - return COVER_FROM_MESSAGE; - else if (!strcmp(arg, "none")) - return COVER_FROM_NONE; - else if (!strcmp(arg, "message")) - return COVER_FROM_MESSAGE; - else if (!strcmp(arg, "subject")) - return COVER_FROM_SUBJECT; - else if (!strcmp(arg, "auto")) - return COVER_FROM_AUTO; - else - die(_("%s: invalid cover from description mode"), arg); -} +enum { + COVER_UNSET, + COVER_OFF, + COVER_ON, + COVER_AUTO +}; static int git_format_config(const char *var, const char *value, void *cb) { + struct rev_info *rev = cb; + if (!strcmp(var, "format.headers")) { if (!value) die(_("format.headers without value")); @@ -865,7 +835,7 @@ static int git_format_config(const char *var, const char *value, void *cb) thread = THREAD_SHALLOW; return 0; } - thread = git_config_bool(var, value) ? THREAD_SHALLOW : THREAD_UNSET; + thread = git_config_bool(var, value) && THREAD_SHALLOW; return 0; } if (!strcmp(var, "format.signoff")) { @@ -902,17 +872,19 @@ static int git_format_config(const char *var, const char *value, void *cb) return 0; } if (!strcmp(var, "format.notes")) { + struct strbuf buf = STRBUF_INIT; int b = git_parse_maybe_bool(value); - if (b < 0) - enable_ref_display_notes(¬es_opt, &show_notes, value); - else if (b) - enable_default_display_notes(¬es_opt, &show_notes); - else - disable_display_notes(¬es_opt, &show_notes); - return 0; - } - if (!strcmp(var, "format.coverfromdescription")) { - cover_from_description_mode = parse_cover_from_description(value); + if (!b) + return 0; + rev->show_notes = 1; + if (b < 0) { + strbuf_addstr(&buf, value); + expand_notes_ref(&buf); + string_list_append(&rev->notes_opt.extra_notes_refs, + strbuf_detach(&buf, NULL)); + } else { + rev->notes_opt.use_default_notes = 1; + } return 0; } @@ -1021,6 +993,20 @@ static void print_signature(FILE *file) putc('\n', file); } +static void add_branch_description(struct strbuf *buf, const char *branch_name) +{ + struct strbuf desc = STRBUF_INIT; + if (!branch_name || !*branch_name) + return; + read_branch_desc(&desc, branch_name); + if (desc.len) { + strbuf_addch(buf, '\n'); + strbuf_addbuf(buf, &desc); + strbuf_addch(buf, '\n'); + } + strbuf_release(&desc); +} + static char *find_branch_name(struct rev_info *rev) { int i, positive = -1; @@ -1067,63 +1053,6 @@ static void show_diffstat(struct rev_info *rev, fprintf(rev->diffopt.file, "\n"); } -static void prepare_cover_text(struct pretty_print_context *pp, - const char *branch_name, - struct strbuf *sb, - const char *encoding, - int need_8bit_cte) -{ - const char *subject = "*** SUBJECT HERE ***"; - const char *body = "*** BLURB HERE ***"; - struct strbuf description_sb = STRBUF_INIT; - struct strbuf subject_sb = STRBUF_INIT; - - if (cover_from_description_mode == COVER_FROM_NONE) - goto do_pp; - - if (branch_name && *branch_name) - read_branch_desc(&description_sb, branch_name); - if (!description_sb.len) - goto do_pp; - - if (cover_from_description_mode == COVER_FROM_SUBJECT || - cover_from_description_mode == COVER_FROM_AUTO) - body = format_subject(&subject_sb, description_sb.buf, " "); - - if (cover_from_description_mode == COVER_FROM_MESSAGE || - (cover_from_description_mode == COVER_FROM_AUTO && - subject_sb.len > COVER_FROM_AUTO_MAX_SUBJECT_LEN)) - body = description_sb.buf; - else - subject = subject_sb.buf; - -do_pp: - pp_title_line(pp, &subject, sb, encoding, need_8bit_cte); - pp_remainder(pp, &body, sb, 0); - - strbuf_release(&description_sb); - strbuf_release(&subject_sb); -} - -static int get_notes_refs(struct string_list_item *item, void *arg) -{ - argv_array_pushf(arg, "--notes=%s", item->string); - return 0; -} - -static void get_notes_args(struct argv_array *arg, struct rev_info *rev) -{ - if (!rev->show_notes) { - argv_array_push(arg, "--no-notes"); - } else if (rev->notes_opt.use_default_notes > 0 || - (rev->notes_opt.use_default_notes == -1 && - !rev->notes_opt.extra_notes_refs.nr)) { - argv_array_push(arg, "--notes"); - } else { - for_each_string_list(&rev->notes_opt.extra_notes_refs, get_notes_refs, arg); - } -} - static void make_cover_letter(struct rev_info *rev, int use_stdout, struct commit *origin, int nr, struct commit **list, @@ -1131,6 +1060,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, int quiet) { const char *committer; + const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n"; + const char *msg; struct shortlog log; struct strbuf sb = STRBUF_INIT; int i; @@ -1160,12 +1091,15 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, if (!branch_name) branch_name = find_branch_name(rev); + msg = body; pp.fmt = CMIT_FMT_EMAIL; pp.date_mode.type = DATE_RFC2822; pp.rev = rev; pp.print_email_subject = 1; pp_user_info(&pp, NULL, &sb, committer, encoding); - prepare_cover_text(&pp, branch_name, &sb, encoding, need_8bit_cte); + pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte); + pp_remainder(&pp, &msg, &sb, 0); + add_branch_description(&sb, branch_name); fprintf(rev->diffopt.file, "%s\n", sb.buf); strbuf_release(&sb); @@ -1196,16 +1130,13 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, * can be added later if deemed desirable. */ struct diff_options opts; - struct argv_array other_arg = ARGV_ARRAY_INIT; diff_setup(&opts); opts.file = rev->diffopt.file; opts.use_color = rev->diffopt.use_color; diff_setup_done(&opts); fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title); - get_notes_args(&other_arg, rev); show_range_diff(rev->rdiff1, rev->rdiff2, - rev->creation_factor, 1, &opts, &other_arg); - argv_array_clear(&other_arg); + rev->creation_factor, 1, &opts); } } @@ -1317,9 +1248,9 @@ static int output_directory_callback(const struct option *opt, const char *arg, static int thread_callback(const struct option *opt, const char *arg, int unset) { - enum thread_level *thread = (enum thread_level *)opt->value; + int *thread = (int *)opt->value; if (unset) - *thread = THREAD_UNSET; + *thread = 0; else if (!arg || !strcmp(arg, "shallow")) *thread = THREAD_SHALLOW; else if (!strcmp(arg, "deep")) @@ -1366,7 +1297,7 @@ static int header_callback(const struct option *opt, const char *arg, int unset) string_list_clear(&extra_to, 0); string_list_clear(&extra_cc, 0); } else { - add_header(arg); + add_header(arg); } return 0; } @@ -1422,7 +1353,7 @@ static struct commit *get_base_commit(const char *base_commit, base = lookup_commit_reference_by_name(base_commit); if (!base) die(_("unknown commit %s"), base_commit); - } else if ((base_commit && !strcmp(base_commit, "auto"))) { + } else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) { struct branch *curr_branch = branch_get(NULL); const char *upstream = branch_get_upstream(curr_branch, NULL); if (upstream) { @@ -1610,7 +1541,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) int use_patch_format = 0; int quiet = 0; int reroll_count = -1; - char *cover_from_description_arg = NULL; char *branch_name = NULL; char *base_commit = NULL; struct base_tree_info bases; @@ -1647,9 +1577,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) { OPTION_CALLBACK, 0, "rfc", &rev, NULL, N_("Use [RFC PATCH] instead of [PATCH]"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback }, - OPT_STRING(0, "cover-from-description", &cover_from_description_arg, - N_("cover-from-description-mode"), - N_("generate parts of a cover letter based on a branch's description")), { OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"), N_("Use [<prefix>] instead of [PATCH]"), PARSE_OPT_NONEG, subject_prefix_callback }, @@ -1713,11 +1640,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) extra_to.strdup_strings = 1; extra_cc.strdup_strings = 1; init_log_defaults(); - init_display_notes(¬es_opt); - git_config(git_format_config, NULL); repo_init_revisions(the_repository, &rev, prefix); - rev.show_notes = show_notes; - memcpy(&rev.notes_opt, ¬es_opt, sizeof(notes_opt)); + git_config(git_format_config, &rev); rev.commit_format = CMIT_FMT_EMAIL; rev.expand_tabs_in_log_default = 0; rev.verbose_header = 1; @@ -1729,9 +1653,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) s_r_opt.def = "HEAD"; s_r_opt.revarg_opt = REVARG_COMMITTISH; - if (base_auto) - base_commit = "auto"; - if (default_attach) { rev.mime_boundary = default_attach; rev.no_inline = 1; @@ -1747,9 +1668,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH); - if (cover_from_description_arg) - cover_from_description_mode = parse_cover_from_description(cover_from_description_arg); - if (0 < reroll_count) { struct strbuf sprefix = STRBUF_INIT; strbuf_addf(&sprefix, "%s v%d", @@ -1836,7 +1754,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.diffopt.flags.binary = 1; if (rev.show_notes) - load_display_notes(&rev.notes_opt); + init_display_notes(&rev.notes_opt); if (!output_directory && !use_stdout) output_directory = config_output_directory; @@ -1847,26 +1765,10 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) setup_pager(); if (output_directory) { - int saved; if (rev.diffopt.use_color != GIT_COLOR_ALWAYS) rev.diffopt.use_color = GIT_COLOR_NEVER; if (use_stdout) die(_("standard output, or directory, which one?")); - /* - * We consider <outdir> as 'outside of gitdir', therefore avoid - * applying adjust_shared_perm in s-c-l-d. - */ - saved = get_shared_repository(); - set_shared_repository(0); - switch (safe_create_leading_directories_const(output_directory)) { - case SCLD_OK: - case SCLD_EXISTS: - break; - default: - die(_("could not create leading directories " - "of '%s'"), output_directory); - } - set_shared_repository(saved); if (mkdir(output_directory, 0777) < 0 && errno != EEXIST) die_errno(_("could not create directory '%s'"), output_directory); @@ -1995,7 +1897,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) } memset(&bases, 0, sizeof(bases)); - if (base_commit) { + if (base_commit || base_auto) { struct commit *base = get_base_commit(base_commit, list, nr); reset_revision_walk(); clear_object_flags(UNINTERESTING); diff --git a/third_party/git/builtin/ls-files.c b/third_party/git/builtin/ls-files.c index f069a028ce..670e8fb93c 100644 --- a/third_party/git/builtin/ls-files.c +++ b/third_party/git/builtin/ls-files.c @@ -492,7 +492,7 @@ static int option_parse_exclude_from(const struct option *opt, BUG_ON_OPT_NEG(unset); exc_given = 1; - add_patterns_from_file(dir, arg); + add_excludes_from_file(dir, arg); return 0; } @@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) int require_work_tree = 0, show_tag = 0, i; const char *max_prefix; struct dir_struct dir; - struct pattern_list *pl; + struct exclude_list *el; struct string_list exclude_list = STRING_LIST_INIT_NODUP; struct option builtin_ls_files_options[] = { /* Think twice before adding "--nul" synonym to this */ @@ -594,9 +594,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) argc = parse_options(argc, argv, prefix, builtin_ls_files_options, ls_files_usage, 0); - pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option"); + el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) { - add_pattern(exclude_list.items[i].string, "", 0, pl, --exclude_args); + add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); } if (show_tag || show_valid_bit || show_fsmonitor_bit) { tag_cached = "H "; diff --git a/third_party/git/builtin/merge-recursive.c b/third_party/git/builtin/merge-recursive.c index a4bfd8fc51..5b910e351e 100644 --- a/third_party/git/builtin/merge-recursive.c +++ b/third_party/git/builtin/merge-recursive.c @@ -1,4 +1,3 @@ -#include "cache.h" #include "builtin.h" #include "commit.h" #include "tag.h" @@ -64,9 +63,6 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) if (argc - i != 3) /* "--" "<head>" "<remote>" */ die(_("not handling anything other than two heads merge.")); - if (repo_read_index_unmerged(the_repository)) - die_resolve_conflict("merge"); - o.branch1 = argv[++i]; o.branch2 = argv[++i]; diff --git a/third_party/git/builtin/merge-tree.c b/third_party/git/builtin/merge-tree.c index e72714a5a8..97b54caeb9 100644 --- a/third_party/git/builtin/merge-tree.c +++ b/third_party/git/builtin/merge-tree.c @@ -180,9 +180,8 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru static char *traverse_path(const struct traverse_info *info, const struct name_entry *n) { - struct strbuf buf = STRBUF_INIT; - strbuf_make_traverse_path(&buf, info, n->path, n->pathlen); - return strbuf_detach(&buf, NULL); + char *path = xmallocz(traverse_path_len(info, n) + the_hash_algo->rawsz); + return make_traverse_path(path, info, n); } static void resolve(const struct traverse_info *info, struct name_entry *ours, struct name_entry *result) diff --git a/third_party/git/builtin/merge.c b/third_party/git/builtin/merge.c index d127d2225f..e2ccbc44e2 100644 --- a/third_party/git/builtin/merge.c +++ b/third_party/git/builtin/merge.c @@ -62,7 +62,6 @@ static int show_diffstat = 1, shortlog_len = -1, squash; static int option_commit = -1; static int option_edit = -1; static int allow_trivial = 1, have_message, verify_signatures; -static int check_trust_level = 1; static int overwrite_ignore = 1; static struct strbuf merge_msg = STRBUF_INIT; static struct strategy **use_strategies; @@ -82,7 +81,7 @@ static int show_progress = -1; static int default_to_upstream = 1; static int signoff; static const char *sign_commit; -static int no_verify; +static int verify_msg = 1; static struct strategy all_strategy[] = { { "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL }, @@ -288,7 +287,7 @@ static struct option builtin_merge_options[] = { N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")), OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")), - OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")), + OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")), OPT_END() }; @@ -632,8 +631,6 @@ static int git_merge_config(const char *k, const char *v, void *cb) } else if (!strcmp(k, "commit.gpgsign")) { sign_commit = git_config_bool(k, v) ? "" : NULL; return 0; - } else if (!strcmp(k, "gpg.mintrustlevel")) { - check_trust_level = 0; } status = fmt_merge_msg_config(k, v, cb); @@ -691,13 +688,16 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, struct commit_list *remoteheads, struct commit *head) { + struct lock_file lock = LOCK_INIT; const char *head_arg = "HEAD"; - if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0) + hold_locked_index(&lock, LOCK_DIE_ON_ERROR); + refresh_cache(REFRESH_QUIET); + if (write_locked_index(&the_index, &lock, + COMMIT_LOCK | SKIP_IF_UNCHANGED)) return error(_("Unable to write index.")); if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) { - struct lock_file lock = LOCK_INIT; int clean, x; struct commit *result; struct commit_list *reversed = NULL; @@ -816,18 +816,6 @@ static void write_merge_heads(struct commit_list *); static void prepare_to_commit(struct commit_list *remoteheads) { struct strbuf msg = STRBUF_INIT; - const char *index_file = get_index_file(); - - if (!no_verify && run_commit_hook(0 < option_edit, index_file, "pre-merge-commit", NULL)) - abort_commit(remoteheads, NULL); - /* - * Re-read the index as pre-merge-commit hook could have updated it, - * and write it out as a tree. We must do this before we invoke - * the editor and after we invoke run_status above. - */ - if (find_hook("pre-merge-commit")) - discard_cache(); - read_cache_from(index_file); strbuf_addbuf(&msg, &merge_msg); if (squash) BUG("the control must not reach here under --squash"); @@ -854,7 +842,7 @@ static void prepare_to_commit(struct commit_list *remoteheads) abort_commit(remoteheads, NULL); } - if (!no_verify && run_commit_hook(0 < option_edit, get_index_file(), + if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(), "commit-msg", git_path_merge_msg(the_repository), NULL)) abort_commit(remoteheads, NULL); @@ -872,8 +860,12 @@ static int merge_trivial(struct commit *head, struct commit_list *remoteheads) { struct object_id result_tree, result_commit; struct commit_list *parents, **pptr = &parents; + struct lock_file lock = LOCK_INIT; - if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0) + hold_locked_index(&lock, LOCK_DIE_ON_ERROR); + refresh_cache(REFRESH_QUIET); + if (write_locked_index(&the_index, &lock, + COMMIT_LOCK | SKIP_IF_UNCHANGED)) return error(_("Unable to write index.")); write_tree_trivial(&result_tree); @@ -1400,8 +1392,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) die(_("Can merge only exactly one commit into empty head")); if (verify_signatures) - verify_merge_signature(remoteheads->item, verbosity, - check_trust_level); + verify_merge_signature(remoteheads->item, verbosity); remote_head_oid = &remoteheads->item->object.oid; read_empty(remote_head_oid, 0); @@ -1424,8 +1415,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (verify_signatures) { for (p = remoteheads; p; p = p->next) { - verify_merge_signature(p->item, verbosity, - check_trust_level); + verify_merge_signature(p->item, verbosity); } } diff --git a/third_party/git/builtin/mktag.c b/third_party/git/builtin/mktag.c index 4982d3a93e..6fb7dc8578 100644 --- a/third_party/git/builtin/mktag.c +++ b/third_party/git/builtin/mktag.c @@ -29,11 +29,8 @@ static int verify_object(const struct object_id *oid, const char *expected_type) const struct object_id *repl = lookup_replace_object(the_repository, oid); if (buffer) { - if (type == type_from_string(expected_type)) { - ret = check_object_signature(the_repository, repl, - buffer, size, - expected_type); - } + if (type == type_from_string(expected_type)) + ret = check_object_signature(repl, buffer, size, expected_type); free(buffer); } return ret; diff --git a/third_party/git/builtin/multi-pack-index.c b/third_party/git/builtin/multi-pack-index.c index 5bf88cd2a8..b1ea1a6aa1 100644 --- a/third_party/git/builtin/multi-pack-index.c +++ b/third_party/git/builtin/multi-pack-index.c @@ -6,25 +6,21 @@ #include "trace2.h" static char const * const builtin_multi_pack_index_usage[] = { - N_("git multi-pack-index [<options>] (write|verify|expire|repack --batch-size=<size>)"), + N_("git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --batch-size=<size>)"), NULL }; static struct opts_multi_pack_index { const char *object_dir; unsigned long batch_size; - int progress; } opts; int cmd_multi_pack_index(int argc, const char **argv, const char *prefix) { - unsigned flags = 0; - static struct option builtin_multi_pack_index_options[] = { OPT_FILENAME(0, "object-dir", &opts.object_dir, N_("object directory containing set of packfile and pack-index pairs")), - OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")), OPT_MAGNITUDE(0, "batch-size", &opts.batch_size, N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")), OPT_END(), @@ -32,15 +28,12 @@ int cmd_multi_pack_index(int argc, const char **argv, git_config(git_default_config, NULL); - opts.progress = isatty(2); argc = parse_options(argc, argv, prefix, builtin_multi_pack_index_options, builtin_multi_pack_index_usage, 0); if (!opts.object_dir) opts.object_dir = get_object_directory(); - if (opts.progress) - flags |= MIDX_PROGRESS; if (argc == 0) usage_with_options(builtin_multi_pack_index_usage, @@ -54,17 +47,16 @@ int cmd_multi_pack_index(int argc, const char **argv, trace2_cmd_mode(argv[0]); if (!strcmp(argv[0], "repack")) - return midx_repack(the_repository, opts.object_dir, - (size_t)opts.batch_size, flags); + return midx_repack(the_repository, opts.object_dir, (size_t)opts.batch_size); if (opts.batch_size) die(_("--batch-size option is only for 'repack' subcommand")); if (!strcmp(argv[0], "write")) - return write_midx_file(opts.object_dir, flags); + return write_midx_file(opts.object_dir); if (!strcmp(argv[0], "verify")) - return verify_midx_file(the_repository, opts.object_dir, flags); + return verify_midx_file(the_repository, opts.object_dir); if (!strcmp(argv[0], "expire")) - return expire_midx_packs(the_repository, opts.object_dir, flags); + return expire_midx_packs(the_repository, opts.object_dir); die(_("unrecognized subcommand: %s"), argv[0]); } diff --git a/third_party/git/builtin/name-rev.c b/third_party/git/builtin/name-rev.c index a9dcd25e46..c785fe16ba 100644 --- a/third_party/git/builtin/name-rev.c +++ b/third_party/git/builtin/name-rev.c @@ -6,25 +6,20 @@ #include "tag.h" #include "refs.h" #include "parse-options.h" -#include "prio-queue.h" #include "sha1-lookup.h" #include "commit-slab.h" -/* - * One day. See the 'name a rev shortly after epoch' test in t6120 when - * changing this value - */ -#define CUTOFF_DATE_SLOP 86400 +#define CUTOFF_DATE_SLOP 86400 /* one day */ -struct rev_name { - char *tip_name; +typedef struct rev_name { + const char *tip_name; timestamp_t taggerdate; int generation; int distance; int from_tag; -}; +} rev_name; -define_commit_slab(commit_rev_name, struct rev_name); +define_commit_slab(commit_rev_name, struct rev_name *); static timestamp_t cutoff = TIME_MAX; static struct commit_rev_name rev_names; @@ -32,16 +27,16 @@ static struct commit_rev_name rev_names; /* How many generations are maximally preferred over _one_ merge traversal? */ #define MERGE_TRAVERSAL_WEIGHT 65535 -static int is_valid_rev_name(const struct rev_name *name) +static struct rev_name *get_commit_rev_name(struct commit *commit) { - return name && (name->generation || name->tip_name); + struct rev_name **slot = commit_rev_name_peek(&rev_names, commit); + + return slot ? *slot : NULL; } -static struct rev_name *get_commit_rev_name(const struct commit *commit) +static void set_commit_rev_name(struct commit *commit, struct rev_name *name) { - struct rev_name *name = commit_rev_name_peek(&rev_names, commit); - - return is_valid_rev_name(name) ? name : NULL; + *commit_rev_name_at(&rev_names, commit) = name; } static int is_better_name(struct rev_name *name, @@ -80,135 +75,68 @@ static int is_better_name(struct rev_name *name, return 0; } -static struct rev_name *create_or_update_name(struct commit *commit, - timestamp_t taggerdate, - int generation, int distance, - int from_tag) -{ - struct rev_name *name = commit_rev_name_at(&rev_names, commit); - - if (is_valid_rev_name(name)) { - if (!is_better_name(name, taggerdate, distance, from_tag)) - return NULL; - - /* - * This string might still be shared with ancestors - * (generation > 0). We can release it here regardless, - * because the new name that has just won will be better - * for them as well, so name_rev() will replace these - * stale pointers when it processes the parents. - */ - if (!name->generation) - free(name->tip_name); - } - - name->taggerdate = taggerdate; - name->generation = generation; - name->distance = distance; - name->from_tag = from_tag; - - return name; -} - -static char *get_parent_name(const struct rev_name *name, int parent_number) -{ - struct strbuf sb = STRBUF_INIT; - size_t len; - - strip_suffix(name->tip_name, "^0", &len); - if (name->generation > 0) { - strbuf_grow(&sb, len + - 1 + decimal_width(name->generation) + - 1 + decimal_width(parent_number)); - strbuf_addf(&sb, "%.*s~%d^%d", (int)len, name->tip_name, - name->generation, parent_number); - } else { - strbuf_grow(&sb, len + - 1 + decimal_width(parent_number)); - strbuf_addf(&sb, "%.*s^%d", (int)len, name->tip_name, - parent_number); - } - return strbuf_detach(&sb, NULL); -} - -static void name_rev(struct commit *start_commit, +static void name_rev(struct commit *commit, const char *tip_name, timestamp_t taggerdate, - int from_tag, int deref) + int generation, int distance, int from_tag, + int deref) { - struct prio_queue queue; - struct commit *commit; - struct commit **parents_to_queue = NULL; - size_t parents_to_queue_nr, parents_to_queue_alloc = 0; - struct rev_name *start_name; - - parse_commit(start_commit); - if (start_commit->date < cutoff) - return; + struct rev_name *name = get_commit_rev_name(commit); + struct commit_list *parents; + int parent_number = 1; + char *to_free = NULL; - start_name = create_or_update_name(start_commit, taggerdate, 0, 0, - from_tag); - if (!start_name) - return; - if (deref) - start_name->tip_name = xstrfmt("%s^0", tip_name); - else - start_name->tip_name = xstrdup(tip_name); + parse_commit(commit); - memset(&queue, 0, sizeof(queue)); /* Use the prio_queue as LIFO */ - prio_queue_put(&queue, start_commit); - - while ((commit = prio_queue_get(&queue))) { - struct rev_name *name = get_commit_rev_name(commit); - struct commit_list *parents; - int parent_number = 1; - - parents_to_queue_nr = 0; + if (commit->date < cutoff) + return; - for (parents = commit->parents; - parents; - parents = parents->next, parent_number++) { - struct commit *parent = parents->item; - struct rev_name *parent_name; - int generation, distance; + if (deref) { + tip_name = to_free = xstrfmt("%s^0", tip_name); - parse_commit(parent); - if (parent->date < cutoff) - continue; + if (generation) + die("generation: %d, but deref?", generation); + } - if (parent_number > 1) { - generation = 0; - distance = name->distance + MERGE_TRAVERSAL_WEIGHT; - } else { - generation = name->generation + 1; - distance = name->distance + 1; - } + if (name == NULL) { + name = xmalloc(sizeof(rev_name)); + set_commit_rev_name(commit, name); + goto copy_data; + } else if (is_better_name(name, taggerdate, distance, from_tag)) { +copy_data: + name->tip_name = tip_name; + name->taggerdate = taggerdate; + name->generation = generation; + name->distance = distance; + name->from_tag = from_tag; + } else { + free(to_free); + return; + } - parent_name = create_or_update_name(parent, taggerdate, - generation, - distance, from_tag); - if (parent_name) { - if (parent_number > 1) - parent_name->tip_name = - get_parent_name(name, - parent_number); - else - parent_name->tip_name = name->tip_name; - ALLOC_GROW(parents_to_queue, - parents_to_queue_nr + 1, - parents_to_queue_alloc); - parents_to_queue[parents_to_queue_nr] = parent; - parents_to_queue_nr++; - } + for (parents = commit->parents; + parents; + parents = parents->next, parent_number++) { + if (parent_number > 1) { + size_t len; + char *new_name; + + strip_suffix(tip_name, "^0", &len); + if (generation > 0) + new_name = xstrfmt("%.*s~%d^%d", (int)len, tip_name, + generation, parent_number); + else + new_name = xstrfmt("%.*s^%d", (int)len, tip_name, + parent_number); + + name_rev(parents->item, new_name, taggerdate, 0, + distance + MERGE_TRAVERSAL_WEIGHT, + from_tag, 0); + } else { + name_rev(parents->item, tip_name, taggerdate, + generation + 1, distance + 1, + from_tag, 0); } - - /* The first parent must come out first from the prio_queue */ - while (parents_to_queue_nr) - prio_queue_put(&queue, - parents_to_queue[--parents_to_queue_nr]); } - - clear_prio_queue(&queue); - free(parents_to_queue); } static int subpath_matches(const char *path, const char *filter) @@ -229,10 +157,10 @@ static const char *name_ref_abbrev(const char *refname, int shorten_unambiguous) { if (shorten_unambiguous) refname = shorten_unambiguous_ref(refname, 0); - else if (skip_prefix(refname, "refs/heads/", &refname)) - ; /* refname already advanced */ - else - skip_prefix(refname, "refs/", &refname); + else if (starts_with(refname, "refs/heads/")) + refname = refname + 11; + else if (starts_with(refname, "refs/")) + refname = refname + 5; return refname; } @@ -247,10 +175,6 @@ static struct tip_table { struct tip_table_entry { struct object_id oid; const char *refname; - struct commit *commit; - timestamp_t taggerdate; - unsigned int from_tag:1; - unsigned int deref:1; } *table; int nr; int alloc; @@ -258,18 +182,13 @@ static struct tip_table { } tip_table; static void add_to_tip_table(const struct object_id *oid, const char *refname, - int shorten_unambiguous, struct commit *commit, - timestamp_t taggerdate, int from_tag, int deref) + int shorten_unambiguous) { refname = name_ref_abbrev(refname, shorten_unambiguous); ALLOC_GROW(tip_table.table, tip_table.nr + 1, tip_table.alloc); oidcpy(&tip_table.table[tip_table.nr].oid, oid); tip_table.table[tip_table.nr].refname = xstrdup(refname); - tip_table.table[tip_table.nr].commit = commit; - tip_table.table[tip_table.nr].taggerdate = taggerdate; - tip_table.table[tip_table.nr].from_tag = from_tag; - tip_table.table[tip_table.nr].deref = deref; tip_table.nr++; tip_table.sorted = 0; } @@ -280,30 +199,12 @@ static int tipcmp(const void *a_, const void *b_) return oidcmp(&a->oid, &b->oid); } -static int cmp_by_tag_and_age(const void *a_, const void *b_) -{ - const struct tip_table_entry *a = a_, *b = b_; - int cmp; - - /* Prefer tags. */ - cmp = b->from_tag - a->from_tag; - if (cmp) - return cmp; - - /* Older is better. */ - if (a->taggerdate < b->taggerdate) - return -1; - return a->taggerdate != b->taggerdate; -} - static int name_ref(const char *path, const struct object_id *oid, int flags, void *cb_data) { struct object *o = parse_object(the_repository, oid); struct name_ref_data *data = cb_data; int can_abbreviate_output = data->tags_only && data->name_only; int deref = 0; - int from_tag = 0; - struct commit *commit = NULL; timestamp_t taggerdate = TIME_MAX; if (data->tags_only && !starts_with(path, "refs/tags/")) @@ -352,6 +253,8 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo return 0; } + add_to_tip_table(oid, path, can_abbreviate_output); + while (o && o->type == OBJ_TAG) { struct tag *t = (struct tag *) o; if (!t->tagged) @@ -361,33 +264,16 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo taggerdate = t->date; } if (o && o->type == OBJ_COMMIT) { - commit = (struct commit *)o; - from_tag = starts_with(path, "refs/tags/"); - if (taggerdate == TIME_MAX) - taggerdate = commit->date; - } + struct commit *commit = (struct commit *)o; + int from_tag = starts_with(path, "refs/tags/"); - add_to_tip_table(oid, path, can_abbreviate_output, commit, taggerdate, + if (taggerdate == TIME_MAX) + taggerdate = ((struct commit *)o)->date; + path = name_ref_abbrev(path, can_abbreviate_output); + name_rev(commit, xstrdup(path), taggerdate, 0, 0, from_tag, deref); - return 0; -} - -static void name_tips(void) -{ - int i; - - /* - * Try to set better names first, so that worse ones spread - * less. - */ - QSORT(tip_table.table, tip_table.nr, cmp_by_tag_and_age); - for (i = 0; i < tip_table.nr; i++) { - struct tip_table_entry *e = &tip_table.table[i]; - if (e->commit) { - name_rev(e->commit, e->refname, e->taggerdate, - e->from_tag, e->deref); - } } + return 0; } static const unsigned char *nth_tip_table_ent(size_t ix, void *table_) @@ -419,11 +305,11 @@ static const char *get_exact_ref_match(const struct object *o) static const char *get_rev_name(const struct object *o, struct strbuf *buf) { struct rev_name *n; - const struct commit *c; + struct commit *c; if (o->type != OBJ_COMMIT) return get_exact_ref_match(o); - c = (const struct commit *) o; + c = (struct commit *) o; n = get_commit_rev_name(c); if (!n) return NULL; @@ -431,10 +317,11 @@ static const char *get_rev_name(const struct object *o, struct strbuf *buf) if (!n->generation) return n->tip_name; else { + int len = strlen(n->tip_name); + if (len > 2 && !strcmp(n->tip_name + len - 2, "^0")) + len -= 2; strbuf_reset(buf); - strbuf_addstr(buf, n->tip_name); - strbuf_strip_suffix(buf, "^0"); - strbuf_addf(buf, "~%d", n->generation); + strbuf_addf(buf, "%.*s~%d", len, n->tip_name, n->generation); return buf->buf; } } @@ -594,15 +481,9 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix) add_object_array(object, *argv, &revs); } - if (cutoff) { - /* check for undeflow */ - if (cutoff > TIME_MIN + CUTOFF_DATE_SLOP) - cutoff = cutoff - CUTOFF_DATE_SLOP; - else - cutoff = TIME_MIN; - } + if (cutoff) + cutoff = cutoff - CUTOFF_DATE_SLOP; for_each_ref(name_ref, &data); - name_tips(); if (transform_stdin) { char buffer[2048]; diff --git a/third_party/git/builtin/notes.c b/third_party/git/builtin/notes.c index 35e468ea2d..02e97f55c5 100644 --- a/third_party/git/builtin/notes.c +++ b/third_party/git/builtin/notes.c @@ -513,7 +513,7 @@ static int copy(int argc, const char **argv, const char *prefix) } } - if (argc < 1) { + if (argc < 2) { error(_("too few parameters")); usage_with_options(git_notes_copy_usage, options); } @@ -622,7 +622,7 @@ static int append_edit(int argc, const char **argv, const char *prefix) strbuf_grow(&d.buf, size + 1); if (d.buf.len && prev_buf && size) - strbuf_insertstr(&d.buf, 0, "\n"); + strbuf_insert(&d.buf, 0, "\n", 1); if (prev_buf && size) strbuf_insert(&d.buf, 0, prev_buf, size); free(prev_buf); @@ -745,7 +745,7 @@ static int merge_commit(struct notes_merge_options *o) memset(&pretty_ctx, 0, sizeof(pretty_ctx)); format_commit_message(partial, "%s", &msg, &pretty_ctx); strbuf_trim(&msg); - strbuf_insertstr(&msg, 0, "notes: "); + strbuf_insert(&msg, 0, "notes: ", 7); update_ref(msg.buf, o->local_ref, &oid, is_null_oid(&parent_oid) ? NULL : &parent_oid, 0, UPDATE_REFS_DIE_ON_ERR); diff --git a/third_party/git/builtin/pack-objects.c b/third_party/git/builtin/pack-objects.c index 02aa6ee480..76ce906946 100644 --- a/third_party/git/builtin/pack-objects.c +++ b/third_party/git/builtin/pack-objects.c @@ -92,11 +92,10 @@ static struct progress *progress_state; static struct packed_git *reuse_packfile; static uint32_t reuse_packfile_objects; -static struct bitmap *reuse_packfile_bitmap; +static off_t reuse_packfile_offset; static int use_bitmap_index_default = 1; static int use_bitmap_index = -1; -static int allow_pack_reuse = 1; static enum { WRITE_BITMAP_FALSE = 0, WRITE_BITMAP_QUIET, @@ -164,7 +163,7 @@ static void *get_delta(struct object_entry *entry) delta_buf = diff_delta(base_buf, base_size, buf, size, &delta_size, 0); /* - * We successfully computed this delta once but dropped it for + * We succesfully computed this delta once but dropped it for * memory reasons. Something is very wrong if this time we * recompute and create a different delta. */ @@ -304,8 +303,7 @@ static unsigned long write_no_reuse_object(struct hashfile *f, struct object_ent if (!usable_delta) { if (oe_type(entry) == OBJ_BLOB && oe_size_greater_than(&to_pack, entry, big_file_threshold) && - (st = open_istream(the_repository, &entry->idx.oid, &type, - &size, NULL)) != NULL) + (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL) buf = NULL; else { buf = read_object_file(&entry->idx.oid, &type, &size); @@ -612,12 +610,12 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag, void *cb_data) { struct object_id peeled; - struct object_entry *entry = packlist_find(&to_pack, oid); + struct object_entry *entry = packlist_find(&to_pack, oid, NULL); if (entry) entry->tagged = 1; if (!peel_ref(path, &peeled)) { - entry = packlist_find(&to_pack, &peeled); + entry = packlist_find(&to_pack, &peeled, NULL); if (entry) entry->tagged = 1; } @@ -786,186 +784,57 @@ static struct object_entry **compute_write_order(void) return wo; } - -/* - * A reused set of objects. All objects in a chunk have the same - * relative position in the original packfile and the generated - * packfile. - */ - -static struct reused_chunk { - /* The offset of the first object of this chunk in the original - * packfile. */ - off_t original; - /* The offset of the first object of this chunk in the generated - * packfile minus "original". */ - off_t difference; -} *reused_chunks; -static int reused_chunks_nr; -static int reused_chunks_alloc; - -static void record_reused_object(off_t where, off_t offset) +static off_t write_reused_pack(struct hashfile *f) { - if (reused_chunks_nr && reused_chunks[reused_chunks_nr-1].difference == offset) - return; + unsigned char buffer[8192]; + off_t to_write, total; + int fd; - ALLOC_GROW(reused_chunks, reused_chunks_nr + 1, - reused_chunks_alloc); - reused_chunks[reused_chunks_nr].original = where; - reused_chunks[reused_chunks_nr].difference = offset; - reused_chunks_nr++; -} + if (!is_pack_valid(reuse_packfile)) + die(_("packfile is invalid: %s"), reuse_packfile->pack_name); -/* - * Binary search to find the chunk that "where" is in. Note - * that we're not looking for an exact match, just the first - * chunk that contains it (which implicitly ends at the start - * of the next chunk. - */ -static off_t find_reused_offset(off_t where) -{ - int lo = 0, hi = reused_chunks_nr; - while (lo < hi) { - int mi = lo + ((hi - lo) / 2); - if (where == reused_chunks[mi].original) - return reused_chunks[mi].difference; - if (where < reused_chunks[mi].original) - hi = mi; - else - lo = mi + 1; - } + fd = git_open(reuse_packfile->pack_name); + if (fd < 0) + die_errno(_("unable to open packfile for reuse: %s"), + reuse_packfile->pack_name); - /* - * The first chunk starts at zero, so we can't have gone below - * there. - */ - assert(lo); - return reused_chunks[lo-1].difference; -} + if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1) + die_errno(_("unable to seek in reused packfile")); -static void write_reused_pack_one(size_t pos, struct hashfile *out, - struct pack_window **w_curs) -{ - off_t offset, next, cur; - enum object_type type; - unsigned long size; + if (reuse_packfile_offset < 0) + reuse_packfile_offset = reuse_packfile->pack_size - the_hash_algo->rawsz; - offset = reuse_packfile->revindex[pos].offset; - next = reuse_packfile->revindex[pos + 1].offset; + total = to_write = reuse_packfile_offset - sizeof(struct pack_header); - record_reused_object(offset, offset - hashfile_total(out)); + while (to_write) { + int read_pack = xread(fd, buffer, sizeof(buffer)); - cur = offset; - type = unpack_object_header(reuse_packfile, w_curs, &cur, &size); - assert(type >= 0); + if (read_pack <= 0) + die_errno(_("unable to read from reused packfile")); - if (type == OBJ_OFS_DELTA) { - off_t base_offset; - off_t fixup; - - unsigned char header[MAX_PACK_OBJECT_HEADER]; - unsigned len; - - base_offset = get_delta_base(reuse_packfile, w_curs, &cur, type, offset); - assert(base_offset != 0); - - /* Convert to REF_DELTA if we must... */ - if (!allow_ofs_delta) { - int base_pos = find_revindex_position(reuse_packfile, base_offset); - struct object_id base_oid; - - nth_packed_object_id(&base_oid, reuse_packfile, - reuse_packfile->revindex[base_pos].nr); - - len = encode_in_pack_object_header(header, sizeof(header), - OBJ_REF_DELTA, size); - hashwrite(out, header, len); - hashwrite(out, base_oid.hash, 20); - copy_pack_data(out, reuse_packfile, w_curs, cur, next - cur); - return; - } - - /* Otherwise see if we need to rewrite the offset... */ - fixup = find_reused_offset(offset) - - find_reused_offset(base_offset); - if (fixup) { - unsigned char ofs_header[10]; - unsigned i, ofs_len; - off_t ofs = offset - base_offset - fixup; - - len = encode_in_pack_object_header(header, sizeof(header), - OBJ_OFS_DELTA, size); + if (read_pack > to_write) + read_pack = to_write; - i = sizeof(ofs_header) - 1; - ofs_header[i] = ofs & 127; - while (ofs >>= 7) - ofs_header[--i] = 128 | (--ofs & 127); - - ofs_len = sizeof(ofs_header) - i; - - hashwrite(out, header, len); - hashwrite(out, ofs_header + sizeof(ofs_header) - ofs_len, ofs_len); - copy_pack_data(out, reuse_packfile, w_curs, cur, next - cur); - return; - } - - /* ...otherwise we have no fixup, and can write it verbatim */ - } - - copy_pack_data(out, reuse_packfile, w_curs, offset, next - offset); -} - -static size_t write_reused_pack_verbatim(struct hashfile *out, - struct pack_window **w_curs) -{ - size_t pos = 0; - - while (pos < reuse_packfile_bitmap->word_alloc && - reuse_packfile_bitmap->words[pos] == (eword_t)~0) - pos++; - - if (pos) { - off_t to_write; - - written = (pos * BITS_IN_EWORD); - to_write = reuse_packfile->revindex[written].offset - - sizeof(struct pack_header); - - /* We're recording one chunk, not one object. */ - record_reused_object(sizeof(struct pack_header), 0); - hashflush(out); - copy_pack_data(out, reuse_packfile, w_curs, - sizeof(struct pack_header), to_write); + hashwrite(f, buffer, read_pack); + to_write -= read_pack; + /* + * We don't know the actual number of objects written, + * only how many bytes written, how many bytes total, and + * how many objects total. So we can fake it by pretending all + * objects we are writing are the same size. This gives us a + * smooth progress meter, and at the end it matches the true + * answer. + */ + written = reuse_packfile_objects * + (((double)(total - to_write)) / total); display_progress(progress_state, written); } - return pos; -} - -static void write_reused_pack(struct hashfile *f) -{ - size_t i = 0; - uint32_t offset; - struct pack_window *w_curs = NULL; - - if (allow_ofs_delta) - i = write_reused_pack_verbatim(f, &w_curs); - - for (; i < reuse_packfile_bitmap->word_alloc; ++i) { - eword_t word = reuse_packfile_bitmap->words[i]; - size_t pos = (i * BITS_IN_EWORD); - - for (offset = 0; offset < BITS_IN_EWORD; ++offset) { - if ((word >> offset) == 0) - break; - - offset += ewah_bit_ctz64(word >> offset); - write_reused_pack_one(pos + offset, f, &w_curs); - display_progress(progress_state, ++written); - } - } - unuse_pack(&w_curs); + close(fd); + written = reuse_packfile_objects; + display_progress(progress_state, written); + return reuse_packfile_offset - sizeof(struct pack_header); } static const char no_split_warning[] = N_( @@ -998,9 +867,11 @@ static void write_pack_file(void) offset = write_pack_header(f, nr_remaining); if (reuse_packfile) { + off_t packfile_size; assert(pack_to_stdout); - write_reused_pack(f); - offset = hashfile_total(f); + + packfile_size = write_reused_pack(f); + offset += packfile_size; } nr_written = 0; @@ -1125,15 +996,12 @@ static int no_try_delta(const char *path) * few lines later when we want to add the new entry. */ static int have_duplicate_entry(const struct object_id *oid, - int exclude) + int exclude, + uint32_t *index_pos) { struct object_entry *entry; - if (reuse_packfile_bitmap && - bitmap_walk_contains(bitmap_git, reuse_packfile_bitmap, oid)) - return 1; - - entry = packlist_find(&to_pack, oid); + entry = packlist_find(&to_pack, oid, index_pos); if (!entry) return 0; @@ -1273,12 +1141,13 @@ static void create_object_entry(const struct object_id *oid, uint32_t hash, int exclude, int no_try_delta, + uint32_t index_pos, struct packed_git *found_pack, off_t found_offset) { struct object_entry *entry; - entry = packlist_alloc(&to_pack, oid); + entry = packlist_alloc(&to_pack, oid->hash, index_pos); entry->hash = hash; oe_set_type(entry, type); if (exclude) @@ -1302,10 +1171,11 @@ static int add_object_entry(const struct object_id *oid, enum object_type type, { struct packed_git *found_pack = NULL; off_t found_offset = 0; + uint32_t index_pos; display_progress(progress_state, ++nr_seen); - if (have_duplicate_entry(oid, exclude)) + if (have_duplicate_entry(oid, exclude, &index_pos)) return 0; if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) { @@ -1320,7 +1190,7 @@ static int add_object_entry(const struct object_id *oid, enum object_type type, create_object_entry(oid, type, pack_name_hash(name), exclude, name && no_try_delta(name), - found_pack, found_offset); + index_pos, found_pack, found_offset); return 1; } @@ -1329,15 +1199,17 @@ static int add_object_entry_from_bitmap(const struct object_id *oid, int flags, uint32_t name_hash, struct packed_git *pack, off_t offset) { + uint32_t index_pos; + display_progress(progress_state, ++nr_seen); - if (have_duplicate_entry(oid, 0)) + if (have_duplicate_entry(oid, 0, &index_pos)) return 0; if (!want_object_in_pack(oid, 0, &pack, &offset)) return 0; - create_object_entry(oid, type, name_hash, 0, 0, pack, offset); + create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset); return 1; } @@ -1619,17 +1491,23 @@ static void cleanup_preferred_base(void) * deltify other objects against, in order to avoid * circular deltas. */ -static int can_reuse_delta(const struct object_id *base_oid, +static int can_reuse_delta(const unsigned char *base_sha1, struct object_entry *delta, struct object_entry **base_out) { struct object_entry *base; + struct object_id base_oid; + + if (!base_sha1) + return 0; + + oidread(&base_oid, base_sha1); /* * First see if we're already sending the base (or it's explicitly in * our "excluded" list). */ - base = packlist_find(&to_pack, base_oid); + base = packlist_find(&to_pack, &base_oid, NULL); if (base) { if (!in_same_island(&delta->idx.oid, &base->idx.oid)) return 0; @@ -1642,9 +1520,9 @@ static int can_reuse_delta(const struct object_id *base_oid, * even if it was buried too deep in history to make it into the * packing list. */ - if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, base_oid)) { + if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, &base_oid)) { if (use_delta_islands) { - if (!in_same_island(&delta->idx.oid, base_oid)) + if (!in_same_island(&delta->idx.oid, &base_oid)) return 0; } *base_out = NULL; @@ -1661,8 +1539,7 @@ static void check_object(struct object_entry *entry) if (IN_PACK(entry)) { struct packed_git *p = IN_PACK(entry); struct pack_window *w_curs = NULL; - int have_base = 0; - struct object_id base_ref; + const unsigned char *base_ref = NULL; struct object_entry *base_entry; unsigned long used, used_0; unsigned long avail; @@ -1703,13 +1580,9 @@ static void check_object(struct object_entry *entry) unuse_pack(&w_curs); return; case OBJ_REF_DELTA: - if (reuse_delta && !entry->preferred_base) { - oidread(&base_ref, - use_pack(p, &w_curs, - entry->in_pack_offset + used, - NULL)); - have_base = 1; - } + if (reuse_delta && !entry->preferred_base) + base_ref = use_pack(p, &w_curs, + entry->in_pack_offset + used, NULL); entry->in_pack_header_size = used + the_hash_algo->rawsz; break; case OBJ_OFS_DELTA: @@ -1739,15 +1612,13 @@ static void check_object(struct object_entry *entry) revidx = find_pack_revindex(p, ofs); if (!revidx) goto give_up; - if (!nth_packed_object_id(&base_ref, p, revidx->nr)) - have_base = 1; + base_ref = nth_packed_object_sha1(p, revidx->nr); } entry->in_pack_header_size = used + used_0; break; } - if (have_base && - can_reuse_delta(&base_ref, entry, &base_entry)) { + if (can_reuse_delta(base_ref, entry, &base_entry)) { oe_set_type(entry, entry->in_pack_type); SET_SIZE(entry, in_pack_size); /* delta size */ SET_DELTA_SIZE(entry, in_pack_size); @@ -1757,7 +1628,7 @@ static void check_object(struct object_entry *entry) entry->delta_sibling_idx = base_entry->delta_child_idx; SET_DELTA_CHILD(base_entry, entry); } else { - SET_DELTA_EXT(entry, &base_ref); + SET_DELTA_EXT(entry, base_ref); } unuse_pack(&w_curs); @@ -2471,6 +2342,15 @@ static void find_deltas(struct object_entry **list, unsigned *list_size, free(array); } +static void try_to_free_from_threads(size_t size) +{ + packing_data_lock(&to_pack); + release_pack_memory(size); + packing_data_unlock(&to_pack); +} + +static try_to_free_t old_try_to_free_routine; + /* * The main object list is split into smaller lists, each is handed to * one worker. @@ -2511,10 +2391,12 @@ static void init_threaded_search(void) pthread_mutex_init(&cache_mutex, NULL); pthread_mutex_init(&progress_mutex, NULL); pthread_cond_init(&progress_cond, NULL); + old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads); } static void cleanup_threaded_search(void) { + set_try_to_free_routine(old_try_to_free_routine); pthread_cond_destroy(&progress_cond); pthread_mutex_destroy(&cache_mutex); pthread_mutex_destroy(&progress_mutex); @@ -2686,13 +2568,6 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size, free(p); } -static int obj_is_packed(const struct object_id *oid) -{ - return packlist_find(&to_pack, oid) || - (reuse_packfile_bitmap && - bitmap_walk_contains(bitmap_git, reuse_packfile_bitmap, oid)); -} - static void add_tag_chain(const struct object_id *oid) { struct tag *tag; @@ -2704,7 +2579,7 @@ static void add_tag_chain(const struct object_id *oid) * it was included via bitmaps, we would not have parsed it * previously). */ - if (obj_is_packed(oid)) + if (packlist_find(&to_pack, oid, NULL)) return; tag = lookup_tag(the_repository, oid); @@ -2728,7 +2603,7 @@ static int add_ref_tag(const char *path, const struct object_id *oid, int flag, if (starts_with(path, "refs/tags/") && /* is a tag? */ !peel_ref(path, &peeled) && /* peelable? */ - obj_is_packed(&peeled)) /* object packed? */ + packlist_find(&to_pack, &peeled, NULL)) /* object packed? */ add_tag_chain(oid); return 0; } @@ -2796,7 +2671,6 @@ static void prepare_pack(int window, int depth) if (nr_deltas && n > 1) { unsigned nr_done = 0; - if (progress) progress_state = start_progress(_("Compressing objects"), nr_deltas); @@ -2841,8 +2715,8 @@ static int git_pack_config(const char *k, const char *v, void *cb) use_bitmap_index_default = git_config_bool(k, v); return 0; } - if (!strcmp(k, "pack.allowpackreuse")) { - allow_pack_reuse = git_config_bool(k, v); + if (!strcmp(k, "pack.usesparse")) { + sparse = git_config_bool(k, v); return 0; } if (!strcmp(k, "pack.threads")) { @@ -2929,7 +2803,7 @@ static void show_object(struct object *obj, const char *name, void *data) for (p = strchr(name, '/'); p; p = strchr(p + 1, '/')) depth++; - ent = packlist_find(&to_pack, &obj->oid); + ent = packlist_find(&to_pack, &obj->oid, NULL); if (ent && depth > oe_tree_depth(&to_pack, ent)) oe_set_tree_depth(&to_pack, ent, depth); } @@ -3055,7 +2929,7 @@ static void add_objects_in_unpacked_packs(void) in_pack.alloc); for (i = 0; i < p->num_objects; i++) { - nth_packed_object_id(&oid, p, i); + nth_packed_object_oid(&oid, p, i); o = lookup_unknown_object(&oid); if (!(o->flags & OBJECT_ADDED)) mark_in_pack_object(o, p, &in_pack); @@ -3159,8 +3033,8 @@ static void loosen_unused_packed_objects(void) die(_("cannot open pack index")); for (i = 0; i < p->num_objects; i++) { - nth_packed_object_id(&oid, p, i); - if (!packlist_find(&to_pack, &oid) && + nth_packed_object_oid(&oid, p, i); + if (!packlist_find(&to_pack, &oid, NULL) && !has_sha1_pack_kept_or_nonlocal(&oid) && !loosened_object_can_be_discarded(&oid, p->mtime)) if (force_object_loose(&oid, p->mtime)) @@ -3176,8 +3050,8 @@ static void loosen_unused_packed_objects(void) */ static int pack_options_allow_reuse(void) { - return allow_pack_reuse && - pack_to_stdout && + return pack_to_stdout && + allow_ofs_delta && !ignore_packed_keep_on_disk && !ignore_packed_keep_in_core && (!local || !have_non_local_packs) && @@ -3186,7 +3060,7 @@ static int pack_options_allow_reuse(void) static int get_object_list_from_bitmap(struct rev_info *revs) { - if (!(bitmap_git = prepare_bitmap_walk(revs, &filter_options))) + if (!(bitmap_git = prepare_bitmap_walk(revs))) return -1; if (pack_options_allow_reuse() && @@ -3194,14 +3068,13 @@ static int get_object_list_from_bitmap(struct rev_info *revs) bitmap_git, &reuse_packfile, &reuse_packfile_objects, - &reuse_packfile_bitmap)) { + &reuse_packfile_offset)) { assert(reuse_packfile_objects); nr_result += reuse_packfile_objects; display_progress(progress_state, nr_result); } - traverse_bitmap_commit_list(bitmap_git, revs, - &add_object_entry_from_bitmap); + traverse_bitmap_commit_list(bitmap_git, &add_object_entry_from_bitmap); return 0; } @@ -3470,10 +3343,6 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) read_replace_refs = 0; sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0); - prepare_repo_settings(the_repository); - if (!sparse && the_repository->settings.pack_use_sparse != -1) - sparse = the_repository->settings.pack_use_sparse; - reset_pack_idx_option(&pack_idx_opts); git_config(git_pack_config, NULL); @@ -3565,6 +3434,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (filter_options.choice) { if (!pack_to_stdout) die(_("cannot use --filter without --stdout")); + use_bitmap_index = 0; } /* @@ -3655,9 +3525,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (progress) fprintf_ln(stderr, _("Total %"PRIu32" (delta %"PRIu32")," - " reused %"PRIu32" (delta %"PRIu32")," - " pack-reused %"PRIu32), - written, written_delta, reused, reused_delta, - reuse_packfile_objects); + " reused %"PRIu32" (delta %"PRIu32")"), + written, written_delta, reused, reused_delta); return 0; } diff --git a/third_party/git/builtin/patch-id.c b/third_party/git/builtin/patch-id.c index 822ffff51f..bd28b80b2d 100644 --- a/third_party/git/builtin/patch-id.c +++ b/third_party/git/builtin/patch-id.c @@ -1,12 +1,16 @@ -#include "cache.h" #include "builtin.h" #include "config.h" #include "diff.h" static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result) { - if (patchlen) - printf("%s %s\n", oid_to_hex(result), oid_to_hex(id)); + char name[50]; + + if (!patchlen) + return; + + memcpy(name, oid_to_hex(id), GIT_SHA1_HEXSZ + 1); + printf("%s %s\n", oid_to_hex(result), name); } static int remove_space(char *line) @@ -56,9 +60,9 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result, { int patchlen = 0, found_next = 0; int before = -1, after = -1; - git_hash_ctx ctx; + git_SHA_CTX ctx; - the_hash_algo->init_fn(&ctx); + git_SHA1_Init(&ctx); oidclr(result); while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) { @@ -118,7 +122,7 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result, /* Compute the sha without whitespace */ len = remove_space(line); patchlen += len; - the_hash_algo->update_fn(&ctx, line, len); + git_SHA1_Update(&ctx, line, len); } if (!found_next) diff --git a/third_party/git/builtin/pull.c b/third_party/git/builtin/pull.c index 3e624d1e00..f1eaf6e6ed 100644 --- a/third_party/git/builtin/pull.c +++ b/third_party/git/builtin/pull.c @@ -15,7 +15,6 @@ #include "sha1-array.h" #include "remote.h" #include "dir.h" -#include "rebase.h" #include "refs.h" #include "refspec.h" #include "revision.h" @@ -27,6 +26,15 @@ #include "commit-reach.h" #include "sequencer.h" +enum rebase_type { + REBASE_INVALID = -1, + REBASE_FALSE = 0, + REBASE_TRUE, + REBASE_PRESERVE, + REBASE_MERGES, + REBASE_INTERACTIVE +}; + /** * Parses the value of --rebase. If value is a false value, returns * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is @@ -37,9 +45,22 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value, int fatal) { - enum rebase_type v = rebase_parse_value(value); - if (v != REBASE_INVALID) - return v; + int v = git_parse_maybe_bool(value); + + if (!v) + return REBASE_FALSE; + else if (v > 0) + return REBASE_TRUE; + else if (!strcmp(value, "preserve") || !strcmp(value, "p")) + return REBASE_PRESERVE; + else if (!strcmp(value, "merges") || !strcmp(value, "m")) + return REBASE_MERGES; + else if (!strcmp(value, "interactive") || !strcmp(value, "i")) + return REBASE_INTERACTIVE; + /* + * Please update _git_config() in git-completion.bash when you + * add new rebase modes. + */ if (fatal) die(_("Invalid value for %s: %s"), key, value); @@ -86,7 +107,6 @@ static char *opt_ff; static char *opt_verify_signatures; static int opt_autostash = -1; static int config_autostash; -static int check_trust_level = 1; static struct argv_array opt_strategies = ARGV_ARRAY_INIT; static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT; static char *opt_gpg_sign; @@ -109,7 +129,6 @@ static char *opt_refmap; static char *opt_ipv4; static char *opt_ipv6; static int opt_show_forced_updates = -1; -static char *set_upstream; static struct option pull_options[] = { /* Shared options */ @@ -224,9 +243,6 @@ static struct option pull_options[] = { PARSE_OPT_NOARG), OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates, N_("check for forced-updates on all updated branches")), - OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL, - N_("set upstream for git pull/fetch"), - PARSE_OPT_NOARG), OPT_END() }; @@ -335,8 +351,6 @@ static enum rebase_type config_get_rebase(void) */ static int git_pull_config(const char *var, const char *value, void *cb) { - int status; - if (!strcmp(var, "rebase.autostash")) { config_autostash = git_config_bool(var, value); return 0; @@ -344,14 +358,7 @@ static int git_pull_config(const char *var, const char *value, void *cb) recurse_submodules = git_config_bool(var, value) ? RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; return 0; - } else if (!strcmp(var, "gpg.mintrustlevel")) { - check_trust_level = 0; } - - status = git_gpg_config(var, value, cb); - if (status) - return status; - return git_default_config(var, value, cb); } @@ -549,8 +556,6 @@ static int run_fetch(const char *repo, const char **refspecs) argv_array_push(&args, "--show-forced-updates"); else if (opt_show_forced_updates == 0) argv_array_push(&args, "--no-show-forced-updates"); - if (set_upstream) - argv_array_push(&args, set_upstream); if (repo) { argv_array_push(&args, repo); @@ -576,8 +581,7 @@ static int pull_into_void(const struct object_id *merge_head, die(_("unable to access commit %s"), oid_to_hex(merge_head)); - verify_merge_signature(commit, opt_verbosity, - check_trust_level); + verify_merge_signature(commit, opt_verbosity); } /* diff --git a/third_party/git/builtin/push.c b/third_party/git/builtin/push.c index 6dbf0f0bb7..021dd3b1e4 100644 --- a/third_party/git/builtin/push.c +++ b/third_party/git/builtin/push.c @@ -64,7 +64,6 @@ static struct string_list push_options_config = STRING_LIST_INIT_DUP; static const char *map_refspec(const char *ref, struct remote *remote, struct ref *local_refs) { - const char *branch_name; struct ref *matched = NULL; /* Does "ref" uniquely name our ref? */ @@ -85,8 +84,8 @@ static const char *map_refspec(const char *ref, } if (push_default == PUSH_DEFAULT_UPSTREAM && - skip_prefix(matched->name, "refs/heads/", &branch_name)) { - struct branch *branch = branch_get(branch_name); + starts_with(matched->name, "refs/heads/")) { + struct branch *branch = branch_get(matched->name + 11); if (branch->merge_nr == 1 && branch->merge[0]->src) { struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, "%s:%s", @@ -144,8 +143,8 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p) return remote->url_nr; } -static NORETURN void die_push_simple(struct branch *branch, - struct remote *remote) +static NORETURN int die_push_simple(struct branch *branch, + struct remote *remote) { /* * There's no point in using shorten_unambiguous_ref here, @@ -358,10 +357,8 @@ static int push_with_options(struct transport *transport, struct refspec *rs, if (verbosity > 0) fprintf(stderr, _("Pushing to %s\n"), transport->url); - trace2_region_enter("push", "transport_push", the_repository); err = transport_push(the_repository, transport, rs, flags, &reject_reasons); - trace2_region_leave("push", "transport_push", the_repository); if (err != 0) { fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR)); error(_("failed to push some refs to '%s'"), transport->url); @@ -388,14 +385,30 @@ static int push_with_options(struct transport *transport, struct refspec *rs, } static int do_push(const char *repo, int flags, - const struct string_list *push_options, - struct remote *remote) + const struct string_list *push_options) { int i, errs; + struct remote *remote = pushremote_get(repo); const char **url; int url_nr; struct refspec *push_refspec = &rs; + if (!remote) { + if (repo) + die(_("bad repository '%s'"), repo); + die(_("No configured push destination.\n" + "Either specify the URL from the command-line or configure a remote repository using\n" + "\n" + " git remote add <name> <url>\n" + "\n" + "and then push using the remote name\n" + "\n" + " git push <name>\n")); + } + + if (remote->mirror) + flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE); + if (push_options->nr) flags |= TRANSPORT_PUSH_OPTIONS; @@ -535,7 +548,6 @@ int cmd_push(int argc, const char **argv, const char *prefix) struct string_list push_options_cmdline = STRING_LIST_INIT_DUP; struct string_list *push_options; const struct string_list_item *item; - struct remote *remote; struct option options[] = { OPT__VERBOSITY(&verbosity), @@ -590,6 +602,20 @@ int cmd_push(int argc, const char **argv, const char *prefix) die(_("--delete is incompatible with --all, --mirror and --tags")); if (deleterefs && argc < 2) die(_("--delete doesn't make sense without any refs")); + if (flags & TRANSPORT_PUSH_ALL) { + if (tags) + die(_("--all and --tags are incompatible")); + if (argc >= 2) + die(_("--all can't be combined with refspecs")); + } + if (flags & TRANSPORT_PUSH_MIRROR) { + if (tags) + die(_("--mirror and --tags are incompatible")); + if (argc >= 2) + die(_("--mirror can't be combined with refspecs")); + } + if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR)) + die(_("--all and --mirror are incompatible")); if (recurse_submodules == RECURSE_SUBMODULES_CHECK) flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK; @@ -606,43 +632,11 @@ int cmd_push(int argc, const char **argv, const char *prefix) set_refspecs(argv + 1, argc - 1, repo); } - remote = pushremote_get(repo); - if (!remote) { - if (repo) - die(_("bad repository '%s'"), repo); - die(_("No configured push destination.\n" - "Either specify the URL from the command-line or configure a remote repository using\n" - "\n" - " git remote add <name> <url>\n" - "\n" - "and then push using the remote name\n" - "\n" - " git push <name>\n")); - } - - if (remote->mirror) - flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE); - - if (flags & TRANSPORT_PUSH_ALL) { - if (tags) - die(_("--all and --tags are incompatible")); - if (argc >= 2) - die(_("--all can't be combined with refspecs")); - } - if (flags & TRANSPORT_PUSH_MIRROR) { - if (tags) - die(_("--mirror and --tags are incompatible")); - if (argc >= 2) - die(_("--mirror can't be combined with refspecs")); - } - if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR)) - die(_("--all and --mirror are incompatible")); - for_each_string_list_item(item, push_options) if (strchr(item->string, '\n')) die(_("push options must not have new line characters")); - rc = do_push(repo, flags, push_options, remote); + rc = do_push(repo, flags, push_options); string_list_clear(&push_options_cmdline, 0); string_list_clear(&push_options_config, 0); if (rc == -1) diff --git a/third_party/git/builtin/range-diff.c b/third_party/git/builtin/range-diff.c index d8a4670629..9202e75544 100644 --- a/third_party/git/builtin/range-diff.c +++ b/third_party/git/builtin/range-diff.c @@ -15,16 +15,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix) { int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT; struct diff_options diffopt = { NULL }; - struct argv_array other_arg = ARGV_ARRAY_INIT; int simple_color = -1; struct option range_diff_options[] = { OPT_INTEGER(0, "creation-factor", &creation_factor, N_("Percentage by which creation is weighted")), OPT_BOOL(0, "no-dual-color", &simple_color, N_("use simple diff colors")), - OPT_PASSTHRU_ARGV(0, "notes", &other_arg, - N_("notes"), N_("passed to 'git log'"), - PARSE_OPT_OPTARG), OPT_END() }; struct option *options; @@ -82,9 +78,8 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix) FREE_AND_NULL(options); res = show_range_diff(range1.buf, range2.buf, creation_factor, - simple_color < 1, &diffopt, &other_arg); + simple_color < 1, &diffopt); - argv_array_clear(&other_arg); strbuf_release(&range1); strbuf_release(&range2); diff --git a/third_party/git/builtin/read-tree.c b/third_party/git/builtin/read-tree.c index af7424b94c..ca5e655d2f 100644 --- a/third_party/git/builtin/read-tree.c +++ b/third_party/git/builtin/read-tree.c @@ -185,7 +185,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) if (opts.reset || opts.merge || opts.prefix) { if (read_cache_unmerged() && (opts.prefix || opts.merge)) - die(_("You need to resolve your current index first")); + die("You need to resolve your current index first"); stage = opts.merge = 1; } resolve_undo_clear(); diff --git a/third_party/git/builtin/rebase.c b/third_party/git/builtin/rebase.c index bff53d5d16..670096c065 100644 --- a/third_party/git/builtin/rebase.c +++ b/third_party/git/builtin/rebase.c @@ -29,8 +29,8 @@ #include "rebase-interactive.h" static char const * const builtin_rebase_usage[] = { - N_("git rebase [-i] [options] [--exec <cmd>] " - "[--onto <newbase> | --keep-base] [<upstream> [<branch>]]"), + N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] " + "[<upstream>] [<branch>]"), N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] " "--root [<branch>]"), N_("git rebase --continue | --abort | --skip | --edit-todo"), @@ -44,22 +44,14 @@ static GIT_PATH_FUNC(merge_dir, "rebase-merge") enum rebase_type { REBASE_UNSPECIFIED = -1, - REBASE_APPLY, + REBASE_AM, REBASE_MERGE, + REBASE_INTERACTIVE, REBASE_PRESERVE_MERGES }; -enum empty_type { - EMPTY_UNSPECIFIED = -1, - EMPTY_DROP, - EMPTY_KEEP, - EMPTY_ASK -}; - struct rebase_options { enum rebase_type type; - enum empty_type empty; - const char *default_backend; const char *state_dir; struct commit *upstream; const char *upstream_name; @@ -70,7 +62,7 @@ struct rebase_options { const char *onto_name; const char *revisions; const char *switch_to; - int root, root_with_onto; + int root; struct object_id *squash_onto; struct commit *restrict_revision; int dont_finish_rebase; @@ -85,6 +77,7 @@ struct rebase_options { const char *action; int signoff; int allow_rerere_autoupdate; + int keep_empty; int autosquash; char *gpg_sign_opt; int autostash; @@ -99,8 +92,6 @@ struct rebase_options { #define REBASE_OPTIONS_INIT { \ .type = REBASE_UNSPECIFIED, \ - .empty = EMPTY_UNSPECIFIED, \ - .default_backend = "merge", \ .flags = REBASE_NO_QUIET, \ .git_am_opts = ARGV_ARRAY_INIT, \ .git_format_patch_opt = STRBUF_INIT \ @@ -119,9 +110,6 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts) replay.allow_rerere_auto = opts->allow_rerere_autoupdate; replay.allow_empty = 1; replay.allow_empty_message = opts->allow_empty_message; - replay.drop_redundant_commits = (opts->empty == EMPTY_DROP); - replay.keep_redundant_commits = (opts->empty == EMPTY_KEEP); - replay.quiet = !(opts->flags & REBASE_NO_QUIET); replay.verbose = opts->flags & REBASE_VERBOSE; replay.reschedule_failed_exec = opts->reschedule_failed_exec; replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt); @@ -129,11 +117,6 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts) if (opts->strategy_opts) parse_strategy_opts(&replay, opts->strategy_opts); - if (opts->squash_onto) { - oidcpy(&replay.squash_onto, opts->squash_onto); - replay.have_squash_onto = 1; - } - return replay; } @@ -258,17 +241,21 @@ static int edit_todo_file(unsigned flags) } static int get_revision_ranges(struct commit *upstream, struct commit *onto, - struct object_id *orig_head, const char **head_hash, + const char **head_hash, char **revisions, char **shortrevisions) { struct commit *base_rev = upstream ? upstream : onto; const char *shorthead; + struct object_id orig_head; - *head_hash = find_unique_abbrev(orig_head, GIT_MAX_HEXSZ); + if (get_oid("HEAD", &orig_head)) + return error(_("no HEAD?")); + + *head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ); *revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid), *head_hash); - shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV); + shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV); if (upstream) { const char *shortrev; @@ -322,8 +309,12 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) struct replay_opts replay = get_replay_opts(opts); struct string_list commands = STRING_LIST_INIT_DUP; - if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head, - &head_hash, &revisions, &shortrevisions)) + if (prepare_branch_to_be_rebased(the_repository, &replay, + opts->switch_to)) + return -1; + + if (get_revision_ranges(opts->upstream, opts->onto, &head_hash, + &revisions, &shortrevisions)) return -1; if (init_basic_state(&replay, @@ -341,8 +332,8 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) argv_array_pushl(&make_script_args, "", revisions, NULL); if (opts->restrict_revision) - argv_array_pushf(&make_script_args, "^%s", - oid_to_hex(&opts->restrict_revision->object.oid)); + argv_array_push(&make_script_args, + oid_to_hex(&opts->restrict_revision->object.oid)); ret = sequencer_make_script(the_repository, &todo_list.buf, make_script_args.argc, make_script_args.argv, @@ -371,7 +362,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) return ret; } -static int run_sequencer_rebase(struct rebase_options *opts, +static int run_rebase_interactive(struct rebase_options *opts, enum action command) { unsigned flags = 0; @@ -379,10 +370,10 @@ static int run_sequencer_rebase(struct rebase_options *opts, git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands); + flags |= opts->keep_empty ? TODO_LIST_KEEP_EMPTY : 0; flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0; flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0; flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0; - flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0; flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0; switch (command) { @@ -442,21 +433,6 @@ static int run_sequencer_rebase(struct rebase_options *opts, return ret; } -static int parse_opt_keep_empty(const struct option *opt, const char *arg, - int unset) -{ - struct rebase_options *opts = opt->value; - - BUG_ON_OPT_ARG(arg); - - /* - * If we ever want to remap --keep-empty to --empty=keep, insert: - * opts->empty = unset ? EMPTY_UNSPECIFIED : EMPTY_KEEP; - */ - opts->type = REBASE_MERGE; - return 0; -} - static const char * const builtin_rebase_interactive_usage[] = { N_("git rebase--interactive [<options>]"), NULL @@ -470,13 +446,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"), REBASE_FORCE), - { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL, - N_("(DEPRECATED) keep empty commits"), - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, - parse_opt_keep_empty }, - OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message, - N_("allow commits with empty messages"), - PARSE_OPT_HIDDEN), + OPT_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")), + OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message, + N_("allow commits with empty messages")), OPT_BOOL(0, "rebase-merges", &opts.rebase_merges, N_("rebase merge commits")), OPT_BOOL(0, "rebase-cousins", &opts.rebase_cousins, N_("keep original branch points of cousins")), @@ -546,26 +518,28 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) warning(_("--[no-]rebase-cousins has no effect without " "--rebase-merges")); - return !!run_sequencer_rebase(&opts, command); + return !!run_rebase_interactive(&opts, command); } -static int is_merge(struct rebase_options *opts) +static int is_interactive(struct rebase_options *opts) { - return opts->type == REBASE_MERGE || + return opts->type == REBASE_INTERACTIVE || opts->type == REBASE_PRESERVE_MERGES; } -static void imply_merge(struct rebase_options *opts, const char *option) +static void imply_interactive(struct rebase_options *opts, const char *option) { switch (opts->type) { - case REBASE_APPLY: + case REBASE_AM: die(_("%s requires an interactive rebase"), option); break; - case REBASE_MERGE: + case REBASE_INTERACTIVE: case REBASE_PRESERVE_MERGES: break; + case REBASE_MERGE: + /* we now implement --merge via --interactive */ default: - opts->type = REBASE_MERGE; /* implied */ + opts->type = REBASE_INTERACTIVE; /* implied */ break; } } @@ -691,8 +665,8 @@ static int rebase_write_basic_state(struct rebase_options *opts) opts->onto ? oid_to_hex(&opts->onto->object.oid) : ""); write_file(state_dir_path("orig-head", opts), "%s", oid_to_hex(&opts->orig_head)); - if (!(opts->flags & REBASE_NO_QUIET)) - write_file(state_dir_path("quiet", opts), "%s", ""); + write_file(state_dir_path("quiet", opts), "%s", + opts->flags & REBASE_NO_QUIET ? "" : "t"); if (opts->flags & REBASE_VERBOSE) write_file(state_dir_path("verbose", opts), "%s", ""); if (opts->strategy) @@ -710,7 +684,7 @@ static int rebase_write_basic_state(struct rebase_options *opts) write_file(state_dir_path("gpg_sign_opt", opts), "%s", opts->gpg_sign_opt); if (opts->signoff) - write_file(state_dir_path("signoff", opts), "--signoff"); + write_file(state_dir_path("strategy", opts), "--signoff"); return 0; } @@ -774,7 +748,7 @@ static int finish_rebase(struct rebase_options *opts) * user should see them. */ run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); - if (opts->type == REBASE_MERGE) { + if (opts->type == REBASE_INTERACTIVE) { struct replay_opts replay = REPLAY_OPTS_INIT; replay.action = REPLAY_INTERACTIVE_REBASE; @@ -1037,8 +1011,7 @@ static int run_am(struct rebase_options *opts) argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout", "--full-index", "--cherry-pick", "--right-only", "--src-prefix=a/", "--dst-prefix=b/", "--no-renames", - "--no-cover-letter", "--pretty=mboxrd", "--topo-order", - "--no-base", NULL); + "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL); if (opts->git_format_patch_opt.len) argv_array_split(&format_patch.args, opts->git_format_patch_opt.buf); @@ -1107,8 +1080,8 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) int status; const char *backend, *backend_func; - if (opts->type == REBASE_MERGE) { - /* Run sequencer-based rebase */ + if (opts->type == REBASE_INTERACTIVE) { + /* Run builtin interactive rebase */ setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1); if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) { setenv("GIT_SEQUENCE_EDITOR", ":", 1); @@ -1121,11 +1094,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) opts->gpg_sign_opt = tmp; } - status = run_sequencer_rebase(opts, action); + status = run_rebase_interactive(opts, action); goto finished_rebase; } - if (opts->type == REBASE_APPLY) { + if (opts->type == REBASE_AM) { status = run_am(opts); goto finished_rebase; } @@ -1145,6 +1118,8 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) add_var(&script_snippet, "revisions", opts->revisions); add_var(&script_snippet, "restrict_revision", opts->restrict_revision ? oid_to_hex(&opts->restrict_revision->object.oid) : NULL); + add_var(&script_snippet, "GIT_QUIET", + opts->flags & REBASE_NO_QUIET ? "" : "t"); sq_quote_argv_pretty(&buf, opts->git_am_opts.argv); add_var(&script_snippet, "git_am_opt", buf.buf); strbuf_release(&buf); @@ -1162,6 +1137,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) opts->allow_rerere_autoupdate ? opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ? "--rerere-autoupdate" : "--no-rerere-autoupdate" : ""); + add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : ""); add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : ""); add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt); add_var(&script_snippet, "cmd", opts->cmd); @@ -1179,7 +1155,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) add_var(&script_snippet, "git_format_patch_opt", opts->git_format_patch_opt.buf); - if (is_merge(opts) && + if (is_interactive(opts) && !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) { strbuf_addstr(&script_snippet, "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; "); @@ -1204,8 +1180,8 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) finished_rebase: if (opts->dont_finish_rebase) ; /* do nothing */ - else if (opts->type == REBASE_MERGE) - ; /* merge backend cleans up after itself */ + else if (opts->type == REBASE_INTERACTIVE) + ; /* interactive rebase cleans up after itself */ else if (status == 0) { if (!file_exists(state_dir_path("stopped-sha", opts))) finish_rebase(opts); @@ -1263,10 +1239,6 @@ static int rebase_config(const char *var, const char *value, void *data) return 0; } - if (!strcmp(var, "rebase.backend")) { - return git_config_string(&opts->default_backend, var, value); - } - return git_default_config(var, value, data); } @@ -1288,60 +1260,28 @@ static int is_linear_history(struct commit *from, struct commit *to) return 1; } -static int can_fast_forward(struct commit *onto, struct commit *upstream, - struct commit *restrict_revision, - struct object_id *head_oid, struct object_id *merge_base) +static int can_fast_forward(struct commit *onto, struct object_id *head_oid, + struct object_id *merge_base) { struct commit *head = lookup_commit(the_repository, head_oid); - struct commit_list *merge_bases = NULL; - int res = 0; + struct commit_list *merge_bases; + int res; if (!head) - goto done; + return 0; merge_bases = get_merge_bases(onto, head); - if (!merge_bases || merge_bases->next) { + if (merge_bases && !merge_bases->next) { + oidcpy(merge_base, &merge_bases->item->object.oid); + res = oideq(merge_base, &onto->object.oid); + } else { oidcpy(merge_base, &null_oid); - goto done; + res = 0; } - - oidcpy(merge_base, &merge_bases->item->object.oid); - if (!oideq(merge_base, &onto->object.oid)) - goto done; - - if (restrict_revision && !oideq(&restrict_revision->object.oid, merge_base)) - goto done; - - if (!upstream) - goto done; - - free_commit_list(merge_bases); - merge_bases = get_merge_bases(upstream, head); - if (!merge_bases || merge_bases->next) - goto done; - - if (!oideq(&onto->object.oid, &merge_bases->item->object.oid)) - goto done; - - res = 1; - -done: free_commit_list(merge_bases); return res && is_linear_history(onto, head); } -static int parse_opt_am(const struct option *opt, const char *arg, int unset) -{ - struct rebase_options *opts = opt->value; - - BUG_ON_OPT_NEG(unset); - BUG_ON_OPT_ARG(arg); - - opts->type = REBASE_APPLY; - - return 0; -} - /* -i followed by -m is still -i */ static int parse_opt_merge(const struct option *opt, const char *arg, int unset) { @@ -1350,7 +1290,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset) BUG_ON_OPT_NEG(unset); BUG_ON_OPT_ARG(arg); - if (!is_merge(opts)) + if (!is_interactive(opts)) opts->type = REBASE_MERGE; return 0; @@ -1365,35 +1305,12 @@ static int parse_opt_interactive(const struct option *opt, const char *arg, BUG_ON_OPT_NEG(unset); BUG_ON_OPT_ARG(arg); - opts->type = REBASE_MERGE; + opts->type = REBASE_INTERACTIVE; opts->flags |= REBASE_INTERACTIVE_EXPLICIT; return 0; } -static enum empty_type parse_empty_value(const char *value) -{ - if (!strcasecmp(value, "drop")) - return EMPTY_DROP; - else if (!strcasecmp(value, "keep")) - return EMPTY_KEEP; - else if (!strcasecmp(value, "ask")) - return EMPTY_ASK; - - die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value); -} - -static int parse_opt_empty(const struct option *opt, const char *arg, int unset) -{ - struct rebase_options *options = opt->value; - enum empty_type value = parse_empty_value(arg); - - BUG_ON_OPT_NEG(unset); - - options->empty = value; - return 0; -} - static void NORETURN error_on_missing_default_upstream(void) { struct branch *current_branch = branch_get(NULL); @@ -1429,14 +1346,14 @@ static void set_reflog_action(struct rebase_options *options) const char *env; struct strbuf buf = STRBUF_INIT; - if (!is_merge(options)) + if (!is_interactive(options)) return; env = getenv(GIT_REFLOG_ACTION_ENVIRONMENT); if (env && strcmp("rebase", env)) return; /* only override it if it is "rebase" */ - strbuf_addf(&buf, "rebase (%s)", options->action); + strbuf_addf(&buf, "rebase -i (%s)", options->action); setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1); strbuf_release(&buf); } @@ -1459,7 +1376,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) struct rebase_options options = REBASE_OPTIONS_INIT; const char *branch_name; int ret, flags, total_argc, in_progress = 0; - int keep_base = 0; int ok_to_skip_pre_rebase = 0; struct strbuf msg = STRBUF_INIT; struct strbuf revisions = STRBUF_INIT; @@ -1474,18 +1390,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) struct object_id squash_onto; char *squash_onto_name = NULL; int reschedule_failed_exec = -1; - int allow_preemptive_ff = 1; struct option builtin_rebase_options[] = { OPT_STRING(0, "onto", &options.onto_name, N_("revision"), N_("rebase onto given branch instead of upstream")), - OPT_BOOL(0, "keep-base", &keep_base, - N_("use the merge-base of upstream and branch as the current base")), OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase, N_("allow pre-rebase hook to run")), OPT_NEGBIT('q', "quiet", &options.flags, N_("be quiet. implies --no-stat"), - REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT), + REBASE_NO_QUIET| REBASE_VERBOSE | REBASE_DIFFSTAT), OPT_BIT('v', "verbose", &options.flags, N_("display a diffstat of what changed upstream"), REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT), @@ -1526,10 +1439,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) OPT_CMDMODE(0, "show-current-patch", &action, N_("show the patch file being applied or merged"), ACTION_SHOW_CURRENT_PATCH), - { OPTION_CALLBACK, 0, "apply", &options, NULL, - N_("use apply strategies to rebase"), - PARSE_OPT_NOARG | PARSE_OPT_NONEG, - parse_opt_am }, { OPTION_CALLBACK, 'm', "merge", &options, NULL, N_("use merging strategies to rebase"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, @@ -1538,18 +1447,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) N_("let the user edit the list of commits to rebase"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_interactive }, - OPT_SET_INT_F('p', "preserve-merges", &options.type, - N_("(DEPRECATED) try to recreate merges instead of " - "ignoring them"), - REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN), + OPT_SET_INT('p', "preserve-merges", &options.type, + N_("(DEPRECATED) try to recreate merges instead of " + "ignoring them"), REBASE_PRESERVE_MERGES), OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate), - OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}", - N_("how to handle commits that become empty"), - PARSE_OPT_NONEG, parse_opt_empty), - { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL, - N_("(DEPRECATED) keep empty commits"), - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, - parse_opt_keep_empty }, + OPT_BOOL('k', "keep-empty", &options.keep_empty, + N_("preserve empty commits during rebase")), OPT_BOOL(0, "autosquash", &options.autosquash, N_("move commits that begin with " "squash!/fixup! under -i")), @@ -1561,10 +1464,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) OPT_STRING_LIST('x', "exec", &exec, N_("exec"), N_("add exec lines after each commit of the " "editable list")), - OPT_BOOL_F(0, "allow-empty-message", - &options.allow_empty_message, - N_("allow rebasing commits with empty messages"), - PARSE_OPT_HIDDEN), + OPT_BOOL(0, "allow-empty-message", + &options.allow_empty_message, + N_("allow rebasing commits with empty messages")), {OPTION_STRING, 'r', "rebase-merges", &rebase_merges, N_("mode"), N_("try to rebase merges instead of skipping them"), @@ -1604,7 +1506,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) die(_("It looks like 'git am' is in progress. Cannot rebase.")); if (is_directory(apply_dir())) { - options.type = REBASE_APPLY; + options.type = REBASE_AM; options.state_dir = apply_dir(); } else if (is_directory(merge_dir())) { strbuf_reset(&buf); @@ -1616,7 +1518,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) strbuf_reset(&buf); strbuf_addf(&buf, "%s/interactive", merge_dir()); if(file_exists(buf.buf)) { - options.type = REBASE_MERGE; + options.type = REBASE_INTERACTIVE; options.flags |= REBASE_INTERACTIVE_EXPLICIT; } else options.type = REBASE_MERGE; @@ -1645,23 +1547,16 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) warning(_("git rebase --preserve-merges is deprecated. " "Use --rebase-merges instead.")); - if (keep_base) { - if (options.onto_name) - die(_("cannot combine '--keep-base' with '--onto'")); - if (options.root) - die(_("cannot combine '--keep-base' with '--root'")); - } - if (action != ACTION_NONE && !in_progress) die(_("No rebase in progress?")); setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0); - if (action == ACTION_EDIT_TODO && !is_merge(&options)) + if (action == ACTION_EDIT_TODO && !is_interactive(&options)) die(_("The --edit-todo action can only be used during " "interactive rebase.")); if (trace2_is_enabled()) { - if (is_merge(&options)) + if (is_interactive(&options)) trace2_cmd_mode("interactive"); else if (exec.nr) trace2_cmd_mode("interactive-exec"); @@ -1737,7 +1632,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) goto cleanup; } case ACTION_QUIT: { - if (options.type == REBASE_MERGE) { + if (options.type == REBASE_INTERACTIVE) { struct replay_opts replay = REPLAY_OPTS_INIT; replay.action = REPLAY_INTERACTIVE_REBASE; @@ -1786,20 +1681,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) state_dir_base, cmd_live_rebase, buf.buf); } - if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) || - (action != ACTION_NONE) || - (exec.nr > 0) || - options.autosquash) { - allow_preemptive_ff = 0; - } - for (i = 0; i < options.git_am_opts.argc; i++) { const char *option = options.git_am_opts.argv[i], *p; if (!strcmp(option, "--committer-date-is-author-date") || !strcmp(option, "--ignore-date") || !strcmp(option, "--whitespace=fix") || !strcmp(option, "--whitespace=strip")) - allow_preemptive_ff = 0; + options.flags |= REBASE_FORCE; else if (skip_prefix(option, "-C", &p)) { while (*p) if (!isdigit(*(p++))) @@ -1819,8 +1707,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (!(options.flags & REBASE_NO_QUIET)) argv_array_push(&options.git_am_opts, "-q"); - if (options.empty != EMPTY_UNSPECIFIED) - imply_merge(&options, "--empty"); + if (options.keep_empty) + imply_interactive(&options, "--keep-empty"); if (gpg_sign) { free(options.gpg_sign_opt); @@ -1830,7 +1718,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (exec.nr) { int i; - imply_merge(&options, "--exec"); + imply_interactive(&options, "--exec"); strbuf_reset(&buf); for (i = 0; i < exec.nr; i++) @@ -1846,7 +1734,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) else if (strcmp("no-rebase-cousins", rebase_merges)) die(_("Unknown mode: %s"), rebase_merges); options.rebase_merges = 1; - imply_merge(&options, "--rebase-merges"); + imply_interactive(&options, "--rebase-merges"); } if (strategy_options.nr) { @@ -1865,9 +1753,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (options.strategy) { options.strategy = xstrdup(options.strategy); switch (options.type) { - case REBASE_APPLY: + case REBASE_AM: die(_("--strategy requires --merge or --interactive")); case REBASE_MERGE: + case REBASE_INTERACTIVE: case REBASE_PRESERVE_MERGES: /* compatible */ break; @@ -1880,65 +1769,47 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } if (options.type == REBASE_MERGE) - imply_merge(&options, "--merge"); + imply_interactive(&options, "--merge"); if (options.root && !options.onto_name) - imply_merge(&options, "--root without --onto"); + imply_interactive(&options, "--root without --onto"); if (isatty(2) && options.flags & REBASE_NO_QUIET) strbuf_addstr(&options.git_format_patch_opt, " --progress"); - if (options.git_am_opts.argc || options.type == REBASE_APPLY) { - /* all am options except -q are compatible only with --apply */ - for (i = options.git_am_opts.argc - 1; i >= 0; i--) - if (strcmp(options.git_am_opts.argv[i], "-q")) - break; - - if (i >= 0) { - if (is_merge(&options)) - die(_("cannot combine apply options with " - "merge options")); - else - options.type = REBASE_APPLY; - } - } - - if (options.type == REBASE_UNSPECIFIED) { - if (!strcmp(options.default_backend, "merge")) - imply_merge(&options, "--merge"); - else if (!strcmp(options.default_backend, "apply")) - options.type = REBASE_APPLY; - else - die(_("Unknown rebase backend: %s"), - options.default_backend); - } - switch (options.type) { case REBASE_MERGE: + case REBASE_INTERACTIVE: case REBASE_PRESERVE_MERGES: options.state_dir = merge_dir(); break; - case REBASE_APPLY: + case REBASE_AM: options.state_dir = apply_dir(); break; default: - BUG("options.type was just set above; should be unreachable."); + /* the default rebase backend is `--am` */ + options.type = REBASE_AM; + options.state_dir = apply_dir(); + break; } - if (options.empty == EMPTY_UNSPECIFIED) { - if (options.flags & REBASE_INTERACTIVE_EXPLICIT) - options.empty = EMPTY_ASK; - else if (exec.nr > 0) - options.empty = EMPTY_KEEP; - else - options.empty = EMPTY_DROP; - } - if (reschedule_failed_exec > 0 && !is_merge(&options)) + if (reschedule_failed_exec > 0 && !is_interactive(&options)) die(_("--reschedule-failed-exec requires " "--exec or --interactive")); if (reschedule_failed_exec >= 0) options.reschedule_failed_exec = reschedule_failed_exec; + if (options.git_am_opts.argc) { + /* all am options except -q are compatible only with --am */ + for (i = options.git_am_opts.argc - 1; i >= 0; i--) + if (strcmp(options.git_am_opts.argv[i], "-q")) + break; + + if (is_interactive(&options) && i >= 0) + die(_("cannot combine am options with either " + "interactive or merge options")); + } + if (options.signoff) { if (options.type == REBASE_PRESERVE_MERGES) die("cannot combine '--signoff' with " @@ -1962,6 +1833,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "'--reschedule-failed-exec'")); } + if (options.rebase_merges) { + if (strategy_options.nr) + die(_("cannot combine '--rebase-merges' with " + "'--strategy-option'")); + if (options.strategy) + die(_("cannot combine '--rebase-merges' with " + "'--strategy'")); + } + if (!options.root) { if (argc < 1) { struct branch *branch; @@ -1992,9 +1872,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.squash_onto = &squash_onto; options.onto_name = squash_onto_name = xstrdup(oid_to_hex(&squash_onto)); - } else - options.root_with_onto = 1; - + } options.upstream_name = NULL; options.upstream = NULL; if (argc > 1) @@ -2004,22 +1882,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } /* Make sure the branch to rebase onto is valid. */ - if (keep_base) { - strbuf_reset(&buf); - strbuf_addstr(&buf, options.upstream_name); - strbuf_addstr(&buf, "..."); - options.onto_name = xstrdup(buf.buf); - } else if (!options.onto_name) + if (!options.onto_name) options.onto_name = options.upstream_name; if (strstr(options.onto_name, "...")) { - if (get_oid_mb(options.onto_name, &merge_base) < 0) { - if (keep_base) - die(_("'%s': need exactly one merge base with branch"), - options.upstream_name); - else - die(_("'%s': need exactly one merge base"), - options.onto_name); - } + if (get_oid_mb(options.onto_name, &merge_base) < 0) + die(_("'%s': need exactly one merge base"), + options.onto_name); options.onto = lookup_commit_or_die(&merge_base, options.onto_name); } else { @@ -2044,11 +1912,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) /* Is it a local branch? */ strbuf_reset(&buf); strbuf_addf(&buf, "refs/heads/%s", branch_name); - if (!read_ref(buf.buf, &options.orig_head)) { - die_if_checked_out(buf.buf, 1); + if (!read_ref(buf.buf, &options.orig_head)) options.head_name = xstrdup(buf.buf); /* If not is it a valid ref (branch or commit)? */ - } else if (!get_oid(branch_name, &options.orig_head)) + else if (!get_oid(branch_name, &options.orig_head)) options.head_name = NULL; else die(_("fatal: no such branch/commit '%s'"), @@ -2101,6 +1968,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) state_dir_path("autostash", &options); struct child_process stash = CHILD_PROCESS_INIT; struct object_id oid; + struct commit *head = + lookup_commit_reference(the_repository, + &options.orig_head); argv_array_pushl(&stash.args, "stash", "create", "autostash", NULL); @@ -2121,9 +1991,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.state_dir); write_file(autostash, "%s", oid_to_hex(&oid)); printf(_("Created autostash: %s\n"), buf.buf); - if (reset_head(NULL, "reset --hard", + if (reset_head(&head->object.oid, "reset --hard", NULL, RESET_HEAD_HARD, NULL, NULL) < 0) die(_("could not reset --hard")); + printf(_("HEAD is now at %s"), + find_unique_abbrev(&head->object.oid, + DEFAULT_ABBREV)); + strbuf_reset(&buf); + pp_commit_easy(CMIT_FMT_ONELINE, head, &buf); + if (buf.len > 0) + printf(" %s", buf.buf); + putchar('\n'); if (discard_index(the_repository->index) < 0 || repo_read_index(the_repository) < 0) @@ -2144,25 +2022,31 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) /* * Check if we are already based on onto with linear history, - * in which case we could fast-forward without replacing the commits - * with new commits recreated by replaying their changes. - * - * Note that can_fast_forward() initializes merge_base, so we have to - * call it before checking allow_preemptive_ff. + * but this should be done only when upstream and onto are the same + * and if this is not an interactive rebase. */ - if (can_fast_forward(options.onto, options.upstream, options.restrict_revision, - &options.orig_head, &merge_base) && - allow_preemptive_ff) { + if (can_fast_forward(options.onto, &options.orig_head, &merge_base) && + !is_interactive(&options) && !options.restrict_revision && + options.upstream && + !oidcmp(&options.upstream->object.oid, &options.onto->object.oid)) { int flag; if (!(options.flags & REBASE_FORCE)) { /* Lazily switch to the target branch if needed... */ if (options.switch_to) { + struct object_id oid; + + if (get_oid(options.switch_to, &oid) < 0) { + ret = !!error(_("could not parse '%s'"), + options.switch_to); + goto cleanup; + } + strbuf_reset(&buf); strbuf_addf(&buf, "%s: checkout %s", getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.switch_to); - if (reset_head(&options.orig_head, "checkout", + if (reset_head(&oid, "checkout", options.head_name, RESET_HEAD_RUN_POST_CHECKOUT_HOOK, NULL, buf.buf) < 0) { @@ -2227,7 +2111,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) diff_flush(&opts); } - if (is_merge(&options)) + if (is_interactive(&options)) goto run_rebase; /* Detach HEAD and reset the tree */ diff --git a/third_party/git/builtin/receive-pack.c b/third_party/git/builtin/receive-pack.c index 2cc18bbffd..dcf385511f 100644 --- a/third_party/git/builtin/receive-pack.c +++ b/third_party/git/builtin/receive-pack.c @@ -27,7 +27,6 @@ #include "object-store.h" #include "protocol.h" #include "commit-reach.h" -#include "worktree.h" static const char * const receive_pack_usage[] = { N_("git receive-pack <git-dir>"), @@ -418,22 +417,24 @@ static int copy_to_sideband(int in, int out, void *arg) return 0; } -static void hmac(unsigned char *out, +#define HMAC_BLOCK_SIZE 64 + +static void hmac_sha1(unsigned char *out, const char *key_in, size_t key_len, const char *text, size_t text_len) { - unsigned char key[GIT_MAX_BLKSZ]; - unsigned char k_ipad[GIT_MAX_BLKSZ]; - unsigned char k_opad[GIT_MAX_BLKSZ]; + unsigned char key[HMAC_BLOCK_SIZE]; + unsigned char k_ipad[HMAC_BLOCK_SIZE]; + unsigned char k_opad[HMAC_BLOCK_SIZE]; int i; - git_hash_ctx ctx; + git_SHA_CTX ctx; /* RFC 2104 2. (1) */ - memset(key, '\0', GIT_MAX_BLKSZ); - if (the_hash_algo->blksz < key_len) { - the_hash_algo->init_fn(&ctx); - the_hash_algo->update_fn(&ctx, key_in, key_len); - the_hash_algo->final_fn(key, &ctx); + memset(key, '\0', HMAC_BLOCK_SIZE); + if (HMAC_BLOCK_SIZE < key_len) { + git_SHA1_Init(&ctx); + git_SHA1_Update(&ctx, key_in, key_len); + git_SHA1_Final(key, &ctx); } else { memcpy(key, key_in, key_len); } @@ -445,29 +446,29 @@ static void hmac(unsigned char *out, } /* RFC 2104 2. (3) & (4) */ - the_hash_algo->init_fn(&ctx); - the_hash_algo->update_fn(&ctx, k_ipad, sizeof(k_ipad)); - the_hash_algo->update_fn(&ctx, text, text_len); - the_hash_algo->final_fn(out, &ctx); + git_SHA1_Init(&ctx); + git_SHA1_Update(&ctx, k_ipad, sizeof(k_ipad)); + git_SHA1_Update(&ctx, text, text_len); + git_SHA1_Final(out, &ctx); /* RFC 2104 2. (6) & (7) */ - the_hash_algo->init_fn(&ctx); - the_hash_algo->update_fn(&ctx, k_opad, sizeof(k_opad)); - the_hash_algo->update_fn(&ctx, out, the_hash_algo->rawsz); - the_hash_algo->final_fn(out, &ctx); + git_SHA1_Init(&ctx); + git_SHA1_Update(&ctx, k_opad, sizeof(k_opad)); + git_SHA1_Update(&ctx, out, GIT_SHA1_RAWSZ); + git_SHA1_Final(out, &ctx); } static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) { struct strbuf buf = STRBUF_INIT; - unsigned char hash[GIT_MAX_RAWSZ]; + unsigned char sha1[GIT_SHA1_RAWSZ]; strbuf_addf(&buf, "%s:%"PRItime, path, stamp); - hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed)); + hmac_sha1(sha1, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed)); strbuf_release(&buf); /* RFC 2104 5. HMAC-SHA1-80 */ - strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, (int)the_hash_algo->hexsz, hash_to_hex(hash)); + strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, GIT_SHA1_HEXSZ, sha1_to_hex(sha1)); return strbuf_detach(&buf, NULL); } @@ -817,6 +818,16 @@ static int run_update_hook(struct command *cmd) return finish_command(&proc); } +static int is_ref_checked_out(const char *ref) +{ + if (is_bare_repository()) + return 0; + + if (!head_name) + return 0; + return !strcmp(head_name, ref); +} + static char *refuse_unconfigured_deny_msg = N_("By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -959,7 +970,7 @@ static const char *push_to_deploy(unsigned char *sha1, if (run_command(&child)) return "Working directory has staged changes"; - read_tree[3] = hash_to_hex(sha1); + read_tree[3] = sha1_to_hex(sha1); child_process_init(&child); child.argv = read_tree; child.env = env->argv; @@ -976,38 +987,28 @@ static const char *push_to_deploy(unsigned char *sha1, static const char *push_to_checkout_hook = "push-to-checkout"; -static const char *push_to_checkout(unsigned char *hash, +static const char *push_to_checkout(unsigned char *sha1, struct argv_array *env, const char *work_tree) { argv_array_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree)); if (run_hook_le(env->argv, push_to_checkout_hook, - hash_to_hex(hash), NULL)) + sha1_to_hex(sha1), NULL)) return "push-to-checkout hook declined"; else return NULL; } -static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree) +static const char *update_worktree(unsigned char *sha1) { - const char *retval, *work_tree, *git_dir = NULL; + const char *retval; + const char *work_tree = git_work_tree_cfg ? git_work_tree_cfg : ".."; struct argv_array env = ARGV_ARRAY_INIT; - if (worktree && worktree->path) - work_tree = worktree->path; - else if (git_work_tree_cfg) - work_tree = git_work_tree_cfg; - else - work_tree = ".."; - if (is_bare_repository()) return "denyCurrentBranch = updateInstead needs a worktree"; - if (worktree) - git_dir = get_worktree_git_dir(worktree); - if (!git_dir) - git_dir = get_git_dir(); - argv_array_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir)); + argv_array_pushf(&env, "GIT_DIR=%s", absolute_path(get_git_dir())); if (!find_hook(push_to_checkout_hook)) retval = push_to_deploy(sha1, &env, work_tree); @@ -1027,7 +1028,6 @@ static const char *update(struct command *cmd, struct shallow_info *si) struct object_id *old_oid = &cmd->old_oid; struct object_id *new_oid = &cmd->new_oid; int do_update_worktree = 0; - const struct worktree *worktree = is_bare_repository() ? NULL : find_shared_symref("HEAD", name); /* only refs/... are allowed */ if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) { @@ -1039,7 +1039,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) free(namespaced_name); namespaced_name = strbuf_detach(&namespaced_name_buf, NULL); - if (worktree) { + if (is_ref_checked_out(namespaced_name)) { switch (deny_current_branch) { case DENY_IGNORE: break; @@ -1071,7 +1071,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) return "deletion prohibited"; } - if (worktree || (head_name && !strcmp(namespaced_name, head_name))) { + if (head_name && !strcmp(namespaced_name, head_name)) { switch (deny_delete_current) { case DENY_IGNORE: break; @@ -1120,7 +1120,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) } if (do_update_worktree) { - ret = update_worktree(new_oid->hash, find_shared_symref("HEAD", name)); + ret = update_worktree(new_oid->hash); if (ret) return ret; } diff --git a/third_party/git/builtin/reflog.c b/third_party/git/builtin/reflog.c index 81dfd563c0..4d3430900d 100644 --- a/third_party/git/builtin/reflog.c +++ b/third_party/git/builtin/reflog.c @@ -560,16 +560,15 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix) for (i = 1; i < argc; i++) { const char *arg = argv[i]; - if (!strcmp(arg, "--dry-run") || !strcmp(arg, "-n")) flags |= EXPIRE_REFLOGS_DRY_RUN; - else if (skip_prefix(arg, "--expire=", &arg)) { - if (parse_expiry_date(arg, &cb.cmd.expire_total)) + else if (starts_with(arg, "--expire=")) { + if (parse_expiry_date(arg + 9, &cb.cmd.expire_total)) die(_("'%s' is not a valid timestamp"), arg); explicit_expiry |= EXPIRE_TOTAL; } - else if (skip_prefix(arg, "--expire-unreachable=", &arg)) { - if (parse_expiry_date(arg, &cb.cmd.expire_unreachable)) + else if (starts_with(arg, "--expire-unreachable=")) { + if (parse_expiry_date(arg + 21, &cb.cmd.expire_unreachable)) die(_("'%s' is not a valid timestamp"), arg); explicit_expiry |= EXPIRE_UNREACH; } diff --git a/third_party/git/builtin/remote.c b/third_party/git/builtin/remote.c index 555d4c896c..5591cef775 100644 --- a/third_party/git/builtin/remote.c +++ b/third_party/git/builtin/remote.c @@ -6,7 +6,6 @@ #include "string-list.h" #include "strbuf.h" #include "run-command.h" -#include "rebase.h" #include "refs.h" #include "refspec.h" #include "object-store.h" @@ -249,8 +248,9 @@ static int add(int argc, const char **argv) struct branch_info { char *remote_name; struct string_list merge; - enum rebase_type rebase; - char *push_remote_name; + enum { + NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE, REBASE_MERGES + } rebase; }; static struct string_list branch_list = STRING_LIST_INIT_NODUP; @@ -264,69 +264,59 @@ static const char *abbrev_ref(const char *name, const char *prefix) static int config_read_branches(const char *key, const char *value, void *cb) { - const char *orig_key = key; - char *name; - struct string_list_item *item; - struct branch_info *info; - enum { REMOTE, MERGE, REBASE, PUSH_REMOTE } type; - size_t key_len; + if (starts_with(key, "branch.")) { + const char *orig_key = key; + char *name; + struct string_list_item *item; + struct branch_info *info; + enum { REMOTE, MERGE, REBASE } type; + size_t key_len; + + key += 7; + if (strip_suffix(key, ".remote", &key_len)) { + name = xmemdupz(key, key_len); + type = REMOTE; + } else if (strip_suffix(key, ".merge", &key_len)) { + name = xmemdupz(key, key_len); + type = MERGE; + } else if (strip_suffix(key, ".rebase", &key_len)) { + name = xmemdupz(key, key_len); + type = REBASE; + } else + return 0; - if (!starts_with(key, "branch.")) - return 0; + item = string_list_insert(&branch_list, name); - key += strlen("branch."); - if (strip_suffix(key, ".remote", &key_len)) - type = REMOTE; - else if (strip_suffix(key, ".merge", &key_len)) - type = MERGE; - else if (strip_suffix(key, ".rebase", &key_len)) - type = REBASE; - else if (strip_suffix(key, ".pushremote", &key_len)) - type = PUSH_REMOTE; - else - return 0; - name = xmemdupz(key, key_len); - - item = string_list_insert(&branch_list, name); - - if (!item->util) - item->util = xcalloc(1, sizeof(struct branch_info)); - info = item->util; - switch (type) { - case REMOTE: - if (info->remote_name) - warning(_("more than one %s"), orig_key); - info->remote_name = xstrdup(value); - break; - case MERGE: { - char *space = strchr(value, ' '); - value = abbrev_branch(value); - while (space) { - char *merge; - merge = xstrndup(value, space - value); - string_list_append(&info->merge, merge); - value = abbrev_branch(space + 1); - space = strchr(value, ' '); + if (!item->util) + item->util = xcalloc(1, sizeof(struct branch_info)); + info = item->util; + if (type == REMOTE) { + if (info->remote_name) + warning(_("more than one %s"), orig_key); + info->remote_name = xstrdup(value); + } else if (type == MERGE) { + char *space = strchr(value, ' '); + value = abbrev_branch(value); + while (space) { + char *merge; + merge = xstrndup(value, space - value); + string_list_append(&info->merge, merge); + value = abbrev_branch(space + 1); + space = strchr(value, ' '); + } + string_list_append(&info->merge, xstrdup(value)); + } else { + int v = git_parse_maybe_bool(value); + if (v >= 0) + info->rebase = v; + else if (!strcmp(value, "preserve")) + info->rebase = NORMAL_REBASE; + else if (!strcmp(value, "merges")) + info->rebase = REBASE_MERGES; + else if (!strcmp(value, "interactive")) + info->rebase = INTERACTIVE_REBASE; } - string_list_append(&info->merge, xstrdup(value)); - break; - } - case REBASE: - /* - * Consider invalid values as false and check the - * truth value with >= REBASE_TRUE. - */ - info->rebase = rebase_parse_value(value); - break; - case PUSH_REMOTE: - if (info->push_remote_name) - warning(_("more than one %s"), orig_key); - info->push_remote_name = xstrdup(value); - break; - default: - BUG("unexpected type=%d", type); } - return 0; } @@ -615,56 +605,6 @@ static int migrate_file(struct remote *remote) return 0; } -struct push_default_info -{ - const char *old_name; - enum config_scope scope; - struct strbuf origin; - int linenr; -}; - -static int config_read_push_default(const char *key, const char *value, - void *cb) -{ - struct push_default_info* info = cb; - if (strcmp(key, "remote.pushdefault") || - !value || strcmp(value, info->old_name)) - return 0; - - info->scope = current_config_scope(); - strbuf_reset(&info->origin); - strbuf_addstr(&info->origin, current_config_name()); - info->linenr = current_config_line(); - - return 0; -} - -static void handle_push_default(const char* old_name, const char* new_name) -{ - struct push_default_info push_default = { - old_name, CONFIG_SCOPE_UNKNOWN, STRBUF_INIT, -1 }; - git_config(config_read_push_default, &push_default); - if (push_default.scope >= CONFIG_SCOPE_COMMAND) - ; /* pass */ - else if (push_default.scope >= CONFIG_SCOPE_LOCAL) { - int result = git_config_set_gently("remote.pushDefault", - new_name); - if (new_name && result && result != CONFIG_NOTHING_SET) - die(_("could not set '%s'"), "remote.pushDefault"); - else if (!new_name && result && result != CONFIG_NOTHING_SET) - die(_("could not unset '%s'"), "remote.pushDefault"); - } else if (push_default.scope >= CONFIG_SCOPE_SYSTEM) { - /* warn */ - warning(_("The %s configuration remote.pushDefault in:\n" - "\t%s:%d\n" - "now names the non-existent remote '%s'"), - config_scope_name(push_default.scope), - push_default.origin.buf, push_default.linenr, - old_name); - } -} - - static int mv(int argc, const char **argv) { struct option options[] = { @@ -740,11 +680,6 @@ static int mv(int argc, const char **argv) strbuf_addf(&buf, "branch.%s.remote", item->string); git_config_set(buf.buf, rename.new_name); } - if (info->push_remote_name && !strcmp(info->push_remote_name, rename.old_name)) { - strbuf_reset(&buf); - strbuf_addf(&buf, "branch.%s.pushremote", item->string); - git_config_set(buf.buf, rename.new_name); - } } if (!refspec_updated) @@ -758,8 +693,9 @@ static int mv(int argc, const char **argv) for (i = 0; i < remote_branches.nr; i++) { struct string_list_item *item = remote_branches.items + i; int flag = 0; + struct object_id oid; - read_ref_full(item->string, RESOLVE_REF_READING, NULL, &flag); + read_ref_full(item->string, RESOLVE_REF_READING, &oid, &flag); if (!(flag & REF_ISSYMREF)) continue; if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF)) @@ -800,9 +736,6 @@ static int mv(int argc, const char **argv) die(_("creating '%s' failed"), buf.buf); } string_list_clear(&remote_branches, 1); - - handle_push_default(rename.old_name, rename.new_name); - return 0; } @@ -849,13 +782,6 @@ static int rm(int argc, const char **argv) die(_("could not unset '%s'"), buf.buf); } } - if (info->push_remote_name && !strcmp(info->push_remote_name, remote->name)) { - strbuf_reset(&buf); - strbuf_addf(&buf, "branch.%s.pushremote", item->string); - result = git_config_set_gently(buf.buf, NULL); - if (result && result != CONFIG_NOTHING_SET) - die(_("could not unset '%s'"), buf.buf); - } } /* @@ -888,8 +814,6 @@ static int rm(int argc, const char **argv) strbuf_addf(&buf, "remote.%s", remote->name); if (git_config_rename_section(buf.buf, NULL) < 1) return error(_("Could not remove config section '%s'"), buf.buf); - - handle_push_default(remote->name, NULL); } return result; @@ -1020,7 +944,7 @@ static int add_local_to_show_info(struct string_list_item *branch_item, void *cb return 0; if ((n = strlen(branch_item->string)) > show_info->width) show_info->width = n; - if (branch_info->rebase >= REBASE_TRUE) + if (branch_info->rebase) show_info->any_rebase = 1; item = string_list_insert(show_info->list, branch_item->string); @@ -1037,16 +961,16 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data) int width = show_info->width + 4; int i; - if (branch_info->rebase >= REBASE_TRUE && branch_info->merge.nr > 1) { + if (branch_info->rebase && branch_info->merge.nr > 1) { error(_("invalid branch.%s.merge; cannot rebase onto > 1 branch"), item->string); return 0; } printf(" %-*s ", show_info->width, item->string); - if (branch_info->rebase >= REBASE_TRUE) { + if (branch_info->rebase) { const char *msg; - if (branch_info->rebase == REBASE_INTERACTIVE) + if (branch_info->rebase == INTERACTIVE_REBASE) msg = _("rebases interactively onto remote %s"); else if (branch_info->rebase == REBASE_MERGES) msg = _("rebases interactively (with merges) onto " diff --git a/third_party/git/builtin/repack.c b/third_party/git/builtin/repack.c index 0781763b06..632c0c0a79 100644 --- a/third_party/git/builtin/repack.c +++ b/third_party/git/builtin/repack.c @@ -11,7 +11,6 @@ #include "midx.h" #include "packfile.h" #include "object-store.h" -#include "promisor-remote.h" static int delta_base_offset = 1; static int pack_kept_objects = -1; @@ -191,7 +190,7 @@ static int write_oid(const struct object_id *oid, struct packed_git *pack, die(_("could not start pack-objects to repack promisor objects")); } - xwrite(cmd->in, oid_to_hex(oid), the_hash_algo->hexsz); + xwrite(cmd->in, oid_to_hex(oid), GIT_SHA1_HEXSZ); xwrite(cmd->in, "\n", 1); return 0; } @@ -233,13 +232,6 @@ static void repack_promisor_objects(const struct pack_objects_args *args, /* * pack-objects creates the .pack and .idx files, but not the * .promisor file. Create the .promisor file, which is empty. - * - * NEEDSWORK: fetch-pack sometimes generates non-empty - * .promisor files containing the ref names and associated - * hashes at the point of generation of the corresponding - * packfile, but this would not preserve their contents. Maybe - * concatenate the contents of all .promisor files instead of - * just creating a new empty file. */ promisor_name = mkpathdup("%s-%s.promisor", packtmp, line.buf); @@ -369,7 +361,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) argv_array_push(&cmd.args, "--all"); argv_array_push(&cmd.args, "--reflog"); argv_array_push(&cmd.args, "--indexed-objects"); - if (has_promisor_remote()) + if (repository_format_partial_clone) argv_array_push(&cmd.args, "--exclude-promisor-objects"); if (write_bitmaps > 0) argv_array_push(&cmd.args, "--write-bitmap-index"); @@ -569,7 +561,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) remove_temporary_files(); if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0)) - write_midx_file(get_object_directory(), 0); + write_midx_file(get_object_directory()); string_list_clear(&names, 0); string_list_clear(&rollback, 0); diff --git a/third_party/git/builtin/replace.c b/third_party/git/builtin/replace.c index b36d17a657..644b21ca8d 100644 --- a/third_party/git/builtin/replace.c +++ b/third_party/git/builtin/replace.c @@ -272,7 +272,7 @@ static int import_object(struct object_id *oid, enum object_type type, return error(_("unable to spawn mktree")); } - if (strbuf_read(&result, cmd.out, the_hash_algo->hexsz + 1) < 0) { + if (strbuf_read(&result, cmd.out, 41) < 0) { error_errno(_("unable to read from mktree")); close(fd); close(cmd.out); @@ -358,15 +358,14 @@ static int replace_parents(struct strbuf *buf, int argc, const char **argv) struct strbuf new_parents = STRBUF_INIT; const char *parent_start, *parent_end; int i; - const unsigned hexsz = the_hash_algo->hexsz; /* find existing parents */ parent_start = buf->buf; - parent_start += hexsz + 6; /* "tree " + "hex sha1" + "\n" */ + parent_start += GIT_SHA1_HEXSZ + 6; /* "tree " + "hex sha1" + "\n" */ parent_end = parent_start; while (starts_with(parent_end, "parent ")) - parent_end += hexsz + 8; /* "parent " + "hex sha1" + "\n" */ + parent_end += 48; /* "parent " + "hex sha1" + "\n" */ /* prepare new parents */ for (i = 0; i < argc; i++) { @@ -409,8 +408,7 @@ static int check_one_mergetag(struct commit *commit, struct tag *tag; int i; - hash_object_file(the_hash_algo, extra->value, extra->len, - type_name(OBJ_TAG), &tag_oid); + hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid); tag = lookup_tag(the_repository, &tag_oid); if (!tag) return error(_("bad mergetag in commit '%s'"), ref); @@ -423,7 +421,7 @@ static int check_one_mergetag(struct commit *commit, if (get_oid(mergetag_data->argv[i], &oid) < 0) return error(_("not a valid object name: '%s'"), mergetag_data->argv[i]); - if (oideq(get_tagged_oid(tag), &oid)) + if (oideq(&tag->tagged->oid, &oid)) return 0; /* found */ } diff --git a/third_party/git/builtin/reset.c b/third_party/git/builtin/reset.c index 18228c312e..fdd572168b 100644 --- a/third_party/git/builtin/reset.c +++ b/third_party/git/builtin/reset.c @@ -30,9 +30,8 @@ static const char * const git_reset_usage[] = { N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"), - N_("git reset [-q] [<tree-ish>] [--] <pathspec>..."), - N_("git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"), - N_("git reset --patch [<tree-ish>] [--] [<pathspec>...]"), + N_("git reset [-q] [<tree-ish>] [--] <paths>..."), + N_("git reset --patch [<tree-ish>] [--] [<paths>...]"), NULL }; @@ -285,8 +284,8 @@ static int git_reset_config(const char *var, const char *value, void *cb) int cmd_reset(int argc, const char **argv, const char *prefix) { int reset_type = NONE, update_ref_status = 0, quiet = 0; - int patch_mode = 0, pathspec_file_nul = 0, unborn; - const char *rev, *pathspec_from_file = NULL; + int patch_mode = 0, unborn; + const char *rev; struct object_id oid; struct pathspec pathspec; int intent_to_add = 0; @@ -307,8 +306,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix) OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")), OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that removed paths will be added later")), - OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), - OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), OPT_END() }; @@ -319,25 +316,11 @@ int cmd_reset(int argc, const char **argv, const char *prefix) PARSE_OPT_KEEP_DASHDASH); parse_args(&pathspec, argv, prefix, patch_mode, &rev); - if (pathspec_from_file) { - if (patch_mode) - die(_("--pathspec-from-file is incompatible with --patch")); - - if (pathspec.nr) - die(_("--pathspec-from-file is incompatible with pathspec arguments")); - - parse_pathspec_file(&pathspec, 0, - PATHSPEC_PREFER_FULL, - prefix, pathspec_from_file, pathspec_file_nul); - } else if (pathspec_file_nul) { - die(_("--pathspec-file-nul requires --pathspec-from-file")); - } - unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid); if (unborn) { /* reset on unborn branch: treat as reset to empty tree */ oidcpy(&oid, the_hash_algo->empty_tree); - } else if (!pathspec.nr && !patch_mode) { + } else if (!pathspec.nr) { struct commit *commit; if (get_oid_committish(rev, &oid)) die(_("Failed to resolve '%s' as a valid revision."), rev); diff --git a/third_party/git/builtin/rev-list.c b/third_party/git/builtin/rev-list.c index f520111eda..301ccb970b 100644 --- a/third_party/git/builtin/rev-list.c +++ b/third_party/git/builtin/rev-list.c @@ -18,6 +18,7 @@ #include "reflog-walk.h" #include "oidset.h" #include "packfile.h" +#include "object-store.h" static const char rev_list_usage[] = "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n" @@ -253,26 +254,11 @@ static int finish_object(struct object *obj, const char *name, void *cb_data) static void show_object(struct object *obj, const char *name, void *cb_data) { struct rev_list_info *info = cb_data; - struct rev_info *revs = info->revs; - if (finish_object(obj, name, cb_data)) return; display_progress(progress, ++progress_counter); if (info->flags & REV_LIST_QUIET) return; - - if (revs->count) { - /* - * The object count is always accumulated in the .count_right - * field for traversal that is not a left-right traversal, - * and cmd_rev_list() made sure that a .count request that - * wants to count non-commit objects, which is handled by - * the show_object() callback, does not ask for .left_right. - */ - revs->count_right++; - return; - } - if (arg_show_object_names) show_object_with_name(stdout, obj, name); else @@ -379,79 +365,6 @@ static inline int parse_missing_action_value(const char *value) return 0; } -static int try_bitmap_count(struct rev_info *revs, - struct list_objects_filter_options *filter) -{ - uint32_t commit_count = 0, - tag_count = 0, - tree_count = 0, - blob_count = 0; - int max_count; - struct bitmap_index *bitmap_git; - - /* This function only handles counting, not general traversal. */ - if (!revs->count) - return -1; - - /* - * A bitmap result can't know left/right, etc, because we don't - * actually traverse. - */ - if (revs->left_right || revs->cherry_mark) - return -1; - - /* - * If we're counting reachable objects, we can't handle a max count of - * commits to traverse, since we don't know which objects go with which - * commit. - */ - if (revs->max_count >= 0 && - (revs->tag_objects || revs->tree_objects || revs->blob_objects)) - return -1; - - /* - * This must be saved before doing any walking, since the revision - * machinery will count it down to zero while traversing. - */ - max_count = revs->max_count; - - bitmap_git = prepare_bitmap_walk(revs, filter); - if (!bitmap_git) - return -1; - - count_bitmap_commit_list(bitmap_git, &commit_count, - revs->tree_objects ? &tree_count : NULL, - revs->blob_objects ? &blob_count : NULL, - revs->tag_objects ? &tag_count : NULL); - if (max_count >= 0 && max_count < commit_count) - commit_count = max_count; - - printf("%d\n", commit_count + tree_count + blob_count + tag_count); - free_bitmap_index(bitmap_git); - return 0; -} - -static int try_bitmap_traversal(struct rev_info *revs, - struct list_objects_filter_options *filter) -{ - struct bitmap_index *bitmap_git; - - /* - * We can't use a bitmap result with a traversal limit, since the set - * of commits we'd get would be essentially random. - */ - if (revs->max_count >= 0) - return -1; - - bitmap_git = prepare_bitmap_walk(revs, filter); - if (!bitmap_git) - return -1; - - traverse_bitmap_commit_list(bitmap_git, revs, &show_object_fast); - free_bitmap_index(bitmap_git); - return 0; -} - int cmd_rev_list(int argc, const char **argv, const char *prefix) { struct rev_info revs; @@ -558,6 +471,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) parse_list_objects_filter(&filter_options, arg); if (filter_options.choice && !revs.blob_objects) die(_("object filtering requires --objects")); + if (filter_options.choice == LOFC_SPARSE_OID && + !filter_options.sparse_oid_value) + die(_("invalid sparse value '%s'"), + filter_options.filter_spec); continue; } if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) { @@ -609,10 +526,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (revs.show_notes) die(_("rev-list does not support display of notes")); - if (revs.count && - (revs.tag_objects || revs.tree_objects || revs.blob_objects) && - (revs.left_right || revs.cherry_mark)) - die(_("marked counting is incompatible with --objects")); + if (filter_options.choice && use_bitmap_index) + die(_("cannot combine --use-bitmap-index with object filtering")); save_commit_buffer = (revs.verbose_header || revs.grep_filter.pattern_list || @@ -623,11 +538,28 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (show_progress) progress = start_delayed_progress(show_progress, 0); - if (use_bitmap_index) { - if (!try_bitmap_count(&revs, &filter_options)) - return 0; - if (!try_bitmap_traversal(&revs, &filter_options)) - return 0; + if (use_bitmap_index && !revs.prune) { + if (revs.count && !revs.left_right && !revs.cherry_mark) { + uint32_t commit_count; + int max_count = revs.max_count; + struct bitmap_index *bitmap_git; + if ((bitmap_git = prepare_bitmap_walk(&revs))) { + count_bitmap_commit_list(bitmap_git, &commit_count, NULL, NULL, NULL); + if (max_count >= 0 && max_count < commit_count) + commit_count = max_count; + printf("%d\n", commit_count); + free_bitmap_index(bitmap_git); + return 0; + } + } else if (revs.max_count < 0 && + revs.tag_objects && revs.tree_objects && revs.blob_objects) { + struct bitmap_index *bitmap_git; + if ((bitmap_git = prepare_bitmap_walk(&revs))) { + traverse_bitmap_commit_list(bitmap_git, &show_object_fast); + free_bitmap_index(bitmap_git); + return 0; + } + } } if (prepare_revision_walk(&revs)) diff --git a/third_party/git/builtin/rev-parse.c b/third_party/git/builtin/rev-parse.c index 7a00da8203..f8bbe6d47e 100644 --- a/third_party/git/builtin/rev-parse.c +++ b/third_party/git/builtin/rev-parse.c @@ -593,7 +593,6 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) const char *name = NULL; struct object_context unused; struct strbuf buf = STRBUF_INIT; - const int hexsz = the_hash_algo->hexsz; if (argc > 1 && !strcmp("--parseopt", argv[1])) return cmd_parseopt(argc - 1, argv + 1, prefix); @@ -731,8 +730,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) abbrev = strtoul(arg, NULL, 10); if (abbrev < MINIMUM_ABBREV) abbrev = MINIMUM_ABBREV; - else if (hexsz <= abbrev) - abbrev = hexsz; + else if (40 <= abbrev) + abbrev = 40; continue; } if (!strcmp(arg, "--sq")) { @@ -803,8 +802,6 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) const char *work_tree = get_git_work_tree(); if (work_tree) puts(work_tree); - else - die("this operation must be run in a work tree"); continue; } if (!strcmp(arg, "--show-superproject-working-tree")) { @@ -921,17 +918,6 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix) show_datestring("--min-age=", arg); continue; } - if (opt_with_value(arg, "--show-object-format", &arg)) { - const char *val = arg ? arg : "storage"; - - if (strcmp(val, "storage") && - strcmp(val, "input") && - strcmp(val, "output")) - die("unknown mode for --show-object-format: %s", - arg); - puts(the_hash_algo->name); - continue; - } if (show_flag(arg) && verify) die_no_single_rev(quiet); continue; diff --git a/third_party/git/builtin/rm.c b/third_party/git/builtin/rm.c index 4858631e0f..19ce95a901 100644 --- a/third_party/git/builtin/rm.c +++ b/third_party/git/builtin/rm.c @@ -235,8 +235,7 @@ static int check_local_mod(struct object_id *head, int index_only) } static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0; -static int ignore_unmatch = 0, pathspec_file_nul; -static char *pathspec_from_file; +static int ignore_unmatch = 0; static struct option builtin_rm_options[] = { OPT__DRY_RUN(&show_only, N_("dry run")), @@ -246,8 +245,6 @@ static struct option builtin_rm_options[] = { OPT_BOOL('r', NULL, &recursive, N_("allow recursive removal")), OPT_BOOL( 0 , "ignore-unmatch", &ignore_unmatch, N_("exit with a zero status even if nothing matched")), - OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), - OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), OPT_END(), }; @@ -262,24 +259,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, builtin_rm_options, builtin_rm_usage, 0); - - parse_pathspec(&pathspec, 0, - PATHSPEC_PREFER_CWD, - prefix, argv); - - if (pathspec_from_file) { - if (pathspec.nr) - die(_("--pathspec-from-file is incompatible with pathspec arguments")); - - parse_pathspec_file(&pathspec, 0, - PATHSPEC_PREFER_CWD, - prefix, pathspec_from_file, pathspec_file_nul); - } else if (pathspec_file_nul) { - die(_("--pathspec-file-nul requires --pathspec-from-file")); - } - - if (!pathspec.nr) - die(_("No pathspec was given. Which files should I remove?")); + if (!argc) + usage_with_options(builtin_rm_usage, builtin_rm_options); if (!index_only) setup_work_tree(); @@ -289,6 +270,9 @@ int cmd_rm(int argc, const char **argv, const char *prefix) if (read_cache() < 0) die(_("index file corrupt")); + parse_pathspec(&pathspec, 0, + PATHSPEC_PREFER_CWD, + prefix, argv); refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &pathspec, NULL, NULL); seen = xcalloc(pathspec.nr, 1); diff --git a/third_party/git/builtin/show-branch.c b/third_party/git/builtin/show-branch.c index 8c90cbb18f..35d7f51c23 100644 --- a/third_party/git/builtin/show-branch.c +++ b/third_party/git/builtin/show-branch.c @@ -536,7 +536,7 @@ static void append_one_rev(const char *av) append_ref(av, &revkey, 0); return; } - if (strpbrk(av, "*?[")) { + if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) { /* glob style match */ int saved_matches = ref_name_cnt; diff --git a/third_party/git/builtin/show-index.c b/third_party/git/builtin/show-index.c index 0826f6a5a2..a6e678809e 100644 --- a/third_party/git/builtin/show-index.c +++ b/third_party/git/builtin/show-index.c @@ -11,7 +11,6 @@ int cmd_show_index(int argc, const char **argv, const char *prefix) unsigned nr; unsigned int version; static unsigned int top_index[256]; - const unsigned hashsz = the_hash_algo->rawsz; if (argc != 1) usage(show_index_usage); @@ -37,23 +36,23 @@ int cmd_show_index(int argc, const char **argv, const char *prefix) } if (version == 1) { for (i = 0; i < nr; i++) { - unsigned int offset, entry[(GIT_MAX_RAWSZ + 4) / sizeof(unsigned int)]; + unsigned int offset, entry[6]; - if (fread(entry, 4 + hashsz, 1, stdin) != 1) + if (fread(entry, 4 + 20, 1, stdin) != 1) die("unable to read entry %u/%u", i, nr); offset = ntohl(entry[0]); - printf("%u %s\n", offset, hash_to_hex((void *)(entry+1))); + printf("%u %s\n", offset, sha1_to_hex((void *)(entry+1))); } } else { unsigned off64_nr = 0; struct { - struct object_id oid; + unsigned char sha1[20]; uint32_t crc; uint32_t off; } *entries; ALLOC_ARRAY(entries, nr); for (i = 0; i < nr; i++) - if (fread(entries[i].oid.hash, hashsz, 1, stdin) != 1) + if (fread(entries[i].sha1, 20, 1, stdin) != 1) die("unable to read sha1 %u/%u", i, nr); for (i = 0; i < nr; i++) if (fread(&entries[i].crc, 4, 1, stdin) != 1) @@ -78,7 +77,7 @@ int cmd_show_index(int argc, const char **argv, const char *prefix) } printf("%" PRIuMAX " %s (%08"PRIx32")\n", (uintmax_t) offset, - oid_to_hex(&entries[i].oid), + sha1_to_hex(entries[i].sha1), ntohl(entries[i].crc)); } free(entries); diff --git a/third_party/git/builtin/sparse-checkout.c b/third_party/git/builtin/sparse-checkout.c deleted file mode 100644 index 740da4b6d5..0000000000 --- a/third_party/git/builtin/sparse-checkout.c +++ /dev/null @@ -1,631 +0,0 @@ -#include "builtin.h" -#include "config.h" -#include "dir.h" -#include "parse-options.h" -#include "pathspec.h" -#include "repository.h" -#include "run-command.h" -#include "strbuf.h" -#include "string-list.h" -#include "cache.h" -#include "cache-tree.h" -#include "lockfile.h" -#include "resolve-undo.h" -#include "unpack-trees.h" -#include "wt-status.h" -#include "quote.h" - -static const char *empty_base = ""; - -static char const * const builtin_sparse_checkout_usage[] = { - N_("git sparse-checkout (init|list|set|add|disable) <options>"), - NULL -}; - -static char *get_sparse_checkout_filename(void) -{ - return git_pathdup("info/sparse-checkout"); -} - -static void write_patterns_to_file(FILE *fp, struct pattern_list *pl) -{ - int i; - - for (i = 0; i < pl->nr; i++) { - struct path_pattern *p = pl->patterns[i]; - - if (p->flags & PATTERN_FLAG_NEGATIVE) - fprintf(fp, "!"); - - fprintf(fp, "%s", p->pattern); - - if (p->flags & PATTERN_FLAG_MUSTBEDIR) - fprintf(fp, "/"); - - fprintf(fp, "\n"); - } -} - -static int sparse_checkout_list(int argc, const char **argv) -{ - struct pattern_list pl; - char *sparse_filename; - int res; - - memset(&pl, 0, sizeof(pl)); - - pl.use_cone_patterns = core_sparse_checkout_cone; - - sparse_filename = get_sparse_checkout_filename(); - res = add_patterns_from_file_to_list(sparse_filename, "", 0, &pl, NULL); - free(sparse_filename); - - if (res < 0) { - warning(_("this worktree is not sparse (sparse-checkout file may not exist)")); - return 0; - } - - if (pl.use_cone_patterns) { - int i; - struct pattern_entry *pe; - struct hashmap_iter iter; - struct string_list sl = STRING_LIST_INIT_DUP; - - hashmap_for_each_entry(&pl.recursive_hashmap, &iter, pe, ent) { - /* pe->pattern starts with "/", skip it */ - string_list_insert(&sl, pe->pattern + 1); - } - - string_list_sort(&sl); - - for (i = 0; i < sl.nr; i++) { - quote_c_style(sl.items[i].string, NULL, stdout, 0); - printf("\n"); - } - - return 0; - } - - write_patterns_to_file(stdout, &pl); - clear_pattern_list(&pl); - - return 0; -} - -static int update_working_directory(struct pattern_list *pl) -{ - int result = 0; - struct unpack_trees_options o; - struct lock_file lock_file = LOCK_INIT; - struct object_id oid; - struct tree *tree; - struct tree_desc t; - struct repository *r = the_repository; - - if (repo_read_index_unmerged(r)) - die(_("you need to resolve your current index first")); - - if (get_oid("HEAD", &oid)) - return 0; - - tree = parse_tree_indirect(&oid); - parse_tree(tree); - init_tree_desc(&t, tree->buffer, tree->size); - - memset(&o, 0, sizeof(o)); - o.verbose_update = isatty(2); - o.merge = 1; - o.update = 1; - o.fn = oneway_merge; - o.head_idx = -1; - o.src_index = r->index; - o.dst_index = r->index; - o.skip_sparse_checkout = 0; - o.pl = pl; - o.keep_pattern_list = !!pl; - - resolve_undo_clear_index(r->index); - setup_work_tree(); - - cache_tree_free(&r->index->cache_tree); - - repo_hold_locked_index(r, &lock_file, LOCK_DIE_ON_ERROR); - - core_apply_sparse_checkout = 1; - result = unpack_trees(1, &t, &o); - - if (!result) { - prime_cache_tree(r, r->index, tree); - write_locked_index(r->index, &lock_file, COMMIT_LOCK); - } else - rollback_lock_file(&lock_file); - - return result; -} - -static char *escaped_pattern(char *pattern) -{ - char *p = pattern; - struct strbuf final = STRBUF_INIT; - - while (*p) { - if (is_glob_special(*p)) - strbuf_addch(&final, '\\'); - - strbuf_addch(&final, *p); - p++; - } - - return strbuf_detach(&final, NULL); -} - -static void write_cone_to_file(FILE *fp, struct pattern_list *pl) -{ - int i; - struct pattern_entry *pe; - struct hashmap_iter iter; - struct string_list sl = STRING_LIST_INIT_DUP; - struct strbuf parent_pattern = STRBUF_INIT; - - hashmap_for_each_entry(&pl->parent_hashmap, &iter, pe, ent) { - if (hashmap_get_entry(&pl->recursive_hashmap, pe, ent, NULL)) - continue; - - if (!hashmap_contains_parent(&pl->recursive_hashmap, - pe->pattern, - &parent_pattern)) - string_list_insert(&sl, pe->pattern); - } - - string_list_sort(&sl); - string_list_remove_duplicates(&sl, 0); - - fprintf(fp, "/*\n!/*/\n"); - - for (i = 0; i < sl.nr; i++) { - char *pattern = escaped_pattern(sl.items[i].string); - - if (strlen(pattern)) - fprintf(fp, "%s/\n!%s/*/\n", pattern, pattern); - free(pattern); - } - - string_list_clear(&sl, 0); - - hashmap_for_each_entry(&pl->recursive_hashmap, &iter, pe, ent) { - if (!hashmap_contains_parent(&pl->recursive_hashmap, - pe->pattern, - &parent_pattern)) - string_list_insert(&sl, pe->pattern); - } - - strbuf_release(&parent_pattern); - - string_list_sort(&sl); - string_list_remove_duplicates(&sl, 0); - - for (i = 0; i < sl.nr; i++) { - char *pattern = escaped_pattern(sl.items[i].string); - fprintf(fp, "%s/\n", pattern); - free(pattern); - } -} - -static int write_patterns_and_update(struct pattern_list *pl) -{ - char *sparse_filename; - FILE *fp; - int fd; - struct lock_file lk = LOCK_INIT; - int result; - - sparse_filename = get_sparse_checkout_filename(); - - if (safe_create_leading_directories(sparse_filename)) - die(_("failed to create directory for sparse-checkout file")); - - fd = hold_lock_file_for_update(&lk, sparse_filename, - LOCK_DIE_ON_ERROR); - - result = update_working_directory(pl); - if (result) { - rollback_lock_file(&lk); - free(sparse_filename); - clear_pattern_list(pl); - update_working_directory(NULL); - return result; - } - - fp = xfdopen(fd, "w"); - - if (core_sparse_checkout_cone) - write_cone_to_file(fp, pl); - else - write_patterns_to_file(fp, pl); - - fflush(fp); - commit_lock_file(&lk); - - free(sparse_filename); - clear_pattern_list(pl); - - return 0; -} - -enum sparse_checkout_mode { - MODE_NO_PATTERNS = 0, - MODE_ALL_PATTERNS = 1, - MODE_CONE_PATTERNS = 2, -}; - -static int set_config(enum sparse_checkout_mode mode) -{ - const char *config_path; - - if (git_config_set_gently("extensions.worktreeConfig", "true")) { - error(_("failed to set extensions.worktreeConfig setting")); - return 1; - } - - config_path = git_path("config.worktree"); - git_config_set_in_file_gently(config_path, - "core.sparseCheckout", - mode ? "true" : NULL); - - git_config_set_in_file_gently(config_path, - "core.sparseCheckoutCone", - mode == MODE_CONE_PATTERNS ? "true" : NULL); - - return 0; -} - -static char const * const builtin_sparse_checkout_init_usage[] = { - N_("git sparse-checkout init [--cone]"), - NULL -}; - -static struct sparse_checkout_init_opts { - int cone_mode; -} init_opts; - -static int sparse_checkout_init(int argc, const char **argv) -{ - struct pattern_list pl; - char *sparse_filename; - int res; - struct object_id oid; - int mode; - struct strbuf pattern = STRBUF_INIT; - - static struct option builtin_sparse_checkout_init_options[] = { - OPT_BOOL(0, "cone", &init_opts.cone_mode, - N_("initialize the sparse-checkout in cone mode")), - OPT_END(), - }; - - repo_read_index(the_repository); - require_clean_work_tree(the_repository, - N_("initialize sparse-checkout"), NULL, 1, 0); - - argc = parse_options(argc, argv, NULL, - builtin_sparse_checkout_init_options, - builtin_sparse_checkout_init_usage, 0); - - if (init_opts.cone_mode) { - mode = MODE_CONE_PATTERNS; - core_sparse_checkout_cone = 1; - } else - mode = MODE_ALL_PATTERNS; - - if (set_config(mode)) - return 1; - - memset(&pl, 0, sizeof(pl)); - - sparse_filename = get_sparse_checkout_filename(); - res = add_patterns_from_file_to_list(sparse_filename, "", 0, &pl, NULL); - - /* If we already have a sparse-checkout file, use it. */ - if (res >= 0) { - free(sparse_filename); - core_apply_sparse_checkout = 1; - return update_working_directory(NULL); - } - - if (get_oid("HEAD", &oid)) { - FILE *fp; - - /* assume we are in a fresh repo, but update the sparse-checkout file */ - fp = xfopen(sparse_filename, "w"); - if (!fp) - die(_("failed to open '%s'"), sparse_filename); - - free(sparse_filename); - fprintf(fp, "/*\n!/*/\n"); - fclose(fp); - return 0; - } - - strbuf_addstr(&pattern, "/*"); - add_pattern(strbuf_detach(&pattern, NULL), empty_base, 0, &pl, 0); - strbuf_addstr(&pattern, "!/*/"); - add_pattern(strbuf_detach(&pattern, NULL), empty_base, 0, &pl, 0); - - return write_patterns_and_update(&pl); -} - -static void insert_recursive_pattern(struct pattern_list *pl, struct strbuf *path) -{ - struct pattern_entry *e = xmalloc(sizeof(*e)); - e->patternlen = path->len; - e->pattern = strbuf_detach(path, NULL); - hashmap_entry_init(&e->ent, - ignore_case ? - strihash(e->pattern) : - strhash(e->pattern)); - - hashmap_add(&pl->recursive_hashmap, &e->ent); - - while (e->patternlen) { - char *slash = strrchr(e->pattern, '/'); - char *oldpattern = e->pattern; - size_t newlen; - - if (slash == e->pattern) - break; - - newlen = slash - e->pattern; - e = xmalloc(sizeof(struct pattern_entry)); - e->patternlen = newlen; - e->pattern = xstrndup(oldpattern, newlen); - hashmap_entry_init(&e->ent, - ignore_case ? - strihash(e->pattern) : - strhash(e->pattern)); - - if (!hashmap_get_entry(&pl->parent_hashmap, e, ent, NULL)) - hashmap_add(&pl->parent_hashmap, &e->ent); - } -} - -static void strbuf_to_cone_pattern(struct strbuf *line, struct pattern_list *pl) -{ - strbuf_trim(line); - - strbuf_trim_trailing_dir_sep(line); - - if (strbuf_normalize_path(line)) - die(_("could not normalize path %s"), line->buf); - - if (!line->len) - return; - - if (line->buf[0] != '/') - strbuf_insertstr(line, 0, "/"); - - insert_recursive_pattern(pl, line); -} - -static char const * const builtin_sparse_checkout_set_usage[] = { - N_("git sparse-checkout (set|add) (--stdin | <patterns>)"), - NULL -}; - -static struct sparse_checkout_set_opts { - int use_stdin; -} set_opts; - -static void add_patterns_from_input(struct pattern_list *pl, - int argc, const char **argv) -{ - int i; - if (core_sparse_checkout_cone) { - struct strbuf line = STRBUF_INIT; - - hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0); - hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0); - pl->use_cone_patterns = 1; - - if (set_opts.use_stdin) { - struct strbuf unquoted = STRBUF_INIT; - while (!strbuf_getline(&line, stdin)) { - if (line.buf[0] == '"') { - strbuf_reset(&unquoted); - if (unquote_c_style(&unquoted, line.buf, NULL)) - die(_("unable to unquote C-style string '%s'"), - line.buf); - - strbuf_swap(&unquoted, &line); - } - - strbuf_to_cone_pattern(&line, pl); - } - - strbuf_release(&unquoted); - } else { - for (i = 0; i < argc; i++) { - strbuf_setlen(&line, 0); - strbuf_addstr(&line, argv[i]); - strbuf_to_cone_pattern(&line, pl); - } - } - } else { - if (set_opts.use_stdin) { - struct strbuf line = STRBUF_INIT; - - while (!strbuf_getline(&line, stdin)) { - size_t len; - char *buf = strbuf_detach(&line, &len); - add_pattern(buf, empty_base, 0, pl, 0); - } - } else { - for (i = 0; i < argc; i++) - add_pattern(argv[i], empty_base, 0, pl, 0); - } - } -} - -enum modify_type { - REPLACE, - ADD, -}; - -static void add_patterns_cone_mode(int argc, const char **argv, - struct pattern_list *pl) -{ - struct strbuf buffer = STRBUF_INIT; - struct pattern_entry *pe; - struct hashmap_iter iter; - struct pattern_list existing; - char *sparse_filename = get_sparse_checkout_filename(); - - add_patterns_from_input(pl, argc, argv); - - memset(&existing, 0, sizeof(existing)); - existing.use_cone_patterns = core_sparse_checkout_cone; - - if (add_patterns_from_file_to_list(sparse_filename, "", 0, - &existing, NULL)) - die(_("unable to load existing sparse-checkout patterns")); - free(sparse_filename); - - hashmap_for_each_entry(&existing.recursive_hashmap, &iter, pe, ent) { - if (!hashmap_contains_parent(&pl->recursive_hashmap, - pe->pattern, &buffer) || - !hashmap_contains_parent(&pl->parent_hashmap, - pe->pattern, &buffer)) { - strbuf_reset(&buffer); - strbuf_addstr(&buffer, pe->pattern); - insert_recursive_pattern(pl, &buffer); - } - } - - clear_pattern_list(&existing); - strbuf_release(&buffer); -} - -static void add_patterns_literal(int argc, const char **argv, - struct pattern_list *pl) -{ - char *sparse_filename = get_sparse_checkout_filename(); - if (add_patterns_from_file_to_list(sparse_filename, "", 0, - pl, NULL)) - die(_("unable to load existing sparse-checkout patterns")); - free(sparse_filename); - add_patterns_from_input(pl, argc, argv); -} - -static int modify_pattern_list(int argc, const char **argv, enum modify_type m) -{ - int result; - int changed_config = 0; - struct pattern_list pl; - memset(&pl, 0, sizeof(pl)); - - switch (m) { - case ADD: - if (core_sparse_checkout_cone) - add_patterns_cone_mode(argc, argv, &pl); - else - add_patterns_literal(argc, argv, &pl); - break; - - case REPLACE: - add_patterns_from_input(&pl, argc, argv); - break; - } - - if (!core_apply_sparse_checkout) { - set_config(MODE_ALL_PATTERNS); - core_apply_sparse_checkout = 1; - changed_config = 1; - } - - result = write_patterns_and_update(&pl); - - if (result && changed_config) - set_config(MODE_NO_PATTERNS); - - clear_pattern_list(&pl); - return result; -} - -static int sparse_checkout_set(int argc, const char **argv, const char *prefix, - enum modify_type m) -{ - static struct option builtin_sparse_checkout_set_options[] = { - OPT_BOOL(0, "stdin", &set_opts.use_stdin, - N_("read patterns from standard in")), - OPT_END(), - }; - - repo_read_index(the_repository); - require_clean_work_tree(the_repository, - N_("set sparse-checkout patterns"), NULL, 1, 0); - - argc = parse_options(argc, argv, prefix, - builtin_sparse_checkout_set_options, - builtin_sparse_checkout_set_usage, - PARSE_OPT_KEEP_UNKNOWN); - - return modify_pattern_list(argc, argv, m); -} - -static int sparse_checkout_disable(int argc, const char **argv) -{ - struct pattern_list pl; - struct strbuf match_all = STRBUF_INIT; - - repo_read_index(the_repository); - require_clean_work_tree(the_repository, - N_("disable sparse-checkout"), NULL, 1, 0); - - memset(&pl, 0, sizeof(pl)); - hashmap_init(&pl.recursive_hashmap, pl_hashmap_cmp, NULL, 0); - hashmap_init(&pl.parent_hashmap, pl_hashmap_cmp, NULL, 0); - pl.use_cone_patterns = 0; - core_apply_sparse_checkout = 1; - - strbuf_addstr(&match_all, "/*"); - add_pattern(strbuf_detach(&match_all, NULL), empty_base, 0, &pl, 0); - - if (update_working_directory(&pl)) - die(_("error while refreshing working directory")); - - clear_pattern_list(&pl); - return set_config(MODE_NO_PATTERNS); -} - -int cmd_sparse_checkout(int argc, const char **argv, const char *prefix) -{ - static struct option builtin_sparse_checkout_options[] = { - OPT_END(), - }; - - if (argc == 2 && !strcmp(argv[1], "-h")) - usage_with_options(builtin_sparse_checkout_usage, - builtin_sparse_checkout_options); - - argc = parse_options(argc, argv, prefix, - builtin_sparse_checkout_options, - builtin_sparse_checkout_usage, - PARSE_OPT_STOP_AT_NON_OPTION); - - git_config(git_default_config, NULL); - - if (argc > 0) { - if (!strcmp(argv[0], "list")) - return sparse_checkout_list(argc, argv); - if (!strcmp(argv[0], "init")) - return sparse_checkout_init(argc, argv); - if (!strcmp(argv[0], "set")) - return sparse_checkout_set(argc, argv, prefix, REPLACE); - if (!strcmp(argv[0], "add")) - return sparse_checkout_set(argc, argv, prefix, ADD); - if (!strcmp(argv[0], "disable")) - return sparse_checkout_disable(argc, argv); - } - - usage_with_options(builtin_sparse_checkout_usage, - builtin_sparse_checkout_options); -} diff --git a/third_party/git/builtin/stash.c b/third_party/git/builtin/stash.c index 78af6ce564..b5a301f24d 100644 --- a/third_party/git/builtin/stash.c +++ b/third_party/git/builtin/stash.c @@ -27,7 +27,6 @@ static const char * const git_stash_usage[] = { N_("git stash clear"), N_("git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" - " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]"), N_("git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]"), @@ -397,7 +396,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, const struct object_id *bases[1]; read_cache_preload(NULL); - if (refresh_and_write_cache(REFRESH_QUIET, 0, 0)) + if (refresh_cache(REFRESH_QUIET)) return -1; if (write_cache_as_tree(&c_tree, 0, NULL)) @@ -428,8 +427,6 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, return error(_("could not save index tree")); reset_head(); - discard_cache(); - read_cache(); } } @@ -484,12 +481,13 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, if (ret) return -1; - /* read back the result of update_index() back from the disk */ discard_cache(); - read_cache(); } - if (!quiet) { + if (quiet) { + if (refresh_cache(REFRESH_QUIET)) + warning("could not refresh index"); + } else { struct child_process cp = CHILD_PROCESS_INIT; /* @@ -499,10 +497,6 @@ static int do_apply_stash(const char *prefix, struct stash_info *info, */ cp.git_cmd = 1; cp.dir = prefix; - argv_array_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s", - absolute_path(get_git_work_tree())); - argv_array_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s", - absolute_path(get_git_dir())); argv_array_push(&cp.args, "status"); run_command(&cp); } @@ -999,9 +993,9 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps, { int ret = 0; struct child_process cp_read_tree = CHILD_PROCESS_INIT; + struct child_process cp_add_i = CHILD_PROCESS_INIT; struct child_process cp_diff_tree = CHILD_PROCESS_INIT; struct index_state istate = { NULL }; - char *old_index_env = NULL, *old_repo_index_file; remove_path(stash_index_path.buf); @@ -1015,19 +1009,16 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps, } /* Find out what the user wants. */ - old_repo_index_file = the_repository->index_file; - the_repository->index_file = stash_index_path.buf; - old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT)); - setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1); - - ret = run_add_interactive(NULL, "--patch=stash", ps); - - the_repository->index_file = old_repo_index_file; - if (old_index_env && *old_index_env) - setenv(INDEX_ENVIRONMENT, old_index_env, 1); - else - unsetenv(INDEX_ENVIRONMENT); - FREE_AND_NULL(old_index_env); + cp_add_i.git_cmd = 1; + argv_array_pushl(&cp_add_i.args, "add--interactive", "--patch=stash", + "--", NULL); + add_pathspecs(&cp_add_i.args, ps); + argv_array_pushf(&cp_add_i.env_array, "GIT_INDEX_FILE=%s", + stash_index_path.buf); + if (run_command(&cp_add_i)) { + ret = -1; + goto done; + } /* State of the working tree. */ if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0, @@ -1091,9 +1082,8 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps } cp_upd_index.git_cmd = 1; - argv_array_pushl(&cp_upd_index.args, "update-index", - "--ignore-skip-worktree-entries", - "-z", "--add", "--remove", "--stdin", NULL); + argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add", + "--remove", "--stdin", NULL); argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s", stash_index_path.buf); @@ -1139,10 +1129,7 @@ static int do_create_stash(const struct pathspec *ps, struct strbuf *stash_msg_b prepare_fallback_ident("git stash", "git@stash"); read_cache_preload(NULL); - if (refresh_and_write_cache(REFRESH_QUIET, 0, 0) < 0) { - ret = -1; - goto done; - } + refresh_cache(REFRESH_QUIET); if (get_oid("HEAD", &info->b_commit)) { if (!quiet) @@ -1303,7 +1290,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q free(ps_matched); } - if (refresh_and_write_cache(REFRESH_QUIET, 0, 0)) { + if (refresh_cache(REFRESH_QUIET)) { ret = -1; goto done; } @@ -1396,7 +1383,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q struct child_process cp = CHILD_PROCESS_INIT; cp.git_cmd = 1; argv_array_pushl(&cp.args, "reset", "--hard", "-q", - "--no-recurse-submodules", NULL); + NULL); if (run_command(&cp)) { ret = -1; goto done; @@ -1452,17 +1439,13 @@ done: return ret; } -static int push_stash(int argc, const char **argv, const char *prefix, - int push_assumed) +static int push_stash(int argc, const char **argv, const char *prefix) { - int force_assume = 0; int keep_index = -1; int patch_mode = 0; int include_untracked = 0; int quiet = 0; - int pathspec_file_nul = 0; const char *stash_msg = NULL; - const char *pathspec_from_file = NULL; struct pathspec ps; struct option options[] = { OPT_BOOL('k', "keep-index", &keep_index, @@ -1476,45 +1459,16 @@ static int push_stash(int argc, const char **argv, const char *prefix, N_("include ignore files"), 2), OPT_STRING('m', "message", &stash_msg, N_("message"), N_("stash message")), - OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), - OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), OPT_END() }; - if (argc) { - force_assume = !strcmp(argv[0], "-p"); + if (argc) argc = parse_options(argc, argv, prefix, options, git_stash_push_usage, - PARSE_OPT_KEEP_DASHDASH); - } - - if (argc) { - if (!strcmp(argv[0], "--")) { - argc--; - argv++; - } else if (push_assumed && !force_assume) { - die("subcommand wasn't specified; 'push' can't be assumed due to unexpected token '%s'", - argv[0]); - } - } + 0); parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN, prefix, argv); - - if (pathspec_from_file) { - if (patch_mode) - die(_("--pathspec-from-file is incompatible with --patch")); - - if (ps.nr) - die(_("--pathspec-from-file is incompatible with pathspec arguments")); - - parse_pathspec_file(&ps, 0, - PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN, - prefix, pathspec_from_file, pathspec_file_nul); - } else if (pathspec_file_nul) { - die(_("--pathspec-file-nul requires --pathspec-from-file")); - } - return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode, include_untracked); } @@ -1584,6 +1538,7 @@ static int use_builtin_stash(void) int cmd_stash(int argc, const char **argv, const char *prefix) { + int i = -1; pid_t pid = getpid(); const char *index_file; struct argv_array args = ARGV_ARRAY_INIT; @@ -1616,7 +1571,7 @@ int cmd_stash(int argc, const char **argv, const char *prefix) (uintmax_t)pid); if (!argc) - return !!push_stash(0, NULL, prefix, 0); + return !!push_stash(0, NULL, prefix); else if (!strcmp(argv[0], "apply")) return !!apply_stash(argc, argv, prefix); else if (!strcmp(argv[0], "clear")) @@ -1636,15 +1591,45 @@ int cmd_stash(int argc, const char **argv, const char *prefix) else if (!strcmp(argv[0], "create")) return !!create_stash(argc, argv, prefix); else if (!strcmp(argv[0], "push")) - return !!push_stash(argc, argv, prefix, 0); + return !!push_stash(argc, argv, prefix); else if (!strcmp(argv[0], "save")) return !!save_stash(argc, argv, prefix); else if (*argv[0] != '-') usage_msg_opt(xstrfmt(_("unknown subcommand: %s"), argv[0]), git_stash_usage, options); - /* Assume 'stash push' */ + if (strcmp(argv[0], "-p")) { + while (++i < argc && strcmp(argv[i], "--")) { + /* + * `akpqu` is a string which contains all short options, + * except `-m` which is verified separately. + */ + if ((strlen(argv[i]) == 2) && *argv[i] == '-' && + strchr("akpqu", argv[i][1])) + continue; + + if (!strcmp(argv[i], "--all") || + !strcmp(argv[i], "--keep-index") || + !strcmp(argv[i], "--no-keep-index") || + !strcmp(argv[i], "--patch") || + !strcmp(argv[i], "--quiet") || + !strcmp(argv[i], "--include-untracked")) + continue; + + /* + * `-m` and `--message=` are verified separately because + * they need to be immediately followed by a string + * (i.e.`-m"foobar"` or `--message="foobar"`). + */ + if (starts_with(argv[i], "-m") || + starts_with(argv[i], "--message=")) + continue; + + usage_with_options(git_stash_usage, options); + } + } + argv_array_push(&args, "push"); argv_array_pushv(&args, argv); - return !!push_stash(args.argc, args.argv, prefix, 1); + return !!push_stash(args.argc, args.argv, prefix); } diff --git a/third_party/git/builtin/submodule--helper.c b/third_party/git/builtin/submodule--helper.c index 86a608eec1..909e77e802 100644 --- a/third_party/git/builtin/submodule--helper.c +++ b/third_party/git/builtin/submodule--helper.c @@ -19,8 +19,6 @@ #include "diffcore.h" #include "diff.h" #include "object-store.h" -#include "dir.h" -#include "advice.h" #define OPT_QUIET (1 << 0) #define OPT_CACHED (1 << 1) @@ -426,7 +424,7 @@ static int module_list(int argc, const char **argv, const char *prefix) const struct cache_entry *ce = list.entries[i]; if (ce_stage(ce)) - printf("%06o %s U\t", ce->ce_mode, oid_to_hex(&null_oid)); + printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1)); else printf("%06o %s %d\t", ce->ce_mode, oid_to_hex(&ce->oid), ce_stage(ce)); @@ -782,8 +780,6 @@ static void status_submodule(const char *path, const struct object_id *ce_oid, struct argv_array diff_files_args = ARGV_ARRAY_INIT; struct rev_info rev; int diff_files_result; - struct strbuf buf = STRBUF_INIT; - const char *git_dir; if (!submodule_from_path(the_repository, &null_oid, path)) die(_("no submodule mapping found in .gitmodules for path '%s'"), @@ -796,26 +792,17 @@ static void status_submodule(const char *path, const struct object_id *ce_oid, goto cleanup; } - strbuf_addf(&buf, "%s/.git", path); - git_dir = read_gitfile(buf.buf); - if (!git_dir) - git_dir = buf.buf; - - if (!is_submodule_active(the_repository, path) || - !is_git_directory(git_dir)) { + if (!is_submodule_active(the_repository, path)) { print_status(flags, '-', path, ce_oid, displaypath); - strbuf_release(&buf); goto cleanup; } - strbuf_release(&buf); argv_array_pushl(&diff_files_args, "diff-files", "--ignore-submodules=dirty", "--quiet", "--", path, NULL); git_config(git_diff_basic_config, NULL); - - repo_init_revisions(the_repository, &rev, NULL); + repo_init_revisions(the_repository, &rev, prefix); rev.abbrev = 0; diff_files_args.argc = setup_revisions(diff_files_args.argc, diff_files_args.argv, @@ -1235,7 +1222,7 @@ static int module_deinit(int argc, const char **argv, const char *prefix) static int clone_submodule(const char *path, const char *gitdir, const char *url, const char *depth, struct string_list *reference, int dissociate, - int quiet, int progress, int single_branch) + int quiet, int progress) { struct child_process cp = CHILD_PROCESS_INIT; @@ -1257,10 +1244,6 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url argv_array_push(&cp.args, "--dissociate"); if (gitdir && *gitdir) argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL); - if (single_branch >= 0) - argv_array_push(&cp.args, single_branch ? - "--single-branch" : - "--no-single-branch"); argv_array_push(&cp.args, "--"); argv_array_push(&cp.args, url); @@ -1285,13 +1268,6 @@ struct submodule_alternate_setup { #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \ SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL } -static const char alternate_error_advice[] = N_( -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -); - static int add_possible_reference_from_superproject( struct object_directory *odb, void *sas_cb) { @@ -1323,8 +1299,6 @@ static int add_possible_reference_from_superproject( } else { switch (sas->error_mode) { case SUBMODULE_ALTERNATE_ERROR_DIE: - if (advice_submodule_alternate_error_strategy_die) - advise(_(alternate_error_advice)); die(_("submodule '%s' cannot add alternate: %s"), sas->submodule_name, err.buf); case SUBMODULE_ALTERNATE_ERROR_INFO: @@ -1385,9 +1359,8 @@ static int module_clone(int argc, const char **argv, const char *prefix) char *p, *path = NULL, *sm_gitdir; struct strbuf sb = STRBUF_INIT; struct string_list reference = STRING_LIST_INIT_NODUP; - int dissociate = 0, require_init = 0; + int dissociate = 0; char *sm_alternate = NULL, *error_strategy = NULL; - int single_branch = -1; struct option module_clone_options[] = { OPT_STRING(0, "prefix", &prefix, @@ -1413,17 +1386,12 @@ static int module_clone(int argc, const char **argv, const char *prefix) OPT__QUIET(&quiet, "Suppress output for cloning a submodule"), OPT_BOOL(0, "progress", &progress, N_("force cloning progress")), - OPT_BOOL(0, "require-init", &require_init, - N_("disallow cloning into non-empty directory")), - OPT_BOOL(0, "single-branch", &single_branch, - N_("clone only one branch, HEAD or --branch")), OPT_END() }; const char *const git_submodule_helper_usage[] = { N_("git submodule--helper clone [--prefix=<path>] [--quiet] " "[--reference <repository>] [--name <name>] [--depth <depth>] " - "[--single-branch] " "--url <url> --path <path>"), NULL }; @@ -1445,10 +1413,6 @@ static int module_clone(int argc, const char **argv, const char *prefix) } else path = xstrdup(path); - if (validate_submodule_git_dir(sm_gitdir, name) < 0) - die(_("refusing to create/use '%s' in another submodule's " - "git dir"), sm_gitdir); - if (!file_exists(sm_gitdir)) { if (safe_create_leading_directories_const(sm_gitdir) < 0) die(_("could not create directory '%s'"), sm_gitdir); @@ -1456,12 +1420,10 @@ static int module_clone(int argc, const char **argv, const char *prefix) prepare_possible_alternates(name, &reference); if (clone_submodule(path, sm_gitdir, url, depth, &reference, dissociate, - quiet, progress, single_branch)) + quiet, progress)) die(_("clone of '%s' into submodule path '%s' failed"), url, path); } else { - if (require_init && !access(path, X_OK) && !is_empty_dir(path)) - die(_("directory not empty: '%s'"), path); if (safe_create_leading_directories_const(path) < 0) die(_("could not create directory '%s'"), path); strbuf_addf(&sb, "%s/index", sm_gitdir); @@ -1516,8 +1478,6 @@ static void determine_submodule_update_strategy(struct repository *r, die(_("Invalid update mode '%s' configured for submodule path '%s'"), val, path); } else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) { - if (sub->update_strategy.type == SM_UPDATE_COMMAND) - BUG("how did we read update = !command from .gitmodules?"); out->type = sub->update_strategy.type; out->command = sub->update_strategy.command; } else @@ -1576,11 +1536,9 @@ struct submodule_update_clone { int recommend_shallow; struct string_list references; int dissociate; - unsigned require_init; const char *depth; const char *recursive_prefix; const char *prefix; - int single_branch; /* to be consumed by git-submodule.sh */ struct update_clone_data *update_clone; @@ -1595,14 +1553,10 @@ struct submodule_update_clone { int max_jobs; }; -#define SUBMODULE_UPDATE_CLONE_INIT { \ - .list = MODULE_LIST_INIT, \ - .update = SUBMODULE_UPDATE_STRATEGY_INIT, \ - .recommend_shallow = -1, \ - .references = STRING_LIST_INIT_DUP, \ - .single_branch = -1, \ - .max_jobs = 1, \ -} +#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \ + SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \ + NULL, NULL, NULL, \ + NULL, 0, 0, 0, NULL, 0, 0, 1} static void next_submodule_warn_missing(struct submodule_update_clone *suc, @@ -1727,8 +1681,6 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL); if (suc->recommend_shallow && sub->recommend_shallow == 1) argv_array_push(&child->args, "--depth=1"); - if (suc->require_init) - argv_array_push(&child->args, "--require-init"); argv_array_pushl(&child->args, "--path", sub->path, NULL); argv_array_pushl(&child->args, "--name", sub->name, NULL); argv_array_pushl(&child->args, "--url", url, NULL); @@ -1741,10 +1693,6 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, argv_array_push(&child->args, "--dissociate"); if (suc->depth) argv_array_push(&child->args, suc->depth); - if (suc->single_branch >= 0) - argv_array_push(&child->args, suc->single_branch ? - "--single-branch" : - "--no-single-branch"); cleanup: strbuf_reset(&displaypath_sb); @@ -1922,15 +1870,11 @@ static int update_clone(int argc, const char **argv, const char *prefix) OPT__QUIET(&suc.quiet, N_("don't print cloning progress")), OPT_BOOL(0, "progress", &suc.progress, N_("force cloning progress")), - OPT_BOOL(0, "require-init", &suc.require_init, - N_("disallow cloning into non-empty directory")), - OPT_BOOL(0, "single-branch", &suc.single_branch, - N_("clone only one branch, HEAD or --branch")), OPT_END() }; const char *const git_submodule_helper_usage[] = { - N_("git submodule--helper update-clone [--prefix=<path>] [<path>...]"), + N_("git submodule--helper update_clone [--prefix=<path>] [<path>...]"), NULL }; suc.prefix = prefix; diff --git a/third_party/git/builtin/unpack-objects.c b/third_party/git/builtin/unpack-objects.c index dd4a75e030..a87a4bfd2c 100644 --- a/third_party/git/builtin/unpack-objects.c +++ b/third_party/git/builtin/unpack-objects.c @@ -24,7 +24,6 @@ static off_t consumed_bytes; static off_t max_input_size; static git_hash_ctx ctx; static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT; -static struct progress *progress; /* * When running under --strict mode, objects whose reachability are @@ -93,7 +92,6 @@ static void use(int bytes) consumed_bytes += bytes; if (max_input_size && consumed_bytes > max_input_size) die(_("pack exceeds maximum allowed size")); - display_throughput(progress, consumed_bytes); } static void *get_data(unsigned long size) @@ -265,8 +263,7 @@ static void write_object(unsigned nr, enum object_type type, } else { struct object *obj; int eaten; - hash_object_file(the_hash_algo, buf, size, type_name(type), - &obj_list[nr].oid); + hash_object_file(buf, size, type_name(type), &obj_list[nr].oid); added_object(nr, type, buf, size); obj = parse_object_buffer(the_repository, &obj_list[nr].oid, type, size, buf, @@ -487,6 +484,7 @@ static void unpack_one(unsigned nr) static void unpack_all(void) { int i; + struct progress *progress = NULL; struct pack_header *hdr = fill(sizeof(struct pack_header)); nr_objects = ntohl(hdr->hdr_entries); diff --git a/third_party/git/builtin/update-index.c b/third_party/git/builtin/update-index.c index d527b8f106..dff2f4b837 100644 --- a/third_party/git/builtin/update-index.c +++ b/third_party/git/builtin/update-index.c @@ -35,7 +35,6 @@ static int verbose; static int mark_valid_only; static int mark_skip_worktree_only; static int mark_fsmonitor_only; -static int ignore_skip_worktree_entries; #define MARK_FLAG 1 #define UNMARK_FLAG 2 static struct strbuf mtime_dir = STRBUF_INIT; @@ -382,8 +381,7 @@ static int process_path(const char *path, struct stat *st, int stat_errno) * so updating it does not make sense. * On the other hand, removing it from index should work */ - if (!ignore_skip_worktree_entries && allow_remove && - remove_file_from_cache(path)) + if (allow_remove && remove_file_from_cache(path)) return error("%s: cannot remove from the index", path); return 0; } @@ -968,7 +966,6 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) struct parse_opt_ctx_t ctx; strbuf_getline_fn getline_fn; int parseopt_state = PARSE_OPT_UNKNOWN; - struct repository *r = the_repository; struct option options[] = { OPT_BIT('q', NULL, &refresh_args.flags, N_("continue refresh even when index needs update"), @@ -1016,8 +1013,6 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) {OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL, N_("clear skip-worktree bit"), PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG}, - OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries, - N_("do not touch index-only entries")), OPT_SET_INT(0, "info-only", &info_only, N_("add to index only; do not add content to object database"), 1), OPT_SET_INT(0, "force-remove", &force_remove, @@ -1185,12 +1180,11 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) remove_split_index(&the_index); } - prepare_repo_settings(r); switch (untracked_cache) { case UC_UNSPECIFIED: break; case UC_DISABLE: - if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE) + if (git_config_get_untracked_cache() == 1) warning(_("core.untrackedCache is set to true; " "remove or change it, if you really want to " "disable the untracked cache")); @@ -1202,7 +1196,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) return !test_if_untracked_cache_is_supported(); case UC_ENABLE: case UC_FORCE: - if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) + if (git_config_get_untracked_cache() == 0) warning(_("core.untrackedCache is set to false; " "remove or change it, if you really want to " "enable the untracked cache")); diff --git a/third_party/git/builtin/worktree.c b/third_party/git/builtin/worktree.c index 24f22800f3..a5bb02b207 100644 --- a/third_party/git/builtin/worktree.c +++ b/third_party/git/builtin/worktree.c @@ -10,6 +10,7 @@ #include "run-command.h" #include "sigchain.h" #include "submodule.h" +#include "refs.h" #include "utf8.h" #include "worktree.h" @@ -234,7 +235,14 @@ static void validate_worktree_add(const char *path, const struct add_opts *opts) die(_("'%s' already exists"), path); worktrees = get_worktrees(0); - wt = find_worktree_by_path(worktrees, path); + /* + * find_worktree()'s suffix matching may undesirably find the main + * rather than a linked worktree (for instance, when the basenames + * of the main worktree and the one being created are the same). + * We're only interested in linked worktrees, so skip the main + * worktree with +1. + */ + wt = find_worktree(worktrees + 1, NULL, path); if (!wt) goto done; @@ -342,7 +350,7 @@ static int add_worktree(const char *path, const char *refname, */ strbuf_reset(&sb); strbuf_addf(&sb, "%s/HEAD", sb_repo.buf); - write_file(sb.buf, "%s", oid_to_hex(&null_oid)); + write_file(sb.buf, "%s", sha1_to_hex(null_sha1)); strbuf_reset(&sb); strbuf_addf(&sb, "%s/commondir", sb_repo.buf); write_file(sb.buf, "../.."); @@ -369,7 +377,7 @@ static int add_worktree(const char *path, const char *refname, if (opts->checkout) { cp.argv = NULL; argv_array_clear(&cp.args); - argv_array_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL); + argv_array_pushl(&cp.args, "reset", "--hard", NULL); if (opts->quiet) argv_array_push(&cp.args, "--quiet"); cp.env = child_env.argv; @@ -872,7 +880,7 @@ static void check_clean_worktree(struct worktree *wt, original_path); ret = xread(cp.out, buf, sizeof(buf)); if (ret) - die(_("'%s' contains modified or untracked files, use --force to delete it"), + die(_("'%s' is dirty, use --force to delete it"), original_path); close(cp.out); ret = finish_command(&cp); diff --git a/third_party/git/bulk-checkin.c b/third_party/git/bulk-checkin.c index 583aacb9e3..39ee7d6107 100644 --- a/third_party/git/bulk-checkin.c +++ b/third_party/git/bulk-checkin.c @@ -197,7 +197,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state, git_hash_ctx ctx; unsigned char obuf[16384]; unsigned header_len; - struct hashfile_checkpoint checkpoint = {0}; + struct hashfile_checkpoint checkpoint; struct pack_idx_entry *idx = NULL; seekback = lseek(fd, 0, SEEK_CUR); diff --git a/third_party/git/bundle.c b/third_party/git/bundle.c index 99439e07a1..b5d21cd80f 100644 --- a/third_party/git/bundle.c +++ b/third_party/git/bundle.c @@ -249,16 +249,15 @@ out: /* Write the pack data to bundle_fd */ -static int write_pack_data(int bundle_fd, struct rev_info *revs, struct argv_array *pack_options) +static int write_pack_data(int bundle_fd, struct rev_info *revs) { struct child_process pack_objects = CHILD_PROCESS_INIT; int i; argv_array_pushl(&pack_objects.args, - "pack-objects", + "pack-objects", "--all-progress-implied", "--stdout", "--thin", "--delta-base-offset", NULL); - argv_array_pushv(&pack_objects.args, pack_options->argv); pack_objects.in = -1; pack_objects.out = bundle_fd; pack_objects.git_cmd = 1; @@ -283,7 +282,7 @@ static int write_pack_data(int bundle_fd, struct rev_info *revs, struct argv_arr struct object *object = revs->pending.objects[i].item; if (object->flags & UNINTERESTING) write_or_die(pack_objects.in, "^", 1); - write_or_die(pack_objects.in, oid_to_hex(&object->oid), the_hash_algo->hexsz); + write_or_die(pack_objects.in, oid_to_hex(&object->oid), GIT_SHA1_HEXSZ); write_or_die(pack_objects.in, "\n", 1); } close(pack_objects.in); @@ -415,7 +414,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) } ref_count++; - write_or_die(bundle_fd, oid_to_hex(&e->item->oid), the_hash_algo->hexsz); + write_or_die(bundle_fd, oid_to_hex(&e->item->oid), 40); write_or_die(bundle_fd, " ", 1); write_or_die(bundle_fd, display_ref, strlen(display_ref)); write_or_die(bundle_fd, "\n", 1); @@ -429,7 +428,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs) } int create_bundle(struct repository *r, const char *path, - int argc, const char **argv, struct argv_array *pack_options) + int argc, const char **argv) { struct lock_file lock = LOCK_INIT; int bundle_fd = -1; @@ -471,7 +470,7 @@ int create_bundle(struct repository *r, const char *path, goto err; /* write pack */ - if (write_pack_data(bundle_fd, &revs, pack_options)) + if (write_pack_data(bundle_fd, &revs)) goto err; if (!bundle_to_stdout) { diff --git a/third_party/git/bundle.h b/third_party/git/bundle.h index ceab0c7475..37c37d7f65 100644 --- a/third_party/git/bundle.h +++ b/third_party/git/bundle.h @@ -1,7 +1,6 @@ #ifndef BUNDLE_H #define BUNDLE_H -#include "argv-array.h" #include "cache.h" struct ref_list { @@ -20,7 +19,7 @@ struct bundle_header { int is_bundle(const char *path, int quiet); int read_bundle_header(const char *path, struct bundle_header *header); int create_bundle(struct repository *r, const char *path, - int argc, const char **argv, struct argv_array *pack_options); + int argc, const char **argv); int verify_bundle(struct repository *r, struct bundle_header *header, int verbose); #define BUNDLE_VERBOSE 1 int unbundle(struct repository *r, struct bundle_header *header, diff --git a/third_party/git/cache-tree.c b/third_party/git/cache-tree.c index a537a806c1..706ffcf188 100644 --- a/third_party/git/cache-tree.c +++ b/third_party/git/cache-tree.c @@ -5,7 +5,6 @@ #include "cache-tree.h" #include "object-store.h" #include "replace-object.h" -#include "promisor-remote.h" #ifndef DEBUG_CACHE_TREE #define DEBUG_CACHE_TREE 0 @@ -358,7 +357,7 @@ static int update_one(struct cache_tree *it, } ce_missing_ok = mode == S_IFGITLINK || missing_ok || - (has_promisor_remote() && + (repository_format_partial_clone && ce_skip_worktree(ce)); if (is_null_oid(oid) || (!ce_missing_ok && !has_object_file(oid))) { @@ -407,15 +406,13 @@ static int update_one(struct cache_tree *it, if (repair) { struct object_id oid; - hash_object_file(the_hash_algo, buffer.buf, buffer.len, - tree_type, &oid); - if (has_object_file_with_flags(&oid, OBJECT_INFO_SKIP_FETCH_OBJECT)) + hash_object_file(buffer.buf, buffer.len, tree_type, &oid); + if (has_object_file(&oid)) oidcpy(&it->oid, &oid); else to_invalidate = 1; } else if (dryrun) { - hash_object_file(the_hash_algo, buffer.buf, buffer.len, - tree_type, &it->oid); + hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid); } else if (write_object_file(buffer.buf, buffer.len, tree_type, &it->oid)) { strbuf_release(&buffer); @@ -611,66 +608,11 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat return it; } -static int write_index_as_tree_internal(struct object_id *oid, - struct index_state *index_state, - int cache_tree_valid, - int flags, - const char *prefix) -{ - if (flags & WRITE_TREE_IGNORE_CACHE_TREE) { - cache_tree_free(&index_state->cache_tree); - cache_tree_valid = 0; - } - - if (!index_state->cache_tree) - index_state->cache_tree = cache_tree(); - - if (!cache_tree_valid && cache_tree_update(index_state, flags) < 0) - return WRITE_TREE_UNMERGED_INDEX; - - if (prefix) { - struct cache_tree *subtree; - subtree = cache_tree_find(index_state->cache_tree, prefix); - if (!subtree) - return WRITE_TREE_PREFIX_ERROR; - oidcpy(oid, &subtree->oid); - } - else - oidcpy(oid, &index_state->cache_tree->oid); - - return 0; -} - -struct tree* write_in_core_index_as_tree(struct repository *repo) { - struct object_id o; - int was_valid, ret; - - struct index_state *index_state = repo->index; - was_valid = index_state->cache_tree && - cache_tree_fully_valid(index_state->cache_tree); - - ret = write_index_as_tree_internal(&o, index_state, was_valid, 0, NULL); - if (ret == WRITE_TREE_UNMERGED_INDEX) { - int i; - fprintf(stderr, "BUG: There are unmerged index entries:\n"); - for (i = 0; i < index_state->cache_nr; i++) { - const struct cache_entry *ce = index_state->cache[i]; - if (ce_stage(ce)) - fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce), - (int)ce_namelen(ce), ce->name); - } - BUG("unmerged index entries when writing inmemory index"); - } - - return lookup_tree(repo, &index_state->cache_tree->oid); -} - - int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix) { int entries, was_valid; struct lock_file lock_file = LOCK_INIT; - int ret; + int ret = 0; hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR); @@ -679,14 +621,18 @@ int write_index_as_tree(struct object_id *oid, struct index_state *index_state, ret = WRITE_TREE_UNREADABLE_INDEX; goto out; } + if (flags & WRITE_TREE_IGNORE_CACHE_TREE) + cache_tree_free(&index_state->cache_tree); - was_valid = !(flags & WRITE_TREE_IGNORE_CACHE_TREE) && - index_state->cache_tree && - cache_tree_fully_valid(index_state->cache_tree); + if (!index_state->cache_tree) + index_state->cache_tree = cache_tree(); - ret = write_index_as_tree_internal(oid, index_state, was_valid, flags, - prefix); - if (!ret && !was_valid) { + was_valid = cache_tree_fully_valid(index_state->cache_tree); + if (!was_valid) { + if (cache_tree_update(index_state, flags) < 0) { + ret = WRITE_TREE_UNMERGED_INDEX; + goto out; + } write_locked_index(index_state, &lock_file, COMMIT_LOCK); /* Not being able to write is fine -- we are only interested * in updating the cache-tree part, and if the next caller @@ -696,6 +642,18 @@ int write_index_as_tree(struct object_id *oid, struct index_state *index_state, */ } + if (prefix) { + struct cache_tree *subtree; + subtree = cache_tree_find(index_state->cache_tree, prefix); + if (!subtree) { + ret = WRITE_TREE_PREFIX_ERROR; + goto out; + } + oidcpy(oid, &subtree->oid); + } + else + oidcpy(oid, &index_state->cache_tree->oid); + out: rollback_lock_file(&lock_file); return ret; @@ -755,7 +713,7 @@ static struct cache_tree *find_cache_tree_from_traversal(struct cache_tree *root if (!info->prev) return root; our_parent = find_cache_tree_from_traversal(root, info->prev); - return cache_tree_find(our_parent, info->name); + return cache_tree_find(our_parent, info->name.path); } int cache_tree_matches_traversal(struct cache_tree *root, @@ -828,10 +786,9 @@ static void verify_one(struct repository *r, i++; } strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0'); - strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz); + strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz); } - hash_object_file(r->hash_algo, tree_buf.buf, tree_buf.len, tree_type, - &new_oid); + hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid); if (!oideq(&new_oid, &it->oid)) BUG("cache-tree for path %.*s does not match. " "Expected %s got %s", len, path->buf, diff --git a/third_party/git/cache-tree.h b/third_party/git/cache-tree.h index 639bfa5340..757bbc48bc 100644 --- a/third_party/git/cache-tree.h +++ b/third_party/git/cache-tree.h @@ -34,7 +34,7 @@ int cache_tree_fully_valid(struct cache_tree *); int cache_tree_update(struct index_state *, int); void cache_tree_verify(struct repository *, struct index_state *); -/* bitmasks to write_index_as_tree flags */ +/* bitmasks to write_cache_as_tree flags */ #define WRITE_TREE_MISSING_OK 1 #define WRITE_TREE_IGNORE_CACHE_TREE 2 #define WRITE_TREE_DRY_RUN 4 @@ -46,7 +46,6 @@ void cache_tree_verify(struct repository *, struct index_state *); #define WRITE_TREE_UNMERGED_INDEX (-2) #define WRITE_TREE_PREFIX_ERROR (-3) -struct tree* write_in_core_index_as_tree(struct repository *repo); int write_index_as_tree(struct object_id *oid, struct index_state *index_state, const char *index_path, int flags, const char *prefix); void prime_cache_tree(struct repository *, struct index_state *, struct tree *); diff --git a/third_party/git/cache.h b/third_party/git/cache.h index 5c309b46c2..023e8af412 100644 --- a/third_party/git/cache.h +++ b/third_party/git/cache.h @@ -304,7 +304,6 @@ static inline unsigned int canon_mode(unsigned int mode) struct split_index; struct untracked_cache; -struct progress; struct index_state { struct cache_entry **cache; @@ -324,10 +323,9 @@ struct index_state { struct hashmap dir_hash; struct object_id oid; struct untracked_cache *untracked; - char *fsmonitor_last_update; + uint64_t fsmonitor_last_update; struct ewah_bitmap *fsmonitor_dirty; struct mem_pool *ce_mem_pool; - struct progress *progress; }; /* Name hashing */ @@ -416,7 +414,6 @@ extern struct index_state the_index; #define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags)) #define chmod_cache_entry(ce, flip) chmod_index_entry(&the_index, (ce), (flip)) #define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL) -#define refresh_and_write_cache(refresh_flags, write_flags, gentle) repo_refresh_and_write_index(the_repository, (refresh_flags), (write_flags), (gentle), NULL, NULL, NULL) #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options)) #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options)) #define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), (namelen)) @@ -634,46 +631,10 @@ int daemonize(void); #define alloc_nr(x) (((x)+16)*3/2) -/** - * Dynamically growing an array using realloc() is error prone and boring. - * - * Define your array with: - * - * - a pointer (`item`) that points at the array, initialized to `NULL` - * (although please name the variable based on its contents, not on its - * type); - * - * - an integer variable (`alloc`) that keeps track of how big the current - * allocation is, initialized to `0`; - * - * - another integer variable (`nr`) to keep track of how many elements the - * array currently has, initialized to `0`. - * - * Then before adding `n`th element to the item, call `ALLOC_GROW(item, n, - * alloc)`. This ensures that the array can hold at least `n` elements by - * calling `realloc(3)` and adjusting `alloc` variable. - * - * ------------ - * sometype *item; - * size_t nr; - * size_t alloc - * - * for (i = 0; i < nr; i++) - * if (we like item[i] already) - * return; - * - * // we did not like any existing one, so add one - * ALLOC_GROW(item, nr + 1, alloc); - * item[nr++] = value you like; - * ------------ - * - * You are responsible for updating the `nr` variable. - * - * If you need to specify the number of elements to allocate explicitly - * then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`. - * - * Consider using ALLOC_GROW_BY instead of ALLOC_GROW as it has some - * added niceties. +/* + * Realloc the buffer pointed at by variable 'x' so that it can hold + * at least 'nr' entries; the number of entries currently allocated + * is 'alloc', using the standard growing factor alloc_nr() macro. * * DO NOT USE any expression with side-effect for 'x', 'nr', or 'alloc'. */ @@ -688,25 +649,6 @@ int daemonize(void); } \ } while (0) -/* - * Similar to ALLOC_GROW but handles updating of the nr value and - * zeroing the bytes of the newly-grown array elements. - * - * DO NOT USE any expression with side-effect for any of the - * arguments. - */ -#define ALLOC_GROW_BY(x, nr, increase, alloc) \ - do { \ - if (increase) { \ - size_t new_nr = nr + (increase); \ - if (new_nr < nr) \ - BUG("negative growth in ALLOC_GROW_BY"); \ - ALLOC_GROW(x, new_nr, alloc); \ - memset((x) + nr, 0, sizeof(*(x)) * (increase)); \ - nr = new_nr; \ - } \ - } while (0) - /* Initialize and use the cache information */ struct lock_file; void preload_index(struct index_state *index, @@ -783,19 +725,6 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na */ int index_name_pos(const struct index_state *, const char *name, int namelen); -/* - * Some functions return the negative complement of an insert position when a - * precise match was not found but a position was found where the entry would - * need to be inserted. This helper protects that logic from any integer - * underflow. - */ -static inline int index_pos_to_insert_pos(uintmax_t pos) -{ - if (pos > INT_MAX) - die("overflow: -1 - %"PRIuMAX, pos); - return -1 - (int)pos; -} - #define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */ #define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */ #define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */ @@ -883,23 +812,6 @@ void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, st #define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */ #define REFRESH_PROGRESS 0x0040 /* show progress bar if stderr is tty */ int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg); -/* - * Refresh the index and write it to disk. - * - * 'refresh_flags' is passed directly to 'refresh_index()', while - * 'COMMIT_LOCK | write_flags' is passed to 'write_locked_index()', so - * the lockfile is always either committed or rolled back. - * - * If 'gentle' is passed, errors locking the index are ignored. - * - * Return 1 if refreshing the index returns an error, -1 if writing - * the index to disk fails, 0 on success. - * - * Note that if refreshing the index returns an error, we still write - * out the index (unless locking fails). - */ -int repo_refresh_and_write_index(struct repository*, unsigned int refresh_flags, unsigned int write_flags, int gentle, const struct pathspec *, char *seen, const char *header_msg); - struct cache_entry *refresh_cache_entry(struct index_state *, struct cache_entry *, unsigned int); void set_alternate_index_output(const char *); @@ -953,14 +865,12 @@ extern char *git_replace_ref_base; extern int fsync_object_files; extern int core_preload_index; +extern int core_apply_sparse_checkout; extern int precomposed_unicode; extern int protect_hfs; extern int protect_ntfs; extern const char *core_fsmonitor; -extern int core_apply_sparse_checkout; -extern int core_sparse_checkout_cone; - /* * Include broken refs in all ref iterations, which will * generally choke dangerous operations rather than letting @@ -1027,6 +937,8 @@ extern int grafts_replace_parents; #define GIT_REPO_VERSION 0 #define GIT_REPO_VERSION_READ 1 extern int repository_format_precious_objects; +extern char *repository_format_partial_clone; +extern const char *core_partial_clone_filter_default; extern int repository_format_worktree_config; /* @@ -1117,6 +1029,7 @@ const char *repo_find_unique_abbrev(struct repository *r, const struct object_id int repo_find_unique_abbrev_r(struct repository *r, char *hex, const struct object_id *oid, int len); #define find_unique_abbrev_r(hex, oid, len) repo_find_unique_abbrev_r(the_repository, hex, oid, len) +extern const unsigned char null_sha1[GIT_MAX_RAWSZ]; extern const struct object_id null_oid; static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2) @@ -1151,9 +1064,14 @@ static inline int oideq(const struct object_id *oid1, const struct object_id *oi return hasheq(oid1->hash, oid2->hash); } +static inline int is_null_sha1(const unsigned char *sha1) +{ + return hasheq(sha1, null_sha1); +} + static inline int is_null_oid(const struct object_id *oid) { - return oideq(oid, &null_oid); + return hasheq(oid->hash, null_sha1); } static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src) @@ -1363,8 +1281,7 @@ int git_open_cloexec(const char *name, int flags); int unpack_loose_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz); int parse_loose_header(const char *hdr, unsigned long *sizep); -int check_object_signature(struct repository *r, const struct object_id *oid, - void *buf, unsigned long size, const char *type); +int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type); int finalize_object_file(const char *tmpfile, const char *filename); @@ -1489,8 +1406,7 @@ int get_oid_hex(const char *hex, struct object_id *sha1); int hex_to_bytes(unsigned char *binary, const char *hex, size_t len); /* - * Convert a binary hash in "unsigned char []" or an object name in - * "struct object_id *" to its hex equivalent. The `_r` variant is reentrant, + * Convert a binary hash to its hex equivalent. The `_r` variant is reentrant, * and writes the NUL-terminated output to the buffer `out`, which must be at * least `GIT_MAX_HEXSZ + 1` bytes, and returns a pointer to out for * convenience. @@ -1498,12 +1414,13 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len); * The non-`_r` variant returns a static buffer, but uses a ring of 4 * buffers, making it safe to make multiple calls for a single statement, like: * - * printf("%s -> %s", hash_to_hex(one), hash_to_hex(two)); - * printf("%s -> %s", oid_to_hex(one), oid_to_hex(two)); + * printf("%s -> %s", sha1_to_hex(one), sha1_to_hex(two)); */ char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *); +char *sha1_to_hex_r(char *out, const unsigned char *sha1); char *oid_to_hex_r(char *out, const struct object_id *oid); char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *); /* static buffer result! */ +char *sha1_to_hex(const unsigned char *sha1); /* same static buffer */ char *hash_to_hex(const unsigned char *hash); /* same static buffer */ char *oid_to_hex(const struct object_id *oid); /* same static buffer */ @@ -1600,7 +1517,8 @@ struct date_mode { struct date_mode *date_mode_from_type(enum date_mode_type type); const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode); -void show_date_relative(timestamp_t time, struct strbuf *timebuf); +void show_date_relative(timestamp_t time, const struct timeval *now, + struct strbuf *timebuf); void show_date_human(timestamp_t time, int tz, const struct timeval *now, struct strbuf *timebuf); int parse_date(const char *date, struct strbuf *out); @@ -1609,7 +1527,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp); void datestamp(struct strbuf *out); #define approxidate(s) approxidate_careful((s), NULL) timestamp_t approxidate_careful(const char *, int *); -timestamp_t approxidate_relative(const char *date); +timestamp_t approxidate_relative(const char *date, const struct timeval *now); void parse_date_format(const char *format, struct date_mode *mode); int date_overflows(timestamp_t date); diff --git a/third_party/git/ci/install-dependencies.sh b/third_party/git/ci/install-dependencies.sh index 497fd32ca8..8cc72503cb 100755 --- a/third_party/git/ci/install-dependencies.sh +++ b/third_party/git/ci/install-dependencies.sh @@ -40,30 +40,20 @@ osx-clang|osx-gcc) test -z "$BREW_INSTALL_PACKAGES" || brew install $BREW_INSTALL_PACKAGES brew link --force gettext - brew cask install --no-quarantine perforce || { - # Update the definitions and try again - cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask && - git -C "$cask_repo" pull --no-stat && - brew cask install --no-quarantine perforce - } || brew install caskroom/cask/perforce case "$jobname" in osx-gcc) - brew install gcc@9 - # Just in case the image is updated to contain gcc@9 - # pre-installed but not linked. - brew link gcc@9 + brew link gcc@8 ;; esac ;; StaticAnalysis) sudo apt-get -q update - sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \ - libexpat-dev gettext + sudo apt-get -q -y install coccinelle ;; Documentation) sudo apt-get -q update - sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns + sudo apt-get -q -y install asciidoc xmlto test -n "$ALREADY_HAVE_ASCIIDOCTOR" || gem install --version 1.5.8 asciidoctor diff --git a/third_party/git/ci/lib.sh b/third_party/git/ci/lib.sh index a90d0dc0fd..44db2d5cbb 100755 --- a/third_party/git/ci/lib.sh +++ b/third_party/git/ci/lib.sh @@ -34,11 +34,6 @@ save_good_tree () { # successfully before (e.g. because the branch got rebased, changing only # the commit messages). skip_good_tree () { - if test "$TRAVIS_DEBUG_MODE" = true - then - return - fi - if ! good_tree_info="$(grep "^$(git rev-parse $CI_COMMIT^{tree}) " "$good_trees_file")" then # Haven't seen this tree yet, or no cached good trees file yet. @@ -131,6 +126,7 @@ then echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1" } + BREW_INSTALL_PACKAGES=gcc@8 export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save" export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml" MAKEFLAGS="$MAKEFLAGS --jobs=10" @@ -155,7 +151,7 @@ fi export DEVELOPER=1 export DEFAULT_TEST_TARGET=prove -export GIT_TEST_CLONE_2GB=true +export GIT_TEST_CLONE_2GB=YesPlease case "$jobname" in linux-clang|linux-gcc) @@ -164,7 +160,7 @@ linux-clang|linux-gcc) export CC=gcc-8 fi - export GIT_TEST_HTTPD=true + export GIT_TEST_HTTPD=YesPlease # The Linux build installs the defined dependency versions below. # The OS X build installs much more recent versions, whichever @@ -181,7 +177,7 @@ linux-clang|linux-gcc) osx-clang|osx-gcc) if [ "$jobname" = osx-gcc ] then - export CC=gcc-9 + export CC=gcc-8 fi # t9810 occasionally fails on Travis CI OS X diff --git a/third_party/git/ci/run-build-and-tests.sh b/third_party/git/ci/run-build-and-tests.sh index 4df54c4efe..ff0ef7f08e 100755 --- a/third_party/git/ci/run-build-and-tests.sh +++ b/third_party/git/ci/run-build-and-tests.sh @@ -20,7 +20,6 @@ linux-gcc) export GIT_TEST_OE_DELTA_SIZE=5 export GIT_TEST_COMMIT_GRAPH=1 export GIT_TEST_MULTI_PACK_INDEX=1 - export GIT_TEST_ADD_I_USE_BUILTIN=1 make test ;; linux-gcc-4.8) diff --git a/third_party/git/ci/run-static-analysis.sh b/third_party/git/ci/run-static-analysis.sh index 65bcebda41..a19aa7ebbc 100755 --- a/third_party/git/ci/run-static-analysis.sh +++ b/third_party/git/ci/run-static-analysis.sh @@ -26,7 +26,4 @@ then exit 1 fi -make hdr-check || -exit 1 - save_good_tree diff --git a/third_party/git/ci/test-documentation.sh b/third_party/git/ci/test-documentation.sh index de41888430..d49089832d 100755 --- a/third_party/git/ci/test-documentation.sh +++ b/third_party/git/ci/test-documentation.sh @@ -7,10 +7,7 @@ filter_log () { sed -e '/^GIT_VERSION = /d' \ - -e "/constant Gem::ConfigMap is deprecated/d" \ -e '/^ \* new asciidoc flags$/d' \ - -e '/stripped namespace before processing/d' \ - -e '/Attributed.*IDs for element/d' \ "$1" } diff --git a/third_party/git/color.c b/third_party/git/color.c index 64f52a4f93..ebb222ec33 100644 --- a/third_party/git/color.c +++ b/third_party/git/color.c @@ -24,14 +24,6 @@ const char *column_colors_ansi[] = { GIT_COLOR_RESET, }; -enum { - COLOR_BACKGROUND_OFFSET = 10, - COLOR_FOREGROUND_ANSI = 30, - COLOR_FOREGROUND_RGB = 38, - COLOR_FOREGROUND_256 = 38, - COLOR_FOREGROUND_BRIGHT_ANSI = 90, -}; - /* Ignore the RESET at the end when giving the size */ const int column_colors_ansi_max = ARRAY_SIZE(column_colors_ansi) - 1; @@ -69,38 +61,15 @@ static int get_hex_color(const char *in, unsigned char *out) return 0; } -/* - * If an ANSI color is recognized in "name", fill "out" and return 0. - * Otherwise, leave out unchanged and return -1. - */ -static int parse_ansi_color(struct color *out, const char *name, int len) +static int parse_color(struct color *out, const char *name, int len) { /* Positions in array must match ANSI color codes */ static const char * const color_names[] = { "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" }; - int i; - int color_offset = COLOR_FOREGROUND_ANSI; - - if (strncasecmp(name, "bright", 6) == 0) { - color_offset = COLOR_FOREGROUND_BRIGHT_ANSI; - name += 6; - len -= 6; - } - for (i = 0; i < ARRAY_SIZE(color_names); i++) { - if (match_word(name, len, color_names[i])) { - out->type = COLOR_ANSI; - out->value = i + color_offset; - return 0; - } - } - return -1; -} - -static int parse_color(struct color *out, const char *name, int len) -{ char *end; + int i; long val; /* First try the special word "normal"... */ @@ -120,8 +89,12 @@ static int parse_color(struct color *out, const char *name, int len) } /* Then pick from our human-readable color names... */ - if (parse_ansi_color(out, name, len) == 0) { - return 0; + for (i = 0; i < ARRAY_SIZE(color_names); i++) { + if (match_word(name, len, color_names[i])) { + out->type = COLOR_ANSI; + out->value = i; + return 0; + } } /* And finally try a literal 256-color-mode number */ @@ -136,15 +109,10 @@ static int parse_color(struct color *out, const char *name, int len) else if (val < 0) { out->type = COLOR_NORMAL; return 0; - /* Rewrite 0-7 as more-portable standard colors. */ + /* Rewrite low numbers as more-portable standard colors. */ } else if (val < 8) { out->type = COLOR_ANSI; - out->value = val + COLOR_FOREGROUND_ANSI; - return 0; - /* Rewrite 8-15 as more-portable aixterm colors. */ - } else if (val < 16) { - out->type = COLOR_ANSI; - out->value = val - 8 + COLOR_FOREGROUND_BRIGHT_ANSI; + out->value = val; return 0; } else if (val < 256) { out->type = COLOR_256; @@ -198,26 +166,23 @@ int color_parse(const char *value, char *dst) * already have the ANSI escape code in it. "out" should have enough * space in it to fit any color. */ -static char *color_output(char *out, int len, const struct color *c, int background) +static char *color_output(char *out, int len, const struct color *c, char type) { - int offset = 0; - - if (background) - offset = COLOR_BACKGROUND_OFFSET; switch (c->type) { case COLOR_UNSPECIFIED: case COLOR_NORMAL: break; case COLOR_ANSI: - out += xsnprintf(out, len, "%d", c->value + offset); + if (len < 2) + BUG("color parsing ran out of space"); + *out++ = type; + *out++ = '0' + c->value; break; case COLOR_256: - out += xsnprintf(out, len, "%d;5;%d", COLOR_FOREGROUND_256 + offset, - c->value); + out += xsnprintf(out, len, "%c8;5;%d", type, c->value); break; case COLOR_RGB: - out += xsnprintf(out, len, "%d;2;%d;%d;%d", - COLOR_FOREGROUND_RGB + offset, + out += xsnprintf(out, len, "%c8;2;%d;%d;%d", type, c->red, c->green, c->blue); break; } @@ -314,12 +279,14 @@ int color_parse_mem(const char *value, int value_len, char *dst) if (!color_empty(&fg)) { if (sep++) OUT(';'); - dst = color_output(dst, end - dst, &fg, 0); + /* foreground colors are all in the 3x range */ + dst = color_output(dst, end - dst, &fg, '3'); } if (!color_empty(&bg)) { if (sep++) OUT(';'); - dst = color_output(dst, end - dst, &bg, 1); + /* background colors are all in the 4x range */ + dst = color_output(dst, end - dst, &bg, '4'); } OUT('m'); } diff --git a/third_party/git/column.c b/third_party/git/column.c index 4a38eed322..7a17c14b82 100644 --- a/third_party/git/column.c +++ b/third_party/git/column.c @@ -23,7 +23,18 @@ struct column_data { /* return length of 's' in letters, ANSI escapes stripped */ static int item_length(const char *s) { - return utf8_strnwidth(s, -1, 1); + int len, i = 0; + struct strbuf str = STRBUF_INIT; + + strbuf_addstr(&str, s); + while ((s = strstr(str.buf + i, "\033[")) != NULL) { + int len = strspn(s + 2, "0123456789;"); + i = s - str.buf; + strbuf_remove(&str, i, len + 3); /* \033[<len><func char> */ + } + len = utf8_strwidth(str.buf); + strbuf_release(&str); + return len; } /* diff --git a/third_party/git/combine-diff.c b/third_party/git/combine-diff.c index d5c4d839dc..3e49f3bda8 100644 --- a/third_party/git/combine-diff.c +++ b/third_party/git/combine-diff.c @@ -930,7 +930,7 @@ static void show_combined_header(struct combine_diff_path *elem, int show_file_header) { struct diff_options *opt = &rev->diffopt; - int abbrev = opt->flags.full_index ? the_hash_algo->hexsz : DEFAULT_ABBREV; + int abbrev = opt->flags.full_index ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV; const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/"; const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/"; const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO); diff --git a/third_party/git/command-list.txt b/third_party/git/command-list.txt index 2087894655..a9ac72bef4 100644 --- a/third_party/git/command-list.txt +++ b/third_party/git/command-list.txt @@ -166,7 +166,6 @@ git-show-index plumbinginterrogators git-show-ref plumbinginterrogators git-sh-i18n purehelpers git-sh-setup purehelpers -git-sparse-checkout mainporcelain worktree git-stash mainporcelain git-stage complete git-status mainporcelain info @@ -204,7 +203,6 @@ gitmodules guide gitnamespaces guide gitrepository-layout guide gitrevisions guide -gitsubmodules guide gittutorial-2 guide gittutorial guide gitworkflows guide diff --git a/third_party/git/commit-graph.c b/third_party/git/commit-graph.c index f013a84e29..fe954ab5f8 100644 --- a/third_party/git/commit-graph.c +++ b/third_party/git/commit-graph.c @@ -41,24 +41,30 @@ #define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \ + GRAPH_FANOUT_SIZE + the_hash_algo->rawsz) -/* Remember to update object flag allocation in object.h */ -#define REACHABLE (1u<<15) - -char *get_commit_graph_filename(struct object_directory *odb) +char *get_commit_graph_filename(const char *obj_dir) { - return xstrfmt("%s/info/commit-graph", odb->path); + char *filename = xstrfmt("%s/info/commit-graph", obj_dir); + char *normalized = xmalloc(strlen(filename) + 1); + normalize_path_copy(normalized, filename); + free(filename); + return normalized; } -static char *get_split_graph_filename(struct object_directory *odb, +static char *get_split_graph_filename(const char *obj_dir, const char *oid_hex) { - return xstrfmt("%s/info/commit-graphs/graph-%s.graph", odb->path, - oid_hex); + char *filename = xstrfmt("%s/info/commit-graphs/graph-%s.graph", + obj_dir, + oid_hex); + char *normalized = xmalloc(strlen(filename) + 1); + normalize_path_copy(normalized, filename); + free(filename); + return normalized; } -static char *get_chain_filename(struct object_directory *odb) +static char *get_chain_filename(const char *obj_dir) { - return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path); + return xstrfmt("%s/info/commit-graphs/commit-graph-chain", obj_dir); } static uint8_t oid_version(void) @@ -108,8 +114,7 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st) return 1; } -struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st, - struct object_directory *odb) +struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st) { void *graph_map; size_t graph_size; @@ -125,9 +130,7 @@ struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st, graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0); ret = parse_commit_graph(graph_map, fd, graph_size); - if (ret) - ret->odb = odb; - else { + if (!ret) { munmap(graph_map, graph_size); close(fd); } @@ -302,8 +305,7 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, return graph; } -static struct commit_graph *load_commit_graph_one(const char *graph_file, - struct object_directory *odb) +static struct commit_graph *load_commit_graph_one(const char *graph_file) { struct stat st; @@ -314,7 +316,7 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file, if (!open_ok) return NULL; - g = load_commit_graph_one_fd_st(fd, &st, odb); + g = load_commit_graph_one_fd_st(fd, &st); if (g) g->filename = xstrdup(graph_file); @@ -322,13 +324,15 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file, return g; } -static struct commit_graph *load_commit_graph_v1(struct repository *r, - struct object_directory *odb) +static struct commit_graph *load_commit_graph_v1(struct repository *r, const char *obj_dir) { - char *graph_name = get_commit_graph_filename(odb); - struct commit_graph *g = load_commit_graph_one(graph_name, odb); + char *graph_name = get_commit_graph_filename(obj_dir); + struct commit_graph *g = load_commit_graph_one(graph_name); free(graph_name); + if (g) + g->obj_dir = obj_dir; + return g; } @@ -365,15 +369,14 @@ static int add_graph_to_chain(struct commit_graph *g, return 1; } -static struct commit_graph *load_commit_graph_chain(struct repository *r, - struct object_directory *odb) +static struct commit_graph *load_commit_graph_chain(struct repository *r, const char *obj_dir) { struct commit_graph *graph_chain = NULL; struct strbuf line = STRBUF_INIT; struct stat st; struct object_id *oids; int i = 0, valid = 1, count; - char *chain_name = get_chain_filename(odb); + char *chain_name = get_chain_filename(obj_dir); FILE *fp; int stat_res; @@ -406,12 +409,14 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, valid = 0; for (odb = r->objects->odb; odb; odb = odb->next) { - char *graph_name = get_split_graph_filename(odb, line.buf); - struct commit_graph *g = load_commit_graph_one(graph_name, odb); + char *graph_name = get_split_graph_filename(odb->path, line.buf); + struct commit_graph *g = load_commit_graph_one(graph_name); free(graph_name); if (g) { + g->obj_dir = odb->path; + if (add_graph_to_chain(g, graph_chain, oids, i)) { graph_chain = g; valid = 1; @@ -434,56 +439,47 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, return graph_chain; } -struct commit_graph *read_commit_graph_one(struct repository *r, - struct object_directory *odb) +struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir) { - struct commit_graph *g = load_commit_graph_v1(r, odb); + struct commit_graph *g = load_commit_graph_v1(r, obj_dir); if (!g) - g = load_commit_graph_chain(r, odb); + g = load_commit_graph_chain(r, obj_dir); return g; } -static void prepare_commit_graph_one(struct repository *r, - struct object_directory *odb) +static void prepare_commit_graph_one(struct repository *r, const char *obj_dir) { if (r->objects->commit_graph) return; - r->objects->commit_graph = read_commit_graph_one(r, odb); + r->objects->commit_graph = read_commit_graph_one(r, obj_dir); } /* * Return 1 if commit_graph is non-NULL, and 0 otherwise. * - * On the first invocation, this function attempts to load the commit + * On the first invocation, this function attemps to load the commit * graph if the_repository is configured to have one. */ static int prepare_commit_graph(struct repository *r) { struct object_directory *odb; - - /* - * This must come before the "already attempted?" check below, because - * we want to disable even an already-loaded graph file. - */ - if (r->commit_graph_disabled) - return 0; - - if (r->objects->commit_graph_attempted) - return !!r->objects->commit_graph; - r->objects->commit_graph_attempted = 1; + int config_value; if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0)) die("dying as requested by the '%s' variable on commit-graph load!", GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD); - prepare_repo_settings(r); + if (r->objects->commit_graph_attempted) + return !!r->objects->commit_graph; + r->objects->commit_graph_attempted = 1; if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) && - r->settings.core_commit_graph != 1) + (repo_config_get_bool(r, "core.commitgraph", &config_value) || + !config_value)) /* * This repository is not configured to use commit graphs, so * do not load one. (But report commit_graph_attempted anyway @@ -499,7 +495,7 @@ static int prepare_commit_graph(struct repository *r) for (odb = r->objects->odb; !r->objects->commit_graph && odb; odb = odb->next) - prepare_commit_graph_one(r, odb); + prepare_commit_graph_one(r, odb->path); return !!r->objects->commit_graph; } @@ -766,7 +762,7 @@ struct packed_oid_list { struct write_commit_graph_context { struct repository *r; - struct object_directory *odb; + char *obj_dir; char *graph_name; struct packed_oid_list oids; struct packed_commit_list commits; @@ -787,8 +783,7 @@ struct write_commit_graph_context { unsigned append:1, report_progress:1, - split:1, - check_oids:1; + split:1; const struct split_commit_graph_opts *split_opts; }; @@ -843,16 +838,12 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len, while (list < last) { struct commit_list *parent; - struct object_id *tree; int edge_value; uint32_t packedDate[2]; display_progress(ctx->progress, ++ctx->progress_cnt); - if (parse_commit_no_graph(*list)) - die(_("unable to parse commit %s"), - oid_to_hex(&(*list)->object.oid)); - tree = get_commit_tree_oid(*list); - hashwrite(f, tree->hash, hash_len); + parse_commit_no_graph(*list); + hashwrite(f, get_commit_tree_oid(*list)->hash, hash_len); parent = (*list)->parents; @@ -1024,11 +1015,11 @@ static void add_missing_parents(struct write_commit_graph_context *ctx, struct c { struct commit_list *parent; for (parent = commit->parents; parent; parent = parent->next) { - if (!(parent->item->object.flags & REACHABLE)) { + if (!(parent->item->object.flags & UNINTERESTING)) { ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc); oidcpy(&ctx->oids.list[ctx->oids.nr], &(parent->item->object.oid)); ctx->oids.nr++; - parent->item->object.flags |= REACHABLE; + parent->item->object.flags |= UNINTERESTING; } } } @@ -1046,7 +1037,7 @@ static void close_reachable(struct write_commit_graph_context *ctx) display_progress(ctx->progress, i + 1); commit = lookup_commit(ctx->r, &ctx->oids.list[i]); if (commit) - commit->object.flags |= REACHABLE; + commit->object.flags |= UNINTERESTING; } stop_progress(&ctx->progress); @@ -1058,7 +1049,7 @@ static void close_reachable(struct write_commit_graph_context *ctx) if (ctx->report_progress) ctx->progress = start_delayed_progress( _("Expanding reachable commits in commit graph"), - 0); + ctx->oids.nr); for (i = 0; i < ctx->oids.nr; i++) { display_progress(ctx->progress, i + 1); commit = lookup_commit(ctx->r, &ctx->oids.list[i]); @@ -1083,7 +1074,7 @@ static void close_reachable(struct write_commit_graph_context *ctx) commit = lookup_commit(ctx->r, &ctx->oids.list[i]); if (commit) - commit->object.flags &= ~REACHABLE; + commit->object.flags &= ~UNINTERESTING; } stop_progress(&ctx->progress); } @@ -1094,7 +1085,7 @@ static void compute_generation_numbers(struct write_commit_graph_context *ctx) struct commit_list *list = NULL; if (ctx->report_progress) - ctx->progress = start_delayed_progress( + ctx->progress = start_progress( _("Computing commit graph generation numbers"), ctx->commits.nr); for (i = 0; i < ctx->commits.nr; i++) { @@ -1143,15 +1134,14 @@ static int add_ref_to_list(const char *refname, return 0; } -int write_commit_graph_reachable(struct object_directory *odb, - enum commit_graph_write_flags flags, +int write_commit_graph_reachable(const char *obj_dir, unsigned int flags, const struct split_commit_graph_opts *split_opts) { struct string_list list = STRING_LIST_INIT_DUP; int result; for_each_ref(add_ref_to_list, &list); - result = write_commit_graph(odb, NULL, &list, + result = write_commit_graph(obj_dir, NULL, &list, flags, split_opts); string_list_clear(&list, 0); @@ -1166,7 +1156,7 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx, struct strbuf packname = STRBUF_INIT; int dirlen; - strbuf_addf(&packname, "%s/pack/", ctx->odb->path); + strbuf_addf(&packname, "%s/pack/", ctx->obj_dir); dirlen = packname.len; if (ctx->report_progress) { strbuf_addf(&progress_title, @@ -1203,8 +1193,8 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx, return 0; } -static int fill_oids_from_commit_hex(struct write_commit_graph_context *ctx, - struct string_list *commit_hex) +static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx, + struct string_list *commit_hex) { uint32_t i; struct strbuf progress_title = STRBUF_INIT; @@ -1225,21 +1215,20 @@ static int fill_oids_from_commit_hex(struct write_commit_graph_context *ctx, struct commit *result; display_progress(ctx->progress, i + 1); - if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) && - (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) { + if (commit_hex->items[i].string && + parse_oid_hex(commit_hex->items[i].string, &oid, &end)) + continue; + + result = lookup_commit_reference_gently(ctx->r, &oid, 1); + + if (result) { ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc); oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid)); ctx->oids.nr++; - } else if (ctx->check_oids) { - error(_("invalid commit object id: %s"), - commit_hex->items[i].string); - return -1; } } stop_progress(&ctx->progress); strbuf_release(&progress_title); - - return 0; } static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx) @@ -1287,6 +1276,7 @@ static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx) static void copy_oids_to_commits(struct write_commit_graph_context *ctx) { uint32_t i; + struct commit_list *parent; ctx->num_extra_edges = 0; if (ctx->report_progress) @@ -1294,8 +1284,7 @@ static void copy_oids_to_commits(struct write_commit_graph_context *ctx) _("Finding extra edges in commit graph"), ctx->oids.nr); for (i = 0; i < ctx->oids.nr; i++) { - unsigned int num_parents; - + int num_parents = 0; display_progress(ctx->progress, i + 1); if (i > 0 && oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i])) continue; @@ -1309,7 +1298,10 @@ static void copy_oids_to_commits(struct write_commit_graph_context *ctx) parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]); - num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents); + for (parent = ctx->commits.list[ctx->commits.nr]->parents; + parent; parent = parent->next) + num_parents++; + if (num_parents > 2) ctx->num_extra_edges += num_parents - 1; @@ -1362,10 +1354,10 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) strbuf_addf(&tmp_file, "%s/info/commit-graphs/tmp_graph_XXXXXX", - ctx->odb->path); + ctx->obj_dir); ctx->graph_name = strbuf_detach(&tmp_file, NULL); } else { - ctx->graph_name = get_commit_graph_filename(ctx->odb); + ctx->graph_name = get_commit_graph_filename(ctx->obj_dir); } if (safe_create_leading_directories(ctx->graph_name)) { @@ -1376,7 +1368,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) } if (ctx->split) { - char *lock_name = get_chain_filename(ctx->odb); + char *lock_name = get_chain_filename(ctx->obj_dir); hold_lock_file_for_update(&lk, lock_name, LOCK_DIE_ON_ERROR); @@ -1464,7 +1456,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) if (ctx->split && ctx->base_graph_name && ctx->num_commit_graphs_after > 1) { char *new_base_hash = xstrdup(oid_to_hex(&ctx->new_base_graph->oid)); - char *new_base_name = get_split_graph_filename(ctx->new_base_graph->odb, new_base_hash); + char *new_base_name = get_split_graph_filename(ctx->new_base_graph->obj_dir, new_base_hash); free(ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2]); free(ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2]); @@ -1500,12 +1492,12 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) } } } else { - char *graph_name = get_commit_graph_filename(ctx->odb); + char *graph_name = get_commit_graph_filename(ctx->obj_dir); unlink(graph_name); } ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(oid_to_hex(&file_hash)); - final_graph_name = get_split_graph_filename(ctx->odb, + final_graph_name = get_split_graph_filename(ctx->obj_dir, ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1]); ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 1] = final_graph_name; @@ -1527,8 +1519,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) { - struct commit_graph *g; - uint32_t num_commits; + struct commit_graph *g = ctx->r->objects->commit_graph; + uint32_t num_commits = ctx->commits.nr; uint32_t i; int max_commits = 0; @@ -1536,18 +1528,15 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) if (ctx->split_opts) { max_commits = ctx->split_opts->max_commits; - - if (ctx->split_opts->size_multiple) - size_mult = ctx->split_opts->size_multiple; + size_mult = ctx->split_opts->size_multiple; } g = ctx->r->objects->commit_graph; - num_commits = ctx->commits.nr; ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1; while (g && (g->num_commits <= size_mult * num_commits || (max_commits && num_commits > max_commits))) { - if (g->odb != ctx->odb) + if (strcmp(g->obj_dir, ctx->obj_dir)) break; num_commits += g->num_commits; @@ -1559,10 +1548,10 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) ctx->new_base_graph = g; if (ctx->num_commit_graphs_after == 2) { - char *old_graph_name = get_commit_graph_filename(g->odb); + char *old_graph_name = get_commit_graph_filename(g->obj_dir); if (!strcmp(g->filename, old_graph_name) && - g->odb != ctx->odb) { + strcmp(g->obj_dir, ctx->obj_dir)) { ctx->num_commit_graphs_after = 1; ctx->new_base_graph = NULL; } @@ -1624,7 +1613,8 @@ static int commit_compare(const void *_a, const void *_b) static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx) { - uint32_t i; + uint32_t i, num_parents; + struct commit_list *parent; if (ctx->report_progress) ctx->progress = start_delayed_progress( @@ -1642,9 +1632,10 @@ static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx) die(_("unexpected duplicate commit id %s"), oid_to_hex(&ctx->commits.list[i]->object.oid)); } else { - unsigned int num_parents; + num_parents = 0; + for (parent = ctx->commits.list[i]->parents; parent; parent = parent->next) + num_parents++; - num_parents = commit_list_count(ctx->commits.list[i]->parents); if (num_parents > 2) ctx->num_extra_edges += num_parents - 1; } @@ -1657,15 +1648,19 @@ static void merge_commit_graphs(struct write_commit_graph_context *ctx) { struct commit_graph *g = ctx->r->objects->commit_graph; uint32_t current_graph_number = ctx->num_commit_graphs_before; + struct strbuf progress_title = STRBUF_INIT; while (g && current_graph_number >= ctx->num_commit_graphs_after) { current_graph_number--; - if (ctx->report_progress) - ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0); + if (ctx->report_progress) { + strbuf_addstr(&progress_title, _("Merging commit-graph")); + ctx->progress = start_delayed_progress(progress_title.buf, 0); + } merge_commit_graph(ctx, g); stop_progress(&ctx->progress); + strbuf_release(&progress_title); g = g->base_graph; } @@ -1709,13 +1704,13 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx) if (ctx->split_opts && ctx->split_opts->expire_time) expire_time -= ctx->split_opts->expire_time; if (!ctx->split) { - char *chain_file_name = get_chain_filename(ctx->odb); + char *chain_file_name = get_chain_filename(ctx->obj_dir); unlink(chain_file_name); free(chain_file_name); ctx->num_commit_graphs_after = 0; } - strbuf_addstr(&path, ctx->odb->path); + strbuf_addstr(&path, ctx->obj_dir); strbuf_addstr(&path, "/info/commit-graphs"); dir = opendir(path.buf); @@ -1754,14 +1749,15 @@ out: strbuf_release(&path); } -int write_commit_graph(struct object_directory *odb, +int write_commit_graph(const char *obj_dir, struct string_list *pack_indexes, struct string_list *commit_hex, - enum commit_graph_write_flags flags, + unsigned int flags, const struct split_commit_graph_opts *split_opts) { struct write_commit_graph_context *ctx; uint32_t i, count_distinct = 0; + size_t len; int res = 0; if (!commit_graph_compatible(the_repository)) @@ -1769,11 +1765,17 @@ int write_commit_graph(struct object_directory *odb, ctx = xcalloc(1, sizeof(struct write_commit_graph_context)); ctx->r = the_repository; - ctx->odb = odb; - ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0; - ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0; - ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0; - ctx->check_oids = flags & COMMIT_GRAPH_WRITE_CHECK_OIDS ? 1 : 0; + + /* normalize object dir with no trailing slash */ + ctx->obj_dir = xmallocz(strlen(obj_dir) + 1); + normalize_path_copy(ctx->obj_dir, obj_dir); + len = strlen(ctx->obj_dir); + if (len && ctx->obj_dir[len - 1] == '/') + ctx->obj_dir[len - 1] = 0; + + ctx->append = flags & COMMIT_GRAPH_APPEND ? 1 : 0; + ctx->report_progress = flags & COMMIT_GRAPH_PROGRESS ? 1 : 0; + ctx->split = flags & COMMIT_GRAPH_SPLIT ? 1 : 0; ctx->split_opts = split_opts; if (ctx->split) { @@ -1806,7 +1808,7 @@ int write_commit_graph(struct object_directory *odb, ctx->oids.alloc = split_opts->max_commits; if (ctx->append) { - prepare_commit_graph_one(ctx->r, ctx->odb); + prepare_commit_graph_one(ctx->r, ctx->obj_dir); if (ctx->r->objects->commit_graph) ctx->oids.alloc += ctx->r->objects->commit_graph->num_commits; } @@ -1828,10 +1830,8 @@ int write_commit_graph(struct object_directory *odb, goto cleanup; } - if (commit_hex) { - if ((res = fill_oids_from_commit_hex(ctx, commit_hex))) - goto cleanup; - } + if (commit_hex) + fill_oids_from_commit_hex(ctx, commit_hex); if (!pack_indexes && !commit_hex) fill_oids_from_all_packs(ctx); @@ -1880,6 +1880,7 @@ cleanup: free(ctx->graph_name); free(ctx->commits.list); free(ctx->oids.list); + free(ctx->obj_dir); if (ctx->commit_graph_filenames_after) { for (i = 0; i < ctx->num_commit_graphs_after; i++) { @@ -1985,10 +1986,8 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) if (verify_commit_graph_error & ~VERIFY_COMMIT_GRAPH_ERROR_HASH) return verify_commit_graph_error; - if (flags & COMMIT_GRAPH_WRITE_PROGRESS) - progress = start_progress(_("Verifying commits in commit graph"), - g->num_commits); - + progress = start_progress(_("Verifying commits in commit graph"), + g->num_commits); for (i = 0; i < g->num_commits; i++) { struct commit *graph_commit, *odb_commit; struct commit_list *graph_parents, *odb_parents; @@ -2096,8 +2095,3 @@ void free_commit_graph(struct commit_graph *g) free(g->filename); free(g); } - -void disable_commit_graph(struct repository *r) -{ - r->commit_graph_disabled = 1; -} diff --git a/third_party/git/commit-graph.h b/third_party/git/commit-graph.h index e87a6f6360..df9a3b20e4 100644 --- a/third_party/git/commit-graph.h +++ b/third_party/git/commit-graph.h @@ -5,14 +5,13 @@ #include "repository.h" #include "string-list.h" #include "cache.h" -#include "object-store.h" #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH" #define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD" struct commit; -char *get_commit_graph_filename(struct object_directory *odb); +char *get_commit_graph_filename(const char *obj_dir); int open_commit_graph(const char *graph_file, int *fd, struct stat *st); /* @@ -49,7 +48,7 @@ struct commit_graph { uint32_t num_commits; struct object_id oid; char *filename; - struct object_directory *odb; + const char *obj_dir; uint32_t num_commits_in_base; struct commit_graph *base_graph; @@ -61,10 +60,8 @@ struct commit_graph { const unsigned char *chunk_base_graphs; }; -struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st, - struct object_directory *odb); -struct commit_graph *read_commit_graph_one(struct repository *r, - struct object_directory *odb); +struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st); +struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir); struct commit_graph *parse_commit_graph(void *graph_map, int fd, size_t graph_size); @@ -74,13 +71,9 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd, */ int generation_numbers_enabled(struct repository *r); -enum commit_graph_write_flags { - COMMIT_GRAPH_WRITE_APPEND = (1 << 0), - COMMIT_GRAPH_WRITE_PROGRESS = (1 << 1), - COMMIT_GRAPH_WRITE_SPLIT = (1 << 2), - /* Make sure that each OID in the input is a valid commit OID. */ - COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3) -}; +#define COMMIT_GRAPH_APPEND (1 << 0) +#define COMMIT_GRAPH_PROGRESS (1 << 1) +#define COMMIT_GRAPH_SPLIT (1 << 2) struct split_commit_graph_opts { int size_multiple; @@ -94,13 +87,12 @@ struct split_commit_graph_opts { * is not compatible with the commit-graph feature, then the * methods will return 0 without writing a commit-graph. */ -int write_commit_graph_reachable(struct object_directory *odb, - enum commit_graph_write_flags flags, +int write_commit_graph_reachable(const char *obj_dir, unsigned int flags, const struct split_commit_graph_opts *split_opts); -int write_commit_graph(struct object_directory *odb, +int write_commit_graph(const char *obj_dir, struct string_list *pack_indexes, struct string_list *commit_hex, - enum commit_graph_write_flags flags, + unsigned int flags, const struct split_commit_graph_opts *split_opts); #define COMMIT_GRAPH_VERIFY_SHALLOW (1 << 0) @@ -110,10 +102,4 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags) void close_commit_graph(struct raw_object_store *); void free_commit_graph(struct commit_graph *); -/* - * Disable further use of the commit graph in this process when parsing a - * "struct commit". - */ -void disable_commit_graph(struct repository *r); - #endif diff --git a/third_party/git/commit-reach.c b/third_party/git/commit-reach.c index 4ca7e706a1..3ea174788a 100644 --- a/third_party/git/commit-reach.c +++ b/third_party/git/commit-reach.c @@ -10,6 +10,7 @@ #include "commit-reach.h" /* Remember to update object flag allocation in object.h */ +#define REACHABLE (1u<<15) #define PARENT1 (1u<<16) #define PARENT2 (1u<<17) #define STALE (1u<<18) diff --git a/third_party/git/commit.c b/third_party/git/commit.c index a6cfa41a4e..a98de16e3d 100644 --- a/third_party/git/commit.c +++ b/third_party/git/commit.c @@ -19,7 +19,6 @@ #include "advice.h" #include "refs.h" #include "commit-reach.h" -#include "run-command.h" static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); @@ -359,15 +358,14 @@ struct tree *repo_get_commit_tree(struct repository *r, struct object_id *get_commit_tree_oid(const struct commit *commit) { - struct tree *tree = get_commit_tree(commit); - return tree ? &tree->object.oid : NULL; + return &get_commit_tree(commit)->object.oid; } void release_commit_memory(struct parsed_object_pool *pool, struct commit *c) { set_commit_tree(c, NULL); - free_commit_buffer(pool, c); c->index = 0; + free_commit_buffer(pool, c); free_commit_list(c->parents); c->object.parsed = 0; @@ -402,22 +400,10 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b struct commit_graft *graft; const int tree_entry_len = the_hash_algo->hexsz + 5; const int parent_entry_len = the_hash_algo->hexsz + 7; - struct tree *tree; if (item->object.parsed) return 0; - - if (item->parents) { - /* - * Presumably this is leftover from an earlier failed parse; - * clear it out in preparation for us re-parsing (we'll hit the - * same error, but that's good, since it lets our caller know - * the result cannot be trusted. - */ - free_commit_list(item->parents); - item->parents = NULL; - } - + item->object.parsed = 1; tail += size; if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) || bufptr[tree_entry_len] != '\n') @@ -425,12 +411,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b if (get_oid_hex(bufptr + 5, &parent) < 0) return error("bad tree pointer in commit %s", oid_to_hex(&item->object.oid)); - tree = lookup_tree(r, &parent); - if (!tree) - return error("bad tree pointer %s in commit %s", - oid_to_hex(&parent), - oid_to_hex(&item->object.oid)); - set_commit_tree(item, tree); + set_commit_tree(item, lookup_tree(r, &parent)); bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */ pptr = &item->parents; @@ -450,11 +431,8 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b if (graft && (graft->nr_parent < 0 || grafts_replace_parents)) continue; new_parent = lookup_commit(r, &parent); - if (!new_parent) - return error("bad parent %s in commit %s", - oid_to_hex(&parent), - oid_to_hex(&item->object.oid)); - pptr = &commit_list_insert(new_parent, pptr)->next; + if (new_parent) + pptr = &commit_list_insert(new_parent, pptr)->next; } if (graft) { int i; @@ -463,9 +441,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b new_parent = lookup_commit(r, &graft->parent[i]); if (!new_parent) - return error("bad graft parent %s in commit %s", - oid_to_hex(&graft->parent[i]), - oid_to_hex(&item->object.oid)); + continue; pptr = &commit_list_insert(new_parent, pptr)->next; } } @@ -474,7 +450,6 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b if (check_graph) load_commit_graph_info(r, item); - item->object.parsed = 1; return 0; } @@ -993,7 +968,7 @@ static int do_sign_commit(struct strbuf *buf, const char *keyid) strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len); inspos += gpg_sig_header_len; } - strbuf_insertstr(buf, inspos++, " "); + strbuf_insert(buf, inspos++, " ", 1); strbuf_insert(buf, inspos, bol, len); inspos += len; copypos += len; @@ -1136,23 +1111,21 @@ int check_commit_signature(const struct commit *commit, struct signature_check * return ret; } -void verify_merge_signature(struct commit *commit, int verbosity, - int check_trust) +void verify_merge_signature(struct commit *commit, int verbosity) { char hex[GIT_MAX_HEXSZ + 1]; struct signature_check signature_check; - int ret; memset(&signature_check, 0, sizeof(signature_check)); - ret = check_commit_signature(commit, &signature_check); + check_commit_signature(commit, &signature_check); find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV); switch (signature_check.result) { case 'G': - if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL)) - die(_("Commit %s has an untrusted GPG signature, " - "allegedly by %s."), hex, signature_check.signer); break; + case 'U': + die(_("Commit %s has an untrusted GPG signature, " + "allegedly by %s."), hex, signature_check.signer); case 'B': die(_("Commit %s has a bad GPG signature " "allegedly by %s."), hex, signature_check.signer); @@ -1607,26 +1580,3 @@ size_t ignore_non_trailer(const char *buf, size_t len) } return boc ? len - boc : len - cutoff; } - -int run_commit_hook(int editor_is_used, const char *index_file, - const char *name, ...) -{ - struct argv_array hook_env = ARGV_ARRAY_INIT; - va_list args; - int ret; - - argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file); - - /* - * Let the hook know that no editor will be launched. - */ - if (!editor_is_used) - argv_array_push(&hook_env, "GIT_EDITOR=:"); - - va_start(args, name); - ret = run_hook_ve(hook_env.argv,name, args); - va_end(args); - argv_array_clear(&hook_env); - - return ret; -} diff --git a/third_party/git/commit.h b/third_party/git/commit.h index 008a0fa4a0..f5295ca7f3 100644 --- a/third_party/git/commit.h +++ b/third_party/git/commit.h @@ -132,7 +132,7 @@ const void *repo_get_commit_buffer(struct repository *r, #endif /* - * Tell the commit subsystem that we are done with a particular commit buffer. + * Tell the commit subsytem that we are done with a particular commit buffer. * The commit and buffer should be the input and return value, respectively, * from an earlier call to get_commit_buffer. The buffer may or may not be * freed by this call; callers should not access the memory afterwards. @@ -383,18 +383,8 @@ int compare_commits_by_author_date(const void *a_, const void *b_, void *unused) * Verify a single commit with check_commit_signature() and die() if it is not * a good signature. This isn't really suitable for general use, but is a * helper to implement consistent logic for pull/merge --verify-signatures. - * - * The check_trust parameter is meant for backward-compatibility. The GPG - * interface verifies key trust with a default trust level that is below the - * default trust level for merge operations. Its value should be non-zero if - * the user hasn't set a minimum trust level explicitly in their configuration. - * - * If the user has set a minimum trust level, then that value should be obeyed - * and check_trust should be zero, even if the configured trust level is below - * the default trust level for merges. */ -void verify_merge_signature(struct commit *commit, int verbose, - int check_trust); +void verify_merge_signature(struct commit *commit, int verbose); int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused); int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused); diff --git a/third_party/git/common-main.c b/third_party/git/common-main.c index 71e21dd20a..582a7b1886 100644 --- a/third_party/git/common-main.c +++ b/third_party/git/common-main.c @@ -39,16 +39,16 @@ int main(int argc, const char **argv) git_resolve_executable_dir(argv[0]); + trace2_initialize(); + trace2_cmd_start(argv); + trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP); + git_setup_gettext(); initialize_the_repository(); attr_start(); - trace2_initialize(); - trace2_cmd_start(argv); - trace2_collect_process_info(TRACE2_PROCESS_INFO_STARTUP); - result = cmd_main(argc, argv); trace2_cmd_exit(result); diff --git a/third_party/git/compat/mingw.c b/third_party/git/compat/mingw.c index d14065d60e..738f0a826a 100644 --- a/third_party/git/compat/mingw.c +++ b/third_party/git/compat/mingw.c @@ -13,19 +13,6 @@ static const int delay[] = { 0, 1, 10, 20, 40 }; -void open_in_gdb(void) -{ - static struct child_process cp = CHILD_PROCESS_INIT; - extern char *_pgmptr; - - argv_array_pushl(&cp.args, "mintty", "gdb", NULL); - argv_array_pushf(&cp.args, "--pid=%d", getpid()); - cp.clean_on_exit = 1; - if (start_command(&cp) < 0) - die_errno("Could not start gdb"); - sleep(1); -} - int err_win_to_posix(DWORD winerr) { int error = ENOSYS; @@ -127,7 +114,6 @@ int err_win_to_posix(DWORD winerr) case ERROR_SHARING_BUFFER_EXCEEDED: error = ENFILE; break; case ERROR_SHARING_VIOLATION: error = EACCES; break; case ERROR_STACK_OVERFLOW: error = ENOMEM; break; - case ERROR_SUCCESS: BUG("err_win_to_posix() called without an error!"); case ERROR_SWAPERROR: error = ENOENT; break; case ERROR_TOO_MANY_MODULES: error = EMFILE; break; case ERROR_TOO_MANY_OPEN_FILES: error = EMFILE; break; @@ -226,7 +212,6 @@ enum hide_dotfiles_type { HIDE_DOTFILES_DOTGITONLY }; -static int core_restrict_inherited_handles = -1; static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY; static char *unset_environment_variables; @@ -246,15 +231,6 @@ int mingw_core_config(const char *var, const char *value, void *cb) return 0; } - if (!strcmp(var, "core.restrictinheritedhandles")) { - if (value && !strcasecmp(value, "auto")) - core_restrict_inherited_handles = -1; - else - core_restrict_inherited_handles = - git_config_bool(var, value); - return 0; - } - return 0; } @@ -387,8 +363,6 @@ static inline int needs_hiding(const char *path) /* ignore trailing slashes */ if (*path) basename = path; - else - break; } if (hide_dotfiles == HIDE_DOTFILES_TRUE) @@ -416,12 +390,6 @@ int mingw_mkdir(const char *path, int mode) { int ret; wchar_t wpath[MAX_PATH]; - - if (!is_valid_win32_path(path, 0)) { - errno = EINVAL; - return -1; - } - if (xutftowcs_path(wpath, path) < 0) return -1; ret = _wmkdir(wpath); @@ -495,7 +463,7 @@ int mingw_open (const char *filename, int oflags, ...) typedef int (*open_fn_t)(wchar_t const *wfilename, int oflags, ...); va_list args; unsigned mode; - int fd, create = (oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL); + int fd; wchar_t wfilename[MAX_PATH]; open_fn_t open_fn; @@ -503,21 +471,16 @@ int mingw_open (const char *filename, int oflags, ...) mode = va_arg(args, int); va_end(args); - if (!is_valid_win32_path(filename, !create)) { - errno = create ? EINVAL : ENOENT; - return -1; - } + if (filename && !strcmp(filename, "/dev/null")) + filename = "nul"; if ((oflags & O_APPEND) && !is_local_named_pipe_path(filename)) open_fn = mingw_open_append; else open_fn = _wopen; - if (filename && !strcmp(filename, "/dev/null")) - wcscpy(wfilename, L"nul"); - else if (xutftowcs_path(wfilename, filename) < 0) + if (xutftowcs_path(wfilename, filename) < 0) return -1; - fd = open_fn(wfilename, oflags, mode); if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) { @@ -575,17 +538,10 @@ FILE *mingw_fopen (const char *filename, const char *otype) FILE *file; wchar_t wfilename[MAX_PATH], wotype[4]; if (filename && !strcmp(filename, "/dev/null")) - wcscpy(wfilename, L"nul"); - else if (!is_valid_win32_path(filename, 1)) { - int create = otype && strchr(otype, 'w'); - errno = create ? EINVAL : ENOENT; - return NULL; - } else if (xutftowcs_path(wfilename, filename) < 0) - return NULL; - - if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0) + filename = "nul"; + if (xutftowcs_path(wfilename, filename) < 0 || + xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0) return NULL; - if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) { error("could not unhide %s", filename); return NULL; @@ -604,17 +560,10 @@ FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream) FILE *file; wchar_t wfilename[MAX_PATH], wotype[4]; if (filename && !strcmp(filename, "/dev/null")) - wcscpy(wfilename, L"nul"); - else if (!is_valid_win32_path(filename, 1)) { - int create = otype && strchr(otype, 'w'); - errno = create ? EINVAL : ENOENT; - return NULL; - } else if (xutftowcs_path(wfilename, filename) < 0) - return NULL; - - if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0) + filename = "nul"; + if (xutftowcs_path(wfilename, filename) < 0 || + xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0) return NULL; - if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) { error("could not unhide %s", filename); return NULL; @@ -1035,16 +984,16 @@ int pipe(int filedes[2]) struct tm *gmtime_r(const time_t *timep, struct tm *result) { - if (gmtime_s(result, timep) == 0) - return result; - return NULL; + /* gmtime() in MSVCRT.DLL is thread-safe, but not reentrant */ + memcpy(result, gmtime(timep), sizeof(struct tm)); + return result; } struct tm *localtime_r(const time_t *timep, struct tm *result) { - if (localtime_s(result, timep) == 0) - return result; - return NULL; + /* localtime() in MSVCRT.DLL is thread-safe, but not reentrant */ + memcpy(result, localtime(timep), sizeof(struct tm)); + return result; } char *mingw_getcwd(char *pointer, int len) @@ -1103,7 +1052,7 @@ static const char *quote_arg_msvc(const char *arg) p++; len++; } - if (*p == '"' || !*p) + if (*p == '"') n += count*2 + 1; continue; } @@ -1125,19 +1074,16 @@ static const char *quote_arg_msvc(const char *arg) count++; *d++ = *arg++; } - if (*arg == '"' || !*arg) { + if (*arg == '"') { while (count-- > 0) *d++ = '\\'; - /* don't escape the surrounding end quote */ - if (!*arg) - break; *d++ = '\\'; } } *d++ = *arg++; } *d++ = '"'; - *d++ = '\0'; + *d++ = 0; return q; } @@ -1150,14 +1096,13 @@ static const char *quote_arg_msys2(const char *arg) for (p = arg; *p; p++) { int ws = isspace(*p); - if (!ws && *p != '\\' && *p != '"' && *p != '{' && *p != '\'' && - *p != '?' && *p != '*' && *p != '~') + if (!ws && *p != '\\' && *p != '"' && *p != '{') continue; if (!buf.len) strbuf_addch(&buf, '"'); if (p != p2) strbuf_add(&buf, p2, p - p2); - if (*p == '\\' || *p == '"') + if (!ws && *p != '{') strbuf_addch(&buf, '\\'); p2 = p; } @@ -1167,7 +1112,7 @@ static const char *quote_arg_msys2(const char *arg) else if (!buf.len) return arg; else - strbuf_add(&buf, p2, p - p2); + strbuf_add(&buf, p2, p - p2), strbuf_addch(&buf, '"'); return strbuf_detach(&buf, 0); @@ -1216,21 +1161,14 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd, int isexe, int exe_only) { char path[MAX_PATH]; - wchar_t wpath[MAX_PATH]; snprintf(path, sizeof(path), "%.*s\\%s.exe", dirlen, dir, cmd); - if (xutftowcs_path(wpath, path) < 0) - return NULL; - - if (!isexe && _waccess(wpath, F_OK) == 0) + if (!isexe && access(path, F_OK) == 0) return xstrdup(path); - wpath[wcslen(wpath)-4] = '\0'; - if ((!exe_only || isexe) && _waccess(wpath, F_OK) == 0) { - if (!(GetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY)) { - path[strlen(path)-4] = '\0'; + path[strlen(path)-4] = '\0'; + if ((!exe_only || isexe) && access(path, F_OK) == 0) + if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY)) return xstrdup(path); - } - } return NULL; } @@ -1245,7 +1183,7 @@ static char *path_lookup(const char *cmd, int exe_only) int len = strlen(cmd); int isexe = len >= 4 && !strcasecmp(cmd+len-4, ".exe"); - if (strpbrk(cmd, "/\\")) + if (strchr(cmd, '/') || strchr(cmd, '\\')) return xstrdup(cmd); path = mingw_getenv("PATH"); @@ -1291,6 +1229,11 @@ static int wenvcmp(const void *a, const void *b) return _wcsnicmp(p, q, p_len); } +/* We need a stable sort to convert the environment between UTF-16 <-> UTF-8 */ +#ifndef INTERNAL_QSORT +#include "qsort.c" +#endif + /* * Build an environment block combining the inherited environment * merged with the given list of settings. @@ -1322,15 +1265,15 @@ static wchar_t *make_environment_block(char **deltaenv) } ALLOC_ARRAY(result, size); - COPY_ARRAY(result, wenv, size); + memcpy(result, wenv, size * sizeof(*wenv)); FreeEnvironmentStringsW(wenv); return result; } /* * If there is a deltaenv, let's accumulate all keys into `array`, - * sort them using the stable git_stable_qsort() and then copy, - * skipping duplicate keys + * sort them using the stable git_qsort() and then copy, skipping + * duplicate keys */ for (p = wenv; p && *p; ) { ALLOC_GROW(array, nr + 1, alloc); @@ -1353,7 +1296,7 @@ static wchar_t *make_environment_block(char **deltaenv) p += wlen + 1; } - git_stable_qsort(array, nr, sizeof(*array), wenvcmp); + git_qsort(array, nr, sizeof(*array), wenvcmp); ALLOC_ARRAY(result, size + delta_size); for (p = result, i = 0; i < nr; i++) { @@ -1366,7 +1309,7 @@ static wchar_t *make_environment_block(char **deltaenv) continue; size = wcslen(array[i]) + 1; - COPY_ARRAY(p, array[i], size); + memcpy(p, array[i], size * sizeof(*p)); p += size; } *p = L'\0'; @@ -1424,10 +1367,7 @@ static inline int match_last_path_component(const char *path, size_t *len, static int is_msys2_sh(const char *cmd) { - if (!cmd) - return 0; - - if (!strcmp(cmd, "sh")) { + if (cmd && !strcmp(cmd, "sh")) { static int ret = -1; char *p; @@ -1447,16 +1387,6 @@ static int is_msys2_sh(const char *cmd) } return ret; } - - if (ends_with(cmd, "\\sh.exe")) { - static char *sh; - - if (!sh) - sh = path_lookup("sh", 0); - - return !fspathcmp(cmd, sh); - } - return 0; } @@ -1464,34 +1394,15 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen const char *dir, int prepend_cmd, int fhin, int fhout, int fherr) { - static int restrict_handle_inheritance = -1; - STARTUPINFOEXW si; + STARTUPINFOW si; PROCESS_INFORMATION pi; - LPPROC_THREAD_ATTRIBUTE_LIST attr_list = NULL; - HANDLE stdhandles[3]; - DWORD stdhandles_count = 0; - SIZE_T size; struct strbuf args; wchar_t wcmd[MAX_PATH], wdir[MAX_PATH], *wargs, *wenvblk = NULL; unsigned flags = CREATE_UNICODE_ENVIRONMENT; BOOL ret; HANDLE cons; const char *(*quote_arg)(const char *arg) = - is_msys2_sh(cmd ? cmd : *argv) ? - quote_arg_msys2 : quote_arg_msvc; - - /* Make sure to override previous errors, if any */ - errno = 0; - - if (restrict_handle_inheritance < 0) - restrict_handle_inheritance = core_restrict_inherited_handles; - /* - * The following code to restrict which handles are inherited seems - * to work properly only on Windows 7 and later, so let's disable it - * on Windows Vista and 2008. - */ - if (restrict_handle_inheritance < 0) - restrict_handle_inheritance = GetVersion() >> 16 >= 7601; + is_msys2_sh(*argv) ? quote_arg_msys2 : quote_arg_msvc; do_unset_environment_variables(); @@ -1520,23 +1431,11 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen CloseHandle(cons); } memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si); - si.StartupInfo.hStdInput = winansi_get_osfhandle(fhin); - si.StartupInfo.hStdOutput = winansi_get_osfhandle(fhout); - si.StartupInfo.hStdError = winansi_get_osfhandle(fherr); - - /* The list of handles cannot contain duplicates */ - if (si.StartupInfo.hStdInput != INVALID_HANDLE_VALUE) - stdhandles[stdhandles_count++] = si.StartupInfo.hStdInput; - if (si.StartupInfo.hStdOutput != INVALID_HANDLE_VALUE && - si.StartupInfo.hStdOutput != si.StartupInfo.hStdInput) - stdhandles[stdhandles_count++] = si.StartupInfo.hStdOutput; - if (si.StartupInfo.hStdError != INVALID_HANDLE_VALUE && - si.StartupInfo.hStdError != si.StartupInfo.hStdInput && - si.StartupInfo.hStdError != si.StartupInfo.hStdOutput) - stdhandles[stdhandles_count++] = si.StartupInfo.hStdError; - if (stdhandles_count) - si.StartupInfo.dwFlags |= STARTF_USESTDHANDLES; + si.cb = sizeof(si); + si.dwFlags = STARTF_USESTDHANDLES; + si.hStdInput = winansi_get_osfhandle(fhin); + si.hStdOutput = winansi_get_osfhandle(fhout); + si.hStdError = winansi_get_osfhandle(fherr); if (*argv && !strcmp(cmd, *argv)) wcmd[0] = L'\0'; @@ -1569,98 +1468,16 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen wenvblk = make_environment_block(deltaenv); memset(&pi, 0, sizeof(pi)); - if (restrict_handle_inheritance && stdhandles_count && - (InitializeProcThreadAttributeList(NULL, 1, 0, &size) || - GetLastError() == ERROR_INSUFFICIENT_BUFFER) && - (attr_list = (LPPROC_THREAD_ATTRIBUTE_LIST) - (HeapAlloc(GetProcessHeap(), 0, size))) && - InitializeProcThreadAttributeList(attr_list, 1, 0, &size) && - UpdateProcThreadAttribute(attr_list, 0, - PROC_THREAD_ATTRIBUTE_HANDLE_LIST, - stdhandles, - stdhandles_count * sizeof(HANDLE), - NULL, NULL)) { - si.lpAttributeList = attr_list; - flags |= EXTENDED_STARTUPINFO_PRESENT; - } - - ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, - stdhandles_count ? TRUE : FALSE, - flags, wenvblk, dir ? wdir : NULL, - &si.StartupInfo, &pi); - - /* - * On Windows 2008 R2, it seems that specifying certain types of handles - * (such as FILE_TYPE_CHAR or FILE_TYPE_PIPE) will always produce an - * error. Rather than playing finicky and fragile games, let's just try - * to detect this situation and simply try again without restricting any - * handle inheritance. This is still better than failing to create - * processes. - */ - if (!ret && restrict_handle_inheritance && stdhandles_count) { - DWORD err = GetLastError(); - struct strbuf buf = STRBUF_INIT; - - if (err != ERROR_NO_SYSTEM_RESOURCES && - /* - * On Windows 7 and earlier, handles on pipes and character - * devices are inherited automatically, and cannot be - * specified in the thread handle list. Rather than trying - * to catch each and every corner case (and running the - * chance of *still* forgetting a few), let's just fall - * back to creating the process without trying to limit the - * handle inheritance. - */ - !(err == ERROR_INVALID_PARAMETER && - GetVersion() >> 16 < 9200) && - !getenv("SUPPRESS_HANDLE_INHERITANCE_WARNING")) { - DWORD fl = 0; - int i; - - setenv("SUPPRESS_HANDLE_INHERITANCE_WARNING", "1", 1); - - for (i = 0; i < stdhandles_count; i++) { - HANDLE h = stdhandles[i]; - strbuf_addf(&buf, "handle #%d: %p (type %lx, " - "handle info (%d) %lx\n", i, h, - GetFileType(h), - GetHandleInformation(h, &fl), - fl); - } - strbuf_addstr(&buf, "\nThis is a bug; please report it " - "at\nhttps://github.com/git-for-windows/" - "git/issues/new\n\n" - "To suppress this warning, please set " - "the environment variable\n\n" - "\tSUPPRESS_HANDLE_INHERITANCE_WARNING=1" - "\n"); - } - restrict_handle_inheritance = 0; - flags &= ~EXTENDED_STARTUPINFO_PRESENT; - ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, - TRUE, flags, wenvblk, dir ? wdir : NULL, - &si.StartupInfo, &pi); - if (!ret) - errno = err_win_to_posix(GetLastError()); - if (ret && buf.len) { - warning("failed to restrict file handles (%ld)\n\n%s", - err, buf.buf); - } - strbuf_release(&buf); - } else if (!ret) - errno = err_win_to_posix(GetLastError()); - - if (si.lpAttributeList) - DeleteProcThreadAttributeList(si.lpAttributeList); - if (attr_list) - HeapFree(GetProcessHeap(), 0, attr_list); + ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE, + flags, wenvblk, dir ? wdir : NULL, &si, &pi); free(wenvblk); free(wargs); - if (!ret) + if (!ret) { + errno = ENOENT; return -1; - + } CloseHandle(pi.hThread); /* @@ -1745,7 +1562,7 @@ static int try_shell_exec(const char *cmd, char *const *argv) while (argv[argc]) argc++; ALLOC_ARRAY(argv2, argc + 1); argv2[0] = (char *)cmd; /* full path to the script file */ - COPY_ARRAY(&argv2[1], &argv[1], argc); + memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc); exec_id = trace2_exec(prog, argv2); pid = mingw_spawnv(prog, argv2, 1); if (pid >= 0) { @@ -1846,8 +1663,6 @@ char *mingw_getenv(const char *name) if (!w_key) die("Out of memory, (tried to allocate %u wchar_t's)", len_key); xutftowcs(w_key, name, len_key); - /* GetEnvironmentVariableW() only sets the last error upon failure */ - SetLastError(ERROR_SUCCESS); len_value = GetEnvironmentVariableW(w_key, w_value, ARRAY_SIZE(w_value)); if (!len_value && GetLastError() == ERROR_ENVVAR_NOT_FOUND) { free(w_key); @@ -2546,128 +2361,6 @@ static void setup_windows_environment(void) } } -int is_valid_win32_path(const char *path, int allow_literal_nul) -{ - const char *p = path; - int preceding_space_or_period = 0, i = 0, periods = 0; - - if (!protect_ntfs) - return 1; - - skip_dos_drive_prefix((char **)&path); - goto segment_start; - - for (;;) { - char c = *(path++); - switch (c) { - case '\0': - case '/': case '\\': - /* cannot end in ` ` or `.`, except for `.` and `..` */ - if (preceding_space_or_period && - (i != periods || periods > 2)) - return 0; - if (!c) - return 1; - - i = periods = preceding_space_or_period = 0; - -segment_start: - switch (*path) { - case 'a': case 'A': /* AUX */ - if (((c = path[++i]) != 'u' && c != 'U') || - ((c = path[++i]) != 'x' && c != 'X')) { -not_a_reserved_name: - path += i; - continue; - } - break; - case 'c': case 'C': /* COM<N>, CON, CONIN$, CONOUT$ */ - if ((c = path[++i]) != 'o' && c != 'O') - goto not_a_reserved_name; - c = path[++i]; - if (c == 'm' || c == 'M') { /* COM<N> */ - if (!isdigit(path[++i])) - goto not_a_reserved_name; - } else if (c == 'n' || c == 'N') { /* CON */ - c = path[i + 1]; - if ((c == 'i' || c == 'I') && - ((c = path[i + 2]) == 'n' || - c == 'N') && - path[i + 3] == '$') - i += 3; /* CONIN$ */ - else if ((c == 'o' || c == 'O') && - ((c = path[i + 2]) == 'u' || - c == 'U') && - ((c = path[i + 3]) == 't' || - c == 'T') && - path[i + 4] == '$') - i += 4; /* CONOUT$ */ - } else - goto not_a_reserved_name; - break; - case 'l': case 'L': /* LPT<N> */ - if (((c = path[++i]) != 'p' && c != 'P') || - ((c = path[++i]) != 't' && c != 'T') || - !isdigit(path[++i])) - goto not_a_reserved_name; - break; - case 'n': case 'N': /* NUL */ - if (((c = path[++i]) != 'u' && c != 'U') || - ((c = path[++i]) != 'l' && c != 'L') || - (allow_literal_nul && - !path[i + 1] && p == path)) - goto not_a_reserved_name; - break; - case 'p': case 'P': /* PRN */ - if (((c = path[++i]) != 'r' && c != 'R') || - ((c = path[++i]) != 'n' && c != 'N')) - goto not_a_reserved_name; - break; - default: - continue; - } - - /* - * So far, this looks like a reserved name. Let's see - * whether it actually is one: trailing spaces, a file - * extension, or an NTFS Alternate Data Stream do not - * matter, the name is still reserved if any of those - * follow immediately after the actual name. - */ - i++; - if (path[i] == ' ') { - preceding_space_or_period = 1; - while (path[++i] == ' ') - ; /* skip all spaces */ - } - - c = path[i]; - if (c && c != '.' && c != ':' && c != '/' && c != '\\') - goto not_a_reserved_name; - - /* contains reserved name */ - return 0; - case '.': - periods++; - /* fallthru */ - case ' ': - preceding_space_or_period = 1; - i++; - continue; - case ':': /* DOS drive prefix was already skipped */ - case '<': case '>': case '"': case '|': case '?': case '*': - /* illegal character */ - return 0; - default: - if (c > '\0' && c < '\x20') - /* illegal character */ - return 0; - } - preceding_space_or_period = 0; - i++; - } -} - #if !defined(_MSC_VER) /* * Disable MSVCRT command line wildcard expansion (__getmainargs called from diff --git a/third_party/git/compat/mingw.h b/third_party/git/compat/mingw.h index e6fe810ba9..a03e40e6e2 100644 --- a/third_party/git/compat/mingw.h +++ b/third_party/git/compat/mingw.h @@ -11,7 +11,7 @@ typedef _sigset_t sigset_t; #undef _POSIX_THREAD_SAFE_FUNCTIONS #endif -int mingw_core_config(const char *var, const char *value, void *cb); +extern int mingw_core_config(const char *var, const char *value, void *cb); #define platform_core_config mingw_core_config /* @@ -443,7 +443,7 @@ static inline void convert_slashes(char *path) *path = '/'; } #define PATH_SEP ';' -char *mingw_query_user_email(void); +extern char *mingw_query_user_email(void); #define query_user_email mingw_query_user_email #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800) #define PRIuMAX "I64u" @@ -453,27 +453,6 @@ char *mingw_query_user_email(void); #endif /** - * Verifies that the given path is a valid one on Windows. - * - * In particular, path segments are disallowed which - * - * - end in a period or a space (except the special directories `.` and `..`). - * - * - contain any of the reserved characters, e.g. `:`, `;`, `*`, etc - * - * - correspond to reserved names (such as `AUX`, `PRN`, etc) - * - * The `allow_literal_nul` parameter controls whether the path `NUL` should - * be considered valid (this makes sense e.g. before opening files, as it is - * perfectly legitimate to open `NUL` on Windows, just as it is to open - * `/dev/null` on Unix/Linux). - * - * Returns 1 upon success, otherwise 0. - */ -int is_valid_win32_path(const char *path, int allow_literal_nul); -#define is_valid_path(path) is_valid_win32_path(path, 0) - -/** * Converts UTF-8 encoded string to UTF-16LE. * * To support repositories with legacy-encoded file names, invalid UTF-8 bytes @@ -579,7 +558,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen); /* * A critical section used in the implementation of the spawn - * functions (mingw_spawnv[p]e()) and waitpid(). Initialised in + * functions (mingw_spawnv[p]e()) and waitpid(). Intialised in * the replacement main() macro below. */ extern CRITICAL_SECTION pinfo_cs; @@ -599,16 +578,6 @@ int wmain(int argc, const wchar_t **w_argv); int main(int argc, const char **argv); /* - * For debugging: if a problem occurs, say, in a Git process that is spawned - * from another Git process which in turn is spawned from yet another Git - * process, it can be quite daunting to figure out what is going on. - * - * Call this function to open a new MinTTY (this assumes you are in Git for - * Windows' SDK) with a GDB that attaches to the current process right away. - */ -extern void open_in_gdb(void); - -/* * Used by Pthread API implementation for Windows */ -int err_win_to_posix(DWORD winerr); +extern int err_win_to_posix(DWORD winerr); diff --git a/third_party/git/compat/nedmalloc/malloc.c.h b/third_party/git/compat/nedmalloc/malloc.c.h index 814845d4b3..b833ff9225 100644 --- a/third_party/git/compat/nedmalloc/malloc.c.h +++ b/third_party/git/compat/nedmalloc/malloc.c.h @@ -1564,7 +1564,7 @@ static FORCEINLINE void* win32direct_mmap(size_t size) { return (ptr != 0)? ptr: MFAIL; } -/* This function supports releasing coalesced segments */ +/* This function supports releasing coalesed segments */ static FORCEINLINE int win32munmap(void* ptr, size_t size) { MEMORY_BASIC_INFORMATION minfo; char* cptr = (char*)ptr; @@ -1655,7 +1655,7 @@ static FORCEINLINE int win32munmap(void* ptr, size_t size) { #define CALL_MREMAP(addr, osz, nsz, mv) MFAIL #endif /* HAVE_MMAP && HAVE_MREMAP */ -/* mstate bit set if contiguous morecore disabled or failed */ +/* mstate bit set if continguous morecore disabled or failed */ #define USE_NONCONTIGUOUS_BIT (4U) /* segment bit set in create_mspace_with_base */ @@ -1755,10 +1755,10 @@ static FORCEINLINE void pthread_release_lock (MLOCK_T *sl) { assert(sl->l != 0); assert(sl->threadid == CURRENT_THREAD); if (--sl->c == 0) { + sl->threadid = 0; volatile unsigned int* lp = &sl->l; int prev = 0; int ret; - sl->threadid = 0; __asm__ __volatile__ ("lock; xchgl %0, %1" : "=r" (ret) : "m" (*(lp)), "0"(prev) @@ -2485,7 +2485,7 @@ typedef struct malloc_segment* msegmentptr; Trim support Fields holding the amount of unused topmost memory that should trigger - timing, and a counter to force periodic scanning to release unused + timming, and a counter to force periodic scanning to release unused non-topmost segments. Locking @@ -3066,7 +3066,7 @@ static int init_mparams(void) { #if !ONLY_MSPACES /* Set up lock for main malloc area */ gm->mflags = mparams.default_mflags; - (void)INITIAL_LOCK(&gm->mutex); + INITIAL_LOCK(&gm->mutex); #endif #if (FOOTERS && !INSECURE) @@ -5017,7 +5017,7 @@ static mstate init_user_mstate(char* tbase, size_t tsize) { mchunkptr msp = align_as_chunk(tbase); mstate m = (mstate)(chunk2mem(msp)); memset(m, 0, msize); - (void)INITIAL_LOCK(&m->mutex); + INITIAL_LOCK(&m->mutex); msp->head = (msize|PINUSE_BIT|CINUSE_BIT); m->seg.base = m->least_addr = tbase; m->seg.size = m->footprint = m->max_footprint = tsize; diff --git a/third_party/git/compat/obstack.h b/third_party/git/compat/obstack.h index f90a46d9b9..ae36ed6a66 100644 --- a/third_party/git/compat/obstack.h +++ b/third_party/git/compat/obstack.h @@ -79,7 +79,7 @@ change its address during its lifetime. When the chars burst over a chunk boundary, we allocate a larger chunk, and then copy the partly formed object from the end of the old chunk to the beginning of the new larger chunk. We then carry on -accrediting characters to the end of the object as we normally would. +accreting characters to the end of the object as we normally would. A special macro is provided to add a single char at a time to a growing object. This allows the use of register variables, which @@ -135,10 +135,8 @@ extern "C" { alignment relative to 0. */ #define __PTR_ALIGN(B, P, A) \ - (sizeof (PTR_INT_TYPE) < sizeof(void *) ? \ - __BPTR_ALIGN((B), (P), (A)) : \ - (void *)__BPTR_ALIGN((PTR_INT_TYPE)(void *)0, (PTR_INT_TYPE)(P), (A)) \ - ) + __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \ + P, A) #include <string.h> diff --git a/third_party/git/compat/poll/poll.c b/third_party/git/compat/poll/poll.c index afa6d24584..0e95dd493c 100644 --- a/third_party/git/compat/poll/poll.c +++ b/third_party/git/compat/poll/poll.c @@ -139,10 +139,22 @@ win32_compute_revents (HANDLE h, int *p_sought) INPUT_RECORD *irbuffer; DWORD avail, nbuffer; BOOL bRet; + IO_STATUS_BLOCK iosb; + FILE_PIPE_LOCAL_INFORMATION fpli; + static PNtQueryInformationFile NtQueryInformationFile; + static BOOL once_only; switch (GetFileType (h)) { case FILE_TYPE_PIPE: + if (!once_only) + { + NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void)) + GetProcAddress (GetModuleHandleW (L"ntdll.dll"), + "NtQueryInformationFile"); + once_only = TRUE; + } + happened = 0; if (PeekNamedPipe (h, NULL, 0, NULL, &avail, NULL) != 0) { @@ -154,9 +166,22 @@ win32_compute_revents (HANDLE h, int *p_sought) else { - /* It was the write-end of the pipe. Unfortunately there is no - reliable way of knowing if it can be written without blocking. - Just say that it's all good. */ + /* It was the write-end of the pipe. Check if it is writable. + If NtQueryInformationFile fails, optimistically assume the pipe is + writable. This could happen on Win9x, where NtQueryInformationFile + is not available, or if we inherit a pipe that doesn't permit + FILE_READ_ATTRIBUTES access on the write end (I think this should + not happen since WinXP SP2; WINE seems fine too). Otherwise, + ensure that enough space is available for atomic writes. */ + memset (&iosb, 0, sizeof (iosb)); + memset (&fpli, 0, sizeof (fpli)); + + if (!NtQueryInformationFile + || NtQueryInformationFile (h, &iosb, &fpli, sizeof (fpli), + FilePipeLocalInformation) + || fpli.WriteQuotaAvailable >= PIPE_BUF + || (fpli.OutboundQuota < PIPE_BUF && + fpli.WriteQuotaAvailable == fpli.OutboundQuota)) happened |= *p_sought & (POLLOUT | POLLWRNORM | POLLWRBAND); } return happened; diff --git a/third_party/git/stable-qsort.c b/third_party/git/compat/qsort.c index 6cbaf39f7b..7d071afb70 100644 --- a/third_party/git/stable-qsort.c +++ b/third_party/git/compat/qsort.c @@ -1,4 +1,4 @@ -#include "git-compat-util.h" +#include "../git-compat-util.h" /* * A merge sort implementation, simplified from the qsort implementation @@ -44,8 +44,8 @@ static void msort_with_tmp(void *b, size_t n, size_t s, memcpy(b, t, (n - n2) * s); } -void git_stable_qsort(void *b, size_t n, size_t s, - int (*cmp)(const void *, const void *)) +void git_qsort(void *b, size_t n, size_t s, + int (*cmp)(const void *, const void *)) { const size_t size = st_mult(n, s); char buf[1024]; diff --git a/third_party/git/compat/regex/regcomp.c b/third_party/git/compat/regex/regcomp.c index d1bc09e49b..c0d838834a 100644 --- a/third_party/git/compat/regex/regcomp.c +++ b/third_party/git/compat/regex/regcomp.c @@ -3462,7 +3462,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name) /* This isn't a valid character. */ return REG_ECOLLATE; - /* Build single byte matching table for this equivalence class. */ + /* Build single byte matcing table for this equivalence class. */ char_buf[1] = (unsigned char) '\0'; len = weights[idx1 & 0xffffff]; for (ch = 0; ch < SBC_MAX; ++ch) diff --git a/third_party/git/compat/regex/regex.h b/third_party/git/compat/regex/regex.h index 2d3412860d..4d81358a83 100644 --- a/third_party/git/compat/regex/regex.h +++ b/third_party/git/compat/regex/regex.h @@ -41,11 +41,6 @@ extern "C" { #endif -#define regcomp git_regcomp -#define regexec git_regexec -#define regerror git_regerror -#define regfree git_regfree - /* The following two types have to be signed and unsigned integer type wide enough to hold a value of a pointer. For most ANSI compilers ptrdiff_t and size_t should be likely OK. Still size of these two @@ -327,7 +322,7 @@ typedef enum /* POSIX regcomp return error codes. (In the order listed in the standard.) */ REG_BADPAT, /* Invalid pattern. */ - REG_ECOLLATE, /* Invalid collating element. */ + REG_ECOLLATE, /* Inalid collating element. */ REG_ECTYPE, /* Invalid character class name. */ REG_EESCAPE, /* Trailing backslash. */ REG_ESUBREG, /* Invalid back reference. */ diff --git a/third_party/git/compat/regex/regex_internal.c b/third_party/git/compat/regex/regex_internal.c index ec51cf3446..59bf151336 100644 --- a/third_party/git/compat/regex/regex_internal.c +++ b/third_party/git/compat/regex/regex_internal.c @@ -1616,7 +1616,7 @@ free_state (re_dfastate_t *state) re_free (state); } -/* Create the new state which is independent of contexts. +/* Create the new state which is independ of contexts. Return the new state if succeeded, otherwise return NULL. */ static re_dfastate_t * diff --git a/third_party/git/compat/regex/regexec.c b/third_party/git/compat/regex/regexec.c index 49358ae475..1b5d89fd5e 100644 --- a/third_party/git/compat/regex/regexec.c +++ b/third_party/git/compat/regex/regexec.c @@ -2420,7 +2420,7 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx) /* From the node set CUR_NODES, pick up the nodes whose types are OP_OPEN_SUBEXP and which have corresponding back references in the regular expression. And register them to use them later for evaluating the - corresponding back references. */ + correspoding back references. */ static reg_errcode_t internal_function @@ -3347,7 +3347,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state) dests_node = dests_alloc->dests_node; dests_ch = dests_alloc->dests_ch; - /* Initialize transition table. */ + /* Initialize transiton table. */ state->word_trtable = state->trtable = NULL; /* At first, group all nodes belonging to `state' into several diff --git a/third_party/git/compat/terminal.c b/third_party/git/compat/terminal.c index 35bca03d14..fa13ee672d 100644 --- a/third_party/git/compat/terminal.c +++ b/third_party/git/compat/terminal.c @@ -2,9 +2,6 @@ #include "compat/terminal.h" #include "sigchain.h" #include "strbuf.h" -#include "run-command.h" -#include "string-list.h" -#include "hashmap.h" #if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE) @@ -35,7 +32,7 @@ static void restore_term(void) term_fd = -1; } -static int disable_bits(tcflag_t bits) +static int disable_echo(void) { struct termios t; @@ -46,7 +43,7 @@ static int disable_bits(tcflag_t bits) old_term = t; sigchain_push_common(restore_term_on_signal); - t.c_lflag &= ~bits; + t.c_lflag &= ~ECHO; if (!tcsetattr(term_fd, TCSAFLUSH, &t)) return 0; @@ -56,44 +53,17 @@ error: return -1; } -static int disable_echo(void) -{ - return disable_bits(ECHO); -} - -static int enable_non_canonical(void) -{ - return disable_bits(ICANON | ECHO); -} - #elif defined(GIT_WINDOWS_NATIVE) #define INPUT_PATH "CONIN$" #define OUTPUT_PATH "CONOUT$" #define FORCE_TEXT "t" -static int use_stty = 1; -static struct string_list stty_restore = STRING_LIST_INIT_DUP; static HANDLE hconin = INVALID_HANDLE_VALUE; static DWORD cmode; static void restore_term(void) { - if (use_stty) { - int i; - struct child_process cp = CHILD_PROCESS_INIT; - - if (stty_restore.nr == 0) - return; - - argv_array_push(&cp.args, "stty"); - for (i = 0; i < stty_restore.nr; i++) - argv_array_push(&cp.args, stty_restore.items[i].string); - run_command(&cp); - string_list_clear(&stty_restore, 0); - return; - } - if (hconin == INVALID_HANDLE_VALUE) return; @@ -102,39 +72,8 @@ static void restore_term(void) hconin = INVALID_HANDLE_VALUE; } -static int disable_bits(DWORD bits) +static int disable_echo(void) { - if (use_stty) { - struct child_process cp = CHILD_PROCESS_INIT; - - argv_array_push(&cp.args, "stty"); - - if (bits & ENABLE_LINE_INPUT) { - string_list_append(&stty_restore, "icanon"); - argv_array_push(&cp.args, "-icanon"); - } - - if (bits & ENABLE_ECHO_INPUT) { - string_list_append(&stty_restore, "echo"); - argv_array_push(&cp.args, "-echo"); - } - - if (bits & ENABLE_PROCESSED_INPUT) { - string_list_append(&stty_restore, "-ignbrk"); - string_list_append(&stty_restore, "intr"); - string_list_append(&stty_restore, "^c"); - argv_array_push(&cp.args, "ignbrk"); - argv_array_push(&cp.args, "intr"); - argv_array_push(&cp.args, ""); - } - - if (run_command(&cp) == 0) - return 0; - - /* `stty` could not be executed; access the Console directly */ - use_stty = 0; - } - hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -143,7 +82,7 @@ static int disable_bits(DWORD bits) GetConsoleMode(hconin, &cmode); sigchain_push_common(restore_term_on_signal); - if (!SetConsoleMode(hconin, cmode & ~bits)) { + if (!SetConsoleMode(hconin, cmode & (~ENABLE_ECHO_INPUT))) { CloseHandle(hconin); hconin = INVALID_HANDLE_VALUE; return -1; @@ -152,47 +91,6 @@ static int disable_bits(DWORD bits) return 0; } -static int disable_echo(void) -{ - return disable_bits(ENABLE_ECHO_INPUT); -} - -static int enable_non_canonical(void) -{ - return disable_bits(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT); -} - -/* - * Override `getchar()`, as the default implementation does not use - * `ReadFile()`. - * - * This poses a problem when we want to see whether the standard - * input has more characters, as the default of Git for Windows is to start the - * Bash in a MinTTY, which uses a named pipe to emulate a pty, in which case - * our `poll()` emulation calls `PeekNamedPipe()`, which seems to require - * `ReadFile()` to be called first to work properly (it only reports 0 - * available bytes, otherwise). - * - * So let's just override `getchar()` with a version backed by `ReadFile()` and - * go our merry ways from here. - */ -static int mingw_getchar(void) -{ - DWORD read = 0; - unsigned char ch; - - if (!ReadFile(GetStdHandle(STD_INPUT_HANDLE), &ch, 1, &read, NULL)) - return EOF; - - if (!read) { - error("Unexpected 0 read"); - return EOF; - } - - return ch; -} -#define getchar mingw_getchar - #endif #ifndef FORCE_TEXT @@ -239,126 +137,6 @@ char *git_terminal_prompt(const char *prompt, int echo) return buf.buf; } -/* - * The `is_known_escape_sequence()` function returns 1 if the passed string - * corresponds to an Escape sequence that the terminal capabilities contains. - * - * To avoid depending on ncurses or other platform-specific libraries, we rely - * on the presence of the `infocmp` executable to do the job for us (failing - * silently if the program is not available or refused to run). - */ -struct escape_sequence_entry { - struct hashmap_entry entry; - char sequence[FLEX_ARRAY]; -}; - -static int sequence_entry_cmp(const void *hashmap_cmp_fn_data, - const struct escape_sequence_entry *e1, - const struct escape_sequence_entry *e2, - const void *keydata) -{ - return strcmp(e1->sequence, keydata ? keydata : e2->sequence); -} - -static int is_known_escape_sequence(const char *sequence) -{ - static struct hashmap sequences; - static int initialized; - - if (!initialized) { - struct child_process cp = CHILD_PROCESS_INIT; - struct strbuf buf = STRBUF_INIT; - char *p, *eol; - - hashmap_init(&sequences, (hashmap_cmp_fn)sequence_entry_cmp, - NULL, 0); - - argv_array_pushl(&cp.args, "infocmp", "-L", "-1", NULL); - if (pipe_command(&cp, NULL, 0, &buf, 0, NULL, 0)) - strbuf_setlen(&buf, 0); - - for (eol = p = buf.buf; *p; p = eol + 1) { - p = strchr(p, '='); - if (!p) - break; - p++; - eol = strchrnul(p, '\n'); - - if (starts_with(p, "\\E")) { - char *comma = memchr(p, ',', eol - p); - struct escape_sequence_entry *e; - - p[0] = '^'; - p[1] = '['; - FLEX_ALLOC_MEM(e, sequence, p, comma - p); - hashmap_entry_init(&e->entry, - strhash(e->sequence)); - hashmap_add(&sequences, &e->entry); - } - if (!*eol) - break; - } - initialized = 1; - } - - return !!hashmap_get_from_hash(&sequences, strhash(sequence), sequence); -} - -int read_key_without_echo(struct strbuf *buf) -{ - static int warning_displayed; - int ch; - - if (warning_displayed || enable_non_canonical() < 0) { - if (!warning_displayed) { - warning("reading single keystrokes not supported on " - "this platform; reading line instead"); - warning_displayed = 1; - } - - return strbuf_getline(buf, stdin); - } - - strbuf_reset(buf); - ch = getchar(); - if (ch == EOF) { - restore_term(); - return EOF; - } - strbuf_addch(buf, ch); - - if (ch == '\033' /* ESC */) { - /* - * We are most likely looking at an Escape sequence. Let's try - * to read more bytes, waiting at most half a second, assuming - * that the sequence is complete if we did not receive any byte - * within that time. - * - * Start by replacing the Escape byte with ^[ */ - strbuf_splice(buf, buf->len - 1, 1, "^[", 2); - - /* - * Query the terminal capabilities once about all the Escape - * sequences it knows about, so that we can avoid waiting for - * half a second when we know that the sequence is complete. - */ - while (!is_known_escape_sequence(buf->buf)) { - struct pollfd pfd = { .fd = 0, .events = POLLIN }; - - if (poll(&pfd, 1, 500) < 1) - break; - - ch = getchar(); - if (ch == EOF) - return 0; - strbuf_addch(buf, ch); - } - } - - restore_term(); - return 0; -} - #else char *git_terminal_prompt(const char *prompt, int echo) @@ -366,23 +144,4 @@ char *git_terminal_prompt(const char *prompt, int echo) return getpass(prompt); } -int read_key_without_echo(struct strbuf *buf) -{ - static int warning_displayed; - const char *res; - - if (!warning_displayed) { - warning("reading single keystrokes not supported on this " - "platform; reading line instead"); - warning_displayed = 1; - } - - res = getpass(""); - strbuf_reset(buf); - if (!res) - return EOF; - strbuf_addstr(buf, res); - return 0; -} - #endif diff --git a/third_party/git/compat/terminal.h b/third_party/git/compat/terminal.h index a9d52b8464..97db7cd69d 100644 --- a/third_party/git/compat/terminal.h +++ b/third_party/git/compat/terminal.h @@ -3,7 +3,4 @@ char *git_terminal_prompt(const char *prompt, int echo); -/* Read a single keystroke, without echoing it to the terminal */ -int read_key_without_echo(struct strbuf *buf); - #endif /* COMPAT_TERMINAL_H */ diff --git a/third_party/git/compat/vcbuild/find_vs_env.bat b/third_party/git/compat/vcbuild/find_vs_env.bat index b35d264c0e..40194dd230 100644 --- a/third_party/git/compat/vcbuild/find_vs_env.bat +++ b/third_party/git/compat/vcbuild/find_vs_env.bat @@ -18,7 +18,7 @@ REM and MAKE, we must blend these two different worlds. This script REM attempts to do that. REM ================================================================ REM This BAT file starts in a plain (non-developer) command prompt, -REM searches for the "best" command prompt setup script, installs +REM searches for the "best" commmand prompt setup script, installs REM it into the current CMD process, and exports the various MSVC REM environment variables for use by MAKE. REM diff --git a/third_party/git/compat/vcbuild/scripts/clink.pl b/third_party/git/compat/vcbuild/scripts/clink.pl index d9f71b7cbb..c7b021bfac 100755 --- a/third_party/git/compat/vcbuild/scripts/clink.pl +++ b/third_party/git/compat/vcbuild/scripts/clink.pl @@ -45,9 +45,9 @@ while (@ARGV) { } elsif ("$arg" eq "-liconv") { push(@args, "libiconv.lib"); } elsif ("$arg" eq "-lcrypto") { - push(@args, "libcrypto.lib"); + push(@args, "libeay32.lib"); } elsif ("$arg" eq "-lssl") { - push(@args, "libssl.lib"); + push(@args, "ssleay32.lib"); } elsif ("$arg" eq "-lcurl") { my $lib = ""; # Newer vcpkg definitions call this libcurl_imp.lib; Do we @@ -68,54 +68,8 @@ while (@ARGV) { } elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") { $arg =~ s/^-L/-LIBPATH:/; push(@lflags, $arg); - } elsif ("$arg" =~ /^-[Rl]/) { + } elsif ("$arg" =~ /^-R/) { # eat - } elsif ("$arg" eq "-Werror") { - push(@cflags, "-WX"); - } elsif ("$arg" eq "-Wall") { - # cl.exe understands -Wall, but it is really overzealous - push(@cflags, "-W4"); - # disable the "signed/unsigned mismatch" warnings; our source code violates that - push(@cflags, "-wd4018"); - push(@cflags, "-wd4245"); - push(@cflags, "-wd4389"); - # disable the "unreferenced formal parameter" warning; our source code violates that - push(@cflags, "-wd4100"); - # disable the "conditional expression is constant" warning; our source code violates that - push(@cflags, "-wd4127"); - # disable the "const object should be initialized" warning; these warnings affect only objects that are `static` - push(@cflags, "-wd4132"); - # disable the "function/data pointer conversion in expression" warning; our source code violates that - push(@cflags, "-wd4152"); - # disable the "non-constant aggregate initializer" warning; our source code violates that - push(@cflags, "-wd4204"); - # disable the "cannot be initialized using address of automatic variable" warning; our source code violates that - push(@cflags, "-wd4221"); - # disable the "possible loss of data" warnings; our source code violates that - push(@cflags, "-wd4244"); - push(@cflags, "-wd4267"); - # disable the "array is too small to include a terminating null character" warning; we ab-use strings to initialize OIDs - push(@cflags, "-wd4295"); - # disable the "'<<': result of 32-bit shift implicitly converted to 64 bits" warning; our source code violates that - push(@cflags, "-wd4334"); - # disable the "declaration hides previous local declaration" warning; our source code violates that - push(@cflags, "-wd4456"); - # disable the "declaration hides function parameter" warning; our source code violates that - push(@cflags, "-wd4457"); - # disable the "declaration hides global declaration" warning; our source code violates that - push(@cflags, "-wd4459"); - # disable the "potentially uninitialized local variable '<name>' used" warning; our source code violates that - push(@cflags, "-wd4701"); - # disable the "unreachable code" warning; our source code violates that - push(@cflags, "-wd4702"); - # disable the "potentially uninitialized local pointer variable used" warning; our source code violates that - push(@cflags, "-wd4703"); - # disable the "assignment within conditional expression" warning; our source code violates that - push(@cflags, "-wd4706"); - # disable the "'inet_ntoa': Use inet_ntop() or InetNtop() instead" warning; our source code violates that - push(@cflags, "-wd4996"); - } elsif ("$arg" =~ /^-W[a-z]/) { - # let's ignore those } else { push(@args, $arg); } diff --git a/third_party/git/compat/win32/path-utils.c b/third_party/git/compat/win32/path-utils.c index ebf2f12eb6..d9d3641de8 100644 --- a/third_party/git/compat/win32/path-utils.c +++ b/third_party/git/compat/win32/path-utils.c @@ -1,29 +1,5 @@ #include "../../git-compat-util.h" -int win32_has_dos_drive_prefix(const char *path) -{ - int i; - - /* - * Does it start with an ASCII letter (i.e. highest bit not set), - * followed by a colon? - */ - if (!(0x80 & (unsigned char)*path)) - return *path && path[1] == ':' ? 2 : 0; - - /* - * While drive letters must be letters of the English alphabet, it is - * possible to assign virtually _any_ Unicode character via `subst` as - * a drive letter to "virtual drives". Even `1`, or `ä`. Or fun stuff - * like this: - * - * subst ֍: %USERPROFILE%\Desktop - */ - for (i = 1; i < 4 && (0x80 & (unsigned char)path[i]); i++) - ; /* skip first UTF-8 character */ - return path[i] == ':' ? i + 1 : 0; -} - int win32_skip_dos_drive_prefix(char **path) { int ret = has_dos_drive_prefix(*path); diff --git a/third_party/git/compat/win32/path-utils.h b/third_party/git/compat/win32/path-utils.h index f2e70872cd..0f70d43920 100644 --- a/third_party/git/compat/win32/path-utils.h +++ b/third_party/git/compat/win32/path-utils.h @@ -1,9 +1,5 @@ -#ifndef WIN32_PATH_UTILS_H -#define WIN32_PATH_UTILS_H - -int win32_has_dos_drive_prefix(const char *path); -#define has_dos_drive_prefix win32_has_dos_drive_prefix - +#define has_dos_drive_prefix(path) \ + (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0) int win32_skip_dos_drive_prefix(char **path); #define skip_dos_drive_prefix win32_skip_dos_drive_prefix static inline int win32_is_dir_sep(int c) @@ -22,5 +18,3 @@ static inline char *win32_find_last_dir_sep(const char *path) #define find_last_dir_sep win32_find_last_dir_sep int win32_offset_1st_component(const char *path); #define offset_1st_component win32_offset_1st_component - -#endif diff --git a/third_party/git/compat/win32/pthread.h b/third_party/git/compat/win32/pthread.h index 737983d00b..c6cb8dd219 100644 --- a/third_party/git/compat/win32/pthread.h +++ b/third_party/git/compat/win32/pthread.h @@ -50,8 +50,8 @@ typedef struct { DWORD tid; } pthread_t; -int pthread_create(pthread_t *thread, const void *unused, - void *(*start_routine)(void*), void *arg); +extern int pthread_create(pthread_t *thread, const void *unused, + void *(*start_routine)(void*), void *arg); /* * To avoid the need of copying a struct, we use small macro wrapper to pass @@ -59,10 +59,10 @@ int pthread_create(pthread_t *thread, const void *unused, */ #define pthread_join(a, b) win32_pthread_join(&(a), (b)) -int win32_pthread_join(pthread_t *thread, void **value_ptr); +extern int win32_pthread_join(pthread_t *thread, void **value_ptr); #define pthread_equal(t1, t2) ((t1).tid == (t2).tid) -pthread_t pthread_self(void); +extern pthread_t pthread_self(void); static inline void NORETURN pthread_exit(void *ret) { diff --git a/third_party/git/compat/winansi.c b/third_party/git/compat/winansi.c index c27b20a79d..cacd82c833 100644 --- a/third_party/git/compat/winansi.c +++ b/third_party/git/compat/winansi.c @@ -546,7 +546,7 @@ static HANDLE swap_osfhnd(int fd, HANDLE new_handle) typedef struct _OBJECT_NAME_INFORMATION { UNICODE_STRING Name; - WCHAR NameBuffer[FLEX_ARRAY]; + WCHAR NameBuffer[0]; } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; #define ObjectNameInformation 1 @@ -662,20 +662,10 @@ void winansi_init(void) */ HANDLE winansi_get_osfhandle(int fd) { - HANDLE ret; - if (fd == 1 && (fd_is_interactive[1] & FD_SWAPPED)) return hconsole1; if (fd == 2 && (fd_is_interactive[2] & FD_SWAPPED)) return hconsole2; - ret = (HANDLE)_get_osfhandle(fd); - - /* - * There are obviously circumstances under which _get_osfhandle() - * returns (HANDLE)-2. This is not documented anywhere, but that is so - * clearly an invalid handle value that we can just work around this - * and return the correct value for invalid handles. - */ - return ret == (HANDLE)-2 ? INVALID_HANDLE_VALUE : ret; + return (HANDLE)_get_osfhandle(fd); } diff --git a/third_party/git/config.c b/third_party/git/config.c index d17d2bd9dc..3900e4947b 100644 --- a/third_party/git/config.c +++ b/third_party/git/config.c @@ -204,7 +204,7 @@ static int prepare_include_condition_pattern(struct strbuf *pat) strbuf_splice(pat, 0, 1, path.buf, slash - path.buf); prefix = slash - path.buf + 1 /* slash */; } else if (!is_absolute_path(pat->buf)) - strbuf_insertstr(pat, 0, "**/"); + strbuf_insert(pat, 0, "**/", 3); add_trailing_starstar_for_dir(pat); @@ -275,7 +275,7 @@ static int include_by_branch(const char *cond, size_t cond_len) int flags; int ret; struct strbuf pattern = STRBUF_INIT; - const char *refname = !the_repository->gitdir ? + const char *refname = !the_repository || !the_repository->gitdir ? NULL : resolve_ref_unsafe("HEAD", 0, NULL, &flags); const char *shortname; @@ -1204,7 +1204,7 @@ static int git_default_core_config(const char *var, const char *value, void *cb) default_abbrev = -1; else { int abbrev = git_config_int(var, value); - if (abbrev < minimum_abbrev || abbrev > the_hash_algo->hexsz) + if (abbrev < minimum_abbrev || abbrev > 40) return error(_("abbrev length out of range: %d"), abbrev); default_abbrev = abbrev; } @@ -1364,11 +1364,6 @@ static int git_default_core_config(const char *var, const char *value, void *cb) return 0; } - if (!strcmp(var, "core.sparsecheckoutcone")) { - core_sparse_checkout_cone = git_config_bool(var, value); - return 0; - } - if (!strcmp(var, "core.precomposeunicode")) { precomposed_unicode = git_config_bool(var, value); return 0; @@ -1384,6 +1379,11 @@ static int git_default_core_config(const char *var, const char *value, void *cb) return 0; } + if (!strcmp(var, "core.partialclonefilter")) { + return git_config_string(&core_partial_clone_filter_default, + var, value); + } + if (!strcmp(var, "core.usereplacerefs")) { read_replace_refs = git_config_bool(var, value); return 0; @@ -1702,7 +1702,6 @@ static int do_git_config_sequence(const struct config_options *opts, char *xdg_config = xdg_config_home("config"); char *user_config = expand_user_path("~/.gitconfig", 0); char *repo_config; - enum config_scope prev_parsing_scope = current_parsing_scope; if (opts->commondir) repo_config = mkpathdup("%s/config", opts->commondir); @@ -1725,12 +1724,15 @@ static int do_git_config_sequence(const struct config_options *opts, if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK)) ret += git_config_from_file(fn, user_config, data); - current_parsing_scope = CONFIG_SCOPE_LOCAL; + current_parsing_scope = CONFIG_SCOPE_REPO; if (!opts->ignore_repo && repo_config && !access_or_die(repo_config, R_OK, 0)) ret += git_config_from_file(fn, repo_config, data); - current_parsing_scope = CONFIG_SCOPE_WORKTREE; + /* + * Note: this should have a new scope, CONFIG_SCOPE_WORKTREE. + * But let's not complicate things before it's actually needed. + */ if (!opts->ignore_worktree && repository_format_worktree_config) { char *path = git_pathdup("config.worktree"); if (!access_or_die(path, R_OK, 0)) @@ -1738,11 +1740,11 @@ static int do_git_config_sequence(const struct config_options *opts, free(path); } - current_parsing_scope = CONFIG_SCOPE_COMMAND; + current_parsing_scope = CONFIG_SCOPE_CMDLINE; if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0) die(_("unable to parse command-line config")); - current_parsing_scope = prev_parsing_scope; + current_parsing_scope = CONFIG_SCOPE_UNKNOWN; free(xdg_config); free(user_config); free(repo_config); @@ -1763,9 +1765,6 @@ int config_with_options(config_fn_t fn, void *data, data = &inc; } - if (config_source) - current_parsing_scope = config_source->scope; - /* * If we have a specific filename, use it. Otherwise, follow the * regular lookup sequence. @@ -1862,9 +1861,9 @@ static struct config_set_element *configset_find_element(struct config_set *cs, if (git_config_parse_key(key, &normalized_key, NULL)) return NULL; - hashmap_entry_init(&k.ent, strhash(normalized_key)); + hashmap_entry_init(&k, strhash(normalized_key)); k.key = normalized_key; - found_entry = hashmap_get_entry(&cs->config_hash, &k, ent, NULL); + found_entry = hashmap_get(&cs->config_hash, &k, NULL); free(normalized_key); return found_entry; } @@ -1883,10 +1882,10 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha */ if (!e) { e = xmalloc(sizeof(*e)); - hashmap_entry_init(&e->ent, strhash(key)); + hashmap_entry_init(e, strhash(key)); e->key = xstrdup(key); string_list_init(&e->value_list, 1); - hashmap_add(&cs->config_hash, &e->ent); + hashmap_add(&cs->config_hash, e); } si = string_list_append_nodup(&e->value_list, xstrdup_or_null(value)); @@ -1914,14 +1913,12 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha } static int config_set_element_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct config_set_element *e1, *e2; - - e1 = container_of(eptr, const struct config_set_element, ent); - e2 = container_of(entry_or_key, const struct config_set_element, ent); + const struct config_set_element *e1 = entry; + const struct config_set_element *e2 = entry_or_key; return strcmp(e1->key, e2->key); } @@ -1942,12 +1939,12 @@ void git_configset_clear(struct config_set *cs) if (!cs->hash_initialized) return; - hashmap_for_each_entry(&cs->config_hash, &iter, entry, - ent /* member name */) { + hashmap_iter_init(&cs->config_hash, &iter); + while ((entry = hashmap_iter_next(&iter))) { free(entry->key); string_list_clear(&entry->value_list, 1); } - hashmap_free_entries(&cs->config_hash, struct config_set_element, ent); + hashmap_free(&cs->config_hash, 1); cs->hash_initialized = 0; free(cs->list.items); cs->list.nr = 0; @@ -2291,6 +2288,30 @@ int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestam return -1; /* thing exists but cannot be parsed */ } +int git_config_get_untracked_cache(void) +{ + int val = -1; + const char *v; + + /* Hack for test programs like test-dump-untracked-cache */ + if (ignore_untracked_cache_config) + return -1; + + if (!git_config_get_maybe_bool("core.untrackedcache", &val)) + return val; + + if (!git_config_get_value("core.untrackedcache", &v)) { + if (!strcasecmp(v, "keep")) + return -1; + + error(_("unknown core.untrackedCache value '%s'; " + "using 'keep' default value"), v); + return -1; + } + + return -1; /* default value */ +} + int git_config_get_split_index(void) { int val; @@ -3298,26 +3319,6 @@ const char *current_config_origin_type(void) } } -const char *config_scope_name(enum config_scope scope) -{ - switch (scope) { - case CONFIG_SCOPE_SYSTEM: - return "system"; - case CONFIG_SCOPE_GLOBAL: - return "global"; - case CONFIG_SCOPE_LOCAL: - return "local"; - case CONFIG_SCOPE_WORKTREE: - return "worktree"; - case CONFIG_SCOPE_COMMAND: - return "command"; - case CONFIG_SCOPE_SUBMODULE: - return "submodule"; - default: - return "unknown"; - } -} - const char *current_config_name(void) { const char *name; @@ -3338,14 +3339,6 @@ enum config_scope current_config_scope(void) return current_parsing_scope; } -int current_config_line(void) -{ - if (current_config_kvi) - return current_config_kvi->linenr; - else - return cf->linenr; -} - int lookup_config(const char **mapping, int nr_mapping, const char *var) { int i; diff --git a/third_party/git/config.h b/third_party/git/config.h index 9b3773f778..f0ed464004 100644 --- a/third_party/git/config.h +++ b/third_party/git/config.h @@ -4,22 +4,6 @@ #include "hashmap.h" #include "string-list.h" - -/** - * The config API gives callers a way to access Git configuration files - * (and files which have the same syntax). - * - * General Usage - * ------------- - * - * Config files are parsed linearly, and each variable found is passed to a - * caller-provided callback function. The callback function is responsible - * for any actions to be taken on the config option, and is free to ignore - * some options. It is not uncommon for the configuration to be parsed - * several times during the run of a Git program, with different callbacks - * picking out different variables useful to themselves. - */ - struct object_id; /* git_config_parse_key() returns these negated: */ @@ -35,22 +19,10 @@ struct object_id; #define CONFIG_REGEX_NONE ((void *)1) -enum config_scope { - CONFIG_SCOPE_UNKNOWN = 0, - CONFIG_SCOPE_SYSTEM, - CONFIG_SCOPE_GLOBAL, - CONFIG_SCOPE_LOCAL, - CONFIG_SCOPE_WORKTREE, - CONFIG_SCOPE_COMMAND, - CONFIG_SCOPE_SUBMODULE, -}; -const char *config_scope_name(enum config_scope scope); - struct git_config_source { unsigned int use_stdin:1; const char *file; const char *blob; - enum config_scope scope; }; enum config_origin_type { @@ -99,34 +71,9 @@ struct config_options { } error_action; }; -/** - * A config callback function takes three parameters: - * - * - the name of the parsed variable. This is in canonical "flat" form: the - * section, subsection, and variable segments will be separated by dots, - * and the section and variable segments will be all lowercase. E.g., - * `core.ignorecase`, `diff.SomeType.textconv`. - * - * - the value of the found variable, as a string. If the variable had no - * value specified, the value will be NULL (typically this means it - * should be interpreted as boolean true). - * - * - a void pointer passed in by the caller of the config API; this can - * contain callback-specific data - * - * A config callback should return 0 for success, or -1 if the variable - * could not be parsed properly. - */ typedef int (*config_fn_t)(const char *, const char *, void *); - int git_default_config(const char *, const char *, void *); - -/** - * Read a specific file in git-config format. - * This function takes the same callback and data parameters as `git_config`. - */ int git_config_from_file(config_fn_t fn, const char *, void *); - int git_config_from_file_with_options(config_fn_t fn, const char *, void *, const struct config_options *); @@ -141,157 +88,34 @@ void git_config_push_parameter(const char *text); int git_config_from_parameters(config_fn_t fn, void *data); void read_early_config(config_fn_t cb, void *data); void read_very_early_config(config_fn_t cb, void *data); - -/** - * Most programs will simply want to look up variables in all config files - * that Git knows about, using the normal precedence rules. To do this, - * call `git_config` with a callback function and void data pointer. - * - * `git_config` will read all config sources in order of increasing - * priority. Thus a callback should typically overwrite previously-seen - * entries with new ones (e.g., if both the user-wide `~/.gitconfig` and - * repo-specific `.git/config` contain `color.ui`, the config machinery - * will first feed the user-wide one to the callback, and then the - * repo-specific one; by overwriting, the higher-priority repo-specific - * value is left at the end). - */ void git_config(config_fn_t fn, void *); - -/** - * Lets the caller examine config while adjusting some of the default - * behavior of `git_config`. It should almost never be used by "regular" - * Git code that is looking up configuration variables. - * It is intended for advanced callers like `git-config`, which are - * intentionally tweaking the normal config-lookup process. - * It takes two extra parameters: - * - * - `config_source` - * If this parameter is non-NULL, it specifies the source to parse for - * configuration, rather than looking in the usual files. See `struct - * git_config_source` in `config.h` for details. Regular `git_config` defaults - * to `NULL`. - * - * - `opts` - * Specify options to adjust the behavior of parsing config files. See `struct - * config_options` in `config.h` for details. As an example: regular `git_config` - * sets `opts.respect_includes` to `1` by default. - */ int config_with_options(config_fn_t fn, void *, struct git_config_source *config_source, const struct config_options *opts); - -/** - * Value Parsing Helpers - * --------------------- - * - * The following helper functions aid in parsing string values - */ - int git_parse_ssize_t(const char *, ssize_t *); int git_parse_ulong(const char *, unsigned long *); - -/** - * Same as `git_config_bool`, except that it returns -1 on error rather - * than dying. - */ int git_parse_maybe_bool(const char *); - -/** - * Parse the string to an integer, including unit factors. Dies on error; - * otherwise, returns the parsed result. - */ int git_config_int(const char *, const char *); - int64_t git_config_int64(const char *, const char *); - -/** - * Identical to `git_config_int`, but for unsigned longs. - */ unsigned long git_config_ulong(const char *, const char *); - ssize_t git_config_ssize_t(const char *, const char *); - -/** - * Same as `git_config_bool`, except that integers are returned as-is, and - * an `is_bool` flag is unset. - */ int git_config_bool_or_int(const char *, const char *, int *); - -/** - * Parse a string into a boolean value, respecting keywords like "true" and - * "false". Integer values are converted into true/false values (when they - * are non-zero or zero, respectively). Other values cause a die(). If - * parsing is successful, the return value is the result. - */ int git_config_bool(const char *, const char *); - -/** - * Allocates and copies the value string into the `dest` parameter; if no - * string is given, prints an error message and returns -1. - */ int git_config_string(const char **, const char *, const char *); - -/** - * Similar to `git_config_string`, but expands `~` or `~user` into the - * user's home directory when found at the beginning of the path. - */ int git_config_pathname(const char **, const char *, const char *); - int git_config_expiry_date(timestamp_t *, const char *, const char *); int git_config_color(char *, const char *, const char *); int git_config_set_in_file_gently(const char *, const char *, const char *); - -/** - * write config values to a specific config file, takes a key/value pair as - * parameter. - */ void git_config_set_in_file(const char *, const char *, const char *); - int git_config_set_gently(const char *, const char *); - -/** - * write config values to `.git/config`, takes a key/value pair as parameter. - */ void git_config_set(const char *, const char *); - int git_config_parse_key(const char *, char **, int *); int git_config_key_is_valid(const char *key); int git_config_set_multivar_gently(const char *, const char *, const char *, int); void git_config_set_multivar(const char *, const char *, const char *, int); int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int); - -/** - * takes four parameters: - * - * - the name of the file, as a string, to which key/value pairs will be written. - * - * - the name of key, as a string. This is in canonical "flat" form: the section, - * subsection, and variable segments will be separated by dots, and the section - * and variable segments will be all lowercase. - * E.g., `core.ignorecase`, `diff.SomeType.textconv`. - * - * - the value of the variable, as a string. If value is equal to NULL, it will - * remove the matching key from the config file. - * - * - the value regex, as a string. It will disregard key/value pairs where value - * does not match. - * - * - a multi_replace value, as an int. If value is equal to zero, nothing or only - * one matching key/value is replaced, else all matching key/values (regardless - * how many) are removed, before the new pair is written. - * - * It returns 0 on success. - */ void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int); - -/** - * rename or remove sections in the config file - * parameters `old_name` and `new_name` - * If NULL is passed through `new_name` parameter, - * the section will be removed from the config file. - */ int git_config_rename_section(const char *, const char *); - int git_config_rename_section_in_file(const char *, const char *, const char *); int git_config_copy_section(const char *, const char *); int git_config_copy_section_in_file(const char *, const char *, const char *); @@ -306,35 +130,18 @@ int config_error_nonbool(const char *); int git_config_parse_parameter(const char *, config_fn_t fn, void *data); +enum config_scope { + CONFIG_SCOPE_UNKNOWN = 0, + CONFIG_SCOPE_SYSTEM, + CONFIG_SCOPE_GLOBAL, + CONFIG_SCOPE_REPO, + CONFIG_SCOPE_CMDLINE, +}; + enum config_scope current_config_scope(void); const char *current_config_origin_type(void); const char *current_config_name(void); -int current_config_line(void); -/** - * Include Directives - * ------------------ - * - * By default, the config parser does not respect include directives. - * However, a caller can use the special `git_config_include` wrapper - * callback to support them. To do so, you simply wrap your "real" callback - * function and data pointer in a `struct config_include_data`, and pass - * the wrapper to the regular config-reading functions. For example: - * - * ------------------------------------------- - * int read_file_with_include(const char *file, config_fn_t fn, void *data) - * { - * struct config_include_data inc = CONFIG_INCLUDE_INIT; - * inc.fn = fn; - * inc.data = data; - * return git_config_from_file(git_config_include, file, &inc); - * } - * ------------------------------------------- - * - * `git_config` respects includes automatically. The lower-level - * `git_config_from_file` does not. - * - */ struct config_include_data { int depth; config_fn_t fn; @@ -362,33 +169,6 @@ int parse_config_key(const char *var, const char **subsection, int *subsection_len, const char **key); -/** - * Custom Configsets - * ----------------- - * - * A `config_set` can be used to construct an in-memory cache for - * config-like files that the caller specifies (i.e., files like `.gitmodules`, - * `~/.gitconfig` etc.). For example, - * - * ---------------------------------------- - * struct config_set gm_config; - * git_configset_init(&gm_config); - * int b; - * //we add config files to the config_set - * git_configset_add_file(&gm_config, ".gitmodules"); - * git_configset_add_file(&gm_config, ".gitmodules_alt"); - * - * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) { - * //hack hack hack - * } - * - * when we are done with the configset: - * git_configset_clear(&gm_config); - * ---------------------------------------- - * - * Configset API provides functions for the above mentioned work flow - */ - struct config_set_element { struct hashmap_entry ent; char *key; @@ -417,47 +197,16 @@ struct config_set { struct configset_list list; }; -/** - * Initializes the config_set `cs`. - */ void git_configset_init(struct config_set *cs); - -/** - * Parses the file and adds the variable-value pairs to the `config_set`, - * dies if there is an error in parsing the file. Returns 0 on success, or - * -1 if the file does not exist or is inaccessible. The user has to decide - * if he wants to free the incomplete configset or continue using it when - * the function returns -1. - */ int git_configset_add_file(struct config_set *cs, const char *filename); - -/** - * Finds and returns the value list, sorted in order of increasing priority - * for the configuration variable `key` and config set `cs`. When the - * configuration variable `key` is not found, returns NULL. The caller - * should not free or modify the returned pointer, as it is owned by the cache. - */ const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key); - -/** - * Clears `config_set` structure, removes all saved variable-value pairs. - */ void git_configset_clear(struct config_set *cs); /* * These functions return 1 if not found, and 0 if found, leaving the found * value in the 'dest' pointer. */ - -/* - * Finds the highest-priority value for the configuration variable `key` - * and config set `cs`, stores the pointer to it in `value` and returns 0. - * When the configuration variable `key` is not found, returns 1 without - * touching `value`. The caller should not free or modify `value`, as it - * is owned by the cache. - */ int git_configset_get_value(struct config_set *cs, const char *key, const char **dest); - int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest); int git_configset_get_string(struct config_set *cs, const char *key, char **dest); int git_configset_get_int(struct config_set *cs, const char *key, int *dest); @@ -491,94 +240,17 @@ int repo_config_get_maybe_bool(struct repository *repo, int repo_config_get_pathname(struct repository *repo, const char *key, const char **dest); -/** - * Querying For Specific Variables - * ------------------------------- - * - * For programs wanting to query for specific variables in a non-callback - * manner, the config API provides two functions `git_config_get_value` - * and `git_config_get_value_multi`. They both read values from an internal - * cache generated previously from reading the config files. - */ - -/** - * Finds the highest-priority value for the configuration variable `key`, - * stores the pointer to it in `value` and returns 0. When the - * configuration variable `key` is not found, returns 1 without touching - * `value`. The caller should not free or modify `value`, as it is owned - * by the cache. - */ int git_config_get_value(const char *key, const char **value); - -/** - * Finds and returns the value list, sorted in order of increasing priority - * for the configuration variable `key`. When the configuration variable - * `key` is not found, returns NULL. The caller should not free or modify - * the returned pointer, as it is owned by the cache. - */ const struct string_list *git_config_get_value_multi(const char *key); - -/** - * Resets and invalidates the config cache. - */ void git_config_clear(void); - -/** - * Allocates and copies the retrieved string into the `dest` parameter for - * the configuration variable `key`; if NULL string is given, prints an - * error message and returns -1. When the configuration variable `key` is - * not found, returns 1 without touching `dest`. - */ int git_config_get_string_const(const char *key, const char **dest); - -/** - * Similar to `git_config_get_string_const`, except that retrieved value - * copied into the `dest` parameter is a mutable string. - */ int git_config_get_string(const char *key, char **dest); - -/** - * Finds and parses the value to an integer for the configuration variable - * `key`. Dies on error; otherwise, stores the value of the parsed integer in - * `dest` and returns 0. When the configuration variable `key` is not found, - * returns 1 without touching `dest`. - */ int git_config_get_int(const char *key, int *dest); - -/** - * Similar to `git_config_get_int` but for unsigned longs. - */ int git_config_get_ulong(const char *key, unsigned long *dest); - -/** - * Finds and parses the value into a boolean value, for the configuration - * variable `key` respecting keywords like "true" and "false". Integer - * values are converted into true/false values (when they are non-zero or - * zero, respectively). Other values cause a die(). If parsing is successful, - * stores the value of the parsed result in `dest` and returns 0. When the - * configuration variable `key` is not found, returns 1 without touching - * `dest`. - */ int git_config_get_bool(const char *key, int *dest); - -/** - * Similar to `git_config_get_bool`, except that integers are copied as-is, - * and `is_bool` flag is unset. - */ int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest); - -/** - * Similar to `git_config_get_bool`, except that it returns -1 on error - * rather than dying. - */ int git_config_get_maybe_bool(const char *key, int *dest); - -/** - * Similar to `git_config_get_string`, but expands `~` or `~user` into - * the user's home directory when found at the beginning of the path. - */ int git_config_get_pathname(const char *key, const char **dest); - int git_config_get_index_threads(int *dest); int git_config_get_untracked_cache(void); int git_config_get_split_index(void); @@ -598,19 +270,7 @@ struct key_value_info { enum config_scope scope; }; -/** - * First prints the error message specified by the caller in `err` and then - * dies printing the line number and the file name of the highest priority - * value for the configuration variable `key`. - */ NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3))); - -/** - * Helper function which formats the die error message according to the - * parameters entered. Used by `git_die_config()`. It can be used by callers - * handling `git_config_get_value_multi()` to print the correct error message - * for the desired value. - */ NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr); #define LOOKUP_CONFIG(mapping, var) \ diff --git a/third_party/git/config.mak.dev b/third_party/git/config.mak.dev index 89b218d11a..bf1f3fcdee 100644 --- a/third_party/git/config.mak.dev +++ b/third_party/git/config.mak.dev @@ -9,6 +9,7 @@ endif DEVELOPER_CFLAGS += -Wall DEVELOPER_CFLAGS += -Wdeclaration-after-statement DEVELOPER_CFLAGS += -Wformat-security +DEVELOPER_CFLAGS += -Wno-format-zero-length DEVELOPER_CFLAGS += -Wold-style-definition DEVELOPER_CFLAGS += -Woverflow DEVELOPER_CFLAGS += -Wpointer-arith diff --git a/third_party/git/config.mak.uname b/third_party/git/config.mak.uname index 0ab8e00938..db7f06b95f 100644 --- a/third_party/git/config.mak.uname +++ b/third_party/git/config.mak.uname @@ -454,6 +454,7 @@ ifneq ($(USE_MSVC_CRTDBG),) # Optionally enable memory leak reporting. BASIC_CFLAGS += -DUSE_MSVC_CRTDBG endif + BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1 # Always give "-Zi" to the compiler and "-debug" to linker (even in # release mode) to force a PDB to be generated (like RelWithDebInfo). BASIC_CFLAGS += -Zi @@ -615,7 +616,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) compat/win32/path-utils.o \ compat/win32/pthread.o compat/win32/syslog.o \ compat/win32/dirent.o - BASIC_CFLAGS += -DWIN32 + BASIC_CFLAGS += -DWIN32 -DPROTECT_NTFS_DEFAULT=1 EXTLIBS += -lws2_32 GITLIBS += git.res PTHREAD_LIBS = @@ -702,24 +703,20 @@ vcxproj: perl contrib/buildsystems/generate -g Vcxproj git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj - # Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file + # Generate the LinkOrCopyBuiltins.targets file (echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \ echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \ for name in $(BUILT_INS);\ do \ echo ' <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \ done && \ - echo ' </Target>' && \ - echo '</Project>') >git/LinkOrCopyBuiltins.targets - (echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \ - echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \ for name in $(REMOTE_CURL_ALIASES); \ do \ echo ' <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \ done && \ echo ' </Target>' && \ - echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets - git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets + echo '</Project>') >git/LinkOrCopyBuiltins.targets + git add -f git/LinkOrCopyBuiltins.targets # Add command-list.h $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h @@ -727,10 +724,11 @@ vcxproj: # Add scripts rm -f perl/perl.mak - $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(SCRIPT_LIB) $(SCRIPTS) + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 \ + $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN) # Strip out the sane tool path, needed only for building sed -i '/^git_broken_path_fix ".*/d' git-sh-setup - git add -f $(SCRIPT_LIB) $(SCRIPTS) + git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN) # Add Perl module $(MAKE) $(LIB_PERL_GEN) @@ -760,10 +758,6 @@ vcxproj: $(MAKE) -C templates git add -f templates/boilerplates.made templates/blt/ - # Add the translated messages - make MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(MOFILES) - git add -f $(MOFILES) - # Add build options $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS git add -f GIT-BUILD-OPTIONS diff --git a/third_party/git/configure.ac b/third_party/git/configure.ac index 66aedb9288..a43b476402 100644 --- a/third_party/git/configure.ac +++ b/third_party/git/configure.ac @@ -85,7 +85,7 @@ AC_DEFUN([GIT_PARSE_WITH], # GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT) # ----------------------------------------------------- -# Set VAR to the value specified by --with-WITHNAME. +# Set VAR to the value specied by --with-WITHNAME. # No verification of arguments is performed, but warnings are issued # if either 'yes' or 'no' is specified. # HELP_TEXT is presented when --help is called. @@ -844,61 +844,12 @@ AC_MSG_CHECKING([for old iconv()]) AC_COMPILE_IFELSE([OLDICONVTEST_SRC], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_OLD_ICONV, 1) OLD_ICONV=UnfortunatelyYes]) GIT_UNSTASH_FLAGS($ICONVDIR) GIT_CONF_SUBST([OLD_ICONV]) -# -# Define ICONV_OMITS_BOM if you are on a system which -# iconv omits bom for utf-{16,32} -if test -z "$NO_ICONV"; then -AC_CACHE_CHECK([whether iconv omits bom for utf-16 and utf-32], - [ac_cv_iconv_omits_bom], -[ -old_LIBS="$LIBS" -if test -n "$NEEDS_LIBICONV"; then - LIBS="$LIBS -liconv" -fi - -AC_RUN_IFELSE( - [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT - #include <iconv.h> - #ifdef HAVE_OLD_ICONV - typedef const char *iconv_ibp; - #else - typedef char *iconv_ibp; - #endif - ], - [[ - int v; - iconv_t conv; - char in[] = "a"; iconv_ibp pin = in; - char out[20] = ""; char *pout = out; - size_t isz = sizeof in; - size_t osz = sizeof out; - - conv = iconv_open("UTF-16", "UTF-8"); - iconv(conv, &pin, &isz, &pout, &osz); - iconv_close(conv); - v = (unsigned char)(out[0]) + (unsigned char)(out[1]); - return v != 0xfe + 0xff; - ]])], - [ac_cv_iconv_omits_bom=no], - [ac_cv_iconv_omits_bom=yes]) - -LIBS="$old_LIBS" -]) -if test "x$ac_cv_iconv_omits_bom" = xyes; then - ICONV_OMITS_BOM=Yes -else - ICONV_OMITS_BOM= -fi -GIT_CONF_SUBST([ICONV_OMITS_BOM]) -fi - ## Checks for typedefs, structures, and compiler characteristics. AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics]) # diff --git a/third_party/git/connect.c b/third_party/git/connect.c index b6451ab5e8..2778481264 100644 --- a/third_party/git/connect.c +++ b/third_party/git/connect.c @@ -511,7 +511,7 @@ int url_is_local_not_ssh(const char *url) const char *colon = strchr(url, ':'); const char *slash = strchr(url, '/'); return !colon || (slash && slash < colon) || - (has_dos_drive_prefix(url) && is_valid_path(url)); + has_dos_drive_prefix(url); } static const char *prot_name(enum protocol protocol) @@ -915,10 +915,6 @@ static enum protocol parse_connect_url(const char *url_orig, char **ret_host, if (protocol == PROTO_LOCAL) path = end; - else if (protocol == PROTO_FILE && *host != '/' && - !has_dos_drive_prefix(host) && - offset_1st_component(host - 2) > 1) - path = host - 2; /* include the leading "//" */ else if (protocol == PROTO_FILE && has_dos_drive_prefix(end)) path = end; /* "file://$(pwd)" may be "file://C:/projects/repo" */ else diff --git a/third_party/git/connected.c b/third_party/git/connected.c index 7e9bd1bc62..cd9b324afa 100644 --- a/third_party/git/connected.c +++ b/third_party/git/connected.c @@ -5,7 +5,6 @@ #include "connected.h" #include "transport.h" #include "packfile.h" -#include "promisor-remote.h" /* * If we feed all the commits we want to verify to this command @@ -29,7 +28,6 @@ int check_connected(oid_iterate_fn fn, void *cb_data, struct packed_git *new_pack = NULL; struct transport *transport; size_t base_len; - const unsigned hexsz = the_hash_algo->hexsz; if (!opt) opt = &defaults; @@ -52,28 +50,18 @@ int check_connected(oid_iterate_fn fn, void *cb_data, strbuf_release(&idx_file); } - if (opt->check_refs_are_promisor_objects_only) { + if (opt->check_refs_only) { /* * For partial clones, we don't want to have to do a regular * connectivity check because we have to enumerate and exclude * all promisor objects (slow), and then the connectivity check * itself becomes a no-op because in a partial clone every * object is a promisor object. Instead, just make sure we - * received, in a promisor packfile, the objects pointed to by - * each wanted ref. + * received the objects pointed to by each wanted ref. */ do { - struct packed_git *p; - - for (p = get_all_packs(the_repository); p; p = p->next) { - if (!p->pack_promisor) - continue; - if (find_pack_entry_one(oid.hash, p)) - goto promisor_pack_found; - } - return 1; -promisor_pack_found: - ; + if (!repo_has_object_file(the_repository, &oid)) + return 1; } while (!fn(cb_data, &oid)); return 0; } @@ -85,7 +73,7 @@ promisor_pack_found: argv_array_push(&rev_list.args,"rev-list"); argv_array_push(&rev_list.args, "--objects"); argv_array_push(&rev_list.args, "--stdin"); - if (has_promisor_remote()) + if (repository_format_partial_clone) argv_array_push(&rev_list.args, "--exclude-promisor-objects"); if (!opt->is_deepening_fetch) { argv_array_push(&rev_list.args, "--not"); @@ -111,7 +99,7 @@ promisor_pack_found: sigchain_push(SIGPIPE, SIG_IGN); - commit[hexsz] = '\n'; + commit[GIT_SHA1_HEXSZ] = '\n'; do { /* * If index-pack already checked that: @@ -124,8 +112,8 @@ promisor_pack_found: if (new_pack && find_pack_entry_one(oid.hash, new_pack)) continue; - memcpy(commit, oid_to_hex(&oid), hexsz); - if (write_in_full(rev_list.in, commit, hexsz + 1) < 0) { + memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ); + if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) { if (errno != EPIPE && errno != EINVAL) error_errno(_("failed write to rev-list")); err = -1; diff --git a/third_party/git/connected.h b/third_party/git/connected.h index eba5c261ba..ce2e7d8f2e 100644 --- a/third_party/git/connected.h +++ b/third_party/git/connected.h @@ -48,13 +48,12 @@ struct check_connected_options { unsigned is_deepening_fetch : 1; /* - * If non-zero, only check that the top-level objects referenced by the - * wanted refs (passed in as cb_data) are promisor objects. This is - * useful for partial clones, where enumerating and excluding all - * promisor objects is very slow and the commit-walk itself becomes a - * no-op. + * If non-zero, only check the top-level objects referenced by the + * wanted refs (passed in as cb_data). This is useful for partial + * clones, where enumerating and excluding all promisor objects is very + * slow and the commit-walk itself becomes a no-op. */ - unsigned check_refs_are_promisor_objects_only : 1; + unsigned check_refs_only : 1; }; #define CHECK_CONNECTED_INIT { 0 } diff --git a/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm b/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm index 5c666f9ac0..576ccabe1d 100644 --- a/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm +++ b/third_party/git/contrib/buildsystems/Generators/Vcxproj.pm @@ -79,8 +79,7 @@ sub createProject { if (!$static_library) { $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}})); $libs_debug = $libs_release; - $libs_debug =~ s/zlib\.lib/zlibd\.lib/g; - $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g; + $libs_debug =~ s/zlib\.lib/zlibd\.lib/; } $defines =~ s/-D//g; @@ -120,13 +119,13 @@ sub createProject { <VCPKGArch Condition="'\$(Platform)'=='Win32'">x86-windows</VCPKGArch> <VCPKGArch Condition="'\$(Platform)'!='Win32'">x64-windows</VCPKGArch> <VCPKGArchDirectory>$cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch)</VCPKGArchDirectory> - <VCPKGBinDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory> - <VCPKGLibDirectory Condition="'\$(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory> - <VCPKGBinDirectory Condition="'\$(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\bin</VCPKGBinDirectory> - <VCPKGLibDirectory Condition="'\$(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\lib</VCPKGLibDirectory> + <VCPKGBinDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\bin</VCPKGBinDirectory> + <VCPKGLibDirectory Condition="'\(Configuration)'=='Debug'">\$(VCPKGArchDirectory)\\debug\\lib</VCPKGLibDirectory> + <VCPKGBinDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\bin</VCPKGBinDirectory> + <VCPKGLibDirectory Condition="'\(Configuration)'!='Debug'">\$(VCPKGArchDirectory)\\lib</VCPKGLibDirectory> <VCPKGIncludeDirectory>\$(VCPKGArchDirectory)\\include</VCPKGIncludeDirectory> - <VCPKGLibs Condition="'\$(Configuration)'=='Debug'">$libs_debug</VCPKGLibs> - <VCPKGLibs Condition="'\$(Configuration)'!='Debug'">$libs_release</VCPKGLibs> + <VCPKGLibs Condition="'\(Configuration)'=='Debug'">$libs_debug</VCPKGLibs> + <VCPKGLibs Condition="'\(Configuration)'!='Debug'">$libs_release</VCPKGLibs> </PropertyGroup> <Import Project="\$(VCTargetsPath)\\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'\$(Configuration)'=='Debug'" Label="Configuration"> @@ -278,9 +277,6 @@ EOM if ($target eq 'git') { print F " <Import Project=\"LinkOrCopyBuiltins.targets\" />\n"; } - if ($target eq 'git-remote-http') { - print F " <Import Project=\"LinkOrCopyRemoteHttp.targets\" />\n"; - } print F << "EOM"; </Project> EOM diff --git a/third_party/git/contrib/buildsystems/engine.pl b/third_party/git/contrib/buildsystems/engine.pl index 070978506a..fba8a3f056 100755 --- a/third_party/git/contrib/buildsystems/engine.pl +++ b/third_party/git/contrib/buildsystems/engine.pl @@ -343,9 +343,9 @@ sub handleLinkLine } elsif ("$part" eq "-lz") { push(@libs, "zlib.lib"); } elsif ("$part" eq "-lcrypto") { - push(@libs, "libcrypto.lib"); + push(@libs, "libeay32.lib"); } elsif ("$part" eq "-lssl") { - push(@libs, "libssl.lib"); + push(@libs, "ssleay32.lib"); } elsif ("$part" eq "-lcurl") { push(@libs, "libcurl.lib"); } elsif ("$part" eq "-lexpat") { diff --git a/third_party/git/contrib/coccinelle/commit.cocci b/third_party/git/contrib/coccinelle/commit.cocci index 778e4704f6..d03453341e 100644 --- a/third_party/git/contrib/coccinelle/commit.cocci +++ b/third_party/git/contrib/coccinelle/commit.cocci @@ -20,7 +20,7 @@ expression s; + set_commit_tree(c, s) ...>} -// These excluded functions must access c->maybe_tree directly. +// These excluded functions must access c->maybe_tree direcly. // Note that if c->maybe_tree is written somewhere outside of these // functions, then the recommended transformation will be bogus with // repo_get_commit_tree() on the LHS. diff --git a/third_party/git/contrib/coccinelle/hashmap.cocci b/third_party/git/contrib/coccinelle/hashmap.cocci deleted file mode 100644 index d69e120ccf..0000000000 --- a/third_party/git/contrib/coccinelle/hashmap.cocci +++ /dev/null @@ -1,16 +0,0 @@ -@ hashmap_entry_init_usage @ -expression E; -struct hashmap_entry HME; -@@ -- HME.hash = E; -+ hashmap_entry_init(&HME, E); - -@@ -identifier f !~ "^hashmap_entry_init$"; -expression E; -struct hashmap_entry *HMEP; -@@ - f(...) {<... -- HMEP->hash = E; -+ hashmap_entry_init(HMEP, E); - ...>} diff --git a/third_party/git/contrib/coccinelle/object_id.cocci b/third_party/git/contrib/coccinelle/object_id.cocci index ddf4f22bd7..3e536a9834 100644 --- a/third_party/git/contrib/coccinelle/object_id.cocci +++ b/third_party/git/contrib/coccinelle/object_id.cocci @@ -13,6 +13,38 @@ struct object_id *OIDPTR; @@ struct object_id OID; @@ +- sha1_to_hex(OID.hash) ++ oid_to_hex(&OID) + +@@ +identifier f != oid_to_hex; +struct object_id *OIDPTR; +@@ + f(...) {<... +- sha1_to_hex(OIDPTR->hash) ++ oid_to_hex(OIDPTR) + ...>} + +@@ +expression E; +struct object_id OID; +@@ +- sha1_to_hex_r(E, OID.hash) ++ oid_to_hex_r(E, &OID) + +@@ +identifier f != oid_to_hex_r; +expression E; +struct object_id *OIDPTR; +@@ + f(...) {<... +- sha1_to_hex_r(E, OIDPTR->hash) ++ oid_to_hex_r(E, OIDPTR) + ...>} + +@@ +struct object_id OID; +@@ - hashclr(OID.hash) + oidclr(&OID) diff --git a/third_party/git/contrib/completion/git-completion.bash b/third_party/git/contrib/completion/git-completion.bash index c21786f2fd..e087c4bf00 100644 --- a/third_party/git/contrib/completion/git-completion.bash +++ b/third_party/git/contrib/completion/git-completion.bash @@ -340,7 +340,7 @@ __gitcomp () c="$c${4-}" if [[ $c == "$cur_"* ]]; then case $c in - --*=|*.) ;; + --*=*|*.) ;; *) c="$c " ;; esac COMPREPLY[i++]="${2-}$c" @@ -360,7 +360,7 @@ __gitcomp () c="$c${4-}" if [[ $c == "$cur_"* ]]; then case $c in - *=|*.) ;; + --*=*|*.) ;; *) c="$c " ;; esac COMPREPLY[i++]="${2-}$c" @@ -524,7 +524,7 @@ __git_index_files () # Even when a directory name itself does not contain # any special characters, it will still be quoted if # any of its (stripped) trailing path components do. - # Because of this we may have seen the same directory + # Because of this we may have seen the same direcory # both quoted and unquoted. if (p in paths) # We have seen the same directory unquoted, @@ -550,7 +550,7 @@ __git_index_files () esc_idx, 1) } else if (esc == "n") { # Uh-oh, a newline character. - # We cannot reliably put a pathname + # We cant reliably put a pathname # containing a newline into COMPREPLY, # and the newline would create a mess. # Skip this path. @@ -565,7 +565,7 @@ __git_index_files () } } # Drop closing double quote, if there is one. - # (There is not any if this is a directory, as it was + # (There isnt any if this is a directory, as it was # already stripped with the trailing path components.) if (substr(p, length(p), 1) == "\"") out = out substr(p, 1, length(p) - 1) @@ -1069,32 +1069,15 @@ __git_aliased_command () done } -# Check whether one of the given words is present on the command line, -# and print the first word found. -# -# Usage: __git_find_on_cmdline [<option>]... "<wordlist>" -# --show-idx: Optionally show the index of the found word in the $words array. +# __git_find_on_cmdline requires 1 argument __git_find_on_cmdline () { - local word c=1 show_idx - - while test $# -gt 1; do - case "$1" in - --show-idx) show_idx=y ;; - *) return 1 ;; - esac - shift - done - local wordlist="$1" - + local word subcommand c=1 while [ $c -lt $cword ]; do - for word in $wordlist; do - if [ "$word" = "${words[c]}" ]; then - if [ -n "$show_idx" ]; then - echo "$c $word" - else - echo "$word" - fi + word="${words[c]}" + for subcommand in $1; do + if [ "$subcommand" = "$word" ]; then + echo "$subcommand" return fi done @@ -1197,7 +1180,6 @@ __git_count_arguments () __git_whitespacelist="nowarn warn error error-all fix" __git_patchformat="mbox stgit stgit-series hg mboxrd" -__git_showcurrentpatch="diff raw" __git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch" _git_am () @@ -1216,10 +1198,6 @@ _git_am () __gitcomp "$__git_patchformat" "" "${cur##--patch-format=}" return ;; - --show-current-patch=*) - __gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}" - return - ;; --*) __gitcomp_builtin am "" \ "$__git_am_inprogress_options" @@ -1272,7 +1250,10 @@ _git_archive () return ;; --*) - __gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes" + __gitcomp " + --format= --list --verbose + --prefix= --remote= --exec= --output + " return ;; esac @@ -1380,9 +1361,7 @@ _git_checkout () esac } -__git_sequencer_inprogress_options="--continue --quit --abort --skip" - -__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options +__git_cherry_pick_inprogress_options="--continue --quit --abort" _git_cherry_pick () { @@ -1420,18 +1399,7 @@ _git_clean () _git_clone () { - case "$prev" in - -c|--config) - __git_complete_config_variable_name_and_value - return - ;; - esac case "$cur" in - --config=*) - __git_complete_config_variable_name_and_value \ - --cur="${cur##--config=}" - return - ;; --*) __gitcomp_builtin clone return @@ -1492,16 +1460,9 @@ __git_diff_algorithms="myers minimal patience histogram" __git_diff_submodule_formats="diff log short" -__git_color_moved_opts="no default plain blocks zebra dimmed-zebra" - -__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change - ignore-all-space allow-indentation-change" - __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color --no-color --color-words --no-renames --check - --color-moved --color-moved= --no-color-moved - --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change @@ -1515,8 +1476,6 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --dirstat-by-file= --cumulative --diff-algorithm= --submodule --submodule= --ignore-submodules - --indent-heuristic --no-indent-heuristic - --textconv --no-textconv " _git_diff () @@ -1532,14 +1491,6 @@ _git_diff () __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}" return ;; - --color-moved=*) - __gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}" - return - ;; - --color-moved-ws=*) - __gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}" - return - ;; --*) __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex --base --ours --theirs --no-index @@ -1786,7 +1737,7 @@ __git_log_shortlog_options=" --all-match --invert-grep " -__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd" +__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd" __git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:" _git_log () @@ -1833,10 +1784,6 @@ _git_log () __gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}" return ;; - --no-walk=*) - __gitcomp "sorted unsorted" "" "${cur##--no-walk=}" - return - ;; --*) __gitcomp " $__git_log_common_options @@ -1844,19 +1791,16 @@ _git_log () $__git_log_gitk_options --root --topo-order --date-order --reverse --follow --full-diff - --abbrev-commit --no-abbrev-commit --abbrev= + --abbrev-commit --abbrev= --relative-date --date= --pretty= --format= --oneline --show-signature --cherry-mark --cherry-pick --graph - --decorate --decorate= --no-decorate + --decorate --decorate= --walk-reflogs - --no-walk --no-walk= --do-walk --parents --children - --expand-tabs --expand-tabs= --no-expand-tabs - --patch $merge $__git_diff_common_options --pickaxe-all --pickaxe-regex @@ -2060,18 +2004,15 @@ _git_range_diff () __git_complete_revlist } -__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch" -__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo" - _git_rebase () { __git_find_repo_path if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then - __gitcomp "$__git_rebase_interactive_inprogress_options" + __gitcomp "--continue --skip --abort --quit --edit-todo --show-current-patch" return elif [ -d "$__git_repo_path"/rebase-apply ] || \ [ -d "$__git_repo_path"/rebase-merge ]; then - __gitcomp "$__git_rebase_inprogress_options" + __gitcomp "--continue --skip --abort --quit --show-current-patch" return fi __git_complete_strategy && return @@ -2080,13 +2021,20 @@ _git_rebase () __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}" return ;; - --onto=*) - __git_complete_refs --cur="${cur##--onto=}" - return - ;; --*) - __gitcomp_builtin rebase "" \ - "$__git_rebase_interactive_inprogress_options" + __gitcomp " + --onto --merge --strategy --interactive + --rebase-merges --preserve-merges --stat --no-stat + --committer-date-is-author-date --ignore-date + --ignore-whitespace --whitespace= + --autosquash --no-autosquash + --fork-point --no-fork-point + --autostash --no-autostash + --verify --no-verify + --keep-empty --root --force-rebase --no-ff + --rerere-autoupdate + --exec + " return esac @@ -2277,282 +2225,181 @@ __git_config_vars= __git_compute_config_vars () { test -n "$__git_config_vars" || - __git_config_vars="$(git help --config-for-completion | sort -u)" + __git_config_vars="$(git help --config-for-completion | sort | uniq)" } -# Completes possible values of various configuration variables. -# -# Usage: __git_complete_config_variable_value [<option>]... -# --varname=<word>: The name of the configuration variable whose value is -# to be completed. Defaults to the previous word on the -# command line. -# --cur=<word>: The current value to be completed. Defaults to the current -# word to be completed. -__git_complete_config_variable_value () +_git_config () { - local varname="$prev" cur_="$cur" - - while test $# != 0; do - case "$1" in - --varname=*) varname="${1##--varname=}" ;; - --cur=*) cur_="${1##--cur=}" ;; - *) return 1 ;; - esac - shift - done + local varname if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then - varname="${varname,,}" + varname="${prev,,}" else - varname="$(echo "$varname" |tr A-Z a-z)" + varname="$(echo "$prev" |tr A-Z a-z)" fi case "$varname" in branch.*.remote|branch.*.pushremote) - __gitcomp_nl "$(__git_remotes)" "" "$cur_" + __gitcomp_nl "$(__git_remotes)" return ;; branch.*.merge) - __git_complete_refs --cur="$cur_" + __git_complete_refs return ;; branch.*.rebase) - __gitcomp "false true merges preserve interactive" "" "$cur_" + __gitcomp "false true merges preserve interactive" return ;; remote.pushdefault) - __gitcomp_nl "$(__git_remotes)" "" "$cur_" + __gitcomp_nl "$(__git_remotes)" return ;; remote.*.fetch) - local remote="${varname#remote.}" + local remote="${prev#remote.}" remote="${remote%.fetch}" - if [ -z "$cur_" ]; then + if [ -z "$cur" ]; then __gitcomp_nl "refs/heads/" "" "" "" return fi - __gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_" + __gitcomp_nl "$(__git_refs_remotes "$remote")" return ;; remote.*.push) - local remote="${varname#remote.}" + local remote="${prev#remote.}" remote="${remote%.push}" __gitcomp_nl "$(__git for-each-ref \ - --format='%(refname):%(refname)' refs/heads)" "" "$cur_" + --format='%(refname):%(refname)' refs/heads)" return ;; pull.twohead|pull.octopus) __git_compute_merge_strategies - __gitcomp "$__git_merge_strategies" "" "$cur_" + __gitcomp "$__git_merge_strategies" + return + ;; + color.branch|color.diff|color.interactive|\ + color.showbranch|color.status|color.ui) + __gitcomp "always never auto" return ;; color.pager) - __gitcomp "false true" "" "$cur_" + __gitcomp "false true" return ;; color.*.*) __gitcomp " normal black red green yellow blue magenta cyan white bold dim ul blink reverse - " "" "$cur_" - return - ;; - color.*) - __gitcomp "false true always never auto" "" "$cur_" + " return ;; diff.submodule) - __gitcomp "$__git_diff_submodule_formats" "" "$cur_" + __gitcomp "$__git_diff_submodule_formats" return ;; help.format) - __gitcomp "man info web html" "" "$cur_" + __gitcomp "man info web html" return ;; log.date) - __gitcomp "$__git_log_date_formats" "" "$cur_" + __gitcomp "$__git_log_date_formats" return ;; sendemail.aliasfiletype) - __gitcomp "mutt mailrc pine elm gnus" "" "$cur_" + __gitcomp "mutt mailrc pine elm gnus" return ;; sendemail.confirm) - __gitcomp "$__git_send_email_confirm_options" "" "$cur_" + __gitcomp "$__git_send_email_confirm_options" return ;; sendemail.suppresscc) - __gitcomp "$__git_send_email_suppresscc_options" "" "$cur_" + __gitcomp "$__git_send_email_suppresscc_options" return ;; sendemail.transferencoding) - __gitcomp "7bit 8bit quoted-printable base64" "" "$cur_" + __gitcomp "7bit 8bit quoted-printable base64" + return + ;; + --get|--get-all|--unset|--unset-all) + __gitcomp_nl "$(__git_config_get_set_variables)" return ;; *.*) return ;; esac -} - -# Completes configuration sections, subsections, variable names. -# -# Usage: __git_complete_config_variable_name [<option>]... -# --cur=<word>: The current configuration section/variable name to be -# completed. Defaults to the current word to be completed. -# --sfx=<suffix>: A suffix to be appended to each fully completed -# configuration variable name (but not to sections or -# subsections) instead of the default space. -__git_complete_config_variable_name () -{ - local cur_="$cur" sfx - - while test $# != 0; do - case "$1" in - --cur=*) cur_="${1##--cur=}" ;; - --sfx=*) sfx="${1##--sfx=}" ;; - *) return 1 ;; - esac - shift - done - - case "$cur_" in + case "$cur" in + --*) + __gitcomp_builtin config + return + ;; branch.*.*) - local pfx="${cur_%.*}." - cur_="${cur_##*.}" - __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx" + local pfx="${cur%.*}." cur_="${cur##*.}" + __gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" return ;; branch.*) - local pfx="${cur%.*}." - cur_="${cur#*.}" + local pfx="${cur%.*}." cur_="${cur#*.}" __gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")" - __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx" + __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" return ;; guitool.*.*) - local pfx="${cur_%.*}." - cur_="${cur_##*.}" + local pfx="${cur%.*}." cur_="${cur##*.}" __gitcomp " argPrompt cmd confirm needsFile noConsole noRescan prompt revPrompt revUnmerged title - " "$pfx" "$cur_" "$sfx" + " "$pfx" "$cur_" return ;; difftool.*.*) - local pfx="${cur_%.*}." - cur_="${cur_##*.}" - __gitcomp "cmd path" "$pfx" "$cur_" "$sfx" + local pfx="${cur%.*}." cur_="${cur##*.}" + __gitcomp "cmd path" "$pfx" "$cur_" return ;; man.*.*) - local pfx="${cur_%.*}." - cur_="${cur_##*.}" - __gitcomp "cmd path" "$pfx" "$cur_" "$sfx" + local pfx="${cur%.*}." cur_="${cur##*.}" + __gitcomp "cmd path" "$pfx" "$cur_" return ;; mergetool.*.*) - local pfx="${cur_%.*}." - cur_="${cur_##*.}" - __gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx" + local pfx="${cur%.*}." cur_="${cur##*.}" + __gitcomp "cmd path trustExitCode" "$pfx" "$cur_" return ;; pager.*) - local pfx="${cur_%.*}." - cur_="${cur_#*.}" + local pfx="${cur%.*}." cur_="${cur#*.}" __git_compute_all_commands - __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx" + __gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" return ;; remote.*.*) - local pfx="${cur_%.*}." - cur_="${cur_##*.}" + local pfx="${cur%.*}." cur_="${cur##*.}" __gitcomp " url proxy fetch push mirror skipDefaultUpdate receivepack uploadpack tagOpt pushurl - " "$pfx" "$cur_" "$sfx" + " "$pfx" "$cur_" return ;; remote.*) - local pfx="${cur_%.*}." - cur_="${cur_#*.}" + local pfx="${cur%.*}." cur_="${cur#*.}" __gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "." - __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx" + __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" return ;; url.*.*) - local pfx="${cur_%.*}." - cur_="${cur_##*.}" - __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx" + local pfx="${cur%.*}." cur_="${cur##*.}" + __gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" return ;; *.*) __git_compute_config_vars - __gitcomp "$__git_config_vars" "" "$cur_" "$sfx" + __gitcomp "$__git_config_vars" ;; *) __git_compute_config_vars - __gitcomp "$(echo "$__git_config_vars" | - awk -F . '{ - sections[$1] = 1 - } - END { - for (s in sections) - print s "." - } - ')" "" "$cur_" - ;; - esac -} - -# Completes '='-separated configuration sections/variable names and values -# for 'git -c section.name=value'. -# -# Usage: __git_complete_config_variable_name_and_value [<option>]... -# --cur=<word>: The current configuration section/variable name/value to be -# completed. Defaults to the current word to be completed. -__git_complete_config_variable_name_and_value () -{ - local cur_="$cur" - - while test $# != 0; do - case "$1" in - --cur=*) cur_="${1##--cur=}" ;; - *) return 1 ;; - esac - shift - done - - case "$cur_" in - *=*) - __git_complete_config_variable_value \ - --varname="${cur_%%=*}" --cur="${cur_#*=}" - ;; - *) - __git_complete_config_variable_name --cur="$cur_" --sfx='=' - ;; - esac -} - -_git_config () -{ - case "$prev" in - --get|--get-all|--unset|--unset-all) - __gitcomp_nl "$(__git_config_get_set_variables)" - return - ;; - *.*) - __git_complete_config_variable_value - return - ;; - esac - case "$cur" in - --*) - __gitcomp_builtin config - ;; - *) - __git_complete_config_variable_name - ;; + __gitcomp "$(echo "$__git_config_vars" | sed 's/\.[^ ]*/./g')" esac } @@ -2665,7 +2512,7 @@ _git_restore () esac } -__git_revert_inprogress_options=$__git_sequencer_inprogress_options +__git_revert_inprogress_options="--continue --quit --abort" _git_revert () { @@ -2733,9 +2580,8 @@ _git_show () return ;; --*) - __gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit - --oneline --show-signature --patch - --expand-tabs --expand-tabs= --no-expand-tabs + __gitcomp "--pretty= --format= --abbrev-commit --oneline + --show-signature $__git_diff_common_options " return @@ -2755,27 +2601,6 @@ _git_show_branch () __git_complete_revlist } -_git_sparse_checkout () -{ - local subcommands="list init set disable" - local subcommand="$(__git_find_on_cmdline "$subcommands")" - if [ -z "$subcommand" ]; then - __gitcomp "$subcommands" - return - fi - - case "$subcommand,$cur" in - init,--*) - __gitcomp "--cone" - ;; - set,--*) - __gitcomp "--stdin" - ;; - *) - ;; - esac -} - _git_stash () { local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked' @@ -2841,7 +2666,7 @@ _git_submodule () { __git_has_doubledash && return - local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs" + local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then case "$cur" in @@ -2905,7 +2730,6 @@ _git_svn () --log-window-size= --no-checkout --quiet --repack-flags --use-log-author --localtime --add-author-from - --recursive --ignore-paths= --include-paths= $remote_opts " local init_opts=" @@ -3027,83 +2851,33 @@ _git_whatchanged () _git_log } -__git_complete_worktree_paths () -{ - local IFS=$'\n' - __gitcomp_nl "$(git worktree list --porcelain | - # Skip the first entry: it's the path of the main worktree, - # which can't be moved, removed, locked, etc. - sed -n -e '2,$ s/^worktree //p')" -} - _git_worktree () { local subcommands="add list lock move prune remove unlock" - local subcommand subcommand_idx - - subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")" - subcommand_idx="${subcommand% *}" - subcommand="${subcommand#* }" - - case "$subcommand,$cur" in - ,*) + local subcommand="$(__git_find_on_cmdline "$subcommands")" + if [ -z "$subcommand" ]; then __gitcomp "$subcommands" - ;; - *,--*) - __gitcomp_builtin worktree_$subcommand - ;; - add,*) # usage: git worktree add [<options>] <path> [<commit-ish>] - # Here we are not completing an --option, it's either the - # path or a ref. - case "$prev" in - -b|-B) # Complete refs for branch to be created/reseted. - __git_complete_refs + else + case "$subcommand,$cur" in + add,--*) + __gitcomp_builtin worktree_add ;; - -*) # The previous word is an -o|--option without an - # unstuck argument: have to complete the path for - # the new worktree, so don't list anything, but let - # Bash fall back to filename completion. - ;; - *) # The previous word is not an --option, so it must - # be either the 'add' subcommand, the unstuck - # argument of an option (e.g. branch for -b|-B), or - # the path for the new worktree. - if [ $cword -eq $((subcommand_idx+1)) ]; then - # Right after the 'add' subcommand: have to - # complete the path, so fall back to Bash - # filename completion. - : - else - case "${words[cword-2]}" in - -b|-B) # After '-b <branch>': have to - # complete the path, so fall back - # to Bash filename completion. - ;; - *) # After the path: have to complete - # the ref to be checked out. - __git_complete_refs - ;; - esac - fi + list,--*) + __gitcomp_builtin worktree_list + ;; + lock,--*) + __gitcomp_builtin worktree_lock + ;; + prune,--*) + __gitcomp_builtin worktree_prune + ;; + remove,--*) + __gitcomp "--force" + ;; + *) ;; esac - ;; - lock,*|remove,*|unlock,*) - __git_complete_worktree_paths - ;; - move,*) - if [ $cword -eq $((subcommand_idx+1)) ]; then - # The first parameter must be an existing working - # tree to be moved. - __git_complete_worktree_paths - else - # The second parameter is the destination: it could - # be any path, so don't list anything, but let Bash - # fall back to filename completion. - : - fi - ;; - esac + fi } __git_complete_common () { @@ -3182,11 +2956,7 @@ __git_main () # Bash filename completion return ;; - -c) - __git_complete_config_variable_name_and_value - return - ;; - --namespace) + -c|--namespace) # we don't support completing these options' arguments return ;; diff --git a/third_party/git/contrib/completion/git-completion.zsh b/third_party/git/contrib/completion/git-completion.zsh index eef4eff53d..886bf95d1f 100644 --- a/third_party/git/contrib/completion/git-completion.zsh +++ b/third_party/git/contrib/completion/git-completion.zsh @@ -11,9 +11,8 @@ # # zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh # -# The recommended way to install this script is to make a copy of it in -# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following -# to your ~/.zshrc file: +# The recommended way to install this script is to copy to '~/.zsh/_git', and +# then add the following to your ~/.zshrc file: # # fpath=(~/.zsh $fpath) diff --git a/third_party/git/contrib/completion/git-prompt.sh b/third_party/git/contrib/completion/git-prompt.sh index 014cd7c3cf..1d510cd47b 100644 --- a/third_party/git/contrib/completion/git-prompt.sh +++ b/third_party/git/contrib/completion/git-prompt.sh @@ -429,7 +429,11 @@ __git_ps1 () __git_eread "$g/rebase-merge/head-name" b __git_eread "$g/rebase-merge/msgnum" step __git_eread "$g/rebase-merge/end" total - r="|REBASE" + if [ -f "$g/rebase-merge/interactive" ]; then + r="|REBASE-i" + else + r="|REBASE-m" + fi else if [ -d "$g/rebase-apply" ]; then __git_eread "$g/rebase-apply/next" step diff --git a/third_party/git/contrib/credential/netrc/.gitignore b/third_party/git/contrib/credential/netrc/.gitignore deleted file mode 100644 index d41cdde84b..0000000000 --- a/third_party/git/contrib/credential/netrc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -git-credential-netrc diff --git a/third_party/git/contrib/credential/netrc/Makefile b/third_party/git/contrib/credential/netrc/Makefile index c284fb8ac4..6174e3bb83 100644 --- a/third_party/git/contrib/credential/netrc/Makefile +++ b/third_party/git/contrib/credential/netrc/Makefile @@ -1,30 +1,8 @@ # The default target of this Makefile is... all:: -SCRIPT_PERL = git-credential-netrc.perl -GIT_ROOT_DIR = ../../.. -HERE = contrib/credential/netrc - -SCRIPT_PERL_FULL = $(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) - -all:: build - -build: - $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ - build-perl-script - -install: build - $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ - install-perl-script - -clean: - $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \ - clean-perl-script - -test: build +test: ./t-git-credential-netrc.sh -testverbose: build +testverbose: ./t-git-credential-netrc.sh -d -v - -.PHONY: all build install clean test testverbose diff --git a/third_party/git/contrib/credential/netrc/git-credential-netrc.perl b/third_party/git/contrib/credential/netrc/git-credential-netrc index bc57cc6588..ebfc123ec6 100755 --- a/third_party/git/contrib/credential/netrc/git-credential-netrc.perl +++ b/third_party/git/contrib/credential/netrc/git-credential-netrc @@ -423,7 +423,7 @@ sub load_config { # load settings from git config my $options = shift; # set from command argument, gpg.program option, or default to gpg - $options->{'gpg'} //= Git::config('gpg.program') + $options->{'gpg'} //= Git->repository()->config('gpg.program') // 'gpg'; log_verbose("using $options{'gpg'} for GPG operations"); } diff --git a/third_party/git/contrib/diff-highlight/DiffHighlight.pm b/third_party/git/contrib/diff-highlight/DiffHighlight.pm index e2589922a6..7440aa1c46 100644 --- a/third_party/git/contrib/diff-highlight/DiffHighlight.pm +++ b/third_party/git/contrib/diff-highlight/DiffHighlight.pm @@ -72,7 +72,7 @@ sub handle_line { (?:$COLOR?\|$COLOR?[ ])* # zero or more trailing "|" [ ]* # trailing whitespace for merges /x) { - my $graph_prefix = $&; + my $graph_prefix = $&; # We must flush before setting graph indent, since the # new commit may be indented differently from what we diff --git a/third_party/git/contrib/hg-to-git/hg-to-git.py b/third_party/git/contrib/hg-to-git/hg-to-git.py index 7eb1b24cc7..de3f81667e 100755 --- a/third_party/git/contrib/hg-to-git/hg-to-git.py +++ b/third_party/git/contrib/hg-to-git/hg-to-git.py @@ -42,7 +42,7 @@ hgnewcsets = 0 def usage(): - print("""\ + print """\ %s: [OPTIONS] <hgprj> options: @@ -54,7 +54,7 @@ options: required: hgprj: name of the HG project to import (directory) -""" % sys.argv[0]) +""" % sys.argv[0] #------------------------------------------------------------------------------ @@ -104,22 +104,22 @@ os.chdir(hgprj) if state: if os.path.exists(state): if verbose: - print('State does exist, reading') + print 'State does exist, reading' f = open(state, 'r') hgvers = pickle.load(f) else: - print('State does not exist, first run') + print 'State does not exist, first run' sock = os.popen('hg tip --template "{rev}"') tip = sock.read() if sock.close(): sys.exit(1) if verbose: - print('tip is', tip) + print 'tip is', tip # Calculate the branches if verbose: - print('analysing the branches...') + print 'analysing the branches...' hgchildren["0"] = () hgparents["0"] = (None, None) hgbranch["0"] = "master" @@ -154,15 +154,15 @@ for cset in range(1, int(tip) + 1): else: hgbranch[str(cset)] = "branch-" + str(cset) -if "0" not in hgvers: - print('creating repository') +if not hgvers.has_key("0"): + print 'creating repository' os.system('git init') # loop through every hg changeset for cset in range(int(tip) + 1): # incremental, already seen - if str(cset) in hgvers: + if hgvers.has_key(str(cset)): continue hgnewcsets += 1 @@ -180,27 +180,27 @@ for cset in range(int(tip) + 1): os.write(fdcomment, csetcomment) os.close(fdcomment) - print('-----------------------------------------') - print('cset:', cset) - print('branch:', hgbranch[str(cset)]) - print('user:', user) - print('date:', date) - print('comment:', csetcomment) + print '-----------------------------------------' + print 'cset:', cset + print 'branch:', hgbranch[str(cset)] + print 'user:', user + print 'date:', date + print 'comment:', csetcomment if parent: - print('parent:', parent) + print 'parent:', parent if mparent: - print('mparent:', mparent) + print 'mparent:', mparent if tag: - print('tag:', tag) - print('-----------------------------------------') + print 'tag:', tag + print '-----------------------------------------' # checkout the parent if necessary if cset != 0: if hgbranch[str(cset)] == "branch-" + str(cset): - print('creating new branch', hgbranch[str(cset)]) + print 'creating new branch', hgbranch[str(cset)] os.system('git checkout -b %s %s' % (hgbranch[str(cset)], hgvers[parent])) else: - print('checking out branch', hgbranch[str(cset)]) + print 'checking out branch', hgbranch[str(cset)] os.system('git checkout %s' % hgbranch[str(cset)]) # merge @@ -209,7 +209,7 @@ for cset in range(int(tip) + 1): otherbranch = hgbranch[mparent] else: otherbranch = hgbranch[parent] - print('merging', otherbranch, 'into', hgbranch[str(cset)]) + print 'merging', otherbranch, 'into', hgbranch[str(cset)] os.system(getgitenv(user, date) + 'git merge --no-commit -s ours "" %s %s' % (hgbranch[str(cset)], otherbranch)) # remove everything except .git and .hg directories @@ -233,12 +233,12 @@ for cset in range(int(tip) + 1): # delete branch if not used anymore... if mparent and len(hgchildren[str(cset)]): - print("Deleting unused branch:", otherbranch) + print "Deleting unused branch:", otherbranch os.system('git branch -d %s' % otherbranch) # retrieve and record the version vvv = os.popen('git show --quiet --pretty=format:%H').read() - print('record', cset, '->', vvv) + print 'record', cset, '->', vvv hgvers[str(cset)] = vvv if hgnewcsets >= opt_nrepack and opt_nrepack != -1: @@ -247,7 +247,7 @@ if hgnewcsets >= opt_nrepack and opt_nrepack != -1: # write the state for incrementals if state: if verbose: - print('Writing state') + print 'Writing state' f = open(state, 'w') pickle.dump(hgvers, f) diff --git a/third_party/git/contrib/hooks/multimail/git_multimail.py b/third_party/git/contrib/hooks/multimail/git_multimail.py index f563be82fc..8823399e75 100755 --- a/third_party/git/contrib/hooks/multimail/git_multimail.py +++ b/third_party/git/contrib/hooks/multimail/git_multimail.py @@ -95,7 +95,7 @@ if PYTHON3: unicode = str def write_str(f, msg): - # Try outputting with the default encoding. If it fails, + # Try outputing with the default encoding. If it fails, # try UTF-8. try: f.buffer.write(msg.encode(sys.getdefaultencoding())) @@ -2129,7 +2129,7 @@ class SMTPMailer(Mailer): # equivalent to # self.smtp.ehlo() # self.smtp.starttls() - # with access to the ssl layer + # with acces to the ssl layer self.smtp.ehlo() if not self.smtp.has_extn("starttls"): raise smtplib.SMTPException("STARTTLS extension not supported by server") @@ -2148,7 +2148,7 @@ class SMTPMailer(Mailer): cert_reqs=ssl.CERT_NONE ) self.environment.get_logger().error( - '*** Warning, the server certificate is not verified (smtp) ***\n' + '*** Warning, the server certificat is not verified (smtp) ***\n' '*** set the option smtpCACerts ***\n' ) if not hasattr(self.smtp.sock, "read"): @@ -3189,7 +3189,7 @@ class ProjectdescEnvironmentMixin(Environment): self.COMPUTED_KEYS += ['projectdesc'] def get_projectdesc(self): - """Return a one-line description of the project.""" + """Return a one-line descripition of the project.""" git_dir = get_git_dir() try: diff --git a/third_party/git/contrib/hooks/multimail/post-receive.example b/third_party/git/contrib/hooks/multimail/post-receive.example index 0f98c5a23d..b9bb11834e 100755 --- a/third_party/git/contrib/hooks/multimail/post-receive.example +++ b/third_party/git/contrib/hooks/multimail/post-receive.example @@ -56,7 +56,7 @@ config = git_multimail.Config('multimailhook') # Set some Git configuration variables. Equivalent to passing var=val # to "git -c var=val" each time git is called, or to adding the -# configuration in .git/config (must come before instantiating the +# configuration in .git/config (must come before instanciating the # environment) : #git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html') #git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com')) diff --git a/third_party/git/contrib/hooks/post-receive-email b/third_party/git/contrib/hooks/post-receive-email index ff565eb3d8..8747b84334 100755 --- a/third_party/git/contrib/hooks/post-receive-email +++ b/third_party/git/contrib/hooks/post-receive-email @@ -329,7 +329,7 @@ generate_update_branch_email() # # git rev-parse --not --all | grep -v $(git rev-parse $refname) # - # Gets us to something pretty safe (apart from the small time + # Get's us to something pretty safe (apart from the small time # between refname being read, and git rev-parse running - for that, # I give up) # diff --git a/third_party/git/contrib/hooks/update-paranoid b/third_party/git/contrib/hooks/update-paranoid index 0092d67b8a..d18b317b2f 100755 --- a/third_party/git/contrib/hooks/update-paranoid +++ b/third_party/git/contrib/hooks/update-paranoid @@ -49,7 +49,7 @@ opcode. Repository sections are matched on the basename of the repository (after removing the .git suffix). -The opcode abbreviations are: +The opcode abbrevations are: C: create new ref D: delete existing ref diff --git a/third_party/git/contrib/mw-to-git/.perlcriticrc b/third_party/git/contrib/mw-to-git/.perlcriticrc index b7333267ad..158958d363 100644 --- a/third_party/git/contrib/mw-to-git/.perlcriticrc +++ b/third_party/git/contrib/mw-to-git/.perlcriticrc @@ -14,7 +14,7 @@ # This rule states that each system call should have its return value checked # The problem is that it includes the print call. Checking every print call's -# return value would be harmful to the code readability. +# return value would be harmful to the code readabilty. # This configuration keeps all default function but print. [InputOutput::RequireCheckedSyscalls] functions = open say close diff --git a/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl b/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl index d8ff2e69c4..af9cbc9d0f 100755 --- a/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl +++ b/third_party/git/contrib/mw-to-git/git-remote-mediawiki.perl @@ -79,7 +79,7 @@ chomp($export_media); $export_media = !($export_media eq 'false'); my $wiki_login = run_git("config --get remote.${remotename}.mwLogin"); -# Note: mwPassword is discouraged. Use the credential system instead. +# Note: mwPassword is discourraged. Use the credential system instead. my $wiki_passwd = run_git("config --get remote.${remotename}.mwPassword"); my $wiki_domain = run_git("config --get remote.${remotename}.mwDomain"); chomp($wiki_login); diff --git a/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php b/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php index b033849800..0f3f4e018a 100644 --- a/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php +++ b/third_party/git/contrib/mw-to-git/t/install-wiki/db_install.php @@ -24,7 +24,7 @@ $url = 'http://localhost:'.$port.'/wiki/mw-config/index.php'; $db_dir = urlencode($tmp); $tmp_cookie = tempnam($tmp, "COOKIE_"); /* - * Fetches a page with cURL. + * Fetchs a page with cURL. */ function get($page_name = "") { $curl = curl_init(); diff --git a/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh index 9106833578..cfbfe7ddf6 100755 --- a/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh +++ b/third_party/git/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh @@ -143,7 +143,7 @@ test_expect_success 'Git clone works with one specific page cloned ' ' test_expect_success 'Git clone works with multiple specific page cloned ' ' wiki_reset && wiki_editpage foo "I will be there" false && - wiki_editpage bar "I will not disappear" false && + wiki_editpage bar "I will not disapear" false && wiki_editpage namnam "I be erased" false && wiki_editpage nyancat "nyan nyan nyan you will not erase me" false && wiki_delete_page namnam && diff --git a/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh b/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh index 3948a00282..6546294f15 100755 --- a/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh +++ b/third_party/git/contrib/mw-to-git/t/test-gitmw-lib.sh @@ -279,7 +279,7 @@ start_lighttpd () { "$LIGHTTPD_DIR"/lighttpd -f "$WEB"/lighttpd.conf if test $? -ne 0 ; then - echo "Could not execute http daemon lighttpd" + echo "Could not execute http deamon lighttpd" exit 1 fi } diff --git a/third_party/git/contrib/svn-fe/svn-fe.txt b/third_party/git/contrib/svn-fe/svn-fe.txt index 19333fc8df..a3425f4770 100644 --- a/third_party/git/contrib/svn-fe/svn-fe.txt +++ b/third_party/git/contrib/svn-fe/svn-fe.txt @@ -56,7 +56,7 @@ line. This line has the form `git-svn-id: URL@REVNO UUID`. The resulting repository will generally require further processing to put each project in its own repository and to separate the history -of each branch. The 'git filter-repo --subdirectory-filter' command +of each branch. The 'git filter-branch --subdirectory-filter' command may be useful for this purpose. BUGS @@ -67,5 +67,5 @@ The exit status does not reflect whether an error was detected. SEE ALSO -------- -git-svn(1), svn2git(1), svk(1), git-filter-repo(1), git-fast-import(1), +git-svn(1), svn2git(1), svk(1), git-filter-branch(1), git-fast-import(1), https://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt diff --git a/third_party/git/contrib/svn-fe/svnrdump_sim.py b/third_party/git/contrib/svn-fe/svnrdump_sim.py index 8a3cee6175..11ac6f6927 100755 --- a/third_party/git/contrib/svn-fe/svnrdump_sim.py +++ b/third_party/git/contrib/svn-fe/svnrdump_sim.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python """ Simulates svnrdump by replaying an existing dump from a file, taking care of the specified revision range. @@ -54,7 +54,7 @@ if __name__ == "__main__": print("usage: %s dump URL -rLOWER:UPPER") sys.exit(1) if not sys.argv[1] == 'dump': - raise NotImplementedError('only "dump" is supported.') + raise NotImplementedError('only "dump" is suppported.') url = sys.argv[2] r = ('0', 'HEAD') if len(sys.argv) == 4 and sys.argv[3][0:2] == '-r': diff --git a/third_party/git/convert.c b/third_party/git/convert.c index 5ead3ce678..94ff837649 100644 --- a/third_party/git/convert.c +++ b/third_party/git/convert.c @@ -8,7 +8,6 @@ #include "pkt-line.h" #include "sub-process.h" #include "utf8.h" -#include "ll-merge.h" /* * convert.c - convert a file when checking it out and checking it in. @@ -270,12 +269,8 @@ static int will_convert_lf_to_crlf(struct text_stat *stats, static int validate_encoding(const char *path, const char *enc, const char *data, size_t len, int die_on_error) { - const char *stripped; - /* We only check for UTF here as UTF?? can be an alias for UTF-?? */ - if (skip_iprefix(enc, "UTF", &stripped)) { - skip_prefix(stripped, "-", &stripped); - + if (istarts_with(enc, "UTF")) { /* * Check for detectable errors in UTF encodings */ @@ -289,10 +284,15 @@ static int validate_encoding(const char *path, const char *enc, */ const char *advise_msg = _( "The file '%s' contains a byte order " - "mark (BOM). Please use UTF-%.*s as " + "mark (BOM). Please use UTF-%s as " "working-tree-encoding."); - int stripped_len = strlen(stripped) - strlen("BE"); - advise(advise_msg, path, stripped_len, stripped); + const char *stripped = NULL; + char *upper = xstrdup_toupper(enc); + upper[strlen(upper)-2] = '\0'; + if (!skip_prefix(upper, "UTF-", &stripped)) + skip_prefix(stripped, "UTF", &stripped); + advise(advise_msg, path, stripped); + free(upper); if (die_on_error) die(error_msg, path, enc); else { @@ -307,7 +307,12 @@ static int validate_encoding(const char *path, const char *enc, "mark (BOM). Please use UTF-%sBE or UTF-%sLE " "(depending on the byte order) as " "working-tree-encoding."); + const char *stripped = NULL; + char *upper = xstrdup_toupper(enc); + if (!skip_prefix(upper, "UTF-", &stripped)) + skip_prefix(stripped, "UTF", &stripped); advise(advise_msg, path, stripped, stripped); + free(upper); if (die_on_error) die(error_msg, path, enc); else { @@ -412,7 +417,7 @@ static int encode_to_git(const char *path, const char *src, size_t src_len, if (!dst) { /* * We could add the blob "as-is" to Git. However, on checkout - * we would try to re-encode to the original encoding. This + * we would try to reencode to the original encoding. This * would fail and we would leave the user with a messed-up * working tree. Let's try to avoid this by screaming loud. */ @@ -1146,7 +1151,7 @@ static int ident_to_worktree(const char *src, size_t len, /* are we "faking" in place editing ? */ if (src == buf->buf) to_free = strbuf_detach(buf, NULL); - hash_object_file(the_hash_algo, src, len, "blob", &oid); + hash_object_file(src, len, "blob", &oid); strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3)); for (;;) { @@ -1288,11 +1293,10 @@ struct conv_attrs { const char *working_tree_encoding; /* Supported encoding or default encoding if NULL */ }; -static struct attr_check *check; - static void convert_attrs(const struct index_state *istate, struct conv_attrs *ca, const char *path) { + static struct attr_check *check; struct attr_check_item *ccheck = NULL; if (!check) { @@ -1335,23 +1339,6 @@ static void convert_attrs(const struct index_state *istate, ca->crlf_action = CRLF_AUTO_INPUT; } -void reset_parsed_attributes(void) -{ - struct convert_driver *drv, *next; - - attr_check_free(check); - check = NULL; - reset_merge_attributes(); - - for (drv = user_convert; drv; drv = next) { - next = drv->next; - free((void *)drv->name); - free(drv); - } - user_convert = NULL; - user_convert_tail = NULL; -} - int would_convert_to_git_filter_fd(const struct index_state *istate, const char *path) { struct conv_attrs ca; @@ -1940,7 +1927,7 @@ static struct stream_filter *ident_filter(const struct object_id *oid) * the contents cannot be filtered without reading the whole thing * in-core. * - * Note that you would be crazy to set CRLF, smudge/clean or ident to a + * Note that you would be crazy to set CRLF, smuge/clean or ident to a * large binary blob you would want us not to slurp into the memory! */ struct stream_filter *get_stream_filter(const struct index_state *istate, diff --git a/third_party/git/convert.h b/third_party/git/convert.h index 3710969d43..831559f10d 100644 --- a/third_party/git/convert.h +++ b/third_party/git/convert.h @@ -94,12 +94,6 @@ void convert_to_git_filter_fd(const struct index_state *istate, int would_convert_to_git_filter_fd(const struct index_state *istate, const char *path); -/* - * Reset the internal list of attributes used by convert_to_git and - * convert_to_working_tree. - */ -void reset_parsed_attributes(void); - /***************************************************************** * * Streaming conversion support diff --git a/third_party/git/credential-store.c b/third_party/git/credential-store.c index c010497cb2..ac295420dd 100644 --- a/third_party/git/credential-store.c +++ b/third_party/git/credential-store.c @@ -72,16 +72,15 @@ static void store_credential_file(const char *fn, struct credential *c) struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, "%s://", c->protocol); - strbuf_addstr_urlencode(&buf, c->username, is_rfc3986_unreserved); + strbuf_addstr_urlencode(&buf, c->username, 1); strbuf_addch(&buf, ':'); - strbuf_addstr_urlencode(&buf, c->password, is_rfc3986_unreserved); + strbuf_addstr_urlencode(&buf, c->password, 1); strbuf_addch(&buf, '@'); if (c->host) - strbuf_addstr_urlencode(&buf, c->host, is_rfc3986_unreserved); + strbuf_addstr_urlencode(&buf, c->host, 1); if (c->path) { strbuf_addch(&buf, '/'); - strbuf_addstr_urlencode(&buf, c->path, - is_rfc3986_reserved_or_unreserved); + strbuf_addstr_urlencode(&buf, c->path, 0); } rewrite_credential_file(fn, c, &buf); diff --git a/third_party/git/credential.c b/third_party/git/credential.c index 108d9e183a..62be651b03 100644 --- a/third_party/git/credential.c +++ b/third_party/git/credential.c @@ -6,7 +6,6 @@ #include "url.h" #include "prompt.h" #include "sigchain.h" -#include "urlmatch.h" void credential_init(struct credential *c) { @@ -41,7 +40,7 @@ static int credential_config_callback(const char *var, const char *value, void *data) { struct credential *c = data; - const char *key; + const char *key, *dot; if (!skip_prefix(var, "credential.", &key)) return 0; @@ -49,16 +48,31 @@ static int credential_config_callback(const char *var, const char *value, if (!value) return config_error_nonbool(var); + dot = strrchr(key, '.'); + if (dot) { + struct credential want = CREDENTIAL_INIT; + char *url = xmemdupz(key, dot - key); + int matched; + + credential_from_url(&want, url); + matched = credential_match(&want, c); + + credential_clear(&want); + free(url); + + if (!matched) + return 0; + key = dot + 1; + } + if (!strcmp(key, "helper")) { if (*value) string_list_append(&c->helpers, value); else string_list_clear(&c->helpers, 0); } else if (!strcmp(key, "username")) { - if (!c->username_from_proto) { - free(c->username); + if (!c->username) c->username = xstrdup(value); - } } else if (!strcmp(key, "usehttppath")) c->use_http_path = git_config_bool(var, value); @@ -73,43 +87,11 @@ static int proto_is_http(const char *s) return !strcmp(s, "https") || !strcmp(s, "http"); } -static void credential_describe(struct credential *c, struct strbuf *out); -static void credential_format(struct credential *c, struct strbuf *out); - -static int select_all(const struct urlmatch_item *a, - const struct urlmatch_item *b) -{ - return 0; -} - static void credential_apply_config(struct credential *c) { - char *normalized_url; - struct urlmatch_config config = { STRING_LIST_INIT_DUP }; - struct strbuf url = STRBUF_INIT; - - if (!c->host) - die(_("refusing to work with credential missing host field")); - if (!c->protocol) - die(_("refusing to work with credential missing protocol field")); - if (c->configured) return; - - config.section = "credential"; - config.key = NULL; - config.collect_fn = credential_config_callback; - config.cascade_fn = NULL; - config.select_fn = select_all; - config.cb = c; - - credential_format(c, &url); - normalized_url = url_normalize(url.buf, &config.url); - - git_config(urlmatch_config_entry, &config); - free(normalized_url); - strbuf_release(&url); - + git_config(credential_config_callback, c); c->configured = 1; if (!c->use_http_path && proto_is_http(c->protocol)) { @@ -130,23 +112,6 @@ static void credential_describe(struct credential *c, struct strbuf *out) strbuf_addf(out, "/%s", c->path); } -static void credential_format(struct credential *c, struct strbuf *out) -{ - if (!c->protocol) - return; - strbuf_addf(out, "%s://", c->protocol); - if (c->username && *c->username) { - strbuf_add_percentencode(out, c->username); - strbuf_addch(out, '@'); - } - if (c->host) - strbuf_addstr(out, c->host); - if (c->path) { - strbuf_addch(out, '/'); - strbuf_add_percentencode(out, c->path); - } -} - static char *credential_ask_one(const char *what, struct credential *c, int flags) { @@ -198,7 +163,6 @@ int credential_read(struct credential *c, FILE *fp) if (!strcmp(key, "username")) { free(c->username); c->username = xstrdup(value); - c->username_from_proto = 1; } else if (!strcmp(key, "password")) { free(c->password); c->password = xstrdup(value); @@ -227,25 +191,20 @@ int credential_read(struct credential *c, FILE *fp) return 0; } -static void credential_write_item(FILE *fp, const char *key, const char *value, - int required) +static void credential_write_item(FILE *fp, const char *key, const char *value) { - if (!value && required) - BUG("credential value for %s is missing", key); if (!value) return; - if (strchr(value, '\n')) - die("credential value for %s contains newline", key); fprintf(fp, "%s=%s\n", key, value); } void credential_write(const struct credential *c, FILE *fp) { - credential_write_item(fp, "protocol", c->protocol, 1); - credential_write_item(fp, "host", c->host, 1); - credential_write_item(fp, "path", c->path, 0); - credential_write_item(fp, "username", c->username, 0); - credential_write_item(fp, "password", c->password, 0); + credential_write_item(fp, "protocol", c->protocol); + credential_write_item(fp, "host", c->host); + credential_write_item(fp, "path", c->path); + credential_write_item(fp, "username", c->username); + credential_write_item(fp, "password", c->password); } static int run_credential_helper(struct credential *c, @@ -363,22 +322,7 @@ void credential_reject(struct credential *c) c->approved = 0; } -static int check_url_component(const char *url, int quiet, - const char *name, const char *value) -{ - if (!value) - return 0; - if (!strchr(value, '\n')) - return 0; - - if (!quiet) - warning(_("url contains a newline in its %s component: %s"), - name, url); - return -1; -} - -int credential_from_url_gently(struct credential *c, const char *url, - int quiet) +void credential_from_url(struct credential *c, const char *url) { const char *at, *colon, *cp, *slash, *host, *proto_end; @@ -391,11 +335,8 @@ int credential_from_url_gently(struct credential *c, const char *url, * (3) proto://<user>:<pass>@<host>/... */ proto_end = strstr(url, "://"); - if (!proto_end || proto_end == url) { - if (!quiet) - warning(_("url has no scheme: %s"), url); - return -1; - } + if (!proto_end) + return; cp = proto_end + 3; at = strchr(cp, '@'); colon = strchr(cp, ':'); @@ -408,20 +349,18 @@ int credential_from_url_gently(struct credential *c, const char *url, else if (!colon || at <= colon) { /* Case (2) */ c->username = url_decode_mem(cp, at - cp); - if (c->username && *c->username) - c->username_from_proto = 1; host = at + 1; } else { /* Case (3) */ c->username = url_decode_mem(cp, colon - cp); - if (c->username && *c->username) - c->username_from_proto = 1; c->password = url_decode_mem(colon + 1, at - (colon + 1)); host = at + 1; } - c->protocol = xmemdupz(url, proto_end - url); - c->host = url_decode_mem(host, slash - host); + if (proto_end - url > 0) + c->protocol = xmemdupz(url, proto_end - url); + if (slash - host > 0) + c->host = url_decode_mem(host, slash - host); /* Trim leading and trailing slashes from path */ while (*slash == '/') slash++; @@ -432,19 +371,4 @@ int credential_from_url_gently(struct credential *c, const char *url, while (p > c->path && *p == '/') *p-- = '\0'; } - - if (check_url_component(url, quiet, "username", c->username) < 0 || - check_url_component(url, quiet, "password", c->password) < 0 || - check_url_component(url, quiet, "protocol", c->protocol) < 0 || - check_url_component(url, quiet, "host", c->host) < 0 || - check_url_component(url, quiet, "path", c->path) < 0) - return -1; - - return 0; -} - -void credential_from_url(struct credential *c, const char *url) -{ - if (credential_from_url_gently(c, url, 0) < 0) - die(_("credential url cannot be parsed: %s"), url); } diff --git a/third_party/git/credential.h b/third_party/git/credential.h index d99ec42b2a..6b0cd16be2 100644 --- a/third_party/git/credential.h +++ b/third_party/git/credential.h @@ -3,123 +3,12 @@ #include "string-list.h" -/** - * The credentials API provides an abstracted way of gathering username and - * password credentials from the user. - * - * Typical setup - * ------------- - * - * ------------ - * +-----------------------+ - * | Git code (C) |--- to server requiring ---> - * | | authentication - * |.......................| - * | C credential API |--- prompt ---> User - * +-----------------------+ - * ^ | - * | pipe | - * | v - * +-----------------------+ - * | Git credential helper | - * +-----------------------+ - * ------------ - * - * The Git code (typically a remote-helper) will call the C API to obtain - * credential data like a login/password pair (credential_fill). The - * API will itself call a remote helper (e.g. "git credential-cache" or - * "git credential-store") that may retrieve credential data from a - * store. If the credential helper cannot find the information, the C API - * will prompt the user. Then, the caller of the API takes care of - * contacting the server, and does the actual authentication. - * - * C API - * ----- - * - * The credential C API is meant to be called by Git code which needs to - * acquire or store a credential. It is centered around an object - * representing a single credential and provides three basic operations: - * fill (acquire credentials by calling helpers and/or prompting the user), - * approve (mark a credential as successfully used so that it can be stored - * for later use), and reject (mark a credential as unsuccessful so that it - * can be erased from any persistent storage). - * - * Example - * ~~~~~~~ - * - * The example below shows how the functions of the credential API could be - * used to login to a fictitious "foo" service on a remote host: - * - * ----------------------------------------------------------------------- - * int foo_login(struct foo_connection *f) - * { - * int status; - * // Create a credential with some context; we don't yet know the - * // username or password. - * - * struct credential c = CREDENTIAL_INIT; - * c.protocol = xstrdup("foo"); - * c.host = xstrdup(f->hostname); - * - * // Fill in the username and password fields by contacting - * // helpers and/or asking the user. The function will die if it - * // fails. - * credential_fill(&c); - * - * // Otherwise, we have a username and password. Try to use it. - * - * status = send_foo_login(f, c.username, c.password); - * switch (status) { - * case FOO_OK: - * // It worked. Store the credential for later use. - * credential_accept(&c); - * break; - * case FOO_BAD_LOGIN: - * // Erase the credential from storage so we don't try it again. - * credential_reject(&c); - * break; - * default: - * // Some other error occurred. We don't know if the - * // credential is good or bad, so report nothing to the - * // credential subsystem. - * } - * - * // Free any associated resources. - * credential_clear(&c); - * - * return status; - * } - * ----------------------------------------------------------------------- - */ - - -/** - * This struct represents a single username/password combination - * along with any associated context. All string fields should be - * heap-allocated (or NULL if they are not known or not applicable). - * The meaning of the individual context fields is the same as - * their counterparts in the helper protocol. - * - * This struct should always be initialized with `CREDENTIAL_INIT` or - * `credential_init`. - */ struct credential { - - /** - * A `string_list` of helpers. Each string specifies an external - * helper which will be run, in order, to either acquire or store - * credentials. This list is filled-in by the API functions - * according to the corresponding configuration variables before - * consulting helpers, so there usually is no need for a caller to - * modify the helpers field at all. - */ struct string_list helpers; - unsigned approved:1, configured:1, quit:1, - use_http_path:1, - username_from_proto:1; + use_http_path:1; char *username; char *password; @@ -130,65 +19,16 @@ struct credential { #define CREDENTIAL_INIT { STRING_LIST_INIT_DUP } -/* Initialize a credential structure, setting all fields to empty. */ void credential_init(struct credential *); - -/** - * Free any resources associated with the credential structure, returning - * it to a pristine initialized state. - */ void credential_clear(struct credential *); -/** - * Instruct the credential subsystem to fill the username and - * password fields of the passed credential struct by first - * consulting helpers, then asking the user. After this function - * returns, the username and password fields of the credential are - * guaranteed to be non-NULL. If an error occurs, the function will - * die(). - */ void credential_fill(struct credential *); - -/** - * Inform the credential subsystem that the provided credentials - * were successfully used for authentication. This will cause the - * credential subsystem to notify any helpers of the approval, so - * that they may store the result to be used again. Any errors - * from helpers are ignored. - */ void credential_approve(struct credential *); - -/** - * Inform the credential subsystem that the provided credentials - * have been rejected. This will cause the credential subsystem to - * notify any helpers of the rejection (which allows them, for - * example, to purge the invalid credentials from storage). It - * will also free() the username and password fields of the - * credential and set them to NULL (readying the credential for - * another call to `credential_fill`). Any errors from helpers are - * ignored. - */ void credential_reject(struct credential *); int credential_read(struct credential *, FILE *); void credential_write(const struct credential *, FILE *); - -/* - * Parse a url into a credential struct, replacing any existing contents. - * - * If the url can't be parsed (e.g., a missing "proto://" component), the - * resulting credential will be empty but we'll still return success from the - * "gently" form. - * - * If we encounter a component which cannot be represented as a credential - * value (e.g., because it contains a newline), the "gently" form will return - * an error but leave the broken state in the credential object for further - * examination. The non-gentle form will issue a warning to stderr and return - * an empty credential. - */ void credential_from_url(struct credential *, const char *url); -int credential_from_url_gently(struct credential *, const char *url, int quiet); - int credential_match(const struct credential *have, const struct credential *want); diff --git a/third_party/git/csum-file.h b/third_party/git/csum-file.h index f9cbd317fb..a98b1eee53 100644 --- a/third_party/git/csum-file.h +++ b/third_party/git/csum-file.h @@ -42,15 +42,6 @@ void hashflush(struct hashfile *f); void crc32_begin(struct hashfile *); uint32_t crc32_end(struct hashfile *); -/* - * Returns the total number of bytes fed to the hashfile so far (including ones - * that have not been written out to the descriptor yet). - */ -static inline off_t hashfile_total(struct hashfile *f) -{ - return f->total + f->offset; -} - static inline void hashwrite_u8(struct hashfile *f, uint8_t data) { hashwrite(f, &data, sizeof(data)); diff --git a/third_party/git/daemon.c b/third_party/git/daemon.c index fd669ed3b4..9d2e0d20ef 100644 --- a/third_party/git/daemon.c +++ b/third_party/git/daemon.c @@ -598,7 +598,7 @@ static void canonicalize_client(struct strbuf *out, const char *in) * Read the host as supplied by the client connection. * * Returns a pointer to the character after the NUL byte terminating the host - * argument, or 'extra_args' if there is no host argument. + * arguemnt, or 'extra_args' if there is no host arguemnt. */ static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen) { @@ -652,7 +652,7 @@ static void parse_extra_args(struct hostinfo *hi, struct argv_array *env, * service that will be run. * * If there ends up being a particular arg in the future that - * git-daemon needs to parse specifically (like the 'host' arg) + * git-daemon needs to parse specificly (like the 'host' arg) * then it can be parsed here and not added to 'git_protocol'. */ if (*arg) { diff --git a/third_party/git/date.c b/third_party/git/date.c index 0355c0676b..06340a77f3 100644 --- a/third_party/git/date.c +++ b/third_party/git/date.c @@ -64,16 +64,16 @@ static time_t gm_time_t(timestamp_t time, int tz) * thing, which means that tz -0100 is passed in as the integer -100, * even though it means "sixty minutes off" */ -static struct tm *time_to_tm(timestamp_t time, int tz, struct tm *tm) +static struct tm *time_to_tm(timestamp_t time, int tz) { time_t t = gm_time_t(time, tz); - return gmtime_r(&t, tm); + return gmtime(&t); } -static struct tm *time_to_tm_local(timestamp_t time, struct tm *tm) +static struct tm *time_to_tm_local(timestamp_t time) { time_t t = time; - return localtime_r(&t, tm); + return localtime(&t); } /* @@ -128,17 +128,16 @@ static void get_time(struct timeval *now) gettimeofday(now, NULL); } -void show_date_relative(timestamp_t time, struct strbuf *timebuf) +void show_date_relative(timestamp_t time, + const struct timeval *now, + struct strbuf *timebuf) { - struct timeval now; timestamp_t diff; - - get_time(&now); - if (now.tv_sec < time) { + if (now->tv_sec < time) { strbuf_addstr(timebuf, _("in the future")); return; } - diff = now.tv_sec - time; + diff = now->tv_sec - time; if (diff < 90) { strbuf_addf(timebuf, Q_("%"PRItime" second ago", "%"PRItime" seconds ago", diff), diff); @@ -241,7 +240,9 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm /* Show "today" times as just relative times */ if (hide.wday) { - show_date_relative(time, buf); + struct timeval now; + get_time(&now); + show_date_relative(time, &now, buf); return; } @@ -283,7 +284,6 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm const char *show_date(timestamp_t time, int tz, const struct date_mode *mode) { struct tm *tm; - struct tm tmbuf = { 0 }; struct tm human_tm = { 0 }; int human_tz = -1; static struct strbuf timebuf = STRBUF_INIT; @@ -313,17 +313,20 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode) } if (mode->type == DATE_RELATIVE) { + struct timeval now; + strbuf_reset(&timebuf); - show_date_relative(time, &timebuf); + get_time(&now); + show_date_relative(time, &now, &timebuf); return timebuf.buf; } if (mode->local) - tm = time_to_tm_local(time, &tmbuf); + tm = time_to_tm_local(time); else - tm = time_to_tm(time, tz, &tmbuf); + tm = time_to_tm(time, tz); if (!tm) { - tm = time_to_tm(0, 0, &tmbuf); + tm = time_to_tm(0, 0); tz = 0; } @@ -977,11 +980,10 @@ void datestamp(struct strbuf *out) { time_t now; int offset; - struct tm tm = { 0 }; time(&now); - offset = tm_to_time_t(localtime_r(&now, &tm)) - now; + offset = tm_to_time_t(localtime(&now)) - now; offset /= 60; date_string(now, offset, out); @@ -1303,18 +1305,15 @@ static timestamp_t approxidate_str(const char *date, return (timestamp_t)update_tm(&tm, &now, 0); } -timestamp_t approxidate_relative(const char *date) +timestamp_t approxidate_relative(const char *date, const struct timeval *tv) { - struct timeval tv; timestamp_t timestamp; int offset; int errors = 0; if (!parse_date_basic(date, ×tamp, &offset)) return timestamp; - - get_time(&tv); - return approxidate_str(date, (const struct timeval *) &tv, &errors); + return approxidate_str(date, tv, &errors); } timestamp_t approxidate_careful(const char *date, int *error_ret) diff --git a/third_party/git/diff-delta.c b/third_party/git/diff-delta.c index 77fea08dfb..e49643353b 100644 --- a/third_party/git/diff-delta.c +++ b/third_party/git/diff-delta.c @@ -326,8 +326,6 @@ create_delta(const struct delta_index *index, const unsigned char *ref_data, *ref_top, *data, *top; unsigned char *out; - *delta_size = 0; - if (!trg_buf || !trg_size) return NULL; diff --git a/third_party/git/diff.c b/third_party/git/diff.c index f2cfbf2214..efe42b341a 100644 --- a/third_party/git/diff.c +++ b/third_party/git/diff.c @@ -25,7 +25,7 @@ #include "packfile.h" #include "parse-options.h" #include "help.h" -#include "promisor-remote.h" +#include "fetch-object.h" #ifdef NO_FAST_WORKING_DIRECTORY #define FAST_WORKING_DIRECTORY 0 @@ -414,6 +414,14 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) return 0; } + if (!strcmp(var, "diff.wserrorhighlight")) { + int val = parse_ws_error_highlight(value); + if (val < 0) + return -1; + ws_error_highlight_default = val; + return 0; + } + if (git_color_config(var, value, cb) < 0) return -1; @@ -442,14 +450,6 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) return color_parse(value, diff_colors[slot]); } - if (!strcmp(var, "diff.wserrorhighlight")) { - int val = parse_ws_error_highlight(value); - if (val < 0) - return -1; - ws_error_highlight_default = val; - return 0; - } - /* like GNU diff's --suppress-blank-empty option */ if (!strcmp(var, "diff.suppressblankempty") || /* for backwards compatibility */ @@ -933,18 +933,16 @@ static int cmp_in_block_with_wsd(const struct diff_options *o, } static int moved_entry_cmp(const void *hashmap_cmp_fn_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *keydata) { const struct diff_options *diffopt = hashmap_cmp_fn_data; - const struct moved_entry *a, *b; + const struct moved_entry *a = entry; + const struct moved_entry *b = entry_or_key; unsigned flags = diffopt->color_moved_ws_handling & XDF_WHITESPACE_FLAGS; - a = container_of(eptr, const struct moved_entry, ent); - b = container_of(entry_or_key, const struct moved_entry, ent); - if (diffopt->color_moved_ws_handling & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) /* @@ -966,9 +964,8 @@ static struct moved_entry *prepare_entry(struct diff_options *o, struct moved_entry *ret = xmalloc(sizeof(*ret)); struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no]; unsigned flags = o->color_moved_ws_handling & XDF_WHITESPACE_FLAGS; - unsigned int hash = xdiff_hash_string(l->line, l->len, flags); - hashmap_entry_init(&ret->ent, hash); + ret->ent.hash = xdiff_hash_string(l->line, l->len, flags); ret->es = l; ret->next_line = NULL; @@ -1005,7 +1002,7 @@ static void add_lines_to_move_detection(struct diff_options *o, if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s) prev_line->next_line = key; - hashmap_add(hm, &key->ent); + hashmap_add(hm, key); prev_line = key; } } @@ -1021,7 +1018,7 @@ static void pmb_advance_or_null(struct diff_options *o, struct moved_entry *prev = pmb[i].match; struct moved_entry *cur = (prev && prev->next_line) ? prev->next_line : NULL; - if (cur && !hm->cmpfn(o, &cur->ent, &match->ent, NULL)) { + if (cur && !hm->cmpfn(o, cur, match, NULL)) { pmb[i].match = cur; } else { pmb[i].match = NULL; @@ -1038,7 +1035,7 @@ static void pmb_advance_or_null_multi_match(struct diff_options *o, int i; char *got_match = xcalloc(1, pmb_nr); - hashmap_for_each_entry_from(hm, match, ent) { + for (; match; match = hashmap_get_next(hm, match)) { for (i = 0; i < pmb_nr; i++) { struct moved_entry *prev = pmb[i].match; struct moved_entry *cur = (prev && prev->next_line) ? @@ -1146,13 +1143,13 @@ static void mark_color_as_moved(struct diff_options *o, case DIFF_SYMBOL_PLUS: hm = del_lines; key = prepare_entry(o, n); - match = hashmap_get_entry(hm, key, ent, NULL); + match = hashmap_get(hm, key, NULL); free(key); break; case DIFF_SYMBOL_MINUS: hm = add_lines; key = prepare_entry(o, n); - match = hashmap_get_entry(hm, key, ent, NULL); + match = hashmap_get(hm, key, NULL); free(key); break; default: @@ -1191,7 +1188,7 @@ static void mark_color_as_moved(struct diff_options *o, * The current line is the start of a new block. * Setup the set of potential blocks. */ - hashmap_for_each_entry_from(hm, match, ent) { + for (; match; match = hashmap_get_next(hm, match)) { ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc); if (o->color_moved_ws_handling & COLOR_MOVED_WS_ALLOW_INDENTATION_CHANGE) { @@ -2495,6 +2492,22 @@ static void pprint_rename(struct strbuf *name, const char *a, const char *b) } } +struct diffstat_t { + int nr; + int alloc; + struct diffstat_file { + char *from_name; + char *name; + char *print_name; + const char *comments; + unsigned is_unmerged:1; + unsigned is_binary:1; + unsigned is_renamed:1; + unsigned is_interesting:1; + uintmax_t added, deleted; + } **files; +}; + static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat, const char *name_a, const char *name_b) @@ -2535,7 +2548,7 @@ static int scale_linear(int it, int width, int max_change) /* * make sure that at least one '-' or '+' is printed if * there is any change to this path. The easiest way is to - * scale linearly as if the allotted width is one column shorter + * scale linearly as if the alloted width is one column shorter * than it is, and then add 1 to the result. */ return 1 + (it * (width - 1) / max_change); @@ -3141,7 +3154,7 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o gather_dirstat(options, &dir, changed, "", 0); } -void free_diffstat_info(struct diffstat_t *diffstat) +static void free_diffstat_info(struct diffstat_t *diffstat) { int i; for (i = 0; i < diffstat->nr; i++) { @@ -3180,7 +3193,7 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l for (cnt = 1; cnt < marker_size; cnt++) if (line[cnt] != firstchar) return 0; - /* line[1] through line[marker_size-1] are same as firstchar */ + /* line[1] thru line[marker_size-1] are same as firstchar */ if (len < marker_size + 1 || !isspace(line[marker_size])) return 0; return 1; @@ -4024,7 +4037,7 @@ int diff_populate_filespec(struct repository *r, return 0; } } - s->data = repo_read_object_file(r, &s->oid, &type, &s->size); + s->data = read_object_file(&s->oid, &type, &s->size); if (!s->data) die("unable to read %s", oid_to_hex(&s->oid)); s->should_free = 1; @@ -5965,7 +5978,7 @@ static void diff_summary(struct diff_options *opt, struct diff_filepair *p) } struct patch_id_t { - git_hash_ctx *ctx; + git_SHA_CTX *ctx; int patchlen; }; @@ -5982,16 +5995,16 @@ static int remove_space(char *line, int len) return dst - line; } -void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx) +void flush_one_hunk(struct object_id *result, git_SHA_CTX *ctx) { unsigned char hash[GIT_MAX_RAWSZ]; unsigned short carry = 0; int i; - the_hash_algo->final_fn(hash, ctx); - the_hash_algo->init_fn(ctx); + git_SHA1_Final(hash, ctx); + git_SHA1_Init(ctx); /* 20-byte sum, with carry */ - for (i = 0; i < the_hash_algo->rawsz; ++i) { + for (i = 0; i < GIT_SHA1_RAWSZ; ++i) { carry += result->hash[i] + hash[i]; result->hash[i] = carry; carry >>= 8; @@ -6005,21 +6018,21 @@ static void patch_id_consume(void *priv, char *line, unsigned long len) new_len = remove_space(line, len); - the_hash_algo->update_fn(data->ctx, line, new_len); + git_SHA1_Update(data->ctx, line, new_len); data->patchlen += new_len; } -static void patch_id_add_string(git_hash_ctx *ctx, const char *str) +static void patch_id_add_string(git_SHA_CTX *ctx, const char *str) { - the_hash_algo->update_fn(ctx, str, strlen(str)); + git_SHA1_Update(ctx, str, strlen(str)); } -static void patch_id_add_mode(git_hash_ctx *ctx, unsigned mode) +static void patch_id_add_mode(git_SHA_CTX *ctx, unsigned mode) { /* large enough for 2^32 in octal */ char buf[12]; int len = xsnprintf(buf, sizeof(buf), "%06o", mode); - the_hash_algo->update_fn(ctx, buf, len); + git_SHA1_Update(ctx, buf, len); } /* returns 0 upon success, and writes result into oid */ @@ -6027,10 +6040,10 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid { struct diff_queue_struct *q = &diff_queued_diff; int i; - git_hash_ctx ctx; + git_SHA_CTX ctx; struct patch_id_t data; - the_hash_algo->init_fn(&ctx); + git_SHA1_Init(&ctx); memset(&data, 0, sizeof(struct patch_id_t)); data.ctx = &ctx; oidclr(oid); @@ -6063,27 +6076,27 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid len2 = remove_space(p->two->path, strlen(p->two->path)); patch_id_add_string(&ctx, "diff--git"); patch_id_add_string(&ctx, "a/"); - the_hash_algo->update_fn(&ctx, p->one->path, len1); + git_SHA1_Update(&ctx, p->one->path, len1); patch_id_add_string(&ctx, "b/"); - the_hash_algo->update_fn(&ctx, p->two->path, len2); + git_SHA1_Update(&ctx, p->two->path, len2); if (p->one->mode == 0) { patch_id_add_string(&ctx, "newfilemode"); patch_id_add_mode(&ctx, p->two->mode); patch_id_add_string(&ctx, "---/dev/null"); patch_id_add_string(&ctx, "+++b/"); - the_hash_algo->update_fn(&ctx, p->two->path, len2); + git_SHA1_Update(&ctx, p->two->path, len2); } else if (p->two->mode == 0) { patch_id_add_string(&ctx, "deletedfilemode"); patch_id_add_mode(&ctx, p->one->mode); patch_id_add_string(&ctx, "---a/"); - the_hash_algo->update_fn(&ctx, p->one->path, len1); + git_SHA1_Update(&ctx, p->one->path, len1); patch_id_add_string(&ctx, "+++/dev/null"); } else { patch_id_add_string(&ctx, "---a/"); - the_hash_algo->update_fn(&ctx, p->one->path, len1); + git_SHA1_Update(&ctx, p->one->path, len1); patch_id_add_string(&ctx, "+++b/"); - the_hash_algo->update_fn(&ctx, p->two->path, len2); + git_SHA1_Update(&ctx, p->two->path, len2); } if (diff_header_only) @@ -6095,10 +6108,10 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid if (diff_filespec_is_binary(options->repo, p->one) || diff_filespec_is_binary(options->repo, p->two)) { - the_hash_algo->update_fn(&ctx, oid_to_hex(&p->one->oid), - the_hash_algo->hexsz); - the_hash_algo->update_fn(&ctx, oid_to_hex(&p->two->oid), - the_hash_algo->hexsz); + git_SHA1_Update(&ctx, oid_to_hex(&p->one->oid), + GIT_SHA1_HEXSZ); + git_SHA1_Update(&ctx, oid_to_hex(&p->two->oid), + GIT_SHA1_HEXSZ); continue; } @@ -6115,7 +6128,7 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid } if (!stable) - the_hash_algo->final_fn(oid->hash, &ctx); + git_SHA1_Final(oid->hash, &ctx); return 0; } @@ -6217,10 +6230,8 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o) if (o->color_moved == COLOR_MOVED_ZEBRA_DIM) dim_moved_lines(o); - hashmap_free_entries(&add_lines, struct moved_entry, - ent); - hashmap_free_entries(&del_lines, struct moved_entry, - ent); + hashmap_free(&add_lines, 1); + hashmap_free(&del_lines, 1); } for (i = 0; i < esm.nr; i++) @@ -6267,7 +6278,12 @@ void diff_flush(struct diff_options *options) dirstat_by_line) { struct diffstat_t diffstat; - compute_diffstat(options, &diffstat, q); + memset(&diffstat, 0, sizeof(struct diffstat_t)); + for (i = 0; i < q->nr; i++) { + struct diff_filepair *p = q->queue[i]; + if (check_pair_status(p)) + diff_flush_stat(p, options, &diffstat); + } if (output_format & DIFF_FORMAT_NUMSTAT) show_numstat(&diffstat, options); if (output_format & DIFF_FORMAT_DIFFSTAT) @@ -6496,7 +6512,6 @@ static void add_if_missing(struct repository *r, const struct diff_filespec *filespec) { if (filespec && filespec->oid_valid && - !S_ISGITLINK(filespec->mode) && oid_object_info_extended(r, &filespec->oid, NULL, OBJECT_INFO_FOR_PREFETCH)) oid_array_append(to_fetch, &filespec->oid); @@ -6504,7 +6519,8 @@ static void add_if_missing(struct repository *r, void diffcore_std(struct diff_options *options) { - if (options->repo == the_repository && has_promisor_remote()) { + if (options->repo == the_repository && + repository_format_partial_clone) { /* * Prefetch the diff pairs that are about to be flushed. */ @@ -6521,8 +6537,8 @@ void diffcore_std(struct diff_options *options) /* * NEEDSWORK: Consider deduplicating the OIDs sent. */ - promisor_remote_get_direct(options->repo, - to_fetch.oid, to_fetch.nr); + fetch_objects(repository_format_partial_clone, + to_fetch.oid, to_fetch.nr); oid_array_clear(&to_fetch); } @@ -6600,20 +6616,6 @@ static int is_submodule_ignored(const char *path, struct diff_options *options) return ignored; } -void compute_diffstat(struct diff_options *options, - struct diffstat_t *diffstat, - struct diff_queue_struct *q) -{ - int i; - - memset(diffstat, 0, sizeof(struct diffstat_t)); - for (i = 0; i < q->nr; i++) { - struct diff_filepair *p = q->queue[i]; - if (check_pair_status(p)) - diff_flush_stat(p, options, diffstat); - } -} - void diff_addremove(struct diff_options *options, int addremove, unsigned mode, const struct object_id *oid, diff --git a/third_party/git/diff.h b/third_party/git/diff.h index 6febe7e365..c2c3056810 100644 --- a/third_party/git/diff.h +++ b/third_party/git/diff.h @@ -9,49 +9,6 @@ #include "object.h" #include "oidset.h" -/** - * The diff API is for programs that compare two sets of files (e.g. two trees, - * one tree and the index) and present the found difference in various ways. - * The calling program is responsible for feeding the API pairs of files, one - * from the "old" set and the corresponding one from "new" set, that are - * different. - * The library called through this API is called diffcore, and is responsible - * for two things. - * - * - finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and - * changes that touch a string (`-S`), as specified by the caller. - * - * - outputting the differences in various formats, as specified by the caller. - * - * Calling sequence - * ---------------- - * - * - Prepare `struct diff_options` to record the set of diff options, and then - * call `repo_diff_setup()` to initialize this structure. This sets up the - * vanilla default. - * - * - Fill in the options structure to specify desired output format, rename - * detection, etc. `diff_opt_parse()` can be used to parse options given - * from the command line in a way consistent with existing git-diff family - * of programs. - * - * - Call `diff_setup_done()`; this inspects the options set up so far for - * internal consistency and make necessary tweaking to it (e.g. if textual - * patch output was asked, recursive behaviour is turned on); the callback - * set_default in diff_options can be used to tweak this more. - * - * - As you find different pairs of files, call `diff_change()` to feed - * modified files, `diff_addremove()` to feed created or deleted files, or - * `diff_unmerge()` to feed a file whose state is 'unmerged' to the API. - * These are thin wrappers to a lower-level `diff_queue()` function that is - * flexible enough to record any of these kinds of changes. - * - * - Once you finish feeding the pairs of files, call `diffcore_std()`. - * This will tell the diffcore library to go ahead and do its work. - * - * - Calling `diff_flush()` will produce the output. - */ - struct combine_diff_path; struct commit; struct diff_filespec; @@ -108,66 +65,21 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data) #define DIFF_FLAGS_INIT { 0 } struct diff_flags { - - /** - * Tells if tree traversal done by tree-diff should recursively descend - * into a tree object pair that are different in preimage and postimage set. - */ unsigned recursive; unsigned tree_in_recursive; - - /* Affects the way how a file that is seemingly binary is treated. */ unsigned binary; unsigned text; - - /** - * Tells the patch output format not to use abbreviated object names on the - * "index" lines. - */ unsigned full_index; - - /* Affects if diff-files shows removed files. */ unsigned silent_on_remove; - - /** - * Tells the diffcore library that the caller is feeding unchanged - * filepairs to allow copies from unmodified files be detected. - */ unsigned find_copies_harder; - unsigned follow_renames; unsigned rename_empty; - - /* Internal; used for optimization to see if there is any change. */ unsigned has_changes; - unsigned quick; - - /** - * Tells diff-files that the input is not tracked files but files in random - * locations on the filesystem. - */ unsigned no_index; - - /** - * Tells output routine that it is Ok to call user specified patch output - * routine. Plumbing disables this to ensure stable output. - */ unsigned allow_external; - - /** - * For communication between the calling program and the options parser; - * tell the calling program to signal the presence of difference using - * program exit code. - */ unsigned exit_with_status; - - /** - * Tells the library that the calling program is feeding the filepairs - * reversed; `one` is two, and `two` is one. - */ unsigned reverse_diff; - unsigned check_failed; unsigned relative_name; unsigned ignore_submodules; @@ -219,72 +131,36 @@ enum diff_submodule_format { DIFF_SUBMODULE_INLINE_DIFF }; -/** - * the set of options the calling program wants to affect the operation of - * diffcore library with. - */ struct diff_options { const char *orderfile; - - /** - * A constant string (can and typically does contain newlines to look for - * a block of text, not just a single line) to filter out the filepairs - * that do not change the number of strings contained in its preimage and - * postimage of the diff_queue. - */ const char *pickaxe; - const char *single_follow; const char *a_prefix, *b_prefix; const char *line_prefix; size_t line_prefix_length; - - /** - * collection of boolean options that affects the operation, but some do - * not have anything to do with the diffcore library. - */ struct diff_flags flags; /* diff-filter bits */ unsigned int filter; int use_color; - - /* Number of context lines to generate in patch output. */ int context; - int interhunkcontext; - - /* Affects the way detection logic for complete rewrites, renames and - * copies. - */ int break_opt; int detect_rename; - int irreversible_delete; int skip_stat_unmatch; int line_termination; - - /* The output format used when `diff_flush()` is run. */ int output_format; - unsigned pickaxe_opts; - - /* Affects the way detection logic for complete rewrites, renames and - * copies. - */ int rename_score; int rename_limit; - int needed_rename_limit; int degraded_cc_to_c; int show_rename_progress; int dirstat_permille; int setup; - - /* Number of hexdigits to abbreviate raw format output to. */ int abbrev; - int ita_invisible_in_index; /* white-space error highlighting */ #define WSEH_NEW (1<<12) @@ -316,7 +192,6 @@ struct diff_options { /* to support internal diff recursion by --follow hack*/ int found_follow; - /* Callback which allows tweaking the options in diff_setup_done(). */ void (*set_default)(struct diff_options *); FILE *file; @@ -370,22 +245,6 @@ void diff_emit_submodule_error(struct diff_options *o, const char *err); void diff_emit_submodule_pipethrough(struct diff_options *o, const char *line, int len); -struct diffstat_t { - int nr; - int alloc; - struct diffstat_file { - char *from_name; - char *name; - char *print_name; - const char *comments; - unsigned is_unmerged:1; - unsigned is_binary:1; - unsigned is_renamed:1; - unsigned is_interesting:1; - uintmax_t added, deleted; - } **files; -}; - enum color_diff { DIFF_RESET = 0, DIFF_CONTEXT = 1, @@ -411,7 +270,6 @@ enum color_diff { DIFF_FILE_OLD_BOLD = 21, DIFF_FILE_NEW_BOLD = 22, }; - const char *diff_get_color(int diff_use_color, enum color_diff ix); #define diff_get_color_opt(o, ix) \ diff_get_color((o)->use_color, ix) @@ -476,10 +334,6 @@ void diff_change(struct diff_options *, struct diff_filepair *diff_unmerge(struct diff_options *, const char *path); -void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat, - struct diff_queue_struct *q); -void free_diffstat_info(struct diffstat_t *diffstat); - #define DIFF_SETUP_REVERSE 1 #define DIFF_SETUP_USE_SIZE_CACHE 4 @@ -584,7 +438,7 @@ int run_diff_index(struct rev_info *revs, int cached); int do_diff_cache(const struct object_id *, struct diff_options *); int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); -void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx); +void flush_one_hunk(struct object_id *, git_SHA_CTX *); int diff_result_code(struct diff_options *, int); diff --git a/third_party/git/diffcore-break.c b/third_party/git/diffcore-break.c index 9d20a6a6fc..875aefd3fe 100644 --- a/third_party/git/diffcore-break.c +++ b/third_party/git/diffcore-break.c @@ -286,17 +286,17 @@ void diffcore_merge_broken(void) /* Peer survived. Merge them */ merge_broken(p, pp, &outq); q->queue[j] = NULL; - goto next; + break; } } - /* The peer did not survive, so we keep - * it in the output. - */ - diff_q(&outq, p); + if (q->nr <= j) + /* The peer did not survive, so we keep + * it in the output. + */ + diff_q(&outq, p); } else diff_q(&outq, p); -next:; } free(q->queue); *q = outq; diff --git a/third_party/git/diffcore-rename.c b/third_party/git/diffcore-rename.c index e189f407af..9624864858 100644 --- a/third_party/git/diffcore-rename.c +++ b/third_party/git/diffcore-rename.c @@ -263,8 +263,8 @@ static unsigned int hash_filespec(struct repository *r, if (!filespec->oid_valid) { if (diff_populate_filespec(r, filespec, 0)) return 0; - hash_object_file(r->hash_algo, filespec->data, filespec->size, - "blob", &filespec->oid); + hash_object_file(filespec->data, filespec->size, "blob", + &filespec->oid); } return oidhash(&filespec->oid); } @@ -274,17 +274,18 @@ static int find_identical_files(struct hashmap *srcs, struct diff_options *options) { int renames = 0; + struct diff_filespec *target = rename_dst[dst_index].two; struct file_similarity *p, *best = NULL; int i = 100, best_score = -1; - unsigned int hash = hash_filespec(options->repo, target); /* * Find the best source match for specified destination. */ - p = hashmap_get_entry_from_hash(srcs, hash, NULL, - struct file_similarity, entry); - hashmap_for_each_entry_from(srcs, p, entry) { + p = hashmap_get_from_hash(srcs, + hash_filespec(options->repo, target), + NULL); + for (; p; p = hashmap_get_next(srcs, p)) { int score; struct diff_filespec *source = p->filespec; @@ -328,8 +329,8 @@ static void insert_file_table(struct repository *r, entry->index = index; entry->filespec = filespec; - hashmap_entry_init(&entry->entry, hash_filespec(r, filespec)); - hashmap_add(table, &entry->entry); + hashmap_entry_init(entry, hash_filespec(r, filespec)); + hashmap_add(table, entry); } /* @@ -358,7 +359,7 @@ static int find_exact_renames(struct diff_options *options) renames += find_identical_files(&file_table, i, options); /* Free the hash data structure and entries */ - hashmap_free_entries(&file_table, struct file_similarity, entry); + hashmap_free(&file_table, 1); return renames; } @@ -584,7 +585,7 @@ void diffcore_rename(struct diff_options *options) stop_progress(&progress); /* cost matrix sorted by most to least similar pair */ - STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare); + QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare); rename_count += find_renames(mx, dst_cnt, minimum_score, 0); if (detect_rename == DIFF_DETECT_COPY) diff --git a/third_party/git/diffcore.h b/third_party/git/diffcore.h index 7c07347e42..b651061c0e 100644 --- a/third_party/git/diffcore.h +++ b/third_party/git/diffcore.h @@ -28,12 +28,6 @@ struct userdiff_driver; #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */ -/** - * the internal representation for a single file (blob). It records the blob - * object name (if known -- for a work tree file it typically is a NUL SHA-1), - * filemode and pathname. This is what the `diff_addremove()`, `diff_change()` - * and `diff_unmerge()` synthesize and feed `diff_queue()` function with. - */ struct diff_filespec { struct object_id oid; char *path; @@ -72,17 +66,6 @@ void diff_free_filespec_data(struct diff_filespec *); void diff_free_filespec_blob(struct diff_filespec *); int diff_filespec_is_binary(struct repository *, struct diff_filespec *); -/** - * This records a pair of `struct diff_filespec`; the filespec for a file in - * the "old" set (i.e. preimage) is called `one`, and the filespec for a file - * in the "new" set (i.e. postimage) is called `two`. A change that represents - * file creation has NULL in `one`, and file deletion has NULL in `two`. - * - * A `filepair` starts pointing at `one` and `two` that are from the same - * filename, but `diffcore_std()` can break pairs and match component filespecs - * with other filespecs from a different filepair to form new filepair. This is - * called 'rename detection'. - */ struct diff_filepair { struct diff_filespec *one; struct diff_filespec *two; @@ -94,7 +77,6 @@ struct diff_filepair { unsigned done_skip_stat_unmatch : 1; unsigned skip_stat_unmatch_result : 1; }; - #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged) #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair) @@ -112,25 +94,11 @@ void diff_free_filepair(struct diff_filepair *); int diff_unmodified_pair(struct diff_filepair *); -/** - * This is a collection of filepairs. Notable members are: - * - * - `queue`: - * An array of pointers to `struct diff_filepair`. This dynamically grows as - * you add filepairs; - * - * - `alloc`: - * The allocated size of the `queue` array; - * - * - `nr`: - * The number of elements in the `queue` array. - */ struct diff_queue_struct { struct diff_filepair **queue; int alloc; int nr; }; - #define DIFF_QUEUE_CLEAR(q) \ do { \ (q)->queue = NULL; \ diff --git a/third_party/git/dir.c b/third_party/git/dir.c index 0ffb1b3302..d021c908e5 100644 --- a/third_party/git/dir.c +++ b/third_party/git/dir.c @@ -2,6 +2,8 @@ * This handles recursive filename detection with exclude * files, index knowledge etc.. * + * See Documentation/technical/api-directory-listing.txt + * * Copyright (C) Linus Torvalds, 2005-2006 * Junio Hamano, 2005-2006 */ @@ -41,8 +43,7 @@ struct cached_dir { int nr_files; int nr_dirs; - const char *d_name; - int d_type; + struct dirent *de; const char *file; struct untracked_cache_dir *ucd; }; @@ -51,8 +52,8 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, struct index_state *istate, const char *path, int len, struct untracked_cache_dir *untracked, int check_only, int stop_at_first_file, const struct pathspec *pathspec); -static int resolve_dtype(int dtype, struct index_state *istate, - const char *path, int len); +static int get_dtype(struct dirent *de, struct index_state *istate, + const char *path, int len); int count_slashes(const char *s) { @@ -138,7 +139,7 @@ static size_t common_prefix_len(const struct pathspec *pathspec) * ":(icase)path" is treated as a pathspec full of * wildcard. In other words, only prefix is considered common * prefix. If the pathspec is abc/foo abc/bar, running in - * subdir xyz, the common prefix is still xyz, not xyz/abc as + * subdir xyz, the common prefix is still xyz, not xuz/abc as * in non-:(icase). */ GUARD_PATHSPEC(pathspec, @@ -272,30 +273,19 @@ static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat, #define DO_MATCH_EXCLUDE (1<<0) #define DO_MATCH_DIRECTORY (1<<1) -#define DO_MATCH_LEADING_PATHSPEC (1<<2) +#define DO_MATCH_SUBMODULE (1<<2) /* - * Does the given pathspec match the given name? A match is found if - * - * (1) the pathspec string is leading directory of 'name' ("RECURSIVELY"), or - * (2) the pathspec string has a leading part matching 'name' ("LEADING"), or - * (3) the pathspec string is a wildcard and matches 'name' ("WILDCARD"), or - * (4) the pathspec string is exactly the same as 'name' ("EXACT"). + * Does 'match' match the given name? + * A match is found if * - * Return value tells which case it was (1-4), or 0 when there is no match. + * (1) the 'match' string is leading directory of 'name', or + * (2) the 'match' string is a wildcard and matches 'name', or + * (3) the 'match' string is exactly the same as 'name'. * - * It may be instructive to look at a small table of concrete examples - * to understand the differences between 1, 2, and 4: + * and the return value tells which case it was. * - * Pathspecs - * | a/b | a/b/ | a/b/c - * ------+-----------+-----------+------------ - * a/b | EXACT | EXACT[1] | LEADING[2] - * Names a/b/ | RECURSIVE | EXACT | LEADING[2] - * a/b/c | RECURSIVE | RECURSIVE | EXACT - * - * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match. - * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match. + * It returns 0 when there is no match. */ static int match_pathspec_item(const struct index_state *istate, const struct pathspec_item *item, int prefix, @@ -363,29 +353,21 @@ static int match_pathspec_item(const struct index_state *istate, item->nowildcard_len - prefix)) return MATCHED_FNMATCH; - /* Perform checks to see if "name" is a leading string of the pathspec */ - if (flags & DO_MATCH_LEADING_PATHSPEC) { + /* Perform checks to see if "name" is a super set of the pathspec */ + if (flags & DO_MATCH_SUBMODULE) { /* name is a literal prefix of the pathspec */ - int offset = name[namelen-1] == '/' ? 1 : 0; if ((namelen < matchlen) && - (match[namelen-offset] == '/') && + (match[namelen] == '/') && !ps_strncmp(item, match, name, namelen)) - return MATCHED_RECURSIVELY_LEADING_PATHSPEC; + return MATCHED_RECURSIVELY; - /* name doesn't match up to the first wild character */ + /* name" doesn't match up to the first wild character */ if (item->nowildcard_len < item->len && ps_strncmp(item, match, name, item->nowildcard_len - prefix)) return 0; /* - * name has no wildcard, and it didn't match as a leading - * pathspec so return. - */ - if (item->nowildcard_len == item->len) - return 0; - - /* * Here is where we would perform a wildmatch to check if * "name" can be matched as a directory (or a prefix) against * the pathspec. Since wildmatch doesn't have this capability @@ -394,7 +376,7 @@ static int match_pathspec_item(const struct index_state *istate, * The submodules themselves will be able to perform more * accurate matching to determine if the pathspec matches. */ - return MATCHED_RECURSIVELY_LEADING_PATHSPEC; + return MATCHED_RECURSIVELY; } return 0; @@ -515,7 +497,7 @@ int submodule_path_match(const struct index_state *istate, strlen(submodule_name), 0, seen, DO_MATCH_DIRECTORY | - DO_MATCH_LEADING_PATHSPEC); + DO_MATCH_SUBMODULE); return matched; } @@ -579,7 +561,7 @@ int no_wildcard(const char *string) return string[simple_length(string)] == '\0'; } -void parse_path_pattern(const char **pattern, +void parse_exclude_pattern(const char **pattern, int *patternlen, unsigned *flags, int *nowildcardlen) @@ -589,20 +571,20 @@ void parse_path_pattern(const char **pattern, *flags = 0; if (*p == '!') { - *flags |= PATTERN_FLAG_NEGATIVE; + *flags |= EXC_FLAG_NEGATIVE; p++; } len = strlen(p); if (len && p[len - 1] == '/') { len--; - *flags |= PATTERN_FLAG_MUSTBEDIR; + *flags |= EXC_FLAG_MUSTBEDIR; } for (i = 0; i < len; i++) { if (p[i] == '/') break; } if (i == len) - *flags |= PATTERN_FLAG_NODIR; + *flags |= EXC_FLAG_NODIR; *nowildcardlen = simple_length(p); /* * we should have excluded the trailing slash from 'p' too, @@ -612,261 +594,35 @@ void parse_path_pattern(const char **pattern, if (*nowildcardlen > len) *nowildcardlen = len; if (*p == '*' && no_wildcard(p + 1)) - *flags |= PATTERN_FLAG_ENDSWITH; + *flags |= EXC_FLAG_ENDSWITH; *pattern = p; *patternlen = len; } -int pl_hashmap_cmp(const void *unused_cmp_data, - const struct hashmap_entry *a, - const struct hashmap_entry *b, - const void *key) +void add_exclude(const char *string, const char *base, + int baselen, struct exclude_list *el, int srcpos) { - const struct pattern_entry *ee1 = - container_of(a, struct pattern_entry, ent); - const struct pattern_entry *ee2 = - container_of(b, struct pattern_entry, ent); - - size_t min_len = ee1->patternlen <= ee2->patternlen - ? ee1->patternlen - : ee2->patternlen; - - if (ignore_case) - return strncasecmp(ee1->pattern, ee2->pattern, min_len); - return strncmp(ee1->pattern, ee2->pattern, min_len); -} - -static char *dup_and_filter_pattern(const char *pattern) -{ - char *set, *read; - size_t count = 0; - char *result = xstrdup(pattern); - - set = result; - read = result; - - while (*read) { - /* skip escape characters (once) */ - if (*read == '\\') - read++; - - *set = *read; - - set++; - read++; - count++; - } - *set = 0; - - if (count > 2 && - *(set - 1) == '*' && - *(set - 2) == '/') - *(set - 2) = 0; - - return result; -} - -static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern *given) -{ - struct pattern_entry *translated; - char *truncated; - char *data = NULL; - const char *prev, *cur, *next; - - if (!pl->use_cone_patterns) - return; - - if (given->flags & PATTERN_FLAG_NEGATIVE && - given->flags & PATTERN_FLAG_MUSTBEDIR && - !strcmp(given->pattern, "/*")) { - pl->full_cone = 0; - return; - } - - if (!given->flags && !strcmp(given->pattern, "/*")) { - pl->full_cone = 1; - return; - } - - if (given->patternlen < 2 || - *given->pattern == '*' || - strstr(given->pattern, "**")) { - /* Not a cone pattern. */ - warning(_("unrecognized pattern: '%s'"), given->pattern); - goto clear_hashmaps; - } - - prev = given->pattern; - cur = given->pattern + 1; - next = given->pattern + 2; - - while (*cur) { - /* Watch for glob characters '*', '\', '[', '?' */ - if (!is_glob_special(*cur)) - goto increment; - - /* But only if *prev != '\\' */ - if (*prev == '\\') - goto increment; - - /* But allow the initial '\' */ - if (*cur == '\\' && - is_glob_special(*next)) - goto increment; - - /* But a trailing '/' then '*' is fine */ - if (*prev == '/' && - *cur == '*' && - *next == 0) - goto increment; - - /* Not a cone pattern. */ - warning(_("unrecognized pattern: '%s'"), given->pattern); - goto clear_hashmaps; - - increment: - prev++; - cur++; - next++; - } - - if (given->patternlen > 2 && - !strcmp(given->pattern + given->patternlen - 2, "/*")) { - if (!(given->flags & PATTERN_FLAG_NEGATIVE)) { - /* Not a cone pattern. */ - warning(_("unrecognized pattern: '%s'"), given->pattern); - goto clear_hashmaps; - } - - truncated = dup_and_filter_pattern(given->pattern); - - translated = xmalloc(sizeof(struct pattern_entry)); - translated->pattern = truncated; - translated->patternlen = given->patternlen - 2; - hashmap_entry_init(&translated->ent, - ignore_case ? - strihash(translated->pattern) : - strhash(translated->pattern)); - - if (!hashmap_get_entry(&pl->recursive_hashmap, - translated, ent, NULL)) { - /* We did not see the "parent" included */ - warning(_("unrecognized negative pattern: '%s'"), - given->pattern); - free(truncated); - free(translated); - goto clear_hashmaps; - } - - hashmap_add(&pl->parent_hashmap, &translated->ent); - hashmap_remove(&pl->recursive_hashmap, &translated->ent, &data); - free(data); - return; - } - - if (given->flags & PATTERN_FLAG_NEGATIVE) { - warning(_("unrecognized negative pattern: '%s'"), - given->pattern); - goto clear_hashmaps; - } - - translated = xmalloc(sizeof(struct pattern_entry)); - - translated->pattern = dup_and_filter_pattern(given->pattern); - translated->patternlen = given->patternlen; - hashmap_entry_init(&translated->ent, - ignore_case ? - strihash(translated->pattern) : - strhash(translated->pattern)); - - hashmap_add(&pl->recursive_hashmap, &translated->ent); - - if (hashmap_get_entry(&pl->parent_hashmap, translated, ent, NULL)) { - /* we already included this at the parent level */ - warning(_("your sparse-checkout file may have issues: pattern '%s' is repeated"), - given->pattern); - hashmap_remove(&pl->parent_hashmap, &translated->ent, &data); - free(data); - free(translated); - } - - return; - -clear_hashmaps: - warning(_("disabling cone pattern matching")); - hashmap_free_entries(&pl->parent_hashmap, struct pattern_entry, ent); - hashmap_free_entries(&pl->recursive_hashmap, struct pattern_entry, ent); - pl->use_cone_patterns = 0; -} - -static int hashmap_contains_path(struct hashmap *map, - struct strbuf *pattern) -{ - struct pattern_entry p; - - /* Check straight mapping */ - p.pattern = pattern->buf; - p.patternlen = pattern->len; - hashmap_entry_init(&p.ent, - ignore_case ? - strihash(p.pattern) : - strhash(p.pattern)); - return !!hashmap_get_entry(map, &p, ent, NULL); -} - -int hashmap_contains_parent(struct hashmap *map, - const char *path, - struct strbuf *buffer) -{ - char *slash_pos; - - strbuf_setlen(buffer, 0); - - if (path[0] != '/') - strbuf_addch(buffer, '/'); - - strbuf_addstr(buffer, path); - - slash_pos = strrchr(buffer->buf, '/'); - - while (slash_pos > buffer->buf) { - strbuf_setlen(buffer, slash_pos - buffer->buf); - - if (hashmap_contains_path(map, buffer)) - return 1; - - slash_pos = strrchr(buffer->buf, '/'); - } - - return 0; -} - -void add_pattern(const char *string, const char *base, - int baselen, struct pattern_list *pl, int srcpos) -{ - struct path_pattern *pattern; + struct exclude *x; int patternlen; unsigned flags; int nowildcardlen; - parse_path_pattern(&string, &patternlen, &flags, &nowildcardlen); - if (flags & PATTERN_FLAG_MUSTBEDIR) { - FLEXPTR_ALLOC_MEM(pattern, pattern, string, patternlen); + parse_exclude_pattern(&string, &patternlen, &flags, &nowildcardlen); + if (flags & EXC_FLAG_MUSTBEDIR) { + FLEXPTR_ALLOC_MEM(x, pattern, string, patternlen); } else { - pattern = xmalloc(sizeof(*pattern)); - pattern->pattern = string; + x = xmalloc(sizeof(*x)); + x->pattern = string; } - pattern->patternlen = patternlen; - pattern->nowildcardlen = nowildcardlen; - pattern->base = base; - pattern->baselen = baselen; - pattern->flags = flags; - pattern->srcpos = srcpos; - ALLOC_GROW(pl->patterns, pl->nr + 1, pl->alloc); - pl->patterns[pl->nr++] = pattern; - pattern->pl = pl; - - add_pattern_to_hashsets(pl, pattern); + x->patternlen = patternlen; + x->nowildcardlen = nowildcardlen; + x->base = base; + x->baselen = baselen; + x->flags = flags; + x->srcpos = srcpos; + ALLOC_GROW(el->excludes, el->nr + 1, el->alloc); + el->excludes[el->nr++] = x; + x->el = el; } static int read_skip_worktree_file_from_index(const struct index_state *istate, @@ -887,19 +643,19 @@ static int read_skip_worktree_file_from_index(const struct index_state *istate, } /* - * Frees memory within pl which was allocated for exclude patterns and - * the file buffer. Does not free pl itself. + * Frees memory within el which was allocated for exclude patterns and + * the file buffer. Does not free el itself. */ -void clear_pattern_list(struct pattern_list *pl) +void clear_exclude_list(struct exclude_list *el) { int i; - for (i = 0; i < pl->nr; i++) - free(pl->patterns[i]); - free(pl->patterns); - free(pl->filebuf); + for (i = 0; i < el->nr; i++) + free(el->excludes[i]); + free(el->excludes); + free(el->filebuf); - memset(pl, 0, sizeof(*pl)); + memset(el, 0, sizeof(*el)); } static void trim_trailing_spaces(char *buf) @@ -1006,21 +762,21 @@ static void invalidate_directory(struct untracked_cache *uc, dir->dirs[i]->recurse = 0; } -static int add_patterns_from_buffer(char *buf, size_t size, +static int add_excludes_from_buffer(char *buf, size_t size, const char *base, int baselen, - struct pattern_list *pl); + struct exclude_list *el); /* * Given a file with name "fname", read it (either from disk, or from * an index if 'istate' is non-null), parse it and store the - * exclude rules in "pl". + * exclude rules in "el". * * If "ss" is not NULL, compute SHA-1 of the exclude file and fill - * stat data from disk (only valid if add_patterns returns zero). If + * stat data from disk (only valid if add_excludes returns zero). If * ss_valid is non-zero, "ss" must contain good value as input. */ -static int add_patterns(const char *fname, const char *base, int baselen, - struct pattern_list *pl, struct index_state *istate, +static int add_excludes(const char *fname, const char *base, int baselen, + struct exclude_list *el, struct index_state *istate, struct oid_stat *oid_stat) { struct stat st; @@ -1074,31 +830,28 @@ static int add_patterns(const char *fname, const char *base, int baselen, oidcpy(&oid_stat->oid, &istate->cache[pos]->oid); else - hash_object_file(the_hash_algo, buf, size, - "blob", &oid_stat->oid); + hash_object_file(buf, size, "blob", + &oid_stat->oid); fill_stat_data(&oid_stat->stat, &st); oid_stat->valid = 1; } } - add_patterns_from_buffer(buf, size, base, baselen, pl); + add_excludes_from_buffer(buf, size, base, baselen, el); return 0; } -static int add_patterns_from_buffer(char *buf, size_t size, +static int add_excludes_from_buffer(char *buf, size_t size, const char *base, int baselen, - struct pattern_list *pl) + struct exclude_list *el) { int i, lineno = 1; char *entry; - hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0); - hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0); - - pl->filebuf = buf; + el->filebuf = buf; if (skip_utf8_bom(&buf, size)) - size -= buf - pl->filebuf; + size -= buf - el->filebuf; entry = buf; @@ -1107,7 +860,7 @@ static int add_patterns_from_buffer(char *buf, size_t size, if (entry != buf + i && entry[0] != '#') { buf[i - (i && buf[i-1] == '\r')] = 0; trim_trailing_spaces(entry); - add_pattern(entry, base, baselen, pl, lineno); + add_exclude(entry, base, baselen, el, lineno); } lineno++; entry = buf + i + 1; @@ -1116,17 +869,17 @@ static int add_patterns_from_buffer(char *buf, size_t size, return 0; } -int add_patterns_from_file_to_list(const char *fname, const char *base, - int baselen, struct pattern_list *pl, +int add_excludes_from_file_to_list(const char *fname, const char *base, + int baselen, struct exclude_list *el, struct index_state *istate) { - return add_patterns(fname, base, baselen, pl, istate, NULL); + return add_excludes(fname, base, baselen, el, istate, NULL); } -int add_patterns_from_blob_to_list( +int add_excludes_from_blob_to_list( struct object_id *oid, const char *base, int baselen, - struct pattern_list *pl) + struct exclude_list *el) { char *buf; size_t size; @@ -1136,31 +889,31 @@ int add_patterns_from_blob_to_list( if (r != 1) return r; - add_patterns_from_buffer(buf, size, base, baselen, pl); + add_excludes_from_buffer(buf, size, base, baselen, el); return 0; } -struct pattern_list *add_pattern_list(struct dir_struct *dir, +struct exclude_list *add_exclude_list(struct dir_struct *dir, int group_type, const char *src) { - struct pattern_list *pl; + struct exclude_list *el; struct exclude_list_group *group; group = &dir->exclude_list_group[group_type]; - ALLOC_GROW(group->pl, group->nr + 1, group->alloc); - pl = &group->pl[group->nr++]; - memset(pl, 0, sizeof(*pl)); - pl->src = src; - return pl; + ALLOC_GROW(group->el, group->nr + 1, group->alloc); + el = &group->el[group->nr++]; + memset(el, 0, sizeof(*el)); + el->src = src; + return el; } /* * Used to set up core.excludesfile and .git/info/exclude lists. */ -static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname, +static void add_excludes_from_file_1(struct dir_struct *dir, const char *fname, struct oid_stat *oid_stat) { - struct pattern_list *pl; + struct exclude_list *el; /* * catch setup_standard_excludes() that's called before * dir->untracked is assigned. That function behaves @@ -1168,15 +921,15 @@ static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname, */ if (!dir->untracked) dir->unmanaged_exclude_files++; - pl = add_pattern_list(dir, EXC_FILE, fname); - if (add_patterns(fname, "", 0, pl, NULL, oid_stat) < 0) + el = add_exclude_list(dir, EXC_FILE, fname); + if (add_excludes(fname, "", 0, el, NULL, oid_stat) < 0) die(_("cannot use %s as an exclude file"), fname); } -void add_patterns_from_file(struct dir_struct *dir, const char *fname) +void add_excludes_from_file(struct dir_struct *dir, const char *fname) { dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */ - add_patterns_from_file_1(dir, fname, NULL); + add_excludes_from_file_1(dir, fname, NULL); } int match_basename(const char *basename, int basenamelen, @@ -1187,7 +940,7 @@ int match_basename(const char *basename, int basenamelen, if (patternlen == basenamelen && !fspathncmp(pattern, basename, basenamelen)) return 1; - } else if (flags & PATTERN_FLAG_ENDSWITH) { + } else if (flags & EXC_FLAG_ENDSWITH) { /* "*literal" matching against "fooliteral" */ if (patternlen - 1 <= basenamelen && !fspathncmp(pattern + 1, @@ -1268,138 +1021,85 @@ int match_pathname(const char *pathname, int pathlen, * any, determines the fate. Returns the exclude_list element which * matched, or NULL for undecided. */ -static struct path_pattern *last_matching_pattern_from_list(const char *pathname, +static struct exclude *last_exclude_matching_from_list(const char *pathname, int pathlen, const char *basename, int *dtype, - struct pattern_list *pl, + struct exclude_list *el, struct index_state *istate) { - struct path_pattern *res = NULL; /* undecided */ + struct exclude *exc = NULL; /* undecided */ int i; - if (!pl->nr) + if (!el->nr) return NULL; /* undefined */ - for (i = pl->nr - 1; 0 <= i; i--) { - struct path_pattern *pattern = pl->patterns[i]; - const char *exclude = pattern->pattern; - int prefix = pattern->nowildcardlen; + for (i = el->nr - 1; 0 <= i; i--) { + struct exclude *x = el->excludes[i]; + const char *exclude = x->pattern; + int prefix = x->nowildcardlen; - if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) { - *dtype = resolve_dtype(*dtype, istate, pathname, pathlen); + if (x->flags & EXC_FLAG_MUSTBEDIR) { + if (*dtype == DT_UNKNOWN) + *dtype = get_dtype(NULL, istate, pathname, pathlen); if (*dtype != DT_DIR) continue; } - if (pattern->flags & PATTERN_FLAG_NODIR) { + if (x->flags & EXC_FLAG_NODIR) { if (match_basename(basename, pathlen - (basename - pathname), - exclude, prefix, pattern->patternlen, - pattern->flags)) { - res = pattern; + exclude, prefix, x->patternlen, + x->flags)) { + exc = x; break; } continue; } - assert(pattern->baselen == 0 || - pattern->base[pattern->baselen - 1] == '/'); + assert(x->baselen == 0 || x->base[x->baselen - 1] == '/'); if (match_pathname(pathname, pathlen, - pattern->base, - pattern->baselen ? pattern->baselen - 1 : 0, - exclude, prefix, pattern->patternlen, - pattern->flags)) { - res = pattern; + x->base, x->baselen ? x->baselen - 1 : 0, + exclude, prefix, x->patternlen, x->flags)) { + exc = x; break; } } - return res; + return exc; } /* - * Scan the list of patterns to determine if the ordered list - * of patterns matches on 'pathname'. - * - * Return 1 for a match, 0 for not matched and -1 for undecided. + * Scan the list and let the last match determine the fate. + * Return 1 for exclude, 0 for include and -1 for undecided. */ -enum pattern_match_result path_matches_pattern_list( - const char *pathname, int pathlen, - const char *basename, int *dtype, - struct pattern_list *pl, - struct index_state *istate) -{ - struct path_pattern *pattern; - struct strbuf parent_pathname = STRBUF_INIT; - int result = NOT_MATCHED; - const char *slash_pos; - - if (!pl->use_cone_patterns) { - pattern = last_matching_pattern_from_list(pathname, pathlen, basename, - dtype, pl, istate); - if (pattern) { - if (pattern->flags & PATTERN_FLAG_NEGATIVE) - return NOT_MATCHED; - else - return MATCHED; - } - - return UNDECIDED; - } - - if (pl->full_cone) - return MATCHED; - - strbuf_addch(&parent_pathname, '/'); - strbuf_add(&parent_pathname, pathname, pathlen); - - if (hashmap_contains_path(&pl->recursive_hashmap, - &parent_pathname)) { - result = MATCHED_RECURSIVE; - goto done; - } - - slash_pos = strrchr(parent_pathname.buf, '/'); - - if (slash_pos == parent_pathname.buf) { - /* include every file in root */ - result = MATCHED; - goto done; - } - - strbuf_setlen(&parent_pathname, slash_pos - parent_pathname.buf); - - if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) { - result = MATCHED; - goto done; - } - - if (hashmap_contains_parent(&pl->recursive_hashmap, - pathname, - &parent_pathname)) - result = MATCHED_RECURSIVE; - -done: - strbuf_release(&parent_pathname); - return result; +int is_excluded_from_list(const char *pathname, + int pathlen, const char *basename, int *dtype, + struct exclude_list *el, struct index_state *istate) +{ + struct exclude *exclude; + exclude = last_exclude_matching_from_list(pathname, pathlen, basename, + dtype, el, istate); + if (exclude) + return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1; + return -1; /* undecided */ } -static struct path_pattern *last_matching_pattern_from_lists( - struct dir_struct *dir, struct index_state *istate, - const char *pathname, int pathlen, - const char *basename, int *dtype_p) +static struct exclude *last_exclude_matching_from_lists(struct dir_struct *dir, + struct index_state *istate, + const char *pathname, int pathlen, const char *basename, + int *dtype_p) { int i, j; struct exclude_list_group *group; - struct path_pattern *pattern; + struct exclude *exclude; for (i = EXC_CMDL; i <= EXC_FILE; i++) { group = &dir->exclude_list_group[i]; for (j = group->nr - 1; j >= 0; j--) { - pattern = last_matching_pattern_from_list( + exclude = last_exclude_matching_from_list( pathname, pathlen, basename, dtype_p, - &group->pl[j], istate); - if (pattern) - return pattern; + &group->el[j], istate); + if (exclude) + return exclude; } } return NULL; @@ -1414,7 +1114,7 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) { struct exclude_list_group *group; - struct pattern_list *pl; + struct exclude_list *el; struct exclude_stack *stk = NULL; struct untracked_cache_dir *untracked; int current; @@ -1430,17 +1130,17 @@ static void prep_exclude(struct dir_struct *dir, if (stk->baselen <= baselen && !strncmp(dir->basebuf.buf, base, stk->baselen)) break; - pl = &group->pl[dir->exclude_stack->exclude_ix]; + el = &group->el[dir->exclude_stack->exclude_ix]; dir->exclude_stack = stk->prev; - dir->pattern = NULL; - free((char *)pl->src); /* see strbuf_detach() below */ - clear_pattern_list(pl); + dir->exclude = NULL; + free((char *)el->src); /* see strbuf_detach() below */ + clear_exclude_list(el); free(stk); group->nr--; } /* Skip traversing into sub directories if the parent is excluded */ - if (dir->pattern) + if (dir->exclude) return; /* @@ -1481,7 +1181,7 @@ static void prep_exclude(struct dir_struct *dir, stk->baselen = cp - base; stk->exclude_ix = group->nr; stk->ucd = untracked; - pl = add_pattern_list(dir, EXC_DIRS, NULL); + el = add_exclude_list(dir, EXC_DIRS, NULL); strbuf_add(&dir->basebuf, base + current, stk->baselen - current); assert(stk->baselen == dir->basebuf.len); @@ -1489,15 +1189,15 @@ static void prep_exclude(struct dir_struct *dir, if (stk->baselen) { int dt = DT_DIR; dir->basebuf.buf[stk->baselen - 1] = 0; - dir->pattern = last_matching_pattern_from_lists(dir, + dir->exclude = last_exclude_matching_from_lists(dir, istate, dir->basebuf.buf, stk->baselen - 1, dir->basebuf.buf + current, &dt); dir->basebuf.buf[stk->baselen - 1] = '/'; - if (dir->pattern && - dir->pattern->flags & PATTERN_FLAG_NEGATIVE) - dir->pattern = NULL; - if (dir->pattern) { + if (dir->exclude && + dir->exclude->flags & EXC_FLAG_NEGATIVE) + dir->exclude = NULL; + if (dir->exclude) { dir->exclude_stack = stk; return; } @@ -1523,30 +1223,30 @@ static void prep_exclude(struct dir_struct *dir, /* * dir->basebuf gets reused by the traversal, but we * need fname to remain unchanged to ensure the src - * member of each struct path_pattern correctly + * member of each struct exclude correctly * back-references its source file. Other invocations - * of add_pattern_list provide stable strings, so we + * of add_exclude_list provide stable strings, so we * strbuf_detach() and free() here in the caller. */ struct strbuf sb = STRBUF_INIT; strbuf_addbuf(&sb, &dir->basebuf); strbuf_addstr(&sb, dir->exclude_per_dir); - pl->src = strbuf_detach(&sb, NULL); - add_patterns(pl->src, pl->src, stk->baselen, pl, istate, + el->src = strbuf_detach(&sb, NULL); + add_excludes(el->src, el->src, stk->baselen, el, istate, untracked ? &oid_stat : NULL); } /* * NEEDSWORK: when untracked cache is enabled, prep_exclude() * will first be called in valid_cached_dir() then maybe many - * times more in last_matching_pattern(). When the cache is - * used, last_matching_pattern() will not be called and + * times more in last_exclude_matching(). When the cache is + * used, last_exclude_matching() will not be called and * reading .gitignore content will be a waste. * * So when it's called by valid_cached_dir() and we can get * .gitignore SHA-1 from the index (i.e. .gitignore is not * modified on work tree), we could delay reading the * .gitignore content until we absolutely need it in - * last_matching_pattern(). Be careful about ignore rule + * last_exclude_matching(). Be careful about ignore rule * order, though, if you do that. */ if (untracked && @@ -1566,7 +1266,7 @@ static void prep_exclude(struct dir_struct *dir, * Returns the exclude_list element which matched, or NULL for * undecided. */ -struct path_pattern *last_matching_pattern(struct dir_struct *dir, +struct exclude *last_exclude_matching(struct dir_struct *dir, struct index_state *istate, const char *pathname, int *dtype_p) @@ -1577,10 +1277,10 @@ struct path_pattern *last_matching_pattern(struct dir_struct *dir, prep_exclude(dir, istate, pathname, basename-pathname); - if (dir->pattern) - return dir->pattern; + if (dir->exclude) + return dir->exclude; - return last_matching_pattern_from_lists(dir, istate, pathname, pathlen, + return last_exclude_matching_from_lists(dir, istate, pathname, pathlen, basename, dtype_p); } @@ -1592,10 +1292,10 @@ struct path_pattern *last_matching_pattern(struct dir_struct *dir, int is_excluded(struct dir_struct *dir, struct index_state *istate, const char *pathname, int *dtype_p) { - struct path_pattern *pattern = - last_matching_pattern(dir, istate, pathname, dtype_p); - if (pattern) - return pattern->flags & PATTERN_FLAG_NEGATIVE ? 0 : 1; + struct exclude *exclude = + last_exclude_matching(dir, istate, pathname, dtype_p); + if (exclude) + return exclude->flags & EXC_FLAG_NEGATIVE ? 0 : 1; return 0; } @@ -1730,8 +1430,6 @@ static enum path_treatment treat_directory(struct dir_struct *dir, const char *dirname, int len, int baselen, int exclude, const struct pathspec *pathspec) { - int nested_repo = 0; - /* The "len-1" is to strip the final '/' */ switch (directory_exists_in_index(istate, dirname, len-1)) { case index_directory: @@ -1741,17 +1439,6 @@ static enum path_treatment treat_directory(struct dir_struct *dir, return path_none; case index_nonexistent: - if ((dir->flags & DIR_SKIP_NESTED_GIT) || - !(dir->flags & DIR_NO_GITLINKS)) { - struct strbuf sb = STRBUF_INIT; - strbuf_addstr(&sb, dirname); - nested_repo = is_nonbare_repository_dir(&sb); - strbuf_release(&sb); - } - if (nested_repo) - return ((dir->flags & DIR_SKIP_NESTED_GIT) ? path_none : - (exclude ? path_excluded : path_untracked)); - if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES) break; if (exclude && @@ -1778,6 +1465,13 @@ static enum path_treatment treat_directory(struct dir_struct *dir, return path_none; } + if (!(dir->flags & DIR_NO_GITLINKS)) { + struct strbuf sb = STRBUF_INIT; + strbuf_addstr(&sb, dirname); + if (is_nonbare_repository_dir(&sb)) + return exclude ? path_excluded : path_untracked; + strbuf_release(&sb); + } return path_recurse; } @@ -1913,9 +1607,10 @@ static int get_index_dtype(struct index_state *istate, return DT_UNKNOWN; } -static int resolve_dtype(int dtype, struct index_state *istate, - const char *path, int len) +static int get_dtype(struct dirent *de, struct index_state *istate, + const char *path, int len) { + int dtype = de ? DTYPE(de) : DT_UNKNOWN; struct stat st; if (dtype != DT_UNKNOWN) @@ -1940,13 +1635,14 @@ static enum path_treatment treat_one_path(struct dir_struct *dir, struct strbuf *path, int baselen, const struct pathspec *pathspec, - int dtype) + int dtype, struct dirent *de) { int exclude; int has_path_in_index = !!index_file_exists(istate, path->buf, path->len, ignore_case); enum path_treatment path_treatment; - dtype = resolve_dtype(dtype, istate, path->buf, path->len); + if (dtype == DT_UNKNOWN) + dtype = get_dtype(de, istate, path->buf, path->len); /* Always exclude indexed files */ if (dtype != DT_DIR && has_path_in_index) @@ -2054,18 +1750,21 @@ static enum path_treatment treat_path(struct dir_struct *dir, int baselen, const struct pathspec *pathspec) { - if (!cdir->d_name) + int dtype; + struct dirent *de = cdir->de; + + if (!de) return treat_path_fast(dir, untracked, cdir, istate, path, baselen, pathspec); - if (is_dot_or_dotdot(cdir->d_name) || !fspathcmp(cdir->d_name, ".git")) + if (is_dot_or_dotdot(de->d_name) || !fspathcmp(de->d_name, ".git")) return path_none; strbuf_setlen(path, baselen); - strbuf_addstr(path, cdir->d_name); + strbuf_addstr(path, de->d_name); if (simplify_away(path->buf, path->len, pathspec)) return path_none; - return treat_one_path(dir, untracked, istate, path, baselen, pathspec, - cdir->d_type); + dtype = DTYPE(de); + return treat_one_path(dir, untracked, istate, path, baselen, pathspec, dtype, de); } static void add_untracked(struct untracked_cache_dir *dir, const char *name) @@ -2109,7 +1808,7 @@ static int valid_cached_dir(struct dir_struct *dir, /* * prep_exclude will be called eventually on this directory, - * but it's called much later in last_matching_pattern(). We + * but it's called much later in last_exclude_matching(). We * need it now to determine the validity of the cache for this * path. The next calls will be nearly no-op, the way * prep_exclude() is designed. @@ -2153,17 +1852,10 @@ static int open_cached_dir(struct cached_dir *cdir, static int read_cached_dir(struct cached_dir *cdir) { - struct dirent *de; - if (cdir->fdir) { - de = readdir(cdir->fdir); - if (!de) { - cdir->d_name = NULL; - cdir->d_type = DT_UNKNOWN; + cdir->de = readdir(cdir->fdir); + if (!cdir->de) return -1; - } - cdir->d_name = de->d_name; - cdir->d_type = DTYPE(de); return 0; } while (cdir->nr_dirs < cdir->untracked->dirs_nr) { @@ -2199,40 +1891,6 @@ static void close_cached_dir(struct cached_dir *cdir) } } -static void add_path_to_appropriate_result_list(struct dir_struct *dir, - struct untracked_cache_dir *untracked, - struct cached_dir *cdir, - struct index_state *istate, - struct strbuf *path, - int baselen, - const struct pathspec *pathspec, - enum path_treatment state) -{ - /* add the path to the appropriate result list */ - switch (state) { - case path_excluded: - if (dir->flags & DIR_SHOW_IGNORED) - dir_add_name(dir, istate, path->buf, path->len); - else if ((dir->flags & DIR_SHOW_IGNORED_TOO) || - ((dir->flags & DIR_COLLECT_IGNORED) && - exclude_matches_pathspec(path->buf, path->len, - pathspec))) - dir_add_ignored(dir, istate, path->buf, path->len); - break; - - case path_untracked: - if (dir->flags & DIR_SHOW_IGNORED) - break; - dir_add_name(dir, istate, path->buf, path->len); - if (cdir->fdir) - add_untracked(untracked, path->buf + baselen); - break; - - default: - break; - } -} - /* * Read a directory tree. We currently ignore anything but * directories, regular files and symlinks. That's because git @@ -2257,15 +1915,6 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, struct untracked_cache_dir *untracked, int check_only, int stop_at_first_file, const struct pathspec *pathspec) { - /* - * WARNING WARNING WARNING: - * - * Any updates to the traversal logic here may need corresponding - * updates in treat_leading_path(). See the commit message for the - * commit adding this warning as well as the commit preceding it - * for details. - */ - struct cached_dir cdir; enum path_treatment state, subdir_state, dir_state = path_none; struct strbuf path = STRBUF_INIT; @@ -2289,11 +1938,8 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, /* recurse into subdir if instructed by treat_path */ if ((state == path_recurse) || ((state == path_untracked) && - (resolve_dtype(cdir.d_type, istate, path.buf, path.len) == DT_DIR) && - ((dir->flags & DIR_SHOW_IGNORED_TOO) || - (pathspec && - do_match_pathspec(istate, pathspec, path.buf, path.len, - baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC)))) { + (dir->flags & DIR_SHOW_IGNORED_TOO) && + (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR))) { struct untracked_cache_dir *ud; ud = lookup_untracked(dir->untracked, untracked, path.buf + baselen, @@ -2304,12 +1950,6 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, check_only, stop_at_first_file, pathspec); if (subdir_state > dir_state) dir_state = subdir_state; - - if (pathspec && - !match_pathspec(istate, pathspec, path.buf, path.len, - 0 /* prefix */, NULL, - 0 /* do NOT special case dirs */)) - state = path_none; } if (check_only) { @@ -2345,9 +1985,29 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, continue; } - add_path_to_appropriate_result_list(dir, untracked, &cdir, - istate, &path, baselen, - pathspec, state); + /* add the path to the appropriate result list */ + switch (state) { + case path_excluded: + if (dir->flags & DIR_SHOW_IGNORED) + dir_add_name(dir, istate, path.buf, path.len); + else if ((dir->flags & DIR_SHOW_IGNORED_TOO) || + ((dir->flags & DIR_COLLECT_IGNORED) && + exclude_matches_pathspec(path.buf, path.len, + pathspec))) + dir_add_ignored(dir, istate, path.buf, path.len); + break; + + case path_untracked: + if (dir->flags & DIR_SHOW_IGNORED) + break; + dir_add_name(dir, istate, path.buf, path.len); + if (cdir.fdir) + add_untracked(untracked, path.buf + baselen); + break; + + default: + break; + } } close_cached_dir(&cdir); out: @@ -2377,95 +2037,41 @@ static int treat_leading_path(struct dir_struct *dir, const char *path, int len, const struct pathspec *pathspec) { - /* - * WARNING WARNING WARNING: - * - * Any updates to the traversal logic here may need corresponding - * updates in read_directory_recursive(). See 777b420347 (dir: - * synchronize treat_leading_path() and read_directory_recursive(), - * 2019-12-19) and its parent commit for details. - */ - struct strbuf sb = STRBUF_INIT; - struct strbuf subdir = STRBUF_INIT; - int prevlen, baselen; + int baselen, rc = 0; const char *cp; - struct cached_dir cdir; - enum path_treatment state = path_none; - - /* - * For each directory component of path, we are going to check whether - * that path is relevant given the pathspec. For example, if path is - * foo/bar/baz/ - * then we will ask treat_path() whether we should go into foo, then - * whether we should go into bar, then whether baz is relevant. - * Checking each is important because e.g. if path is - * .git/info/ - * then we need to check .git to know we shouldn't traverse it. - * If the return from treat_path() is: - * * path_none, for any path, we return false. - * * path_recurse, for all path components, we return true - * * <anything else> for some intermediate component, we make sure - * to add that path to the relevant list but return false - * signifying that we shouldn't recurse into it. - */ + int old_flags = dir->flags; while (len && path[len - 1] == '/') len--; if (!len) return 1; - - memset(&cdir, 0, sizeof(cdir)); - cdir.d_type = DT_DIR; baselen = 0; - prevlen = 0; + dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES; while (1) { - prevlen = baselen + !!baselen; - cp = path + prevlen; + cp = path + baselen + !!baselen; cp = memchr(cp, '/', path + len - cp); if (!cp) baselen = len; else baselen = cp - path; - strbuf_reset(&sb); + strbuf_setlen(&sb, 0); strbuf_add(&sb, path, baselen); if (!is_directory(sb.buf)) break; - strbuf_reset(&sb); - strbuf_add(&sb, path, prevlen); - strbuf_reset(&subdir); - strbuf_add(&subdir, path+prevlen, baselen-prevlen); - cdir.d_name = subdir.buf; - state = treat_path(dir, NULL, &cdir, istate, &sb, prevlen, - pathspec); - if (state == path_untracked && - resolve_dtype(cdir.d_type, istate, sb.buf, sb.len) == DT_DIR && - (dir->flags & DIR_SHOW_IGNORED_TOO || - do_match_pathspec(istate, pathspec, sb.buf, sb.len, - baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC)) { - if (!match_pathspec(istate, pathspec, sb.buf, sb.len, - 0 /* prefix */, NULL, - 0 /* do NOT special case dirs */)) - state = path_none; - add_path_to_appropriate_result_list(dir, NULL, &cdir, - istate, - &sb, baselen, - pathspec, state); - state = path_recurse; - } - - if (state != path_recurse) + if (simplify_away(sb.buf, sb.len, pathspec)) + break; + if (treat_one_path(dir, NULL, istate, &sb, baselen, pathspec, + DT_DIR, NULL) == path_none) break; /* do not recurse into it */ - if (len <= baselen) + if (len <= baselen) { + rc = 1; break; /* finished checking */ + } } - add_path_to_appropriate_result_list(dir, NULL, &cdir, istate, - &sb, baselen, pathspec, - state); - - strbuf_release(&subdir); strbuf_release(&sb); - return state == path_recurse; + dir->flags = old_flags; + return rc; } static const char *get_ident_string(void) @@ -2840,7 +2446,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) * wanted anyway */ continue; - /* fall through */ + /* fall thru */ } else if (S_ISDIR(st.st_mode)) { if (!remove_dir_recurse(path, flag, &kept_down)) continue; /* happy */ @@ -2882,14 +2488,14 @@ void setup_standard_excludes(struct dir_struct *dir) if (!excludes_file) excludes_file = xdg_config_home("ignore"); if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) - add_patterns_from_file_1(dir, excludes_file, + add_excludes_from_file_1(dir, excludes_file, dir->untracked ? &dir->ss_excludes_file : NULL); /* per repository user preference */ if (startup_info->have_repository) { const char *path = git_path_info_exclude(); if (!access_or_warn(path, R_OK, 0)) - add_patterns_from_file_1(dir, path, + add_excludes_from_file_1(dir, path, dir->untracked ? &dir->ss_info_exclude : NULL); } } @@ -2921,18 +2527,18 @@ void clear_directory(struct dir_struct *dir) { int i, j; struct exclude_list_group *group; - struct pattern_list *pl; + struct exclude_list *el; struct exclude_stack *stk; for (i = EXC_CMDL; i <= EXC_FILE; i++) { group = &dir->exclude_list_group[i]; for (j = 0; j < group->nr; j++) { - pl = &group->pl[j]; + el = &group->el[j]; if (i == EXC_DIRS) - free((char *)pl->src); - clear_pattern_list(pl); + free((char *)el->src); + clear_exclude_list(el); } - free(group->pl); + free(group->el); } stk = dir->exclude_stack; diff --git a/third_party/git/dir.h b/third_party/git/dir.h index 5855c065a6..680079bbe3 100644 --- a/third_party/git/dir.h +++ b/third_party/git/dir.h @@ -1,68 +1,34 @@ #ifndef DIR_H #define DIR_H +/* See Documentation/technical/api-directory-listing.txt */ + #include "cache.h" -#include "hashmap.h" #include "strbuf.h" -/** - * The directory listing API is used to enumerate paths in the work tree, - * optionally taking `.git/info/exclude` and `.gitignore` files per directory - * into account. - */ - -/** - * Calling sequence - * ---------------- - * - * Note: The index may be checked for .gitignore files that are - * CE_SKIP_WORKTREE marked. If you want to exclude files, make sure you have - * loaded the index first. - * - * - Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0, - * sizeof(dir))`. - * - * - To add single exclude pattern, call `add_pattern_list()` and then - * `add_pattern()`. - * - * - To add patterns from a file (e.g. `.git/info/exclude`), call - * `add_patterns_from_file()` , and/or set `dir.exclude_per_dir`. A - * short-hand function `setup_standard_excludes()` can be used to set - * up the standard set of exclude settings. - * - * - Set options described in the Data Structure section above. - * - * - Call `read_directory()`. - * - * - Use `dir.entries[]`. - * - * - Call `clear_directory()` when none of the contained elements are no longer in use. - * - */ - struct dir_entry { unsigned int len; char name[FLEX_ARRAY]; /* more */ }; -#define PATTERN_FLAG_NODIR 1 -#define PATTERN_FLAG_ENDSWITH 4 -#define PATTERN_FLAG_MUSTBEDIR 8 -#define PATTERN_FLAG_NEGATIVE 16 +#define EXC_FLAG_NODIR 1 +#define EXC_FLAG_ENDSWITH 4 +#define EXC_FLAG_MUSTBEDIR 8 +#define EXC_FLAG_NEGATIVE 16 -struct path_pattern { +struct exclude { /* - * This allows callers of last_matching_pattern() etc. + * This allows callers of last_exclude_matching() etc. * to determine the origin of the matching pattern. */ - struct pattern_list *pl; + struct exclude_list *el; const char *pattern; int patternlen; int nowildcardlen; const char *base; int baselen; - unsigned flags; /* PATTERN_FLAG_* */ + unsigned flags; /* EXC_FLAG_* */ /* * Counting starts from 1 for line numbers in ignore files, @@ -71,13 +37,6 @@ struct path_pattern { int srcpos; }; -/* used for hashmaps for cone patterns */ -struct pattern_entry { - struct hashmap_entry ent; - char *pattern; - size_t patternlen; -}; - /* * Each excludes file will be parsed into a fresh exclude_list which * is appended to the relevant exclude_list_group (either EXC_DIRS or @@ -85,7 +44,7 @@ struct pattern_entry { * can also be used to represent the list of --exclude values passed * via CLI args. */ -struct pattern_list { +struct exclude_list { int nr; int alloc; @@ -95,27 +54,7 @@ struct pattern_list { /* origin of list, e.g. path to filename, or descriptive string */ const char *src; - struct path_pattern **patterns; - - /* - * While scanning the excludes, we attempt to match the patterns - * with a more restricted set that allows us to use hashsets for - * matching logic, which is faster than the linear lookup in the - * excludes array above. If non-zero, that check succeeded. - */ - unsigned use_cone_patterns; - unsigned full_cone; - - /* - * Stores paths where everything starting with those paths - * is included. - */ - struct hashmap recursive_hashmap; - - /* - * Used to check single-level parents of blobs. - */ - struct hashmap parent_hashmap; + struct exclude **excludes; }; /* @@ -133,7 +72,7 @@ struct exclude_stack { struct exclude_list_group { int nr, alloc; - struct pattern_list *pl; + struct exclude_list *el; }; struct oid_stat { @@ -205,101 +144,24 @@ struct untracked_cache { unsigned int use_fsmonitor : 1; }; -/** - * structure is used to pass directory traversal options to the library and to - * record the paths discovered. A single `struct dir_struct` is used regardless - * of whether or not the traversal recursively descends into subdirectories. - */ struct dir_struct { - - /* The number of members in `entries[]` array. */ - int nr; - - /* Internal use; keeps track of allocation of `entries[]` array.*/ - int alloc; - - /* The number of members in `ignored[]` array. */ - int ignored_nr; - - int ignored_alloc; - - /* bit-field of options */ + int nr, alloc; + int ignored_nr, ignored_alloc; enum { - - /** - * Return just ignored files in `entries[]`, not untracked files. - * This flag is mutually exclusive with `DIR_SHOW_IGNORED_TOO`. - */ DIR_SHOW_IGNORED = 1<<0, - - /* Include a directory that is not tracked. */ DIR_SHOW_OTHER_DIRECTORIES = 1<<1, - - /* Do not include a directory that is not tracked and is empty. */ DIR_HIDE_EMPTY_DIRECTORIES = 1<<2, - - /** - * If set, recurse into a directory that looks like a Git directory. - * Otherwise it is shown as a directory. - */ DIR_NO_GITLINKS = 1<<3, - - /** - * Special mode for git-add. Return ignored files in `ignored[]` and - * untracked files in `entries[]`. Only returns ignored files that match - * pathspec exactly (no wildcards). Does not recurse into ignored - * directories. - */ DIR_COLLECT_IGNORED = 1<<4, - - /** - * Similar to `DIR_SHOW_IGNORED`, but return ignored files in - * `ignored[]` in addition to untracked files in `entries[]`. - * This flag is mutually exclusive with `DIR_SHOW_IGNORED`. - */ DIR_SHOW_IGNORED_TOO = 1<<5, - DIR_COLLECT_KILLED_ONLY = 1<<6, - - /** - * Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is - * set, the untracked contents of untracked directories are also - * returned in `entries[]`. - */ DIR_KEEP_UNTRACKED_CONTENTS = 1<<7, - - /** - * Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is - * set, returns ignored files and directories that match an exclude - * pattern. If a directory matches an exclude pattern, then the - * directory is returned and the contained paths are not. A directory - * that does not match an exclude pattern will not be returned even if - * all of its contents are ignored. In this case, the contents are - * returned as individual entries. - * - * If this is set, files and directories that explicitly match an ignore - * pattern are reported. Implicitly ignored directories (directories that - * do not match an ignore pattern, but whose contents are all ignored) - * are not reported, instead all of the contents are reported. - */ - DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8, - - DIR_SKIP_NESTED_GIT = 1<<9 + DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8 } flags; - - /* An array of `struct dir_entry`, each element of which describes a path. */ struct dir_entry **entries; - - /** - * used for ignored paths with the `DIR_SHOW_IGNORED_TOO` and - * `DIR_COLLECT_IGNORED` flags. - */ struct dir_entry **ignored; - /** - * The name of the file to be read in each directory for excluded files - * (typically `.gitignore`). - */ + /* Exclude info */ const char *exclude_per_dir; /* @@ -329,7 +191,7 @@ struct dir_struct { * matching exclude struct if the directory is excluded. */ struct exclude_stack *exclude_stack; - struct path_pattern *pattern; + struct exclude *exclude; struct strbuf basebuf; /* Enable untracked file cache if set */ @@ -349,9 +211,8 @@ int count_slashes(const char *s); * when populating the seen[] array. */ #define MATCHED_RECURSIVELY 1 -#define MATCHED_RECURSIVELY_LEADING_PATHSPEC 2 -#define MATCHED_FNMATCH 3 -#define MATCHED_EXACTLY 4 +#define MATCHED_FNMATCH 2 +#define MATCHED_EXACTLY 3 int simple_length(const char *match); int no_wildcard(const char *string); char *common_prefix(const struct pathspec *pathspec); @@ -369,24 +230,10 @@ int read_directory(struct dir_struct *, struct index_state *istate, const char *path, int len, const struct pathspec *pathspec); -enum pattern_match_result { - UNDECIDED = -1, - NOT_MATCHED = 0, - MATCHED = 1, - MATCHED_RECURSIVE = 2, -}; - -/* - * Scan the list of patterns to determine if the ordered list - * of patterns matches on 'pathname'. - * - * Return 1 for a match, 0 for not matched and -1 for undecided. - */ -enum pattern_match_result path_matches_pattern_list(const char *pathname, - int pathlen, - const char *basename, int *dtype, - struct pattern_list *pl, - struct index_state *istate); +int is_excluded_from_list(const char *pathname, int pathlen, + const char *basename, int *dtype, + struct exclude_list *el, + struct index_state *istate); struct dir_entry *dir_add_ignored(struct dir_struct *dir, struct index_state *istate, const char *pathname, int len); @@ -401,33 +248,26 @@ int match_pathname(const char *, int, const char *, int, const char *, int, int, unsigned); -struct path_pattern *last_matching_pattern(struct dir_struct *dir, - struct index_state *istate, - const char *name, int *dtype); +struct exclude *last_exclude_matching(struct dir_struct *dir, + struct index_state *istate, + const char *name, int *dtype); int is_excluded(struct dir_struct *dir, struct index_state *istate, const char *name, int *dtype); -int pl_hashmap_cmp(const void *unused_cmp_data, - const struct hashmap_entry *a, - const struct hashmap_entry *b, - const void *key); -int hashmap_contains_parent(struct hashmap *map, - const char *path, - struct strbuf *buffer); -struct pattern_list *add_pattern_list(struct dir_struct *dir, +struct exclude_list *add_exclude_list(struct dir_struct *dir, int group_type, const char *src); -int add_patterns_from_file_to_list(const char *fname, const char *base, int baselen, - struct pattern_list *pl, struct index_state *istate); -void add_patterns_from_file(struct dir_struct *, const char *fname); -int add_patterns_from_blob_to_list(struct object_id *oid, +int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, + struct exclude_list *el, struct index_state *istate); +void add_excludes_from_file(struct dir_struct *, const char *fname); +int add_excludes_from_blob_to_list(struct object_id *oid, const char *base, int baselen, - struct pattern_list *pl); -void parse_path_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen); -void add_pattern(const char *string, const char *base, - int baselen, struct pattern_list *pl, int srcpos); -void clear_pattern_list(struct pattern_list *pl); + struct exclude_list *el); +void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen); +void add_exclude(const char *string, const char *base, + int baselen, struct exclude_list *el, int srcpos); +void clear_exclude_list(struct exclude_list *el); void clear_directory(struct dir_struct *dir); int repo_file_exists(struct repository *repo, const char *path); diff --git a/third_party/git/environment.c b/third_party/git/environment.c index e72a02d0d5..89af47cb85 100644 --- a/third_party/git/environment.c +++ b/third_party/git/environment.c @@ -31,6 +31,8 @@ int warn_ambiguous_refs = 1; int warn_on_object_refname_ambiguity = 1; int ref_paranoia = -1; int repository_format_precious_objects; +char *repository_format_partial_clone; +const char *core_partial_clone_filter_default; int repository_format_worktree_config; const char *git_commit_encoding; const char *git_log_output_encoding; @@ -67,7 +69,6 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE; char *notes_ref_name; int grafts_replace_parents = 1; int core_apply_sparse_checkout; -int core_sparse_checkout_cone; int merge_log_config = -1; int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */ unsigned long pack_size_limit_cfg; @@ -79,7 +80,7 @@ enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET; int protect_hfs = PROTECT_HFS_DEFAULT; #ifndef PROTECT_NTFS_DEFAULT -#define PROTECT_NTFS_DEFAULT 1 +#define PROTECT_NTFS_DEFAULT 0 #endif int protect_ntfs = PROTECT_NTFS_DEFAULT; const char *core_fsmonitor; diff --git a/third_party/git/ewah/bitmap.c b/third_party/git/ewah/bitmap.c index d8cec585af..52f1178db4 100644 --- a/third_party/git/ewah/bitmap.c +++ b/third_party/git/ewah/bitmap.c @@ -22,26 +22,21 @@ #define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_EWORD)) #define EWAH_BLOCK(x) (x / BITS_IN_EWORD) -struct bitmap *bitmap_word_alloc(size_t word_alloc) +struct bitmap *bitmap_new(void) { struct bitmap *bitmap = xmalloc(sizeof(struct bitmap)); - bitmap->words = xcalloc(word_alloc, sizeof(eword_t)); - bitmap->word_alloc = word_alloc; + bitmap->words = xcalloc(32, sizeof(eword_t)); + bitmap->word_alloc = 32; return bitmap; } -struct bitmap *bitmap_new(void) -{ - return bitmap_word_alloc(32); -} - void bitmap_set(struct bitmap *self, size_t pos) { size_t block = EWAH_BLOCK(pos); if (block >= self->word_alloc) { size_t old_size = self->word_alloc; - self->word_alloc = block ? block * 2 : 1; + self->word_alloc = block * 2; REALLOC_ARRAY(self->words, self->word_alloc); memset(self->words + old_size, 0x0, (self->word_alloc - old_size) * sizeof(eword_t)); @@ -50,14 +45,6 @@ void bitmap_set(struct bitmap *self, size_t pos) self->words[block] |= EWAH_MASK(pos); } -void bitmap_unset(struct bitmap *self, size_t pos) -{ - size_t block = EWAH_BLOCK(pos); - - if (block < self->word_alloc) - self->words[block] &= ~EWAH_MASK(pos); -} - int bitmap_get(struct bitmap *self, size_t pos) { size_t block = EWAH_BLOCK(pos); diff --git a/third_party/git/ewah/ewok.h b/third_party/git/ewah/ewok.h index 011852bef1..84b2a29faa 100644 --- a/third_party/git/ewah/ewok.h +++ b/third_party/git/ewah/ewok.h @@ -172,9 +172,7 @@ struct bitmap { }; struct bitmap *bitmap_new(void); -struct bitmap *bitmap_word_alloc(size_t word_alloc); void bitmap_set(struct bitmap *self, size_t pos); -void bitmap_unset(struct bitmap *self, size_t pos); int bitmap_get(struct bitmap *self, size_t pos); void bitmap_reset(struct bitmap *self); void bitmap_free(struct bitmap *self); diff --git a/third_party/git/fast-import.c b/third_party/git/fast-import.c index b8b65a801c..b44d6a467e 100644 --- a/third_party/git/fast-import.c +++ b/third_party/git/fast-import.c @@ -217,7 +217,6 @@ static uintmax_t next_mark; static struct strbuf new_data = STRBUF_INIT; static int seen_data_command; static int require_explicit_termination; -static int allow_unsafe_features; /* Signal handling */ static volatile sig_atomic_t checkpoint_requested; @@ -1683,12 +1682,6 @@ static void dump_marks(void) if (!export_marks_file || (import_marks_file && !import_marks_file_done)) return; - if (safe_create_leading_directories_const(export_marks_file)) { - failure |= error_errno("unable to create leading directories of %s", - export_marks_file); - return; - } - if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) { failure |= error_errno("Unable to write marks file %s", export_marks_file); @@ -1770,6 +1763,7 @@ static int read_next_command(void) } else { struct recent_command *rc; + strbuf_detach(&command_buf, NULL); stdin_eof = strbuf_getline_lf(&command_buf, stdin); if (stdin_eof) return EOF; @@ -1790,7 +1784,7 @@ static int read_next_command(void) free(rc->buf); } - rc->buf = xstrdup(command_buf.buf); + rc->buf = command_buf.buf; rc->prev = cmd_tail; rc->next = cmd_hist.prev; rc->prev->next = rc; @@ -1839,6 +1833,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res) char *term = xstrdup(data); size_t term_len = command_buf.len - (data - command_buf.buf); + strbuf_detach(&command_buf, NULL); for (;;) { if (strbuf_getline_lf(&command_buf, stdin) == EOF) die("EOF in data (terminator '%s' not found)", term); @@ -2496,14 +2491,18 @@ static void parse_from_existing(struct branch *b) } } -static int parse_objectish(struct branch *b, const char *objectish) +static int parse_from(struct branch *b) { + const char *from; struct branch *s; struct object_id oid; + if (!skip_prefix(command_buf.buf, "from ", &from)) + return 0; + oidcpy(&oid, &b->branch_tree.versions[1].oid); - s = lookup_branch(objectish); + s = lookup_branch(from); if (b == s) die("Can't create a branch from itself: %s", b->name); else if (s) { @@ -2511,8 +2510,8 @@ static int parse_objectish(struct branch *b, const char *objectish) oidcpy(&b->oid, &s->oid); oidcpy(&b->branch_tree.versions[0].oid, t); oidcpy(&b->branch_tree.versions[1].oid, t); - } else if (*objectish == ':') { - uintmax_t idnum = parse_mark_ref_eol(objectish); + } else if (*from == ':') { + uintmax_t idnum = parse_mark_ref_eol(from); struct object_entry *oe = find_mark(idnum); if (oe->type != OBJ_COMMIT) die("Mark :%" PRIuMAX " not a commit", idnum); @@ -2526,13 +2525,13 @@ static int parse_objectish(struct branch *b, const char *objectish) } else parse_from_existing(b); } - } else if (!get_oid(objectish, &b->oid)) { + } else if (!get_oid(from, &b->oid)) { parse_from_existing(b); if (is_null_oid(&b->oid)) b->delete = 1; } else - die("Invalid ref name or SHA1 expression: %s", objectish); + die("Invalid ref name or SHA1 expression: %s", from); if (b->branch_tree.tree && !oideq(&oid, &b->branch_tree.versions[1].oid)) { release_tree_content_recursive(b->branch_tree.tree); @@ -2543,26 +2542,6 @@ static int parse_objectish(struct branch *b, const char *objectish) return 1; } -static int parse_from(struct branch *b) -{ - const char *from; - - if (!skip_prefix(command_buf.buf, "from ", &from)) - return 0; - - return parse_objectish(b, from); -} - -static int parse_objectish_with_prefix(struct branch *b, const char *prefix) -{ - const char *base; - - if (!skip_prefix(command_buf.buf, prefix, &base)) - return 0; - - return parse_objectish(b, base); -} - static struct hash_list *parse_merge(unsigned int *count) { struct hash_list *list = NULL, **tail = &list, *n; @@ -2609,7 +2588,7 @@ static void parse_new_commit(const char *arg) struct branch *b; char *author = NULL; char *committer = NULL; - char *encoding = NULL; + const char *encoding = NULL; struct hash_list *merge_list = NULL; unsigned int merge_count; unsigned char prev_fanout, new_fanout; @@ -2632,10 +2611,8 @@ static void parse_new_commit(const char *arg) } if (!committer) die("Expected committer but didn't get one"); - if (skip_prefix(command_buf.buf, "encoding ", &v)) { - encoding = xstrdup(v); + if (skip_prefix(command_buf.buf, "encoding ", &encoding)) read_next_command(); - } parse_data(&msg, 0, NULL); read_next_command(); parse_from(b); @@ -2709,7 +2686,6 @@ static void parse_new_commit(const char *arg) strbuf_addbuf(&new_data, &msg); free(author); free(committer); - free(encoding); if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark)) b->pack_id = pack_id; @@ -2737,7 +2713,6 @@ static void parse_new_tag(const char *arg) first_tag = t; last_tag = t; read_next_command(); - parse_mark(); /* from ... */ if (!skip_prefix(command_buf.buf, "from ", &from)) @@ -2794,7 +2769,7 @@ static void parse_new_tag(const char *arg) strbuf_addbuf(&new_data, &msg); free(tagger); - if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, next_mark)) + if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, 0)) t->pack_id = MAX_PACK_ID; else t->pack_id = pack_id; @@ -2803,7 +2778,6 @@ static void parse_new_tag(const char *arg) static void parse_reset_branch(const char *arg) { struct branch *b; - const char *tag_name; b = lookup_branch(arg); if (b) { @@ -2819,32 +2793,6 @@ static void parse_reset_branch(const char *arg) b = new_branch(arg); read_next_command(); parse_from(b); - if (b->delete && skip_prefix(b->name, "refs/tags/", &tag_name)) { - /* - * Elsewhere, we call dump_branches() before dump_tags(), - * and dump_branches() will handle ref deletions first, so - * in order to make sure the deletion actually takes effect, - * we need to remove the tag from our list of tags to update. - * - * NEEDSWORK: replace list of tags with hashmap for faster - * deletion? - */ - struct tag *t, *prev = NULL; - for (t = first_tag; t; t = t->next_tag) { - if (!strcmp(t->name, tag_name)) - break; - prev = t; - } - if (t) { - if (prev) - prev->next_tag = t->next_tag; - else - first_tag = t->next_tag; - if (!t->next_tag) - last_tag = prev; - /* There is no mem_pool_free(t) function to call. */ - } - } if (command_buf.len > 0) unread_command_buf = 1; } @@ -3111,28 +3059,6 @@ static void parse_progress(void) skip_optional_lf(); } -static void parse_alias(void) -{ - struct object_entry *e; - struct branch b; - - skip_optional_lf(); - read_next_command(); - - /* mark ... */ - parse_mark(); - if (!next_mark) - die(_("Expected 'mark' command, got %s"), command_buf.buf); - - /* to ... */ - memset(&b, 0, sizeof(b)); - if (!parse_objectish_with_prefix(&b, "to ")) - die(_("Expected 'to' command, got %s"), command_buf.buf); - e = find_object(&b.oid); - assert(e); - insert_mark(next_mark, e); -} - static char* make_fast_import_path(const char *path) { if (!relative_marks_paths || is_absolute_path(path)) @@ -3153,6 +3079,7 @@ static void option_import_marks(const char *marks, } import_marks_file = make_fast_import_path(marks); + safe_create_leading_directories_const(import_marks_file); import_marks_file_from_stream = from_stream; import_marks_file_ignore_missing = ignore_missing; } @@ -3193,6 +3120,7 @@ static void option_active_branches(const char *branches) static void option_export_marks(const char *marks) { export_marks_file = make_fast_import_path(marks); + safe_create_leading_directories_const(export_marks_file); } static void option_cat_blob_fd(const char *fd) @@ -3235,12 +3163,10 @@ static int parse_one_option(const char *option) option_active_branches(option); } else if (skip_prefix(option, "export-pack-edges=", &option)) { option_export_pack_edges(option); - } else if (!strcmp(option, "quiet")) { + } else if (starts_with(option, "quiet")) { show_stats = 0; - } else if (!strcmp(option, "stats")) { + } else if (starts_with(option, "stats")) { show_stats = 1; - } else if (!strcmp(option, "allow-unsafe-features")) { - ; /* already handled during early option parsing */ } else { return 0; } @@ -3248,13 +3174,6 @@ static int parse_one_option(const char *option) return 1; } -static void check_unsafe_feature(const char *feature, int from_stream) -{ - if (from_stream && !allow_unsafe_features) - die(_("feature '%s' forbidden in input without --allow-unsafe-features"), - feature); -} - static int parse_one_feature(const char *feature, int from_stream) { const char *arg; @@ -3262,16 +3181,11 @@ static int parse_one_feature(const char *feature, int from_stream) if (skip_prefix(feature, "date-format=", &arg)) { option_date_format(arg); } else if (skip_prefix(feature, "import-marks=", &arg)) { - check_unsafe_feature("import-marks", from_stream); option_import_marks(arg, from_stream, 0); } else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) { - check_unsafe_feature("import-marks-if-exists", from_stream); option_import_marks(arg, from_stream, 1); } else if (skip_prefix(feature, "export-marks=", &arg)) { - check_unsafe_feature(feature, from_stream); option_export_marks(arg); - } else if (!strcmp(feature, "alias")) { - ; /* Don't die - this feature is supported */ } else if (!strcmp(feature, "get-mark")) { ; /* Don't die - this feature is supported */ } else if (!strcmp(feature, "cat-blob")) { @@ -3397,20 +3311,6 @@ int cmd_main(int argc, const char **argv) avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*)); marks = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set)); - /* - * We don't parse most options until after we've seen the set of - * "feature" lines at the start of the stream (which allows the command - * line to override stream data). But we must do an early parse of any - * command-line options that impact how we interpret the feature lines. - */ - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; - if (*arg != '-' || !strcmp(arg, "--")) - break; - if (!strcmp(arg, "--allow-unsafe-features")) - allow_unsafe_features = 1; - } - global_argc = argc; global_argv = argv; @@ -3442,8 +3342,6 @@ int cmd_main(int argc, const char **argv) parse_checkpoint(); else if (!strcmp("done", command_buf.buf)) break; - else if (!strcmp("alias", command_buf.buf)) - parse_alias(); else if (starts_with(command_buf.buf, "progress ")) parse_progress(); else if (skip_prefix(command_buf.buf, "feature ", &v)) diff --git a/third_party/git/fetch-negotiator.c b/third_party/git/fetch-negotiator.c index 0a1357dc9d..d6d685cba0 100644 --- a/third_party/git/fetch-negotiator.c +++ b/third_party/git/fetch-negotiator.c @@ -2,20 +2,19 @@ #include "fetch-negotiator.h" #include "negotiator/default.h" #include "negotiator/skipping.h" -#include "repository.h" -void fetch_negotiator_init(struct repository *r, - struct fetch_negotiator *negotiator) +void fetch_negotiator_init(struct fetch_negotiator *negotiator, + const char *algorithm) { - prepare_repo_settings(r); - switch(r->settings.fetch_negotiation_algorithm) { - case FETCH_NEGOTIATION_SKIPPING: - skipping_negotiator_init(negotiator); - return; - - case FETCH_NEGOTIATION_DEFAULT: - default: - default_negotiator_init(negotiator); - return; + if (algorithm) { + if (!strcmp(algorithm, "skipping")) { + skipping_negotiator_init(negotiator); + return; + } else if (!strcmp(algorithm, "default")) { + /* Fall through to default initialization */ + } else { + die("unknown fetch negotiation algorithm '%s'", algorithm); + } } + default_negotiator_init(negotiator); } diff --git a/third_party/git/fetch-negotiator.h b/third_party/git/fetch-negotiator.h index ea78868504..9e3967ce66 100644 --- a/third_party/git/fetch-negotiator.h +++ b/third_party/git/fetch-negotiator.h @@ -2,7 +2,6 @@ #define FETCH_NEGOTIATOR_H struct commit; -struct repository; /* * An object that supplies the information needed to negotiate the contents of @@ -53,7 +52,7 @@ struct fetch_negotiator { void *data; }; -void fetch_negotiator_init(struct repository *r, - struct fetch_negotiator *negotiator); +void fetch_negotiator_init(struct fetch_negotiator *negotiator, + const char *algorithm); #endif diff --git a/third_party/git/fetch-object.c b/third_party/git/fetch-object.c new file mode 100644 index 0000000000..4266548800 --- /dev/null +++ b/third_party/git/fetch-object.c @@ -0,0 +1,40 @@ +#include "cache.h" +#include "packfile.h" +#include "pkt-line.h" +#include "strbuf.h" +#include "transport.h" +#include "fetch-object.h" + +static void fetch_refs(const char *remote_name, struct ref *ref) +{ + struct remote *remote; + struct transport *transport; + int original_fetch_if_missing = fetch_if_missing; + + fetch_if_missing = 0; + remote = remote_get(remote_name); + if (!remote->url[0]) + die(_("Remote with no URL")); + transport = transport_get(remote, remote->url[0]); + + transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); + transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1"); + transport_fetch_refs(transport, ref); + fetch_if_missing = original_fetch_if_missing; +} + +void fetch_objects(const char *remote_name, const struct object_id *oids, + int oid_nr) +{ + struct ref *ref = NULL; + int i; + + for (i = 0; i < oid_nr; i++) { + struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i])); + oidcpy(&new_ref->old_oid, &oids[i]); + new_ref->exact_oid = 1; + new_ref->next = ref; + ref = new_ref; + } + fetch_refs(remote_name, ref); +} diff --git a/third_party/git/fetch-object.h b/third_party/git/fetch-object.h new file mode 100644 index 0000000000..d6444caa5a --- /dev/null +++ b/third_party/git/fetch-object.h @@ -0,0 +1,9 @@ +#ifndef FETCH_OBJECT_H +#define FETCH_OBJECT_H + +struct object_id; + +void fetch_objects(const char *remote_name, const struct object_id *oids, + int oid_nr); + +#endif diff --git a/third_party/git/fetch-pack.c b/third_party/git/fetch-pack.c index 1734a573b0..65be043f2a 100644 --- a/third_party/git/fetch-pack.c +++ b/third_party/git/fetch-pack.c @@ -36,6 +36,7 @@ static int agent_supported; static int server_supports_filtering; static struct lock_file shallow_lock; static const char *alternate_shallow_file; +static char *negotiation_algorithm; static struct strbuf fsck_msg_types = STRBUF_INIT; /* Remember to update object flag allocation in object.h */ @@ -167,16 +168,16 @@ static enum ack_type get_ack(struct packet_reader *reader, if (!strcmp(reader->line, "NAK")) return NAK; if (skip_prefix(reader->line, "ACK ", &arg)) { - const char *p; - if (!parse_oid_hex(arg, result_oid, &p)) { - len -= p - reader->line; + if (!get_oid_hex(arg, result_oid)) { + arg += 40; + len -= arg - reader->line; if (len < 1) return ACK; - if (strstr(p, "continue")) + if (strstr(arg, "continue")) return ACK_continue; - if (strstr(p, "common")) + if (strstr(arg, "common")) return ACK_common; - if (strstr(p, "ready")) + if (strstr(arg, "ready")) return ACK_ready; return ACK; } @@ -338,9 +339,12 @@ static int find_common(struct fetch_negotiator *negotiator, } } if (server_supports_filtering && args->filter_options.choice) { - const char *spec = - expand_list_objects_filter_spec(&args->filter_options); - packet_buf_write(&req_buf, "filter %s", spec); + struct strbuf expanded_filter_spec = STRBUF_INIT; + expand_list_objects_filter_spec(&args->filter_options, + &expanded_filter_spec); + packet_buf_write(&req_buf, "filter %s", + expanded_filter_spec.buf); + strbuf_release(&expanded_filter_spec); } packet_buf_flush(&req_buf); state_len = req_buf.len; @@ -382,7 +386,6 @@ static int find_common(struct fetch_negotiator *negotiator, state_len = 0; } - trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository); flushes = 0; retval = -1; if (args->no_dependents) @@ -467,7 +470,6 @@ static int find_common(struct fetch_negotiator *negotiator, } } done: - trace2_region_leave("fetch-pack", "negotiation_v0_v1", the_repository); if (!got_ready || !no_done) { packet_buf_write(&req_buf, "done\n"); send_request(args, fd[1], &req_buf); @@ -669,20 +671,17 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator, save_commit_buffer = 0; - trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL); for (ref = *refs; ref; ref = ref->next) { struct object *o; if (!has_object_file_with_flags(&ref->old_oid, - OBJECT_INFO_QUICK | - OBJECT_INFO_SKIP_FETCH_OBJECT)) + OBJECT_INFO_QUICK)) continue; o = parse_object(the_repository, &ref->old_oid); if (!o) continue; - /* - * We already have it -- which may mean that we were + /* We already have it -- which may mean that we were * in sync with the other side at some time after * that (it is OK if we guess wrong here). */ @@ -692,13 +691,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator, cutoff = commit->date; } } - trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL); - /* - * This block marks all local refs as COMPLETE, and then recursively marks all - * parents of those refs as COMPLETE. - */ - trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL); if (!args->deepen) { for_each_ref(mark_complete_oid, NULL); for_each_cached_alternate(NULL, mark_alternate_complete); @@ -706,13 +699,11 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator, if (cutoff) mark_recent_complete_commits(args, cutoff); } - trace2_region_leave("fetch-pack", "mark_complete_local_refs", NULL); /* * Mark all complete remote refs as common refs. * Don't mark them common yet; the server has to be told so first. */ - trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL); for (ref = *refs; ref; ref = ref->next) { struct object *o = deref_tag(the_repository, lookup_object(the_repository, @@ -725,7 +716,6 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator, negotiator->known_common(negotiator, (struct commit *)o); } - trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL); save_commit_buffer = old_save_commit_buffer; } @@ -768,33 +758,8 @@ static int sideband_demux(int in, int out, void *data) return ret; } -static void write_promisor_file(const char *keep_name, - struct ref **sought, int nr_sought) -{ - struct strbuf promisor_name = STRBUF_INIT; - int suffix_stripped; - FILE *output; - int i; - - strbuf_addstr(&promisor_name, keep_name); - suffix_stripped = strbuf_strip_suffix(&promisor_name, ".keep"); - if (!suffix_stripped) - BUG("name of pack lockfile should end with .keep (was '%s')", - keep_name); - strbuf_addstr(&promisor_name, ".promisor"); - - output = xfopen(promisor_name.buf, "w"); - for (i = 0; i < nr_sought; i++) - fprintf(output, "%s %s\n", oid_to_hex(&sought[i]->old_oid), - sought[i]->name); - fclose(output); - - strbuf_release(&promisor_name); -} - static int get_pack(struct fetch_pack_args *args, - int xd[2], char **pack_lockfile, - struct ref **sought, int nr_sought) + int xd[2], char **pack_lockfile) { struct async demux; int do_keep = args->keep_pack; @@ -856,13 +821,7 @@ static int get_pack(struct fetch_pack_args *args, } if (args->check_self_contained_and_connected) argv_array_push(&cmd.args, "--check-self-contained-and-connected"); - /* - * If we're obtaining the filename of a lockfile, we'll use - * that filename to write a .promisor file with more - * information below. If not, we need index-pack to do it for - * us. - */ - if (!(do_keep && pack_lockfile) && args->from_promisor) + if (args->from_promisor) argv_array_push(&cmd.args, "--promisor"); } else { @@ -916,14 +875,6 @@ static int get_pack(struct fetch_pack_args *args, die(_("%s failed"), cmd_name); if (use_sideband && finish_async(&demux)) die(_("error in sideband demultiplexer")); - - /* - * Now that index-pack has succeeded, write the promisor file using the - * obtained .keep filename if necessary - */ - if (do_keep && pack_lockfile && args->from_promisor) - write_promisor_file(*pack_lockfile, sought, nr_sought); - return 0; } @@ -941,20 +892,12 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, struct shallow_info *si, char **pack_lockfile) { - struct repository *r = the_repository; struct ref *ref = copy_ref_list(orig_ref); struct object_id oid; const char *agent_feature; int agent_len; - struct fetch_negotiator negotiator_alloc; - struct fetch_negotiator *negotiator; - - if (args->no_dependents) { - negotiator = NULL; - } else { - negotiator = &negotiator_alloc; - fetch_negotiator_init(r, negotiator); - } + struct fetch_negotiator negotiator; + fetch_negotiator_init(&negotiator, negotiation_algorithm); sort_ref_list(&ref, ref_compare_name); QSORT(sought, nr_sought, cmp_ref_by_name); @@ -968,7 +911,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, if (server_supports("shallow")) print_verbose(args, _("Server supports %s"), "shallow"); - else if (args->depth > 0 || is_repository_shallow(r)) + else if (args->depth > 0 || is_repository_shallow(the_repository)) die(_("Server does not support shallow clients")); if (args->depth > 0 || args->deepen_since || args->deepen_not) args->deepen = 1; @@ -1041,7 +984,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, die(_("Server does not support --deepen")); if (!args->no_dependents) { - mark_complete_and_common_ref(negotiator, args, &ref); + mark_complete_and_common_ref(&negotiator, args, &ref); filter_refs(args, &ref, sought, nr_sought); if (everything_local(args, &ref)) { packet_flush(fd[1]); @@ -1050,7 +993,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, } else { filter_refs(args, &ref, sought, nr_sought); } - if (find_common(negotiator, args, fd, &oid, ref) < 0) + if (find_common(&negotiator, args, fd, &oid, ref) < 0) if (!args->keep_pack) /* When cloning, it is not unusual to have * no common commit. @@ -1066,12 +1009,11 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, alternate_shallow_file = setup_temporary_shallow(si->shallow); else alternate_shallow_file = NULL; - if (get_pack(args, fd, pack_lockfile, sought, nr_sought)) + if (get_pack(args, fd, pack_lockfile)) die(_("git fetch-pack: fetch failed.")); all_done: - if (negotiator) - negotiator->release(negotiator); + negotiator.release(&negotiator); return ref; } @@ -1170,7 +1112,7 @@ static int add_haves(struct fetch_negotiator *negotiator, } static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, - struct fetch_pack_args *args, + const struct fetch_pack_args *args, const struct ref *wants, struct oidset *common, int *haves_to_send, int *in_vain, int sideband_all) @@ -1211,10 +1153,13 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out, /* Add filter */ if (server_supports_feature("fetch", "filter", 0) && args->filter_options.choice) { - const char *spec = - expand_list_objects_filter_spec(&args->filter_options); + struct strbuf expanded_filter_spec = STRBUF_INIT; print_verbose(args, _("Server supports filter")); - packet_buf_write(&req_buf, "filter %s", spec); + expand_list_objects_filter_spec(&args->filter_options, + &expanded_filter_spec); + packet_buf_write(&req_buf, "filter %s", + expanded_filter_spec.buf); + strbuf_release(&expanded_filter_spec); } else if (args->filter_options.choice) { warning("filtering not recognized by server, ignoring"); } @@ -1289,8 +1234,7 @@ static int process_acks(struct fetch_negotiator *negotiator, struct commit *commit; oidset_insert(common, &oid); commit = lookup_commit(the_repository, &oid); - if (negotiator) - negotiator->ack(negotiator, commit); + negotiator->ack(negotiator, commit); } continue; } @@ -1435,23 +1379,14 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, struct shallow_info *si, char **pack_lockfile) { - struct repository *r = the_repository; struct ref *ref = copy_ref_list(orig_ref); enum fetch_state state = FETCH_CHECK_LOCAL; struct oidset common = OIDSET_INIT; struct packet_reader reader; - int in_vain = 0, negotiation_started = 0; + int in_vain = 0; int haves_to_send = INITIAL_FLUSH; - struct fetch_negotiator negotiator_alloc; - struct fetch_negotiator *negotiator; - - if (args->no_dependents) { - negotiator = NULL; - } else { - negotiator = &negotiator_alloc; - fetch_negotiator_init(r, negotiator); - } - + struct fetch_negotiator negotiator; + fetch_negotiator_init(&negotiator, negotiation_algorithm); packet_reader_init(&reader, fd[0], NULL, 0, PACKET_READ_CHOMP_NEWLINE | PACKET_READ_DIE_ON_ERR_PACKET); @@ -1475,15 +1410,15 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, /* Filter 'ref' by 'sought' and those that aren't local */ if (!args->no_dependents) { - mark_complete_and_common_ref(negotiator, args, &ref); + mark_complete_and_common_ref(&negotiator, args, &ref); filter_refs(args, &ref, sought, nr_sought); if (everything_local(args, &ref)) state = FETCH_DONE; else state = FETCH_SEND_REQUEST; - mark_tips(negotiator, args->negotiation_tips); - for_each_cached_alternate(negotiator, + mark_tips(&negotiator, args->negotiation_tips); + for_each_cached_alternate(&negotiator, insert_one_alternate_object); } else { filter_refs(args, &ref, sought, nr_sought); @@ -1491,13 +1426,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, } break; case FETCH_SEND_REQUEST: - if (!negotiation_started) { - negotiation_started = 1; - trace2_region_enter("fetch-pack", - "negotiation_v2", - the_repository); - } - if (send_fetch_request(negotiator, fd[1], args, ref, + if (send_fetch_request(&negotiator, fd[1], args, ref, &common, &haves_to_send, &in_vain, reader.use_sideband)) @@ -1507,7 +1436,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, break; case FETCH_PROCESS_ACKS: /* Process ACKs/NAKs */ - switch (process_acks(negotiator, &reader, &common)) { + switch (process_acks(&negotiator, &reader, &common)) { case 2: state = FETCH_GET_PACK; break; @@ -1520,9 +1449,6 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, } break; case FETCH_GET_PACK: - trace2_region_leave("fetch-pack", - "negotiation_v2", - the_repository); /* Check for shallow-info section */ if (process_section_header(&reader, "shallow-info", 1)) receive_shallow_info(args, &reader, shallows, si); @@ -1532,7 +1458,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, /* get the pack */ process_section_header(&reader, "packfile", 0); - if (get_pack(args, fd, pack_lockfile, sought, nr_sought)) + if (get_pack(args, fd, pack_lockfile)) die(_("git fetch-pack: fetch failed.")); state = FETCH_DONE; @@ -1542,8 +1468,7 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, } } - if (negotiator) - negotiator->release(negotiator); + negotiator.release(&negotiator); oidset_clear(&common); return ref; } @@ -1580,6 +1505,8 @@ static void fetch_pack_config(void) git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta); git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects); git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects); + git_config_get_string("fetch.negotiationalgorithm", + &negotiation_algorithm); git_config(fetch_pack_config_cb, NULL); } diff --git a/third_party/git/fsck.c b/third_party/git/fsck.c index 73f30773f2..cdb7d8db03 100644 --- a/third_party/git/fsck.c +++ b/third_party/git/fsck.c @@ -9,14 +9,12 @@ #include "tag.h" #include "fsck.h" #include "refs.h" -#include "url.h" #include "utf8.h" #include "decorate.h" #include "oidset.h" #include "packfile.h" #include "submodule-config.h" #include "config.h" -#include "credential.h" #include "help.h" static struct oidset gitmodules_found = OIDSET_INIT; @@ -45,17 +43,21 @@ static struct oidset gitmodules_done = OIDSET_INIT; FUNC(MISSING_AUTHOR, ERROR) \ FUNC(MISSING_COMMITTER, ERROR) \ FUNC(MISSING_EMAIL, ERROR) \ + FUNC(MISSING_GRAFT, ERROR) \ FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \ FUNC(MISSING_OBJECT, ERROR) \ + FUNC(MISSING_PARENT, ERROR) \ FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \ FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \ FUNC(MISSING_TAG, ERROR) \ FUNC(MISSING_TAG_ENTRY, ERROR) \ + FUNC(MISSING_TAG_OBJECT, ERROR) \ FUNC(MISSING_TREE, ERROR) \ FUNC(MISSING_TREE_OBJECT, ERROR) \ FUNC(MISSING_TYPE, ERROR) \ FUNC(MISSING_TYPE_ENTRY, ERROR) \ FUNC(MULTIPLE_AUTHORS, ERROR) \ + FUNC(TAG_OBJECT_NOT_TAG, ERROR) \ FUNC(TREE_NOT_SORTED, ERROR) \ FUNC(UNKNOWN_TYPE, ERROR) \ FUNC(ZERO_PADDED_DATE, ERROR) \ @@ -66,7 +68,6 @@ static struct oidset gitmodules_done = OIDSET_INIT; FUNC(GITMODULES_SYMLINK, ERROR) \ FUNC(GITMODULES_URL, ERROR) \ FUNC(GITMODULES_PATH, ERROR) \ - FUNC(GITMODULES_UPDATE, ERROR) \ /* warnings */ \ FUNC(BAD_FILEMODE, WARN) \ FUNC(EMPTY_NAME, WARN) \ @@ -280,16 +281,14 @@ static void append_msg_id(struct strbuf *sb, const char *msg_id) strbuf_addstr(sb, ": "); } -static int object_on_skiplist(struct fsck_options *opts, - const struct object_id *oid) +static int object_on_skiplist(struct fsck_options *opts, struct object *obj) { - return opts && oid && oidset_contains(&opts->skiplist, oid); + return opts && obj && oidset_contains(&opts->skiplist, &obj->oid); } -__attribute__((format (printf, 5, 6))) -static int report(struct fsck_options *options, - const struct object_id *oid, enum object_type object_type, - enum fsck_msg_id id, const char *fmt, ...) +__attribute__((format (printf, 4, 5))) +static int report(struct fsck_options *options, struct object *object, + enum fsck_msg_id id, const char *fmt, ...) { va_list ap; struct strbuf sb = STRBUF_INIT; @@ -298,7 +297,7 @@ static int report(struct fsck_options *options, if (msg_type == FSCK_IGNORE) return 0; - if (object_on_skiplist(options, oid)) + if (object_on_skiplist(options, object)) return 0; if (msg_type == FSCK_FATAL) @@ -310,71 +309,49 @@ static int report(struct fsck_options *options, va_start(ap, fmt); strbuf_vaddf(&sb, fmt, ap); - result = options->error_func(options, oid, object_type, - msg_type, sb.buf); + result = options->error_func(options, object, msg_type, sb.buf); strbuf_release(&sb); va_end(ap); return result; } -void fsck_enable_object_names(struct fsck_options *options) +static char *get_object_name(struct fsck_options *options, struct object *obj) { if (!options->object_names) - options->object_names = kh_init_oid_map(); -} - -const char *fsck_get_object_name(struct fsck_options *options, - const struct object_id *oid) -{ - khiter_t pos; - if (!options->object_names) - return NULL; - pos = kh_get_oid_map(options->object_names, *oid); - if (pos >= kh_end(options->object_names)) return NULL; - return kh_value(options->object_names, pos); + return lookup_decoration(options->object_names, obj); } -void fsck_put_object_name(struct fsck_options *options, - const struct object_id *oid, - const char *fmt, ...) +static void put_object_name(struct fsck_options *options, struct object *obj, + const char *fmt, ...) { va_list ap; struct strbuf buf = STRBUF_INIT; - khiter_t pos; - int hashret; + char *existing; if (!options->object_names) return; - - pos = kh_put_oid_map(options->object_names, *oid, &hashret); - if (!hashret) + existing = lookup_decoration(options->object_names, obj); + if (existing) return; va_start(ap, fmt); strbuf_vaddf(&buf, fmt, ap); - kh_value(options->object_names, pos) = strbuf_detach(&buf, NULL); + add_decoration(options->object_names, obj, strbuf_detach(&buf, NULL)); va_end(ap); } -const char *fsck_describe_object(struct fsck_options *options, - const struct object_id *oid) +static const char *describe_object(struct fsck_options *o, struct object *obj) { - static struct strbuf bufs[] = { - STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT - }; - static int b = 0; - struct strbuf *buf; - const char *name = fsck_get_object_name(options, oid); - - buf = bufs + b; - b = (b + 1) % ARRAY_SIZE(bufs); - strbuf_reset(buf); - strbuf_addstr(buf, oid_to_hex(oid)); - if (name) - strbuf_addf(buf, " (%s)", name); + static struct strbuf buf = STRBUF_INIT; + char *name; + + strbuf_reset(&buf); + strbuf_addstr(&buf, oid_to_hex(&obj->oid)); + if (o->object_names && (name = lookup_decoration(o->object_names, obj))) + strbuf_addf(&buf, " (%s)", name); - return buf->buf; + return buf.buf; } static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *options) @@ -387,7 +364,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op if (parse_tree(tree)) return -1; - name = fsck_get_object_name(options, &tree->object.oid); + name = get_object_name(options, &tree->object); if (init_tree_desc_gently(&desc, tree->buffer, tree->size)) return -1; while (tree_entry_gently(&desc, &entry)) { @@ -400,21 +377,20 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op if (S_ISDIR(entry.mode)) { obj = (struct object *)lookup_tree(the_repository, &entry.oid); if (name && obj) - fsck_put_object_name(options, &entry.oid, "%s%s/", - name, entry.path); + put_object_name(options, obj, "%s%s/", name, + entry.path); result = options->walk(obj, OBJ_TREE, data, options); } else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) { obj = (struct object *)lookup_blob(the_repository, &entry.oid); if (name && obj) - fsck_put_object_name(options, &entry.oid, "%s%s", - name, entry.path); + put_object_name(options, obj, "%s%s", name, + entry.path); result = options->walk(obj, OBJ_BLOB, data, options); } else { result = error("in tree %s: entry %s has bad mode %.6o", - fsck_describe_object(options, &tree->object.oid), - entry.path, entry.mode); + describe_object(options, &tree->object), entry.path, entry.mode); } if (result < 0) return result; @@ -435,10 +411,10 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio if (parse_commit(commit)) return -1; - name = fsck_get_object_name(options, &commit->object.oid); + name = get_object_name(options, &commit->object); if (name) - fsck_put_object_name(options, get_commit_tree_oid(commit), - "%s:", name); + put_object_name(options, &get_commit_tree(commit)->object, + "%s:", name); result = options->walk((struct object *)get_commit_tree(commit), OBJ_TREE, data, options); @@ -466,17 +442,16 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio while (parents) { if (name) { - struct object_id *oid = &parents->item->object.oid; + struct object *obj = &parents->item->object; if (counter++) - fsck_put_object_name(options, oid, "%s^%d", - name, counter); + put_object_name(options, obj, "%s^%d", + name, counter); else if (generation > 0) - fsck_put_object_name(options, oid, "%.*s~%d", - name_prefix_len, name, - generation + 1); + put_object_name(options, obj, "%.*s~%d", + name_prefix_len, name, generation + 1); else - fsck_put_object_name(options, oid, "%s^", name); + put_object_name(options, obj, "%s^", name); } result = options->walk((struct object *)parents->item, OBJ_COMMIT, data, options); if (result < 0) @@ -490,12 +465,12 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio static int fsck_walk_tag(struct tag *tag, void *data, struct fsck_options *options) { - const char *name = fsck_get_object_name(options, &tag->object.oid); + char *name = get_object_name(options, &tag->object); if (parse_tag(tag)) return -1; if (name) - fsck_put_object_name(options, &tag->tagged->oid, "%s", name); + put_object_name(options, tag->tagged, "%s", name); return options->walk(tag->tagged, OBJ_ANY, data, options); } @@ -517,8 +492,7 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options) case OBJ_TAG: return fsck_walk_tag((struct tag *)obj, data, options); default: - error("Unknown object type for %s", - fsck_describe_object(options, &obj->oid)); + error("Unknown object type for %s", describe_object(options, obj)); return -1; } } @@ -569,9 +543,7 @@ static int verify_ordered(unsigned mode1, const char *name1, unsigned mode2, con return c1 < c2 ? 0 : TREE_UNORDERED; } -static int fsck_tree(const struct object_id *oid, - const char *buffer, unsigned long size, - struct fsck_options *options) +static int fsck_tree(struct tree *item, struct fsck_options *options) { int retval = 0; int has_null_sha1 = 0; @@ -588,8 +560,8 @@ static int fsck_tree(const struct object_id *oid, unsigned o_mode; const char *o_name; - if (init_tree_desc_gently(&desc, buffer, size)) { - retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree"); + if (init_tree_desc_gently(&desc, item->buffer, item->size)) { + retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree"); return retval; } @@ -598,7 +570,7 @@ static int fsck_tree(const struct object_id *oid, while (desc.size) { unsigned short mode; - const char *name, *backslash; + const char *name; const struct object_id *oid; oid = tree_entry_extract(&desc, &name, &mode); @@ -615,30 +587,13 @@ static int fsck_tree(const struct object_id *oid, if (!S_ISLNK(mode)) oidset_insert(&gitmodules_found, oid); else - retval += report(options, - oid, OBJ_TREE, + retval += report(options, &item->object, FSCK_MSG_GITMODULES_SYMLINK, ".gitmodules is a symbolic link"); } - if ((backslash = strchr(name, '\\'))) { - while (backslash) { - backslash++; - has_dotgit |= is_ntfs_dotgit(backslash); - if (is_ntfs_dotgitmodules(backslash)) { - if (!S_ISLNK(mode)) - oidset_insert(&gitmodules_found, oid); - else - retval += report(options, oid, OBJ_TREE, - FSCK_MSG_GITMODULES_SYMLINK, - ".gitmodules is a symbolic link"); - } - backslash = strchr(backslash, '\\'); - } - } - if (update_tree_entry_gently(&desc)) { - retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree"); + retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree"); break; } @@ -683,31 +638,30 @@ static int fsck_tree(const struct object_id *oid, } if (has_null_sha1) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1"); + retval += report(options, &item->object, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1"); if (has_full_path) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_FULL_PATHNAME, "contains full pathnames"); + retval += report(options, &item->object, FSCK_MSG_FULL_PATHNAME, "contains full pathnames"); if (has_empty_name) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_EMPTY_NAME, "contains empty pathname"); + retval += report(options, &item->object, FSCK_MSG_EMPTY_NAME, "contains empty pathname"); if (has_dot) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOT, "contains '.'"); + retval += report(options, &item->object, FSCK_MSG_HAS_DOT, "contains '.'"); if (has_dotdot) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOTDOT, "contains '..'"); + retval += report(options, &item->object, FSCK_MSG_HAS_DOTDOT, "contains '..'"); if (has_dotgit) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_HAS_DOTGIT, "contains '.git'"); + retval += report(options, &item->object, FSCK_MSG_HAS_DOTGIT, "contains '.git'"); if (has_zero_pad) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_ZERO_PADDED_FILEMODE, "contains zero-padded file modes"); + retval += report(options, &item->object, FSCK_MSG_ZERO_PADDED_FILEMODE, "contains zero-padded file modes"); if (has_bad_modes) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_FILEMODE, "contains bad file modes"); + retval += report(options, &item->object, FSCK_MSG_BAD_FILEMODE, "contains bad file modes"); if (has_dup_entries) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_DUPLICATE_ENTRIES, "contains duplicate file entries"); + retval += report(options, &item->object, FSCK_MSG_DUPLICATE_ENTRIES, "contains duplicate file entries"); if (not_properly_sorted) - retval += report(options, oid, OBJ_TREE, FSCK_MSG_TREE_NOT_SORTED, "not properly sorted"); + retval += report(options, &item->object, FSCK_MSG_TREE_NOT_SORTED, "not properly sorted"); return retval; } static int verify_headers(const void *data, unsigned long size, - const struct object_id *oid, enum object_type type, - struct fsck_options *options) + struct object *obj, struct fsck_options *options) { const char *buffer = (const char *)data; unsigned long i; @@ -715,7 +669,7 @@ static int verify_headers(const void *data, unsigned long size, for (i = 0; i < size; i++) { switch (buffer[i]) { case '\0': - return report(options, oid, type, + return report(options, obj, FSCK_MSG_NUL_IN_HEADER, "unterminated header: NUL at offset %ld", i); case '\n': @@ -733,13 +687,11 @@ static int verify_headers(const void *data, unsigned long size, if (size && buffer[size - 1] == '\n') return 0; - return report(options, oid, type, + return report(options, obj, FSCK_MSG_UNTERMINATED_HEADER, "unterminated header"); } -static int fsck_ident(const char **ident, - const struct object_id *oid, enum object_type type, - struct fsck_options *options) +static int fsck_ident(const char **ident, struct object *obj, struct fsck_options *options) { const char *p = *ident; char *end; @@ -749,28 +701,28 @@ static int fsck_ident(const char **ident, (*ident)++; if (*p == '<') - return report(options, oid, type, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); + return report(options, obj, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); p += strcspn(p, "<>\n"); if (*p == '>') - return report(options, oid, type, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name"); + return report(options, obj, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name"); if (*p != '<') - return report(options, oid, type, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email"); + return report(options, obj, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email"); if (p[-1] != ' ') - return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); + return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email"); p++; p += strcspn(p, "<>\n"); if (*p != '>') - return report(options, oid, type, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email"); + return report(options, obj, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email"); p++; if (*p != ' ') - return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date"); + return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date"); p++; if (*p == '0' && p[1] != ' ') - return report(options, oid, type, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date"); + return report(options, obj, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date"); if (date_overflows(parse_timestamp(p, &end, 10))) - return report(options, oid, type, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow"); + return report(options, obj, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow"); if ((end == p || *end != ' ')) - return report(options, oid, type, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date"); + return report(options, obj, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date"); p = end + 1; if ((*p != '+' && *p != '-') || !isdigit(p[1]) || @@ -778,60 +730,83 @@ static int fsck_ident(const char **ident, !isdigit(p[3]) || !isdigit(p[4]) || (p[5] != '\n')) - return report(options, oid, type, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone"); + return report(options, obj, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone"); p += 6; return 0; } -static int fsck_commit(const struct object_id *oid, - const char *buffer, unsigned long size, - struct fsck_options *options) +static int fsck_commit_buffer(struct commit *commit, const char *buffer, + unsigned long size, struct fsck_options *options) { - struct object_id tree_oid, parent_oid; - unsigned author_count; + struct object_id tree_oid, oid; + struct commit_graft *graft; + unsigned parent_count, parent_line_count = 0, author_count; int err; const char *buffer_begin = buffer; const char *p; - if (verify_headers(buffer, size, oid, OBJ_COMMIT, options)) + if (verify_headers(buffer, size, &commit->object, options)) return -1; if (!skip_prefix(buffer, "tree ", &buffer)) - return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line"); + return report(options, &commit->object, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line"); if (parse_oid_hex(buffer, &tree_oid, &p) || *p != '\n') { - err = report(options, oid, OBJ_COMMIT, FSCK_MSG_BAD_TREE_SHA1, "invalid 'tree' line format - bad sha1"); + err = report(options, &commit->object, FSCK_MSG_BAD_TREE_SHA1, "invalid 'tree' line format - bad sha1"); if (err) return err; } buffer = p + 1; while (skip_prefix(buffer, "parent ", &buffer)) { - if (parse_oid_hex(buffer, &parent_oid, &p) || *p != '\n') { - err = report(options, oid, OBJ_COMMIT, FSCK_MSG_BAD_PARENT_SHA1, "invalid 'parent' line format - bad sha1"); + if (parse_oid_hex(buffer, &oid, &p) || *p != '\n') { + err = report(options, &commit->object, FSCK_MSG_BAD_PARENT_SHA1, "invalid 'parent' line format - bad sha1"); if (err) return err; } buffer = p + 1; + parent_line_count++; + } + graft = lookup_commit_graft(the_repository, &commit->object.oid); + parent_count = commit_list_count(commit->parents); + if (graft) { + if (graft->nr_parent == -1 && !parent_count) + ; /* shallow commit */ + else if (graft->nr_parent != parent_count) { + err = report(options, &commit->object, FSCK_MSG_MISSING_GRAFT, "graft objects missing"); + if (err) + return err; + } + } else { + if (parent_count != parent_line_count) { + err = report(options, &commit->object, FSCK_MSG_MISSING_PARENT, "parent objects missing"); + if (err) + return err; + } } author_count = 0; while (skip_prefix(buffer, "author ", &buffer)) { author_count++; - err = fsck_ident(&buffer, oid, OBJ_COMMIT, options); + err = fsck_ident(&buffer, &commit->object, options); if (err) return err; } if (author_count < 1) - err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line"); + err = report(options, &commit->object, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line"); else if (author_count > 1) - err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines"); + err = report(options, &commit->object, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines"); if (err) return err; if (!skip_prefix(buffer, "committer ", &buffer)) - return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line"); - err = fsck_ident(&buffer, oid, OBJ_COMMIT, options); + return report(options, &commit->object, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line"); + err = fsck_ident(&buffer, &commit->object, options); if (err) return err; + if (!get_commit_tree(commit)) { + err = report(options, &commit->object, FSCK_MSG_BAD_TREE, "could not load commit's tree %s", oid_to_hex(&tree_oid)); + if (err) + return err; + } if (memchr(buffer_begin, '\0', size)) { - err = report(options, oid, OBJ_COMMIT, FSCK_MSG_NUL_IN_COMMIT, + err = report(options, &commit->object, FSCK_MSG_NUL_IN_COMMIT, "NUL byte in the commit object body"); if (err) return err; @@ -839,60 +814,91 @@ static int fsck_commit(const struct object_id *oid, return 0; } -static int fsck_tag(const struct object_id *oid, const char *buffer, - unsigned long size, struct fsck_options *options) +static int fsck_commit(struct commit *commit, const char *data, + unsigned long size, struct fsck_options *options) { - struct object_id tagged_oid; + const char *buffer = data ? data : get_commit_buffer(commit, &size); + int ret = fsck_commit_buffer(commit, buffer, size, options); + if (!data) + unuse_commit_buffer(commit, buffer); + return ret; +} + +static int fsck_tag_buffer(struct tag *tag, const char *data, + unsigned long size, struct fsck_options *options) +{ + struct object_id oid; int ret = 0; - char *eol; + const char *buffer; + char *to_free = NULL, *eol; struct strbuf sb = STRBUF_INIT; const char *p; - ret = verify_headers(buffer, size, oid, OBJ_TAG, options); + if (data) + buffer = data; + else { + enum object_type type; + + buffer = to_free = + read_object_file(&tag->object.oid, &type, &size); + if (!buffer) + return report(options, &tag->object, + FSCK_MSG_MISSING_TAG_OBJECT, + "cannot read tag object"); + + if (type != OBJ_TAG) { + ret = report(options, &tag->object, + FSCK_MSG_TAG_OBJECT_NOT_TAG, + "expected tag got %s", + type_name(type)); + goto done; + } + } + + ret = verify_headers(buffer, size, &tag->object, options); if (ret) goto done; if (!skip_prefix(buffer, "object ", &buffer)) { - ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line"); + ret = report(options, &tag->object, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line"); goto done; } - if (parse_oid_hex(buffer, &tagged_oid, &p) || *p != '\n') { - ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_OBJECT_SHA1, "invalid 'object' line format - bad sha1"); + if (parse_oid_hex(buffer, &oid, &p) || *p != '\n') { + ret = report(options, &tag->object, FSCK_MSG_BAD_OBJECT_SHA1, "invalid 'object' line format - bad sha1"); if (ret) goto done; } buffer = p + 1; if (!skip_prefix(buffer, "type ", &buffer)) { - ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line"); + ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line"); goto done; } eol = strchr(buffer, '\n'); if (!eol) { - ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TYPE, "invalid format - unexpected end after 'type' line"); + ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE, "invalid format - unexpected end after 'type' line"); goto done; } if (type_from_string_gently(buffer, eol - buffer, 1) < 0) - ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_TYPE, "invalid 'type' value"); + ret = report(options, &tag->object, FSCK_MSG_BAD_TYPE, "invalid 'type' value"); if (ret) goto done; buffer = eol + 1; if (!skip_prefix(buffer, "tag ", &buffer)) { - ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line"); + ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line"); goto done; } eol = strchr(buffer, '\n'); if (!eol) { - ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAG, "invalid format - unexpected end after 'type' line"); + ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG, "invalid format - unexpected end after 'type' line"); goto done; } strbuf_addf(&sb, "refs/tags/%.*s", (int)(eol - buffer), buffer); if (check_refname_format(sb.buf, 0)) { - ret = report(options, oid, OBJ_TAG, - FSCK_MSG_BAD_TAG_NAME, - "invalid 'tag' name: %.*s", - (int)(eol - buffer), buffer); + ret = report(options, &tag->object, FSCK_MSG_BAD_TAG_NAME, + "invalid 'tag' name: %.*s", + (int)(eol - buffer), buffer); if (ret) goto done; } @@ -900,163 +906,32 @@ static int fsck_tag(const struct object_id *oid, const char *buffer, if (!skip_prefix(buffer, "tagger ", &buffer)) { /* early tags do not contain 'tagger' lines; warn only */ - ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line"); + ret = report(options, &tag->object, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line"); if (ret) goto done; } else - ret = fsck_ident(&buffer, oid, OBJ_TAG, options); + ret = fsck_ident(&buffer, &tag->object, options); done: strbuf_release(&sb); + free(to_free); return ret; } -/* - * Like builtin/submodule--helper.c's starts_with_dot_slash, but without - * relying on the platform-dependent is_dir_sep helper. - * - * This is for use in checking whether a submodule URL is interpreted as - * relative to the current directory on any platform, since \ is a - * directory separator on Windows but not on other platforms. - */ -static int starts_with_dot_slash(const char *str) -{ - return str[0] == '.' && (str[1] == '/' || str[1] == '\\'); -} - -/* - * Like starts_with_dot_slash, this is a variant of submodule--helper's - * helper of the same name with the twist that it accepts backslash as a - * directory separator even on non-Windows platforms. - */ -static int starts_with_dot_dot_slash(const char *str) -{ - return str[0] == '.' && starts_with_dot_slash(str + 1); -} - -static int submodule_url_is_relative(const char *url) -{ - return starts_with_dot_slash(url) || starts_with_dot_dot_slash(url); -} - -/* - * Count directory components that a relative submodule URL should chop - * from the remote_url it is to be resolved against. - * - * In other words, this counts "../" components at the start of a - * submodule URL. - * - * Returns the number of directory components to chop and writes a - * pointer to the next character of url after all leading "./" and - * "../" components to out. - */ -static int count_leading_dotdots(const char *url, const char **out) -{ - int result = 0; - while (1) { - if (starts_with_dot_dot_slash(url)) { - result++; - url += strlen("../"); - continue; - } - if (starts_with_dot_slash(url)) { - url += strlen("./"); - continue; - } - *out = url; - return result; - } -} -/* - * Check whether a transport is implemented by git-remote-curl. - * - * If it is, returns 1 and writes the URL that would be passed to - * git-remote-curl to the "out" parameter. - * - * Otherwise, returns 0 and leaves "out" untouched. - * - * Examples: - * http::https://example.com/repo.git -> 1, https://example.com/repo.git - * https://example.com/repo.git -> 1, https://example.com/repo.git - * git://example.com/repo.git -> 0 - * - * This is for use in checking for previously exploitable bugs that - * required a submodule URL to be passed to git-remote-curl. - */ -static int url_to_curl_url(const char *url, const char **out) +static int fsck_tag(struct tag *tag, const char *data, + unsigned long size, struct fsck_options *options) { - /* - * We don't need to check for case-aliases, "http.exe", and so - * on because in the default configuration, is_transport_allowed - * prevents URLs with those schemes from being cloned - * automatically. - */ - if (skip_prefix(url, "http::", out) || - skip_prefix(url, "https::", out) || - skip_prefix(url, "ftp::", out) || - skip_prefix(url, "ftps::", out)) - return 1; - if (starts_with(url, "http://") || - starts_with(url, "https://") || - starts_with(url, "ftp://") || - starts_with(url, "ftps://")) { - *out = url; - return 1; - } - return 0; -} + struct object *tagged = tag->tagged; -static int check_submodule_url(const char *url) -{ - const char *curl_url; - - if (looks_like_command_line_option(url)) - return -1; - - if (submodule_url_is_relative(url)) { - char *decoded; - const char *next; - int has_nl; - - /* - * This could be appended to an http URL and url-decoded; - * check for malicious characters. - */ - decoded = url_decode(url); - has_nl = !!strchr(decoded, '\n'); - - free(decoded); - if (has_nl) - return -1; - - /* - * URLs which escape their root via "../" can overwrite - * the host field and previous components, resolving to - * URLs like https::example.com/submodule.git and - * https:///example.com/submodule.git that were - * susceptible to CVE-2020-11008. - */ - if (count_leading_dotdots(url, &next) > 0 && - (*next == ':' || *next == '/')) - return -1; - } + if (!tagged) + return report(options, &tag->object, FSCK_MSG_BAD_TAG_OBJECT, "could not load tagged object"); - else if (url_to_curl_url(url, &curl_url)) { - struct credential c = CREDENTIAL_INIT; - int ret = 0; - if (credential_from_url_gently(&c, curl_url, 1) || - !*c.host) - ret = -1; - credential_clear(&c); - return ret; - } - - return 0; + return fsck_tag_buffer(tag, data, size, options); } struct fsck_gitmodules_data { - const struct object_id *oid; + struct object *obj; struct fsck_options *options; int ret; }; @@ -1074,47 +949,38 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata) name = xmemdupz(subsection, subsection_len); if (check_submodule_name(name) < 0) - data->ret |= report(data->options, - data->oid, OBJ_BLOB, + data->ret |= report(data->options, data->obj, FSCK_MSG_GITMODULES_NAME, "disallowed submodule name: %s", name); if (!strcmp(key, "url") && value && - check_submodule_url(value) < 0) - data->ret |= report(data->options, - data->oid, OBJ_BLOB, + looks_like_command_line_option(value)) + data->ret |= report(data->options, data->obj, FSCK_MSG_GITMODULES_URL, "disallowed submodule url: %s", value); if (!strcmp(key, "path") && value && looks_like_command_line_option(value)) - data->ret |= report(data->options, - data->oid, OBJ_BLOB, + data->ret |= report(data->options, data->obj, FSCK_MSG_GITMODULES_PATH, "disallowed submodule path: %s", value); - if (!strcmp(key, "update") && value && - parse_submodule_update_type(value) == SM_UPDATE_COMMAND) - data->ret |= report(data->options, data->oid, OBJ_BLOB, - FSCK_MSG_GITMODULES_UPDATE, - "disallowed submodule update setting: %s", - value); free(name); return 0; } -static int fsck_blob(const struct object_id *oid, const char *buf, +static int fsck_blob(struct blob *blob, const char *buf, unsigned long size, struct fsck_options *options) { struct fsck_gitmodules_data data; struct config_options config_opts = { 0 }; - if (!oidset_contains(&gitmodules_found, oid)) + if (!oidset_contains(&gitmodules_found, &blob->object.oid)) return 0; - oidset_insert(&gitmodules_done, oid); + oidset_insert(&gitmodules_done, &blob->object.oid); - if (object_on_skiplist(options, oid)) + if (object_on_skiplist(options, &blob->object)) return 0; if (!buf) { @@ -1123,18 +989,18 @@ static int fsck_blob(const struct object_id *oid, const char *buf, * blob too gigantic to load into memory. Let's just consider * that an error. */ - return report(options, oid, OBJ_BLOB, + return report(options, &blob->object, FSCK_MSG_GITMODULES_LARGE, ".gitmodules too large to parse"); } - data.oid = oid; + data.obj = &blob->object; data.options = options; data.ret = 0; config_opts.error_action = CONFIG_ERROR_SILENT; if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB, ".gitmodules", buf, size, &data, &config_opts)) - data.ret |= report(options, oid, OBJ_BLOB, + data.ret |= report(options, &blob->object, FSCK_MSG_GITMODULES_PARSE, "could not parse gitmodules blob"); @@ -1145,33 +1011,31 @@ int fsck_object(struct object *obj, void *data, unsigned long size, struct fsck_options *options) { if (!obj) - return report(options, NULL, OBJ_NONE, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck"); + return report(options, obj, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck"); if (obj->type == OBJ_BLOB) - return fsck_blob(&obj->oid, data, size, options); + return fsck_blob((struct blob *)obj, data, size, options); if (obj->type == OBJ_TREE) - return fsck_tree(&obj->oid, data, size, options); + return fsck_tree((struct tree *) obj, options); if (obj->type == OBJ_COMMIT) - return fsck_commit(&obj->oid, data, size, options); + return fsck_commit((struct commit *) obj, (const char *) data, + size, options); if (obj->type == OBJ_TAG) - return fsck_tag(&obj->oid, data, size, options); + return fsck_tag((struct tag *) obj, (const char *) data, + size, options); - return report(options, &obj->oid, obj->type, - FSCK_MSG_UNKNOWN_TYPE, - "unknown type '%d' (internal fsck error)", - obj->type); + return report(options, obj, FSCK_MSG_UNKNOWN_TYPE, "unknown type '%d' (internal fsck error)", + obj->type); } int fsck_error_function(struct fsck_options *o, - const struct object_id *oid, - enum object_type object_type, - int msg_type, const char *message) + struct object *obj, int msg_type, const char *message) { if (msg_type == FSCK_WARN) { - warning("object %s: %s", fsck_describe_object(o, oid), message); + warning("object %s: %s", describe_object(o, obj), message); return 0; } - error("object %s: %s", fsck_describe_object(o, oid), message); + error("object %s: %s", describe_object(o, obj), message); return 1; } @@ -1183,6 +1047,7 @@ int fsck_finish(struct fsck_options *options) oidset_iter_init(&gitmodules_found, &iter); while ((oid = oidset_iter_next(&iter))) { + struct blob *blob; enum object_type type; unsigned long size; char *buf; @@ -1190,22 +1055,29 @@ int fsck_finish(struct fsck_options *options) if (oidset_contains(&gitmodules_done, oid)) continue; + blob = lookup_blob(the_repository, oid); + if (!blob) { + struct object *obj = lookup_unknown_object(oid); + ret |= report(options, obj, + FSCK_MSG_GITMODULES_BLOB, + "non-blob found at .gitmodules"); + continue; + } + buf = read_object_file(oid, &type, &size); if (!buf) { - if (is_promisor_object(oid)) + if (is_promisor_object(&blob->object.oid)) continue; - ret |= report(options, - oid, OBJ_BLOB, + ret |= report(options, &blob->object, FSCK_MSG_GITMODULES_MISSING, "unable to read .gitmodules blob"); continue; } if (type == OBJ_BLOB) - ret |= fsck_blob(oid, buf, size, options); + ret |= fsck_blob(blob, buf, size, options); else - ret |= report(options, - oid, type, + ret |= report(options, &blob->object, FSCK_MSG_GITMODULES_BLOB, "non-blob found at .gitmodules"); free(buf); diff --git a/third_party/git/fsck.h b/third_party/git/fsck.h index 69cf715e79..b95595ae5f 100644 --- a/third_party/git/fsck.h +++ b/third_party/git/fsck.h @@ -27,12 +27,10 @@ typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct f /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */ typedef int (*fsck_error)(struct fsck_options *o, - const struct object_id *oid, enum object_type object_type, - int msg_type, const char *message); + struct object *obj, int type, const char *message); int fsck_error_function(struct fsck_options *o, - const struct object_id *oid, enum object_type object_type, - int msg_type, const char *message); + struct object *obj, int type, const char *message); struct fsck_options { fsck_walk_func walk; @@ -40,7 +38,7 @@ struct fsck_options { unsigned strict:1; int *msg_type; struct oidset skiplist; - kh_oid_map_t *object_names; + struct decoration *object_names; }; #define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL, OIDSET_INIT } @@ -54,11 +52,7 @@ struct fsck_options { * 0 everything OK */ int fsck_walk(struct object *obj, void *data, struct fsck_options *options); - -/* - * Blob objects my pass a NULL data pointer, which indicates they are too large - * to fit in memory. All other types must pass a real buffer. - */ +/* If NULL is passed for data, we assume the object is local and read it. */ int fsck_object(struct object *obj, void *data, unsigned long size, struct fsck_options *options); @@ -69,29 +63,4 @@ int fsck_object(struct object *obj, void *data, unsigned long size, */ int fsck_finish(struct fsck_options *options); -/* - * Subsystem for storing human-readable names for each object. - * - * If fsck_enable_object_names() has not been called, all other functions are - * noops. - * - * Use fsck_put_object_name() to seed initial names (e.g. from refnames); the - * fsck code will extend that while walking trees, etc. - * - * Use fsck_get_object_name() to get a single name (or NULL if none). Or the - * more convenient describe_object(), which always produces an output string - * with the oid combined with the name (if any). Note that the return value - * points to a rotating array of static buffers, and may be invalidated by a - * subsequent call. - */ -void fsck_enable_object_names(struct fsck_options *options); -const char *fsck_get_object_name(struct fsck_options *options, - const struct object_id *oid); -__attribute__((format (printf,3,4))) -void fsck_put_object_name(struct fsck_options *options, - const struct object_id *oid, - const char *fmt, ...); -const char *fsck_describe_object(struct fsck_options *options, - const struct object_id *oid); - #endif diff --git a/third_party/git/fsmonitor.c b/third_party/git/fsmonitor.c index 932bd9012d..231e83a94d 100644 --- a/third_party/git/fsmonitor.c +++ b/third_party/git/fsmonitor.c @@ -6,42 +6,19 @@ #include "run-command.h" #include "strbuf.h" -#define INDEX_EXTENSION_VERSION1 (1) -#define INDEX_EXTENSION_VERSION2 (2) -#define HOOK_INTERFACE_VERSION1 (1) -#define HOOK_INTERFACE_VERSION2 (2) +#define INDEX_EXTENSION_VERSION (1) +#define HOOK_INTERFACE_VERSION (1) struct trace_key trace_fsmonitor = TRACE_KEY_INIT(FSMONITOR); static void fsmonitor_ewah_callback(size_t pos, void *is) { struct index_state *istate = (struct index_state *)is; - struct cache_entry *ce; + struct cache_entry *ce = istate->cache[pos]; - if (pos >= istate->cache_nr) - BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" >= %u)", - (uintmax_t)pos, istate->cache_nr); - - ce = istate->cache[pos]; ce->ce_flags &= ~CE_FSMONITOR_VALID; } -static int fsmonitor_hook_version(void) -{ - int hook_version; - - if (git_config_get_int("core.fsmonitorhookversion", &hook_version)) - return -1; - - if (hook_version == HOOK_INTERFACE_VERSION1 || - hook_version == HOOK_INTERFACE_VERSION2) - return hook_version; - - warning("Invalid hook version '%i' in core.fsmonitorhookversion. " - "Must be 1 or 2.", hook_version); - return -1; -} - int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz) { @@ -50,26 +27,17 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data, uint32_t ewah_size; struct ewah_bitmap *fsmonitor_dirty; int ret; - uint64_t timestamp; - struct strbuf last_update = STRBUF_INIT; - if (sz < sizeof(uint32_t) + 1 + sizeof(uint32_t)) + if (sz < sizeof(uint32_t) + sizeof(uint64_t) + sizeof(uint32_t)) return error("corrupt fsmonitor extension (too short)"); hdr_version = get_be32(index); index += sizeof(uint32_t); - if (hdr_version == INDEX_EXTENSION_VERSION1) { - timestamp = get_be64(index); - strbuf_addf(&last_update, "%"PRIu64"", timestamp); - index += sizeof(uint64_t); - } else if (hdr_version == INDEX_EXTENSION_VERSION2) { - strbuf_addstr(&last_update, index); - index += last_update.len + 1; - } else { + if (hdr_version != INDEX_EXTENSION_VERSION) return error("bad fsmonitor version %d", hdr_version); - } - istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL); + istate->fsmonitor_last_update = get_be64(index); + index += sizeof(uint64_t); ewah_size = get_be32(index); index += sizeof(uint32_t); @@ -82,45 +50,32 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data, } istate->fsmonitor_dirty = fsmonitor_dirty; - if (!istate->split_index && - istate->fsmonitor_dirty->bit_size > istate->cache_nr) - BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)", - (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); - trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful"); return 0; } void fill_fsmonitor_bitmap(struct index_state *istate) { - unsigned int i, skipped = 0; + unsigned int i; istate->fsmonitor_dirty = ewah_new(); - for (i = 0; i < istate->cache_nr; i++) { - if (istate->cache[i]->ce_flags & CE_REMOVE) - skipped++; - else if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID)) - ewah_set(istate->fsmonitor_dirty, i - skipped); - } + for (i = 0; i < istate->cache_nr; i++) + if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID)) + ewah_set(istate->fsmonitor_dirty, i); } void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate) { uint32_t hdr_version; + uint64_t tm; uint32_t ewah_start; uint32_t ewah_size = 0; int fixup = 0; - if (!istate->split_index && - istate->fsmonitor_dirty->bit_size > istate->cache_nr) - BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)", - (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); - - put_be32(&hdr_version, INDEX_EXTENSION_VERSION2); + put_be32(&hdr_version, INDEX_EXTENSION_VERSION); strbuf_add(sb, &hdr_version, sizeof(uint32_t)); - strbuf_addstr(sb, istate->fsmonitor_last_update); - strbuf_addch(sb, 0); /* Want to keep a NUL */ - + put_be64(&tm, istate->fsmonitor_last_update); + strbuf_add(sb, &tm, sizeof(uint64_t)); fixup = sb->len; strbuf_add(sb, &ewah_size, sizeof(uint32_t)); /* we'll fix this up later */ @@ -137,9 +92,9 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate) } /* - * Call the query-fsmonitor hook passing the last update token of the saved results. + * Call the query-fsmonitor hook passing the time of the last saved results. */ -static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result) +static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *query_result) { struct child_process cp = CHILD_PROCESS_INIT; @@ -148,7 +103,7 @@ static int query_fsmonitor(int version, const char *last_update, struct strbuf * argv_array_push(&cp.args, core_fsmonitor); argv_array_pushf(&cp.args, "%d", version); - argv_array_pushf(&cp.args, "%s", last_update); + argv_array_pushf(&cp.args, "%" PRIuMAX, (uintmax_t)last_update); cp.use_shell = 1; cp.dir = get_git_work_tree(); @@ -175,18 +130,14 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n void refresh_fsmonitor(struct index_state *istate) { struct strbuf query_result = STRBUF_INIT; - int query_success = 0, hook_version = -1; - size_t bol = 0; /* beginning of line */ + int query_success = 0; + size_t bol; /* beginning of line */ uint64_t last_update; - struct strbuf last_update_token = STRBUF_INIT; char *buf; unsigned int i; if (!core_fsmonitor || istate->fsmonitor_has_run_once) return; - - hook_version = fsmonitor_hook_version(); - istate->fsmonitor_has_run_once = 1; trace_printf_key(&trace_fsmonitor, "refresh fsmonitor"); @@ -195,60 +146,26 @@ void refresh_fsmonitor(struct index_state *istate) * should be inclusive to ensure we don't miss potential changes. */ last_update = getnanotime(); - if (hook_version == HOOK_INTERFACE_VERSION1) - strbuf_addf(&last_update_token, "%"PRIu64"", last_update); /* - * If we have a last update token, call query_fsmonitor for the set of - * changes since that token, else assume everything is possibly dirty + * If we have a last update time, call query_fsmonitor for the set of + * changes since that time, else assume everything is possibly dirty * and check it all. */ if (istate->fsmonitor_last_update) { - if (hook_version == -1 || hook_version == HOOK_INTERFACE_VERSION2) { - query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION2, - istate->fsmonitor_last_update, &query_result); - - if (query_success) { - if (hook_version < 0) - hook_version = HOOK_INTERFACE_VERSION2; - - /* - * First entry will be the last update token - * Need to use a char * variable because static - * analysis was suggesting to use strbuf_addbuf - * but we don't want to copy the entire strbuf - * only the the chars up to the first NUL - */ - buf = query_result.buf; - strbuf_addstr(&last_update_token, buf); - if (!last_update_token.len) { - warning("Empty last update token."); - query_success = 0; - } else { - bol = last_update_token.len + 1; - } - } else if (hook_version < 0) { - hook_version = HOOK_INTERFACE_VERSION1; - if (!last_update_token.len) - strbuf_addf(&last_update_token, "%"PRIu64"", last_update); - } - } - - if (hook_version == HOOK_INTERFACE_VERSION1) { - query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION1, - istate->fsmonitor_last_update, &query_result); - } - + query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION, + istate->fsmonitor_last_update, &query_result); trace_performance_since(last_update, "fsmonitor process '%s'", core_fsmonitor); trace_printf_key(&trace_fsmonitor, "fsmonitor process '%s' returned %s", core_fsmonitor, query_success ? "success" : "failure"); } /* a fsmonitor process can return '/' to indicate all entries are invalid */ - if (query_success && query_result.buf[bol] != '/') { + if (query_success && query_result.buf[0] != '/') { /* Mark all entries returned by the monitor as dirty */ buf = query_result.buf; - for (i = bol; i < query_result.len; i++) { + bol = 0; + for (i = 0; i < query_result.len; i++) { if (buf[i] != '\0') continue; fsmonitor_refresh_callback(istate, buf + bol); @@ -256,47 +173,31 @@ void refresh_fsmonitor(struct index_state *istate) } if (bol < query_result.len) fsmonitor_refresh_callback(istate, buf + bol); - - /* Now mark the untracked cache for fsmonitor usage */ - if (istate->untracked) - istate->untracked->use_fsmonitor = 1; } else { - - /* We only want to run the post index changed hook if we've actually changed entries, so keep track - * if we actually changed entries or not */ - int is_cache_changed = 0; /* Mark all entries invalid */ - for (i = 0; i < istate->cache_nr; i++) { - if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) { - is_cache_changed = 1; - istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID; - } - } + for (i = 0; i < istate->cache_nr; i++) + istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID; /* If we're going to check every file, ensure we save the results */ - if (is_cache_changed) - istate->cache_changed |= FSMONITOR_CHANGED; + istate->cache_changed |= FSMONITOR_CHANGED; if (istate->untracked) istate->untracked->use_fsmonitor = 0; } strbuf_release(&query_result); - /* Now that we've updated istate, save the last_update_token */ - FREE_AND_NULL(istate->fsmonitor_last_update); - istate->fsmonitor_last_update = strbuf_detach(&last_update_token, NULL); + /* Now that we've updated istate, save the last_update time */ + istate->fsmonitor_last_update = last_update; } void add_fsmonitor(struct index_state *istate) { unsigned int i; - struct strbuf last_update = STRBUF_INIT; if (!istate->fsmonitor_last_update) { trace_printf_key(&trace_fsmonitor, "add fsmonitor"); istate->cache_changed |= FSMONITOR_CHANGED; - strbuf_addf(&last_update, "%"PRIu64"", getnanotime()); - istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL); + istate->fsmonitor_last_update = getnanotime(); /* reset the fsmonitor state */ for (i = 0; i < istate->cache_nr; i++) @@ -318,7 +219,7 @@ void remove_fsmonitor(struct index_state *istate) if (istate->fsmonitor_last_update) { trace_printf_key(&trace_fsmonitor, "remove fsmonitor"); istate->cache_changed |= FSMONITOR_CHANGED; - FREE_AND_NULL(istate->fsmonitor_last_update); + istate->fsmonitor_last_update = 0; } } @@ -335,12 +236,11 @@ void tweak_fsmonitor(struct index_state *istate) } /* Mark all previously saved entries as dirty */ - if (istate->fsmonitor_dirty->bit_size > istate->cache_nr) - BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)", - (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr); ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate); - refresh_fsmonitor(istate); + /* Now mark the untracked cache for fsmonitor usage */ + if (istate->untracked) + istate->untracked->use_fsmonitor = 1; } ewah_free(istate->fsmonitor_dirty); diff --git a/third_party/git/git-add--interactive.perl b/third_party/git/git-add--interactive.perl index 10fd30ae16..c20ae9e210 100755 --- a/third_party/git/git-add--interactive.perl +++ b/third_party/git/git-add--interactive.perl @@ -177,9 +177,7 @@ sub run_cmd_pipe { } else { my $fh = undef; open($fh, '-|', @_) or die; - my @out = <$fh>; - close $fh || die "Cannot close @_ ($!)"; - return @out; + return <$fh>; } } @@ -226,7 +224,7 @@ my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path')) sub get_empty_tree { return $empty_tree if defined $empty_tree; - ($empty_tree) = run_cmd_pipe(qw(git hash-object -t tree /dev/null)); + $empty_tree = run_cmd_pipe(qw(git hash-object -t tree /dev/null)); chomp $empty_tree; return $empty_tree; } @@ -1129,7 +1127,7 @@ aborted and the hunk is left unchanged. EOF2 close $fh; - chomp(my ($editor) = run_cmd_pipe(qw(git var GIT_EDITOR))); + chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR))); system('sh', '-c', $editor.' "$@"', $editor, $hunkfile); if ($? != 0) { @@ -1543,7 +1541,7 @@ sub patch_update_file { for (@{$hunk[$ix]{DISPLAY}}) { print; } - print colored $prompt_color, "(", ($ix+1), "/$num) ", + print colored $prompt_color, sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other); my $line = prompt_single_character; diff --git a/third_party/git/git-compat-util.h b/third_party/git/git-compat-util.h index aed0b5d4f9..83be89de0a 100644 --- a/third_party/git/git-compat-util.h +++ b/third_party/git/git-compat-util.h @@ -77,7 +77,7 @@ #endif /* * ARRAY_SIZE - get the number of elements in a visible array - * @x: the array whose size you want. + * <at> x: the array whose size you want. * * This does not work on pointers, or arrays declared as [], or * function parameters. With correct compiler support, such usage @@ -320,11 +320,30 @@ char *gitdirname(char *); #define PATH_MAX 4096 #endif +#ifndef PRIuMAX +#define PRIuMAX "llu" +#endif + +#ifndef SCNuMAX +#define SCNuMAX PRIuMAX +#endif + +#ifndef PRIu32 +#define PRIu32 "u" +#endif + +#ifndef PRIx32 +#define PRIx32 "x" +#endif + +#ifndef PRIo32 +#define PRIo32 "o" +#endif + typedef uintmax_t timestamp_t; #define PRItime PRIuMAX #define parse_timestamp strtoumax #define TIME_MAX UINTMAX_MAX -#define TIME_MIN 0 #ifndef PATH_SEP #define PATH_SEP ':' @@ -377,10 +396,6 @@ static inline int git_offset_1st_component(const char *path) #define offset_1st_component git_offset_1st_component #endif -#ifndef is_valid_path -#define is_valid_path(path) 1 -#endif - #ifndef find_last_dir_sep static inline char *git_find_last_dir_sep(const char *path) { @@ -803,6 +818,9 @@ const char *inet_ntop(int af, const void *src, char *dst, size_t size); int git_atexit(void (*handler)(void)); #endif +typedef void (*try_to_free_t)(size_t); +try_to_free_t set_try_to_free_routine(try_to_free_t); + static inline size_t st_add(size_t a, size_t b) { if (unsigned_add_overflows(a, b)) @@ -1076,10 +1094,10 @@ static inline int strtol_i(char const *s, int base, int *result) return 0; } -void git_stable_qsort(void *base, size_t nmemb, size_t size, - int(*compar)(const void *, const void *)); #ifdef INTERNAL_QSORT -#define qsort git_stable_qsort +void git_qsort(void *base, size_t nmemb, size_t size, + int(*compar)(const void *, const void *)); +#define qsort git_qsort #endif #define QSORT(base, n, compar) sane_qsort((base), (n), sizeof(*(base)), compar) @@ -1090,9 +1108,6 @@ static inline void sane_qsort(void *base, size_t nmemb, size_t size, qsort(base, nmemb, size, compar); } -#define STABLE_QSORT(base, n, compar) \ - git_stable_qsort((base), (n), sizeof(*(base)), compar) - #ifndef HAVE_ISO_QSORT_S int git_qsort_s(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *ctx); @@ -1297,42 +1312,4 @@ void unleak_memory(const void *ptr, size_t len); */ #include "banned.h" -/* - * container_of - Get the address of an object containing a field. - * - * @ptr: pointer to the field. - * @type: type of the object. - * @member: name of the field within the object. - */ -#define container_of(ptr, type, member) \ - ((type *) ((char *)(ptr) - offsetof(type, member))) - -/* - * helper function for `container_of_or_null' to avoid multiple - * evaluation of @ptr - */ -static inline void *container_of_or_null_offset(void *ptr, size_t offset) -{ - return ptr ? (char *)ptr - offset : NULL; -} - -/* - * like `container_of', but allows returned value to be NULL - */ -#define container_of_or_null(ptr, type, member) \ - (type *)container_of_or_null_offset(ptr, offsetof(type, member)) - -/* - * like offsetof(), but takes a pointer to a a variable of type which - * contains @member, instead of a specified type. - * @ptr is subject to multiple evaluation since we can't rely on __typeof__ - * everywhere. - */ -#if defined(__GNUC__) /* clang sets this, too */ -#define OFFSETOF_VAR(ptr, member) offsetof(__typeof__(*ptr), member) -#else /* !__GNUC__ */ -#define OFFSETOF_VAR(ptr, member) \ - ((uintptr_t)&(ptr)->member - (uintptr_t)(ptr)) -#endif /* !__GNUC__ */ - #endif diff --git a/third_party/git/git-cvsimport.perl b/third_party/git/git-cvsimport.perl index 1057f389d3..b31613cb8a 100755 --- a/third_party/git/git-cvsimport.perl +++ b/third_party/git/git-cvsimport.perl @@ -600,7 +600,7 @@ my $cvs = CVSconn->new($opt_d, $cvs_tree); sub pdate($) { my ($d) = @_; m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?# - or die "Unparsable date: $d\n"; + or die "Unparseable date: $d\n"; my $y=$1; $y+=100 if $y<70; $y+=1900 if $y<1000; diff --git a/third_party/git/git-filter-branch.sh b/third_party/git/git-filter-branch.sh index fea7964617..5c5afa2b98 100755 --- a/third_party/git/git-filter-branch.sh +++ b/third_party/git/git-filter-branch.sh @@ -83,20 +83,6 @@ set_ident () { finish_ident COMMITTER } -if test -z "$FILTER_BRANCH_SQUELCH_WARNING$GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS" -then - cat <<EOF -WARNING: git-filter-branch has a glut of gotchas generating mangled history - rewrites. Hit Ctrl-C before proceeding to abort, then use an - alternative filtering tool such as 'git filter-repo' - (https://github.com/newren/git-filter-repo/) instead. See the - filter-branch manual page for more details; to squelch this warning, - set FILTER_BRANCH_SQUELCH_WARNING=1. -EOF - sleep 10 - printf "Proceeding with filter-branch...\n\n" -fi - USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>] [--tree-filter <command>] [--index-filter <command>] [--parent-filter <command>] [--msg-filter <command>] diff --git a/third_party/git/git-gui/README.md b/third_party/git/git-gui/README.md deleted file mode 100644 index 5ce2122fbc..0000000000 --- a/third_party/git/git-gui/README.md +++ /dev/null @@ -1,174 +0,0 @@ -# Git GUI - A graphical user interface for Git - -Git GUI allows you to use the [Git source control management -tools](https://git-scm.com/) via a GUI. This includes staging, committing, -adding, pushing, etc. It can also be used as a blame viewer, a tree browser, -and a citool (make exactly one commit before exiting and returning to shell). -More details about Git GUI can be found in its manual page by either running -`man git-gui`, or by visiting the [online manual -page](https://git-scm.com/docs/git-gui). - -Git GUI was initially written by Shawn O. Pearce, and is distributed with the -standard Git installation. - -# Building and installing - -You need to have the following dependencies installed before you begin: - -- Git -- Tcl -- Tk -- wish -- Gitk (needed for browsing history) -- msgfmt - -Most of Git GUI is written in Tcl, so there is no compilation involved. Still, -some things do need to be done (mostly some substitutions), so you do need to -"build" it. - -You can build Git GUI using: - -``` -make -``` - -And then install it using: - -``` -make install -``` - -You probably need to have root/admin permissions to install. - -# Contributing - -The project is currently maintained by Pratyush Yadav over at -https://github.com/prati0100/git-gui. Even though the project is hosted at -GitHub, the development does not happen over GitHub Issues and Pull Requests. -Instead, an email based workflow is used. The Git mailing list -[git@vger.kernel.org](mailto:git@vger.kernel.org) is where the patches are -discussed and reviewed. - -More information about the Git mailing list and instructions to subscribe can -be found [here](https://git.wiki.kernel.org/index.php/GitCommunity). - -## Sending your changes - -Since the development happens over email, you need to send in your commits in -text format. Commits can be converted to emails via the two tools provided by -Git: `git-send-email` and `git-format-patch`. - -You can use `git-format-patch` to generate patches in mbox format from your -commits that can then be sent via email. Let's say you are working on a branch -called 'foo' that was created on top of 'master'. You can run: - -``` -git format-patch -o output_dir master..foo -``` - -to convert all the extra commits in 'foo' into a set of patches saved in the -folder `output_dir`. - -If you are sending multiple patches, it is recommended to include a cover -letter. A cover letter is an email explaining in brief what the series is -supposed to do. A cover letter template can be generated by passing -`--cover-letter` to `git-format-patch`. - -After you send your patches, you might get a review suggesting some changes. -Make those changes, and re-send your patch(es) in reply to the first patch of -your initial version. Also please mention the version of the patch. This can be -done by passing `-v X` to `git-format-patch`, where 'X' is the version number -of the patch(es). - -### Using git-send-email - -You can use `git-send-email` to send patches generated via `git-format-patch`. -While you can directly send patches via `git-send-email`, it is recommended -that you first use `git-format-patch` to generate the emails, audit them, and -then send them via `git-send-email`. - -A pretty good guide to configuring and using `git-send-email` can be found -[here](https://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/) - -### Using your email client - -If your email client supports sending mbox format emails, you can use -`git-format-patch` to get an mbox file for each commit, and then send them. If -there is more than one patch in the series, then all patches after the first -patch (or the cover letter) need to be sent as replies to the first. -`git-send-email` does this by default. - -### Using GitGitGadget - -Since some people prefer a GitHub pull request based workflow, they can use -[GitGitGadget](https://gitgitgadget.github.io/) to send in patches. The tool -was originally written for sending patches to the Git project, but it now also -supports sending patches for git-gui. - -Instructions for using GitGitGadget to send git-gui patches, courtesy of -Johannes Schindelin: - -If you don't already have a fork of the [git/git](https://github.com/git/git) -repo, you need to make one. Then clone your fork: - -``` -git clone https://github.com/<your-username>/git -``` - -Then add GitGitGadget as a remote: - -``` -git remote add gitgitgadget https://github.com/gitgitgadget/git -``` - -Then fetch the git-gui branch: - -``` -git fetch gitgitgadget git-gui/master -``` - -Then create a new branch based on git-gui/master: - -``` -git checkout -b <your-branch-name> git-gui/master -``` - -Make whatever commits you need to, push them to your fork, and then head over -to https://github.com/gitgitgadget/git/pulls and open a Pull Request targeting -git-gui/master. - -GitGitGadget will welcome you with a (hopefully) helpful message. - -## Signing off - -You need to sign off your commits before sending them to the list. You can do -that by passing the `-s` option to `git-commit`. You can also use the "Sign -Off" option in Git GUI. - -A sign-off is a simple 'Signed-off-by: A U Thor \<author@example.com\>' line at -the end of the commit message, after your explanation of the commit. - -A sign-off means that you are legally allowed to send the code, and it serves -as a certificate of origin. More information can be found at -[developercertificate.org](https://developercertificate.org/). - -## Responding to review comments - -It is quite likely your patches will get review comments. Those comments are -sent on the Git mailing list as replies to your patch, and you will usually be -Cc'ed in those replies. - -You are expected to respond by either explaining your code further to convince -the reviewer what you are doing is correct, or acknowledge the comments and -re-send the patches with those comments addressed. - -Some tips for those not familiar with communication on a mailing list: - -- Use only plain text emails. No HTML at all. -- Wrap lines at around 75 characters. -- Do not send attachments. If you do need to send some files, consider using a - hosting service, and paste the link in your email. -- Do not [top post](http://www.idallen.com/topposting.html). -- Always "reply all". Keep all correspondents and the list in Cc. If you reply - directly to a reviewer, and not Cc the list, other people would not be able - to chime in. diff --git a/third_party/git/git-gui/git-gui--askpass b/third_party/git/git-gui/git-gui--askpass index 1c99ee8ca2..4277f30c41 100755 --- a/third_party/git/git-gui/git-gui--askpass +++ b/third_party/git/git-gui/git-gui--askpass @@ -56,11 +56,6 @@ proc finish {} { } } - # On Windows, force the encoding to UTF-8: it is what `git.exe` expects - if {$::tcl_platform(platform) eq {windows}} { - set ::answer [encoding convertto utf-8 $::answer] - } - puts $::answer set ::rc 0 } diff --git a/third_party/git/git-gui/git-gui.sh b/third_party/git/git-gui/git-gui.sh index 4610e4ca72..6de74ce639 100755 --- a/third_party/git/git-gui/git-gui.sh +++ b/third_party/git/git-gui/git-gui.sh @@ -30,8 +30,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.}] ## ## Tcl/Tk sanity check -if {[catch {package require Tcl 8.5} err] - || [catch {package require Tk 8.5} err] +if {[catch {package require Tcl 8.4} err] + || [catch {package require Tk 8.4} err] } { catch {wm withdraw .} tk_messageBox \ @@ -684,7 +684,6 @@ proc load_current_branch {} { global current_branch is_detached set fd [open [gitdir HEAD] r] - fconfigure $fd -translation binary -encoding utf-8 if {[gets $fd ref] < 1} { set ref {} } @@ -1341,7 +1340,6 @@ set HEAD {} set PARENT {} set MERGE_HEAD [list] set commit_type {} -set commit_type_is_amend 0 set empty_tree {} set current_branch {} set is_detached 0 @@ -1349,9 +1347,8 @@ set current_diff_path {} set is_3way_diff 0 set is_submodule_diff 0 set is_conflict_diff 0 +set selected_commit_type new set diff_empty_count 0 -set last_revert {} -set last_revert_enc {} set nullid "0000000000000000000000000000000000000000" set nullid2 "0000000000000000000000000000000000000001" @@ -1437,7 +1434,7 @@ proc PARENT {} { } proc force_amend {} { - global commit_type_is_amend + global selected_commit_type global HEAD PARENT MERGE_HEAD commit_type repository_state newType newHEAD newMERGE_HEAD @@ -1446,7 +1443,7 @@ proc force_amend {} { set MERGE_HEAD $newMERGE_HEAD set commit_type $newType - set commit_type_is_amend 1 + set selected_commit_type amend do_select_commit_type } @@ -1798,10 +1795,10 @@ proc ui_status {msg} { } } -proc ui_ready {} { +proc ui_ready {{test {}}} { global main_status if {[info exists main_status]} { - $main_status show [mc "Ready."] + $main_status show [mc "Ready."] $test } } @@ -2151,6 +2148,8 @@ proc incr_font_size {font {amt 1}} { ## ## ui commands +set starting_gitk_msg [mc "Starting gitk... please wait..."] + proc do_gitk {revs {is_submodule false}} { global current_diff_path file_states current_diff_side ui_index global _gitdir _gitworktree @@ -2205,12 +2204,9 @@ proc do_gitk {revs {is_submodule false}} { set env(GIT_WORK_TREE) $_gitworktree cd $pwd - if {[info exists main_status]} { - set status_operation [$::main_status \ - start \ - [mc "Starting %s... please wait..." "gitk"]] - - after 3500 [list $status_operation stop] + ui_status $::starting_gitk_msg + after 10000 { + ui_ready $starting_gitk_msg } } } @@ -2242,16 +2238,16 @@ proc do_git_gui {} { set env(GIT_WORK_TREE) $_gitworktree cd $pwd - set status_operation [$::main_status \ - start \ - [mc "Starting %s... please wait..." "git-gui"]] - - after 3500 [list $status_operation stop] + ui_status $::starting_gitk_msg + after 10000 { + ui_ready $starting_gitk_msg + } } } -# Get the system-specific explorer app/command. -proc get_explorer {} { +proc do_explore {} { + global _gitworktree + set explorer {} if {[is_Cygwin] || [is_Windows]} { set explorer "explorer.exe" } elseif {[is_MacOSX]} { @@ -2260,23 +2256,9 @@ proc get_explorer {} { # freedesktop.org-conforming system is our best shot set explorer "xdg-open" } - return $explorer -} - -proc do_explore {} { - global _gitworktree - set explorer [get_explorer] eval exec $explorer [list [file nativename $_gitworktree]] & } -# Open file relative to the working tree by the default associated app. -proc do_file_open {file} { - global _gitworktree - set explorer [get_explorer] - set full_file_path [file join $_gitworktree $file] - exec $explorer [file nativename $full_file_path] & -} - set is_quitting 0 set ret_code 1 @@ -2512,7 +2494,7 @@ proc force_first_diff {after} { proc toggle_or_diff {mode w args} { global file_states file_lists current_diff_path ui_index ui_workdir - global last_clicked selected_paths file_lists_last_clicked + global last_clicked selected_paths if {$mode eq "click"} { foreach {x y} $args break @@ -2569,8 +2551,6 @@ proc toggle_or_diff {mode w args} { $ui_index tag remove in_sel 0.0 end $ui_workdir tag remove in_sel 0.0 end - set file_lists_last_clicked($w) $path - # Determine the state of the file if {[info exists file_states($path)]} { set state [lindex $file_states($path) 0] @@ -2684,32 +2664,6 @@ proc show_less_context {} { } } -proc focus_widget {widget} { - global file_lists last_clicked selected_paths - global file_lists_last_clicked - - if {[llength $file_lists($widget)] > 0} { - set path $file_lists_last_clicked($widget) - set index [lsearch -sorted -exact $file_lists($widget) $path] - if {$index < 0} { - set index 0 - set path [lindex $file_lists($widget) $index] - } - - focus $widget - set last_clicked [list $widget [expr $index + 1]] - array unset selected_paths - set selected_paths($path) 1 - show_diff $path $widget - } -} - -proc toggle_commit_type {} { - global commit_type_is_amend - set commit_type_is_amend [expr !$commit_type_is_amend] - do_select_commit_type -} - ###################################################################### ## ## ui construction @@ -2752,18 +2706,10 @@ if {![is_bare]} { } if {[is_Windows]} { - # Use /git-bash.exe if available - set normalized [file normalize $::argv0] - regsub "/mingw../libexec/git-core/git-gui$" \ - $normalized "/git-bash.exe" cmdLine - if {$cmdLine != $normalized && [file exists $cmdLine]} { - set cmdLine [list "Git Bash" $cmdLine &] - } else { - set cmdLine [list "Git Bash" bash --login -l &] - } .mbar.repository add command \ -label [mc "Git Bash"] \ - -command {eval exec [auto_execok start] $cmdLine} + -command {eval exec [auto_execok start] \ + [list "Git Bash" bash --login -l &]} } if {[is_Windows] || ![is_bare]} { @@ -2906,11 +2852,19 @@ if {[is_enabled multicommit] || [is_enabled singlecommit]} { menu .mbar.commit if {![is_enabled nocommit]} { - .mbar.commit add checkbutton \ + .mbar.commit add radiobutton \ + -label [mc "New Commit"] \ + -command do_select_commit_type \ + -variable selected_commit_type \ + -value new + lappend disable_on_lock \ + [list .mbar.commit entryconf [.mbar.commit index last] -state] + + .mbar.commit add radiobutton \ -label [mc "Amend Last Commit"] \ - -accelerator $M1T-E \ - -variable commit_type_is_amend \ - -command do_select_commit_type + -command do_select_commit_type \ + -variable selected_commit_type \ + -value amend lappend disable_on_lock \ [list .mbar.commit entryconf [.mbar.commit index last] -state] @@ -3076,23 +3030,8 @@ unset doc_path doc_url wm protocol . WM_DELETE_WINDOW do_quit bind all <$M1B-Key-q> do_quit bind all <$M1B-Key-Q> do_quit - -set m1b_w_script { - set toplvl_win [winfo toplevel %W] - - # If we are destroying the main window, we should call do_quit to take - # care of cleanup before exiting the program. - if {$toplvl_win eq "."} { - do_quit - } else { - destroy $toplvl_win - } -} - -bind all <$M1B-Key-w> $m1b_w_script -bind all <$M1B-Key-W> $m1b_w_script - -unset m1b_w_script +bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} +bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} set subcommand_args {} proc usage {} { @@ -3398,10 +3337,18 @@ set ui_comm .vpane.lower.commarea.buffer.frame.t set ui_coml .vpane.lower.commarea.buffer.header.l if {![is_enabled nocommit]} { - ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \ + ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \ + -text [mc "New Commit"] \ + -command do_select_commit_type \ + -variable selected_commit_type \ + -value new + lappend disable_on_lock \ + [list .vpane.lower.commarea.buffer.header.new conf -state] + ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \ -text [mc "Amend Last Commit"] \ - -variable commit_type_is_amend \ - -command do_select_commit_type + -command do_select_commit_type \ + -variable selected_commit_type \ + -value amend lappend disable_on_lock \ [list .vpane.lower.commarea.buffer.header.amend conf -state] } @@ -3426,6 +3373,7 @@ pack $ui_coml -side left -fill x if {![is_enabled nocommit]} { pack .vpane.lower.commarea.buffer.header.amend -side right + pack .vpane.lower.commarea.buffer.header.new -side right } textframe .vpane.lower.commarea.buffer.frame @@ -3439,16 +3387,10 @@ ttext $ui_comm -background white -foreground black \ -relief sunken \ -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \ -font font_diff \ - -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \ -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set} -${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \ - -orient horizontal \ - -command [list $ui_comm xview] ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \ - -orient vertical \ -command [list $ui_comm yview] -pack .vpane.lower.commarea.buffer.frame.sbx -side bottom -fill x pack .vpane.lower.commarea.buffer.frame.sby -side right -fill y pack $ui_comm -side left -fill y pack .vpane.lower.commarea.buffer.header -side top -fill x @@ -3528,11 +3470,9 @@ tlabel .vpane.lower.diff.header.file \ -justify left tlabel .vpane.lower.diff.header.path \ -background gold \ - -foreground blue \ + -foreground black \ -anchor w \ - -justify left \ - -font [eval font create [font configure font_ui] -underline 1] \ - -cursor hand2 + -justify left pack .vpane.lower.diff.header.status -side left pack .vpane.lower.diff.header.file -side left pack .vpane.lower.diff.header.path -fill x @@ -3547,12 +3487,8 @@ $ctxm add command \ -type STRING \ -- $current_diff_path } -$ctxm add command \ - -label [mc Open] \ - -command {do_file_open $current_diff_path} lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" -bind .vpane.lower.diff.header.path <Button-1> {do_file_open $current_diff_path} # -- Diff Body # @@ -3611,9 +3547,6 @@ $ui_diff tag conf d_s- \ $ui_diff tag conf d< \ -foreground orange \ -font font_diffbold -$ui_diff tag conf d| \ - -foreground orange \ - -font font_diffbold $ui_diff tag conf d= \ -foreground orange \ -font font_diffbold @@ -3673,32 +3606,16 @@ set ctxm .vpane.lower.diff.body.ctxm menu $ctxm -tearoff 0 $ctxm add command \ -label [mc "Apply/Reverse Hunk"] \ - -command {apply_or_revert_hunk $cursorX $cursorY 0} + -command {apply_hunk $cursorX $cursorY} set ui_diff_applyhunk [$ctxm index last] lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] $ctxm add command \ -label [mc "Apply/Reverse Line"] \ - -command {apply_or_revert_range_or_line $cursorX $cursorY 0; do_rescan} + -command {apply_range_or_line $cursorX $cursorY; do_rescan} set ui_diff_applyline [$ctxm index last] lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state] $ctxm add separator $ctxm add command \ - -label [mc "Revert Hunk"] \ - -command {apply_or_revert_hunk $cursorX $cursorY 1} -set ui_diff_reverthunk [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_reverthunk -state] -$ctxm add command \ - -label [mc "Revert Line"] \ - -command {apply_or_revert_range_or_line $cursorX $cursorY 1; do_rescan} -set ui_diff_revertline [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_revertline -state] -$ctxm add command \ - -label [mc "Undo Last Revert"] \ - -command {undo_last_revert; do_rescan} -set ui_diff_undorevert [$ctxm index last] -lappend diff_actions [list $ctxm entryconf $ui_diff_undorevert -state] -$ctxm add separator -$ctxm add command \ -label [mc "Show Less Context"] \ -command show_less_context lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] @@ -3776,7 +3693,7 @@ proc has_textconv {path} { } proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { - global current_diff_path file_states last_revert + global current_diff_path file_states set ::cursorX $x set ::cursorY $y if {[info exists file_states($current_diff_path)]} { @@ -3790,28 +3707,19 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { tk_popup $ctxmsm $X $Y } else { set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}] - set u [mc "Undo Last Revert"] if {$::ui_index eq $::current_diff_side} { set l [mc "Unstage Hunk From Commit"] - set h [mc "Revert Hunk"] - if {$has_range} { set t [mc "Unstage Lines From Commit"] - set r [mc "Revert Lines"] } else { set t [mc "Unstage Line From Commit"] - set r [mc "Revert Line"] } } else { set l [mc "Stage Hunk For Commit"] - set h [mc "Revert Hunk"] - if {$has_range} { set t [mc "Stage Lines For Commit"] - set r [mc "Revert Lines"] } else { set t [mc "Stage Line For Commit"] - set r [mc "Revert Line"] } } if {$::is_3way_diff @@ -3822,35 +3730,11 @@ proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} { || [string match {T?} $state] || [has_textconv $current_diff_path]} { set s disabled - set revert_state disabled } else { set s normal - - # Only allow reverting changes in the working tree. If - # the user wants to revert changes in the index, they - # need to unstage those first. - if {$::ui_workdir eq $::current_diff_side} { - set revert_state normal - } else { - set revert_state disabled - } } - - if {$last_revert eq {}} { - set undo_state disabled - } else { - set undo_state normal - } - $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l $ctxm entryconf $::ui_diff_applyline -state $s -label $t - $ctxm entryconf $::ui_diff_revertline -state $revert_state \ - -label $r - $ctxm entryconf $::ui_diff_reverthunk -state $revert_state \ - -label $h - $ctxm entryconf $::ui_diff_undorevert -state $undo_state \ - -label $u - tk_popup $ctxm $X $Y } } @@ -3977,8 +3861,6 @@ bind . <$M1B-Key-j> do_revert_selection bind . <$M1B-Key-J> do_revert_selection bind . <$M1B-Key-i> do_add_all bind . <$M1B-Key-I> do_add_all -bind . <$M1B-Key-e> toggle_commit_type -bind . <$M1B-Key-E> toggle_commit_type bind . <$M1B-Key-minus> {show_less_context;break} bind . <$M1B-Key-KP_Subtract> {show_less_context;break} bind . <$M1B-Key-equal> {show_more_context;break} @@ -3995,14 +3877,6 @@ foreach i [list $ui_index $ui_workdir] { } unset i -bind . <Alt-Key-1> {focus_widget $::ui_workdir} -bind . <Alt-Key-2> {focus_widget $::ui_index} -bind . <Alt-Key-3> {focus $::ui_diff} -bind . <Alt-Key-4> {focus $::ui_comm} - -set file_lists_last_clicked($ui_index) {} -set file_lists_last_clicked($ui_workdir) {} - set file_lists($ui_index) [list] set file_lists($ui_workdir) [list] @@ -4181,9 +4055,6 @@ if {$picked && [is_config_true gui.autoexplore]} { do_explore } -# Clear "Initializing..." status -after 500 {$main_status show ""} - # Local variables: # mode: tcl # indent-tabs-mode: t diff --git a/third_party/git/git-gui/lib/blame.tcl b/third_party/git/git-gui/lib/blame.tcl index 62ec083667..a1aeb8b96e 100644 --- a/third_party/git/git-gui/lib/blame.tcl +++ b/third_party/git/git-gui/lib/blame.tcl @@ -24,7 +24,6 @@ field w_cviewer ; # pane showing commit message field finder ; # find mini-dialog frame field gotoline ; # line goto mini-dialog frame field status ; # status mega-widget instance -field status_operation ; # operation displayed by status mega-widget field old_height ; # last known height of $w.file_pane @@ -275,7 +274,6 @@ constructor new {i_commit i_path i_jump} { pack $w_cviewer -expand 1 -fill both set status [::status_bar::new $w.status] - set status_operation {} menu $w.ctxm -tearoff 0 $w.ctxm add command \ @@ -604,23 +602,16 @@ method _exec_blame {cur_w cur_d options cur_s} { } else { lappend options $commit } - - # We may recurse in from another call to _exec_blame and already have - # a status operation. - if {$status_operation == {}} { - set status_operation [$status start \ - $cur_s \ - [mc "lines annotated"]] - } else { - $status_operation restart $cur_s - } - lappend options -- $path set fd [eval git_read --nice blame $options] fconfigure $fd -blocking 0 -translation lf -encoding utf-8 fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d] set current_fd $fd set blame_lines 0 + + $status start \ + $cur_s \ + [mc "lines annotated"] } method _read_blame {fd cur_w cur_d} { @@ -815,11 +806,10 @@ method _read_blame {fd cur_w cur_d} { [mc "Loading original location annotations..."] } else { set current_fd {} - $status_operation stop [mc "Annotation complete."] - set status_operation {} + $status stop [mc "Annotation complete."] } } else { - $status_operation update $blame_lines $total_lines + $status update $blame_lines $total_lines } } ifdeleted { catch {close $fd} } @@ -1134,7 +1124,7 @@ method _blameparent {} { set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path] } if {[catch {set fd [eval git_read $diffcmd]} err]} { - $status_operation stop [mc "Unable to display parent"] + $status stop [mc "Unable to display parent"] error_popup [strcat [mc "Error loading diff:"] "\n\n$err"] return } diff --git a/third_party/git/git-gui/lib/branch.tcl b/third_party/git/git-gui/lib/branch.tcl index 8b0c485889..777eeb79c1 100644 --- a/third_party/git/git-gui/lib/branch.tcl +++ b/third_party/git/git-gui/lib/branch.tcl @@ -8,7 +8,6 @@ proc load_all_heads {} { set rh_len [expr {[string length $rh] + 1}] set all_heads [list] set fd [git_read for-each-ref --format=%(refname) $rh] - fconfigure $fd -translation binary -encoding utf-8 while {[gets $fd line] > 0} { if {!$some_heads_tracking || ![is_tracking_branch $line]} { lappend all_heads [string range $line $rh_len end] @@ -25,7 +24,6 @@ proc load_all_tags {} { --sort=-taggerdate \ --format=%(refname) \ refs/tags] - fconfigure $fd -translation binary -encoding utf-8 while {[gets $fd line] > 0} { if {![regsub ^refs/tags/ $line {} name]} continue lappend all_tags $name diff --git a/third_party/git/git-gui/lib/checkout_op.tcl b/third_party/git/git-gui/lib/checkout_op.tcl index 21ea768d80..9e7412c446 100644 --- a/third_party/git/git-gui/lib/checkout_op.tcl +++ b/third_party/git/git-gui/lib/checkout_op.tcl @@ -341,9 +341,9 @@ method _readtree {} { global HEAD set readtree_d {} - set status_bar_operation [$::main_status start \ + $::main_status start \ [mc "Updating working directory to '%s'..." [_name $this]] \ - [mc "files checked out"]] + [mc "files checked out"] set fd [git_read --stderr read-tree \ -m \ @@ -354,27 +354,26 @@ method _readtree {} { $new_hash \ ] fconfigure $fd -blocking 0 -translation binary - fileevent $fd readable [cb _readtree_wait $fd $status_bar_operation] + fileevent $fd readable [cb _readtree_wait $fd] } -method _readtree_wait {fd status_bar_operation} { +method _readtree_wait {fd} { global current_branch set buf [read $fd] - $status_bar_operation update_meter $buf + $::main_status update_meter $buf append readtree_d $buf fconfigure $fd -blocking 1 if {![eof $fd]} { fconfigure $fd -blocking 0 - $status_bar_operation stop return } if {[catch {close $fd}]} { set err $readtree_d regsub {^fatal: } $err {} err - $status_bar_operation stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]] + $::main_status stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]] warn_popup [strcat [mc "File level merge required."] " $err @@ -385,12 +384,12 @@ $err return } - $status_bar_operation stop + $::main_status stop _after_readtree $this } method _after_readtree {} { - global commit_type HEAD MERGE_HEAD PARENT + global selected_commit_type commit_type HEAD MERGE_HEAD PARENT global current_branch is_detached global ui_comm @@ -491,12 +490,12 @@ method _update_repo_state {} { # amend mode our file lists are accurate and we can avoid # the rescan. # - global commit_type_is_amend commit_type HEAD MERGE_HEAD PARENT + global selected_commit_type commit_type HEAD MERGE_HEAD PARENT global ui_comm unlock_index set name [_name $this] - set commit_type_is_amend 0 + set selected_commit_type new if {[string match amend* $commit_type]} { $ui_comm delete 0.0 end $ui_comm edit reset diff --git a/third_party/git/git-gui/lib/choose_repository.tcl b/third_party/git/git-gui/lib/choose_repository.tcl index e54f3e66d8..80f5a59bbb 100644 --- a/third_party/git/git-gui/lib/choose_repository.tcl +++ b/third_party/git/git-gui/lib/choose_repository.tcl @@ -9,18 +9,6 @@ field w_body ; # Widget holding the center content field w_next ; # Next button field w_quit ; # Quit button field o_cons ; # Console object (if active) - -# Status mega-widget instance during _do_clone2 (used by _copy_files and -# _link_files). Widget is destroyed before _do_clone2 calls -# _do_clone_checkout -field o_status - -# Operation displayed by status mega-widget during _do_clone_checkout => -# _readtree_wait => _postcheckout_wait => _do_clone_submodules => -# _do_validate_submodule_cloning. The status mega-widget is a different -# instance than that stored in $o_status in earlier operations. -field o_status_op - field w_types ; # List of type buttons in clone field w_recentlist ; # Listbox containing recent repositories field w_localpath ; # Entry widget bound to local_path @@ -671,12 +659,12 @@ method _do_clone2 {} { switch -exact -- $clone_type { hardlink { - set o_status [status_bar::two_line $w_body] + set o_cons [status_bar::two_line $w_body] pack $w_body -fill x -padx 10 -pady 10 - set status_op [$o_status start \ + $o_cons start \ [mc "Counting objects"] \ - [mc "buckets"]] + [mc "buckets"] update if {[file exists [file join $objdir info alternates]]} { @@ -701,7 +689,6 @@ method _do_clone2 {} { } err]} { catch {cd $pwd} _clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err] - $status_op stop return } } @@ -713,7 +700,7 @@ method _do_clone2 {} { -directory [file join $objdir] ??] set bcnt [expr {[llength $buckets] + 2}] set bcur 1 - $status_op update $bcur $bcnt + $o_cons update $bcur $bcnt update file mkdir [file join .git objects pack] @@ -721,7 +708,7 @@ method _do_clone2 {} { -directory [file join $objdir pack] *] { lappend tolink [file join pack $i] } - $status_op update [incr bcur] $bcnt + $o_cons update [incr bcur] $bcnt update foreach i $buckets { @@ -730,10 +717,10 @@ method _do_clone2 {} { -directory [file join $objdir $i] *] { lappend tolink [file join $i $j] } - $status_op update [incr bcur] $bcnt + $o_cons update [incr bcur] $bcnt update } - $status_op stop + $o_cons stop if {$tolink eq {}} { info_popup [strcat \ @@ -760,8 +747,6 @@ method _do_clone2 {} { if {!$i} return destroy $w_body - - set o_status {} } full { set o_cons [console::embed \ @@ -796,9 +781,9 @@ method _do_clone2 {} { } method _copy_files {objdir tocopy} { - set status_op [$o_status start \ + $o_cons start \ [mc "Copying objects"] \ - [mc "KiB"]] + [mc "KiB"] set tot 0 set cmp 0 foreach p $tocopy { @@ -813,7 +798,7 @@ method _copy_files {objdir tocopy} { while {![eof $f_in]} { incr cmp [fcopy $f_in $f_cp -size 16384] - $status_op update \ + $o_cons update \ [expr {$cmp / 1024}] \ [expr {$tot / 1024}] update @@ -823,19 +808,17 @@ method _copy_files {objdir tocopy} { close $f_cp } err]} { _clone_failed $this [mc "Unable to copy object: %s" $err] - $status_op stop return 0 } } - $status_op stop return 1 } method _link_files {objdir tolink} { set total [llength $tolink] - set status_op [$o_status start \ + $o_cons start \ [mc "Linking objects"] \ - [mc "objects"]] + [mc "objects"] for {set i 0} {$i < $total} {} { set p [lindex $tolink $i] if {[catch { @@ -844,17 +827,15 @@ method _link_files {objdir tolink} { [file join $objdir $p] } err]} { _clone_failed $this [mc "Unable to hardlink object: %s" $err] - $status_op stop return 0 } incr i if {$i % 5 == 0} { - $status_op update $i $total + $o_cons update $i $total update } } - $status_op stop return 1 } @@ -977,26 +958,11 @@ method _do_clone_checkout {HEAD} { return } - set status [status_bar::two_line $w_body] + set o_cons [status_bar::two_line $w_body] pack $w_body -fill x -padx 10 -pady 10 - - # We start the status operation here. - # - # This function calls _readtree_wait as a callback. - # - # _readtree_wait in turn either calls _do_clone_submodules directly, - # or calls _postcheckout_wait as a callback which then calls - # _do_clone_submodules. - # - # _do_clone_submodules calls _do_validate_submodule_cloning. - # - # _do_validate_submodule_cloning stops the status operation. - # - # There are no other calls into this chain from other code. - - set o_status_op [$status start \ + $o_cons start \ [mc "Creating working directory"] \ - [mc "files"]] + [mc "files"] set readtree_err {} set fd [git_read --stderr read-tree \ @@ -1010,9 +976,33 @@ method _do_clone_checkout {HEAD} { fileevent $fd readable [cb _readtree_wait $fd] } +method _do_validate_submodule_cloning {ok} { + if {$ok} { + $o_cons done $ok + set done 1 + } else { + _clone_failed $this [mc "Cannot clone submodules."] + } +} + +method _do_clone_submodules {} { + if {$recursive eq {true}} { + destroy $w_body + set o_cons [console::embed \ + $w_body \ + [mc "Cloning submodules"]] + pack $w_body -fill both -expand 1 -padx 10 + $o_cons exec \ + [list git submodule update --init --recursive] \ + [cb _do_validate_submodule_cloning] + } else { + set done 1 + } +} + method _readtree_wait {fd} { set buf [read $fd] - $o_status_op update_meter $buf + $o_cons update_meter $buf append readtree_err $buf fconfigure $fd -blocking 1 @@ -1060,34 +1050,6 @@ method _postcheckout_wait {fd_ph} { fconfigure $fd_ph -blocking 0 } -method _do_clone_submodules {} { - if {$recursive eq {true}} { - $o_status_op stop - set o_status_op {} - - destroy $w_body - - set o_cons [console::embed \ - $w_body \ - [mc "Cloning submodules"]] - pack $w_body -fill both -expand 1 -padx 10 - $o_cons exec \ - [list git submodule update --init --recursive] \ - [cb _do_validate_submodule_cloning] - } else { - set done 1 - } -} - -method _do_validate_submodule_cloning {ok} { - if {$ok} { - $o_cons done $ok - set done 1 - } else { - _clone_failed $this [mc "Cannot clone submodules."] - } -} - ###################################################################### ## ## Open Existing Repository diff --git a/third_party/git/git-gui/lib/chord.tcl b/third_party/git/git-gui/lib/chord.tcl deleted file mode 100644 index e21e7d3d0b..0000000000 --- a/third_party/git/git-gui/lib/chord.tcl +++ /dev/null @@ -1,158 +0,0 @@ -# Simple Chord for Tcl -# -# A "chord" is a method with more than one entrypoint and only one body, such -# that the body runs only once all the entrypoints have been called by -# different asynchronous tasks. In this implementation, the chord is defined -# dynamically for each invocation. A SimpleChord object is created, supplying -# body script to be run when the chord is completed, and then one or more notes -# are added to the chord. Each note can be called like a proc, and returns -# immediately if the chord isn't yet complete. When the last remaining note is -# called, the body runs before the note returns. -# -# The SimpleChord class has a constructor that takes the body script, and a -# method add_note that returns a note object. Since the body script does not -# run in the context of the procedure that defined it, a mechanism is provided -# for injecting variables into the chord for use by the body script. The -# activation of a note is idempotent; multiple calls have the same effect as -# a simple call. -# -# If you are invoking asynchronous operations with chord notes as completion -# callbacks, and there is a possibility that earlier operations could complete -# before later ones are started, it is a good practice to create a "common" -# note on the chord that prevents it from being complete until you're certain -# you've added all the notes you need. -# -# Example: -# -# # Turn off the UI while running a couple of async operations. -# lock_ui -# -# set chord [SimpleChord::new { -# unlock_ui -# # Note: $notice here is not referenced in the calling scope -# if {$notice} { info_popup $notice } -# } -# -# # Configure a note to keep the chord from completing until -# # all operations have been initiated. -# set common_note [$chord add_note] -# -# # Activate notes in 'after' callbacks to other operations -# set newnote [$chord add_note] -# async_operation $args [list $newnote activate] -# -# # Communicate with the chord body -# if {$condition} { -# # This sets $notice in the same context that the chord body runs in. -# $chord eval { set notice "Something interesting" } -# } -# -# # Activate the common note, making the chord eligible to complete -# $common_note activate -# -# At this point, the chord will complete at some unknown point in the future. -# The common note might have been the first note activated, or the async -# operations might have completed synchronously and the common note is the -# last one, completing the chord before this code finishes, or anything in -# between. The purpose of the chord is to not have to worry about the order. - -# SimpleChord class: -# Represents a procedure that conceptually has multiple entrypoints that must -# all be called before the procedure executes. Each entrypoint is called a -# "note". The chord is only "completed" when all the notes are "activated". -class SimpleChord { - field notes - field body - field is_completed - field eval_ns - - # Constructor: - # set chord [SimpleChord::new {body}] - # Creates a new chord object with the specified body script. The - # body script is evaluated at most once, when a note is activated - # and the chord has no other non-activated notes. - constructor new {i_body} { - set notes [list] - set body $i_body - set is_completed 0 - set eval_ns "[namespace qualifiers $this]::eval" - return $this - } - - # Method: - # $chord eval {script} - # Runs the specified script in the same context (namespace) in which - # the chord body will be evaluated. This can be used to set variable - # values for the chord body to use. - method eval {script} { - namespace eval $eval_ns $script - } - - # Method: - # set note [$chord add_note] - # Adds a new note to the chord, an instance of ChordNote. Raises an - # error if the chord is already completed, otherwise the chord is - # updated so that the new note must also be activated before the - # body is evaluated. - method add_note {} { - if {$is_completed} { error "Cannot add a note to a completed chord" } - - set note [ChordNote::new $this] - - lappend notes $note - - return $note - } - - # This method is for internal use only and is intentionally undocumented. - method notify_note_activation {} { - if {!$is_completed} { - foreach note $notes { - if {![$note is_activated]} { return } - } - - set is_completed 1 - - namespace eval $eval_ns $body - delete_this - } - } -} - -# ChordNote class: -# Represents a note within a chord, providing a way to activate it. When the -# final note of the chord is activated (this can be any note in the chord, -# with all other notes already previously activated in any order), the chord's -# body is evaluated. -class ChordNote { - field chord - field is_activated - - # Constructor: - # Instances of ChordNote are created internally by calling add_note on - # SimpleChord objects. - constructor new {c} { - set chord $c - set is_activated 0 - return $this - } - - # Method: - # [$note is_activated] - # Returns true if this note has already been activated. - method is_activated {} { - return $is_activated - } - - # Method: - # $note activate - # Activates the note, if it has not already been activated, and - # completes the chord if there are no other notes awaiting - # activation. Subsequent calls will have no further effect. - method activate {} { - if {!$is_activated} { - set is_activated 1 - $chord notify_note_activation - } - } -} diff --git a/third_party/git/git-gui/lib/commit.tcl b/third_party/git/git-gui/lib/commit.tcl index b516aa2990..75ea965dac 100644 --- a/third_party/git/git-gui/lib/commit.tcl +++ b/third_party/git/git-gui/lib/commit.tcl @@ -333,7 +333,7 @@ proc commit_writetree {curHEAD msg_p} { proc commit_committree {fd_wt curHEAD msg_p} { global HEAD PARENT MERGE_HEAD commit_type commit_author global current_branch - global ui_comm commit_type_is_amend + global ui_comm selected_commit_type global file_states selected_paths rescan_active global repo_config global env @@ -467,8 +467,8 @@ A rescan will be automatically started now. # -- Update in memory status # + set selected_commit_type new set commit_type normal - set commit_type_is_amend 0 set HEAD $cmt_id set PARENT $cmt_id set MERGE_HEAD [list] diff --git a/third_party/git/git-gui/lib/console.tcl b/third_party/git/git-gui/lib/console.tcl index bb6b9c889e..1f3248ffd1 100644 --- a/third_party/git/git-gui/lib/console.tcl +++ b/third_party/git/git-gui/lib/console.tcl @@ -203,8 +203,6 @@ method done {ok} { focus $w.ok } } - - bind $w <Key-Escape> "destroy $w;break" } method _sb_set {sb orient first last} { diff --git a/third_party/git/git-gui/lib/diff.tcl b/third_party/git/git-gui/lib/diff.tcl index 871ad488c2..68c4a6c736 100644 --- a/third_party/git/git-gui/lib/diff.tcl +++ b/third_party/git/git-gui/lib/diff.tcl @@ -55,7 +55,7 @@ proc reshow_diff {{after {}}} { proc force_diff_encoding {enc} { global current_diff_path - + if {$current_diff_path ne {}} { force_path_encoding $current_diff_path $enc reshow_diff @@ -270,6 +270,19 @@ proc show_other_diff {path w m cont_info} { } } +proc get_conflict_marker_size {path} { + set size 7 + catch { + set fd_rc [eval [list git_read check-attr "conflict-marker-size" -- $path]] + set ret [gets $fd_rc line] + close $fd_rc + if {$ret > 0} { + regexp {.*: conflict-marker-size: (\d+)$} $line line size + } + } + return $size +} + proc start_show_diff {cont_info {add_opts {}}} { global file_states file_lists global is_3way_diff is_submodule_diff diff_active repo_config @@ -285,7 +298,7 @@ proc start_show_diff {cont_info {add_opts {}}} { set is_submodule_diff 0 set diff_active 1 set current_diff_header {} - set conflict_size [gitattr $path conflict-marker-size 7] + set conflict_size [get_conflict_marker_size $path] set cmd [list] if {$w eq $ui_index} { @@ -347,10 +360,6 @@ proc start_show_diff {cont_info {add_opts {}}} { } set ::current_diff_inheader 1 - # Detect pre-image lines of the diff3 conflict-style. They are just - # '++' lines which is not bijective. Thus, we need to maintain a state - # across lines. - set ::conflict_in_pre_image 0 fconfigure $fd \ -blocking 0 \ -encoding [get_path_encoding $path] \ @@ -453,23 +462,11 @@ proc read_diff {fd conflict_size cont_info} { {--} {set tags d_--} {++} { set regexp [string map [list %conflict_size $conflict_size]\ - {^\+\+([<>=|]){%conflict_size}(?: |$)}] + {^\+\+([<>=]){%conflict_size}(?: |$)}] if {[regexp $regexp $line _g op]} { set is_conflict_diff 1 set line [string replace $line 0 1 { }] set tags d$op - - # The ||| conflict-marker marks the start of the pre-image. - # All those lines are also prefixed with '++'. Thus we need - # to maintain this state. - set ::conflict_in_pre_image [expr {$op eq {|}}] - } elseif {$::conflict_in_pre_image} { - # This is a pre-image line. It is the one which both sides - # are based on. As it has also the '++' line start, it is - # normally shown as 'added'. Invert this to '--' to make - # it a 'removed' line. - set line [string replace $line 0 1 {--}] - set tags d_-- } else { set tags d_++ } @@ -570,31 +567,24 @@ proc read_diff {fd conflict_size cont_info} { } } -proc apply_or_revert_hunk {x y revert} { +proc apply_hunk {x y} { global current_diff_path current_diff_header current_diff_side - global ui_diff ui_index file_states last_revert last_revert_enc + global ui_diff ui_index file_states if {$current_diff_path eq {} || $current_diff_header eq {}} return if {![lock_index apply_hunk]} return - set apply_cmd {apply --whitespace=nowarn} + set apply_cmd {apply --cached --whitespace=nowarn} set mi [lindex $file_states($current_diff_path) 0] if {$current_diff_side eq $ui_index} { set failed_msg [mc "Failed to unstage selected hunk."] - lappend apply_cmd --reverse --cached + lappend apply_cmd --reverse if {[string index $mi 0] ne {M}} { unlock_index return } } else { - if {$revert} { - set failed_msg [mc "Failed to revert selected hunk."] - lappend apply_cmd --reverse - } else { - set failed_msg [mc "Failed to stage selected hunk."] - lappend apply_cmd --cached - } - + set failed_msg [mc "Failed to stage selected hunk."] if {[string index $mi 1] ne {M}} { unlock_index return @@ -613,40 +603,29 @@ proc apply_or_revert_hunk {x y revert} { set e_lno end } - set wholepatch "$current_diff_header[$ui_diff get $s_lno $e_lno]" - if {[catch { set enc [get_path_encoding $current_diff_path] set p [eval git_write $apply_cmd] fconfigure $p -translation binary -encoding $enc - puts -nonewline $p $wholepatch + puts -nonewline $p $current_diff_header + puts -nonewline $p [$ui_diff get $s_lno $e_lno] close $p} err]} { error_popup "$failed_msg\n\n$err" unlock_index return } - if {$revert} { - # Save a copy of this patch for undoing reverts. - set last_revert $wholepatch - set last_revert_enc $enc - } - $ui_diff conf -state normal $ui_diff delete $s_lno $e_lno $ui_diff conf -state disabled - # Check if the hunk was the last one in the file. if {[$ui_diff get 1.0 end] eq "\n"} { set o _ } else { set o ? } - # Update the status flags. - if {$revert} { - set mi [string index $mi 0]$o - } elseif {$current_diff_side eq $ui_index} { + if {$current_diff_side eq $ui_index} { set mi ${o}M } elseif {[string index $mi 0] eq {_}} { set mi M$o @@ -661,9 +640,9 @@ proc apply_or_revert_hunk {x y revert} { } } -proc apply_or_revert_range_or_line {x y revert} { +proc apply_range_or_line {x y} { global current_diff_path current_diff_header current_diff_side - global ui_diff ui_index file_states last_revert + global ui_diff ui_index file_states set selected [$ui_diff tag nextrange sel 0.0] @@ -681,27 +660,19 @@ proc apply_or_revert_range_or_line {x y revert} { if {$current_diff_path eq {} || $current_diff_header eq {}} return if {![lock_index apply_hunk]} return - set apply_cmd {apply --whitespace=nowarn} + set apply_cmd {apply --cached --whitespace=nowarn} set mi [lindex $file_states($current_diff_path) 0] if {$current_diff_side eq $ui_index} { set failed_msg [mc "Failed to unstage selected line."] set to_context {+} - lappend apply_cmd --reverse --cached + lappend apply_cmd --reverse if {[string index $mi 0] ne {M}} { unlock_index return } } else { - if {$revert} { - set failed_msg [mc "Failed to revert selected line."] - set to_context {+} - lappend apply_cmd --reverse - } else { - set failed_msg [mc "Failed to stage selected line."] - set to_context {-} - lappend apply_cmd --cached - } - + set failed_msg [mc "Failed to stage selected line."] + set to_context {-} if {[string index $mi 1] ne {M}} { unlock_index return @@ -859,47 +830,7 @@ proc apply_or_revert_range_or_line {x y revert} { puts -nonewline $p $wholepatch close $p} err]} { error_popup "$failed_msg\n\n$err" - unlock_index - return - } - - if {$revert} { - # Save a copy of this patch for undoing reverts. - set last_revert $current_diff_header$wholepatch - set last_revert_enc $enc - } - - unlock_index -} - -# Undo the last line/hunk reverted. When hunks and lines are reverted, a copy -# of the diff applied is saved. Re-apply that diff to undo the revert. -# -# Right now, we only use a single variable to hold the copy, and not a -# stack/deque for simplicity, so multiple undos are not possible. Maybe this -# can be added if the need for something like this is felt in the future. -proc undo_last_revert {} { - global last_revert current_diff_path current_diff_header - global last_revert_enc - - if {$last_revert eq {}} return - if {![lock_index apply_hunk]} return - - set apply_cmd {apply --whitespace=nowarn} - set failed_msg [mc "Failed to undo last revert."] - - if {[catch { - set enc $last_revert_enc - set p [eval git_write $apply_cmd] - fconfigure $p -translation binary -encoding $enc - puts -nonewline $p $last_revert - close $p} err]} { - error_popup "$failed_msg\n\n$err" - unlock_index - return } - set last_revert {} - unlock_index } diff --git a/third_party/git/git-gui/lib/index.tcl b/third_party/git/git-gui/lib/index.tcl index 1fc5b42300..b588db11d9 100644 --- a/third_party/git/git-gui/lib/index.tcl +++ b/third_party/git/git-gui/lib/index.tcl @@ -7,74 +7,67 @@ proc _delete_indexlock {} { } } -proc close_and_unlock_index {fd after} { - if {![catch {_close_updateindex $fd} err]} { +proc _close_updateindex {fd after} { + global use_ttk NS + fconfigure $fd -blocking 1 + if {[catch {close $fd} err]} { + set w .indexfried + Dialog $w + wm withdraw $w + wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]] + wm geometry $w "+[winfo rootx .]+[winfo rooty .]" + set s [mc "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."] + text $w.msg -yscrollcommand [list $w.vs set] \ + -width [string length $s] -relief flat \ + -borderwidth 0 -highlightthickness 0 \ + -background [get_bg_color $w] + $w.msg tag configure bold -font font_uibold -justify center + ${NS}::scrollbar $w.vs -command [list $w.msg yview] + $w.msg insert end $s bold \n\n$err {} + $w.msg configure -state disabled + + ${NS}::button $w.continue \ + -text [mc "Continue"] \ + -command [list destroy $w] + ${NS}::button $w.unlock \ + -text [mc "Unlock Index"] \ + -command "destroy $w; _delete_indexlock" + grid $w.msg - $w.vs -sticky news + grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2 + grid columnconfigure $w 0 -weight 1 + grid rowconfigure $w 0 -weight 1 + + wm protocol $w WM_DELETE_WINDOW update + bind $w.continue <Visibility> " + grab $w + focus %W + " + wm deiconify $w + tkwait window $w + + $::main_status stop unlock_index - uplevel #0 $after - } else { - rescan_on_error $err $after + rescan $after 0 + return } -} -proc _close_updateindex {fd} { - fconfigure $fd -blocking 1 - close $fd -} - -proc rescan_on_error {err {after {}}} { - global use_ttk NS - - set w .indexfried - Dialog $w - wm withdraw $w - wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]] - wm geometry $w "+[winfo rootx .]+[winfo rooty .]" - set s [mc "Updating the Git index failed. A rescan will be automatically started to resynchronize git-gui."] - text $w.msg -yscrollcommand [list $w.vs set] \ - -width [string length $s] -relief flat \ - -borderwidth 0 -highlightthickness 0 \ - -background [get_bg_color $w] - $w.msg tag configure bold -font font_uibold -justify center - ${NS}::scrollbar $w.vs -command [list $w.msg yview] - $w.msg insert end $s bold \n\n$err {} - $w.msg configure -state disabled - - ${NS}::button $w.continue \ - -text [mc "Continue"] \ - -command [list destroy $w] - ${NS}::button $w.unlock \ - -text [mc "Unlock Index"] \ - -command "destroy $w; _delete_indexlock" - grid $w.msg - $w.vs -sticky news - grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2 - grid columnconfigure $w 0 -weight 1 - grid rowconfigure $w 0 -weight 1 - - wm protocol $w WM_DELETE_WINDOW update - bind $w.continue <Visibility> " - grab $w - focus %W - " - wm deiconify $w - tkwait window $w - - $::main_status stop_all + $::main_status stop unlock_index - rescan [concat $after [list ui_ready]] 0 + uplevel #0 $after } -proc update_indexinfo {msg path_list after} { +proc update_indexinfo {msg pathList after} { global update_index_cp if {![lock_index update]} return set update_index_cp 0 - set path_list [lsort $path_list] - set total_cnt [llength $path_list] - set batch [expr {int($total_cnt * .01) + 1}] + set pathList [lsort $pathList] + set totalCnt [llength $pathList] + set batch [expr {int($totalCnt * .01) + 1}] if {$batch > 25} {set batch 25} - set status_bar_operation [$::main_status start $msg [mc "files"]] + $::main_status start $msg [mc "files"] set fd [git_write update-index -z --index-info] fconfigure $fd \ -blocking 0 \ @@ -85,29 +78,26 @@ proc update_indexinfo {msg path_list after} { fileevent $fd writable [list \ write_update_indexinfo \ $fd \ - $path_list \ - $total_cnt \ + $pathList \ + $totalCnt \ $batch \ - $status_bar_operation \ $after \ ] } -proc write_update_indexinfo {fd path_list total_cnt batch status_bar_operation \ - after} { +proc write_update_indexinfo {fd pathList totalCnt batch after} { global update_index_cp global file_states current_diff_path - if {$update_index_cp >= $total_cnt} { - $status_bar_operation stop - close_and_unlock_index $fd $after + if {$update_index_cp >= $totalCnt} { + _close_updateindex $fd $after return } for {set i $batch} \ - {$update_index_cp < $total_cnt && $i > 0} \ + {$update_index_cp < $totalCnt && $i > 0} \ {incr i -1} { - set path [lindex $path_list $update_index_cp] + set path [lindex $pathList $update_index_cp] incr update_index_cp set s $file_states($path) @@ -129,21 +119,21 @@ proc write_update_indexinfo {fd path_list total_cnt batch status_bar_operation \ display_file $path $new } - $status_bar_operation update $update_index_cp $total_cnt + $::main_status update $update_index_cp $totalCnt } -proc update_index {msg path_list after} { +proc update_index {msg pathList after} { global update_index_cp if {![lock_index update]} return set update_index_cp 0 - set path_list [lsort $path_list] - set total_cnt [llength $path_list] - set batch [expr {int($total_cnt * .01) + 1}] + set pathList [lsort $pathList] + set totalCnt [llength $pathList] + set batch [expr {int($totalCnt * .01) + 1}] if {$batch > 25} {set batch 25} - set status_bar_operation [$::main_status start $msg [mc "files"]] + $::main_status start $msg [mc "files"] set fd [git_write update-index --add --remove -z --stdin] fconfigure $fd \ -blocking 0 \ @@ -154,29 +144,26 @@ proc update_index {msg path_list after} { fileevent $fd writable [list \ write_update_index \ $fd \ - $path_list \ - $total_cnt \ + $pathList \ + $totalCnt \ $batch \ - $status_bar_operation \ $after \ ] } -proc write_update_index {fd path_list total_cnt batch status_bar_operation \ - after} { +proc write_update_index {fd pathList totalCnt batch after} { global update_index_cp global file_states current_diff_path - if {$update_index_cp >= $total_cnt} { - $status_bar_operation stop - close_and_unlock_index $fd $after + if {$update_index_cp >= $totalCnt} { + _close_updateindex $fd $after return } for {set i $batch} \ - {$update_index_cp < $total_cnt && $i > 0} \ + {$update_index_cp < $totalCnt && $i > 0} \ {incr i -1} { - set path [lindex $path_list $update_index_cp] + set path [lindex $pathList $update_index_cp] incr update_index_cp switch -glob -- [lindex $file_states($path) 0] { @@ -203,21 +190,21 @@ proc write_update_index {fd path_list total_cnt batch status_bar_operation \ display_file $path $new } - $status_bar_operation update $update_index_cp $total_cnt + $::main_status update $update_index_cp $totalCnt } -proc checkout_index {msg path_list after capture_error} { +proc checkout_index {msg pathList after} { global update_index_cp if {![lock_index update]} return set update_index_cp 0 - set path_list [lsort $path_list] - set total_cnt [llength $path_list] - set batch [expr {int($total_cnt * .01) + 1}] + set pathList [lsort $pathList] + set totalCnt [llength $pathList] + set batch [expr {int($totalCnt * .01) + 1}] if {$batch > 25} {set batch 25} - set status_bar_operation [$::main_status start $msg [mc "files"]] + $::main_status start $msg [mc "files"] set fd [git_write checkout-index \ --index \ --quiet \ @@ -234,45 +221,26 @@ proc checkout_index {msg path_list after capture_error} { fileevent $fd writable [list \ write_checkout_index \ $fd \ - $path_list \ - $total_cnt \ + $pathList \ + $totalCnt \ $batch \ - $status_bar_operation \ $after \ - $capture_error \ ] } -proc write_checkout_index {fd path_list total_cnt batch status_bar_operation \ - after capture_error} { +proc write_checkout_index {fd pathList totalCnt batch after} { global update_index_cp global file_states current_diff_path - if {$update_index_cp >= $total_cnt} { - $status_bar_operation stop - - # We do not unlock the index directly here because this - # operation expects to potentially run in parallel with file - # deletions scheduled by revert_helper. We're done with the - # update index, so we close it, but actually unlocking the index - # and dealing with potential errors is deferred to the chord - # body that runs when all async operations are completed. - # - # (See after_chord in revert_helper.) - - if {[catch {_close_updateindex $fd} err]} { - uplevel #0 $capture_error [list $err] - } - - uplevel #0 $after - + if {$update_index_cp >= $totalCnt} { + _close_updateindex $fd $after return } for {set i $batch} \ - {$update_index_cp < $total_cnt && $i > 0} \ + {$update_index_cp < $totalCnt && $i > 0} \ {incr i -1} { - set path [lindex $path_list $update_index_cp] + set path [lindex $pathList $update_index_cp] incr update_index_cp switch -glob -- [lindex $file_states($path) 0] { U? {continue} @@ -285,7 +253,7 @@ proc write_checkout_index {fd path_list total_cnt batch status_bar_operation \ } } - $status_bar_operation update $update_index_cp $total_cnt + $::main_status update $update_index_cp $totalCnt } proc unstage_helper {txt paths} { @@ -293,7 +261,7 @@ proc unstage_helper {txt paths} { if {![lock_index begin-update]} return - set path_list [list] + set pathList [list] set after {} foreach path $paths { switch -glob -- [lindex $file_states($path) 0] { @@ -301,19 +269,19 @@ proc unstage_helper {txt paths} { M? - T? - D? { - lappend path_list $path + lappend pathList $path if {$path eq $current_diff_path} { set after {reshow_diff;} } } } } - if {$path_list eq {}} { + if {$pathList eq {}} { unlock_index } else { update_indexinfo \ $txt \ - $path_list \ + $pathList \ [concat $after [list ui_ready]] } } @@ -337,7 +305,7 @@ proc add_helper {txt paths} { if {![lock_index begin-update]} return - set path_list [list] + set pathList [list] set after {} foreach path $paths { switch -glob -- [lindex $file_states($path) 0] { @@ -353,19 +321,19 @@ proc add_helper {txt paths} { ?M - ?D - ?T { - lappend path_list $path + lappend pathList $path if {$path eq $current_diff_path} { set after {reshow_diff;} } } } } - if {$path_list eq {}} { + if {$pathList eq {}} { unlock_index } else { update_index \ $txt \ - $path_list \ + $pathList \ [concat $after {ui_status [mc "Ready to commit."]}] } } @@ -420,303 +388,66 @@ proc do_add_all {} { add_helper [mc "Adding all changed files"] $paths } -# Copied from TclLib package "lambda". -proc lambda {arguments body args} { - return [list ::apply [list $arguments $body] {*}$args] -} - proc revert_helper {txt paths} { global file_states current_diff_path if {![lock_index begin-update]} return - # Common "after" functionality that waits until multiple asynchronous - # operations are complete (by waiting for them to activate their notes - # on the chord). - # - # The asynchronous operations are each indicated below by a comment - # before the code block that starts the async operation. - set after_chord [SimpleChord::new { - if {[string trim $err] != ""} { - rescan_on_error $err - } else { - unlock_index - if {$should_reshow_diff} { reshow_diff } - ui_ready - } - }] - - $after_chord eval { set should_reshow_diff 0 } - - # This function captures an error for processing when after_chord is - # completed. (The chord is curried into the lambda function.) - set capture_error [lambda \ - {chord error} \ - { $chord eval [list set err $error] } \ - $after_chord] - - # We don't know how many notes we're going to create (it's dynamic based - # on conditional paths below), so create a common note that will delay - # the chord's completion until we activate it, and then activate it - # after all the other notes have been created. - set after_common_note [$after_chord add_note] - - set path_list [list] - set untracked_list [list] - + set pathList [list] + set after {} foreach path $paths { switch -glob -- [lindex $file_states($path) 0] { U? {continue} - ?O { - lappend untracked_list $path - } ?M - ?T - ?D { - lappend path_list $path + lappend pathList $path if {$path eq $current_diff_path} { - $after_chord eval { set should_reshow_diff 1 } + set after {reshow_diff;} } } } } - set path_cnt [llength $path_list] - set untracked_cnt [llength $untracked_list] - - # Asynchronous operation: revert changes by checking them out afresh - # from the index. - if {$path_cnt > 0} { - # Split question between singular and plural cases, because - # such distinction is needed in some languages. Previously, the - # code used "Revert changes in" for both, but that can't work - # in languages where 'in' must be combined with word from - # rest of string (in different way for both cases of course). - # - # FIXME: Unfortunately, even that isn't enough in some languages - # as they have quite complex plural-form rules. Unfortunately, - # msgcat doesn't seem to support that kind of string - # translation. - # - if {$path_cnt == 1} { - set query [mc \ - "Revert changes in file %s?" \ - [short_path [lindex $path_list]] \ - ] - } else { - set query [mc \ - "Revert changes in these %i files?" \ - $path_cnt] - } - - set reply [tk_dialog \ - .confirm_revert \ - "[appname] ([reponame])" \ - "$query - -[mc "Any unstaged changes will be permanently lost by the revert."]" \ - question \ - 1 \ - [mc "Do Nothing"] \ - [mc "Revert Changes"] \ - ] - - if {$reply == 1} { - set note [$after_chord add_note] - checkout_index \ - $txt \ - $path_list \ - [list $note activate] \ - $capture_error - } - } - - # Asynchronous operation: Deletion of untracked files. - if {$untracked_cnt > 0} { - # Split question between singular and plural cases, because - # such distinction is needed in some languages. - # - # FIXME: Unfortunately, even that isn't enough in some languages - # as they have quite complex plural-form rules. Unfortunately, - # msgcat doesn't seem to support that kind of string - # translation. - # - if {$untracked_cnt == 1} { - set query [mc \ - "Delete untracked file %s?" \ - [short_path [lindex $untracked_list]] \ - ] - } else { - set query [mc \ - "Delete these %i untracked files?" \ - $untracked_cnt \ - ] - } - - set reply [tk_dialog \ - .confirm_revert \ - "[appname] ([reponame])" \ - "$query - -[mc "Files will be permanently deleted."]" \ - question \ - 1 \ - [mc "Do Nothing"] \ - [mc "Delete Files"] \ - ] - - if {$reply == 1} { - $after_chord eval { set should_reshow_diff 1 } - set note [$after_chord add_note] - delete_files $untracked_list [list $note activate] - } - } - - # Activate the common note. If no other notes were created, this - # completes the chord. If other notes were created, then this common - # note prevents a race condition where the chord might complete early. - $after_common_note activate -} - -# Delete all of the specified files, performing deletion in batches to allow the -# UI to remain responsive and updated. -proc delete_files {path_list after} { - # Enable progress bar status updates - set status_bar_operation [$::main_status \ - start \ - [mc "Deleting"] \ - [mc "files"]] - - set path_index 0 - set deletion_errors [list] - set batch_size 50 - - delete_helper \ - $path_list \ - $path_index \ - $deletion_errors \ - $batch_size \ - $status_bar_operation \ - $after -} - -# Helper function to delete a list of files in batches. Each call deletes one -# batch of files, and then schedules a call for the next batch after any UI -# messages have been processed. -proc delete_helper {path_list path_index deletion_errors batch_size \ - status_bar_operation after} { - global file_states - - set path_cnt [llength $path_list] - - set batch_remaining $batch_size - - while {$batch_remaining > 0} { - if {$path_index >= $path_cnt} { break } - - set path [lindex $path_list $path_index] - - set deletion_failed [catch {file delete -- $path} deletion_error] - - if {$deletion_failed} { - lappend deletion_errors [list "$deletion_error"] - } else { - remove_empty_directories [file dirname $path] - - # Don't assume the deletion worked. Remove the file from - # the UI, but only if it no longer exists. - if {![path_exists $path]} { - unset file_states($path) - display_file $path __ - } - } - - incr path_index 1 - incr batch_remaining -1 - } - - # Update the progress bar to indicate that this batch has been - # completed. The update will be visible when this procedure returns - # and allows the UI thread to process messages. - $status_bar_operation update $path_index $path_cnt - - if {$path_index < $path_cnt} { - # The Tcler's Wiki lists this as the best practice for keeping - # a UI active and processing messages during a long-running - # operation. - - after idle [list after 0 [list \ - delete_helper \ - $path_list \ - $path_index \ - $deletion_errors \ - $batch_size \ - $status_bar_operation \ - $after - ]] + # Split question between singular and plural cases, because + # such distinction is needed in some languages. Previously, the + # code used "Revert changes in" for both, but that can't work + # in languages where 'in' must be combined with word from + # rest of string (in different way for both cases of course). + # + # FIXME: Unfortunately, even that isn't enough in some languages + # as they have quite complex plural-form rules. Unfortunately, + # msgcat doesn't seem to support that kind of string translation. + # + set n [llength $pathList] + if {$n == 0} { + unlock_index + return + } elseif {$n == 1} { + set query [mc "Revert changes in file %s?" [short_path [lindex $pathList]]] } else { - # Finish the status bar operation. - $status_bar_operation stop - - # Report error, if any, based on how many deletions failed. - set deletion_error_cnt [llength $deletion_errors] - - if {($deletion_error_cnt > 0) - && ($deletion_error_cnt <= [MAX_VERBOSE_FILES_IN_DELETION_ERROR])} { - set error_text [mc "Encountered errors deleting files:\n"] - - foreach deletion_error $deletion_errors { - append error_text "* [lindex $deletion_error 0]\n" - } - - error_popup $error_text - } elseif {$deletion_error_cnt == $path_cnt} { - error_popup [mc \ - "None of the %d selected files could be deleted." \ - $path_cnt \ - ] - } elseif {$deletion_error_cnt > 1} { - error_popup [mc \ - "%d of the %d selected files could not be deleted." \ - $deletion_error_cnt \ - $path_cnt \ - ] - } - - uplevel #0 $after + set query [mc "Revert changes in these %i files?" $n] } -} -proc MAX_VERBOSE_FILES_IN_DELETION_ERROR {} { return 10; } - -# This function is from the TCL documentation: -# -# https://wiki.tcl-lang.org/page/file+exists -# -# [file exists] returns false if the path does exist but is a symlink to a path -# that doesn't exist. This proc returns true if the path exists, regardless of -# whether it is a symlink and whether it is broken. -proc path_exists {name} { - expr {![catch {file lstat $name finfo}]} -} - -# Remove as many empty directories as we can starting at the specified path, -# walking up the directory tree. If we encounter a directory that is not -# empty, or if a directory deletion fails, then we stop the operation and -# return to the caller. Even if this procedure fails to delete any -# directories at all, it does not report failure. -proc remove_empty_directories {directory_path} { - set parent_path [file dirname $directory_path] - - while {$parent_path != $directory_path} { - set contents [glob -nocomplain -dir $directory_path *] + set reply [tk_dialog \ + .confirm_revert \ + "[appname] ([reponame])" \ + "$query - if {[llength $contents] > 0} { break } - if {[catch {file delete -- $directory_path}]} { break } - - set directory_path $parent_path - set parent_path [file dirname $directory_path] +[mc "Any unstaged changes will be permanently lost by the revert."]" \ + question \ + 1 \ + [mc "Do Nothing"] \ + [mc "Revert Changes"] \ + ] + if {$reply == 1} { + checkout_index \ + $txt \ + $pathList \ + [concat $after [list ui_ready]] + } else { + unlock_index } } @@ -735,19 +466,19 @@ proc do_revert_selection {} { } proc do_select_commit_type {} { - global commit_type commit_type_is_amend + global commit_type selected_commit_type - if {$commit_type_is_amend == 0 + if {$selected_commit_type eq {new} && [string match amend* $commit_type]} { create_new_commit - } elseif {$commit_type_is_amend == 1 + } elseif {$selected_commit_type eq {amend} && ![string match amend* $commit_type]} { load_last_commit # The amend request was rejected... # if {![string match amend* $commit_type]} { - set commit_type_is_amend 0 + set selected_commit_type new } } } diff --git a/third_party/git/git-gui/lib/merge.tcl b/third_party/git/git-gui/lib/merge.tcl index 664803cf3f..9f253db5b3 100644 --- a/third_party/git/git-gui/lib/merge.tcl +++ b/third_party/git/git-gui/lib/merge.tcl @@ -241,27 +241,23 @@ Continue with resetting the current changes?"] if {[ask_popup $op_question] eq {yes}} { set fd [git_read --stderr read-tree --reset -u -v HEAD] fconfigure $fd -blocking 0 -translation binary - set status_bar_operation [$::main_status \ - start \ - [mc "Aborting"] \ - [mc "files reset"]] - fileevent $fd readable [namespace code [list \ - _reset_wait $fd $status_bar_operation]] + fileevent $fd readable [namespace code [list _reset_wait $fd]] + $::main_status start [mc "Aborting"] [mc "files reset"] } else { unlock_index } } -proc _reset_wait {fd status_bar_operation} { +proc _reset_wait {fd} { global ui_comm - $status_bar_operation update_meter [read $fd] + $::main_status update_meter [read $fd] fconfigure $fd -blocking 1 if {[eof $fd]} { set fail [catch {close $fd} err] + $::main_status stop unlock_index - $status_bar_operation stop $ui_comm delete 0.0 end $ui_comm edit modified false diff --git a/third_party/git/git-gui/lib/status_bar.tcl b/third_party/git/git-gui/lib/status_bar.tcl index d32b14142f..02111a1742 100644 --- a/third_party/git/git-gui/lib/status_bar.tcl +++ b/third_party/git/git-gui/lib/status_bar.tcl @@ -1,42 +1,16 @@ # git-gui status bar mega-widget # Copyright (C) 2007 Shawn Pearce -# The status_bar class manages the entire status bar. It is possible for -# multiple overlapping asynchronous operations to want to display status -# simultaneously. Each one receives a status_bar_operation when it calls the -# start method, and the status bar combines all active operations into the -# line of text it displays. Most of the time, there will be at most one -# ongoing operation. -# -# Note that the entire status bar can be either in single-line or two-line -# mode, depending on the constructor. Multiple active operations are only -# supported for single-line status bars. - class status_bar { -field allow_multiple ; # configured at construction - field w ; # our own window path field w_l ; # text widget we draw messages into field w_c ; # canvas we draw a progress bar into field c_pack ; # script to pack the canvas with - -field baseline_text ; # text to show if there are no operations -field status_bar_text ; # combined text for all operations - -field operations ; # list of current ongoing operations - -# The status bar can display a progress bar, updated when consumers call the -# update method on their status_bar_operation. When there are multiple -# operations, the status bar shows the combined status of all operations. -# -# When an overlapping operation completes, the progress bar is going to -# abruptly have one fewer operation in the calculation, causing a discontinuity. -# Therefore, whenever an operation completes, if it is not the last operation, -# this counter is increased, and the progress bar is calculated as though there -# were still another operation at 100%. When the last operation completes, this -# is reset to 0. -field completed_operation_count +field status {}; # single line of text we show +field prefix {}; # text we format into status +field units {}; # unit of progress +field meter {}; # current core git progress meter (if active) constructor new {path} { global use_ttk NS @@ -44,19 +18,12 @@ constructor new {path} { set w_l $w.l set w_c $w.c - # Standard single-line status bar: Permit overlapping operations - set allow_multiple 1 - - set baseline_text "" - set operations [list] - set completed_operation_count 0 - ${NS}::frame $w if {!$use_ttk} { $w configure -borderwidth 1 -relief sunken } ${NS}::label $w_l \ - -textvariable @status_bar_text \ + -textvariable @status \ -anchor w \ -justify left pack $w_l -side left @@ -77,16 +44,9 @@ constructor two_line {path} { set w_l $w.l set w_c $w.c - # Two-line status bar: Only one ongoing operation permitted. - set allow_multiple 0 - - set baseline_text "" - set operations [list] - set completed_operation_count 0 - ${NS}::frame $w ${NS}::label $w_l \ - -textvariable @status_bar_text \ + -textvariable @status \ -anchor w \ -justify left pack $w_l -anchor w -fill x @@ -96,7 +56,7 @@ constructor two_line {path} { return $this } -method ensure_canvas {} { +method start {msg uds} { if {[winfo exists $w_c]} { $w_c coords bar 0 0 0 20 } else { @@ -108,170 +68,31 @@ method ensure_canvas {} { $w_c create rectangle 0 0 0 20 -tags bar -fill navy eval $c_pack } -} - -method show {msg} { - $this ensure_canvas - set baseline_text $msg - $this refresh -} - -method start {msg {uds {}}} { - set baseline_text "" - - if {!$allow_multiple && [llength $operations]} { - return [lindex $operations 0] - } - - $this ensure_canvas - - set operation [status_bar_operation::new $this $msg $uds] - - lappend operations $operation - - $this refresh - - return $operation -} - -method refresh {} { - set new_text "" - - set total [expr $completed_operation_count * 100] - set have $total - - foreach operation $operations { - if {$new_text != ""} { - append new_text " / " - } - - append new_text [$operation get_status] - - set total [expr $total + 100] - set have [expr $have + [$operation get_progress]] - } - - if {$new_text == ""} { - set new_text $baseline_text - } - - set status_bar_text $new_text - - if {[winfo exists $w_c]} { - set pixel_width 0 - if {$have > 0} { - set pixel_width [expr {[winfo width $w_c] * $have / $total}] - } - - $w_c coords bar 0 0 $pixel_width 20 - } -} - -method stop {operation stop_msg} { - set idx [lsearch $operations $operation] - - if {$idx >= 0} { - set operations [lreplace $operations $idx $idx] - set completed_operation_count [expr \ - $completed_operation_count + 1] - - if {[llength $operations] == 0} { - set completed_operation_count 0 - - destroy $w_c - if {$stop_msg ne {}} { - set baseline_text $stop_msg - } - } - - $this refresh - } -} - -method stop_all {{stop_msg {}}} { - # This makes the operation's call to stop a no-op. - set operations_copy $operations - set operations [list] - - foreach operation $operations_copy { - $operation stop - } - - if {$stop_msg ne {}} { - set baseline_text $stop_msg - } - - $this refresh -} - -method _delete {current} { - if {$current eq $w} { - delete_this - } -} - -} - -# The status_bar_operation class tracks a single consumer's ongoing status bar -# activity, with the context that there are a few situations where multiple -# overlapping asynchronous operations might want to display status information -# simultaneously. Instances of status_bar_operation are created by calling -# start on the status_bar, and when the caller is done with its stauts bar -# operation, it calls stop on the operation. - -class status_bar_operation { - -field status_bar; # reference back to the status_bar that owns this object - -field is_active; - -field status {}; # single line of text we show -field progress {}; # current progress (0 to 100) -field prefix {}; # text we format into status -field units {}; # unit of progress -field meter {}; # current core git progress meter (if active) - -constructor new {owner msg uds} { - set status_bar $owner set status $msg - set progress 0 set prefix $msg set units $uds set meter {} - - set is_active 1 - - return $this } -method get_is_active {} { return $is_active } -method get_status {} { return $status } -method get_progress {} { return $progress } - method update {have total} { - if {!$is_active} { return } - - set progress 0 - + set pdone 0 + set cdone 0 if {$total > 0} { - set progress [expr {100 * $have / $total}] + set pdone [expr {100 * $have / $total}] + set cdone [expr {[winfo width $w_c] * $have / $total}] } set prec [string length [format %i $total]] - set status [mc "%s ... %*i of %*i %s (%3i%%)" \ $prefix \ $prec $have \ $prec $total \ - $units $progress] - - $status_bar refresh + $units $pdone] + $w_c coords bar 0 0 $cdone 20 } method update_meter {buf} { - if {!$is_active} { return } - append meter $buf set r [string last "\r" $meter] if {$r == -1} { @@ -288,25 +109,23 @@ method update_meter {buf} { } } -method stop {{stop_msg {}}} { - if {$is_active} { - set is_active 0 - $status_bar stop $this $stop_msg +method stop {{msg {}}} { + destroy $w_c + if {$msg ne {}} { + set status $msg } } -method restart {msg} { - if {!$is_active} { return } - - set status $msg - set prefix $msg - set meter {} - $status_bar refresh +method show {msg {test {}}} { + if {$test eq {} || $status eq $test} { + set status $msg + } } -method _delete {} { - stop - delete_this +method _delete {current} { + if {$current eq $w} { + delete_this + } } } diff --git a/third_party/git/git-gui/po/de.po b/third_party/git/git-gui/po/de.po index a8d5f61ca3..baebff2fff 100644 --- a/third_party/git/git-gui/po/de.po +++ b/third_party/git/git-gui/po/de.po @@ -7,42 +7,41 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-08 22:54+0100\n" -"PO-Revision-Date: 2020-02-09 22:40+0100\n" -"Last-Translator: Christian Stimming <christian@cstimming.de>\n" +"POT-Creation-Date: 2010-01-26 22:22+0100\n" +"PO-Revision-Date: 2010-01-26 22:25+0100\n" +"Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German\n" -"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: git-gui.sh:847 +#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 +#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "git-gui: Programmfehler" + +#: git-gui.sh:743 #, tcl-format msgid "Invalid font specified in %s:" msgstr "Ungültige Zeichensatz-Angabe in %s:" -#: git-gui.sh:901 +#: git-gui.sh:779 msgid "Main Font" msgstr "Programmschriftart" -#: git-gui.sh:902 +#: git-gui.sh:780 msgid "Diff/Console Font" msgstr "Vergleich-Schriftart" -#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 -#: git-gui.sh:3212 -msgid "git-gui: fatal error" -msgstr "git-gui: Programmfehler" - -#: git-gui.sh:918 +#: git-gui.sh:794 msgid "Cannot find git in PATH." msgstr "Git kann im PATH nicht gefunden werden." -#: git-gui.sh:945 +#: git-gui.sh:821 msgid "Cannot parse Git version string:" msgstr "Git Versionsangabe kann nicht erkannt werden:" -#: git-gui.sh:970 +#: git-gui.sh:839 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -61,524 +60,479 @@ msgstr "" "\n" "Soll angenommen werden, »%s« sei Version 1.5.0?\n" -#: git-gui.sh:1267 +#: git-gui.sh:1128 msgid "Git directory not found:" msgstr "Git-Verzeichnis nicht gefunden:" -#: git-gui.sh:1301 +#: git-gui.sh:1146 msgid "Cannot move to top of working directory:" msgstr "" "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt " "werden:" -#: git-gui.sh:1309 +#: git-gui.sh:1154 msgid "Cannot use bare repository:" -msgstr "Bloßes Repository kann nicht benutzt werden:" +msgstr "Bloßes Projektarchiv kann nicht benutzt werden:" -#: git-gui.sh:1317 +#: git-gui.sh:1162 msgid "No working directory" msgstr "Kein Arbeitsverzeichnis" -#: git-gui.sh:1491 lib/checkout_op.tcl:306 +#: git-gui.sh:1334 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "Dateistatus aktualisieren..." -#: git-gui.sh:1551 +#: git-gui.sh:1390 msgid "Scanning for modified files ..." msgstr "Nach geänderten Dateien suchen..." -#: git-gui.sh:1629 +#: git-gui.sh:1454 msgid "Calling prepare-commit-msg hook..." -msgstr "Aufrufen des »prepare-commit-msg hook«..." +msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)..." -#: git-gui.sh:1646 +#: git-gui.sh:1471 msgid "Commit declined by prepare-commit-msg hook." -msgstr "Commit abgelehnt durch »prepare-commit-msg hook«." +msgstr "" +"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit " +"hook«)." -#: git-gui.sh:1804 lib/browser.tcl:252 +#: git-gui.sh:1629 lib/browser.tcl:246 msgid "Ready." msgstr "Bereit." -#: git-gui.sh:1968 +#: git-gui.sh:1787 #, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." -msgstr "" -"Anzeigelimit erreicht (gui.maxfilesdisplayed = %s) für Anzahl Einträge. Es " -"werden nicht alle %s Dateien gezeigt." +msgid "Displaying only %s of %s files." +msgstr "Nur %s von %s Dateien werden angezeigt." -#: git-gui.sh:2091 +#: git-gui.sh:1913 msgid "Unmodified" msgstr "Unverändert" -#: git-gui.sh:2093 +#: git-gui.sh:1915 msgid "Modified, not staged" msgstr "Verändert, nicht bereitgestellt" -#: git-gui.sh:2094 git-gui.sh:2106 +#: git-gui.sh:1916 git-gui.sh:1924 msgid "Staged for commit" -msgstr "Bereitgestellt zum Committen" +msgstr "Bereitgestellt zum Eintragen" -#: git-gui.sh:2095 git-gui.sh:2107 +#: git-gui.sh:1917 git-gui.sh:1925 msgid "Portions staged for commit" -msgstr "Teilweise bereitgestellt zum Committen" +msgstr "Teilweise bereitgestellt zum Eintragen" -#: git-gui.sh:2096 git-gui.sh:2108 +#: git-gui.sh:1918 git-gui.sh:1926 msgid "Staged for commit, missing" -msgstr "Bereitgestellt zum Committen, fehlend" +msgstr "Bereitgestellt zum Eintragen, fehlend" -#: git-gui.sh:2098 +#: git-gui.sh:1920 msgid "File type changed, not staged" msgstr "Dateityp geändert, nicht bereitgestellt" -#: git-gui.sh:2099 git-gui.sh:2100 -msgid "File type changed, old type staged for commit" -msgstr "Dateityp geändert, alter Dateityp bereitgestellt" - -#: git-gui.sh:2101 +#: git-gui.sh:1921 msgid "File type changed, staged" msgstr "Dateityp geändert, bereitgestellt" -#: git-gui.sh:2102 -msgid "File type change staged, modification not staged" -msgstr "Dateityp-Änderung bereitgestellt, Inhaltsänderung nicht bereitgestellt" - -#: git-gui.sh:2103 -msgid "File type change staged, file missing" -msgstr "Dateityp-Änderung bereitgestellt, Datei gelöscht" - -#: git-gui.sh:2105 +#: git-gui.sh:1923 msgid "Untracked, not staged" -msgstr "Unversioniert, nicht bereitgestellt" +msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt" -#: git-gui.sh:2110 +#: git-gui.sh:1928 msgid "Missing" msgstr "Fehlend" -#: git-gui.sh:2111 +#: git-gui.sh:1929 msgid "Staged for removal" msgstr "Bereitgestellt zum Löschen" -#: git-gui.sh:2112 +#: git-gui.sh:1930 msgid "Staged for removal, still present" msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden" -#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 -#: git-gui.sh:2118 git-gui.sh:2119 +#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 +#: git-gui.sh:1936 git-gui.sh:1937 msgid "Requires merge resolution" msgstr "Konfliktauflösung nötig" -#: git-gui.sh:2164 +#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." +msgstr "Gitk wird gestartet... bitte warten." + +#: git-gui.sh:1984 msgid "Couldn't find gitk in PATH" msgstr "Gitk kann im PATH nicht gefunden werden." -#: git-gui.sh:2210 git-gui.sh:2245 -#, tcl-format -msgid "Starting %s... please wait..." -msgstr "%s wird gestartet... bitte warten." - -#: git-gui.sh:2224 +#: git-gui.sh:2043 msgid "Couldn't find git gui in PATH" msgstr "»Git gui« kann im PATH nicht gefunden werden." -#: git-gui.sh:2726 lib/choose_repository.tcl:53 +#: git-gui.sh:2455 lib/choose_repository.tcl:36 msgid "Repository" -msgstr "Repository" +msgstr "Projektarchiv" -#: git-gui.sh:2727 +#: git-gui.sh:2456 msgid "Edit" msgstr "Bearbeiten" -#: git-gui.sh:2729 lib/choose_rev.tcl:567 +#: git-gui.sh:2458 lib/choose_rev.tcl:561 msgid "Branch" -msgstr "Branch" +msgstr "Zweig" -#: git-gui.sh:2732 lib/choose_rev.tcl:554 +#: git-gui.sh:2461 lib/choose_rev.tcl:548 msgid "Commit@@noun" -msgstr "Commit" +msgstr "Version" -#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 +#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "Zusammenführen" -#: git-gui.sh:2736 lib/choose_rev.tcl:563 +#: git-gui.sh:2465 lib/choose_rev.tcl:557 msgid "Remote" -msgstr "Extern" +msgstr "Externe Archive" -#: git-gui.sh:2739 +#: git-gui.sh:2468 msgid "Tools" msgstr "Werkzeuge" -#: git-gui.sh:2748 +#: git-gui.sh:2477 msgid "Explore Working Copy" -msgstr "Arbeitskopie im Dateimanager öffnen" - -#: git-gui.sh:2763 -msgid "Git Bash" -msgstr "Git Bash" +msgstr "Arbeitskopie im Dateimanager" -#: git-gui.sh:2772 +#: git-gui.sh:2483 msgid "Browse Current Branch's Files" -msgstr "Aktuellen Branch durchblättern" +msgstr "Aktuellen Zweig durchblättern" -#: git-gui.sh:2776 +#: git-gui.sh:2487 msgid "Browse Branch Files..." -msgstr "Branch durchblättern..." +msgstr "Einen Zweig durchblättern..." -#: git-gui.sh:2781 +#: git-gui.sh:2492 msgid "Visualize Current Branch's History" -msgstr "Aktuellen Branch darstellen" +msgstr "Aktuellen Zweig darstellen" -#: git-gui.sh:2785 +#: git-gui.sh:2496 msgid "Visualize All Branch History" -msgstr "Historie aller Branches darstellen" +msgstr "Alle Zweige darstellen" -#: git-gui.sh:2792 +#: git-gui.sh:2503 #, tcl-format msgid "Browse %s's Files" -msgstr "Branch »%s« durchblättern" +msgstr "Zweig »%s« durchblättern" -#: git-gui.sh:2794 +#: git-gui.sh:2505 #, tcl-format msgid "Visualize %s's History" msgstr "Historie von »%s« darstellen" -#: git-gui.sh:2799 lib/database.tcl:40 +#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "Datenbankstatistik" -#: git-gui.sh:2802 lib/database.tcl:33 +#: git-gui.sh:2513 lib/database.tcl:34 msgid "Compress Database" msgstr "Datenbank komprimieren" -#: git-gui.sh:2805 +#: git-gui.sh:2516 msgid "Verify Database" msgstr "Datenbank überprüfen" -#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 +#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 +#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 msgid "Create Desktop Icon" msgstr "Desktop-Icon erstellen" -#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 +#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 msgid "Quit" msgstr "Beenden" -#: git-gui.sh:2836 +#: git-gui.sh:2547 msgid "Undo" msgstr "Rückgängig" -#: git-gui.sh:2839 +#: git-gui.sh:2550 msgid "Redo" msgstr "Wiederholen" -#: git-gui.sh:2843 git-gui.sh:3461 +#: git-gui.sh:2554 git-gui.sh:3109 msgid "Cut" msgstr "Ausschneiden" -#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 +#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 #: lib/console.tcl:69 msgid "Copy" msgstr "Kopieren" -#: git-gui.sh:2849 git-gui.sh:3467 +#: git-gui.sh:2560 git-gui.sh:3115 msgid "Paste" msgstr "Einfügen" -#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 -#: lib/branch_delete.tcl:28 +#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "Löschen" -#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 +#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 msgid "Select All" msgstr "Alle auswählen" -#: git-gui.sh:2865 +#: git-gui.sh:2576 msgid "Create..." msgstr "Erstellen..." -#: git-gui.sh:2871 +#: git-gui.sh:2582 msgid "Checkout..." -msgstr "Auschecken..." +msgstr "Umstellen..." -#: git-gui.sh:2877 +#: git-gui.sh:2588 msgid "Rename..." msgstr "Umbenennen..." -#: git-gui.sh:2882 +#: git-gui.sh:2593 msgid "Delete..." msgstr "Löschen..." -#: git-gui.sh:2887 +#: git-gui.sh:2598 msgid "Reset..." -msgstr "Änderungen verwerfen..." +msgstr "Zurücksetzen..." -#: git-gui.sh:2897 +#: git-gui.sh:2608 msgid "Done" msgstr "Fertig" -#: git-gui.sh:2899 +#: git-gui.sh:2610 msgid "Commit@@verb" -msgstr "Committen" +msgstr "Eintragen" -#: git-gui.sh:2908 git-gui.sh:3400 +#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "Neue Version" + +#: git-gui.sh:2627 git-gui.sh:3057 msgid "Amend Last Commit" -msgstr "Letzten Commit nachbessern" +msgstr "Letzte nachbessern" -#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 +#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "Neu laden" -#: git-gui.sh:2924 +#: git-gui.sh:2643 msgid "Stage To Commit" -msgstr "Für Commit bereitstellen" +msgstr "Zum Eintragen bereitstellen" -#: git-gui.sh:2930 +#: git-gui.sh:2649 msgid "Stage Changed Files To Commit" -msgstr "Geänderte Dateien für Commit bereitstellen" +msgstr "Geänderte Dateien bereitstellen" -#: git-gui.sh:2936 +#: git-gui.sh:2655 msgid "Unstage From Commit" -msgstr "Aus Commit-Bereitstellung herausnehmen" +msgstr "Aus der Bereitstellung herausnehmen" -#: git-gui.sh:2942 lib/index.tcl:521 +#: git-gui.sh:2661 lib/index.tcl:412 msgid "Revert Changes" msgstr "Änderungen verwerfen" -#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 +#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 msgid "Show Less Context" msgstr "Weniger Zeilen anzeigen" -#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 +#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 msgid "Show More Context" msgstr "Mehr Zeilen anzeigen" -#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 +#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 msgid "Sign Off" msgstr "Abzeichnen" -#: git-gui.sh:2977 +#: git-gui.sh:2696 msgid "Local Merge..." msgstr "Lokales Zusammenführen..." -#: git-gui.sh:2982 +#: git-gui.sh:2701 msgid "Abort Merge..." msgstr "Zusammenführen abbrechen..." -#: git-gui.sh:2994 git-gui.sh:3022 +#: git-gui.sh:2713 git-gui.sh:2741 msgid "Add..." -msgstr "Neues hinzufügen..." +msgstr "Hinzufügen..." -#: git-gui.sh:2998 +#: git-gui.sh:2717 msgid "Push..." msgstr "Versenden..." -#: git-gui.sh:3002 +#: git-gui.sh:2721 msgid "Delete Branch..." -msgstr "Branch löschen..." +msgstr "Zweig löschen..." -#: git-gui.sh:3012 git-gui.sh:3666 +#: git-gui.sh:2731 git-gui.sh:3292 msgid "Options..." msgstr "Optionen..." -#: git-gui.sh:3023 +#: git-gui.sh:2742 msgid "Remove..." msgstr "Entfernen..." -#: git-gui.sh:3032 lib/choose_repository.tcl:67 +#: git-gui.sh:2751 lib/choose_repository.tcl:50 msgid "Help" msgstr "Hilfe" -#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 -#: lib/choose_repository.tcl:70 lib/about.tcl:14 +#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 #, tcl-format msgid "About %s" msgstr "Über %s" -#: git-gui.sh:3064 +#: git-gui.sh:2783 msgid "Online Documentation" msgstr "Online-Dokumentation" -#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 +#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 msgid "Show SSH Key" msgstr "SSH-Schlüssel anzeigen" -#: git-gui.sh:3097 git-gui.sh:3229 -msgid "usage:" -msgstr "Verwendung:" - -#: git-gui.sh:3101 git-gui.sh:3233 -msgid "Usage" -msgstr "Verwendung" - -#: git-gui.sh:3182 lib/blame.tcl:575 -msgid "Error" -msgstr "Fehler" - -#: git-gui.sh:3213 +#: git-gui.sh:2893 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "" "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis " "nicht gefunden" -#: git-gui.sh:3246 +#: git-gui.sh:2926 msgid "Current Branch:" -msgstr "Aktueller Branch:" +msgstr "Aktueller Zweig:" -#: git-gui.sh:3271 +#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" +msgstr "Bereitstellung (zum Eintragen)" + +#: git-gui.sh:2967 msgid "Unstaged Changes" msgstr "Nicht bereitgestellte Änderungen" -#: git-gui.sh:3293 -msgid "Staged Changes (Will Commit)" -msgstr "Bereitstellung (zum Committen)" - -#: git-gui.sh:3367 +#: git-gui.sh:3017 msgid "Stage Changed" msgstr "Alles bereitstellen" -#: git-gui.sh:3386 lib/transport.tcl:137 +#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 msgid "Push" msgstr "Versenden" -#: git-gui.sh:3413 +#: git-gui.sh:3071 msgid "Initial Commit Message:" -msgstr "Erste Commit-Beschreibung:" +msgstr "Erste Versionsbeschreibung:" -#: git-gui.sh:3414 +#: git-gui.sh:3072 msgid "Amended Commit Message:" msgstr "Nachgebesserte Beschreibung:" -#: git-gui.sh:3415 +#: git-gui.sh:3073 msgid "Amended Initial Commit Message:" msgstr "Nachgebesserte erste Beschreibung:" -#: git-gui.sh:3416 +#: git-gui.sh:3074 msgid "Amended Merge Commit Message:" msgstr "Nachgebesserte Zusammenführungs-Beschreibung:" -#: git-gui.sh:3417 +#: git-gui.sh:3075 msgid "Merge Commit Message:" msgstr "Zusammenführungs-Beschreibung:" -#: git-gui.sh:3418 +#: git-gui.sh:3076 msgid "Commit Message:" -msgstr "Commit-Beschreibung:" +msgstr "Versionsbeschreibung:" -#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 +#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 msgid "Copy All" msgstr "Alle kopieren" -#: git-gui.sh:3501 lib/blame.tcl:106 +#: git-gui.sh:3149 lib/blame.tcl:104 msgid "File:" msgstr "Datei:" -#: git-gui.sh:3549 lib/choose_repository.tcl:1100 -msgid "Open" -msgstr "Öffnen" - -#: git-gui.sh:3629 +#: git-gui.sh:3255 msgid "Refresh" msgstr "Aktualisieren" -#: git-gui.sh:3650 +#: git-gui.sh:3276 msgid "Decrease Font Size" msgstr "Schriftgröße verkleinern" -#: git-gui.sh:3654 +#: git-gui.sh:3280 msgid "Increase Font Size" msgstr "Schriftgröße vergrößern" -#: git-gui.sh:3662 lib/blame.tcl:296 +#: git-gui.sh:3288 lib/blame.tcl:281 msgid "Encoding" msgstr "Zeichenkodierung" -#: git-gui.sh:3673 +#: git-gui.sh:3299 msgid "Apply/Reverse Hunk" -msgstr "Patch-Block anwenden/zurücknehmen" +msgstr "Kontext anwenden/umkehren" -#: git-gui.sh:3678 +#: git-gui.sh:3304 msgid "Apply/Reverse Line" -msgstr "Zeile anwenden/zurücknehmen" - -#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805 -msgid "Revert Hunk" -msgstr "Patch-Block zurücknehmen" - -#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812 -msgid "Revert Line" -msgstr "Zeilenänderungen zurücknehmen" - -#: git-gui.sh:3694 git-gui.sh:3791 -msgid "Undo Last Revert" -msgstr "Letztes Zurücknehmen rückgängig" +msgstr "Zeile anwenden/umkehren" -#: git-gui.sh:3713 +#: git-gui.sh:3323 msgid "Run Merge Tool" msgstr "Zusammenführungswerkzeug" -#: git-gui.sh:3718 +#: git-gui.sh:3328 msgid "Use Remote Version" msgstr "Externe Version benutzen" -#: git-gui.sh:3722 +#: git-gui.sh:3332 msgid "Use Local Version" msgstr "Lokale Version benutzen" -#: git-gui.sh:3726 +#: git-gui.sh:3336 msgid "Revert To Base" -msgstr "Zurücksetzen auf ursprünglichen Commit" +msgstr "Ursprüngliche Version benutzen" -#: git-gui.sh:3744 +#: git-gui.sh:3354 msgid "Visualize These Changes In The Submodule" -msgstr "Diese Änderungen im Submodul darstellen" +msgstr "Diese Änderungen im Untermodul darstellen" -#: git-gui.sh:3748 +#: git-gui.sh:3358 msgid "Visualize Current Branch History In The Submodule" -msgstr "Aktuellen Branch im Submodul darstellen" +msgstr "Aktuellen Zweig im Untermodul darstellen" -#: git-gui.sh:3752 +#: git-gui.sh:3362 msgid "Visualize All Branch History In The Submodule" -msgstr "Alle Branches im Submodul darstellen" +msgstr "Alle Zweige im Untermodul darstellen" -#: git-gui.sh:3757 +#: git-gui.sh:3367 msgid "Start git gui In The Submodule" -msgstr "Git gui im Submodul starten" +msgstr "Git gui im Untermodul starten" -#: git-gui.sh:3793 +#: git-gui.sh:3389 msgid "Unstage Hunk From Commit" -msgstr "Patch-Block aus Bereitstellung herausnehmen" +msgstr "Kontext aus Bereitstellung herausnehmen" -#: git-gui.sh:3797 +#: git-gui.sh:3391 msgid "Unstage Lines From Commit" msgstr "Zeilen aus der Bereitstellung herausnehmen" -#: git-gui.sh:3798 git-gui.sh:3809 -msgid "Revert Lines" -msgstr "Zeilenänderung zurücknehmen" - -#: git-gui.sh:3800 +#: git-gui.sh:3393 msgid "Unstage Line From Commit" msgstr "Zeile aus der Bereitstellung herausnehmen" -#: git-gui.sh:3804 +#: git-gui.sh:3396 msgid "Stage Hunk For Commit" -msgstr "Patch-Block zur Bereitstellung hinzufügen" +msgstr "Kontext zur Bereitstellung hinzufügen" -#: git-gui.sh:3808 +#: git-gui.sh:3398 msgid "Stage Lines For Commit" msgstr "Zeilen zur Bereitstellung hinzufügen" -#: git-gui.sh:3811 +#: git-gui.sh:3400 msgid "Stage Line For Commit" msgstr "Zeile zur Bereitstellung hinzufügen" -#: git-gui.sh:3861 +#: git-gui.sh:3424 msgid "Initializing..." msgstr "Initialisieren..." -#: git-gui.sh:4017 +#: git-gui.sh:3541 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -594,7 +548,7 @@ msgstr "" "von %s an Git weitergegeben werden:\n" "\n" -#: git-gui.sh:4046 +#: git-gui.sh:3570 msgid "" "\n" "This is due to a known issue with the\n" @@ -604,7 +558,7 @@ msgstr "" "Dies ist ein bekanntes Problem der Tcl-Version, die\n" "in Cygwin mitgeliefert wird." -#: git-gui.sh:4051 +#: git-gui.sh:3575 #, tcl-format msgid "" "\n" @@ -620,151 +574,315 @@ msgstr "" "gewünschten Werte für die Einstellung user.name und \n" "user.email in Ihre Datei ~/.gitconfig einfügen.\n" -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - eine grafische Oberfläche für Git." -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "Rechtschreibprüfung nicht verfügbar" +#: lib/blame.tcl:72 +msgid "File Viewer" +msgstr "Datei-Browser" -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" +#: lib/blame.tcl:78 +msgid "Commit:" +msgstr "Version:" -#: lib/spellcheck.tcl:70 +#: lib/blame.tcl:271 +msgid "Copy Commit" +msgstr "Version kopieren" + +#: lib/blame.tcl:275 +msgid "Find Text..." +msgstr "Text suchen..." + +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" +msgstr "Volle Kopie-Erkennung" + +#: lib/blame.tcl:288 +msgid "Show History Context" +msgstr "Historien-Kontext anzeigen" + +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" +msgstr "Elternversion annotieren" + +#: lib/blame.tcl:450 #, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Wörterbuch auf %s zurückgesetzt." +msgid "Reading %s..." +msgstr "%s lesen..." -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." +msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "Unbekanntes Rechtschreibprüfungsprogramm" +#: lib/blame.tcl:577 +msgid "lines annotated" +msgstr "Zeilen annotiert" -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "Keine Vorschläge" +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." +msgstr "Annotierungen für ursprünglichen Ort werden geladen..." -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" +#: lib/blame.tcl:772 +msgid "Annotation complete." +msgstr "Annotierung vollständig." -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "Rechtschreibprüfung fehlgeschlagen" +#: lib/blame.tcl:802 +msgid "Busy" +msgstr "Verarbeitung läuft" -#: lib/transport.tcl:6 lib/remote_add.tcl:132 -#, tcl-format -msgid "fetch %s" -msgstr "»%s« anfordern" +#: lib/blame.tcl:803 +msgid "Annotation process is already running." +msgstr "Annotierung läuft bereits." -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "Neue Änderungen von »%s« holen" +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." +msgstr "Intensive Kopie-Erkennung läuft..." -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "Gelöschte externe Branches aus »%s« entfernen" +#: lib/blame.tcl:910 +msgid "Loading annotation..." +msgstr "Annotierung laden..." -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Gelöschte externe Trackingbranches aus »%s« werden entfernt" +#: lib/blame.tcl:963 +msgid "Author:" +msgstr "Autor:" + +#: lib/blame.tcl:967 +msgid "Committer:" +msgstr "Eintragender:" -#: lib/transport.tcl:25 -msgid "fetch all remotes" -msgstr "Abrufen aller externen" +#: lib/blame.tcl:972 +msgid "Original File:" +msgstr "Ursprüngliche Datei:" -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" -msgstr "Neue Änderungen von allen externen anfordern" +#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" +msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:" -#: lib/transport.tcl:40 -msgid "remote prune all remotes" -msgstr "Extern veraltete Branches entfernen aller Repositories" +#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" +msgstr "Elternversion kann nicht gefunden werden:" -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" -msgstr "" -"Gelöschte externe Trackingbranches aus allen Repositories werden entfernt" +#: lib/blame.tcl:1090 +msgid "Unable to display parent" +msgstr "Elternversion kann nicht angezeigt werden" -#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 -#: lib/remote_add.tcl:162 -#, tcl-format -msgid "push %s" -msgstr "»%s« versenden..." +#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" +msgstr "Fehler beim Laden des Vergleichs:" -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "Änderungen nach »%s« versenden" +#: lib/blame.tcl:1231 +msgid "Originally By:" +msgstr "Ursprünglich von:" -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Spiegeln nach %s" +#: lib/blame.tcl:1237 +msgid "In File:" +msgstr "In Datei:" -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "%s %s nach %s versenden" +#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" +msgstr "Kopiert oder verschoben durch:" -#: lib/transport.tcl:132 -msgid "Push Branches" -msgstr "Branches versenden" +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" +msgstr "Auf Zweig umstellen" -#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 -#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 -#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 -#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 -#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 +#: lib/branch_checkout.tcl:23 +msgid "Checkout" +msgstr "Umstellen" + +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 +#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 +#: lib/transport.tcl:108 msgid "Cancel" msgstr "Abbrechen" -#: lib/transport.tcl:147 -msgid "Source Branches" -msgstr "Lokale Branches" +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" +msgstr "Version" -#: lib/transport.tcl:162 -msgid "Destination Repository" -msgstr "Ziel-Repository" +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" +msgstr "Optionen" -#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 -msgid "Remote:" -msgstr "Externes Repository:" +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "Übernahmezweig anfordern" -#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 -msgid "Arbitrary Location:" -msgstr "Beliebige Adresse:" +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" +msgstr "Verbindung zu lokalem Zweig lösen" -#: lib/transport.tcl:205 -msgid "Transfer Options" -msgstr "Netzwerk-Einstellungen" +#: lib/branch_create.tcl:22 +msgid "Create Branch" +msgstr "Zweig erstellen" -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" +#: lib/branch_create.tcl:27 +msgid "Create New Branch" +msgstr "Neuen Zweig erstellen" + +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" +msgstr "Erstellen" + +#: lib/branch_create.tcl:40 +msgid "Branch Name" +msgstr "Zweigname" + +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" +msgstr "Name:" + +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" +msgstr "Passend zu Übernahmezweig-Name" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "Anfangsversion" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "Existierenden Zweig aktualisieren:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "Nein" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Nur Schnellzusammenführung" + +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" +msgstr "Zurücksetzen" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "Arbeitskopie umstellen nach Erstellen" + +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." +msgstr "Bitte wählen Sie einen Übernahmezweig." + +#: lib/branch_create.tcl:140 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "Übernahmezweig »%s« ist kein Zweig im externen Projektarchiv." + +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." +msgstr "Bitte geben Sie einen Zweignamen an." + +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "»%s« ist kein zulässiger Zweigname." + +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" +msgstr "Zweig löschen" + +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" +msgstr "Lokalen Zweig löschen" + +#: lib/branch_delete.tcl:37 +msgid "Local Branches" +msgstr "Lokale Zweige" + +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" +msgstr "Nur löschen, wenn zusammengeführt nach" + +#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" +msgstr "Immer (Keine Zusammenführungsprüfung)" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:" + +#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" msgstr "" -"Überschreiben von existierenden Branches erzwingen (könnte Änderungen " -"löschen)" +"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand " +"möglich.\n" +"\n" +"Sollen die ausgewählten Zweige gelöscht werden?" -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" -msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "" +"Fehler beim Löschen der Zweige:\n" +"%s" -#: lib/transport.tcl:215 -msgid "Include tags" -msgstr "Mit Tags versenden" +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" +msgstr "Zweig umbenennen" -#: lib/transport.tcl:229 +#: lib/branch_rename.tcl:26 +msgid "Rename" +msgstr "Umbenennen" + +#: lib/branch_rename.tcl:36 +msgid "Branch:" +msgstr "Zweig:" + +#: lib/branch_rename.tcl:39 +msgid "New Name:" +msgstr "Neuer Name:" + +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." +msgstr "Bitte wählen Sie einen Zweig zum umbenennen." + +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 #, tcl-format -msgid "%s (%s): Push" -msgstr "%s (%s): Versenden" +msgid "Branch '%s' already exists." +msgstr "Zweig »%s« existiert bereits." + +#: lib/branch_rename.tcl:117 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "Fehler beim Umbenennen von »%s«." + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "Starten..." + +#: lib/browser.tcl:26 +msgid "File Browser" +msgstr "Datei-Browser" + +#: lib/browser.tcl:126 lib/browser.tcl:143 +#, tcl-format +msgid "Loading %s..." +msgstr "%s laden..." + +#: lib/browser.tcl:187 +msgid "[Up To Parent]" +msgstr "[Nach oben]" + +#: lib/browser.tcl:267 lib/browser.tcl:273 +msgid "Browse Branch Files" +msgstr "Dateien des Zweigs durchblättern" + +#: lib/browser.tcl:278 lib/choose_repository.tcl:398 +#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 +#: lib/choose_repository.tcl:1028 +msgid "Browse" +msgstr "Blättern" #: lib/checkout_op.tcl:85 #, tcl-format @@ -774,28 +892,23 @@ msgstr "Änderungen »%s« von »%s« anfordern" #: lib/checkout_op.tcl:133 #, tcl-format msgid "fatal: Cannot resolve %s" -msgstr "Fehler: »%s« kann nicht als Branch oder Version erkannt werden" +msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden" -#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 -#: lib/database.tcl:30 +#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 msgid "Close" msgstr "Schließen" #: lib/checkout_op.tcl:175 #, tcl-format msgid "Branch '%s' does not exist." -msgstr "Branch »%s« existiert nicht." +msgstr "Zweig »%s« existiert nicht." #: lib/checkout_op.tcl:194 #, tcl-format msgid "Failed to configure simplified git-pull for '%s'." msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«." -#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "Branch »%s« existiert bereits." - #: lib/checkout_op.tcl:229 #, tcl-format msgid "" @@ -804,10 +917,10 @@ msgid "" "It cannot fast-forward to %s.\n" "A merge is required." msgstr "" -"Branch »%s« existiert bereits.\n" +"Zweig »%s« existiert bereits.\n" "\n" -"Branch kann nicht auf »%s« vorgespult werden. Reguläres Zusammenführen ist " -"notwendig." +"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres " +"Zusammenführen ist notwendig." #: lib/checkout_op.tcl:243 #, tcl-format @@ -832,79 +945,76 @@ msgid "" "\n" "The rescan will be automatically started now.\n" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" "\n" -"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " -"geändert. Vor dem Wechseln des lokalen Branches muss neu geladen werden.\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n" "\n" "Es wird gleich neu geladen.\n" #: lib/checkout_op.tcl:345 #, tcl-format msgid "Updating working directory to '%s'..." -msgstr "Arbeitskopie aktualisieren auf »%s«..." +msgstr "Arbeitskopie umstellen auf »%s«..." #: lib/checkout_op.tcl:346 msgid "files checked out" msgstr "Dateien aktualisiert" -#: lib/checkout_op.tcl:377 +#: lib/checkout_op.tcl:376 #, tcl-format msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "" -"Branch »%s« Auschecken abgebrochen (Zusammenführen der Dateien ist " +"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist " "notwendig)." -#: lib/checkout_op.tcl:378 +#: lib/checkout_op.tcl:377 msgid "File level merge required." msgstr "Zusammenführen der Dateien ist notwendig." -#: lib/checkout_op.tcl:382 +#: lib/checkout_op.tcl:381 #, tcl-format msgid "Staying on branch '%s'." -msgstr "Es wird auf Branch »%s« verblieben." +msgstr "Es wird auf Zweig »%s« verblieben." -#: lib/checkout_op.tcl:453 +#: lib/checkout_op.tcl:452 msgid "" "You are no longer on a local branch.\n" "\n" "If you wanted to be on a branch, create one now starting from 'This Detached " "Checkout'." msgstr "" -"Die Arbeitskopie ist nicht auf einem lokalen Branch.\n" +"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n" "\n" -"Wenn Sie auf einem Branch arbeiten möchten, erstellen Sie bitte jetzt einen " -"Branch mit der Auswahl »Losgelöste Arbeitskopie-Version«." +"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen " +"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«." -#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 +#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 #, tcl-format msgid "Checked out '%s'." msgstr "Umgestellt auf »%s«." -#: lib/checkout_op.tcl:536 +#: lib/checkout_op.tcl:535 #, tcl-format msgid "Resetting '%s' to '%s' will lose the following commits:" -msgstr "Umsetzen von »%s« nach »%s« wird folgende Commits verlieren:" +msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:" -#: lib/checkout_op.tcl:558 +#: lib/checkout_op.tcl:557 msgid "Recovering lost commits may not be easy." msgstr "" -"Verlorene Commits können nur mit größerem Aufwand wiederhergestellt werden." +"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt " +"werden." -#: lib/checkout_op.tcl:563 +#: lib/checkout_op.tcl:562 #, tcl-format msgid "Reset '%s'?" -msgstr "»%s« umsetzen?" +msgstr "»%s« zurücksetzen?" -#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 +#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 msgid "Visualize" msgstr "Darstellen" -#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 -msgid "Reset" -msgstr "Umsetzen (Reset)" - -#: lib/checkout_op.tcl:636 +#: lib/checkout_op.tcl:635 #, tcl-format msgid "" "Failed to set current branch.\n" @@ -914,7 +1024,7 @@ msgid "" "\n" "This should not have occurred. %s will now close and give up." msgstr "" -"Lokaler Branch kann nicht gesetzt werden.\n" +"Lokaler Zweig kann nicht gesetzt werden.\n" "\n" "Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt " "aktualisiert, aber einige interne Git-Dateien konnten nicht geändert " @@ -922,345 +1032,23 @@ msgstr "" "\n" "Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen." -#: lib/remote_add.tcl:20 -#, tcl-format -msgid "%s (%s): Add Remote" -msgstr "%s (%s): Externes Repository hinzufügen" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "Neues externes Repository hinzufügen" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "Hinzufügen" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "Einzelheiten des externen Repository" - -#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 -msgid "Name:" -msgstr "Name:" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "Adresse:" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "Weitere Aktion" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "Jetzt anfordern" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" -msgstr "Externes Repository initialisieren und dahin versenden" - -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" -msgstr "Keine weitere Aktion" - -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." -msgstr "Bitte geben Sie einen Namen des externen Repository an." - -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "»%s« ist kein zulässiger Name eines externen Repository." - -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "Fehler beim Hinzufügen des externen Repository »%s« aus Adresse »%s«." - -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" -msgstr "»%s« anfordern" - -#: lib/remote_add.tcl:156 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "" -"Initialisieren eines externen Repositories an Adresse »%s« ist nicht möglich." - -#: lib/remote_add.tcl:163 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "Einrichten von »%s« an »%s«" - -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "Starten..." - -#: lib/browser.tcl:27 -#, tcl-format -msgid "%s (%s): File Browser" -msgstr "%s (%s): Datei-Browser" - -#: lib/browser.tcl:132 lib/browser.tcl:149 -#, tcl-format -msgid "Loading %s..." -msgstr "%s laden..." - -#: lib/browser.tcl:193 -msgid "[Up To Parent]" -msgstr "[Nach oben]" - -#: lib/browser.tcl:275 -#, tcl-format -msgid "%s (%s): Browse Branch Files" -msgstr "%s (%s): Dateien des Branches durchblättern" - -#: lib/browser.tcl:282 -msgid "Browse Branch Files" -msgstr "Dateien des Branches durchblättern" - -#: lib/browser.tcl:288 lib/choose_repository.tcl:437 -#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 -#: lib/choose_repository.tcl:1115 -msgid "Browse" -msgstr "Blättern" - -#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "Version" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "Bereitstellung kann nicht wieder freigegeben werden." - -#: lib/index.tcl:30 -msgid "Index Error" -msgstr "Fehler in Bereitstellung" - -#: lib/index.tcl:32 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" -"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine " -"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu " -"synchronisieren." - -#: lib/index.tcl:43 -msgid "Continue" -msgstr "Fortsetzen" - -#: lib/index.tcl:46 -msgid "Unlock Index" -msgstr "Bereitstellung freigeben" - -#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 -#: lib/choose_repository.tcl:999 -msgid "files" -msgstr "Dateien" - -#: lib/index.tcl:326 -msgid "Unstaging selected files from commit" -msgstr "Gewählte Dateien aus der Bereitstellung herausnehmen" - -#: lib/index.tcl:330 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Datei »%s« aus der Bereitstellung herausnehmen" - -#: lib/index.tcl:369 -msgid "Ready to commit." -msgstr "Bereit zum Committen." - -#: lib/index.tcl:378 -msgid "Adding selected files" -msgstr "Gewählte Dateien hinzufügen" - -#: lib/index.tcl:382 -#, tcl-format -msgid "Adding %s" -msgstr "»%s« hinzufügen" - -#: lib/index.tcl:412 -#, tcl-format -msgid "Stage %d untracked files?" -msgstr "%d unversionierte Dateien bereitstellen?" - -#: lib/index.tcl:420 -msgid "Adding all changed files" -msgstr "Alle geänderten Dateien hinzufügen" - -#: lib/index.tcl:503 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "Änderungen in Datei »%s« verwerfen?" - -#: lib/index.tcl:508 -#, tcl-format -msgid "Revert changes in these %i files?" -msgstr "Änderungen in diesen %i Dateien verwerfen?" - -#: lib/index.tcl:517 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "" -"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." - -#: lib/index.tcl:520 lib/index.tcl:563 -msgid "Do Nothing" -msgstr "Nichts tun" - -#: lib/index.tcl:545 -#, tcl-format -msgid "Delete untracked file %s?" -msgstr "Unversionierte Datei »%s« löschen?" - -#: lib/index.tcl:550 -#, tcl-format -msgid "Delete these %i untracked files?" -msgstr "Diese %i unversionierten Dateien löschen?" - -#: lib/index.tcl:560 -msgid "Files will be permanently deleted." -msgstr "Dateien werden endgültig gelöscht." - -#: lib/index.tcl:564 -msgid "Delete Files" -msgstr "Dateien löschen" - -#: lib/index.tcl:586 -msgid "Deleting" -msgstr "Löschen" - -#: lib/index.tcl:665 -msgid "Encountered errors deleting files:\n" -msgstr "Fehler beim Löschen der Dateien:\n" - -#: lib/index.tcl:674 -#, tcl-format -msgid "None of the %d selected files could be deleted." -msgstr "Keine der %d gewählten Dateien konnten gelöscht werden." - -#: lib/index.tcl:679 -#, tcl-format -msgid "%d of the %d selected files could not be deleted." -msgstr "%d der %d gewählten Dateien konnten nicht gelöscht werden." - -#: lib/index.tcl:726 -msgid "Reverting selected files" -msgstr "Änderungen in gewählten Dateien verwerfen" - -#: lib/index.tcl:730 -#, tcl-format -msgid "Reverting %s" -msgstr "Änderungen in %s verwerfen" - -#: lib/branch_checkout.tcl:16 -#, tcl-format -msgid "%s (%s): Checkout Branch" -msgstr "%s (%s): Branch auschecken" - -#: lib/branch_checkout.tcl:21 -msgid "Checkout Branch" -msgstr "Branch auschecken" - -#: lib/branch_checkout.tcl:26 -msgid "Checkout" -msgstr "Auschecken" - -#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 -msgid "Options" -msgstr "Optionen" - -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "Trackingbranch anfordern" - -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" -msgstr "Verbindung zu lokalem Branch lösen" - -#: lib/status_bar.tcl:263 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s ... %*i von %*i %s (%3i%%)" - -#: lib/remote.tcl:200 -msgid "Push to" -msgstr "Versenden nach" - -#: lib/remote.tcl:218 -msgid "Remove Remote" -msgstr "Externes Repository entfernen" - -#: lib/remote.tcl:223 -msgid "Prune from" -msgstr "Veraltete Branches entfernen" - -#: lib/remote.tcl:228 -msgid "Fetch from" -msgstr "Anfordern" - -#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 -msgid "All" -msgstr "Alle" - -#: lib/branch_rename.tcl:15 -#, tcl-format -msgid "%s (%s): Rename Branch" -msgstr "%s (%s): Branch umbenennen" - -#: lib/branch_rename.tcl:23 -msgid "Rename Branch" -msgstr "Branch umbenennen" - -#: lib/branch_rename.tcl:28 -msgid "Rename" -msgstr "Umbenennen" - -#: lib/branch_rename.tcl:38 -msgid "Branch:" -msgstr "Branch:" - -#: lib/branch_rename.tcl:46 -msgid "New Name:" -msgstr "Neuer Name:" - -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." -msgstr "Bitte wählen Sie einen Branch zum umbenennen." - -#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 -msgid "Please supply a branch name." -msgstr "Bitte geben Sie einen Branchnamen an." - -#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 -#, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "»%s« ist kein zulässiger Branchname." - -#: lib/branch_rename.tcl:123 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "Fehler beim Umbenennen von »%s«." - -#: lib/choose_font.tcl:41 +#: lib/choose_font.tcl:39 msgid "Select" msgstr "Auswählen" -#: lib/choose_font.tcl:55 +#: lib/choose_font.tcl:53 msgid "Font Family" msgstr "Schriftfamilie" -#: lib/choose_font.tcl:76 +#: lib/choose_font.tcl:74 msgid "Font Size" msgstr "Schriftgröße" -#: lib/choose_font.tcl:93 +#: lib/choose_font.tcl:91 msgid "Font Example" msgstr "Schriftbeispiel" -#: lib/choose_font.tcl:105 +#: lib/choose_font.tcl:103 msgid "" "This is example text.\n" "If you like this text, it can be your font." @@ -1268,1137 +1056,277 @@ msgstr "" "Dies ist ein Beispieltext.\n" "Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen." -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "Ungültige globale Zeichenkodierung »%s«" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "Ungültige Repository-Zeichenkodierung »%s«" - -#: lib/option.tcl:119 -msgid "Restore Defaults" -msgstr "Voreinstellungen wiederherstellen" - -#: lib/option.tcl:123 -msgid "Save" -msgstr "Speichern" - -#: lib/option.tcl:133 -#, tcl-format -msgid "%s Repository" -msgstr "%s Repository" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "Global (Alle Repositories)" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "Benutzername" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "E-Mail-Adresse" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" -msgstr "Zusammenführungs-Commits zusammenfassen" - -#: lib/option.tcl:144 -msgid "Merge Verbosity" -msgstr "Ausführlichkeit der Zusammenführen-Meldungen" - -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" -msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" - -#: lib/option.tcl:146 -msgid "Use Merge Tool" -msgstr "Zusammenführungswerkzeug" - -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" -msgstr "Auf Dateiänderungsdatum verlassen" - -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" -msgstr "Veraltete Trackingbranches entfernen während Anforderung" - -#: lib/option.tcl:150 -msgid "Match Tracking Branches" -msgstr "Neue Branches automatisch als Trackingbranch" - -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" -msgstr "Benutze »textconv« für Vergleich und Annotieren" - -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" -msgstr "Kopie-Annotieren nur bei geänderten Dateien" - -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" -msgstr "Anzahl Einträge in »Letzte Repositories«" - -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" -msgstr "Mindestzahl Zeichen für Kopie-Annotieren" - -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" -msgstr "Anzahl Tage für Annotieren-Historien-Kontext" - -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" -msgstr "Anzahl der Kontextzeilen beim Vergleich" - -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" -msgstr "Zusätzliche Vergleich-/diff-Parameter" - -#: lib/option.tcl:158 -msgid "Commit Message Text Width" -msgstr "Textbreite der Commit-Beschreibung" - -#: lib/option.tcl:159 -msgid "New Branch Name Template" -msgstr "Namensvorlage für neue Branches" - -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" -msgstr "Voreingestellte Zeichenkodierung" - -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" -msgstr "Warnen vor Committen auf losgelöste Branchspitze" - -#: lib/option.tcl:162 -msgid "Staging of untracked files" -msgstr "Unversionierte Dateien bereitstellen" - -#: lib/option.tcl:163 -msgid "Show untracked files" -msgstr "Unversionierte Dateien anzeigen" - -#: lib/option.tcl:164 -msgid "Tab spacing" -msgstr "Tabulator-Breite" - -#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 -#: lib/database.tcl:57 -#, tcl-format -msgid "%s:" -msgstr "%s:" - -#: lib/option.tcl:210 -msgid "Change" -msgstr "Ändern" - -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" -msgstr "Wörterbuch Rechtschreibprüfung:" - -#: lib/option.tcl:284 -msgid "Change Font" -msgstr "Schriftart ändern" - -#: lib/option.tcl:288 -#, tcl-format -msgid "Choose %s" -msgstr "%s wählen" - -#: lib/option.tcl:294 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:308 -msgid "Preferences" -msgstr "Einstellungen" - -#: lib/option.tcl:345 -msgid "Failed to completely save options:" -msgstr "Optionen konnten nicht gespeichert werden:" - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "Voreinstellung" - -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" -msgstr "Systemweit (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "Andere" - -#: lib/tools.tcl:76 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein." - -#: lib/tools.tcl:92 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" -msgstr "Wollen Sie %1$s wirklich auf Datei »%2$s« starten?" - -#: lib/tools.tcl:96 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "Wollen Sie %s wirklich starten?" - -#: lib/tools.tcl:118 -#, tcl-format -msgid "Tool: %s" -msgstr "Werkzeug: %s" - -#: lib/tools.tcl:119 -#, tcl-format -msgid "Running: %s" -msgstr "Starten: %s" - -#: lib/tools.tcl:158 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "Werkzeug erfolgreich abgeschlossen: %s" - -#: lib/tools.tcl:160 -#, tcl-format -msgid "Tool failed: %s" -msgstr "Werkzeug fehlgeschlagen: %s" - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "Konflikt durch Basisversion ersetzen?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "Konflikt durch diesen Branch ersetzen?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "Konflikt durch anderen Branch ersetzen?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "" -"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n" -"\n" -"»%s« wird überschrieben.\n" -"\n" -"Diese Operation kann nur rückgängig gemacht werden, wenn die\n" -"Zusammenführung erneut gestartet wird." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "Auflösung hinzugefügt für %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "" -"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch " -"das Zusamenführungswerkzeug gelöst werden." - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "Konflikt-Datei existiert nicht" - -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Kein GUI Zusammenführungswerkzeug: »%s«" - -#: lib/mergetool.tcl:275 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" -msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?" - -#: lib/mergetool.tcl:330 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "" -"Fehler beim Abrufen der Dateiversionen:\n" -"%s" - -#: lib/mergetool.tcl:350 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "" -"Zusammenführungswerkzeug konnte nicht gestartet werden:\n" -"\n" -"%s" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "Zusammenführungswerkzeug starten..." - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." -msgstr "Zusammenführungswerkzeug fehlgeschlagen." - -#: lib/tools_dlg.tcl:22 -#, tcl-format -msgid "%s (%s): Add Tool" -msgstr "%s (%s): Werkzeug hinzufügen" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "Neues Kommando für Werkzeug hinzufügen" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" -msgstr "Global hinzufügen" - -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" -msgstr "Einzelheiten des Werkzeugs" - -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" -msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:" - -#: lib/tools_dlg.tcl:60 -msgid "Command:" -msgstr "Kommando:" - -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" -msgstr "Bestätigungsfrage vor Starten anzeigen" - -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "Benutzer nach Version fragen (setzt $REVISION)" - -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)" - -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" -msgstr "Kein Ausgabefenster zeigen" - -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)" - -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." -msgstr "Bitte geben Sie einen Werkzeugnamen an." - -#: lib/tools_dlg.tcl:126 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "Werkzeug »%s« existiert bereits." - -#: lib/tools_dlg.tcl:148 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "" -"Werkzeug konnte nicht hinzugefügt werden:\n" -"\n" -"%s" - -#: lib/tools_dlg.tcl:187 -#, tcl-format -msgid "%s (%s): Remove Tool" -msgstr "%s (%s): Werkzeug entfernen" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" -msgstr "Werkzeugkommandos entfernen" - -#: lib/tools_dlg.tcl:198 -msgid "Remove" -msgstr "Entfernen" - -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" -msgstr "(Werkzeuge für lokales Repository werden in Blau angezeigt)" - -#: lib/tools_dlg.tcl:283 -#, tcl-format -msgid "%s (%s):" -msgstr "%s (%s):" - -#: lib/tools_dlg.tcl:292 -#, tcl-format -msgid "Run Command: %s" -msgstr "Kommando aufrufen: %s" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "Argumente" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "Ok" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "Suchen:" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "Nächster" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "Voriger" - -#: lib/search.tcl:52 -msgid "RegExp" -msgstr "RegAusdruck" - -#: lib/search.tcl:54 -msgid "Case" -msgstr "Groß/klein" - -#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 -#, tcl-format -msgid "%s (%s): Create Desktop Icon" -msgstr "%s (%s): Desktop-Icon erstellen" - -#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 -msgid "Cannot write shortcut:" -msgstr "Fehler beim Schreiben der Verknüpfung:" - -#: lib/shortcut.tcl:140 -msgid "Cannot write icon:" -msgstr "Fehler beim Erstellen des Icons:" - -#: lib/remote_branch_delete.tcl:29 -#, tcl-format -msgid "%s (%s): Delete Branch Remotely" -msgstr "%s (%s): Branch in externem Repository löschen" - -#: lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Branch in externem Repository löschen" - -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" -msgstr "In Repository" - -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" -msgstr "Branches" - -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" -msgstr "Nur löschen, wenn" - -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" -msgstr "Zusammengeführt mit:" - -#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 -msgid "Always (Do not perform merge checks)" -msgstr "Immer (Keine Zusammenführungsprüfung)" - -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." -msgstr "Für »Zusammenführen mit« muss ein Branch angegeben werden." - -#: lib/remote_branch_delete.tcl:185 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "" -"Folgende Branches sind noch nicht mit »%s« zusammengeführt:\n" -"\n" -" - %s" - -#: lib/remote_branch_delete.tcl:190 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" -"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die " -"notwendigen Commits vorher angefordert haben. Sie sollten versuchen, zuerst " -"von »%s« anzufordern." - -#: lib/remote_branch_delete.tcl:208 -msgid "Please select one or more branches to delete." -msgstr "Bitte wählen Sie mindestens einen Branch, der gelöscht werden soll." - -#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "" -"Das Wiederherstellen von gelöschten Branches ist nur mit größerem Aufwand " -"möglich.\n" -"\n" -"Sollen die ausgewählten Branches gelöscht werden?" - -#: lib/remote_branch_delete.tcl:227 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Branches auf »%s« werden gelöscht" - -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." -msgstr "Kein Repository ausgewählt." - -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." -msgstr "»%s« laden..." - -#: lib/choose_repository.tcl:45 +#: lib/choose_repository.tcl:28 msgid "Git Gui" msgstr "Git Gui" -#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 +#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 msgid "Create New Repository" -msgstr "Repository neu erstellen" +msgstr "Neues Projektarchiv" -#: lib/choose_repository.tcl:110 +#: lib/choose_repository.tcl:93 msgid "New..." msgstr "Neu..." -#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 +#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 msgid "Clone Existing Repository" -msgstr "Repository klonen" +msgstr "Projektarchiv klonen" -#: lib/choose_repository.tcl:128 +#: lib/choose_repository.tcl:106 msgid "Clone..." msgstr "Klonen..." -#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 +#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 msgid "Open Existing Repository" -msgstr "Repository öffnen" +msgstr "Projektarchiv öffnen" -#: lib/choose_repository.tcl:141 +#: lib/choose_repository.tcl:119 msgid "Open..." msgstr "Öffnen..." -#: lib/choose_repository.tcl:154 +#: lib/choose_repository.tcl:132 msgid "Recent Repositories" -msgstr "Letzte Repositories" +msgstr "Zuletzt benutzte Projektarchive" -#: lib/choose_repository.tcl:164 +#: lib/choose_repository.tcl:138 msgid "Open Recent Repository:" -msgstr "Zuletzt benutztes Repository öffnen:" +msgstr "Zuletzt benutztes Projektarchiv öffnen:" -#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 -#: lib/choose_repository.tcl:345 +#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 +#: lib/choose_repository.tcl:320 #, tcl-format msgid "Failed to create repository %s:" -msgstr "Repository »%s« konnte nicht erstellt werden:" +msgstr "Projektarchiv »%s« konnte nicht erstellt werden:" -#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 -msgid "Create" -msgstr "Erstellen" - -#: lib/choose_repository.tcl:432 +#: lib/choose_repository.tcl:391 msgid "Directory:" msgstr "Verzeichnis:" -#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 -#: lib/choose_repository.tcl:1139 +#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 +#: lib/choose_repository.tcl:1052 msgid "Git Repository" -msgstr "Git Repository" +msgstr "Git Projektarchiv" -#: lib/choose_repository.tcl:487 +#: lib/choose_repository.tcl:448 #, tcl-format msgid "Directory %s already exists." msgstr "Verzeichnis »%s« existiert bereits." -#: lib/choose_repository.tcl:491 +#: lib/choose_repository.tcl:452 #, tcl-format msgid "File %s already exists." msgstr "Datei »%s« existiert bereits." -#: lib/choose_repository.tcl:506 +#: lib/choose_repository.tcl:466 msgid "Clone" msgstr "Klonen" -#: lib/choose_repository.tcl:519 +#: lib/choose_repository.tcl:479 msgid "Source Location:" -msgstr "Herkunfts-Adresse:" +msgstr "Herkunft:" -#: lib/choose_repository.tcl:528 +#: lib/choose_repository.tcl:490 msgid "Target Directory:" msgstr "Zielverzeichnis:" -#: lib/choose_repository.tcl:538 +#: lib/choose_repository.tcl:502 msgid "Clone Type:" msgstr "Art des Klonens:" -#: lib/choose_repository.tcl:543 +#: lib/choose_repository.tcl:508 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "Standard (schnell, teilweise redundant, Hardlinks)" -#: lib/choose_repository.tcl:548 +#: lib/choose_repository.tcl:514 msgid "Full Copy (Slower, Redundant Backup)" msgstr "Alles kopieren (langsamer, volle Redundanz)" -#: lib/choose_repository.tcl:553 +#: lib/choose_repository.tcl:520 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)" -#: lib/choose_repository.tcl:560 -msgid "Recursively clone submodules too" -msgstr "Rekursiv weitere Submodule klonen" - -#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 -#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 -#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 +#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 +#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 +#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 #, tcl-format msgid "Not a Git repository: %s" -msgstr "Kein Git-Repository: %s" +msgstr "Kein Git-Projektarchiv in »%s« gefunden." -#: lib/choose_repository.tcl:630 +#: lib/choose_repository.tcl:592 msgid "Standard only available for local repository." -msgstr "Standard ist nur für lokale Repositories verfügbar." +msgstr "Standard ist nur für lokale Projektarchive verfügbar." -#: lib/choose_repository.tcl:634 +#: lib/choose_repository.tcl:596 msgid "Shared only available for local repository." -msgstr "Verknüpft ist nur für lokale Repositories verfügbar." +msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar." -#: lib/choose_repository.tcl:655 +#: lib/choose_repository.tcl:617 #, tcl-format msgid "Location %s already exists." -msgstr "Adresse »%s« existiert bereits." +msgstr "Projektarchiv »%s« existiert bereits." -#: lib/choose_repository.tcl:666 +#: lib/choose_repository.tcl:628 msgid "Failed to configure origin" msgstr "Der Ursprungsort konnte nicht eingerichtet werden" -#: lib/choose_repository.tcl:678 +#: lib/choose_repository.tcl:640 msgid "Counting objects" msgstr "Objekte werden gezählt" -#: lib/choose_repository.tcl:679 +#: lib/choose_repository.tcl:641 msgid "buckets" msgstr "Buckets" -#: lib/choose_repository.tcl:703 +#: lib/choose_repository.tcl:665 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s" -#: lib/choose_repository.tcl:740 +#: lib/choose_repository.tcl:701 #, tcl-format msgid "Nothing to clone from %s." msgstr "Von »%s« konnte nichts geklont werden." -#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 -#: lib/choose_repository.tcl:974 +#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 +#: lib/choose_repository.tcl:929 msgid "The 'master' branch has not been initialized." -msgstr "Der »master«-Branch wurde noch nicht initialisiert." +msgstr "Der »master«-Zweig wurde noch nicht initialisiert." -#: lib/choose_repository.tcl:755 +#: lib/choose_repository.tcl:716 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert." -#: lib/choose_repository.tcl:769 +#: lib/choose_repository.tcl:728 #, tcl-format msgid "Cloning from %s" msgstr "Kopieren von »%s«" -#: lib/choose_repository.tcl:800 +#: lib/choose_repository.tcl:759 msgid "Copying objects" msgstr "Objektdatenbank kopieren" -#: lib/choose_repository.tcl:801 +#: lib/choose_repository.tcl:760 msgid "KiB" msgstr "KB" -#: lib/choose_repository.tcl:825 +#: lib/choose_repository.tcl:784 #, tcl-format msgid "Unable to copy object: %s" msgstr "Objekt kann nicht kopiert werden: %s" -#: lib/choose_repository.tcl:837 +#: lib/choose_repository.tcl:794 msgid "Linking objects" msgstr "Objekte verlinken" -#: lib/choose_repository.tcl:838 +#: lib/choose_repository.tcl:795 msgid "objects" msgstr "Objekte" -#: lib/choose_repository.tcl:846 +#: lib/choose_repository.tcl:803 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s" -#: lib/choose_repository.tcl:903 +#: lib/choose_repository.tcl:858 msgid "Cannot fetch branches and objects. See console output for details." msgstr "" -"Branches und Objekte konnten nicht angefordert werden. Kontrollieren Sie " -"die Ausgaben auf der Konsole für weitere Angaben." +"Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die " +"Ausgaben auf der Konsole für weitere Angaben." -#: lib/choose_repository.tcl:914 +#: lib/choose_repository.tcl:869 msgid "Cannot fetch tags. See console output for details." msgstr "" -"Tags konnten nicht angefordert werden. Kontrollieren Sie die Ausgaben auf " -"der Konsole für weitere Angaben." +"Markierungen konnten nicht angefordert werden. Kontrollieren Sie die " +"Ausgaben auf der Konsole für weitere Angaben." -#: lib/choose_repository.tcl:938 +#: lib/choose_repository.tcl:893 msgid "Cannot determine HEAD. See console output for details." msgstr "" -"Die Branchspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " +"Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die " "Ausgaben auf der Konsole für weitere Angaben." -#: lib/choose_repository.tcl:947 +#: lib/choose_repository.tcl:902 #, tcl-format msgid "Unable to cleanup %s" msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden." -#: lib/choose_repository.tcl:953 +#: lib/choose_repository.tcl:908 msgid "Clone failed." msgstr "Klonen fehlgeschlagen." -#: lib/choose_repository.tcl:960 +#: lib/choose_repository.tcl:915 msgid "No default branch obtained." -msgstr "Kein voreingestellter Branch gefunden." +msgstr "Kein voreingestellter Zweig gefunden." -#: lib/choose_repository.tcl:971 +#: lib/choose_repository.tcl:926 #, tcl-format msgid "Cannot resolve %s as a commit." -msgstr "»%s« wurde nicht als Commit gefunden." +msgstr "»%s« wurde nicht als Version gefunden." -#: lib/choose_repository.tcl:998 +#: lib/choose_repository.tcl:938 msgid "Creating working directory" msgstr "Arbeitskopie erstellen" -#: lib/choose_repository.tcl:1028 +#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 +#: lib/index.tcl:198 +msgid "files" +msgstr "Dateien" + +#: lib/choose_repository.tcl:968 msgid "Initial file checkout failed." msgstr "Erstellen der Arbeitskopie fehlgeschlagen." -#: lib/choose_repository.tcl:1072 -msgid "Cloning submodules" -msgstr "Klone Submodul" - -#: lib/choose_repository.tcl:1087 -msgid "Cannot clone submodules." -msgstr "Submodul konnte nicht geklont werden." +#: lib/choose_repository.tcl:1011 +msgid "Open" +msgstr "Öffnen" -#: lib/choose_repository.tcl:1110 +#: lib/choose_repository.tcl:1021 msgid "Repository:" -msgstr "Repository:" +msgstr "Projektarchiv:" -#: lib/choose_repository.tcl:1159 +#: lib/choose_repository.tcl:1072 #, tcl-format msgid "Failed to open repository %s:" -msgstr "Repository »%s« konnte nicht geöffnet werden." - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - eine grafische Oberfläche für Git." - -#: lib/blame.tcl:74 -#, tcl-format -msgid "%s (%s): File Viewer" -msgstr "%s (%s): Datei-Browser" - -#: lib/blame.tcl:80 -msgid "Commit:" -msgstr "Commit:" - -#: lib/blame.tcl:282 -msgid "Copy Commit" -msgstr "Commit kopieren" - -#: lib/blame.tcl:286 -msgid "Find Text..." -msgstr "Text suchen..." - -#: lib/blame.tcl:290 -msgid "Goto Line..." -msgstr "Gehe zu Zeile..." - -#: lib/blame.tcl:299 -msgid "Do Full Copy Detection" -msgstr "Volle Kopie-Erkennung" - -#: lib/blame.tcl:303 -msgid "Show History Context" -msgstr "Historien-Kontext anzeigen" - -#: lib/blame.tcl:306 -msgid "Blame Parent Commit" -msgstr "Elterncommit annotieren" - -#: lib/blame.tcl:468 -#, tcl-format -msgid "Reading %s..." -msgstr "%s lesen..." - -#: lib/blame.tcl:596 -msgid "Loading copy/move tracking annotations..." -msgstr "Annotierungen für Kopieren/Verschieben werden geladen..." - -#: lib/blame.tcl:613 -msgid "lines annotated" -msgstr "Zeilen annotiert" - -#: lib/blame.tcl:815 -msgid "Loading original location annotations..." -msgstr "Annotierungen für ursprünglichen Ort werden geladen..." - -#: lib/blame.tcl:818 -msgid "Annotation complete." -msgstr "Annotierung vollständig." - -#: lib/blame.tcl:849 -msgid "Busy" -msgstr "Verarbeitung läuft" - -#: lib/blame.tcl:850 -msgid "Annotation process is already running." -msgstr "Annotierung läuft bereits." - -#: lib/blame.tcl:889 -msgid "Running thorough copy detection..." -msgstr "Intensive Kopie-Erkennung läuft..." - -#: lib/blame.tcl:957 -msgid "Loading annotation..." -msgstr "Annotierung laden..." - -#: lib/blame.tcl:1010 -msgid "Author:" -msgstr "Autor:" - -#: lib/blame.tcl:1014 -msgid "Committer:" -msgstr "Committer:" - -#: lib/blame.tcl:1019 -msgid "Original File:" -msgstr "Ursprüngliche Datei:" - -#: lib/blame.tcl:1067 -msgid "Cannot find HEAD commit:" -msgstr "Branchspitze (»HEAD commit«) kann nicht gefunden werden:" - -#: lib/blame.tcl:1122 -msgid "Cannot find parent commit:" -msgstr "Elterncommit kann nicht gefunden werden:" - -#: lib/blame.tcl:1137 -msgid "Unable to display parent" -msgstr "Elterncommit kann nicht angezeigt werden" - -#: lib/blame.tcl:1138 lib/diff.tcl:345 -msgid "Error loading diff:" -msgstr "Fehler beim Laden des Vergleichs:" - -#: lib/blame.tcl:1279 -msgid "Originally By:" -msgstr "Ursprünglich von:" - -#: lib/blame.tcl:1285 -msgid "In File:" -msgstr "In Datei:" - -#: lib/blame.tcl:1290 -msgid "Copied Or Moved Here By:" -msgstr "Kopiert oder verschoben durch:" - -#: lib/diff.tcl:77 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." -msgstr "" -"Keine Änderungen feststellbar.\n" -"\n" -"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei " -"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist " -"unverändert.\n" -"\n" -"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen " -"Dateien zu prüfen." - -#: lib/diff.tcl:117 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "Vergleich von »%s« laden..." - -#: lib/diff.tcl:143 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "" -"LOKAL: gelöscht\n" -"EXTERN:\n" - -#: lib/diff.tcl:148 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "" -"EXTERN: gelöscht\n" -"LOKAL:\n" - -#: lib/diff.tcl:155 -msgid "LOCAL:\n" -msgstr "LOKAL:\n" - -#: lib/diff.tcl:158 -msgid "REMOTE:\n" -msgstr "EXTERN:\n" - -#: lib/diff.tcl:220 lib/diff.tcl:344 -#, tcl-format -msgid "Unable to display %s" -msgstr "Datei »%s« kann nicht angezeigt werden" - -#: lib/diff.tcl:221 -msgid "Error loading file:" -msgstr "Fehler beim Laden der Datei:" - -#: lib/diff.tcl:227 -msgid "Git Repository (subproject)" -msgstr "Git-Repository (Subprojekt)" - -#: lib/diff.tcl:239 -msgid "* Binary file (not showing content)." -msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" - -#: lib/diff.tcl:244 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "" -"* Unversionierte Datei hat %d Bytes.\n" -"* Nur erste %d Bytes werden angezeigt.\n" - -#: lib/diff.tcl:250 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "" -"\n" -"* Unversionierte Datei, hier abgeschnitten durch %s.\n" -"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n" - -#: lib/diff.tcl:583 -msgid "Failed to unstage selected hunk." -msgstr "" -"Fehler beim Herausnehmen des gewählten Patch-Blocks aus der Bereitstellung." - -#: lib/diff.tcl:591 -msgid "Failed to revert selected hunk." -msgstr "Fehler beim Zurücknehmen des gewählten Patch-Blocks." - -#: lib/diff.tcl:594 -msgid "Failed to stage selected hunk." -msgstr "Fehler beim Bereitstellen des gewählten Patch-Blocks." - -#: lib/diff.tcl:687 -msgid "Failed to unstage selected line." -msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung." - -#: lib/diff.tcl:696 -msgid "Failed to revert selected line." -msgstr "Fehler beim Zurücknehmen der gewählten Zeile." - -#: lib/diff.tcl:700 -msgid "Failed to stage selected line." -msgstr "Fehler beim Bereitstellen der gewählten Zeile." - -#: lib/diff.tcl:889 -msgid "Failed to undo last revert." -msgstr "Fehler beim Rückgängigmachen des letzten Zurücknehmen-Commits" - -#: lib/sshkey.tcl:34 -msgid "No keys found." -msgstr "Keine Schlüssel gefunden." - -#: lib/sshkey.tcl:37 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "Öffentlicher Schlüssel gefunden in: %s" - -#: lib/sshkey.tcl:43 -msgid "Generate Key" -msgstr "Schlüssel erzeugen" +msgstr "Projektarchiv »%s« konnte nicht geöffnet werden." -#: lib/sshkey.tcl:61 -msgid "Copy To Clipboard" -msgstr "In Zwischenablage kopieren" - -#: lib/sshkey.tcl:75 -msgid "Your OpenSSH Public Key" -msgstr "Ihr OpenSSH öffenlicher Schlüssel" - -#: lib/sshkey.tcl:83 -msgid "Generating..." -msgstr "Erzeugen..." - -#: lib/sshkey.tcl:89 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "" -"Konnte »ssh-keygen« nicht starten:\n" -"\n" -"%s" - -#: lib/sshkey.tcl:116 -msgid "Generation failed." -msgstr "Schlüsselerzeugung fehlgeschlagen." - -#: lib/sshkey.tcl:123 -msgid "Generation succeeded, but no keys found." -msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden." - -#: lib/sshkey.tcl:126 -#, tcl-format -msgid "Your key is in: %s" -msgstr "Ihr Schlüssel ist abgelegt in: %s" - -#: lib/branch_create.tcl:23 -#, tcl-format -msgid "%s (%s): Create Branch" -msgstr "%s (%s): Branch erstellen" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "Neuen Branch erstellen" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "Branchname" - -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "Passend zu Trackingbranch-Name" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "Anfangsversion" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "Existierenden Branch aktualisieren:" - -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "Nein" - -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Nur Vorspulen" - -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "Branch auschecken nach Erstellen" - -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." -msgstr "Bitte wählen Sie einen Trackingbranch." - -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "Trackingbranch »%s« ist kein Branch im externen Repository." - -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Verarbeitung. Bitte warten..." - -#: lib/console.tcl:186 -msgid "Success" -msgstr "Erfolgreich" - -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "Fehler: Kommando fehlgeschlagen" - -#: lib/line.tcl:17 -msgid "Goto Line:" -msgstr "Gehe zu Zeile:" - -#: lib/line.tcl:23 -msgid "Go" -msgstr "Gehe" - -#: lib/choose_rev.tcl:52 +#: lib/choose_rev.tcl:53 msgid "This Detached Checkout" -msgstr "Losgelöste Arbeitskopie-Version" +msgstr "Abgetrennte Arbeitskopie-Version" #: lib/choose_rev.tcl:60 msgid "Revision Expression:" -msgstr "Version Regex-Ausdruck:" +msgstr "Version Regexp-Ausdruck:" -#: lib/choose_rev.tcl:72 +#: lib/choose_rev.tcl:74 msgid "Local Branch" -msgstr "Lokaler Branch" +msgstr "Lokaler Zweig" -#: lib/choose_rev.tcl:77 +#: lib/choose_rev.tcl:79 msgid "Tracking Branch" -msgstr "Trackingbranch" +msgstr "Übernahmezweig" -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 msgid "Tag" -msgstr "Tag" +msgstr "Markierung" -#: lib/choose_rev.tcl:321 +#: lib/choose_rev.tcl:317 #, tcl-format msgid "Invalid revision: %s" msgstr "Ungültige Version: %s" -#: lib/choose_rev.tcl:342 +#: lib/choose_rev.tcl:338 msgid "No revision selected." msgstr "Keine Version ausgewählt." -#: lib/choose_rev.tcl:350 +#: lib/choose_rev.tcl:346 msgid "Revision expression is empty." msgstr "Versions-Ausdruck ist leer." -#: lib/choose_rev.tcl:537 +#: lib/choose_rev.tcl:531 msgid "Updated" msgstr "Aktualisiert" -#: lib/choose_rev.tcl:565 +#: lib/choose_rev.tcl:559 msgid "URL" msgstr "URL" @@ -2409,10 +1337,10 @@ msgid "" "You are about to create the initial commit. There is no commit before this " "to amend.\n" msgstr "" -"Kein Commit zur Nachbesserung vorhanden.\n" +"Keine Version zur Nachbesserung vorhanden.\n" "\n" -"Sie sind dabei, den ersten Commit zu erstellen. Es gibt keinen existierenden " -"Commit, den Sie nachbessern könnten.\n" +"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende " +"Version, die Sie nachbessern könnten.\n" #: lib/commit.tcl:18 msgid "" @@ -2422,31 +1350,31 @@ msgid "" "completed. You cannot amend the prior commit unless you first abort the " "current merge activity.\n" msgstr "" -"Nachbesserung bei Zusammenführung nicht möglich.\n" +"Nachbesserung währen Zusammenführung nicht möglich.\n" "\n" -"Sie haben das Zusammenführen von Commits angefangen, aber noch nicht " -"beendet. Sie können keinen vorigen Commit nachbessern, solange eine " +"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht " +"beendet. Sie können keine vorige Übertragung nachbessern, solange eine " "unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung " "beenden oder abbrechen.\n" -#: lib/commit.tcl:56 +#: lib/commit.tcl:48 msgid "Error loading commit data for amend:" -msgstr "Fehler beim Laden der Commitdaten für Nachbessern:" +msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:" -#: lib/commit.tcl:83 +#: lib/commit.tcl:75 msgid "Unable to obtain your identity:" msgstr "Benutzername konnte nicht bestimmt werden:" -#: lib/commit.tcl:88 +#: lib/commit.tcl:80 msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:" -#: lib/commit.tcl:138 +#: lib/commit.tcl:129 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht." -#: lib/commit.tcl:158 +#: lib/commit.tcl:149 msgid "" "Last scanned state does not match repository state.\n" "\n" @@ -2455,14 +1383,14 @@ msgid "" "\n" "The rescan will be automatically started now.\n" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" "\n" -"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " -"geändert. Vor dem nächsten Commit muss neu geladen werden.\n" +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " +"geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n" "\n" "Es wird gleich neu geladen.\n" -#: lib/commit.tcl:182 +#: lib/commit.tcl:172 #, tcl-format msgid "" "Unmerged files cannot be committed.\n" @@ -2470,13 +1398,12 @@ msgid "" "File %s has merge conflicts. You must resolve them and stage the file " "before committing.\n" msgstr "" -"Nicht zusammengeführte Dateien können nicht committet werden.\n" +"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n" "\n" "Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie " -"müssen diese Konflikte auflösen und die Dateien in die Bereitstellung " -"hinzufügen, bevor Sie committen können.\n" +"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n" -#: lib/commit.tcl:190 +#: lib/commit.tcl:180 #, tcl-format msgid "" "Unknown file state %s detected.\n" @@ -2485,19 +1412,19 @@ msgid "" msgstr "" "Unbekannter Dateizustand »%s«.\n" "\n" -"Datei »%s« kann nicht committet werden.\n" +"Datei »%s« kann nicht eingetragen werden.\n" -#: lib/commit.tcl:198 +#: lib/commit.tcl:188 msgid "" "No changes to commit.\n" "\n" "You must stage at least 1 file before you can commit.\n" msgstr "" -"Keine Änderungen vorhanden, die committet werden könnten.\n" +"Keine Änderungen vorhanden, die eingetragen werden könnten.\n" "\n" -"Sie müssen mindestens eine Datei bereitstellen, bevor Sie committen können.\n" +"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n" -#: lib/commit.tcl:213 +#: lib/commit.tcl:203 msgid "" "Please supply a commit message.\n" "\n" @@ -2517,58 +1444,42 @@ msgstr "" "\n" "- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n" -#: lib/commit.tcl:244 +#: lib/commit.tcl:234 msgid "Calling pre-commit hook..." -msgstr "Aufrufen des »pre-commit hook«..." +msgstr "Aufrufen der Vor-Eintragen-Kontrolle (»pre-commit hook«)..." -#: lib/commit.tcl:259 +#: lib/commit.tcl:249 msgid "Commit declined by pre-commit hook." -msgstr "Committen abgelehnt durch »pre-commit hook«." +msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)." -#: lib/commit.tcl:278 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" -msgstr "" -"Sie sind dabei, einen Commit auf losgelöste Branchspitze (»commit to " -"detached head«) zu erstellen. Das ist riskant, denn wenn Sie zu einem " -"anderen Branch wechseln, würden Sie diese Änderungen verlieren und es ist " -"nachträglich schwierig, diese aus dem Commit-Log (»reflog«) wiederzufinden. " -"Es wird empfohlen, diesen Commit abzubrechen und zunächst einen neuen Branch " -"zu erstellen.\n" -"\n" -" Wollen Sie den Commit trotzdem in dieser Form erstellen?" - -#: lib/commit.tcl:299 +#: lib/commit.tcl:272 msgid "Calling commit-msg hook..." -msgstr "Aufrufen des »commit-msg hook«..." +msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle (»commit-message hook«)..." -#: lib/commit.tcl:314 +#: lib/commit.tcl:287 msgid "Commit declined by commit-msg hook." -msgstr "Committen abgelehnt durch »commit-msg hook«." +msgstr "" +"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message " +"hook«)." -#: lib/commit.tcl:327 +#: lib/commit.tcl:300 msgid "Committing changes..." -msgstr "Änderungen committen..." +msgstr "Änderungen eintragen..." -#: lib/commit.tcl:344 +#: lib/commit.tcl:316 msgid "write-tree failed:" msgstr "write-tree fehlgeschlagen:" -#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 +#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 msgid "Commit failed." -msgstr "Committen fehlgeschlagen." +msgstr "Eintragen fehlgeschlagen." -#: lib/commit.tcl:362 +#: lib/commit.tcl:334 #, tcl-format msgid "Commit %s appears to be corrupt" msgstr "Version »%s« scheint beschädigt zu sein" -#: lib/commit.tcl:367 +#: lib/commit.tcl:339 msgid "" "No changes to commit.\n" "\n" @@ -2576,104 +1487,70 @@ msgid "" "\n" "A rescan will be automatically started now.\n" msgstr "" -"Keine Änderungen zum committen.\n" +"Keine Änderungen einzutragen.\n" "\n" -"Es gibt keine geänderte Datei in diesem Commit und es wurde auch nichts " +"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts " "zusammengeführt.\n" "\n" "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n" -#: lib/commit.tcl:374 +#: lib/commit.tcl:346 msgid "No changes to commit." -msgstr "Keine Änderungen, die committet werden können." +msgstr "Keine Änderungen, die eingetragen werden können." -#: lib/commit.tcl:394 +#: lib/commit.tcl:360 msgid "commit-tree failed:" msgstr "commit-tree fehlgeschlagen:" -#: lib/commit.tcl:421 +#: lib/commit.tcl:381 msgid "update-ref failed:" msgstr "update-ref fehlgeschlagen:" -#: lib/commit.tcl:514 +#: lib/commit.tcl:469 #, tcl-format msgid "Created commit %s: %s" -msgstr "Commit %s erstellt: %s" - -#: lib/branch_delete.tcl:16 -#, tcl-format -msgid "%s (%s): Delete Branch" -msgstr "%s (%s): Branch löschen" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" -msgstr "Lokalen Branch löschen" - -#: lib/branch_delete.tcl:39 -msgid "Local Branches" -msgstr "Lokale Branches" - -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" -msgstr "Nur löschen, wenn zusammengeführt nach" +msgstr "Version %s übertragen: %s" -#: lib/branch_delete.tcl:103 -#, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "Folgende Branches sind noch nicht mit »%s« zusammengeführt:" - -#: lib/branch_delete.tcl:131 -#, tcl-format -msgid " - %s:" -msgstr " - %s:" +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Verarbeitung. Bitte warten..." -#: lib/branch_delete.tcl:141 -#, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "" -"Fehler beim Löschen der Branches:\n" -"%s" +#: lib/console.tcl:186 +msgid "Success" +msgstr "Erfolgreich" -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "Ungültiges Datum von Git: %s" +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "Fehler: Kommando fehlgeschlagen" -#: lib/database.tcl:42 +#: lib/database.tcl:43 msgid "Number of loose objects" msgstr "Anzahl unverknüpfter Objekte" -#: lib/database.tcl:43 +#: lib/database.tcl:44 msgid "Disk space used by loose objects" msgstr "Festplattenplatz von unverknüpften Objekten" -#: lib/database.tcl:44 +#: lib/database.tcl:45 msgid "Number of packed objects" msgstr "Anzahl komprimierter Objekte" -#: lib/database.tcl:45 +#: lib/database.tcl:46 msgid "Number of packs" msgstr "Anzahl Komprimierungseinheiten" -#: lib/database.tcl:46 +#: lib/database.tcl:47 msgid "Disk space used by packed objects" msgstr "Festplattenplatz von komprimierten Objekten" -#: lib/database.tcl:47 +#: lib/database.tcl:48 msgid "Packed objects waiting for pruning" msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind" -#: lib/database.tcl:48 +#: lib/database.tcl:49 msgid "Garbage files" msgstr "Dateien im Mülleimer" -#: lib/database.tcl:66 -#, tcl-format -msgid "%s (%s): Database Statistics" -msgstr "%s (%s): Datenbankstatistik" - #: lib/database.tcl:72 msgid "Compressing the object database" msgstr "Objektdatenbank komprimieren" @@ -2692,37 +1569,214 @@ msgid "" "\n" "Compress the database now?" msgstr "" -"Dieses Repository enthält ungefähr %i nicht verknüpfte Objekte.\n" +"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n" "\n" -"Für eine optimale Performance wird empfohlen, die Datenbank des Repository " -"zu komprimieren.\n" +"Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n" "\n" "Soll die Datenbank jetzt komprimiert werden?" -#: lib/error.tcl:20 +#: lib/date.tcl:25 #, tcl-format -msgid "%s: error" -msgstr "%s: Fehler" +msgid "Invalid date from Git: %s" +msgstr "Ungültiges Datum von Git: %s" -#: lib/error.tcl:36 +#: lib/diff.tcl:64 #, tcl-format -msgid "%s: warning" -msgstr "%s: Warnung" +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." +msgstr "" +"Keine Änderungen feststellbar.\n" +"\n" +"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei von " +"einem anderen Programm modifiziert, aber der Inhalt der Datei ist " +"unverändert.\n" +"\n" +"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen " +"Dateien zu prüfen." + +#: lib/diff.tcl:104 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "Vergleich von »%s« laden..." + +#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "" +"LOKAL: gelöscht\n" +"ANDERES:\n" + +#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "" +"ANDERES: gelöscht\n" +"LOKAL:\n" -#: lib/error.tcl:80 +#: lib/diff.tcl:137 +msgid "LOCAL:\n" +msgstr "LOKAL:\n" + +#: lib/diff.tcl:140 +msgid "REMOTE:\n" +msgstr "ANDERES:\n" + +#: lib/diff.tcl:202 lib/diff.tcl:319 #, tcl-format -msgid "%s hook failed:" -msgstr "%s hook fehlgeschlagen:" +msgid "Unable to display %s" +msgstr "Datei »%s« kann nicht angezeigt werden" -#: lib/error.tcl:96 +#: lib/diff.tcl:203 +msgid "Error loading file:" +msgstr "Fehler beim Laden der Datei:" + +#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" +msgstr "Git-Projektarchiv (Unterprojekt)" + +#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." +msgstr "* Binärdatei (Inhalt wird nicht angezeigt)" + +#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "" +"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n" +"* Nur erste %d Bytes werden angezeigt.\n" + +#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "" +"\n" +"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n" +"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n" + +#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." +msgstr "" +"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung." + +#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." +msgstr "Fehler beim Bereitstellen des gewählten Kontexts." + +#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." +msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung." + +#: lib/diff.tcl:576 +msgid "Failed to stage selected line." +msgstr "Fehler beim Bereitstellen der gewählten Zeile." + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "Voreinstellung" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Systemweit (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "Andere" + +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" +msgstr "Fehler" + +#: lib/error.tcl:36 +msgid "warning" +msgstr "Warnung" + +#: lib/error.tcl:94 msgid "You must correct the above errors before committing." msgstr "" -"Sie müssen die obigen Fehler zuerst beheben, bevor Sie committen können." +"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können." + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "Bereitstellung kann nicht wieder freigegeben werden." + +#: lib/index.tcl:15 +msgid "Index Error" +msgstr "Fehler in Bereitstellung" + +#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "" +"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine " +"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu " +"synchronisieren." + +#: lib/index.tcl:28 +msgid "Continue" +msgstr "Fortsetzen" -#: lib/error.tcl:116 +#: lib/index.tcl:31 +msgid "Unlock Index" +msgstr "Bereitstellung freigeben" + +#: lib/index.tcl:289 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Datei »%s« aus der Bereitstellung herausnehmen" + +#: lib/index.tcl:328 +msgid "Ready to commit." +msgstr "Bereit zum Eintragen." + +#: lib/index.tcl:341 #, tcl-format -msgid "%s (%s): error" -msgstr "%s (%s): Fehler" +msgid "Adding %s" +msgstr "»%s« hinzufügen..." + +#: lib/index.tcl:398 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "Änderungen in Datei »%s« verwerfen?" + +#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "Änderungen in den gewählten %i Dateien verwerfen?" + +#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "" +"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen." + +#: lib/index.tcl:411 +msgid "Do Nothing" +msgstr "Nichts tun" + +#: lib/index.tcl:429 +msgid "Reverting selected files" +msgstr "Änderungen in gewählten Dateien verwerfen" + +#: lib/index.tcl:433 +#, tcl-format +msgid "Reverting %s" +msgstr "Änderungen in %s verwerfen" #: lib/merge.tcl:13 msgid "" @@ -2732,7 +1786,7 @@ msgid "" msgstr "" "Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n" "\n" -"Sie müssen zuerst den Nachbesserungs-Commit abschließen, bevor Sie " +"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie " "zusammenführen können.\n" #: lib/merge.tcl:27 @@ -2744,9 +1798,9 @@ msgid "" "\n" "The rescan will be automatically started now.\n" msgstr "" -"Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n" +"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n" "\n" -"Ein anderes Git-Programm hat das Repository seit dem letzten Laden " +"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden " "geändert. Vor einem Zusammenführen muss neu geladen werden.\n" "\n" "Es wird gleich neu geladen.\n" @@ -2763,11 +1817,10 @@ msgid "" msgstr "" "Zusammenführung mit Konflikten.\n" "\n" -"Die Datei »%s« enthält Konflikte beim Zusammenführen.\n" -"\n" -"Sie müssen diese Konflikte per Hand auflösen. Anschließend müssen Sie die " -"Datei wieder bereitstellen und committen, um die Zusammenführung " -"abzuschließen. Erst danach kann eine neue Zusammenführung begonnen werden.\n" +"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese " +"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder " +"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst " +"danach kann eine neue Zusammenführung begonnen werden.\n" #: lib/merge.tcl:55 #, tcl-format @@ -2781,45 +1834,39 @@ msgid "" msgstr "" "Es liegen Änderungen vor.\n" "\n" -"Die Datei »%s« wurde geändert.\n" -"\n" -"Sie sollten zuerst den bereitgestellten Commit abschließen, bevor Sie eine " -"Zusammenführung beginnen. Mit dieser Reihenfolge können Sie mögliche " -"Konflikte beim Zusammenführen wesentlich einfacher beheben oder abbrechen.\n" +"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte " +"Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser " +"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich " +"einfacher beheben oder abbrechen.\n" -#: lib/merge.tcl:108 +#: lib/merge.tcl:107 #, tcl-format msgid "%s of %s" msgstr "%s von %s" -#: lib/merge.tcl:126 +#: lib/merge.tcl:120 #, tcl-format msgid "Merging %s and %s..." msgstr "Zusammenführen von %s und %s..." -#: lib/merge.tcl:137 +#: lib/merge.tcl:131 msgid "Merge completed successfully." msgstr "Zusammenführen erfolgreich abgeschlossen." -#: lib/merge.tcl:139 +#: lib/merge.tcl:133 msgid "Merge failed. Conflict resolution is required." msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig." -#: lib/merge.tcl:156 -#, tcl-format -msgid "%s (%s): Merge" -msgstr "%s (%s): Zusammenführen" - -#: lib/merge.tcl:164 +#: lib/merge.tcl:158 #, tcl-format msgid "Merge Into %s" msgstr "Zusammenführen in »%s«" -#: lib/merge.tcl:183 +#: lib/merge.tcl:177 msgid "Revision To Merge" msgstr "Zusammenzuführende Version" -#: lib/merge.tcl:218 +#: lib/merge.tcl:212 msgid "" "Cannot abort while amending.\n" "\n" @@ -2827,9 +1874,9 @@ msgid "" msgstr "" "Abbruch der Nachbesserung ist nicht möglich.\n" "\n" -"Sie müssen die Nachbesserung diese Commits abschließen.\n" +"Sie müssen die Nachbesserung der Version abschließen.\n" -#: lib/merge.tcl:228 +#: lib/merge.tcl:222 msgid "" "Abort merge?\n" "\n" @@ -2839,11 +1886,12 @@ msgid "" msgstr "" "Zusammenführen abbrechen?\n" "\n" -"Wenn Sie abbrechen, gehen alle noch nicht committeten Änderungen verloren.\n" +"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen " +"verloren.\n" "\n" "Zusammenführen jetzt abbrechen?" -#: lib/merge.tcl:234 +#: lib/merge.tcl:228 msgid "" "Reset changes?\n" "\n" @@ -2851,24 +1899,694 @@ msgid "" "\n" "Continue with resetting the current changes?" msgstr "" -"Änderungen verwerfen?\n" +"Änderungen zurücksetzen?\n" "\n" -"Alle noch nicht committeten Änderungen würden verloren gehen.\n" +"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen " +"verloren.\n" "\n" -"Änderungen jetzt verwerfen?" +"Änderungen jetzt zurücksetzen?" -#: lib/merge.tcl:246 +#: lib/merge.tcl:239 msgid "Aborting" msgstr "Abbruch" -#: lib/merge.tcl:247 +#: lib/merge.tcl:239 msgid "files reset" msgstr "Dateien zurückgesetzt" -#: lib/merge.tcl:277 +#: lib/merge.tcl:267 msgid "Abort failed." msgstr "Abbruch fehlgeschlagen." -#: lib/merge.tcl:279 +#: lib/merge.tcl:269 msgid "Abort completed. Ready." msgstr "Abbruch durchgeführt. Bereit." + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "Konflikt durch Basisversion ersetzen?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "Konflikt durch diesen Zweig ersetzen?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "Konflikt durch anderen Zweig ersetzen?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "" +"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n" +"\n" +"»%s« wird überschrieben.\n" +"\n" +"Diese Operation kann nur rückgängig gemacht werden, wenn die\n" +"Zusammenführung erneut gestartet wird." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "Auflösung hinzugefügt für %s" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "" +"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch " +"das Zusamenführungswerkzeug gelöst werden." + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "Konflikt-Datei existiert nicht" + +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "Kein GUI Zusammenführungswerkzeug: »%s«" + +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«" + +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" +msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?" + +#: lib/mergetool.tcl:323 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "" +"Fehler beim Abrufen der Dateiversionen:\n" +"%s" + +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "" +"Zusammenführungswerkzeug konnte nicht gestartet werden:\n" +"\n" +"%s" + +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." +msgstr "Zusammenführungswerkzeug starten..." + +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." +msgstr "Zusammenführungswerkzeug fehlgeschlagen." + +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "Ungültige globale Zeichenkodierung »%s«" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "Ungültige Archiv-Zeichenkodierung »%s«" + +#: lib/option.tcl:117 +msgid "Restore Defaults" +msgstr "Voreinstellungen wiederherstellen" + +#: lib/option.tcl:121 +msgid "Save" +msgstr "Speichern" + +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" +msgstr "Projektarchiv %s" + +#: lib/option.tcl:132 +msgid "Global (All Repositories)" +msgstr "Global (Alle Projektarchive)" + +#: lib/option.tcl:138 +msgid "User Name" +msgstr "Benutzername" + +#: lib/option.tcl:139 +msgid "Email Address" +msgstr "E-Mail-Adresse" + +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" +msgstr "Zusammenführungs-Versionen zusammenfassen" + +#: lib/option.tcl:142 +msgid "Merge Verbosity" +msgstr "Ausführlichkeit der Zusammenführen-Meldungen" + +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" +msgstr "Vergleichsstatistik nach Zusammenführen anzeigen" + +#: lib/option.tcl:144 +msgid "Use Merge Tool" +msgstr "Zusammenführungswerkzeug" + +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" +msgstr "Auf Dateiänderungsdatum verlassen" + +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" +msgstr "Übernahmezweige aufräumen während Anforderung" + +#: lib/option.tcl:148 +msgid "Match Tracking Branches" +msgstr "Passend zu Übernahmezweig" + +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" +msgstr "Kopie-Annotieren nur bei geänderten Dateien" + +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" +msgstr "Mindestzahl Zeichen für Kopie-Annotieren" + +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" +msgstr "Anzahl Tage für Historien-Kontext" + +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" +msgstr "Anzahl der Kontextzeilen beim Vergleich" + +#: lib/option.tcl:153 +msgid "Commit Message Text Width" +msgstr "Textbreite der Versionsbeschreibung" + +#: lib/option.tcl:154 +msgid "New Branch Name Template" +msgstr "Namensvorschlag für neue Zweige" + +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" +msgstr "Voreingestellte Zeichenkodierung" + +#: lib/option.tcl:203 +msgid "Change" +msgstr "Ändern" + +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" +msgstr "Wörterbuch Rechtschreibprüfung:" + +#: lib/option.tcl:254 +msgid "Change Font" +msgstr "Schriftart ändern" + +#: lib/option.tcl:258 +#, tcl-format +msgid "Choose %s" +msgstr "%s wählen" + +#: lib/option.tcl:264 +msgid "pt." +msgstr "pt." + +#: lib/option.tcl:278 +msgid "Preferences" +msgstr "Einstellungen" + +#: lib/option.tcl:314 +msgid "Failed to completely save options:" +msgstr "Optionen konnten nicht gespeichert werden:" + +#: lib/remote_add.tcl:19 +msgid "Add Remote" +msgstr "Externes Archiv hinzufügen" + +#: lib/remote_add.tcl:24 +msgid "Add New Remote" +msgstr "Neues externes Archiv hinzufügen" + +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" +msgstr "Hinzufügen" + +#: lib/remote_add.tcl:37 +msgid "Remote Details" +msgstr "Einzelheiten des externen Archivs" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "Adresse:" + +#: lib/remote_add.tcl:62 +msgid "Further Action" +msgstr "Weitere Aktion jetzt" + +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" +msgstr "Gleich anfordern" + +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" +msgstr "Externes Archiv initialisieren und dahin versenden" + +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" +msgstr "Nichts tun" + +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." +msgstr "Bitte geben Sie einen Namen des externen Archivs an." + +#: lib/remote_add.tcl:114 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "»%s« ist kein zulässiger Name eines externen Archivs." + +#: lib/remote_add.tcl:125 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "Fehler beim Hinzufügen des externen Archivs »%s« aus Herkunftsort »%s«." + +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" +msgstr "»%s« anfordern" + +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" +msgstr "»%s« anfordern" + +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "Initialisieren eines externen Archivs an Adresse »%s« ist nicht möglich." + +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" +msgstr "»%s« versenden..." + +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "Einrichten von »%s« an »%s«" + +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "Zweig in externem Archiv löschen" + +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" +msgstr "In Projektarchiv" + +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" +msgstr "Externes Archiv:" + +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" +msgstr "Adresse:" + +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" +msgstr "Zweige" + +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" +msgstr "Nur löschen, wenn" + +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" +msgstr "Zusammengeführt mit:" + +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." +msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden." + +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "" +"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n" +"\n" +" - %s" + +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "" +"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die " +"notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, " +"zuerst von »%s« anzufordern." + +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." +msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll." + +#: lib/remote_branch_delete.tcl:226 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Zweige auf »%s« werden gelöscht" + +#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." +msgstr "Kein Projektarchiv ausgewählt." + +#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." +msgstr "»%s« laden..." + +#: lib/remote.tcl:163 +msgid "Remove Remote" +msgstr "Externes Archiv entfernen" + +#: lib/remote.tcl:168 +msgid "Prune from" +msgstr "Aufräumen von" + +#: lib/remote.tcl:173 +msgid "Fetch from" +msgstr "Anfordern von" + +#: lib/remote.tcl:215 +msgid "Push to" +msgstr "Versenden nach" + +#: lib/search.tcl:21 +msgid "Find:" +msgstr "Suchen:" + +#: lib/search.tcl:23 +msgid "Next" +msgstr "Nächster" + +#: lib/search.tcl:24 +msgid "Prev" +msgstr "Voriger" + +#: lib/search.tcl:25 +msgid "Case-Sensitive" +msgstr "Groß-/Kleinschreibung unterscheiden" + +#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" +msgstr "Fehler beim Schreiben der Verknüpfung:" + +#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" +msgstr "Fehler beim Erstellen des Icons:" + +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "Rechtschreibprüfungsprogramm nicht unterstützt" + +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "Rechtschreibprüfung nicht verfügbar" + +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung" + +#: lib/spellcheck.tcl:70 +#, tcl-format +msgid "Reverting dictionary to %s." +msgstr "Wörterbuch auf %s zurückgesetzt." + +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen" + +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "Unbekanntes Rechtschreibprüfungsprogramm" + +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "Keine Vorschläge" + +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm" + +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "Rechtschreibprüfung fehlgeschlagen" + +#: lib/sshkey.tcl:31 +msgid "No keys found." +msgstr "Keine Schlüssel gefunden." + +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "Öffentlicher Schlüssel gefunden in: %s" + +#: lib/sshkey.tcl:40 +msgid "Generate Key" +msgstr "Schlüssel erzeugen" + +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" +msgstr "In Zwischenablage kopieren" + +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" +msgstr "Ihr OpenSSH öffenlicher Schlüssel" + +#: lib/sshkey.tcl:78 +msgid "Generating..." +msgstr "Erzeugen..." + +#: lib/sshkey.tcl:84 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "" +"Konnte »ssh-keygen« nicht starten:\n" +"\n" +"%s" + +#: lib/sshkey.tcl:111 +msgid "Generation failed." +msgstr "Schlüsselerzeugung fehlgeschlagen." + +#: lib/sshkey.tcl:118 +msgid "Generation succeeded, but no keys found." +msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden." + +#: lib/sshkey.tcl:121 +#, tcl-format +msgid "Your key is in: %s" +msgstr "Ihr Schlüssel ist abgelegt in: %s" + +#: lib/status_bar.tcl:83 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s ... %*i von %*i %s (%3i%%)" + +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" +msgstr "Werkzeug hinzufügen" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "Neues Kommando für Werkzeug hinzufügen" + +#: lib/tools_dlg.tcl:33 +msgid "Add globally" +msgstr "Global hinzufügen" + +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" +msgstr "Einzelheiten des Werkzeugs" + +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" +msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:" + +#: lib/tools_dlg.tcl:61 +msgid "Command:" +msgstr "Kommando:" + +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" +msgstr "Bestätigungsfrage vor Starten anzeigen" + +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "Benutzer nach Version fragen (setzt $REVISION)" + +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)" + +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" +msgstr "Kein Ausgabefenster zeigen" + +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)" + +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." +msgstr "Bitte geben Sie einen Werkzeugnamen an." + +#: lib/tools_dlg.tcl:129 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "Werkzeug »%s« existiert bereits." + +#: lib/tools_dlg.tcl:151 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "" +"Werkzeug konnte nicht hinzugefügt werden:\n" +"\n" +"%s" + +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" +msgstr "Werkzeug entfernen" + +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" +msgstr "Werkzeugkommandos entfernen" + +#: lib/tools_dlg.tcl:200 +msgid "Remove" +msgstr "Entfernen" + +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" +msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)" + +#: lib/tools_dlg.tcl:297 +#, tcl-format +msgid "Run Command: %s" +msgstr "Kommando aufrufen: %s" + +#: lib/tools_dlg.tcl:311 +msgid "Arguments" +msgstr "Argumente" + +#: lib/tools_dlg.tcl:348 +msgid "OK" +msgstr "Ok" + +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein." + +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "Wollen Sie %s wirklich starten?" + +#: lib/tools.tcl:110 +#, tcl-format +msgid "Tool: %s" +msgstr "Werkzeug: %s" + +#: lib/tools.tcl:111 +#, tcl-format +msgid "Running: %s" +msgstr "Starten: %s" + +#: lib/tools.tcl:149 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "Werkzeug erfolgreich abgeschlossen: %s" + +#: lib/tools.tcl:151 +#, tcl-format +msgid "Tool failed: %s" +msgstr "Werkzeug fehlgeschlagen: %s" + +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "Neue Änderungen von »%s« holen" + +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" +msgstr "Aufräumen von »%s«" + +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden" + +#: lib/transport.tcl:26 +#, tcl-format +msgid "Pushing changes to %s" +msgstr "Änderungen nach »%s« versenden" + +#: lib/transport.tcl:64 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Spiegeln nach %s" + +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "%s %s nach %s versenden" + +#: lib/transport.tcl:100 +msgid "Push Branches" +msgstr "Zweige versenden" + +#: lib/transport.tcl:114 +msgid "Source Branches" +msgstr "Lokale Zweige" + +#: lib/transport.tcl:131 +msgid "Destination Repository" +msgstr "Ziel-Projektarchiv" + +#: lib/transport.tcl:169 +msgid "Transfer Options" +msgstr "Netzwerk-Einstellungen" + +#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "" +"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)" + +#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" +msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)" + +#: lib/transport.tcl:179 +msgid "Include tags" +msgstr "Mit Markierungen übertragen" diff --git a/third_party/git/git-gui/po/git-gui.pot b/third_party/git/git-gui/po/git-gui.pot index b79ed4e133..0c94f9c2c6 100644 --- a/third_party/git/git-gui/po/git-gui.pot +++ b/third_party/git/git-gui/po/git-gui.pot @@ -8,42 +8,41 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-08 22:54+0100\n" +"POT-Creation-Date: 2010-01-26 15:47-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: git-gui.sh:847 +#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 +#: git-gui.sh:922 +msgid "git-gui: fatal error" +msgstr "" + +#: git-gui.sh:743 #, tcl-format msgid "Invalid font specified in %s:" msgstr "" -#: git-gui.sh:901 +#: git-gui.sh:779 msgid "Main Font" msgstr "" -#: git-gui.sh:902 +#: git-gui.sh:780 msgid "Diff/Console Font" msgstr "" -#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 -#: git-gui.sh:3212 -msgid "git-gui: fatal error" -msgstr "" - -#: git-gui.sh:918 +#: git-gui.sh:794 msgid "Cannot find git in PATH." msgstr "" -#: git-gui.sh:945 +#: git-gui.sh:821 msgid "Cannot parse Git version string:" msgstr "" -#: git-gui.sh:970 +#: git-gui.sh:839 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -55,518 +54,473 @@ msgid "" "Assume '%s' is version 1.5.0?\n" msgstr "" -#: git-gui.sh:1267 +#: git-gui.sh:1128 msgid "Git directory not found:" msgstr "" -#: git-gui.sh:1301 +#: git-gui.sh:1146 msgid "Cannot move to top of working directory:" msgstr "" -#: git-gui.sh:1309 +#: git-gui.sh:1154 msgid "Cannot use bare repository:" msgstr "" -#: git-gui.sh:1317 +#: git-gui.sh:1162 msgid "No working directory" msgstr "" -#: git-gui.sh:1491 lib/checkout_op.tcl:306 +#: git-gui.sh:1334 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "" -#: git-gui.sh:1551 +#: git-gui.sh:1390 msgid "Scanning for modified files ..." msgstr "" -#: git-gui.sh:1629 +#: git-gui.sh:1454 msgid "Calling prepare-commit-msg hook..." msgstr "" -#: git-gui.sh:1646 +#: git-gui.sh:1471 msgid "Commit declined by prepare-commit-msg hook." msgstr "" -#: git-gui.sh:1804 lib/browser.tcl:252 +#: git-gui.sh:1629 lib/browser.tcl:246 msgid "Ready." msgstr "" -#: git-gui.sh:1968 +#: git-gui.sh:1787 #, tcl-format -msgid "" -"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files." +msgid "Displaying only %s of %s files." msgstr "" -#: git-gui.sh:2091 +#: git-gui.sh:1913 msgid "Unmodified" msgstr "" -#: git-gui.sh:2093 +#: git-gui.sh:1915 msgid "Modified, not staged" msgstr "" -#: git-gui.sh:2094 git-gui.sh:2106 +#: git-gui.sh:1916 git-gui.sh:1924 msgid "Staged for commit" msgstr "" -#: git-gui.sh:2095 git-gui.sh:2107 +#: git-gui.sh:1917 git-gui.sh:1925 msgid "Portions staged for commit" msgstr "" -#: git-gui.sh:2096 git-gui.sh:2108 +#: git-gui.sh:1918 git-gui.sh:1926 msgid "Staged for commit, missing" msgstr "" -#: git-gui.sh:2098 +#: git-gui.sh:1920 msgid "File type changed, not staged" msgstr "" -#: git-gui.sh:2099 git-gui.sh:2100 -msgid "File type changed, old type staged for commit" -msgstr "" - -#: git-gui.sh:2101 +#: git-gui.sh:1921 msgid "File type changed, staged" msgstr "" -#: git-gui.sh:2102 -msgid "File type change staged, modification not staged" -msgstr "" - -#: git-gui.sh:2103 -msgid "File type change staged, file missing" -msgstr "" - -#: git-gui.sh:2105 +#: git-gui.sh:1923 msgid "Untracked, not staged" msgstr "" -#: git-gui.sh:2110 +#: git-gui.sh:1928 msgid "Missing" msgstr "" -#: git-gui.sh:2111 +#: git-gui.sh:1929 msgid "Staged for removal" msgstr "" -#: git-gui.sh:2112 +#: git-gui.sh:1930 msgid "Staged for removal, still present" msgstr "" -#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 -#: git-gui.sh:2118 git-gui.sh:2119 +#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 +#: git-gui.sh:1936 git-gui.sh:1937 msgid "Requires merge resolution" msgstr "" -#: git-gui.sh:2164 -msgid "Couldn't find gitk in PATH" +#: git-gui.sh:1972 +msgid "Starting gitk... please wait..." msgstr "" -#: git-gui.sh:2210 git-gui.sh:2245 -#, tcl-format -msgid "Starting %s... please wait..." +#: git-gui.sh:1984 +msgid "Couldn't find gitk in PATH" msgstr "" -#: git-gui.sh:2224 +#: git-gui.sh:2043 msgid "Couldn't find git gui in PATH" msgstr "" -#: git-gui.sh:2726 lib/choose_repository.tcl:53 +#: git-gui.sh:2455 lib/choose_repository.tcl:36 msgid "Repository" msgstr "" -#: git-gui.sh:2727 +#: git-gui.sh:2456 msgid "Edit" msgstr "" -#: git-gui.sh:2729 lib/choose_rev.tcl:567 +#: git-gui.sh:2458 lib/choose_rev.tcl:561 msgid "Branch" msgstr "" -#: git-gui.sh:2732 lib/choose_rev.tcl:554 +#: git-gui.sh:2461 lib/choose_rev.tcl:548 msgid "Commit@@noun" msgstr "" -#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 +#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 msgid "Merge" msgstr "" -#: git-gui.sh:2736 lib/choose_rev.tcl:563 +#: git-gui.sh:2465 lib/choose_rev.tcl:557 msgid "Remote" msgstr "" -#: git-gui.sh:2739 +#: git-gui.sh:2468 msgid "Tools" msgstr "" -#: git-gui.sh:2748 +#: git-gui.sh:2477 msgid "Explore Working Copy" msgstr "" -#: git-gui.sh:2763 -msgid "Git Bash" -msgstr "" - -#: git-gui.sh:2772 +#: git-gui.sh:2483 msgid "Browse Current Branch's Files" msgstr "" -#: git-gui.sh:2776 +#: git-gui.sh:2487 msgid "Browse Branch Files..." msgstr "" -#: git-gui.sh:2781 +#: git-gui.sh:2492 msgid "Visualize Current Branch's History" msgstr "" -#: git-gui.sh:2785 +#: git-gui.sh:2496 msgid "Visualize All Branch History" msgstr "" -#: git-gui.sh:2792 +#: git-gui.sh:2503 #, tcl-format msgid "Browse %s's Files" msgstr "" -#: git-gui.sh:2794 +#: git-gui.sh:2505 #, tcl-format msgid "Visualize %s's History" msgstr "" -#: git-gui.sh:2799 lib/database.tcl:40 +#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "" -#: git-gui.sh:2802 lib/database.tcl:33 +#: git-gui.sh:2513 lib/database.tcl:34 msgid "Compress Database" msgstr "" -#: git-gui.sh:2805 +#: git-gui.sh:2516 msgid "Verify Database" msgstr "" -#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 +#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 +#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 msgid "Create Desktop Icon" msgstr "" -#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 +#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 msgid "Quit" msgstr "" -#: git-gui.sh:2836 +#: git-gui.sh:2547 msgid "Undo" msgstr "" -#: git-gui.sh:2839 +#: git-gui.sh:2550 msgid "Redo" msgstr "" -#: git-gui.sh:2843 git-gui.sh:3461 +#: git-gui.sh:2554 git-gui.sh:3109 msgid "Cut" msgstr "" -#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 +#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 #: lib/console.tcl:69 msgid "Copy" msgstr "" -#: git-gui.sh:2849 git-gui.sh:3467 +#: git-gui.sh:2560 git-gui.sh:3115 msgid "Paste" msgstr "" -#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 -#: lib/branch_delete.tcl:28 +#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 +#: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "" -#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 +#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 msgid "Select All" msgstr "" -#: git-gui.sh:2865 +#: git-gui.sh:2576 msgid "Create..." msgstr "" -#: git-gui.sh:2871 +#: git-gui.sh:2582 msgid "Checkout..." msgstr "" -#: git-gui.sh:2877 +#: git-gui.sh:2588 msgid "Rename..." msgstr "" -#: git-gui.sh:2882 +#: git-gui.sh:2593 msgid "Delete..." msgstr "" -#: git-gui.sh:2887 +#: git-gui.sh:2598 msgid "Reset..." msgstr "" -#: git-gui.sh:2897 +#: git-gui.sh:2608 msgid "Done" msgstr "" -#: git-gui.sh:2899 +#: git-gui.sh:2610 msgid "Commit@@verb" msgstr "" -#: git-gui.sh:2908 git-gui.sh:3400 +#: git-gui.sh:2619 git-gui.sh:3050 +msgid "New Commit" +msgstr "" + +#: git-gui.sh:2627 git-gui.sh:3057 msgid "Amend Last Commit" msgstr "" -#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 +#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "" -#: git-gui.sh:2924 +#: git-gui.sh:2643 msgid "Stage To Commit" msgstr "" -#: git-gui.sh:2930 +#: git-gui.sh:2649 msgid "Stage Changed Files To Commit" msgstr "" -#: git-gui.sh:2936 +#: git-gui.sh:2655 msgid "Unstage From Commit" msgstr "" -#: git-gui.sh:2942 lib/index.tcl:521 +#: git-gui.sh:2661 lib/index.tcl:412 msgid "Revert Changes" msgstr "" -#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 +#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 msgid "Show Less Context" msgstr "" -#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 +#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 msgid "Show More Context" msgstr "" -#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 +#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 msgid "Sign Off" msgstr "" -#: git-gui.sh:2977 +#: git-gui.sh:2696 msgid "Local Merge..." msgstr "" -#: git-gui.sh:2982 +#: git-gui.sh:2701 msgid "Abort Merge..." msgstr "" -#: git-gui.sh:2994 git-gui.sh:3022 +#: git-gui.sh:2713 git-gui.sh:2741 msgid "Add..." msgstr "" -#: git-gui.sh:2998 +#: git-gui.sh:2717 msgid "Push..." msgstr "" -#: git-gui.sh:3002 +#: git-gui.sh:2721 msgid "Delete Branch..." msgstr "" -#: git-gui.sh:3012 git-gui.sh:3666 +#: git-gui.sh:2731 git-gui.sh:3292 msgid "Options..." msgstr "" -#: git-gui.sh:3023 +#: git-gui.sh:2742 msgid "Remove..." msgstr "" -#: git-gui.sh:3032 lib/choose_repository.tcl:67 +#: git-gui.sh:2751 lib/choose_repository.tcl:50 msgid "Help" msgstr "" -#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 -#: lib/choose_repository.tcl:70 lib/about.tcl:14 +#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 #, tcl-format msgid "About %s" msgstr "" -#: git-gui.sh:3064 +#: git-gui.sh:2783 msgid "Online Documentation" msgstr "" -#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 +#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 msgid "Show SSH Key" msgstr "" -#: git-gui.sh:3097 git-gui.sh:3229 -msgid "usage:" -msgstr "" - -#: git-gui.sh:3101 git-gui.sh:3233 -msgid "Usage" -msgstr "" - -#: git-gui.sh:3182 lib/blame.tcl:575 -msgid "Error" -msgstr "" - -#: git-gui.sh:3213 +#: git-gui.sh:2893 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "" -#: git-gui.sh:3246 +#: git-gui.sh:2926 msgid "Current Branch:" msgstr "" -#: git-gui.sh:3271 -msgid "Unstaged Changes" +#: git-gui.sh:2947 +msgid "Staged Changes (Will Commit)" msgstr "" -#: git-gui.sh:3293 -msgid "Staged Changes (Will Commit)" +#: git-gui.sh:2967 +msgid "Unstaged Changes" msgstr "" -#: git-gui.sh:3367 +#: git-gui.sh:3017 msgid "Stage Changed" msgstr "" -#: git-gui.sh:3386 lib/transport.tcl:137 +#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 msgid "Push" msgstr "" -#: git-gui.sh:3413 +#: git-gui.sh:3071 msgid "Initial Commit Message:" msgstr "" -#: git-gui.sh:3414 +#: git-gui.sh:3072 msgid "Amended Commit Message:" msgstr "" -#: git-gui.sh:3415 +#: git-gui.sh:3073 msgid "Amended Initial Commit Message:" msgstr "" -#: git-gui.sh:3416 +#: git-gui.sh:3074 msgid "Amended Merge Commit Message:" msgstr "" -#: git-gui.sh:3417 +#: git-gui.sh:3075 msgid "Merge Commit Message:" msgstr "" -#: git-gui.sh:3418 +#: git-gui.sh:3076 msgid "Commit Message:" msgstr "" -#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 +#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 msgid "Copy All" msgstr "" -#: git-gui.sh:3501 lib/blame.tcl:106 +#: git-gui.sh:3149 lib/blame.tcl:104 msgid "File:" msgstr "" -#: git-gui.sh:3549 lib/choose_repository.tcl:1100 -msgid "Open" -msgstr "" - -#: git-gui.sh:3629 +#: git-gui.sh:3255 msgid "Refresh" msgstr "" -#: git-gui.sh:3650 +#: git-gui.sh:3276 msgid "Decrease Font Size" msgstr "" -#: git-gui.sh:3654 +#: git-gui.sh:3280 msgid "Increase Font Size" msgstr "" -#: git-gui.sh:3662 lib/blame.tcl:296 +#: git-gui.sh:3288 lib/blame.tcl:281 msgid "Encoding" msgstr "" -#: git-gui.sh:3673 +#: git-gui.sh:3299 msgid "Apply/Reverse Hunk" msgstr "" -#: git-gui.sh:3678 +#: git-gui.sh:3304 msgid "Apply/Reverse Line" msgstr "" -#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805 -msgid "Revert Hunk" -msgstr "" - -#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812 -msgid "Revert Line" -msgstr "" - -#: git-gui.sh:3694 git-gui.sh:3791 -msgid "Undo Last Revert" -msgstr "" - -#: git-gui.sh:3713 +#: git-gui.sh:3323 msgid "Run Merge Tool" msgstr "" -#: git-gui.sh:3718 +#: git-gui.sh:3328 msgid "Use Remote Version" msgstr "" -#: git-gui.sh:3722 +#: git-gui.sh:3332 msgid "Use Local Version" msgstr "" -#: git-gui.sh:3726 +#: git-gui.sh:3336 msgid "Revert To Base" msgstr "" -#: git-gui.sh:3744 +#: git-gui.sh:3354 msgid "Visualize These Changes In The Submodule" msgstr "" -#: git-gui.sh:3748 +#: git-gui.sh:3358 msgid "Visualize Current Branch History In The Submodule" msgstr "" -#: git-gui.sh:3752 +#: git-gui.sh:3362 msgid "Visualize All Branch History In The Submodule" msgstr "" -#: git-gui.sh:3757 +#: git-gui.sh:3367 msgid "Start git gui In The Submodule" msgstr "" -#: git-gui.sh:3793 +#: git-gui.sh:3389 msgid "Unstage Hunk From Commit" msgstr "" -#: git-gui.sh:3797 +#: git-gui.sh:3391 msgid "Unstage Lines From Commit" msgstr "" -#: git-gui.sh:3798 git-gui.sh:3809 -msgid "Revert Lines" -msgstr "" - -#: git-gui.sh:3800 +#: git-gui.sh:3393 msgid "Unstage Line From Commit" msgstr "" -#: git-gui.sh:3804 +#: git-gui.sh:3396 msgid "Stage Hunk For Commit" msgstr "" -#: git-gui.sh:3808 +#: git-gui.sh:3398 msgid "Stage Lines For Commit" msgstr "" -#: git-gui.sh:3811 +#: git-gui.sh:3400 msgid "Stage Line For Commit" msgstr "" -#: git-gui.sh:3861 +#: git-gui.sh:3424 msgid "Initializing..." msgstr "" -#: git-gui.sh:4017 +#: git-gui.sh:3541 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -577,14 +531,14 @@ msgid "" "\n" msgstr "" -#: git-gui.sh:4046 +#: git-gui.sh:3570 msgid "" "\n" "This is due to a known issue with the\n" "Tcl binary distributed by Cygwin." msgstr "" -#: git-gui.sh:4051 +#: git-gui.sh:3575 #, tcl-format msgid "" "\n" @@ -595,2072 +549,1846 @@ msgid "" "~/.gitconfig file.\n" msgstr "" -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." msgstr "" -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" +#: lib/blame.tcl:72 +msgid "File Viewer" msgstr "" -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" +#: lib/blame.tcl:78 +msgid "Commit:" msgstr "" -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." +#: lib/blame.tcl:271 +msgid "Copy Commit" msgstr "" -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" +#: lib/blame.tcl:275 +msgid "Find Text..." msgstr "" -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" +#: lib/blame.tcl:284 +msgid "Do Full Copy Detection" msgstr "" -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" +#: lib/blame.tcl:288 +msgid "Show History Context" msgstr "" -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" +#: lib/blame.tcl:291 +msgid "Blame Parent Commit" msgstr "" -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" +#: lib/blame.tcl:450 +#, tcl-format +msgid "Reading %s..." msgstr "" -#: lib/transport.tcl:6 lib/remote_add.tcl:132 -#, tcl-format -msgid "fetch %s" +#: lib/blame.tcl:557 +msgid "Loading copy/move tracking annotations..." msgstr "" -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" +#: lib/blame.tcl:577 +msgid "lines annotated" msgstr "" -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" +#: lib/blame.tcl:769 +msgid "Loading original location annotations..." msgstr "" -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" +#: lib/blame.tcl:772 +msgid "Annotation complete." msgstr "" -#: lib/transport.tcl:25 -msgid "fetch all remotes" +#: lib/blame.tcl:802 +msgid "Busy" msgstr "" -#: lib/transport.tcl:26 -msgid "Fetching new changes from all remotes" +#: lib/blame.tcl:803 +msgid "Annotation process is already running." msgstr "" -#: lib/transport.tcl:40 -msgid "remote prune all remotes" +#: lib/blame.tcl:842 +msgid "Running thorough copy detection..." msgstr "" -#: lib/transport.tcl:41 -msgid "Pruning tracking branches deleted from all remotes" +#: lib/blame.tcl:910 +msgid "Loading annotation..." msgstr "" -#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 -#: lib/remote_add.tcl:162 -#, tcl-format -msgid "push %s" +#: lib/blame.tcl:963 +msgid "Author:" msgstr "" -#: lib/transport.tcl:55 -#, tcl-format -msgid "Pushing changes to %s" +#: lib/blame.tcl:967 +msgid "Committer:" msgstr "" -#: lib/transport.tcl:93 -#, tcl-format -msgid "Mirroring to %s" +#: lib/blame.tcl:972 +msgid "Original File:" msgstr "" -#: lib/transport.tcl:111 -#, tcl-format -msgid "Pushing %s %s to %s" +#: lib/blame.tcl:1020 +msgid "Cannot find HEAD commit:" msgstr "" -#: lib/transport.tcl:132 -msgid "Push Branches" +#: lib/blame.tcl:1075 +msgid "Cannot find parent commit:" msgstr "" -#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 -#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 -#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 -#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 -#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 -msgid "Cancel" +#: lib/blame.tcl:1090 +msgid "Unable to display parent" msgstr "" -#: lib/transport.tcl:147 -msgid "Source Branches" +#: lib/blame.tcl:1091 lib/diff.tcl:320 +msgid "Error loading diff:" msgstr "" -#: lib/transport.tcl:162 -msgid "Destination Repository" +#: lib/blame.tcl:1231 +msgid "Originally By:" msgstr "" -#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 -msgid "Remote:" +#: lib/blame.tcl:1237 +msgid "In File:" msgstr "" -#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 -msgid "Arbitrary Location:" +#: lib/blame.tcl:1242 +msgid "Copied Or Moved Here By:" msgstr "" -#: lib/transport.tcl:205 -msgid "Transfer Options" +#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +msgid "Checkout Branch" msgstr "" -#: lib/transport.tcl:207 -msgid "Force overwrite existing branch (may discard changes)" +#: lib/branch_checkout.tcl:23 +msgid "Checkout" msgstr "" -#: lib/transport.tcl:211 -msgid "Use thin pack (for slow network connections)" +#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 +#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 +#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 +#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 +#: lib/transport.tcl:108 +msgid "Cancel" msgstr "" -#: lib/transport.tcl:215 -msgid "Include tags" +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +msgid "Revision" msgstr "" -#: lib/transport.tcl:229 -#, tcl-format -msgid "%s (%s): Push" +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +msgid "Options" msgstr "" -#: lib/checkout_op.tcl:85 -#, tcl-format -msgid "Fetching %s from %s" +#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" msgstr "" -#: lib/checkout_op.tcl:133 -#, tcl-format -msgid "fatal: Cannot resolve %s" +#: lib/branch_checkout.tcl:44 +msgid "Detach From Local Branch" msgstr "" -#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 -#: lib/database.tcl:30 -msgid "Close" +#: lib/branch_create.tcl:22 +msgid "Create Branch" msgstr "" -#: lib/checkout_op.tcl:175 -#, tcl-format -msgid "Branch '%s' does not exist." +#: lib/branch_create.tcl:27 +msgid "Create New Branch" msgstr "" -#: lib/checkout_op.tcl:194 -#, tcl-format -msgid "Failed to configure simplified git-pull for '%s'." +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +msgid "Create" msgstr "" -#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 -#, tcl-format -msgid "Branch '%s' already exists." +#: lib/branch_create.tcl:40 +msgid "Branch Name" msgstr "" -#: lib/checkout_op.tcl:229 -#, tcl-format -msgid "" -"Branch '%s' already exists.\n" -"\n" -"It cannot fast-forward to %s.\n" -"A merge is required." +#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +msgid "Name:" msgstr "" -#: lib/checkout_op.tcl:243 -#, tcl-format -msgid "Merge strategy '%s' not supported." +#: lib/branch_create.tcl:58 +msgid "Match Tracking Branch Name" msgstr "" -#: lib/checkout_op.tcl:262 -#, tcl-format -msgid "Failed to update '%s'." +#: lib/branch_create.tcl:66 +msgid "Starting Revision" msgstr "" -#: lib/checkout_op.tcl:274 -msgid "Staging area (index) is already locked." +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" msgstr "" -#: lib/checkout_op.tcl:289 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before the current branch can be changed.\n" -"\n" -"The rescan will be automatically started now.\n" +#: lib/branch_create.tcl:75 +msgid "No" msgstr "" -#: lib/checkout_op.tcl:345 -#, tcl-format -msgid "Updating working directory to '%s'..." +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" msgstr "" -#: lib/checkout_op.tcl:346 -msgid "files checked out" +#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +msgid "Reset" msgstr "" -#: lib/checkout_op.tcl:377 -#, tcl-format -msgid "Aborted checkout of '%s' (file level merging is required)." +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" msgstr "" -#: lib/checkout_op.tcl:378 -msgid "File level merge required." +#: lib/branch_create.tcl:131 +msgid "Please select a tracking branch." msgstr "" -#: lib/checkout_op.tcl:382 +#: lib/branch_create.tcl:140 #, tcl-format -msgid "Staying on branch '%s'." +msgid "Tracking branch %s is not a branch in the remote repository." msgstr "" -#: lib/checkout_op.tcl:453 -msgid "" -"You are no longer on a local branch.\n" -"\n" -"If you wanted to be on a branch, create one now starting from 'This Detached " -"Checkout'." +#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +msgid "Please supply a branch name." msgstr "" -#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 +#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 #, tcl-format -msgid "Checked out '%s'." +msgid "'%s' is not an acceptable branch name." msgstr "" -#: lib/checkout_op.tcl:536 -#, tcl-format -msgid "Resetting '%s' to '%s' will lose the following commits:" +#: lib/branch_delete.tcl:15 +msgid "Delete Branch" msgstr "" -#: lib/checkout_op.tcl:558 -msgid "Recovering lost commits may not be easy." +#: lib/branch_delete.tcl:20 +msgid "Delete Local Branch" msgstr "" -#: lib/checkout_op.tcl:563 -#, tcl-format -msgid "Reset '%s'?" +#: lib/branch_delete.tcl:37 +msgid "Local Branches" msgstr "" -#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 -msgid "Visualize" +#: lib/branch_delete.tcl:52 +msgid "Delete Only If Merged Into" msgstr "" -#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 -msgid "Reset" +#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 +msgid "Always (Do not perform merge checks)" msgstr "" -#: lib/checkout_op.tcl:636 +#: lib/branch_delete.tcl:103 #, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "" + +#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 msgid "" -"Failed to set current branch.\n" -"\n" -"This working directory is only partially switched. We successfully updated " -"your files, but failed to update an internal Git file.\n" +"Recovering deleted branches is difficult.\n" "\n" -"This should not have occurred. %s will now close and give up." +"Delete the selected branches?" msgstr "" -#: lib/remote_add.tcl:20 +#: lib/branch_delete.tcl:141 #, tcl-format -msgid "%s (%s): Add Remote" -msgstr "" - -#: lib/remote_add.tcl:25 -msgid "Add New Remote" -msgstr "" - -#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 -msgid "Add" -msgstr "" - -#: lib/remote_add.tcl:39 -msgid "Remote Details" -msgstr "" - -#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 -msgid "Name:" -msgstr "" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "" - -#: lib/remote_add.tcl:60 -msgid "Further Action" -msgstr "" - -#: lib/remote_add.tcl:63 -msgid "Fetch Immediately" -msgstr "" - -#: lib/remote_add.tcl:69 -msgid "Initialize Remote Repository and Push" +msgid "" +"Failed to delete branches:\n" +"%s" msgstr "" -#: lib/remote_add.tcl:75 -msgid "Do Nothing Else Now" +#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +msgid "Rename Branch" msgstr "" -#: lib/remote_add.tcl:100 -msgid "Please supply a remote name." +#: lib/branch_rename.tcl:26 +msgid "Rename" msgstr "" -#: lib/remote_add.tcl:113 -#, tcl-format -msgid "'%s' is not an acceptable remote name." +#: lib/branch_rename.tcl:36 +msgid "Branch:" msgstr "" -#: lib/remote_add.tcl:124 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." +#: lib/branch_rename.tcl:39 +msgid "New Name:" msgstr "" -#: lib/remote_add.tcl:133 -#, tcl-format -msgid "Fetching the %s" +#: lib/branch_rename.tcl:75 +msgid "Please select a branch to rename." msgstr "" -#: lib/remote_add.tcl:156 +#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 #, tcl-format -msgid "Do not know how to initialize repository at location '%s'." +msgid "Branch '%s' already exists." msgstr "" -#: lib/remote_add.tcl:163 +#: lib/branch_rename.tcl:117 #, tcl-format -msgid "Setting up the %s (at %s)" +msgid "Failed to rename '%s'." msgstr "" #: lib/browser.tcl:17 msgid "Starting..." msgstr "" -#: lib/browser.tcl:27 -#, tcl-format -msgid "%s (%s): File Browser" +#: lib/browser.tcl:26 +msgid "File Browser" msgstr "" -#: lib/browser.tcl:132 lib/browser.tcl:149 +#: lib/browser.tcl:126 lib/browser.tcl:143 #, tcl-format msgid "Loading %s..." msgstr "" -#: lib/browser.tcl:193 +#: lib/browser.tcl:187 msgid "[Up To Parent]" msgstr "" -#: lib/browser.tcl:275 -#, tcl-format -msgid "%s (%s): Browse Branch Files" -msgstr "" - -#: lib/browser.tcl:282 +#: lib/browser.tcl:267 lib/browser.tcl:273 msgid "Browse Branch Files" msgstr "" -#: lib/browser.tcl:288 lib/choose_repository.tcl:437 -#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 -#: lib/choose_repository.tcl:1115 +#: lib/browser.tcl:278 lib/choose_repository.tcl:398 +#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 +#: lib/choose_repository.tcl:1028 msgid "Browse" msgstr "" -#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 -msgid "Revision" -msgstr "" - -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "" - -#: lib/index.tcl:30 -msgid "Index Error" -msgstr "" - -#: lib/index.tcl:32 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "" - -#: lib/index.tcl:43 -msgid "Continue" -msgstr "" - -#: lib/index.tcl:46 -msgid "Unlock Index" -msgstr "" - -#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 -#: lib/choose_repository.tcl:999 -msgid "files" -msgstr "" - -#: lib/index.tcl:326 -msgid "Unstaging selected files from commit" -msgstr "" - -#: lib/index.tcl:330 +#: lib/checkout_op.tcl:85 #, tcl-format -msgid "Unstaging %s from commit" +msgid "Fetching %s from %s" msgstr "" -#: lib/index.tcl:369 -msgid "Ready to commit." +#: lib/checkout_op.tcl:133 +#, tcl-format +msgid "fatal: Cannot resolve %s" msgstr "" -#: lib/index.tcl:378 -msgid "Adding selected files" +#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 +#: lib/sshkey.tcl:53 +msgid "Close" msgstr "" -#: lib/index.tcl:382 +#: lib/checkout_op.tcl:175 #, tcl-format -msgid "Adding %s" +msgid "Branch '%s' does not exist." msgstr "" -#: lib/index.tcl:412 +#: lib/checkout_op.tcl:194 #, tcl-format -msgid "Stage %d untracked files?" +msgid "Failed to configure simplified git-pull for '%s'." msgstr "" -#: lib/index.tcl:420 -msgid "Adding all changed files" +#: lib/checkout_op.tcl:229 +#, tcl-format +msgid "" +"Branch '%s' already exists.\n" +"\n" +"It cannot fast-forward to %s.\n" +"A merge is required." msgstr "" -#: lib/index.tcl:503 +#: lib/checkout_op.tcl:243 #, tcl-format -msgid "Revert changes in file %s?" +msgid "Merge strategy '%s' not supported." msgstr "" -#: lib/index.tcl:508 +#: lib/checkout_op.tcl:262 #, tcl-format -msgid "Revert changes in these %i files?" +msgid "Failed to update '%s'." msgstr "" -#: lib/index.tcl:517 -msgid "Any unstaged changes will be permanently lost by the revert." +#: lib/checkout_op.tcl:274 +msgid "Staging area (index) is already locked." msgstr "" -#: lib/index.tcl:520 lib/index.tcl:563 -msgid "Do Nothing" +#: lib/checkout_op.tcl:289 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before the current branch can be changed.\n" +"\n" +"The rescan will be automatically started now.\n" msgstr "" -#: lib/index.tcl:545 +#: lib/checkout_op.tcl:345 #, tcl-format -msgid "Delete untracked file %s?" +msgid "Updating working directory to '%s'..." msgstr "" -#: lib/index.tcl:550 -#, tcl-format -msgid "Delete these %i untracked files?" +#: lib/checkout_op.tcl:346 +msgid "files checked out" msgstr "" -#: lib/index.tcl:560 -msgid "Files will be permanently deleted." +#: lib/checkout_op.tcl:376 +#, tcl-format +msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "" -#: lib/index.tcl:564 -msgid "Delete Files" +#: lib/checkout_op.tcl:377 +msgid "File level merge required." msgstr "" -#: lib/index.tcl:586 -msgid "Deleting" +#: lib/checkout_op.tcl:381 +#, tcl-format +msgid "Staying on branch '%s'." msgstr "" -#: lib/index.tcl:665 -msgid "Encountered errors deleting files:\n" +#: lib/checkout_op.tcl:452 +msgid "" +"You are no longer on a local branch.\n" +"\n" +"If you wanted to be on a branch, create one now starting from 'This Detached " +"Checkout'." msgstr "" -#: lib/index.tcl:674 +#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 #, tcl-format -msgid "None of the %d selected files could be deleted." +msgid "Checked out '%s'." msgstr "" -#: lib/index.tcl:679 +#: lib/checkout_op.tcl:535 #, tcl-format -msgid "%d of the %d selected files could not be deleted." +msgid "Resetting '%s' to '%s' will lose the following commits:" msgstr "" -#: lib/index.tcl:726 -msgid "Reverting selected files" +#: lib/checkout_op.tcl:557 +msgid "Recovering lost commits may not be easy." msgstr "" -#: lib/index.tcl:730 +#: lib/checkout_op.tcl:562 #, tcl-format -msgid "Reverting %s" +msgid "Reset '%s'?" msgstr "" -#: lib/branch_checkout.tcl:16 -#, tcl-format -msgid "%s (%s): Checkout Branch" +#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +msgid "Visualize" msgstr "" -#: lib/branch_checkout.tcl:21 -msgid "Checkout Branch" +#: lib/checkout_op.tcl:635 +#, tcl-format +msgid "" +"Failed to set current branch.\n" +"\n" +"This working directory is only partially switched. We successfully updated " +"your files, but failed to update an internal Git file.\n" +"\n" +"This should not have occurred. %s will now close and give up." msgstr "" -#: lib/branch_checkout.tcl:26 -msgid "Checkout" +#: lib/choose_font.tcl:39 +msgid "Select" msgstr "" -#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 -msgid "Options" +#: lib/choose_font.tcl:53 +msgid "Font Family" msgstr "" -#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" +#: lib/choose_font.tcl:74 +msgid "Font Size" msgstr "" -#: lib/branch_checkout.tcl:47 -msgid "Detach From Local Branch" +#: lib/choose_font.tcl:91 +msgid "Font Example" msgstr "" -#: lib/status_bar.tcl:263 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" +#: lib/choose_font.tcl:103 +msgid "" +"This is example text.\n" +"If you like this text, it can be your font." msgstr "" -#: lib/remote.tcl:200 -msgid "Push to" +#: lib/choose_repository.tcl:28 +msgid "Git Gui" msgstr "" -#: lib/remote.tcl:218 -msgid "Remove Remote" +#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +msgid "Create New Repository" msgstr "" -#: lib/remote.tcl:223 -msgid "Prune from" +#: lib/choose_repository.tcl:93 +msgid "New..." msgstr "" -#: lib/remote.tcl:228 -msgid "Fetch from" +#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +msgid "Clone Existing Repository" msgstr "" -#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 -msgid "All" +#: lib/choose_repository.tcl:106 +msgid "Clone..." msgstr "" -#: lib/branch_rename.tcl:15 -#, tcl-format -msgid "%s (%s): Rename Branch" +#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +msgid "Open Existing Repository" msgstr "" -#: lib/branch_rename.tcl:23 -msgid "Rename Branch" +#: lib/choose_repository.tcl:119 +msgid "Open..." msgstr "" -#: lib/branch_rename.tcl:28 -msgid "Rename" +#: lib/choose_repository.tcl:132 +msgid "Recent Repositories" msgstr "" -#: lib/branch_rename.tcl:38 -msgid "Branch:" +#: lib/choose_repository.tcl:138 +msgid "Open Recent Repository:" msgstr "" -#: lib/branch_rename.tcl:46 -msgid "New Name:" +#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 +#: lib/choose_repository.tcl:320 +#, tcl-format +msgid "Failed to create repository %s:" msgstr "" -#: lib/branch_rename.tcl:81 -msgid "Please select a branch to rename." +#: lib/choose_repository.tcl:391 +msgid "Directory:" msgstr "" -#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 -msgid "Please supply a branch name." +#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 +#: lib/choose_repository.tcl:1052 +msgid "Git Repository" msgstr "" -#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 +#: lib/choose_repository.tcl:448 #, tcl-format -msgid "'%s' is not an acceptable branch name." +msgid "Directory %s already exists." msgstr "" -#: lib/branch_rename.tcl:123 +#: lib/choose_repository.tcl:452 #, tcl-format -msgid "Failed to rename '%s'." -msgstr "" - -#: lib/choose_font.tcl:41 -msgid "Select" -msgstr "" - -#: lib/choose_font.tcl:55 -msgid "Font Family" +msgid "File %s already exists." msgstr "" -#: lib/choose_font.tcl:76 -msgid "Font Size" +#: lib/choose_repository.tcl:466 +msgid "Clone" msgstr "" -#: lib/choose_font.tcl:93 -msgid "Font Example" +#: lib/choose_repository.tcl:479 +msgid "Source Location:" msgstr "" -#: lib/choose_font.tcl:105 -msgid "" -"This is example text.\n" -"If you like this text, it can be your font." +#: lib/choose_repository.tcl:490 +msgid "Target Directory:" msgstr "" -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" +#: lib/choose_repository.tcl:502 +msgid "Clone Type:" msgstr "" -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" +#: lib/choose_repository.tcl:508 +msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "" -#: lib/option.tcl:119 -msgid "Restore Defaults" +#: lib/choose_repository.tcl:514 +msgid "Full Copy (Slower, Redundant Backup)" msgstr "" -#: lib/option.tcl:123 -msgid "Save" +#: lib/choose_repository.tcl:520 +msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "" -#: lib/option.tcl:133 +#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 +#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 +#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 #, tcl-format -msgid "%s Repository" -msgstr "" - -#: lib/option.tcl:134 -msgid "Global (All Repositories)" -msgstr "" - -#: lib/option.tcl:140 -msgid "User Name" -msgstr "" - -#: lib/option.tcl:141 -msgid "Email Address" -msgstr "" - -#: lib/option.tcl:143 -msgid "Summarize Merge Commits" +msgid "Not a Git repository: %s" msgstr "" -#: lib/option.tcl:144 -msgid "Merge Verbosity" +#: lib/choose_repository.tcl:592 +msgid "Standard only available for local repository." msgstr "" -#: lib/option.tcl:145 -msgid "Show Diffstat After Merge" +#: lib/choose_repository.tcl:596 +msgid "Shared only available for local repository." msgstr "" -#: lib/option.tcl:146 -msgid "Use Merge Tool" +#: lib/choose_repository.tcl:617 +#, tcl-format +msgid "Location %s already exists." msgstr "" -#: lib/option.tcl:148 -msgid "Trust File Modification Timestamps" +#: lib/choose_repository.tcl:628 +msgid "Failed to configure origin" msgstr "" -#: lib/option.tcl:149 -msgid "Prune Tracking Branches During Fetch" +#: lib/choose_repository.tcl:640 +msgid "Counting objects" msgstr "" -#: lib/option.tcl:150 -msgid "Match Tracking Branches" +#: lib/choose_repository.tcl:641 +msgid "buckets" msgstr "" -#: lib/option.tcl:151 -msgid "Use Textconv For Diffs and Blames" +#: lib/choose_repository.tcl:665 +#, tcl-format +msgid "Unable to copy objects/info/alternates: %s" msgstr "" -#: lib/option.tcl:152 -msgid "Blame Copy Only On Changed Files" +#: lib/choose_repository.tcl:701 +#, tcl-format +msgid "Nothing to clone from %s." msgstr "" -#: lib/option.tcl:153 -msgid "Maximum Length of Recent Repositories List" +#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 +#: lib/choose_repository.tcl:929 +msgid "The 'master' branch has not been initialized." msgstr "" -#: lib/option.tcl:154 -msgid "Minimum Letters To Blame Copy On" +#: lib/choose_repository.tcl:716 +msgid "Hardlinks are unavailable. Falling back to copying." msgstr "" -#: lib/option.tcl:155 -msgid "Blame History Context Radius (days)" +#: lib/choose_repository.tcl:728 +#, tcl-format +msgid "Cloning from %s" msgstr "" -#: lib/option.tcl:156 -msgid "Number of Diff Context Lines" +#: lib/choose_repository.tcl:759 +msgid "Copying objects" msgstr "" -#: lib/option.tcl:157 -msgid "Additional Diff Parameters" +#: lib/choose_repository.tcl:760 +msgid "KiB" msgstr "" -#: lib/option.tcl:158 -msgid "Commit Message Text Width" +#: lib/choose_repository.tcl:784 +#, tcl-format +msgid "Unable to copy object: %s" msgstr "" -#: lib/option.tcl:159 -msgid "New Branch Name Template" +#: lib/choose_repository.tcl:794 +msgid "Linking objects" msgstr "" -#: lib/option.tcl:160 -msgid "Default File Contents Encoding" +#: lib/choose_repository.tcl:795 +msgid "objects" msgstr "" -#: lib/option.tcl:161 -msgid "Warn before committing to a detached head" +#: lib/choose_repository.tcl:803 +#, tcl-format +msgid "Unable to hardlink object: %s" msgstr "" -#: lib/option.tcl:162 -msgid "Staging of untracked files" +#: lib/choose_repository.tcl:858 +msgid "Cannot fetch branches and objects. See console output for details." msgstr "" -#: lib/option.tcl:163 -msgid "Show untracked files" +#: lib/choose_repository.tcl:869 +msgid "Cannot fetch tags. See console output for details." msgstr "" -#: lib/option.tcl:164 -msgid "Tab spacing" +#: lib/choose_repository.tcl:893 +msgid "Cannot determine HEAD. See console output for details." msgstr "" -#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 -#: lib/database.tcl:57 +#: lib/choose_repository.tcl:902 #, tcl-format -msgid "%s:" -msgstr "" - -#: lib/option.tcl:210 -msgid "Change" +msgid "Unable to cleanup %s" msgstr "" -#: lib/option.tcl:254 -msgid "Spelling Dictionary:" +#: lib/choose_repository.tcl:908 +msgid "Clone failed." msgstr "" -#: lib/option.tcl:284 -msgid "Change Font" +#: lib/choose_repository.tcl:915 +msgid "No default branch obtained." msgstr "" -#: lib/option.tcl:288 +#: lib/choose_repository.tcl:926 #, tcl-format -msgid "Choose %s" +msgid "Cannot resolve %s as a commit." msgstr "" -#: lib/option.tcl:294 -msgid "pt." +#: lib/choose_repository.tcl:938 +msgid "Creating working directory" msgstr "" -#: lib/option.tcl:308 -msgid "Preferences" +#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 +#: lib/index.tcl:198 +msgid "files" msgstr "" -#: lib/option.tcl:345 -msgid "Failed to completely save options:" +#: lib/choose_repository.tcl:968 +msgid "Initial file checkout failed." msgstr "" -#: lib/encoding.tcl:443 -msgid "Default" +#: lib/choose_repository.tcl:1011 +msgid "Open" msgstr "" -#: lib/encoding.tcl:448 -#, tcl-format -msgid "System (%s)" +#: lib/choose_repository.tcl:1021 +msgid "Repository:" msgstr "" -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" +#: lib/choose_repository.tcl:1072 +#, tcl-format +msgid "Failed to open repository %s:" msgstr "" -#: lib/tools.tcl:76 -#, tcl-format -msgid "Running %s requires a selected file." +#: lib/choose_rev.tcl:53 +msgid "This Detached Checkout" msgstr "" -#: lib/tools.tcl:92 -#, tcl-format -msgid "Are you sure you want to run %1$s on file \"%2$s\"?" +#: lib/choose_rev.tcl:60 +msgid "Revision Expression:" msgstr "" -#: lib/tools.tcl:96 -#, tcl-format -msgid "Are you sure you want to run %s?" +#: lib/choose_rev.tcl:74 +msgid "Local Branch" msgstr "" -#: lib/tools.tcl:118 -#, tcl-format -msgid "Tool: %s" +#: lib/choose_rev.tcl:79 +msgid "Tracking Branch" msgstr "" -#: lib/tools.tcl:119 -#, tcl-format -msgid "Running: %s" +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +msgid "Tag" msgstr "" -#: lib/tools.tcl:158 +#: lib/choose_rev.tcl:317 #, tcl-format -msgid "Tool completed successfully: %s" +msgid "Invalid revision: %s" msgstr "" -#: lib/tools.tcl:160 -#, tcl-format -msgid "Tool failed: %s" +#: lib/choose_rev.tcl:338 +msgid "No revision selected." msgstr "" -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" +#: lib/choose_rev.tcl:346 +msgid "Revision expression is empty." msgstr "" -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" +#: lib/choose_rev.tcl:531 +msgid "Updated" msgstr "" -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" +#: lib/choose_rev.tcl:559 +msgid "URL" msgstr "" -#: lib/mergetool.tcl:14 -#, tcl-format +#: lib/commit.tcl:9 msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" +"There is nothing to amend.\n" "\n" -"This operation can be undone only by restarting the merge." -msgstr "" - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" +"You are about to create the initial commit. There is no commit before this " +"to amend.\n" msgstr "" -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" +#: lib/commit.tcl:18 +msgid "" +"Cannot amend while merging.\n" +"\n" +"You are currently in the middle of a merge that has not been fully " +"completed. You cannot amend the prior commit unless you first abort the " +"current merge activity.\n" msgstr "" -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" +#: lib/commit.tcl:48 +msgid "Error loading commit data for amend:" msgstr "" -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" +#: lib/commit.tcl:75 +msgid "Unable to obtain your identity:" msgstr "" -#: lib/mergetool.tcl:246 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" +#: lib/commit.tcl:80 +msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "" -#: lib/mergetool.tcl:275 +#: lib/commit.tcl:129 #, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "" - -#: lib/mergetool.tcl:310 -msgid "Merge tool is already running, terminate it?" +msgid "warning: Tcl does not support encoding '%s'." msgstr "" -#: lib/mergetool.tcl:330 -#, tcl-format +#: lib/commit.tcl:149 msgid "" -"Error retrieving versions:\n" -"%s" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before another commit can be created.\n" +"\n" +"The rescan will be automatically started now.\n" msgstr "" -#: lib/mergetool.tcl:350 +#: lib/commit.tcl:172 #, tcl-format msgid "" -"Could not start the merge tool:\n" +"Unmerged files cannot be committed.\n" "\n" -"%s" -msgstr "" - -#: lib/mergetool.tcl:354 -msgid "Running merge tool..." -msgstr "" - -#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 -msgid "Merge tool failed." +"File %s has merge conflicts. You must resolve them and stage the file " +"before committing.\n" msgstr "" -#: lib/tools_dlg.tcl:22 +#: lib/commit.tcl:180 #, tcl-format -msgid "%s (%s): Add Tool" -msgstr "" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "" - -#: lib/tools_dlg.tcl:34 -msgid "Add globally" +msgid "" +"Unknown file state %s detected.\n" +"\n" +"File %s cannot be committed by this program.\n" msgstr "" -#: lib/tools_dlg.tcl:46 -msgid "Tool Details" +#: lib/commit.tcl:188 +msgid "" +"No changes to commit.\n" +"\n" +"You must stage at least 1 file before you can commit.\n" msgstr "" -#: lib/tools_dlg.tcl:49 -msgid "Use '/' separators to create a submenu tree:" +#: lib/commit.tcl:203 +msgid "" +"Please supply a commit message.\n" +"\n" +"A good commit message has the following format:\n" +"\n" +"- First line: Describe in one sentence what you did.\n" +"- Second line: Blank\n" +"- Remaining lines: Describe why this change is good.\n" msgstr "" -#: lib/tools_dlg.tcl:60 -msgid "Command:" +#: lib/commit.tcl:234 +msgid "Calling pre-commit hook..." msgstr "" -#: lib/tools_dlg.tcl:71 -msgid "Show a dialog before running" +#: lib/commit.tcl:249 +msgid "Commit declined by pre-commit hook." msgstr "" -#: lib/tools_dlg.tcl:77 -msgid "Ask the user to select a revision (sets $REVISION)" +#: lib/commit.tcl:272 +msgid "Calling commit-msg hook..." msgstr "" -#: lib/tools_dlg.tcl:82 -msgid "Ask the user for additional arguments (sets $ARGS)" +#: lib/commit.tcl:287 +msgid "Commit declined by commit-msg hook." msgstr "" -#: lib/tools_dlg.tcl:89 -msgid "Don't show the command output window" +#: lib/commit.tcl:300 +msgid "Committing changes..." msgstr "" -#: lib/tools_dlg.tcl:94 -msgid "Run only if a diff is selected ($FILENAME not empty)" +#: lib/commit.tcl:316 +msgid "write-tree failed:" msgstr "" -#: lib/tools_dlg.tcl:118 -msgid "Please supply a name for the tool." +#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +msgid "Commit failed." msgstr "" -#: lib/tools_dlg.tcl:126 +#: lib/commit.tcl:334 #, tcl-format -msgid "Tool '%s' already exists." +msgid "Commit %s appears to be corrupt" msgstr "" -#: lib/tools_dlg.tcl:148 -#, tcl-format +#: lib/commit.tcl:339 msgid "" -"Could not add tool:\n" -"%s" -msgstr "" - -#: lib/tools_dlg.tcl:187 -#, tcl-format -msgid "%s (%s): Remove Tool" -msgstr "" - -#: lib/tools_dlg.tcl:193 -msgid "Remove Tool Commands" +"No changes to commit.\n" +"\n" +"No files were modified by this commit and it was not a merge commit.\n" +"\n" +"A rescan will be automatically started now.\n" msgstr "" -#: lib/tools_dlg.tcl:198 -msgid "Remove" +#: lib/commit.tcl:346 +msgid "No changes to commit." msgstr "" -#: lib/tools_dlg.tcl:231 -msgid "(Blue denotes repository-local tools)" +#: lib/commit.tcl:360 +msgid "commit-tree failed:" msgstr "" -#: lib/tools_dlg.tcl:283 -#, tcl-format -msgid "%s (%s):" +#: lib/commit.tcl:381 +msgid "update-ref failed:" msgstr "" -#: lib/tools_dlg.tcl:292 +#: lib/commit.tcl:469 #, tcl-format -msgid "Run Command: %s" -msgstr "" - -#: lib/tools_dlg.tcl:306 -msgid "Arguments" -msgstr "" - -#: lib/tools_dlg.tcl:341 -msgid "OK" -msgstr "" - -#: lib/search.tcl:48 -msgid "Find:" -msgstr "" - -#: lib/search.tcl:50 -msgid "Next" -msgstr "" - -#: lib/search.tcl:51 -msgid "Prev" -msgstr "" - -#: lib/search.tcl:52 -msgid "RegExp" +msgid "Created commit %s: %s" msgstr "" -#: lib/search.tcl:54 -msgid "Case" +#: lib/console.tcl:59 +msgid "Working... please wait..." msgstr "" -#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 -#, tcl-format -msgid "%s (%s): Create Desktop Icon" +#: lib/console.tcl:186 +msgid "Success" msgstr "" -#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 -msgid "Cannot write shortcut:" +#: lib/console.tcl:200 +msgid "Error: Command Failed" msgstr "" -#: lib/shortcut.tcl:140 -msgid "Cannot write icon:" +#: lib/database.tcl:43 +msgid "Number of loose objects" msgstr "" -#: lib/remote_branch_delete.tcl:29 -#, tcl-format -msgid "%s (%s): Delete Branch Remotely" +#: lib/database.tcl:44 +msgid "Disk space used by loose objects" msgstr "" -#: lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" +#: lib/database.tcl:45 +msgid "Number of packed objects" msgstr "" -#: lib/remote_branch_delete.tcl:48 -msgid "From Repository" +#: lib/database.tcl:46 +msgid "Number of packs" msgstr "" -#: lib/remote_branch_delete.tcl:88 -msgid "Branches" +#: lib/database.tcl:47 +msgid "Disk space used by packed objects" msgstr "" -#: lib/remote_branch_delete.tcl:110 -msgid "Delete Only If" +#: lib/database.tcl:48 +msgid "Packed objects waiting for pruning" msgstr "" -#: lib/remote_branch_delete.tcl:112 -msgid "Merged Into:" +#: lib/database.tcl:49 +msgid "Garbage files" msgstr "" -#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 -msgid "Always (Do not perform merge checks)" +#: lib/database.tcl:72 +msgid "Compressing the object database" msgstr "" -#: lib/remote_branch_delete.tcl:153 -msgid "A branch is required for 'Merged Into'." +#: lib/database.tcl:83 +msgid "Verifying the object database with fsck-objects" msgstr "" -#: lib/remote_branch_delete.tcl:185 +#: lib/database.tcl:107 #, tcl-format msgid "" -"The following branches are not completely merged into %s:\n" +"This repository currently has approximately %i loose objects.\n" "\n" -" - %s" +"To maintain optimal performance it is strongly recommended that you compress " +"the database.\n" +"\n" +"Compress the database now?" msgstr "" -#: lib/remote_branch_delete.tcl:190 +#: lib/date.tcl:25 #, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "" - -#: lib/remote_branch_delete.tcl:208 -msgid "Please select one or more branches to delete." +msgid "Invalid date from Git: %s" msgstr "" -#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 +#: lib/diff.tcl:64 +#, tcl-format msgid "" -"Recovering deleted branches is difficult.\n" +"No differences detected.\n" "\n" -"Delete the selected branches?" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but " +"the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have " +"the same state." msgstr "" -#: lib/remote_branch_delete.tcl:227 +#: lib/diff.tcl:104 #, tcl-format -msgid "Deleting branches from %s" +msgid "Loading diff of %s..." msgstr "" -#: lib/remote_branch_delete.tcl:300 -msgid "No repository selected." +#: lib/diff.tcl:125 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" msgstr "" -#: lib/remote_branch_delete.tcl:305 -#, tcl-format -msgid "Scanning %s..." +#: lib/diff.tcl:130 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" msgstr "" -#: lib/choose_repository.tcl:45 -msgid "Git Gui" +#: lib/diff.tcl:137 +msgid "LOCAL:\n" msgstr "" -#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 -msgid "Create New Repository" +#: lib/diff.tcl:140 +msgid "REMOTE:\n" msgstr "" -#: lib/choose_repository.tcl:110 -msgid "New..." +#: lib/diff.tcl:202 lib/diff.tcl:319 +#, tcl-format +msgid "Unable to display %s" msgstr "" -#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 -msgid "Clone Existing Repository" +#: lib/diff.tcl:203 +msgid "Error loading file:" msgstr "" -#: lib/choose_repository.tcl:128 -msgid "Clone..." +#: lib/diff.tcl:210 +msgid "Git Repository (subproject)" msgstr "" -#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 -msgid "Open Existing Repository" +#: lib/diff.tcl:222 +msgid "* Binary file (not showing content)." msgstr "" -#: lib/choose_repository.tcl:141 -msgid "Open..." +#: lib/diff.tcl:227 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" msgstr "" -#: lib/choose_repository.tcl:154 -msgid "Recent Repositories" +#: lib/diff.tcl:233 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" msgstr "" -#: lib/choose_repository.tcl:164 -msgid "Open Recent Repository:" +#: lib/diff.tcl:482 +msgid "Failed to unstage selected hunk." msgstr "" -#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 -#: lib/choose_repository.tcl:345 -#, tcl-format -msgid "Failed to create repository %s:" +#: lib/diff.tcl:489 +msgid "Failed to stage selected hunk." msgstr "" -#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 -msgid "Create" +#: lib/diff.tcl:568 +msgid "Failed to unstage selected line." msgstr "" -#: lib/choose_repository.tcl:432 -msgid "Directory:" +#: lib/diff.tcl:576 +msgid "Failed to stage selected line." msgstr "" -#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 -#: lib/choose_repository.tcl:1139 -msgid "Git Repository" +#: lib/encoding.tcl:443 +msgid "Default" msgstr "" -#: lib/choose_repository.tcl:487 +#: lib/encoding.tcl:448 #, tcl-format -msgid "Directory %s already exists." +msgid "System (%s)" msgstr "" -#: lib/choose_repository.tcl:491 -#, tcl-format -msgid "File %s already exists." +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" msgstr "" -#: lib/choose_repository.tcl:506 -msgid "Clone" +#: lib/error.tcl:20 lib/error.tcl:114 +msgid "error" msgstr "" -#: lib/choose_repository.tcl:519 -msgid "Source Location:" +#: lib/error.tcl:36 +msgid "warning" msgstr "" -#: lib/choose_repository.tcl:528 -msgid "Target Directory:" +#: lib/error.tcl:94 +msgid "You must correct the above errors before committing." msgstr "" -#: lib/choose_repository.tcl:538 -msgid "Clone Type:" +#: lib/index.tcl:6 +msgid "Unable to unlock the index." msgstr "" -#: lib/choose_repository.tcl:543 -msgid "Standard (Fast, Semi-Redundant, Hardlinks)" +#: lib/index.tcl:15 +msgid "Index Error" msgstr "" -#: lib/choose_repository.tcl:548 -msgid "Full Copy (Slower, Redundant Backup)" +#: lib/index.tcl:17 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." msgstr "" -#: lib/choose_repository.tcl:553 -msgid "Shared (Fastest, Not Recommended, No Backup)" +#: lib/index.tcl:28 +msgid "Continue" msgstr "" -#: lib/choose_repository.tcl:560 -msgid "Recursively clone submodules too" +#: lib/index.tcl:31 +msgid "Unlock Index" msgstr "" -#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 -#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 -#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 +#: lib/index.tcl:289 #, tcl-format -msgid "Not a Git repository: %s" +msgid "Unstaging %s from commit" msgstr "" -#: lib/choose_repository.tcl:630 -msgid "Standard only available for local repository." +#: lib/index.tcl:328 +msgid "Ready to commit." msgstr "" -#: lib/choose_repository.tcl:634 -msgid "Shared only available for local repository." +#: lib/index.tcl:341 +#, tcl-format +msgid "Adding %s" msgstr "" -#: lib/choose_repository.tcl:655 +#: lib/index.tcl:398 #, tcl-format -msgid "Location %s already exists." +msgid "Revert changes in file %s?" msgstr "" -#: lib/choose_repository.tcl:666 -msgid "Failed to configure origin" +#: lib/index.tcl:400 +#, tcl-format +msgid "Revert changes in these %i files?" msgstr "" -#: lib/choose_repository.tcl:678 -msgid "Counting objects" +#: lib/index.tcl:408 +msgid "Any unstaged changes will be permanently lost by the revert." msgstr "" -#: lib/choose_repository.tcl:679 -msgid "buckets" +#: lib/index.tcl:411 +msgid "Do Nothing" msgstr "" -#: lib/choose_repository.tcl:703 -#, tcl-format -msgid "Unable to copy objects/info/alternates: %s" +#: lib/index.tcl:429 +msgid "Reverting selected files" msgstr "" -#: lib/choose_repository.tcl:740 +#: lib/index.tcl:433 #, tcl-format -msgid "Nothing to clone from %s." +msgid "Reverting %s" msgstr "" -#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 -#: lib/choose_repository.tcl:974 -msgid "The 'master' branch has not been initialized." +#: lib/merge.tcl:13 +msgid "" +"Cannot merge while amending.\n" +"\n" +"You must finish amending this commit before starting any type of merge.\n" msgstr "" -#: lib/choose_repository.tcl:755 -msgid "Hardlinks are unavailable. Falling back to copying." +#: lib/merge.tcl:27 +msgid "" +"Last scanned state does not match repository state.\n" +"\n" +"Another Git program has modified this repository since the last scan. A " +"rescan must be performed before a merge can be performed.\n" +"\n" +"The rescan will be automatically started now.\n" msgstr "" -#: lib/choose_repository.tcl:769 +#: lib/merge.tcl:45 #, tcl-format -msgid "Cloning from %s" +msgid "" +"You are in the middle of a conflicted merge.\n" +"\n" +"File %s has merge conflicts.\n" +"\n" +"You must resolve them, stage the file, and commit to complete the current " +"merge. Only then can you begin another merge.\n" msgstr "" -#: lib/choose_repository.tcl:800 -msgid "Copying objects" +#: lib/merge.tcl:55 +#, tcl-format +msgid "" +"You are in the middle of a change.\n" +"\n" +"File %s is modified.\n" +"\n" +"You should complete the current commit before starting a merge. Doing so " +"will help you abort a failed merge, should the need arise.\n" msgstr "" -#: lib/choose_repository.tcl:801 -msgid "KiB" +#: lib/merge.tcl:107 +#, tcl-format +msgid "%s of %s" msgstr "" -#: lib/choose_repository.tcl:825 +#: lib/merge.tcl:120 #, tcl-format -msgid "Unable to copy object: %s" +msgid "Merging %s and %s..." msgstr "" -#: lib/choose_repository.tcl:837 -msgid "Linking objects" +#: lib/merge.tcl:131 +msgid "Merge completed successfully." msgstr "" -#: lib/choose_repository.tcl:838 -msgid "objects" +#: lib/merge.tcl:133 +msgid "Merge failed. Conflict resolution is required." msgstr "" -#: lib/choose_repository.tcl:846 +#: lib/merge.tcl:158 #, tcl-format -msgid "Unable to hardlink object: %s" -msgstr "" - -#: lib/choose_repository.tcl:903 -msgid "Cannot fetch branches and objects. See console output for details." +msgid "Merge Into %s" msgstr "" -#: lib/choose_repository.tcl:914 -msgid "Cannot fetch tags. See console output for details." +#: lib/merge.tcl:177 +msgid "Revision To Merge" msgstr "" -#: lib/choose_repository.tcl:938 -msgid "Cannot determine HEAD. See console output for details." +#: lib/merge.tcl:212 +msgid "" +"Cannot abort while amending.\n" +"\n" +"You must finish amending this commit.\n" msgstr "" -#: lib/choose_repository.tcl:947 -#, tcl-format -msgid "Unable to cleanup %s" +#: lib/merge.tcl:222 +msgid "" +"Abort merge?\n" +"\n" +"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with aborting the current merge?" msgstr "" -#: lib/choose_repository.tcl:953 -msgid "Clone failed." +#: lib/merge.tcl:228 +msgid "" +"Reset changes?\n" +"\n" +"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" +"\n" +"Continue with resetting the current changes?" msgstr "" -#: lib/choose_repository.tcl:960 -msgid "No default branch obtained." +#: lib/merge.tcl:239 +msgid "Aborting" msgstr "" -#: lib/choose_repository.tcl:971 -#, tcl-format -msgid "Cannot resolve %s as a commit." +#: lib/merge.tcl:239 +msgid "files reset" msgstr "" -#: lib/choose_repository.tcl:998 -msgid "Creating working directory" +#: lib/merge.tcl:267 +msgid "Abort failed." msgstr "" -#: lib/choose_repository.tcl:1028 -msgid "Initial file checkout failed." +#: lib/merge.tcl:269 +msgid "Abort completed. Ready." msgstr "" -#: lib/choose_repository.tcl:1072 -msgid "Cloning submodules" +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" msgstr "" -#: lib/choose_repository.tcl:1087 -msgid "Cannot clone submodules." +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" msgstr "" -#: lib/choose_repository.tcl:1110 -msgid "Repository:" +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" msgstr "" -#: lib/choose_repository.tcl:1159 +#: lib/mergetool.tcl:14 #, tcl-format -msgid "Failed to open repository %s:" -msgstr "" - -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." msgstr "" -#: lib/blame.tcl:74 +#: lib/mergetool.tcl:45 #, tcl-format -msgid "%s (%s): File Viewer" -msgstr "" - -#: lib/blame.tcl:80 -msgid "Commit:" +msgid "File %s seems to have unresolved conflicts, still stage?" msgstr "" -#: lib/blame.tcl:282 -msgid "Copy Commit" +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" msgstr "" -#: lib/blame.tcl:286 -msgid "Find Text..." +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" msgstr "" -#: lib/blame.tcl:290 -msgid "Goto Line..." +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" msgstr "" -#: lib/blame.tcl:299 -msgid "Do Full Copy Detection" +#: lib/mergetool.tcl:264 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" msgstr "" -#: lib/blame.tcl:303 -msgid "Show History Context" +#: lib/mergetool.tcl:268 +#, tcl-format +msgid "Unsupported merge tool '%s'" msgstr "" -#: lib/blame.tcl:306 -msgid "Blame Parent Commit" +#: lib/mergetool.tcl:303 +msgid "Merge tool is already running, terminate it?" msgstr "" -#: lib/blame.tcl:468 +#: lib/mergetool.tcl:323 #, tcl-format -msgid "Reading %s..." +msgid "" +"Error retrieving versions:\n" +"%s" msgstr "" -#: lib/blame.tcl:596 -msgid "Loading copy/move tracking annotations..." +#: lib/mergetool.tcl:343 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" msgstr "" -#: lib/blame.tcl:613 -msgid "lines annotated" +#: lib/mergetool.tcl:347 +msgid "Running merge tool..." msgstr "" -#: lib/blame.tcl:815 -msgid "Loading original location annotations..." +#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +msgid "Merge tool failed." msgstr "" -#: lib/blame.tcl:818 -msgid "Annotation complete." +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" msgstr "" -#: lib/blame.tcl:849 -msgid "Busy" +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" msgstr "" -#: lib/blame.tcl:850 -msgid "Annotation process is already running." +#: lib/option.tcl:117 +msgid "Restore Defaults" msgstr "" -#: lib/blame.tcl:889 -msgid "Running thorough copy detection..." +#: lib/option.tcl:121 +msgid "Save" msgstr "" -#: lib/blame.tcl:957 -msgid "Loading annotation..." +#: lib/option.tcl:131 +#, tcl-format +msgid "%s Repository" msgstr "" -#: lib/blame.tcl:1010 -msgid "Author:" +#: lib/option.tcl:132 +msgid "Global (All Repositories)" msgstr "" -#: lib/blame.tcl:1014 -msgid "Committer:" +#: lib/option.tcl:138 +msgid "User Name" msgstr "" -#: lib/blame.tcl:1019 -msgid "Original File:" +#: lib/option.tcl:139 +msgid "Email Address" msgstr "" -#: lib/blame.tcl:1067 -msgid "Cannot find HEAD commit:" +#: lib/option.tcl:141 +msgid "Summarize Merge Commits" msgstr "" -#: lib/blame.tcl:1122 -msgid "Cannot find parent commit:" +#: lib/option.tcl:142 +msgid "Merge Verbosity" msgstr "" -#: lib/blame.tcl:1137 -msgid "Unable to display parent" +#: lib/option.tcl:143 +msgid "Show Diffstat After Merge" msgstr "" -#: lib/blame.tcl:1138 lib/diff.tcl:345 -msgid "Error loading diff:" +#: lib/option.tcl:144 +msgid "Use Merge Tool" msgstr "" -#: lib/blame.tcl:1279 -msgid "Originally By:" +#: lib/option.tcl:146 +msgid "Trust File Modification Timestamps" msgstr "" -#: lib/blame.tcl:1285 -msgid "In File:" +#: lib/option.tcl:147 +msgid "Prune Tracking Branches During Fetch" msgstr "" -#: lib/blame.tcl:1290 -msgid "Copied Or Moved Here By:" +#: lib/option.tcl:148 +msgid "Match Tracking Branches" msgstr "" -#: lib/diff.tcl:77 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but " -"the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have " -"the same state." +#: lib/option.tcl:149 +msgid "Blame Copy Only On Changed Files" msgstr "" -#: lib/diff.tcl:117 -#, tcl-format -msgid "Loading diff of %s..." +#: lib/option.tcl:150 +msgid "Minimum Letters To Blame Copy On" msgstr "" -#: lib/diff.tcl:143 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" +#: lib/option.tcl:151 +msgid "Blame History Context Radius (days)" msgstr "" -#: lib/diff.tcl:148 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" +#: lib/option.tcl:152 +msgid "Number of Diff Context Lines" msgstr "" -#: lib/diff.tcl:155 -msgid "LOCAL:\n" +#: lib/option.tcl:153 +msgid "Commit Message Text Width" msgstr "" -#: lib/diff.tcl:158 -msgid "REMOTE:\n" +#: lib/option.tcl:154 +msgid "New Branch Name Template" msgstr "" -#: lib/diff.tcl:220 lib/diff.tcl:344 -#, tcl-format -msgid "Unable to display %s" +#: lib/option.tcl:155 +msgid "Default File Contents Encoding" msgstr "" -#: lib/diff.tcl:221 -msgid "Error loading file:" +#: lib/option.tcl:203 +msgid "Change" msgstr "" -#: lib/diff.tcl:227 -msgid "Git Repository (subproject)" +#: lib/option.tcl:230 +msgid "Spelling Dictionary:" msgstr "" -#: lib/diff.tcl:239 -msgid "* Binary file (not showing content)." +#: lib/option.tcl:254 +msgid "Change Font" msgstr "" -#: lib/diff.tcl:244 +#: lib/option.tcl:258 #, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" +msgid "Choose %s" msgstr "" -#: lib/diff.tcl:250 -#, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" +#: lib/option.tcl:264 +msgid "pt." msgstr "" -#: lib/diff.tcl:583 -msgid "Failed to unstage selected hunk." +#: lib/option.tcl:278 +msgid "Preferences" msgstr "" -#: lib/diff.tcl:591 -msgid "Failed to revert selected hunk." +#: lib/option.tcl:314 +msgid "Failed to completely save options:" msgstr "" -#: lib/diff.tcl:594 -msgid "Failed to stage selected hunk." +#: lib/remote.tcl:163 +msgid "Remove Remote" msgstr "" -#: lib/diff.tcl:687 -msgid "Failed to unstage selected line." +#: lib/remote.tcl:168 +msgid "Prune from" msgstr "" -#: lib/diff.tcl:696 -msgid "Failed to revert selected line." +#: lib/remote.tcl:173 +msgid "Fetch from" msgstr "" -#: lib/diff.tcl:700 -msgid "Failed to stage selected line." +#: lib/remote.tcl:215 +msgid "Push to" msgstr "" -#: lib/diff.tcl:889 -msgid "Failed to undo last revert." +#: lib/remote_add.tcl:19 +msgid "Add Remote" msgstr "" -#: lib/sshkey.tcl:34 -msgid "No keys found." +#: lib/remote_add.tcl:24 +msgid "Add New Remote" msgstr "" -#: lib/sshkey.tcl:37 -#, tcl-format -msgid "Found a public key in: %s" +#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +msgid "Add" msgstr "" -#: lib/sshkey.tcl:43 -msgid "Generate Key" +#: lib/remote_add.tcl:37 +msgid "Remote Details" msgstr "" -#: lib/sshkey.tcl:61 -msgid "Copy To Clipboard" +#: lib/remote_add.tcl:50 +msgid "Location:" msgstr "" -#: lib/sshkey.tcl:75 -msgid "Your OpenSSH Public Key" +#: lib/remote_add.tcl:62 +msgid "Further Action" msgstr "" -#: lib/sshkey.tcl:83 -msgid "Generating..." +#: lib/remote_add.tcl:65 +msgid "Fetch Immediately" msgstr "" -#: lib/sshkey.tcl:89 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" +#: lib/remote_add.tcl:71 +msgid "Initialize Remote Repository and Push" msgstr "" -#: lib/sshkey.tcl:116 -msgid "Generation failed." +#: lib/remote_add.tcl:77 +msgid "Do Nothing Else Now" msgstr "" -#: lib/sshkey.tcl:123 -msgid "Generation succeeded, but no keys found." +#: lib/remote_add.tcl:101 +msgid "Please supply a remote name." msgstr "" -#: lib/sshkey.tcl:126 +#: lib/remote_add.tcl:114 #, tcl-format -msgid "Your key is in: %s" +msgid "'%s' is not an acceptable remote name." msgstr "" -#: lib/branch_create.tcl:23 +#: lib/remote_add.tcl:125 #, tcl-format -msgid "%s (%s): Create Branch" -msgstr "" - -#: lib/branch_create.tcl:28 -msgid "Create New Branch" -msgstr "" - -#: lib/branch_create.tcl:42 -msgid "Branch Name" -msgstr "" - -#: lib/branch_create.tcl:57 -msgid "Match Tracking Branch Name" -msgstr "" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" +msgid "Failed to add remote '%s' of location '%s'." msgstr "" -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" +#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#, tcl-format +msgid "fetch %s" msgstr "" -#: lib/branch_create.tcl:75 -msgid "No" +#: lib/remote_add.tcl:134 +#, tcl-format +msgid "Fetching the %s" msgstr "" -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" +#: lib/remote_add.tcl:157 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." msgstr "" -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" +#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 +#: lib/transport.tcl:81 +#, tcl-format +msgid "push %s" msgstr "" -#: lib/branch_create.tcl:132 -msgid "Please select a tracking branch." +#: lib/remote_add.tcl:164 +#, tcl-format +msgid "Setting up the %s (at %s)" msgstr "" -#: lib/branch_create.tcl:141 -#, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." +#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" msgstr "" -#: lib/console.tcl:59 -msgid "Working... please wait..." +#: lib/remote_branch_delete.tcl:47 +msgid "From Repository" msgstr "" -#: lib/console.tcl:186 -msgid "Success" +#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +msgid "Remote:" msgstr "" -#: lib/console.tcl:200 -msgid "Error: Command Failed" +#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +msgid "Arbitrary Location:" msgstr "" -#: lib/line.tcl:17 -msgid "Goto Line:" +#: lib/remote_branch_delete.tcl:84 +msgid "Branches" msgstr "" -#: lib/line.tcl:23 -msgid "Go" +#: lib/remote_branch_delete.tcl:109 +msgid "Delete Only If" msgstr "" -#: lib/choose_rev.tcl:52 -msgid "This Detached Checkout" +#: lib/remote_branch_delete.tcl:111 +msgid "Merged Into:" msgstr "" -#: lib/choose_rev.tcl:60 -msgid "Revision Expression:" +#: lib/remote_branch_delete.tcl:152 +msgid "A branch is required for 'Merged Into'." msgstr "" -#: lib/choose_rev.tcl:72 -msgid "Local Branch" +#: lib/remote_branch_delete.tcl:184 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" msgstr "" -#: lib/choose_rev.tcl:77 -msgid "Tracking Branch" +#: lib/remote_branch_delete.tcl:189 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." msgstr "" -#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 -msgid "Tag" +#: lib/remote_branch_delete.tcl:207 +msgid "Please select one or more branches to delete." msgstr "" -#: lib/choose_rev.tcl:321 +#: lib/remote_branch_delete.tcl:226 #, tcl-format -msgid "Invalid revision: %s" +msgid "Deleting branches from %s" msgstr "" -#: lib/choose_rev.tcl:342 -msgid "No revision selected." +#: lib/remote_branch_delete.tcl:292 +msgid "No repository selected." msgstr "" -#: lib/choose_rev.tcl:350 -msgid "Revision expression is empty." +#: lib/remote_branch_delete.tcl:297 +#, tcl-format +msgid "Scanning %s..." msgstr "" -#: lib/choose_rev.tcl:537 -msgid "Updated" +#: lib/search.tcl:21 +msgid "Find:" msgstr "" -#: lib/choose_rev.tcl:565 -msgid "URL" +#: lib/search.tcl:23 +msgid "Next" msgstr "" -#: lib/commit.tcl:9 -msgid "" -"There is nothing to amend.\n" -"\n" -"You are about to create the initial commit. There is no commit before this " -"to amend.\n" +#: lib/search.tcl:24 +msgid "Prev" msgstr "" -#: lib/commit.tcl:18 -msgid "" -"Cannot amend while merging.\n" -"\n" -"You are currently in the middle of a merge that has not been fully " -"completed. You cannot amend the prior commit unless you first abort the " -"current merge activity.\n" +#: lib/search.tcl:25 +msgid "Case-Sensitive" msgstr "" -#: lib/commit.tcl:56 -msgid "Error loading commit data for amend:" +#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +msgid "Cannot write shortcut:" msgstr "" -#: lib/commit.tcl:83 -msgid "Unable to obtain your identity:" +#: lib/shortcut.tcl:137 +msgid "Cannot write icon:" msgstr "" -#: lib/commit.tcl:88 -msgid "Invalid GIT_COMMITTER_IDENT:" +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" msgstr "" -#: lib/commit.tcl:138 -#, tcl-format -msgid "warning: Tcl does not support encoding '%s'." +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" msgstr "" -#: lib/commit.tcl:158 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before another commit can be created.\n" -"\n" -"The rescan will be automatically started now.\n" +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" msgstr "" -#: lib/commit.tcl:182 +#: lib/spellcheck.tcl:70 #, tcl-format -msgid "" -"Unmerged files cannot be committed.\n" -"\n" -"File %s has merge conflicts. You must resolve them and stage the file " -"before committing.\n" +msgid "Reverting dictionary to %s." msgstr "" -#: lib/commit.tcl:190 -#, tcl-format -msgid "" -"Unknown file state %s detected.\n" -"\n" -"File %s cannot be committed by this program.\n" +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" msgstr "" -#: lib/commit.tcl:198 -msgid "" -"No changes to commit.\n" -"\n" -"You must stage at least 1 file before you can commit.\n" +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" msgstr "" -#: lib/commit.tcl:213 -msgid "" -"Please supply a commit message.\n" -"\n" -"A good commit message has the following format:\n" -"\n" -"- First line: Describe in one sentence what you did.\n" -"- Second line: Blank\n" -"- Remaining lines: Describe why this change is good.\n" +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" msgstr "" -#: lib/commit.tcl:244 -msgid "Calling pre-commit hook..." +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" msgstr "" -#: lib/commit.tcl:259 -msgid "Commit declined by pre-commit hook." +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" msgstr "" -#: lib/commit.tcl:278 -msgid "" -"You are about to commit on a detached head. This is a potentially dangerous " -"thing to do because if you switch to another branch you will lose your " -"changes and it can be difficult to retrieve them later from the reflog. You " -"should probably cancel this commit and create a new branch to continue.\n" -" \n" -" Do you really want to proceed with your Commit?" +#: lib/sshkey.tcl:31 +msgid "No keys found." msgstr "" -#: lib/commit.tcl:299 -msgid "Calling commit-msg hook..." +#: lib/sshkey.tcl:34 +#, tcl-format +msgid "Found a public key in: %s" msgstr "" -#: lib/commit.tcl:314 -msgid "Commit declined by commit-msg hook." +#: lib/sshkey.tcl:40 +msgid "Generate Key" msgstr "" -#: lib/commit.tcl:327 -msgid "Committing changes..." +#: lib/sshkey.tcl:56 +msgid "Copy To Clipboard" msgstr "" -#: lib/commit.tcl:344 -msgid "write-tree failed:" +#: lib/sshkey.tcl:70 +msgid "Your OpenSSH Public Key" msgstr "" -#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 -msgid "Commit failed." +#: lib/sshkey.tcl:78 +msgid "Generating..." msgstr "" -#: lib/commit.tcl:362 +#: lib/sshkey.tcl:84 #, tcl-format -msgid "Commit %s appears to be corrupt" -msgstr "" - -#: lib/commit.tcl:367 msgid "" -"No changes to commit.\n" -"\n" -"No files were modified by this commit and it was not a merge commit.\n" +"Could not start ssh-keygen:\n" "\n" -"A rescan will be automatically started now.\n" -msgstr "" - -#: lib/commit.tcl:374 -msgid "No changes to commit." +"%s" msgstr "" -#: lib/commit.tcl:394 -msgid "commit-tree failed:" +#: lib/sshkey.tcl:111 +msgid "Generation failed." msgstr "" -#: lib/commit.tcl:421 -msgid "update-ref failed:" +#: lib/sshkey.tcl:118 +msgid "Generation succeeded, but no keys found." msgstr "" -#: lib/commit.tcl:514 +#: lib/sshkey.tcl:121 #, tcl-format -msgid "Created commit %s: %s" +msgid "Your key is in: %s" msgstr "" -#: lib/branch_delete.tcl:16 +#: lib/status_bar.tcl:83 #, tcl-format -msgid "%s (%s): Delete Branch" -msgstr "" - -#: lib/branch_delete.tcl:21 -msgid "Delete Local Branch" +msgid "%s ... %*i of %*i %s (%3i%%)" msgstr "" -#: lib/branch_delete.tcl:39 -msgid "Local Branches" +#: lib/tools.tcl:75 +#, tcl-format +msgid "Running %s requires a selected file." msgstr "" -#: lib/branch_delete.tcl:51 -msgid "Delete Only If Merged Into" +#: lib/tools.tcl:90 +#, tcl-format +msgid "Are you sure you want to run %s?" msgstr "" -#: lib/branch_delete.tcl:103 +#: lib/tools.tcl:110 #, tcl-format -msgid "The following branches are not completely merged into %s:" +msgid "Tool: %s" msgstr "" -#: lib/branch_delete.tcl:131 +#: lib/tools.tcl:111 #, tcl-format -msgid " - %s:" +msgid "Running: %s" msgstr "" -#: lib/branch_delete.tcl:141 +#: lib/tools.tcl:149 #, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" +msgid "Tool completed successfully: %s" msgstr "" -#: lib/date.tcl:25 +#: lib/tools.tcl:151 #, tcl-format -msgid "Invalid date from Git: %s" +msgid "Tool failed: %s" msgstr "" -#: lib/database.tcl:42 -msgid "Number of loose objects" +#: lib/tools_dlg.tcl:22 +msgid "Add Tool" msgstr "" -#: lib/database.tcl:43 -msgid "Disk space used by loose objects" +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" msgstr "" -#: lib/database.tcl:44 -msgid "Number of packed objects" +#: lib/tools_dlg.tcl:33 +msgid "Add globally" msgstr "" -#: lib/database.tcl:45 -msgid "Number of packs" +#: lib/tools_dlg.tcl:45 +msgid "Tool Details" msgstr "" -#: lib/database.tcl:46 -msgid "Disk space used by packed objects" +#: lib/tools_dlg.tcl:48 +msgid "Use '/' separators to create a submenu tree:" msgstr "" -#: lib/database.tcl:47 -msgid "Packed objects waiting for pruning" +#: lib/tools_dlg.tcl:61 +msgid "Command:" msgstr "" -#: lib/database.tcl:48 -msgid "Garbage files" +#: lib/tools_dlg.tcl:74 +msgid "Show a dialog before running" msgstr "" -#: lib/database.tcl:66 -#, tcl-format -msgid "%s (%s): Database Statistics" +#: lib/tools_dlg.tcl:80 +msgid "Ask the user to select a revision (sets $REVISION)" msgstr "" -#: lib/database.tcl:72 -msgid "Compressing the object database" +#: lib/tools_dlg.tcl:85 +msgid "Ask the user for additional arguments (sets $ARGS)" msgstr "" -#: lib/database.tcl:83 -msgid "Verifying the object database with fsck-objects" +#: lib/tools_dlg.tcl:92 +msgid "Don't show the command output window" msgstr "" -#: lib/database.tcl:107 -#, tcl-format -msgid "" -"This repository currently has approximately %i loose objects.\n" -"\n" -"To maintain optimal performance it is strongly recommended that you compress " -"the database.\n" -"\n" -"Compress the database now?" +#: lib/tools_dlg.tcl:97 +msgid "Run only if a diff is selected ($FILENAME not empty)" msgstr "" -#: lib/error.tcl:20 -#, tcl-format -msgid "%s: error" +#: lib/tools_dlg.tcl:121 +msgid "Please supply a name for the tool." msgstr "" -#: lib/error.tcl:36 +#: lib/tools_dlg.tcl:129 #, tcl-format -msgid "%s: warning" +msgid "Tool '%s' already exists." msgstr "" -#: lib/error.tcl:80 +#: lib/tools_dlg.tcl:151 #, tcl-format -msgid "%s hook failed:" +msgid "" +"Could not add tool:\n" +"%s" msgstr "" -#: lib/error.tcl:96 -msgid "You must correct the above errors before committing." +#: lib/tools_dlg.tcl:190 +msgid "Remove Tool" msgstr "" -#: lib/error.tcl:116 -#, tcl-format -msgid "%s (%s): error" +#: lib/tools_dlg.tcl:196 +msgid "Remove Tool Commands" msgstr "" -#: lib/merge.tcl:13 -msgid "" -"Cannot merge while amending.\n" -"\n" -"You must finish amending this commit before starting any type of merge.\n" +#: lib/tools_dlg.tcl:200 +msgid "Remove" msgstr "" -#: lib/merge.tcl:27 -msgid "" -"Last scanned state does not match repository state.\n" -"\n" -"Another Git program has modified this repository since the last scan. A " -"rescan must be performed before a merge can be performed.\n" -"\n" -"The rescan will be automatically started now.\n" +#: lib/tools_dlg.tcl:236 +msgid "(Blue denotes repository-local tools)" msgstr "" -#: lib/merge.tcl:45 +#: lib/tools_dlg.tcl:297 #, tcl-format -msgid "" -"You are in the middle of a conflicted merge.\n" -"\n" -"File %s has merge conflicts.\n" -"\n" -"You must resolve them, stage the file, and commit to complete the current " -"merge. Only then can you begin another merge.\n" +msgid "Run Command: %s" msgstr "" -#: lib/merge.tcl:55 -#, tcl-format -msgid "" -"You are in the middle of a change.\n" -"\n" -"File %s is modified.\n" -"\n" -"You should complete the current commit before starting a merge. Doing so " -"will help you abort a failed merge, should the need arise.\n" +#: lib/tools_dlg.tcl:311 +msgid "Arguments" msgstr "" -#: lib/merge.tcl:108 -#, tcl-format -msgid "%s of %s" +#: lib/tools_dlg.tcl:348 +msgid "OK" msgstr "" -#: lib/merge.tcl:126 +#: lib/transport.tcl:7 #, tcl-format -msgid "Merging %s and %s..." +msgid "Fetching new changes from %s" msgstr "" -#: lib/merge.tcl:137 -msgid "Merge completed successfully." +#: lib/transport.tcl:18 +#, tcl-format +msgid "remote prune %s" msgstr "" -#: lib/merge.tcl:139 -msgid "Merge failed. Conflict resolution is required." +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" msgstr "" -#: lib/merge.tcl:156 +#: lib/transport.tcl:26 #, tcl-format -msgid "%s (%s): Merge" +msgid "Pushing changes to %s" msgstr "" -#: lib/merge.tcl:164 +#: lib/transport.tcl:64 #, tcl-format -msgid "Merge Into %s" +msgid "Mirroring to %s" msgstr "" -#: lib/merge.tcl:183 -msgid "Revision To Merge" +#: lib/transport.tcl:82 +#, tcl-format +msgid "Pushing %s %s to %s" msgstr "" -#: lib/merge.tcl:218 -msgid "" -"Cannot abort while amending.\n" -"\n" -"You must finish amending this commit.\n" +#: lib/transport.tcl:100 +msgid "Push Branches" msgstr "" -#: lib/merge.tcl:228 -msgid "" -"Abort merge?\n" -"\n" -"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with aborting the current merge?" +#: lib/transport.tcl:114 +msgid "Source Branches" msgstr "" -#: lib/merge.tcl:234 -msgid "" -"Reset changes?\n" -"\n" -"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" -"\n" -"Continue with resetting the current changes?" +#: lib/transport.tcl:131 +msgid "Destination Repository" msgstr "" -#: lib/merge.tcl:246 -msgid "Aborting" +#: lib/transport.tcl:169 +msgid "Transfer Options" msgstr "" -#: lib/merge.tcl:247 -msgid "files reset" +#: lib/transport.tcl:171 +msgid "Force overwrite existing branch (may discard changes)" msgstr "" -#: lib/merge.tcl:277 -msgid "Abort failed." +#: lib/transport.tcl:175 +msgid "Use thin pack (for slow network connections)" msgstr "" -#: lib/merge.tcl:279 -msgid "Abort completed. Ready." +#: lib/transport.tcl:179 +msgid "Include tags" msgstr "" diff --git a/third_party/git/git-gui/po/glossary/de.po b/third_party/git/git-gui/po/glossary/de.po index 4c5f233ee5..35764d1d22 100644 --- a/third_party/git/git-gui/po/glossary/de.po +++ b/third_party/git/git-gui/po/glossary/de.po @@ -6,11 +6,10 @@ msgid "" msgstr "" "Project-Id-Version: git-gui glossary\n" -"POT-Creation-Date: 2020-01-26 22:26+0100\n" -"PO-Revision-Date: 2020-02-09 21:22+0100\n" +"POT-Creation-Date: 2008-01-07 21:20+0100\n" +"PO-Revision-Date: 2008-02-16 21:48+0100\n" "Last-Translator: Christian Stimming <stimming@tuhh.de>\n" "Language-Team: German \n" -"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,9 +19,6 @@ msgid "" "English Term (Dear translator: This file will never be visible to the user!)" msgstr "" "Deutsche Übersetzung.\n" -"Git-core glossary:\n" -" https://github.com/ruester/git-po-de/wiki/Translation-Guidelines\n" -"\n" "Andere deutsche SCM:\n" " http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://" "tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po " @@ -36,77 +32,33 @@ msgstr "" " http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po " "(username=guest, password empty, schlecht)" -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "abbrechen" - #. "" msgid "amend" msgstr "nachbessern (ergänzen)" -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "Vorgänger-Commit" - #. "" msgid "annotate" msgstr "annotieren" -#. "The person who initially created (authored) a commit" -msgid "author" -msgstr "Autor" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "bloßes Projektarchiv" - -#. "a parent version of the current file" -msgid "base" -msgstr "Ursprung" - -#. "" -msgid "bisect" -msgstr "binäre Suche [noun], binäre Suche benutzen [verb]" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "annotieren" - -#. "" -msgid "blob" -msgstr "Blob" - #. "A 'branch' is an active line of development." msgid "branch [noun]" -msgstr "Branch" +msgstr "Zweig" #. "" msgid "branch [verb]" -msgstr "branchen" +msgstr "verzweigen" #. "" msgid "checkout [noun]" msgstr "" -"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? Source " -"Safe: Auscheckvorgang)" +"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? " +"Source Safe: Auscheckvorgang)" #. "The action of updating the working tree to a revision which was stored in the object database." msgid "checkout [verb]" msgstr "" -"Arbeitskopie erstellen; Branch auschecken [checkout a branch] (umstellen? " -"Source Safe: auschecken)" - -#. "to select and apply a single commit to the current HEAD without merging" -msgid "cherry-pick" -msgstr "cherry-pick (pflücken?)" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child commit" -msgstr "Kind-Commit" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "aufräumen" +"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? " +"ausspielen? abrufen? Source Safe: auschecken)" #. "" msgid "clone [verb]" @@ -114,98 +66,39 @@ msgstr "klonen" #. "A single point in the git history." msgid "commit [noun]" -msgstr "Commit (Version?)" +msgstr "" +"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, " +"Sendung?, Übergabe?, Einspielung?, Ablagevorgang?)" #. "The action of storing a new snapshot of the project's state in the git history." msgid "commit [verb]" msgstr "" -"committen (eintragen?, TortoiseSVN: übertragen; Source Safe: einchecken)" - -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "Commit-Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" - -#. "The person who committed a commit (to the current branch), which might be different than the author." -msgid "committer" -msgstr "Committer" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "Nachfolger-Commit" - -#. "checkout of a revision rather than some head" -msgid "detached HEAD" -msgstr "losgelöster HEAD / Branchspitze" - -#. "checkout of a revision rather than some head" -msgid "detached checkout" -msgstr "losgelöster Commit (von Branch losgelöster Commit?)" +"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, " +"übergeben?, einspielen?, einpflegen?, ablegen?)" #. "" msgid "diff [noun]" -msgstr "Vergleich (Diff? Source Safe: Unterschiede)" +msgstr "Vergleich (Source Safe: Unterschiede)" #. "" msgid "diff [verb]" msgstr "vergleichen" -#. "" -msgid "directory" -msgstr "Verzeichnis" - -#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast-forward" -msgstr "vorspulen" +#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +msgid "fast forward merge" +msgstr "Schnellzusammenführung" #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." msgid "fetch" msgstr "anfordern (holen?)" -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "Datei-basiertes zusammenführen" - -#. "" -msgid "file" -msgstr "Datei" - -#. "the last revision in a branch" -msgid "head" -msgstr "HEAD / Branchspitze" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "Hook (in der dt. Informatik wohl als Einschubmethode bezeichnet)" - #. "One context of consecutive lines in a whole patch, which consists of many such hunks" msgid "hunk" -msgstr "Patch-Block (Kontext?)" +msgstr "Kontext" #. "A collection of files. The index is a stored version of your working tree." msgid "index (in git-gui: staging area)" -msgstr "" -"Bereitstellung (sofern der git index gemeint ist. In git-gui sowieso: " -"staging area)" - -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "Erstellen der Arbeitskopie, auschecken" - -#. "The very first commit in a repository" -msgid "initial commit" -msgstr "Allererster Commit" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "Lokaler Branch" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "loses Objekt" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "Master-Branch" +msgstr "Bereitstellung" #. "A successful merge results in the creation of a new commit representing the result of the merge." msgid "merge [noun]" @@ -219,212 +112,78 @@ msgstr "zusammenführen" msgid "message" msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)" -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "origin" - -#. "" -msgid "orphan commit" -msgstr "verwaister Commit" - -#. "" -msgid "orphan reference" -msgstr "verwaiste Referenz" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "Pack-Datei" - -#. "the process of creating a pack file" -msgid "pack [verb]" -msgstr "Pack-Datei erstellen" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "gepacktes Objekt" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent commit" -msgstr "Eltern-Commit" - -msgid "patch" -msgstr "Patch" - -#. "The path to a file" -msgid "path" -msgstr "Pfad" - -#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." +#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." msgid "prune" -msgstr "veraltete Branches entfernen (aufräumen?, entfernen?)" +msgstr "aufräumen (entfernen?)" #. "Pulling a branch means to fetch it and merge it." msgid "pull" -msgstr "" -"übernehmen (pull? ziehen? Vorsicht: zusammenführen = merge, aber pull kann " -"auch rebase bewirken)" +msgstr "übernehmen (ziehen?)" #. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" msgid "push" msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)" -#. "The process of rebasing one set of commits on top of another branch's head" -msgid "rebase [noun]" -msgstr "der Rebase (das Umpflanzen)" - -#. "Re-apply one set of commits on top of another branch's head. Contrary to merge." -msgid "rebase [verb]" -msgstr "rebase (umpflanzen)" - #. "" msgid "redo" msgstr "wiederholen" -#. "" -msgid "reference" -msgstr "Referenz" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "Commit-Log, »reflog«" - -msgid "refmap" -msgstr "Refmap" - -#. "" -msgid "refspec" -msgstr "Refspec" - -#. "The adjective for anything which is outside of the current (local) repository" -msgid "remote [adj]" -msgstr "Extern (Andere?, Gegenseite?, Entfernte?, Server?)" - -#. "A branch in any other ('remote') repository" -msgid "remote branch" -msgstr "Externer branch" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote repository" -msgstr "Externes Repository" +#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +msgid "remote" +msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)" #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" msgid "repository" -msgstr "Repository" +msgstr "Projektarchiv" #. "" msgid "reset" -msgstr "umsetzen (reset to commit), Änderungen verwerfen (reset to HEAD)" - -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "auflösen (einen Konflikt)" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "" -"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " -"mit neuem commit; umkehren?)" +msgstr "zurücksetzen (zurückkehren?)" #. "" msgid "revert" -msgstr "" -"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also " -"mit neuem commit; umkehren?)" - -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "Version Regexp-Ausdruck" +msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)" #. "A particular state of files and directories which was stored in the object database." msgid "revision" -msgstr "" -"Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: " -"Revision; Source Safe: Version)" +msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)" #. "" msgid "sign off" -msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)" +msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)" -#. "see: staging area. In some areas of git this is called 'index'." -msgid "stage [noun], index" -msgstr "Bereitstellung" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage [verb]" -msgstr "bereitstellen" - -#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." +#. "" msgid "staging area" msgstr "Bereitstellung" -#. "The place (stack) where changes can be temporarily saved without committing" -msgid "stash [noun]" -msgstr "der Stash" - -#. "temporarily save changes in a stack without committing" -msgid "stash [verb]" -msgstr "in Stash speichern; \"stash\" benutzen" - #. "" msgid "status" msgstr "Status" -#. "" -msgid "submodule" -msgstr "Submodul (Untermodul?)" - -#. "A ref pointing to some commit object. In other words: A label on a specific commit." +#. "A ref pointing to a tag or commit object" msgid "tag [noun]" -msgstr "Tag (Markierung?)" +msgstr "Markierung" -#. "The process of creating a tag at a specific commit object" +#. "" msgid "tag [verb]" -msgstr "taggen (markieren?)" - -#. "The person who created a tag" -msgid "tagger" -msgstr "Tag-Ersteller (Markierungs-Ersteller?)" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "versioniert/unversioniert" +msgstr "markieren" #. "A regular git branch that is used to follow changes from another repository." msgid "tracking branch" -msgstr "Tracking-Branch (Verfolgungsbranch? Übernahmebranch?)" - -#. "" -msgid "trailer" -msgstr "Anhang" - -#. "1. tree object, 2. directory tree" -msgid "tree" -msgstr "1. Baum-Objekt, 2. Verzeichnisbaum" +msgstr "Übernahmezweig" #. "" msgid "undo" msgstr "rückgängig" -#. "Remove content of files from the staging area again so that it will not be part of the next commit" -msgid "unstage" -msgstr "aus Bereitstellung herausnehmen" - -#. "Retrieving the temporarily saved changes back again from the stash" -msgid "unstash [verb]" -msgstr "aus Stash zurückladen" - #. "" msgid "update" msgstr "aktualisieren" #. "" -msgid "upstream branch" -msgstr "Upstream-Branch" - -#. "" msgid "verify" msgstr "überprüfen" #. "The tree of actual checked out files." -msgid "working directory, working copy, working tree" +msgid "working copy, working tree" msgstr "Arbeitskopie" diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot b/third_party/git/git-gui/po/glossary/git-gui-glossary.pot index 4e66e0da3a..40eb3e9c07 100644 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.pot +++ b/third_party/git/git-gui/po/glossary/git-gui-glossary.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-01-26 22:26+0100\n" +"POT-Creation-Date: 2008-01-07 21:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,46 +18,14 @@ msgstr "" msgid "English Term (Dear translator: This file will never be visible to the user!)" msgstr "" -#. "prematurely stop and abandon an operation" -msgid "abort" -msgstr "" - #. "" msgid "amend" msgstr "" -#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" -msgid "ancestor" -msgstr "" - #. "" msgid "annotate" msgstr "" -#. "The person who initially created (authored) a commit" -msgid "author" -msgstr "" - -#. "a repository with only .git directory, without working directory" -msgid "bare repository" -msgstr "" - -#. "a parent version of the current file" -msgid "base" -msgstr "" - -#. "" -msgid "bisect" -msgstr "" - -#. "get the authors responsible for each line in a file" -msgid "blame" -msgstr "" - -#. "" -msgid "blob" -msgstr "" - #. "A 'branch' is an active line of development." msgid "branch [noun]" msgstr "" @@ -74,18 +42,6 @@ msgstr "" msgid "checkout [verb]" msgstr "" -#. "to select and apply a single commit to the current HEAD without merging" -msgid "cherry-pick" -msgstr "" - -#. "a commit that directly succeeds the current one in git's graph of commits" -msgid "child commit" -msgstr "" - -#. "clean the state of the git repository, often after manually stopped operation" -msgid "cleanup" -msgstr "" - #. "" msgid "clone [verb]" msgstr "" @@ -98,26 +54,6 @@ msgstr "" msgid "commit [verb]" msgstr "" -#. "a message that gets attached with any commit" -msgid "commit message" -msgstr "" - -#. "The person who committed a commit (to the current branch), which might be different than the author." -msgid "committer" -msgstr "" - -#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -msgid "descendant" -msgstr "" - -#. "checkout of a revision rather than some head" -msgid "detached HEAD" -msgstr "" - -#. "checkout of a revision rather than some head" -msgid "detached checkout" -msgstr "" - #. "" msgid "diff [noun]" msgstr "" @@ -126,34 +62,14 @@ msgstr "" msgid "diff [verb]" msgstr "" -#. "" -msgid "directory" -msgstr "" - -#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." -msgid "fast-forward" +#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +msgid "fast forward merge" msgstr "" #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." msgid "fetch" msgstr "" -#. "any merge strategy that works on a file by file basis" -msgid "file level merging" -msgstr "" - -#. "" -msgid "file" -msgstr "" - -#. "the last revision in a branch" -msgid "head" -msgstr "" - -#. "script that gets executed automatically on some event" -msgid "hook" -msgstr "" - #. "One context of consecutive lines in a whole patch, which consists of many such hunks" msgid "hunk" msgstr "" @@ -162,26 +78,6 @@ msgstr "" msgid "index (in git-gui: staging area)" msgstr "" -#. "the first checkout during a clone operation" -msgid "initial checkout" -msgstr "" - -#. "The very first commit in a repository" -msgid "initial commit" -msgstr "" - -#. "a branch that resides in the local git repository" -msgid "local branch" -msgstr "" - -#. "a Git object that is not part of any pack" -msgid "loose object" -msgstr "" - -#. "a branch called by convention 'master' that exists in a newly created git repository" -msgid "master branch" -msgstr "" - #. "A successful merge results in the creation of a new commit representing the result of the merge." msgid "merge [noun]" msgstr "" @@ -194,42 +90,7 @@ msgstr "" msgid "message" msgstr "" -#. "a remote called by convention 'origin' that the current git repository has been cloned from" -msgid "origin" -msgstr "" - -#. "" -msgid "orphan commit" -msgstr "" - -#. "" -msgid "orphan reference" -msgstr "" - -#. "a file containing many git objects packed together" -msgid "pack [noun]" -msgstr "" - -#. "the process of creating a pack file" -msgid "pack [verb]" -msgstr "" - -#. "a Git object part of some pack" -msgid "packed object" -msgstr "" - -#. "a commit that directly precedes the current one in git's graph of commits" -msgid "parent commit" -msgstr "" - -msgid "patch" "" -msgstr "" - -#. "The path to a file" -msgid "path" -msgstr "" - -#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." +#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." msgid "prune" msgstr "" @@ -241,43 +102,12 @@ msgstr "" msgid "push" msgstr "" -#. "The process of rebasing one set of commits on top of another branch's head" -msgid "rebase [noun]" -msgstr "" - -#. "Re-apply one set of commits on top of another branch's head. Contrary to merge." -msgid "rebase [verb]" -msgstr "" - #. "" msgid "redo" msgstr "" -#. "" -msgid "reference" -msgstr "" - -#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -msgid "reflog" -msgstr "" - -msgid "refmap" "" -msgstr "" - -#. "" -msgid "refspec" -msgstr "" - -#. "The adjective for anything which is outside of the current (local) repository" -msgid "remote [adj]" -msgstr "" - -#. "A branch in any other ('remote') repository" -msgid "remote branch" -msgstr "" - -#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." -msgid "remote repository" +#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +msgid "remote" msgstr "" #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" @@ -288,22 +118,10 @@ msgstr "" msgid "reset" msgstr "" -#. "decide which changes from alternative versions of a file should persist in Git" -msgid "resolve (a conflict)" -msgstr "" - -#. "abandon changes and go to pristine version" -msgid "revert changes" -msgstr "" - #. "" msgid "revert" msgstr "" -#. "expression that signifies a revision in git" -msgid "revision expression" -msgstr "" - #. "A particular state of files and directories which was stored in the object database." msgid "revision" msgstr "" @@ -312,87 +130,39 @@ msgstr "" msgid "sign off" msgstr "" -#. "see: staging area. In some areas of git this is called 'index'." -msgid "stage [noun], index" -msgstr "" - -#. "add some content of files and directories to the staging area in preparation for a commit" -msgid "stage [verb]" -msgstr "" - -#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." +#. "" msgid "staging area" msgstr "" -#. "The place (stack) where changes can be temporarily saved without committing" -msgid "stash [noun]" -msgstr "" - -#. "temporarily save changes in a stack without committing" -msgid "stash [verb]" -msgstr "" - #. "" msgid "status" msgstr "" -#. "" -msgid "submodule" -msgstr "" - -#. "A ref pointing to some commit object. In other words: A label on a specific commit." +#. "A ref pointing to a tag or commit object" msgid "tag [noun]" msgstr "" -#. "The process of creating a tag at a specific commit object" +#. "" msgid "tag [verb]" msgstr "" -#. "The person who created a tag" -msgid "tagger" -msgstr "" - -#. "file whose content is tracked/not tracked by git" -msgid "tracked/untracked" -msgstr "" - #. "A regular git branch that is used to follow changes from another repository." msgid "tracking branch" msgstr "" #. "" -msgid "trailer" -msgstr "" - -#. "1. tree object, 2. directory tree" -msgid "tree" -msgstr "" - -#. "" msgid "undo" msgstr "" -#. "Remove content of files from the staging area again so that it will not be part of the next commit" -msgid "unstage" -msgstr "" - -#. "Retrieving the temporarily saved changes back again from the stash" -msgid "unstash [verb]" -msgstr "" - #. "" msgid "update" msgstr "" #. "" -msgid "upstream branch" -msgstr "" - -#. "" msgid "verify" msgstr "" #. "The tree of actual checked out files." -msgid "working directory, working copy, working tree" +msgid "working copy, working tree" msgstr "" diff --git a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt b/third_party/git/git-gui/po/glossary/git-gui-glossary.txt index 48b9f10e57..409304692d 100644 --- a/third_party/git/git-gui/po/glossary/git-gui-glossary.txt +++ b/third_party/git/git-gui/po/glossary/git-gui-glossary.txt @@ -1,96 +1,67 @@ "English Term (Dear translator: This file will never be visible to the user!)" "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" -"abort" "prematurely stop and abandon an operation" "amend" "" -"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" "annotate" "" -"author" "The person who initially created (authored) a commit" -"bare repository" "a repository with only .git directory, without working directory" -"base" "a parent version of the current file" -"bisect" "" -"blame" "get the authors responsible for each line in a file" -"blob" "" "branch [noun]" "A 'branch' is an active line of development." "branch [verb]" "" "checkout [noun]" "" "checkout [verb]" "The action of updating the working tree to a revision which was stored in the object database." -"cherry-pick" "to select and apply a single commit to the current HEAD without merging" -"child commit" "a commit that directly succeeds the current one in git's graph of commits" -"cleanup" "clean the state of the git repository, often after manually stopped operation" "clone [verb]" "" "commit [noun]" "A single point in the git history." "commit [verb]" "The action of storing a new snapshot of the project's state in the git history." -"commit message" "a message that gets attached with any commit" -"committer" "The person who committed a commit (to the current branch), which might be different than the author." -"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" -"detached HEAD" "checkout of a revision rather than some head" -"detached checkout" "checkout of a revision rather than some head" "diff [noun]" "" "diff [verb]" "" -"directory" "" -"fast-forward" "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." +"fast forward merge" "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have." "fetch" "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too." -"file level merging" "any merge strategy that works on a file by file basis" -"file" "" -"head" "the last revision in a branch" -"hook" "script that gets executed automatically on some event" "hunk" "One context of consecutive lines in a whole patch, which consists of many such hunks" "index (in git-gui: staging area)" "A collection of files. The index is a stored version of your working tree." -"initial checkout" "the first checkout during a clone operation" -"initial commit" "The very first commit in a repository" -"local branch" "a branch that resides in the local git repository" -"loose object" "a Git object that is not part of any pack" -"master branch" "a branch called by convention 'master' that exists in a newly created git repository" "merge [noun]" "A successful merge results in the creation of a new commit representing the result of the merge." "merge [verb]" "To bring the contents of another branch into the current branch." "message" "" -"origin" "a remote called by convention 'origin' that the current git repository has been cloned from" -"orphan commit" "" -"orphan reference" "" -"pack [noun]" "a file containing many git objects packed together" -"pack [verb]" "the process of creating a pack file" -"packed object" "a Git object part of some pack" -"parent commit" "a commit that directly precedes the current one in git's graph of commits" -"patch" "" -"path" "The path to a file" -"prune" "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." +"prune" "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'." "pull" "Pulling a branch means to fetch it and merge it." "push" "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)" -"rebase [noun]" "The process of rebasing one set of commits on top of another branch's head" -"rebase [verb]" "Re-apply one set of commits on top of another branch's head. Contrary to merge." "redo" "" -"reference" "" -"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" -"refmap" "" -"refspec" "" -"remote [adj]" "The adjective for anything which is outside of the current (local) repository" -"remote branch" "A branch in any other ('remote') repository" -"remote repository" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." +"remote" "An other repository ('remote'). One might have a set of remotes whose branches one tracks." "repository" "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)" "reset" "" -"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" -"revert changes" "abandon changes and go to pristine version" "revert" "" -"revision expression" "expression that signifies a revision in git" "revision" "A particular state of files and directories which was stored in the object database." "sign off" "" -"stage [noun], index" "see: staging area. In some areas of git this is called 'index'." -"stage [verb]" "add some content of files and directories to the staging area in preparation for a commit" -"staging area" "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'." -"stash [noun]" "The place (stack) where changes can be temporarily saved without committing" -"stash [verb]" "temporarily save changes in a stack without committing" +"staging area" "" "status" "" -"submodule" "" -"tag [noun]" "A ref pointing to some commit object. In other words: A label on a specific commit." -"tag [verb]" "The process of creating a tag at a specific commit object" -"tagger" "The person who created a tag" -"tracked/untracked" "file whose content is tracked/not tracked by git" +"tag [noun]" "A ref pointing to a tag or commit object" +"tag [verb]" "" "tracking branch" "A regular git branch that is used to follow changes from another repository." -"trailer" "" -"tree" "1. tree object, 2. directory tree" "undo" "" -"unstage" "Remove content of files from the staging area again so that it will not be part of the next commit" -"unstash [verb]" "Retrieving the temporarily saved changes back again from the stash" "update" "" -"upstream branch" "" "verify" "" -"working directory, working copy, working tree" "The tree of actual checked out files." +"working copy, working tree" "The tree of actual checked out files." +"ancestor" "a commit that succeeds the current one in git's graph of commits (not necessarily directly)" +"abort" "prematurely stop and abandon an operation" +"bare repository" "a repository with only .git directory, without working directory" +"base" "a parent version of the current file" +"blame" "get the authors responsible for each line in a file" +"cherry-pick" "to select and apply a single commit without merging" +"child" "a commit that directly succeeds the current one in git's graph of commits" +"cleanup" "clean the state of the git repository, often after manually stopped operation" +"commit message" "a message that gets attached with any commit" +"descendant" "a commit that precedes the current one in git's graph of commits (not necessarily directly)" +"detached checkout" "checkout of a revision rather than a some head" +"file level merging" "any merge strategy that works on a file by file basis" +"head" "the last revision in a branch" +"hook" "script that gets executed automatically on some event" +"initial checkout" "the first checkout during a clone operation" +"local branch" "a branch that resides in the local git repository" +"loose object" "a Git object that is not part of any pack" +"master branch" "a branch called by convention 'master' that exists in a newly created git repository" +"origin" "a remote called by convention 'origin' that the current git repository has been cloned from" +"pack [noun]" "a file containing many git objects packed together" +"packed object" "a Git object part of some pack" +"parent" "a commit that directly precedes the current one in git's graph of commits" +"reflog" "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)" +"resolve (a conflict)" "decide which changes from alternative versions of a file should persist in Git" +"revert changes" "abandon changes and go to pristine version" +"revision expression" "expression that signifies a revision in git" +"stage/unstage" "add some content of files and directories to the staging area in preparation for a commit" +"stash" "temporarily save changes in a stack without committing" +"tracked/untracked" "file whose content is tracked/not tracked by git" diff --git a/third_party/git/git-gui/po/ja.po b/third_party/git/git-gui/po/ja.po index 2f61153ab9..208651c1af 100644 --- a/third_party/git/git-gui/po/ja.po +++ b/third_party/git/git-gui/po/ja.po @@ -4,15 +4,14 @@ # # しらいし ななこ <nanako3@bluebottle.com>, 2007. # Satoshi Yasushima <s.yasushima@gmail.com>, 2016. -# KIDANI Akito <a.kid.1985@gmail.com>, 2019. # msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-27 17:52+0900\n" -"PO-Revision-Date: 2019-10-13 23:20+0900\n" -"Last-Translator: KIDANI Akito <a.kid.1985@gmail.com>\n" +"PO-Revision-Date: 2016-06-22 12:50+0900\n" +"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -662,7 +661,7 @@ msgstr "" #: lib/merge.tcl:108 #, tcl-format msgid "%s of %s" -msgstr "%2$s の %1$s ブランチ" +msgstr "%s の %s ブランチ" #: lib/merge.tcl:122 #, tcl-format @@ -957,7 +956,7 @@ msgstr "エラー: コマンドが失敗しました" #: lib/checkout_op.tcl:85 #, tcl-format msgid "Fetching %s from %s" -msgstr "%2$s から %1$s をフェッチしています" +msgstr "%s から %s をフェッチしています" #: lib/checkout_op.tcl:133 #, tcl-format diff --git a/third_party/git/git-legacy-stash.sh b/third_party/git/git-legacy-stash.sh index 4d4ebb4f2b..f60e9b3e87 100755 --- a/third_party/git/git-legacy-stash.sh +++ b/third_party/git/git-legacy-stash.sh @@ -193,8 +193,7 @@ create_stash () { GIT_INDEX_FILE="$TMPindex" && export GIT_INDEX_FILE && git diff-index --name-only -z HEAD -- "$@" >"$TMP-stagenames" && - git update-index --ignore-skip-worktree-entries \ - -z --add --remove --stdin <"$TMP-stagenames" && + git update-index -z --add --remove --stdin <"$TMP-stagenames" && git write-tree && rm -f "$TMPindex" ) ) || @@ -207,7 +206,7 @@ create_stash () { # find out what the user wants GIT_INDEX_FILE="$TMP-index" \ - git add --legacy-stash-p -- "$@" && + git add--interactive --patch=stash -- "$@" && # state of the working tree w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) || @@ -371,7 +370,7 @@ push_stash () { git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R else - git reset --hard -q --no-recurse-submodules + git reset --hard -q fi if test "$keep_index" = "t" && test -n "$i_tree" diff --git a/third_party/git/git-p4.py b/third_party/git/git-p4.py index 9a71a6690d..3991e7d1a7 100755 --- a/third_party/git/git-p4.py +++ b/third_party/git/git-p4.py @@ -7,14 +7,6 @@ # 2007 Trolltech ASA # License: MIT <http://www.opensource.org/licenses/mit-license.php> # -# pylint: disable=invalid-name,missing-docstring,too-many-arguments,broad-except -# pylint: disable=no-self-use,wrong-import-position,consider-iterating-dictionary -# pylint: disable=wrong-import-order,unused-import,too-few-public-methods -# pylint: disable=too-many-lines,ungrouped-imports,fixme,too-many-locals -# pylint: disable=line-too-long,bad-whitespace,superfluous-parens -# pylint: disable=too-many-statements,too-many-instance-attributes -# pylint: disable=too-many-branches,too-many-nested-blocks -# import sys if sys.hexversion < 0x02040000: # The limiter is the subprocess module @@ -169,30 +161,12 @@ def calcDiskFree(): return st.f_bavail * st.f_frsize def die(msg): - """ Terminate execution. Make sure that any running child processes have been wait()ed for before - calling this. - """ if verbose: raise Exception(msg) else: sys.stderr.write(msg + "\n") sys.exit(1) -def prompt(prompt_text): - """ Prompt the user to choose one of the choices - - Choices are identified in the prompt_text by square brackets around - a single letter option. - """ - choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text)) - while True: - response = raw_input(prompt_text).strip().lower() - if not response: - continue - response = response[0] - if response in choices: - return response - def write_pipe(c, stdin): if verbose: sys.stderr.write('Writing pipe: %s\n' % str(c)) @@ -629,14 +603,6 @@ class P4RequestSizeException(P4ServerException): super(P4RequestSizeException, self).__init__(exit_code, p4_result) self.limit = limit -class P4CommandException(P4Exception): - """ Something went wrong calling p4 which means we have to give up """ - def __init__(self, msg): - self.msg = msg - - def __str__(self): - return self.msg - def isModeExecChanged(src_mode, dst_mode): return isModeExec(src_mode) != isModeExec(dst_mode) @@ -1194,11 +1160,13 @@ class LargeFileSystem(object): if contentsSize <= gitConfigInt('git-p4.largeFileCompressedThreshold'): return False contentTempFile = self.generateTempFile(contents) - compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=True) - with zipfile.ZipFile(compressedContentFile, mode='w') as zf: - zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED) - compressedContentsSize = zf.infolist()[0].compress_size + compressedContentFile = tempfile.NamedTemporaryFile(prefix='git-p4-large-file', delete=False) + zf = zipfile.ZipFile(compressedContentFile.name, mode='w') + zf.write(contentTempFile, compress_type=zipfile.ZIP_DEFLATED) + zf.close() + compressedContentsSize = zf.infolist()[0].compress_size os.remove(contentTempFile) + os.remove(compressedContentFile.name) if compressedContentsSize > gitConfigInt('git-p4.largeFileCompressedThreshold'): return True return False @@ -1291,15 +1259,9 @@ class GitLFS(LargeFileSystem): pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile) oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1) - # if someone use external lfs.storage ( not in local repo git ) - lfs_path = gitConfig('lfs.storage') - if not lfs_path: - lfs_path = 'lfs' - if not os.path.isabs(lfs_path): - lfs_path = os.path.join(os.getcwd(), '.git', lfs_path) localLargeFile = os.path.join( - lfs_path, - 'objects', oid[:2], oid[2:4], + os.getcwd(), + '.git', 'lfs', 'objects', oid[:2], oid[2:4], oid, ) # LFS Spec states that pointer files should not have the executable bit set. @@ -1818,11 +1780,12 @@ class P4Submit(Command, P4UserMap): if os.stat(template_file).st_mtime > mtime: return True - response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ") - if response == 'y': - return True - if response == 'n': - return False + while True: + response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ") + if response == 'y': + return True + if response == 'n': + return False def get_diff_description(self, editedFiles, filesToAdd, symlinks): # diff @@ -2384,22 +2347,31 @@ class P4Submit(Command, P4UserMap): " --prepare-p4-only") break if i < last: - # prompt for what to do, or use the option/variable - if self.conflict_behavior == "ask": - print("What do you want to do?") - response = prompt("[s]kip this commit but apply the rest, or [q]uit? ") - elif self.conflict_behavior == "skip": - response = "s" - elif self.conflict_behavior == "quit": - response = "q" - else: - die("Unknown conflict_behavior '%s'" % - self.conflict_behavior) - - if response == "s": - print("Skipping this commit, but applying the rest") - if response == "q": - print("Quitting") + quit = False + while True: + # prompt for what to do, or use the option/variable + if self.conflict_behavior == "ask": + print("What do you want to do?") + response = raw_input("[s]kip this commit but apply" + " the rest, or [q]uit? ") + if not response: + continue + elif self.conflict_behavior == "skip": + response = "s" + elif self.conflict_behavior == "quit": + response = "q" + else: + die("Unknown conflict_behavior '%s'" % + self.conflict_behavior) + + if response[0] == "s": + print("Skipping this commit, but applying the rest") + break + if response[0] == "q": + print("Quitting") + quit = True + break + if quit: break chdir(self.oldWorkingDirectory) @@ -3553,79 +3525,10 @@ class P4Sync(Command, P4UserMap): self.updateOptionDict(details) try: self.commit(details, self.extractFilesFromCommit(details), self.branch) - except IOError as err: + except IOError: print("IO error with git fast-import. Is your git version recent enough?") - print("IO error details: {}".format(err)) print(self.gitError.read()) - - def importRevisions(self, args, branch_arg_given): - changes = [] - - if len(self.changesFile) > 0: - with open(self.changesFile) as f: - output = f.readlines() - changeSet = set() - for line in output: - changeSet.add(int(line)) - - for change in changeSet: - changes.append(change) - - changes.sort() - else: - # catch "git p4 sync" with no new branches, in a repo that - # does not have any existing p4 branches - if len(args) == 0: - if not self.p4BranchesInGit: - raise P4CommandException("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.") - - # The default branch is master, unless --branch is used to - # specify something else. Make sure it exists, or complain - # nicely about how to use --branch. - if not self.detectBranches: - if not branch_exists(self.branch): - if branch_arg_given: - raise P4CommandException("Error: branch %s does not exist." % self.branch) - else: - raise P4CommandException("Error: no branch %s; perhaps specify one with --branch." % - self.branch) - - if self.verbose: - print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths), - self.changeRange)) - changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size) - - if len(self.maxChanges) > 0: - changes = changes[:min(int(self.maxChanges), len(changes))] - - if len(changes) == 0: - if not self.silent: - print("No changes to import!") - else: - if not self.silent and not self.detectBranches: - print("Import destination: %s" % self.branch) - - self.updatedBranches = set() - - if not self.detectBranches: - if args: - # start a new branch - self.initialParent = "" - else: - # build on a previous revision - self.initialParent = parseRevision(self.branch) - - self.importChanges(changes) - - if not self.silent: - print("") - if len(self.updatedBranches) > 0: - sys.stdout.write("Updated branches: ") - for b in self.updatedBranches: - sys.stdout.write("%s " % b) - sys.stdout.write("\n") - def openStreams(self): self.importProcess = subprocess.Popen(["git", "fast-import"], stdin=subprocess.PIPE, @@ -3636,14 +3539,11 @@ class P4Sync(Command, P4UserMap): self.gitError = self.importProcess.stderr def closeStreams(self): - if self.gitStream is None: - return self.gitStream.close() if self.importProcess.wait() != 0: die("fast-import failed: %s" % self.gitError.read()) self.gitOutput.close() self.gitError.close() - self.gitStream = None def run(self, args): if self.importIntoRemotes: @@ -3827,36 +3727,87 @@ class P4Sync(Command, P4UserMap): b = b[len(self.projectName):] self.createdBranches.add(b) - p4_check_access() - self.openStreams() - err = None + if revision: + self.importHeadRevision(revision) + else: + changes = [] - try: - if revision: - self.importHeadRevision(revision) + if len(self.changesFile) > 0: + output = open(self.changesFile).readlines() + changeSet = set() + for line in output: + changeSet.add(int(line)) + + for change in changeSet: + changes.append(change) + + changes.sort() + else: + # catch "git p4 sync" with no new branches, in a repo that + # does not have any existing p4 branches + if len(args) == 0: + if not self.p4BranchesInGit: + die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.") + + # The default branch is master, unless --branch is used to + # specify something else. Make sure it exists, or complain + # nicely about how to use --branch. + if not self.detectBranches: + if not branch_exists(self.branch): + if branch_arg_given: + die("Error: branch %s does not exist." % self.branch) + else: + die("Error: no branch %s; perhaps specify one with --branch." % + self.branch) + + if self.verbose: + print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths), + self.changeRange)) + changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size) + + if len(self.maxChanges) > 0: + changes = changes[:min(int(self.maxChanges), len(changes))] + + if len(changes) == 0: + if not self.silent: + print("No changes to import!") else: - self.importRevisions(args, branch_arg_given) + if not self.silent and not self.detectBranches: + print("Import destination: %s" % self.branch) - if gitConfigBool("git-p4.importLabels"): - self.importLabels = True + self.updatedBranches = set() - if self.importLabels: - p4Labels = getP4Labels(self.depotPaths) - gitTags = getGitTags() + if not self.detectBranches: + if args: + # start a new branch + self.initialParent = "" + else: + # build on a previous revision + self.initialParent = parseRevision(self.branch) - missingP4Labels = p4Labels - gitTags - self.importP4Labels(self.gitStream, missingP4Labels) + self.importChanges(changes) - except P4CommandException as e: - err = e + if not self.silent: + print("") + if len(self.updatedBranches) > 0: + sys.stdout.write("Updated branches: ") + for b in self.updatedBranches: + sys.stdout.write("%s " % b) + sys.stdout.write("\n") + + if gitConfigBool("git-p4.importLabels"): + self.importLabels = True + + if self.importLabels: + p4Labels = getP4Labels(self.depotPaths) + gitTags = getGitTags() - finally: - self.closeStreams() + missingP4Labels = p4Labels - gitTags + self.importP4Labels(self.gitStream, missingP4Labels) - if err: - die(str(err)) + self.closeStreams() # Cleanup temporary branches created during import if self.tempBranches != []: @@ -4190,12 +4141,7 @@ def main(): description = cmd.description, formatter = HelpFormatter()) - try: - (cmd, args) = parser.parse_args(sys.argv[2:], cmd); - except: - parser.print_help() - raise - + (cmd, args) = parser.parse_args(sys.argv[2:], cmd); global verbose verbose = cmd.verbose if cmd.needsGit: diff --git a/third_party/git/git-send-email.perl b/third_party/git/git-send-email.perl index dc95656f75..5f92c89c1c 100755 --- a/third_party/git/git-send-email.perl +++ b/third_party/git/git-send-email.perl @@ -1228,7 +1228,7 @@ sub process_address_list { # domain name that corresponds the IP address in the HELO/EHLO # handshake. This is used to verify the connection and prevent # spammers from trying to hide their identity. If the DNS and IP don't -# match, the receiving MTA may deny the connection. +# match, the receiveing MTA may deny the connection. # # Here is a deny example of Net::SMTP with the default "localhost.localdomain" # diff --git a/third_party/git/git-submodule.sh b/third_party/git/git-submodule.sh index 89f915cae9..c7f58c5756 100755 --- a/third_party/git/git-submodule.sh +++ b/third_party/git/git-submodule.sh @@ -10,9 +10,8 @@ USAGE="[--quiet] [--cached] or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...] or: $dashless [--quiet] init [--] [<path>...] or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...) - or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...] + or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...] or: $dashless [--quiet] set-branch (--default|--branch <branch>) [--] <path> - or: $dashless [--quiet] set-url [--] <path> <newurl> or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...] or: $dashless [--quiet] foreach [--recursive] <command> or: $dashless [--quiet] sync [--recursive] [--] [<path>...] @@ -37,7 +36,6 @@ reference= cached= recursive= init= -require_init= files= remote= nofetch= @@ -47,7 +45,6 @@ custom_name= depth= progress= dissociate= -single_branch= die_if_unmatched () { @@ -242,15 +239,13 @@ cmd_add() die "$(eval_gettext "'\$sm_path' does not have a commit checked out")" fi - if test -z "$force" + if test -z "$force" && + ! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1 then - dryerr=$(git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" 2>&1 >/dev/null) - res=$? - if test $res -ne 0 - then - echo >&2 "$dryerr" - exit $res - fi + eval_gettextln "The following path is ignored by one of your .gitignore files: +\$sm_path +Use -f if you really want to add it." >&2 + exit 1 fi if test -n "$custom_name" @@ -471,10 +466,6 @@ cmd_update() -i|--init) init=1 ;; - --require-init) - init=1 - require_init=1 - ;; --remote) remote=1 ;; @@ -529,12 +520,6 @@ cmd_update() --jobs=*) jobs=$1 ;; - --single-branch) - single_branch="--single-branch" - ;; - --no-single-branch) - single_branch="--no-single-branch" - ;; --) shift break @@ -563,8 +548,6 @@ cmd_update() ${reference:+"$reference"} \ ${dissociate:+"--dissociate"} \ ${depth:+--depth "$depth"} \ - ${require_init:+--require-init} \ - $single_branch \ $recommend_shallow \ $jobs \ -- \ @@ -778,55 +761,6 @@ cmd_set_branch() { } # -# Configures a submodule's remote url -# -# $@ = requested path, requested url -# -cmd_set_url() { - while test $# -ne 0 - do - case "$1" in - -q|--quiet) - GIT_QUIET=1 - ;; - --) - shift - break - ;; - -*) - usage - ;; - *) - break - ;; - esac - shift - done - - if test $# -ne 2 - then - usage - fi - - # we can't use `git submodule--helper name` here because internally, it - # hashes the path so a trailing slash could lead to an unintentional no match - name="$(git submodule--helper list "$1" | cut -f2)" - if test -z "$name" - then - exit 1 - fi - - url="$2" - if test -z "$url" - then - exit 1 - fi - - git submodule--helper config submodule."$name".url "$url" - git submodule--helper sync ${GIT_QUIET:+--quiet} "$name" -} - -# # Show commit summary for submodules in index or working tree # # If '--cached' is given, show summary between index and given commit, @@ -1125,7 +1059,7 @@ cmd_absorbgitdirs() while test $# != 0 && test -z "$command" do case "$1" in - add | foreach | init | deinit | update | set-branch | set-url | status | summary | sync | absorbgitdirs) + add | foreach | init | deinit | update | set-branch | status | summary | sync | absorbgitdirs) command=$1 ;; -q|--quiet) diff --git a/third_party/git/git-svn.perl b/third_party/git/git-svn.perl index 4aa208ff5f..050f2a36f4 100755 --- a/third_party/git/git-svn.perl +++ b/third_party/git/git-svn.perl @@ -110,7 +110,7 @@ my ($_stdin, $_help, $_edit, $_template, $_shared, $_version, $_fetch_all, $_no_rebase, $_fetch_parent, $_before, $_after, - $_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local, + $_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local, $_prefix, $_no_checkout, $_url, $_verbose, $_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props); @@ -270,8 +270,7 @@ my %cmd = ( 'local|l' => \$_local, 'fetch-all|all' => \$_fetch_all, 'dry-run|n' => \$_dry_run, - 'rebase-merges|p' => \$_rebase_merges, - 'preserve-merges|p' => \$_rebase_merges, + 'preserve-merges|p' => \$_preserve_merges, %fc_opts } ], 'commit-diff' => [ \&cmd_commit_diff, 'Commit a diff between two trees', @@ -1055,7 +1054,7 @@ sub cmd_dcommit { 'If you are attempting to commit ', "merges, try running:\n\t", 'git rebase --interactive', - '--rebase-merges ', + '--preserve-merges ', $gs->refname, "\nBefore dcommitting"; } @@ -1718,7 +1717,7 @@ sub rebase_cmd { push @cmd, '-v' if $_verbose; push @cmd, qw/--merge/ if $_merge; push @cmd, "--strategy=$_strategy" if $_strategy; - push @cmd, "--rebase-merges" if $_rebase_merges; + push @cmd, "--preserve-merges" if $_preserve_merges; @cmd; } diff --git a/third_party/git/git.c b/third_party/git/git.c index 7be7ad34bd..c1ee7124ed 100644 --- a/third_party/git/git.c +++ b/third_party/git/git.c @@ -369,7 +369,8 @@ static int handle_alias(int *argcp, const char ***argv) die(_("alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this"), alias_command); - MOVE_ARRAY(new_argv - option_count, new_argv, count); + memmove(new_argv - option_count, new_argv, + count * sizeof(char *)); new_argv -= option_count; if (count < 1) @@ -384,7 +385,7 @@ static int handle_alias(int *argcp, const char ***argv) REALLOC_ARRAY(new_argv, count + *argcp); /* insert after command name */ - COPY_ARRAY(new_argv + count, *argv + 1, *argcp); + memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp); trace2_cmd_alias(alias_command, new_argv); trace2_cmd_list_config(); @@ -572,7 +573,6 @@ static struct cmd_struct commands[] = { { "show-branch", cmd_show_branch, RUN_SETUP }, { "show-index", cmd_show_index }, { "show-ref", cmd_show_ref, RUN_SETUP }, - { "sparse-checkout", cmd_sparse_checkout, RUN_SETUP | NEED_WORK_TREE }, { "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE }, /* * NEEDSWORK: Until the builtin stash is thoroughly robust and no diff --git a/third_party/git/gitk-git/gitk b/third_party/git/gitk-git/gitk index abe4805ade..a14d7a16b2 100755 --- a/third_party/git/gitk-git/gitk +++ b/third_party/git/gitk-git/gitk @@ -3404,8 +3404,6 @@ set rectmask { } image create bitmap reficon-H -background black -foreground "#00ff00" \ -data $rectdata -maskdata $rectmask -image create bitmap reficon-R -background black -foreground "#ffddaa" \ - -data $rectdata -maskdata $rectmask image create bitmap reficon-o -background black -foreground "#ddddff" \ -data $rectdata -maskdata $rectmask @@ -7018,7 +7016,6 @@ proc commit_descriptor {p} { # append some text to the ctext widget, and make any SHA1 ID # that we know about be a clickable link. -# Also look for URLs of the form "http[s]://..." and make them web links. proc appendwithlinks {text tags} { global ctext linknum curview @@ -7035,18 +7032,6 @@ proc appendwithlinks {text tags} { setlink $linkid link$linknum incr linknum } - set wlinks [regexp -indices -all -inline -line \ - {https?://[^[:space:]]+} $text] - foreach l $wlinks { - set s2 [lindex $l 0] - set e2 [lindex $l 1] - set url [string range $text $s2 $e2] - incr e2 - $ctext tag delete link$linknum - $ctext tag add link$linknum "$start + $s2 c" "$start + $e2 c" - setwlink $url link$linknum - incr linknum - } } proc setlink {id lk} { @@ -7079,18 +7064,6 @@ proc setlink {id lk} { } } -proc setwlink {url lk} { - global ctext - global linkfgcolor - global web_browser - - if {$web_browser eq {}} return - $ctext tag conf $lk -foreground $linkfgcolor -underline 1 - $ctext tag bind $lk <1> [list browseweb $url] - $ctext tag bind $lk <Enter> {linkcursor %W 1} - $ctext tag bind $lk <Leave> {linkcursor %W -1} -} - proc appendshortlink {id {pre {}} {post {}}} { global ctext linknum @@ -7125,16 +7098,6 @@ proc linkcursor {w inc} { } } -proc browseweb {url} { - global web_browser - - if {$web_browser eq {}} return - # Use eval here in case $web_browser is a command plus some arguments - if {[catch {eval exec $web_browser [list $url] &} err]} { - error_popup "[mc "Error starting web browser:"] $err" - } -} - proc viewnextline {dir} { global canv linespc @@ -8228,11 +8191,11 @@ proc parseblobdiffline {ids line} { } else { $ctext insert end "$line\n" filesep } - } elseif {$currdiffsubmod != "" && ![string compare -length 3 " >" $line]} { + } elseif {![string compare -length 3 " >" $line]} { set $currdiffsubmod "" set line [encoding convertfrom $diffencoding $line] $ctext insert end "$line\n" dresult - } elseif {$currdiffsubmod != "" && ![string compare -length 3 " <" $line]} { + } elseif {![string compare -length 3 " <" $line]} { set $currdiffsubmod "" set line [encoding convertfrom $diffencoding $line] $ctext insert end "$line\n" d0 @@ -10059,7 +10022,6 @@ proc sel_reflist {w x y} { set n [lindex $ref 0] switch -- [lindex $ref 1] { "H" {selbyid $headids($n)} - "R" {selbyid $headids($n)} "T" {selbyid $tagids($n)} "o" {selbyid $otherrefids($n)} } @@ -10089,11 +10051,7 @@ proc refill_reflist {} { foreach n [array names headids] { if {[string match $reflistfilter $n]} { if {[commitinview $headids($n) $curview]} { - if {[string match "remotes/*" $n]} { - lappend refs [list $n R] - } else { - lappend refs [list $n H] - } + lappend refs [list $n H] } else { interestedin $headids($n) {run refill_reflist} } @@ -11530,7 +11488,7 @@ proc create_prefs_page {w} { proc prefspage_general {notebook} { global NS maxwidth maxgraphpct showneartags showlocalchanges global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs - global hideremotes want_ttk have_ttk maxrefs web_browser + global hideremotes want_ttk have_ttk maxrefs set page [create_prefs_page $notebook.general] @@ -11581,13 +11539,6 @@ proc prefspage_general {notebook} { pack configure $page.extdifff.l -padx 10 grid x $page.extdifff $page.extdifft -sticky ew - ${NS}::entry $page.webbrowser -textvariable web_browser - ${NS}::frame $page.webbrowserf - ${NS}::label $page.webbrowserf.l -text [mc "Web browser" ] - pack $page.webbrowserf.l -side left - pack configure $page.webbrowserf.l -padx 10 - grid x $page.webbrowserf $page.webbrowser -sticky ew - ${NS}::label $page.lgen -text [mc "General options"] grid $page.lgen - -sticky w -pady 10 ${NS}::checkbutton $page.want_ttk -variable want_ttk \ @@ -12359,7 +12310,6 @@ if {[tk windowingsystem] eq "win32"} { set bgcolor SystemWindow set fgcolor SystemWindowText set selectbgcolor SystemHighlight - set web_browser "cmd /c start" } else { set uicolor grey85 set uifgcolor black @@ -12367,11 +12317,6 @@ if {[tk windowingsystem] eq "win32"} { set bgcolor white set fgcolor black set selectbgcolor gray85 - if {[tk windowingsystem] eq "aqua"} { - set web_browser "open" - } else { - set web_browser "xdg-open" - } } set diffcolors {red "#00a000" blue} set diffcontext 3 @@ -12445,7 +12390,6 @@ set config_variables { filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor indexcirclecolor circlecolors linkfgcolor circleoutlinecolor - web_browser } foreach var $config_variables { config_init_trace $var diff --git a/third_party/git/gitk-git/po/zh_cn.po b/third_party/git/gitk-git/po/zh_cn.po deleted file mode 100644 index 17b7f899da..0000000000 --- a/third_party/git/gitk-git/po/zh_cn.po +++ /dev/null @@ -1,1367 +0,0 @@ -# Translation of gitk to Simplified Chinese. -# -# Translators: -# YanKe <imyanke@163.com>, 2017 - -msgid "" -msgstr "" -"Project-Id-Version: Git Chinese Localization Project\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-02-28 23:11+0800\n" -"PO-Revision-Date: 2017-03-11 02:27+0800\n" -"Last-Translator: YanKe <imyanke@163.com>\n" -"Language-Team: Chinese\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" - -#: gitk:140 -msgid "Couldn't get list of unmerged files:" -msgstr "不能获取未合并文件列表：" - -#: gitk:212 gitk:2403 -msgid "Color words" -msgstr "着色显示差异" - -#: gitk:217 gitk:2403 gitk:8249 gitk:8282 -msgid "Markup words" -msgstr "标记显示差异" - -#: gitk:324 -msgid "Error parsing revisions:" -msgstr "解析版本错误：" - -#: gitk:380 -msgid "Error executing --argscmd command:" -msgstr "运行 --argscmd命令出错" - -#: gitk:393 -msgid "No files selected: --merge specified but no files are unmerged." -msgstr "没有选中文件：--指定merge参数但没有未合并的文件。" - -#: gitk:396 -msgid "" -"No files selected: --merge specified but no unmerged files are within file " -"limit." -msgstr "没有选中文件：--指定merge参数但没有未合并的文件在文件中" - -#: gitk:418 gitk:566 -msgid "Error executing git log:" -msgstr "执行git log命令出错：" - -#: gitk:436 gitk:582 -msgid "Reading" -msgstr "读取中" - -#: gitk:496 gitk:4549 -msgid "Reading commits..." -msgstr "提交记录读取中..." - -#: gitk:499 gitk:1641 gitk:4552 -msgid "No commits selected" -msgstr "未选中任何提交" - -#: gitk:1449 gitk:4069 gitk:12583 -msgid "Command line" -msgstr "命令行" - -#: gitk:1515 -msgid "Can't parse git log output:" -msgstr "不能解析git log输出：" - -#: gitk:1744 -msgid "No commit information available" -msgstr "无可用提交信息" - -#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668 -msgid "OK" -msgstr "确定" - -#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791 -#: gitk:11389 gitk:11669 -msgid "Cancel" -msgstr "取消" - -#: gitk:2087 -msgid "&Update" -msgstr "更新" - -#: gitk:2088 -msgid "&Reload" -msgstr "重新加载" - -#: gitk:2089 -msgid "Reread re&ferences" -msgstr "重新读取引用" - -#: gitk:2090 -msgid "&List references" -msgstr "列出引用(分支以及tag)" - -#: gitk:2092 -msgid "Start git &gui" -msgstr "启动git gui客户端" - -#: gitk:2094 -msgid "&Quit" -msgstr "退出" - -#: gitk:2086 -msgid "&File" -msgstr "文件" - -#: gitk:2098 -msgid "&Preferences" -msgstr "偏好设置" - -#: gitk:2097 -msgid "&Edit" -msgstr "编辑" - -#: gitk:2102 -msgid "&New view..." -msgstr "新视图..." - -#: gitk:2103 -msgid "&Edit view..." -msgstr "编辑视图..." - -#: gitk:2104 -msgid "&Delete view" -msgstr "删除视图" - -#: gitk:2106 -msgid "&All files" -msgstr "所有文件" - -#: gitk:2101 -msgid "&View" -msgstr "视图" - -#: gitk:2111 gitk:2121 -msgid "&About gitk" -msgstr "关于gitk" - -#: gitk:2112 gitk:2126 -msgid "&Key bindings" -msgstr "快捷键" - -#: gitk:2110 gitk:2125 -msgid "&Help" -msgstr "帮助" - -#: gitk:2203 gitk:8681 -msgid "SHA1 ID:" -msgstr "SHA1 ID：" - -#: gitk:2247 -msgid "Row" -msgstr "行" - -#: gitk:2285 -msgid "Find" -msgstr "查找" - -#: gitk:2313 -msgid "commit" -msgstr "提交" - -#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851 -#: gitk:6936 -msgid "containing:" -msgstr "包含：" - -#: gitk:2320 gitk:3550 gitk:3555 gitk:4787 -msgid "touching paths:" -msgstr "影响路径：" - -#: gitk:2321 gitk:4801 -msgid "adding/removing string:" -msgstr "增加/删除字符串：" - -#: gitk:2322 gitk:4803 -msgid "changing lines matching:" -msgstr "改变行匹配：" - -#: gitk:2331 gitk:2333 gitk:4790 -msgid "Exact" -msgstr "精确匹配" - -#: gitk:2333 gitk:4878 gitk:6747 -msgid "IgnCase" -msgstr "忽略大小写" - -#: gitk:2333 gitk:4760 gitk:4876 gitk:6743 -msgid "Regexp" -msgstr "正则" - -#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940 -msgid "All fields" -msgstr "所有字段" - -#: gitk:2336 gitk:4895 gitk:4928 gitk:6810 -msgid "Headline" -msgstr "标题" - -#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413 -msgid "Comments" -msgstr "提交注释" - -#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859 -#: gitk:8874 -msgid "Author" -msgstr "作者" - -#: gitk:2337 gitk:4895 gitk:6810 gitk:7350 -msgid "Committer" -msgstr "提交者" - -#: gitk:2371 -msgid "Search" -msgstr "搜索" - -#: gitk:2379 -msgid "Diff" -msgstr "差异" - -#: gitk:2381 -msgid "Old version" -msgstr "老版本" - -#: gitk:2383 -msgid "New version" -msgstr "新版本" - -#: gitk:2386 -msgid "Lines of context" -msgstr "Diff上下文显示行数" - -#: gitk:2396 -msgid "Ignore space change" -msgstr "忽略空格修改" - -#: gitk:2400 gitk:2402 gitk:7983 gitk:8235 -msgid "Line diff" -msgstr "按行显示差异" - -#: gitk:2467 -msgid "Patch" -msgstr "补丁" - -#: gitk:2469 -msgid "Tree" -msgstr "树" - -#: gitk:2639 gitk:2660 -msgid "Diff this -> selected" -msgstr "比较从当前提交到选中提交的差异" - -#: gitk:2640 gitk:2661 -msgid "Diff selected -> this" -msgstr "比较从选中提交到当前提交的差异" - -#: gitk:2641 gitk:2662 -msgid "Make patch" -msgstr "制作补丁" - -#: gitk:2642 gitk:9283 -msgid "Create tag" -msgstr "创建tag" - -#: gitk:2643 -msgid "Copy commit summary" -msgstr "复制提交摘要" - -#: gitk:2644 gitk:9414 -msgid "Write commit to file" -msgstr "写入提交到文件" - -#: gitk:2645 -msgid "Create new branch" -msgstr "创建新分支" - -#: gitk:2646 -msgid "Cherry-pick this commit" -msgstr "在此提交运用补丁(cherry-pick)命令" - -#: gitk:2647 -msgid "Reset HEAD branch to here" -msgstr "将分支头(HEAD)重置到此处" - -#: gitk:2648 -msgid "Mark this commit" -msgstr "标记此提交" - -#: gitk:2649 -msgid "Return to mark" -msgstr "返回到标记" - -#: gitk:2650 -msgid "Find descendant of this and mark" -msgstr "查找本次提交的子提交并标记" - -#: gitk:2651 -msgid "Compare with marked commit" -msgstr "和已标记的提交作比较" - -#: gitk:2652 gitk:2663 -msgid "Diff this -> marked commit" -msgstr "比较从当前提交到已标记提交的差异" - -#: gitk:2653 gitk:2664 -msgid "Diff marked commit -> this" -msgstr "比较从已标记提交到当前提交的差异" - -#: gitk:2654 -msgid "Revert this commit" -msgstr "撤销(revert)此提交" - -#: gitk:2670 -msgid "Check out this branch" -msgstr "检出(checkout)此分支" - -#: gitk:2671 -msgid "Rename this branch" -msgstr "重命名(Rename)此分支" - -#: gitk:2672 -msgid "Remove this branch" -msgstr "删除(Remove)此分支" - -#: gitk:2673 -msgid "Copy branch name" -msgstr "复制分支名称" - -#: gitk:2680 -msgid "Highlight this too" -msgstr "高亮此处" - -#: gitk:2681 -msgid "Highlight this only" -msgstr "只高亮此处" - -#: gitk:2682 -msgid "External diff" -msgstr "外部diff" - -#: gitk:2683 -msgid "Blame parent commit" -msgstr "Blame父提交" - -#: gitk:2684 -msgid "Copy path" -msgstr "复制路径" - -#: gitk:2691 -msgid "Show origin of this line" -msgstr "显示此行原始提交" - -#: gitk:2692 -msgid "Run git gui blame on this line" -msgstr "在此行运行git gui客户端的blame" - -#: gitk:3036 -msgid "About gitk" -msgstr "关于gitk" - -#: gitk:3038 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright © 2005-2016 Paul Mackerras\n" -"\n" -"Use and redistribute under the terms of the GNU General Public License" -msgstr "\nGitk — 一个git的提交查看器\n\n© 2005-2016 Paul Mackerras\n\n在GNU许可证下使用以及分发" - -#: gitk:3046 gitk:3113 gitk:10004 -msgid "Close" -msgstr "关闭" - -#: gitk:3067 -msgid "Gitk key bindings" -msgstr "Gitk快捷键" - -#: gitk:3070 -msgid "Gitk key bindings:" -msgstr "Gitk快捷键：" - -#: gitk:3072 -#, tcl-format -msgid "<%s-Q>\t\tQuit" -msgstr "<%s-Q>\t\t退出" - -#: gitk:3073 -#, tcl-format -msgid "<%s-W>\t\tClose window" -msgstr "<%s-W>\t\t关闭窗口" - -#: gitk:3074 -msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\t移动到第一次提交" - -#: gitk:3075 -msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\t移动到最后一次提交" - -#: gitk:3076 -msgid "<Up>, p, k\tMove up one commit" -msgstr "<Up>, p, k\t移动到上一次提交" - -#: gitk:3077 -msgid "<Down>, n, j\tMove down one commit" -msgstr "<Down>, n, j\t移动到下一次提交" - -#: gitk:3078 -msgid "<Left>, z, h\tGo back in history list" -msgstr "<Left>, z, h\t历史列表的上一项" - -#: gitk:3079 -msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\t历史列表的下一项" - -#: gitk:3080 -#, tcl-format -msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "<%s-n>\t在历史列表中前往本次提交的第n个父提交" - -#: gitk:3081 -msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\t上一页提交列表" - -#: gitk:3082 -msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\t下一页提交列表" - -#: gitk:3083 -#, tcl-format -msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\t滚动到提交列表顶部" - -#: gitk:3084 -#, tcl-format -msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\t滚动到提交列表底部" - -#: gitk:3085 -#, tcl-format -msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\t向上滚动一行提交列表" - -#: gitk:3086 -#, tcl-format -msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\t向下滚动一行提交列表" - -#: gitk:3087 -#, tcl-format -msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\t向上滚动一页提交列表" - -#: gitk:3088 -#, tcl-format -msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\t向下滚动一页提交列表" - -#: gitk:3089 -msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Shift-Up>\t向后查找(向上的，更晚的提交)" - -#: gitk:3090 -msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\t向前查找(向下的，更早的提交)" - -#: gitk:3091 -msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\t向上滚动diff视图一页" - -#: gitk:3092 -msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\t向上滚动diff视图一页" - -#: gitk:3093 -msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Space>\t\t向下滚动diff视图一页" - -#: gitk:3094 -msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\t向上滚动diff视图18行" - -#: gitk:3095 -msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\t向下滚动diff视图18行" - -#: gitk:3096 -#, tcl-format -msgid "<%s-F>\t\tFind" -msgstr "<%s-F>\t\t查找" - -#: gitk:3097 -#, tcl-format -msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\t移动到下一次查找命中" - -#: gitk:3098 -msgid "<Return>\tMove to next find hit" -msgstr "<Return>\t\t移动到下一次查找命中" - -#: gitk:3099 -msgid "g\t\tGo to commit" -msgstr "g\t\t转到提交" - -#: gitk:3100 -msgid "/\t\tFocus the search box" -msgstr "/\t\t选中搜索框" - -#: gitk:3101 -msgid "?\t\tMove to previous find hit" -msgstr "?\t\t移动到上一次查找命中" - -#: gitk:3102 -msgid "f\t\tScroll diff view to next file" -msgstr "f\t\t滚动diff视图到下一个文件" - -#: gitk:3103 -#, tcl-format -msgid "<%s-S>\t\tSearch for next hit in diff view" -msgstr "<%s-S>\t\t在diff视图中查找下一此命中" - -#: gitk:3104 -#, tcl-format -msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\t在diff视图中查找上一次命中" - -#: gitk:3105 -#, tcl-format -msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\t增大字体大小" - -#: gitk:3106 -#, tcl-format -msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\t增大字体大小" - -#: gitk:3107 -#, tcl-format -msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\t减小字体大小" - -#: gitk:3108 -#, tcl-format -msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\t减小字体大小" - -#: gitk:3109 -msgid "<F5>\t\tUpdate" -msgstr "<F5>\t\t更新" - -#: gitk:3574 gitk:3583 -#, tcl-format -msgid "Error creating temporary directory %s:" -msgstr "创建临时目录出错%s：" - -#: gitk:3596 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "从%s获取\"%s\"出错：" - -#: gitk:3659 -msgid "command failed:" -msgstr "执行命令失败：" - -#: gitk:3808 -msgid "No such commit" -msgstr "无此提交" - -#: gitk:3822 -msgid "git gui blame: command failed:" -msgstr "git gui blame：执行命令失败：" - -#: gitk:3853 -#, tcl-format -msgid "Couldn't read merge head: %s" -msgstr "不能读取合并头(merge head)：%s" - -#: gitk:3861 -#, tcl-format -msgid "Error reading index: %s" -msgstr "读取索引出错：%s" - -#: gitk:3886 -#, tcl-format -msgid "Couldn't start git blame: %s" -msgstr "不能执行git blame：%s" - -#: gitk:3889 gitk:6778 -msgid "Searching" -msgstr "搜索中" - -#: gitk:3921 -#, tcl-format -msgid "Error running git blame: %s" -msgstr "运行git blame出错：%s" - -#: gitk:3949 -#, tcl-format -msgid "That line comes from commit %s, which is not in this view" -msgstr "此行来自提交%s，不在此视图中" - -#: gitk:3963 -msgid "External diff viewer failed:" -msgstr "外部diff查看器失败：" - -#: gitk:4067 -msgid "All files" -msgstr "所有文件" - -#: gitk:4091 -msgid "View" -msgstr "视图" - -#: gitk:4094 -msgid "Gitk view definition" -msgstr "Gitk视图定义" - -#: gitk:4098 -msgid "Remember this view" -msgstr "记住此视图" - -#: gitk:4099 -msgid "References (space separated list):" -msgstr "引用(空格切分的列表)：" - -#: gitk:4100 -msgid "Branches & tags:" -msgstr "分支和tags" - -#: gitk:4101 -msgid "All refs" -msgstr "所有引用" - -#: gitk:4102 -msgid "All (local) branches" -msgstr "所有(本地)分支" - -#: gitk:4103 -msgid "All tags" -msgstr "所有tag" - -#: gitk:4104 -msgid "All remote-tracking branches" -msgstr "所有远程跟踪分支" - -#: gitk:4105 -msgid "Commit Info (regular expressions):" -msgstr "提交信息 (正则表达式)：" - -#: gitk:4106 -msgid "Author:" -msgstr "作者：" - -#: gitk:4107 -msgid "Committer:" -msgstr "提交者：" - -#: gitk:4108 -msgid "Commit Message:" -msgstr "提交信息：" - -#: gitk:4109 -msgid "Matches all Commit Info criteria" -msgstr "匹配所有提交信息标准" - -#: gitk:4110 -msgid "Matches no Commit Info criteria" -msgstr "匹配无提交信息标准" - -#: gitk:4111 -msgid "Changes to Files:" -msgstr "文件修改列表：" - -#: gitk:4112 -msgid "Fixed String" -msgstr "固定字符串" - -#: gitk:4113 -msgid "Regular Expression" -msgstr "正则表达式：" - -#: gitk:4114 -msgid "Search string:" -msgstr "搜索字符串：" - -#: gitk:4115 -msgid "" -"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " -"15:27:38\"):" -msgstr "提交日期 (\"2星期之前\", \"2009-03-17 15:27:38\", \"5月 17, 2009 15:27:38\"):" - -#: gitk:4116 -msgid "Since:" -msgstr "自：" - -#: gitk:4117 -msgid "Until:" -msgstr "到：" - -#: gitk:4118 -msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "限制 且/或 跳过一定数量的版本(正整数)：" - -#: gitk:4119 -msgid "Number to show:" -msgstr "显示数量：" - -#: gitk:4120 -msgid "Number to skip:" -msgstr "跳过数量：" - -#: gitk:4121 -msgid "Miscellaneous options:" -msgstr "其他选项：" - -#: gitk:4122 -msgid "Strictly sort by date" -msgstr "严格按日期整理" - -#: gitk:4123 -msgid "Mark branch sides" -msgstr "标记分支边界" - -#: gitk:4124 -msgid "Limit to first parent" -msgstr "限制到第一个父提交" - -#: gitk:4125 -msgid "Simple history" -msgstr "简易历史" - -#: gitk:4126 -msgid "Additional arguments to git log:" -msgstr "git log命令的额外参数：" - -#: gitk:4127 -msgid "Enter files and directories to include, one per line:" -msgstr "输入文件和文件夹来引用，每行一个：" - -#: gitk:4128 -msgid "Command to generate more commits to include:" -msgstr "命令产生更多的提交来引用：" - -#: gitk:4252 -msgid "Gitk: edit view" -msgstr "Gitk: 编辑视图" - -#: gitk:4260 -msgid "-- criteria for selecting revisions" -msgstr "-- 用来选择版本的规则" - -#: gitk:4265 -msgid "View Name" -msgstr "视图名称" - -#: gitk:4340 -msgid "Apply (F5)" -msgstr "应用(F5)" - -#: gitk:4378 -msgid "Error in commit selection arguments:" -msgstr "提交选择参数错误：" - -#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525 -msgid "None" -msgstr "无" - -#: gitk:5045 gitk:5050 -msgid "Descendant" -msgstr "子提交" - -#: gitk:5046 -msgid "Not descendant" -msgstr "非子提交" - -#: gitk:5053 gitk:5058 -msgid "Ancestor" -msgstr "父提交" - -#: gitk:5054 -msgid "Not ancestor" -msgstr "非父提交" - -#: gitk:5348 -msgid "Local changes checked in to index but not committed" -msgstr "已添加到索引但未提交的修改" - -#: gitk:5384 -msgid "Local uncommitted changes, not checked in to index" -msgstr "未添加到索引且未提交的修改" - -#: gitk:7158 -msgid "and many more" -msgstr "更多" - -#: gitk:7161 -msgid "many" -msgstr "很多" - -#: gitk:7352 -msgid "Tags:" -msgstr "Tags:" - -#: gitk:7369 gitk:7375 gitk:8854 -msgid "Parent" -msgstr "父节点" - -#: gitk:7380 -msgid "Child" -msgstr "子节点" - -#: gitk:7389 -msgid "Branch" -msgstr "分支" - -#: gitk:7392 -msgid "Follows" -msgstr "之后的tag" - -#: gitk:7395 -msgid "Precedes" -msgstr "之前的tag" - -#: gitk:7990 -#, tcl-format -msgid "Error getting diffs: %s" -msgstr "获取差异错误：%s" - -#: gitk:8679 -msgid "Goto:" -msgstr "转到：" - -#: gitk:8700 -#, tcl-format -msgid "Short SHA1 id %s is ambiguous" -msgstr "短格式的SHA1提交号%s不明确、有歧义" - -#: gitk:8707 -#, tcl-format -msgid "Revision %s is not known" -msgstr "版本%s未知" - -#: gitk:8717 -#, tcl-format -msgid "SHA1 id %s is not known" -msgstr "提交号(SHA1 id)%s未知" - -#: gitk:8719 -#, tcl-format -msgid "Revision %s is not in the current view" -msgstr "版本%s不在当前视图中" - -#: gitk:8861 gitk:8876 -msgid "Date" -msgstr "日期" - -#: gitk:8864 -msgid "Children" -msgstr "子节点" - -#: gitk:8927 -#, tcl-format -msgid "Reset %s branch to here" -msgstr "重置分支%s到此处" - -#: gitk:8929 -msgid "Detached head: can't reset" -msgstr "分离的头(head)：不能重置(reset)" - -#: gitk:9034 gitk:9040 -msgid "Skipping merge commit " -msgstr "跳过合并提交" - -#: gitk:9049 gitk:9054 -msgid "Error getting patch ID for " -msgstr "获取补丁ID出错" - -#: gitk:9050 gitk:9055 -msgid " - stopping\n" -msgstr " — 停止中\n" - -#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094 -msgid "Commit " -msgstr "提交" - -#: gitk:9064 -msgid "" -" is the same patch as\n" -" " -msgstr " 是相同的补丁(patch)\n " - -#: gitk:9072 -msgid "" -" differs from\n" -" " -msgstr " 差异来自\n " - -#: gitk:9074 -msgid "" -"Diff of commits:\n" -"\n" -msgstr "提交的差异(Diff)：\n\n" - -#: gitk:9086 gitk:9095 -#, tcl-format -msgid " has %s children - stopping\n" -msgstr "有%s子节点 — 停止中\n" - -#: gitk:9114 -#, tcl-format -msgid "Error writing commit to file: %s" -msgstr "写入提交到文件出错：%s" - -#: gitk:9120 -#, tcl-format -msgid "Error diffing commits: %s" -msgstr "比较提交差异出错：%s" - -#: gitk:9166 -msgid "Top" -msgstr "顶部" - -#: gitk:9167 -msgid "From" -msgstr "从" - -#: gitk:9172 -msgid "To" -msgstr "到" - -#: gitk:9196 -msgid "Generate patch" -msgstr "生成补丁(patch)" - -#: gitk:9198 -msgid "From:" -msgstr "从：" - -#: gitk:9207 -msgid "To:" -msgstr "到：" - -#: gitk:9216 -msgid "Reverse" -msgstr "反向(Reverse)" - -#: gitk:9218 gitk:9428 -msgid "Output file:" -msgstr "输出文件：" - -#: gitk:9224 -msgid "Generate" -msgstr "生成" - -#: gitk:9262 -msgid "Error creating patch:" -msgstr "创建补丁(patch)出错：" - -#: gitk:9285 gitk:9416 gitk:9504 -msgid "ID:" -msgstr "ID:" - -#: gitk:9294 -msgid "Tag name:" -msgstr "Tag名称：" - -#: gitk:9297 -msgid "Tag message is optional" -msgstr "Tag信息是可选的" - -#: gitk:9299 -msgid "Tag message:" -msgstr "Tag信息：" - -#: gitk:9303 gitk:9474 -msgid "Create" -msgstr "创建" - -#: gitk:9321 -msgid "No tag name specified" -msgstr "未指定tag名称" - -#: gitk:9325 -#, tcl-format -msgid "Tag \"%s\" already exists" -msgstr "Tag\"%s\"已经存在" - -#: gitk:9335 -msgid "Error creating tag:" -msgstr "创建tag出错：" - -#: gitk:9425 -msgid "Command:" -msgstr "命令：" - -#: gitk:9433 -msgid "Write" -msgstr "写入" - -#: gitk:9451 -msgid "Error writing commit:" -msgstr "写入提交出错：" - -#: gitk:9473 -msgid "Create branch" -msgstr "创建分支" - -#: gitk:9489 -#, tcl-format -msgid "Rename branch %s" -msgstr "重命名分支%s" - -#: gitk:9490 -msgid "Rename" -msgstr "重命名" - -#: gitk:9514 -msgid "Name:" -msgstr "名称：" - -#: gitk:9538 -msgid "Please specify a name for the new branch" -msgstr "请指定新分支的名称" - -#: gitk:9543 -#, tcl-format -msgid "Branch '%s' already exists. Overwrite?" -msgstr "分支\"%s\"已经存在。覆盖它？" - -#: gitk:9587 -msgid "Please specify a new name for the branch" -msgstr "请重新指定新分支的名称" - -#: gitk:9650 -#, tcl-format -msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "提交%s已经存在于分支%s。确定重新应用它？" - -#: gitk:9655 -msgid "Cherry-picking" -msgstr "打补丁中(Cherry-picking)" - -#: gitk:9664 -#, tcl-format -msgid "" -"Cherry-pick failed because of local changes to file '%s'.\n" -"Please commit, reset or stash your changes and try again." -msgstr "打补丁(Cherry-pick)失败，因为本地修改了文件\"%s\"。\n请提交(commit)、重置(reset)或暂存(stash)修改后重试。" - -#: gitk:9670 -msgid "" -"Cherry-pick failed because of merge conflict.\n" -"Do you wish to run git citool to resolve it?" -msgstr "打补丁(Cherry-pick)失败因为合并冲突。\n你是否希望运行git citool 来解决冲突？" - -#: gitk:9686 gitk:9744 -msgid "No changes committed" -msgstr "无已经提交的修改" - -#: gitk:9713 -#, tcl-format -msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "提交%s不包含在分支%s中，确认回滚(revert)它？" - -#: gitk:9718 -msgid "Reverting" -msgstr "回滚中(Reverting)" - -#: gitk:9726 -#, tcl-format -msgid "" -"Revert failed because of local changes to the following files:%s Please " -"commit, reset or stash your changes and try again." -msgstr "回滚(revert)失败，因为如下的本地文件修改：%s\n请提交(commit)、重置(reset)或者暂存(stash)改变后重试。" - -#: gitk:9730 -msgid "" -"Revert failed because of merge conflict.\n" -" Do you wish to run git citool to resolve it?" -msgstr "回滚(revert)失败，因为合并冲突。\n你是否希望运行git citool来解决冲突？" - -#: gitk:9773 -msgid "Confirm reset" -msgstr "确认重置(reset)" - -#: gitk:9775 -#, tcl-format -msgid "Reset branch %s to %s?" -msgstr "重置(reset)分支%s到%s？" - -#: gitk:9777 -msgid "Reset type:" -msgstr "重置(reset)类型：" - -#: gitk:9780 -msgid "Soft: Leave working tree and index untouched" -msgstr "软性：离开工作树，索引未改变" - -#: gitk:9783 -msgid "Mixed: Leave working tree untouched, reset index" -msgstr "混合：离开工作树(未改变)，索引重置" - -#: gitk:9786 -msgid "" -"Hard: Reset working tree and index\n" -"(discard ALL local changes)" -msgstr "硬性：重置工作树和索引\n(丢弃所有的本地修改)" - -#: gitk:9803 -msgid "Resetting" -msgstr "重置中(Resetting)" - -#: gitk:9876 -#, tcl-format -msgid "A local branch named %s exists already" -msgstr "本地分支%s已经存在" - -#: gitk:9884 -msgid "Checking out" -msgstr "检出中(Checking out)" - -#: gitk:9943 -msgid "Cannot delete the currently checked-out branch" -msgstr "不能删除当前检出(checkout)分支" - -#: gitk:9949 -#, tcl-format -msgid "" -"The commits on branch %s aren't on any other branch.\n" -"Really delete branch %s?" -msgstr "在分支%s上的提交不在其他任何分支上。\n确认删除分支%s？" - -#: gitk:9980 -#, tcl-format -msgid "Tags and heads: %s" -msgstr "Tags和头指针(heads)：%s" - -#: gitk:9997 -msgid "Filter" -msgstr "过滤器" - -#: gitk:10293 -msgid "" -"Error reading commit topology information; branch and preceding/following " -"tag information will be incomplete." -msgstr "读取提交拓扑信息出错；分支和之前/之后的tag信息将不能完成。" - -#: gitk:11270 -msgid "Tag" -msgstr "标签(Tag)" - -#: gitk:11274 -msgid "Id" -msgstr "Id" - -#: gitk:11357 -msgid "Gitk font chooser" -msgstr "Gitk字体选择" - -#: gitk:11374 -msgid "B" -msgstr "粗体" - -#: gitk:11377 -msgid "I" -msgstr "斜体" - -#: gitk:11495 -msgid "Commit list display options" -msgstr "提交列表展示选项" - -#: gitk:11498 -msgid "Maximum graph width (lines)" -msgstr "最大图宽度(行数)" - -#: gitk:11502 -#, no-tcl-format -msgid "Maximum graph width (% of pane)" -msgstr "最大图宽度(%窗口百分比)" - -#: gitk:11505 -msgid "Show local changes" -msgstr "显示本地修改" - -#: gitk:11508 -msgid "Auto-select SHA1 (length)" -msgstr "自动选择SHA1(长度)" - -#: gitk:11512 -msgid "Hide remote refs" -msgstr "隐藏远程引用" - -#: gitk:11516 -msgid "Diff display options" -msgstr "差异(Diff)展示选项" - -#: gitk:11518 -msgid "Tab spacing" -msgstr "制表符宽度" - -#: gitk:11521 -msgid "Display nearby tags/heads" -msgstr "显示临近的tags/heads" - -#: gitk:11524 -msgid "Maximum # tags/heads to show" -msgstr "最大tags/heads展示数量" - -#: gitk:11527 -msgid "Limit diffs to listed paths" -msgstr "diff中列出文件限制" - -#: gitk:11530 -msgid "Support per-file encodings" -msgstr "单独文件编码支持" - -#: gitk:11536 gitk:11683 -msgid "External diff tool" -msgstr "外部差异(diff)工具" - -#: gitk:11537 -msgid "Choose..." -msgstr "选择..." - -#: gitk:11542 -msgid "General options" -msgstr "常规选项" - -#: gitk:11545 -msgid "Use themed widgets" -msgstr "使用主题小部件" - -#: gitk:11547 -msgid "(change requires restart)" -msgstr "(需重启生效)" - -#: gitk:11549 -msgid "(currently unavailable)" -msgstr "(当前不可用)" - -#: gitk:11560 -msgid "Colors: press to choose" -msgstr "颜色：点击来选择" - -#: gitk:11563 -msgid "Interface" -msgstr "界面" - -#: gitk:11564 -msgid "interface" -msgstr "界面" - -#: gitk:11567 -msgid "Background" -msgstr "背景" - -#: gitk:11568 gitk:11598 -msgid "background" -msgstr "背景" - -#: gitk:11571 -msgid "Foreground" -msgstr "前景" - -#: gitk:11572 -msgid "foreground" -msgstr "前景" - -#: gitk:11575 -msgid "Diff: old lines" -msgstr "差异(Diff)：老代码行" - -#: gitk:11576 -msgid "diff old lines" -msgstr "差异(diff)老代码行" - -#: gitk:11580 -msgid "Diff: new lines" -msgstr "差异(Diff)：新代码行" - -#: gitk:11581 -msgid "diff new lines" -msgstr "差异(diff)新代码行" - -#: gitk:11585 -msgid "Diff: hunk header" -msgstr "差异(Diff)：补丁片段头信息" - -#: gitk:11587 -msgid "diff hunk header" -msgstr "差异(diff)补丁片段头信息" - -#: gitk:11591 -msgid "Marked line bg" -msgstr "已标记代码行背景" - -#: gitk:11593 -msgid "marked line background" -msgstr "已标记代码行背景" - -#: gitk:11597 -msgid "Select bg" -msgstr "选择背景" - -#: gitk:11606 -msgid "Fonts: press to choose" -msgstr "字体：点击来选择" - -#: gitk:11608 -msgid "Main font" -msgstr "主字体" - -#: gitk:11609 -msgid "Diff display font" -msgstr "差异(Diff)显示字体" - -#: gitk:11610 -msgid "User interface font" -msgstr "用户界面字体" - -#: gitk:11632 -msgid "Gitk preferences" -msgstr "Gitk偏好设置" - -#: gitk:11641 -msgid "General" -msgstr "常规" - -#: gitk:11642 -msgid "Colors" -msgstr "颜色" - -#: gitk:11643 -msgid "Fonts" -msgstr "字体" - -#: gitk:11693 -#, tcl-format -msgid "Gitk: choose color for %s" -msgstr "Gitk：选择颜色用于%s" - -#: gitk:12206 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "对不起，gitk不能运行在当前版本的Tcl/Tk中。\nGitk运行需要最低版本为Tcl/Tk8.4。" - -#: gitk:12416 -msgid "Cannot find a git repository here." -msgstr "在此位置未发现git仓库。" - -#: gitk:12463 -#, tcl-format -msgid "Ambiguous argument '%s': both revision and filename" -msgstr "不明确有歧义的参数\"%s\"：版本和文件名称" - -#: gitk:12475 -msgid "Bad arguments to gitk:" -msgstr "运行gitk参数错误：" diff --git a/third_party/git/gitweb/gitweb.perl b/third_party/git/gitweb/gitweb.perl index 65a3a9e62e..7fef19fe59 100755 --- a/third_party/git/gitweb/gitweb.perl +++ b/third_party/git/gitweb/gitweb.perl @@ -741,7 +741,7 @@ sub evaluate_gitweb_config { $GITWEB_CONFIG_SYSTEM = "" if ($GITWEB_CONFIG_SYSTEM eq $GITWEB_CONFIG_COMMON); # Common system-wide settings for convenience. - # Those settings can be overridden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM. + # Those settings can be ovverriden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM. read_config_file($GITWEB_CONFIG_COMMON); # Use first config file that exists. This means use the per-instance @@ -1657,15 +1657,15 @@ sub quot_cec { my $cntrl = shift; my %opts = @_; my %es = ( # character escape codes, aka escape sequences - "\t" => '\t', # tab (HT) - "\n" => '\n', # line feed (LF) - "\r" => '\r', # carriage return (CR) - "\f" => '\f', # form feed (FF) - "\b" => '\b', # backspace (BS) - "\a" => '\a', # alarm (bell) (BEL) - "\e" => '\e', # escape (ESC) - "\013" => '\v', # vertical tab (VT) - "\000" => '\0', # nul character (NUL) + "\t" => '\t', # tab (HT) + "\n" => '\n', # line feed (LF) + "\r" => '\r', # carrige return (CR) + "\f" => '\f', # form feed (FF) + "\b" => '\b', # backspace (BS) + "\a" => '\a', # alarm (bell) (BEL) + "\e" => '\e', # escape (ESC) + "\013" => '\v', # vertical tab (VT) + "\000" => '\0', # nul character (NUL) ); my $chr = ( (exists $es{$cntrl}) ? $es{$cntrl} @@ -4048,7 +4048,7 @@ sub print_feed_meta { $href_params{'extra_options'} = undef; $href_params{'action'} = $type; - $link_attr{'-href'} = esc_attr(href(%href_params)); + $link_attr{'-href'} = href(%href_params); print "<link ". "rel=\"$link_attr{'-rel'}\" ". "title=\"$link_attr{'-title'}\" ". @@ -4057,7 +4057,7 @@ sub print_feed_meta { "/>\n"; $href_params{'extra_options'} = '--no-merges'; - $link_attr{'-href'} = esc_attr(href(%href_params)); + $link_attr{'-href'} = href(%href_params); $link_attr{'-title'} .= ' (no merges)'; print "<link ". "rel=\"$link_attr{'-rel'}\" ". @@ -4070,12 +4070,10 @@ sub print_feed_meta { } else { printf('<link rel="alternate" title="%s projects list" '. 'href="%s" type="text/plain; charset=utf-8" />'."\n", - esc_attr($site_name), - esc_attr(href(project=>undef, action=>"project_index"))); + esc_attr($site_name), href(project=>undef, action=>"project_index")); printf('<link rel="alternate" title="%s projects feeds" '. 'href="%s" type="text/x-opml" />'."\n", - esc_attr($site_name), - esc_attr(href(project=>undef, action=>"opml"))); + esc_attr($site_name), href(project=>undef, action=>"opml")); } } @@ -4289,8 +4287,8 @@ sub git_footer_html { if (defined $action && $action eq 'blame_incremental') { print qq!<script type="text/javascript">\n!. - qq!startBlame("!. esc_attr(href(action=>"blame_data", -replay=>1)) .qq!",\n!. - qq! "!. esc_attr(href()) .qq!");\n!. + qq!startBlame("!. href(action=>"blame_data", -replay=>1) .qq!",\n!. + qq! "!. href() .qq!");\n!. qq!</script>\n!; } else { my ($jstimezone, $tz_cookie, $datetime_class) = @@ -5285,7 +5283,7 @@ sub format_ctx_rem_add_lines { # + c # + d # - # Otherwise the highlighting would be confusing. + # Otherwise the highlightling would be confusing. if ($is_combined) { for (my $i = 0; $i < @$add; $i++) { my $prefix_rem = substr($rem->[$i], 0, $num_parents); @@ -7157,8 +7155,8 @@ sub git_blob { print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!; } print qq! src="! . - esc_attr(href(action=>"blob_plain", hash=>$hash, - hash_base=>$hash_base, file_name=>$file_name)) . + href(action=>"blob_plain", hash=>$hash, + hash_base=>$hash_base, file_name=>$file_name) . qq!" />\n!; } else { my $nr; @@ -8241,7 +8239,6 @@ sub git_feed { } else { $alt_url = href(-full=>1, action=>"summary"); } - $alt_url = esc_attr($alt_url); print qq!<?xml version="1.0" encoding="utf-8"?>\n!; if ($format eq 'rss') { print <<XML; @@ -8279,7 +8276,7 @@ XML $alt_url . '" />' . "\n" . '<link rel="self" type="' . $content_type . '" href="' . $cgi->self_url() . '" />' . "\n" . - "<id>" . esc_url(href(-full=>1)) . "</id>\n" . + "<id>" . href(-full=>1) . "</id>\n" . # use project owner for feed author "<author><name>$owner</name></author>\n"; if (defined $favicon) { @@ -8325,7 +8322,7 @@ XML "<author>" . esc_html($co{'author'}) . "</author>\n" . "<pubDate>$cd{'rfc2822'}</pubDate>\n" . "<guid isPermaLink=\"true\">$co_url</guid>\n" . - "<link>" . esc_html($co_url) . "</link>\n" . + "<link>$co_url</link>\n" . "<description>" . esc_html($co{'title'}) . "</description>\n" . "<content:encoded>" . "<![CDATA[\n"; @@ -8347,8 +8344,8 @@ XML } print "</contributor>\n" . "<published>$cd{'iso-8601'}</published>\n" . - "<link rel=\"alternate\" type=\"text/html\" href=\"" . esc_attr($co_url) . "\" />\n" . - "<id>" . esc_html($co_url) . "</id>\n" . + "<link rel=\"alternate\" type=\"text/html\" href=\"$co_url\" />\n" . + "<id>$co_url</id>\n" . "<content type=\"xhtml\" xml:base=\"" . esc_url($my_url) . "\">\n" . "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n"; } @@ -8455,8 +8452,8 @@ XML } my $path = esc_html(chop_str($proj{'path'}, 25, 5)); - my $rss = esc_attr(href('project' => $proj{'path'}, 'action' => 'rss', -full => 1)); - my $html = esc_attr(href('project' => $proj{'path'}, 'action' => 'summary', -full => 1)); + my $rss = href('project' => $proj{'path'}, 'action' => 'rss', -full => 1); + my $html = href('project' => $proj{'path'}, 'action' => 'summary', -full => 1); print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n"; } print <<XML; diff --git a/third_party/git/gitweb/static/js/blame_incremental.js b/third_party/git/gitweb/static/js/blame_incremental.js index e100d8206b..db6eb50584 100644 --- a/third_party/git/gitweb/static/js/blame_incremental.js +++ b/third_party/git/gitweb/static/js/blame_incremental.js @@ -484,7 +484,7 @@ function processBlameLines(lines) { case 'previous': curCommit.nprevious++; // store only first 'previous' header - if (!('previous' in curCommit)) { + if (!'previous' in curCommit) { var parts = data.split(' ', 2); curCommit.previous = parts[0]; curCommit.file_parent = unquote(parts[1]); diff --git a/third_party/git/gpg-interface.c b/third_party/git/gpg-interface.c index 165274d74a..d60115ca40 100644 --- a/third_party/git/gpg-interface.c +++ b/third_party/git/gpg-interface.c @@ -7,8 +7,6 @@ #include "tempfile.h" static char *configured_signing_key; -static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED; - struct gpg_format { const char *name; const char *program; @@ -87,8 +85,6 @@ void signature_check_clear(struct signature_check *sigc) #define GPG_STATUS_UID (1<<2) /* The status includes key fingerprints */ #define GPG_STATUS_FINGERPRINT (1<<3) -/* The status includes trust level */ -#define GPG_STATUS_TRUST_LEVEL (1<<4) /* Short-hand for standard exclusive *SIG status with keyid & UID */ #define GPG_STATUS_STDSIG (GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID|GPG_STATUS_UID) @@ -100,49 +96,15 @@ static struct { } sigcheck_gpg_status[] = { { 'G', "GOODSIG ", GPG_STATUS_STDSIG }, { 'B', "BADSIG ", GPG_STATUS_STDSIG }, + { 'U', "TRUST_NEVER", 0 }, + { 'U', "TRUST_UNDEFINED", 0 }, { 'E', "ERRSIG ", GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID }, { 'X', "EXPSIG ", GPG_STATUS_STDSIG }, { 'Y', "EXPKEYSIG ", GPG_STATUS_STDSIG }, { 'R', "REVKEYSIG ", GPG_STATUS_STDSIG }, { 0, "VALIDSIG ", GPG_STATUS_FINGERPRINT }, - { 0, "TRUST_", GPG_STATUS_TRUST_LEVEL }, -}; - -static struct { - const char *key; - enum signature_trust_level value; -} sigcheck_gpg_trust_level[] = { - { "UNDEFINED", TRUST_UNDEFINED }, - { "NEVER", TRUST_NEVER }, - { "MARGINAL", TRUST_MARGINAL }, - { "FULLY", TRUST_FULLY }, - { "ULTIMATE", TRUST_ULTIMATE }, }; -static void replace_cstring(char **field, const char *line, const char *next) -{ - free(*field); - - if (line && next) - *field = xmemdupz(line, next - line); - else - *field = NULL; -} - -static int parse_gpg_trust_level(const char *level, - enum signature_trust_level *res) -{ - size_t i; - - for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_trust_level); i++) { - if (!strcmp(sigcheck_gpg_trust_level[i].key, level)) { - *res = sigcheck_gpg_trust_level[i].value; - return 0; - } - } - return 1; -} - static void parse_gpg_output(struct signature_check *sigc) { const char *buf = sigc->gpg_status; @@ -164,18 +126,9 @@ static void parse_gpg_output(struct signature_check *sigc) /* Iterate over all search strings */ for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) { if (skip_prefix(line, sigcheck_gpg_status[i].check, &line)) { - /* - * GOODSIG, BADSIG etc. can occur only once for - * each signature. Therefore, if we had more - * than one then we're dealing with multiple - * signatures. We don't support them - * currently, and they're rather hard to - * create, so something is likely fishy and we - * should reject them altogether. - */ if (sigcheck_gpg_status[i].flags & GPG_STATUS_EXCLUSIVE) { if (seen_exclusive_status++) - goto error; + goto found_duplicate_status; } if (sigcheck_gpg_status[i].result) @@ -183,62 +136,33 @@ static void parse_gpg_output(struct signature_check *sigc) /* Do we have key information? */ if (sigcheck_gpg_status[i].flags & GPG_STATUS_KEYID) { next = strchrnul(line, ' '); - replace_cstring(&sigc->key, line, next); + free(sigc->key); + sigc->key = xmemdupz(line, next - line); /* Do we have signer information? */ if (*next && (sigcheck_gpg_status[i].flags & GPG_STATUS_UID)) { line = next + 1; next = strchrnul(line, '\n'); - replace_cstring(&sigc->signer, line, next); - } - } - - /* Do we have trust level? */ - if (sigcheck_gpg_status[i].flags & GPG_STATUS_TRUST_LEVEL) { - /* - * GPG v1 and v2 differs in how the - * TRUST_ lines are written. Some - * trust lines contain no additional - * space-separated information for v1. - */ - size_t trust_size = strcspn(line, " \n"); - char *trust = xmemdupz(line, trust_size); - - if (parse_gpg_trust_level(trust, &sigc->trust_level)) { - free(trust); - goto error; + free(sigc->signer); + sigc->signer = xmemdupz(line, next - line); } - free(trust); } - /* Do we have fingerprint? */ if (sigcheck_gpg_status[i].flags & GPG_STATUS_FINGERPRINT) { - const char *limit; - char **field; - next = strchrnul(line, ' '); - replace_cstring(&sigc->fingerprint, line, next); - - /* - * Skip interim fields. The search is - * limited to the same line since only - * OpenPGP signatures has a field with - * the primary fingerprint. - */ - limit = strchrnul(line, '\n'); + free(sigc->fingerprint); + sigc->fingerprint = xmemdupz(line, next - line); + + /* Skip interim fields */ for (j = 9; j > 0; j--) { - if (!*next || limit <= next) + if (!*next) break; line = next + 1; next = strchrnul(line, ' '); } - field = &sigc->primary_key_fingerprint; - if (!j) { - next = strchrnul(line, '\n'); - replace_cstring(field, line, next); - } else { - replace_cstring(field, NULL, NULL); - } + next = strchrnul(line, '\n'); + free(sigc->primary_key_fingerprint); + sigc->primary_key_fingerprint = xmemdupz(line, next - line); } break; @@ -247,7 +171,14 @@ static void parse_gpg_output(struct signature_check *sigc) } return; -error: +found_duplicate_status: + /* + * GOODSIG, BADSIG etc. can occur only once for each signature. + * Therefore, if we had more than one then we're dealing with multiple + * signatures. We don't support them currently, and they're rather + * hard to create, so something is likely fishy and we should reject + * them altogether. + */ sigc->result = 'E'; /* Clear partial data to avoid confusion */ FREE_AND_NULL(sigc->primary_key_fingerprint); @@ -264,7 +195,6 @@ int check_signature(const char *payload, size_t plen, const char *signature, int status; sigc->result = 'N'; - sigc->trust_level = -1; status = verify_signed_buffer(payload, plen, signature, slen, &gpg_output, &gpg_status); @@ -274,8 +204,7 @@ int check_signature(const char *payload, size_t plen, const char *signature, sigc->gpg_output = strbuf_detach(&gpg_output, NULL); sigc->gpg_status = strbuf_detach(&gpg_status, NULL); parse_gpg_output(sigc); - status |= sigc->result != 'G'; - status |= sigc->trust_level < configured_min_trust_level; + status |= sigc->result != 'G' && sigc->result != 'U'; out: strbuf_release(&gpg_status); @@ -322,8 +251,6 @@ int git_gpg_config(const char *var, const char *value, void *cb) { struct gpg_format *fmt = NULL; char *fmtname = NULL; - char *trust; - int ret; if (!strcmp(var, "user.signingkey")) { if (!value) @@ -343,20 +270,6 @@ int git_gpg_config(const char *var, const char *value, void *cb) return 0; } - if (!strcmp(var, "gpg.mintrustlevel")) { - if (!value) - return config_error_nonbool(var); - - trust = xstrdup_toupper(value); - ret = parse_gpg_trust_level(trust, &configured_min_trust_level); - free(trust); - - if (ret) - return error("unsupported value for %s: %s", var, - value); - return 0; - } - if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program")) fmtname = "openpgp"; diff --git a/third_party/git/gpg-interface.h b/third_party/git/gpg-interface.h index 796571e9e9..3e624ec289 100644 --- a/third_party/git/gpg-interface.h +++ b/third_party/git/gpg-interface.h @@ -7,14 +7,6 @@ struct strbuf; #define GPG_VERIFY_RAW 2 #define GPG_VERIFY_OMIT_STATUS 4 -enum signature_trust_level { - TRUST_UNDEFINED, - TRUST_NEVER, - TRUST_MARGINAL, - TRUST_FULLY, - TRUST_ULTIMATE, -}; - struct signature_check { char *payload; char *gpg_output; @@ -24,6 +16,7 @@ struct signature_check { * possible "result": * 0 (not checked) * N (checked but no further result) + * U (untrusted good) * G (good) * B (bad) */ @@ -32,7 +25,6 @@ struct signature_check { char *key; char *fingerprint; char *primary_key_fingerprint; - enum signature_trust_level trust_level; }; void signature_check_clear(struct signature_check *sigc); diff --git a/third_party/git/graph.c b/third_party/git/graph.c index 4fb25ad464..f53135485f 100644 --- a/third_party/git/graph.c +++ b/third_party/git/graph.c @@ -34,7 +34,6 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb); * handle directly. It is assumed that this is the same file handle as the * file specified by the graph diff options. This is necessary so that * graph_show_strbuf can be called even with a NULL graph. - * If a NULL graph is supplied, the strbuf is printed as-is. */ static void graph_show_strbuf(struct git_graph *graph, FILE *file, @@ -113,42 +112,14 @@ static const char *column_get_color_code(unsigned short color) return column_colors[color]; } -struct graph_line { - struct strbuf *buf; - size_t width; -}; - -static inline void graph_line_addch(struct graph_line *line, int c) -{ - strbuf_addch(line->buf, c); - line->width++; -} - -static inline void graph_line_addchars(struct graph_line *line, int c, size_t n) -{ - strbuf_addchars(line->buf, c, n); - line->width += n; -} - -static inline void graph_line_addstr(struct graph_line *line, const char *s) -{ - strbuf_addstr(line->buf, s); - line->width += strlen(s); -} - -static inline void graph_line_addcolor(struct graph_line *line, unsigned short color) -{ - strbuf_addstr(line->buf, column_get_color_code(color)); -} - -static void graph_line_write_column(struct graph_line *line, const struct column *c, - char col_char) +static void strbuf_write_column(struct strbuf *sb, const struct column *c, + char col_char) { if (c->color < column_colors_max) - graph_line_addcolor(line, c->color); - graph_line_addch(line, col_char); + strbuf_addstr(sb, column_get_color_code(c->color)); + strbuf_addch(sb, col_char); if (c->color < column_colors_max) - graph_line_addcolor(line, column_colors_max); + strbuf_addstr(sb, column_get_color_code(column_colors_max)); } struct git_graph { @@ -204,63 +175,9 @@ struct git_graph { */ int prev_commit_index; /* - * Which layout variant to use to display merge commits. If the - * commit's first parent is known to be in a column to the left of the - * merge, then this value is 0 and we use the layout on the left. - * Otherwise, the value is 1 and the layout on the right is used. This - * field tells us how many columns the first parent occupies. - * - * 0) 1) - * - * | | | *-. | | *---. - * | |_|/|\ \ | | |\ \ \ - * |/| | | | | | | | | | * - */ - int merge_layout; - /* - * The number of columns added to the graph by the current commit. For - * 2-way and octopus merges, this is usually one less than the - * number of parents: - * - * | | | | | \ - * | * | | *---. \ - * | |\ \ | |\ \ \ \ - * | | | | | | | | | | - * - * num_parents: 2 num_parents: 4 - * edges_added: 1 edges_added: 3 - * - * For left-skewed merges, the first parent fuses with its neighbor and - * so one less column is added: - * - * | | | | | \ - * | * | | *-. \ - * |/| | |/|\ \ \ - * | | | | | | | | - * - * num_parents: 2 num_parents: 4 - * edges_added: 0 edges_added: 2 - * - * This number determines how edges to the right of the merge are - * displayed in commit and post-merge lines; if no columns have been - * added then a vertical line should be used where a right-tracking - * line would otherwise be used. - * - * | * \ | * | - * | |\ \ |/| | - * | | * \ | * | - */ - int edges_added; - /* - * The number of columns added by the previous commit, which is used to - * smooth edges appearing to the right of a commit in a commit line - * following a post-merge line. - */ - int prev_edges_added; - /* * The maximum number of columns that can be stored in the columns * and new_columns arrays. This is also half the number of entries - * that can be stored in the mapping and old_mapping arrays. + * that can be stored in the mapping and new_mapping arrays. */ int column_capacity; /* @@ -298,12 +215,12 @@ struct git_graph { */ int *mapping; /* - * A copy of the contents of the mapping array from the last commit, - * which we use to improve the display of columns that are tracking - * from right to left through a commit line. We also use this to - * avoid allocating a fresh array when we compute the next mapping. + * A temporary array for computing the next mapping state + * while we are outputting a mapping line. This is stored as part + * of the git_graph simply so we don't have to allocate a new + * temporary array each time we have to output a collapsing line. */ - int *old_mapping; + int *new_mapping; /* * The current default column color being used. This is * stored as an index into the array column_colors. @@ -368,9 +285,6 @@ struct git_graph *graph_init(struct rev_info *opt) graph->prev_state = GRAPH_PADDING; graph->commit_index = 0; graph->prev_commit_index = 0; - graph->merge_layout = 0; - graph->edges_added = 0; - graph->prev_edges_added = 0; graph->num_columns = 0; graph->num_new_columns = 0; graph->mapping_size = 0; @@ -389,7 +303,7 @@ struct git_graph *graph_init(struct rev_info *opt) ALLOC_ARRAY(graph->columns, graph->column_capacity); ALLOC_ARRAY(graph->new_columns, graph->column_capacity); ALLOC_ARRAY(graph->mapping, 2 * graph->column_capacity); - ALLOC_ARRAY(graph->old_mapping, 2 * graph->column_capacity); + ALLOC_ARRAY(graph->new_mapping, 2 * graph->column_capacity); /* * The diff output prefix callback, with this we can make @@ -419,7 +333,7 @@ static void graph_ensure_capacity(struct git_graph *graph, int num_columns) REALLOC_ARRAY(graph->columns, graph->column_capacity); REALLOC_ARRAY(graph->new_columns, graph->column_capacity); REALLOC_ARRAY(graph->mapping, graph->column_capacity * 2); - REALLOC_ARRAY(graph->old_mapping, graph->column_capacity * 2); + REALLOC_ARRAY(graph->new_mapping, graph->column_capacity * 2); } /* @@ -518,76 +432,74 @@ static unsigned short graph_find_commit_color(const struct git_graph *graph, return graph_get_current_column_color(graph); } -static int graph_find_new_column_by_commit(struct git_graph *graph, - struct commit *commit) -{ - int i; - for (i = 0; i < graph->num_new_columns; i++) { - if (graph->new_columns[i].commit == commit) - return i; - } - return -1; -} - static void graph_insert_into_new_columns(struct git_graph *graph, struct commit *commit, - int idx) + int *mapping_index) { - int i = graph_find_new_column_by_commit(graph, commit); - int mapping_idx; + int i; /* - * If the commit is not already in the new_columns array, then add it - * and record it as being in the final column. + * If the commit is already in the new_columns list, we don't need to + * add it. Just update the mapping correctly. */ - if (i < 0) { - i = graph->num_new_columns++; - graph->new_columns[i].commit = commit; - graph->new_columns[i].color = graph_find_commit_color(graph, commit); + for (i = 0; i < graph->num_new_columns; i++) { + if (graph->new_columns[i].commit == commit) { + graph->mapping[*mapping_index] = i; + *mapping_index += 2; + return; + } } - if (graph->num_parents > 1 && idx > -1 && graph->merge_layout == -1) { - /* - * If this is the first parent of a merge, choose a layout for - * the merge line based on whether the parent appears in a - * column to the left of the merge - */ - int dist, shift; - - dist = idx - i; - shift = (dist > 1) ? 2 * dist - 3 : 1; + /* + * This commit isn't already in new_columns. Add it. + */ + graph->new_columns[graph->num_new_columns].commit = commit; + graph->new_columns[graph->num_new_columns].color = graph_find_commit_color(graph, commit); + graph->mapping[*mapping_index] = graph->num_new_columns; + *mapping_index += 2; + graph->num_new_columns++; +} - graph->merge_layout = (dist > 0) ? 0 : 1; - graph->edges_added = graph->num_parents + graph->merge_layout - 2; +static void graph_update_width(struct git_graph *graph, + int is_commit_in_existing_columns) +{ + /* + * Compute the width needed to display the graph for this commit. + * This is the maximum width needed for any row. All other rows + * will be padded to this width. + * + * Compute the number of columns in the widest row: + * Count each existing column (graph->num_columns), and each new + * column added by this commit. + */ + int max_cols = graph->num_columns + graph->num_parents; - mapping_idx = graph->width + (graph->merge_layout - 1) * shift; - graph->width += 2 * graph->merge_layout; + /* + * Even if the current commit has no parents to be printed, it + * still takes up a column for itself. + */ + if (graph->num_parents < 1) + max_cols++; - } else if (graph->edges_added > 0 && i == graph->mapping[graph->width - 2]) { - /* - * If some columns have been added by a merge, but this commit - * was found in the last existing column, then adjust the - * numbers so that the two edges immediately join, i.e.: - * - * * | * | - * |\ \ => |\| - * | |/ | * - * | * - */ - mapping_idx = graph->width - 2; - graph->edges_added = -1; - } else { - mapping_idx = graph->width; - graph->width += 2; - } + /* + * We added a column for the current commit as part of + * graph->num_parents. If the current commit was already in + * graph->columns, then we have double counted it. + */ + if (is_commit_in_existing_columns) + max_cols--; - graph->mapping[mapping_idx] = i; + /* + * Each column takes up 2 spaces + */ + graph->width = max_cols * 2; } static void graph_update_columns(struct git_graph *graph) { struct commit_list *parent; int max_new_columns; + int mapping_idx; int i, seen_this, is_commit_in_columns; /* @@ -620,10 +532,6 @@ static void graph_update_columns(struct git_graph *graph) for (i = 0; i < graph->mapping_size; i++) graph->mapping[i] = -1; - graph->width = 0; - graph->prev_edges_added = graph->edges_added; - graph->edges_added = 0; - /* * Populate graph->new_columns and graph->mapping * @@ -634,6 +542,7 @@ static void graph_update_columns(struct git_graph *graph) * supposed to end up after the collapsing is performed. */ seen_this = 0; + mapping_idx = 0; is_commit_in_columns = 1; for (i = 0; i <= graph->num_columns; i++) { struct commit *col_commit; @@ -647,9 +556,9 @@ static void graph_update_columns(struct git_graph *graph) } if (col_commit == graph->commit) { + int old_mapping_idx = mapping_idx; seen_this = 1; graph->commit_index = i; - graph->merge_layout = -1; for (parent = first_interesting_parent(graph); parent; parent = next_interesting_parent(graph, parent)) { @@ -662,18 +571,21 @@ static void graph_update_columns(struct git_graph *graph) !is_commit_in_columns) { graph_increment_column_color(graph); } - graph_insert_into_new_columns(graph, parent->item, i); + graph_insert_into_new_columns(graph, + parent->item, + &mapping_idx); } /* - * We always need to increment graph->width by at + * We always need to increment mapping_idx by at * least 2, even if it has no interesting parents. * The current commit always takes up at least 2 * spaces. */ - if (graph->num_parents == 0) - graph->width += 2; + if (mapping_idx == old_mapping_idx) + mapping_idx += 2; } else { - graph_insert_into_new_columns(graph, col_commit, -1); + graph_insert_into_new_columns(graph, col_commit, + &mapping_idx); } } @@ -683,43 +595,11 @@ static void graph_update_columns(struct git_graph *graph) while (graph->mapping_size > 1 && graph->mapping[graph->mapping_size - 1] < 0) graph->mapping_size--; -} - -static int graph_num_dashed_parents(struct git_graph *graph) -{ - return graph->num_parents + graph->merge_layout - 3; -} -static int graph_num_expansion_rows(struct git_graph *graph) -{ /* - * Normally, we need two expansion rows for each dashed parent line from - * an octopus merge: - * - * | * - * | |\ - * | | \ - * | | \ - * | *-. \ - * | |\ \ \ - * - * If the merge is skewed to the left, then its parents occupy one less - * column, and we don't need as many expansion rows to route around it; - * in some cases that means we don't need any expansion rows at all: - * - * | * - * | |\ - * | * \ - * |/|\ \ + * Compute graph->width for this commit */ - return graph_num_dashed_parents(graph) * 2; -} - -static int graph_needs_pre_commit_line(struct git_graph *graph) -{ - return graph->num_parents >= 3 && - graph->commit_index < (graph->num_columns - 1) && - graph->expansion_row < graph_num_expansion_rows(graph); + graph_update_width(graph, is_commit_in_columns); } void graph_update(struct git_graph *graph, struct commit *commit) @@ -777,7 +657,8 @@ void graph_update(struct git_graph *graph, struct commit *commit) */ if (graph->state != GRAPH_PADDING) graph->state = GRAPH_SKIP; - else if (graph_needs_pre_commit_line(graph)) + else if (graph->num_parents >= 3 && + graph->commit_index < (graph->num_columns - 1)) graph->state = GRAPH_PRE_COMMIT; else graph->state = GRAPH_COMMIT; @@ -805,7 +686,8 @@ static int graph_is_mapping_correct(struct git_graph *graph) return 1; } -static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *line) +static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb, + int chars_written) { /* * Add additional spaces to the end of the strbuf, so that all @@ -814,22 +696,34 @@ static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *l * This way, fields printed to the right of the graph will remain * aligned for the entire commit. */ - if (line->width < graph->width) - graph_line_addchars(line, ' ', graph->width - line->width); + if (chars_written < graph->width) + strbuf_addchars(sb, ' ', graph->width - chars_written); } static void graph_output_padding_line(struct git_graph *graph, - struct graph_line *line) + struct strbuf *sb) { int i; /* + * We could conceivable be called with a NULL commit + * if our caller has a bug, and invokes graph_next_line() + * immediately after graph_init(), without first calling + * graph_update(). Return without outputting anything in this + * case. + */ + if (!graph->commit) + return; + + /* * Output a padding row, that leaves all branch lines unchanged */ for (i = 0; i < graph->num_new_columns; i++) { - graph_line_write_column(line, &graph->new_columns[i], '|'); - graph_line_addch(line, ' '); + strbuf_write_column(sb, &graph->new_columns[i], '|'); + strbuf_addch(sb, ' '); } + + graph_pad_horizontally(graph, sb, graph->num_new_columns * 2); } @@ -839,24 +733,28 @@ int graph_width(struct git_graph *graph) } -static void graph_output_skip_line(struct git_graph *graph, struct graph_line *line) +static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb) { /* * Output an ellipsis to indicate that a portion * of the graph is missing. */ - graph_line_addstr(line, "..."); + strbuf_addstr(sb, "..."); + graph_pad_horizontally(graph, sb, 3); - if (graph_needs_pre_commit_line(graph)) + if (graph->num_parents >= 3 && + graph->commit_index < (graph->num_columns - 1)) graph_update_state(graph, GRAPH_PRE_COMMIT); else graph_update_state(graph, GRAPH_COMMIT); } static void graph_output_pre_commit_line(struct git_graph *graph, - struct graph_line *line) + struct strbuf *sb) { + int num_expansion_rows; int i, seen_this; + int chars_written; /* * This function formats a row that increases the space around a commit @@ -866,24 +764,27 @@ static void graph_output_pre_commit_line(struct git_graph *graph, * We need 2 extra rows for every parent over 2. */ assert(graph->num_parents >= 3); + num_expansion_rows = (graph->num_parents - 2) * 2; /* * graph->expansion_row tracks the current expansion row we are on. * It should be in the range [0, num_expansion_rows - 1] */ assert(0 <= graph->expansion_row && - graph->expansion_row < graph_num_expansion_rows(graph)); + graph->expansion_row < num_expansion_rows); /* * Output the row */ seen_this = 0; + chars_written = 0; for (i = 0; i < graph->num_columns; i++) { struct column *col = &graph->columns[i]; if (col->commit == graph->commit) { seen_this = 1; - graph_line_write_column(line, col, '|'); - graph_line_addchars(line, ' ', graph->expansion_row); + strbuf_write_column(sb, col, '|'); + strbuf_addchars(sb, ' ', graph->expansion_row); + chars_written += 1 + graph->expansion_row; } else if (seen_this && (graph->expansion_row == 0)) { /* * This is the first line of the pre-commit output. @@ -896,27 +797,33 @@ static void graph_output_pre_commit_line(struct git_graph *graph, */ if (graph->prev_state == GRAPH_POST_MERGE && graph->prev_commit_index < i) - graph_line_write_column(line, col, '\\'); + strbuf_write_column(sb, col, '\\'); else - graph_line_write_column(line, col, '|'); + strbuf_write_column(sb, col, '|'); + chars_written++; } else if (seen_this && (graph->expansion_row > 0)) { - graph_line_write_column(line, col, '\\'); + strbuf_write_column(sb, col, '\\'); + chars_written++; } else { - graph_line_write_column(line, col, '|'); + strbuf_write_column(sb, col, '|'); + chars_written++; } - graph_line_addch(line, ' '); + strbuf_addch(sb, ' '); + chars_written++; } + graph_pad_horizontally(graph, sb, chars_written); + /* * Increment graph->expansion_row, * and move to state GRAPH_COMMIT if necessary */ graph->expansion_row++; - if (!graph_needs_pre_commit_line(graph)) + if (graph->expansion_row >= num_expansion_rows) graph_update_state(graph, GRAPH_COMMIT); } -static void graph_output_commit_char(struct git_graph *graph, struct graph_line *line) +static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb) { /* * For boundary commits, print 'o' @@ -924,67 +831,72 @@ static void graph_output_commit_char(struct git_graph *graph, struct graph_line */ if (graph->commit->object.flags & BOUNDARY) { assert(graph->revs->boundary); - graph_line_addch(line, 'o'); + strbuf_addch(sb, 'o'); return; } /* * get_revision_mark() handles all other cases without assert() */ - graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit)); + strbuf_addstr(sb, get_revision_mark(graph->revs, graph->commit)); } /* - * Draw the horizontal dashes of an octopus merge. + * Draw the horizontal dashes of an octopus merge and return the number of + * characters written. */ -static void graph_draw_octopus_merge(struct git_graph *graph, struct graph_line *line) +static int graph_draw_octopus_merge(struct git_graph *graph, + struct strbuf *sb) { /* - * The parents of a merge commit can be arbitrarily reordered as they - * are mapped onto display columns, for example this is a valid merge: + * Here dashless_parents represents the number of parents which don't + * need to have dashes (the edges labeled "0" and "1"). And + * dashful_parents are the remaining ones. * - * | | *---. - * | | |\ \ \ - * | | |/ / / - * | |/| | / - * | |_|_|/ - * |/| | | - * 3 1 0 2 + * | *---. + * | |\ \ \ + * | | | | | + * x 0 1 2 3 * - * The numbers denote which parent of the merge each visual column - * corresponds to; we can't assume that the parents will initially - * display in the order given by new_columns. + */ + const int dashless_parents = 2; + int dashful_parents = graph->num_parents - dashless_parents; + + /* + * Usually, we add one new column for each parent (like the diagram + * above) but sometimes the first parent goes into an existing column, + * like this: * - * To find the right color for each dash, we need to consult the - * mapping array, starting from the column 2 places to the right of the - * merge commit, and use that to find out which logical column each - * edge will collapse to. + * | *---. + * | |\ \ \ + * |/ / / / + * x 0 1 2 * - * Commits are rendered once all edges have collapsed to their correct - * logcial column, so commit_index gives us the right visual offset for - * the merge commit. + * In which case the number of parents will be one greater than the + * number of added columns. */ + int added_cols = (graph->num_new_columns - graph->num_columns); + int parent_in_old_cols = graph->num_parents - added_cols; - int i, j; - struct column *col; - - int dashed_parents = graph_num_dashed_parents(graph); - - for (i = 0; i < dashed_parents; i++) { - j = graph->mapping[(graph->commit_index + i + 2) * 2]; - col = &graph->new_columns[j]; + /* + * In both cases, commit_index corresponds to the edge labeled "0". + */ + int first_col = graph->commit_index + dashless_parents + - parent_in_old_cols; - graph_line_write_column(line, col, '-'); - graph_line_write_column(line, col, (i == dashed_parents - 1) ? '.' : '-'); + int i; + for (i = 0; i < dashful_parents; i++) { + strbuf_write_column(sb, &graph->new_columns[i+first_col], '-'); + strbuf_write_column(sb, &graph->new_columns[i+first_col], + i == dashful_parents-1 ? '.' : '-'); } - - return; + return 2 * dashful_parents; } -static void graph_output_commit_line(struct git_graph *graph, struct graph_line *line) +static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb) { int seen_this = 0; - int i; + int i, chars_written; /* * Output the row containing this commit @@ -994,6 +906,7 @@ static void graph_output_commit_line(struct git_graph *graph, struct graph_line * children that we have already processed.) */ seen_this = 0; + chars_written = 0; for (i = 0; i <= graph->num_columns; i++) { struct column *col = &graph->columns[i]; struct commit *col_commit; @@ -1007,17 +920,19 @@ static void graph_output_commit_line(struct git_graph *graph, struct graph_line if (col_commit == graph->commit) { seen_this = 1; - graph_output_commit_char(graph, line); + graph_output_commit_char(graph, sb); + chars_written++; if (graph->num_parents > 2) - graph_draw_octopus_merge(graph, line); - } else if (seen_this && (graph->edges_added > 1)) { - graph_line_write_column(line, col, '\\'); - } else if (seen_this && (graph->edges_added == 1)) { + chars_written += graph_draw_octopus_merge(graph, + sb); + } else if (seen_this && (graph->num_parents > 2)) { + strbuf_write_column(sb, col, '\\'); + chars_written++; + } else if (seen_this && (graph->num_parents == 2)) { /* - * This is either a right-skewed 2-way merge - * commit, or a left-skewed 3-way merge. - * There is no GRAPH_PRE_COMMIT stage for such + * This is a 2-way merge commit. + * There is no GRAPH_PRE_COMMIT stage for 2-way * merges, so this is the first line of output * for this commit. Check to see what the previous * line of output was. @@ -1029,21 +944,21 @@ static void graph_output_commit_line(struct git_graph *graph, struct graph_line * makes the output look nicer. */ if (graph->prev_state == GRAPH_POST_MERGE && - graph->prev_edges_added > 0 && graph->prev_commit_index < i) - graph_line_write_column(line, col, '\\'); + strbuf_write_column(sb, col, '\\'); else - graph_line_write_column(line, col, '|'); - } else if (graph->prev_state == GRAPH_COLLAPSING && - graph->old_mapping[2 * i + 1] == i && - graph->mapping[2 * i] < i) { - graph_line_write_column(line, col, '/'); + strbuf_write_column(sb, col, '|'); + chars_written++; } else { - graph_line_write_column(line, col, '|'); + strbuf_write_column(sb, col, '|'); + chars_written++; } - graph_line_addch(line, ' '); + strbuf_addch(sb, ' '); + chars_written++; } + graph_pad_horizontally(graph, sb, chars_written); + /* * Update graph->state */ @@ -1055,19 +970,26 @@ static void graph_output_commit_line(struct git_graph *graph, struct graph_line graph_update_state(graph, GRAPH_COLLAPSING); } -const char merge_chars[] = {'/', '|', '\\'}; +static struct column *find_new_column_by_commit(struct git_graph *graph, + struct commit *commit) +{ + int i; + for (i = 0; i < graph->num_new_columns; i++) { + if (graph->new_columns[i].commit == commit) + return &graph->new_columns[i]; + } + return NULL; +} -static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line) +static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf *sb) { int seen_this = 0; - int i, j; - - struct commit_list *first_parent = first_interesting_parent(graph); - struct column *parent_col = NULL; + int i, j, chars_written; /* * Output the post-merge row */ + chars_written = 0; for (i = 0; i <= graph->num_columns; i++) { struct column *col = &graph->columns[i]; struct commit *col_commit; @@ -1086,50 +1008,38 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct graph_l * new_columns and use those to format the * edges. */ - struct commit_list *parents = first_parent; - int par_column; - int idx = graph->merge_layout; - char c; + struct commit_list *parents = NULL; + struct column *par_column; seen_this = 1; - - for (j = 0; j < graph->num_parents; j++) { - par_column = graph_find_new_column_by_commit(graph, parents->item); - assert(par_column >= 0); - - c = merge_chars[idx]; - graph_line_write_column(line, &graph->new_columns[par_column], c); - if (idx == 2) { - if (graph->edges_added > 0 || j < graph->num_parents - 1) - graph_line_addch(line, ' '); - } else { - idx++; - } + parents = first_interesting_parent(graph); + assert(parents); + par_column = find_new_column_by_commit(graph, parents->item); + assert(par_column); + + strbuf_write_column(sb, par_column, '|'); + chars_written++; + for (j = 0; j < graph->num_parents - 1; j++) { parents = next_interesting_parent(graph, parents); + assert(parents); + par_column = find_new_column_by_commit(graph, parents->item); + assert(par_column); + strbuf_write_column(sb, par_column, '\\'); + strbuf_addch(sb, ' '); } - if (graph->edges_added == 0) - graph_line_addch(line, ' '); - + chars_written += j * 2; } else if (seen_this) { - if (graph->edges_added > 0) - graph_line_write_column(line, col, '\\'); - else - graph_line_write_column(line, col, '|'); - graph_line_addch(line, ' '); + strbuf_write_column(sb, col, '\\'); + strbuf_addch(sb, ' '); + chars_written += 2; } else { - graph_line_write_column(line, col, '|'); - if (graph->merge_layout != 0 || i != graph->commit_index - 1) { - if (parent_col) - graph_line_write_column( - line, parent_col, '_'); - else - graph_line_addch(line, ' '); - } + strbuf_write_column(sb, col, '|'); + strbuf_addch(sb, ' '); + chars_written += 2; } - - if (col_commit == first_parent->item) - parent_col = col; } + graph_pad_horizontally(graph, sb, chars_written); + /* * Update graph->state */ @@ -1139,7 +1049,7 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct graph_l graph_update_state(graph, GRAPH_COLLAPSING); } -static void graph_output_collapsing_line(struct git_graph *graph, struct graph_line *line) +static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf *sb) { int i; short used_horizontal = 0; @@ -1147,18 +1057,13 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l int horizontal_edge_target = -1; /* - * Swap the mapping and old_mapping arrays - */ - SWAP(graph->mapping, graph->old_mapping); - - /* - * Clear out the mapping array + * Clear out the new_mapping array */ for (i = 0; i < graph->mapping_size; i++) - graph->mapping[i] = -1; + graph->new_mapping[i] = -1; for (i = 0; i < graph->mapping_size; i++) { - int target = graph->old_mapping[i]; + int target = graph->mapping[i]; if (target < 0) continue; @@ -1179,14 +1084,14 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l * This column is already in the * correct place */ - assert(graph->mapping[i] == -1); - graph->mapping[i] = target; - } else if (graph->mapping[i - 1] < 0) { + assert(graph->new_mapping[i] == -1); + graph->new_mapping[i] = target; + } else if (graph->new_mapping[i - 1] < 0) { /* * Nothing is to the left. * Move to the left by one */ - graph->mapping[i - 1] = target; + graph->new_mapping[i - 1] = target; /* * If there isn't already an edge moving horizontally * select this one. @@ -1202,9 +1107,9 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l * line. */ for (j = (target * 2)+3; j < (i - 2); j += 2) - graph->mapping[j] = target; + graph->new_mapping[j] = target; } - } else if (graph->mapping[i - 1] == target) { + } else if (graph->new_mapping[i - 1] == target) { /* * There is a branch line to our left * already, and it is our target. We @@ -1212,7 +1117,7 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l * the same parent commit. * * We don't have to add anything to the - * output or mapping, since the + * output or new_mapping, since the * existing branch line has already taken * care of it. */ @@ -1224,46 +1129,39 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l * * The space just to the left of this * branch should always be empty. + * + * The branch to the left of that space + * should be our eventual target. */ - assert(graph->mapping[i - 1] > target); - assert(graph->mapping[i - 2] < 0); - graph->mapping[i - 2] = target; + assert(graph->new_mapping[i - 1] > target); + assert(graph->new_mapping[i - 2] < 0); + assert(graph->new_mapping[i - 3] == target); + graph->new_mapping[i - 2] = target; /* * Mark this branch as the horizontal edge to * prevent any other edges from moving * horizontally. */ - if (horizontal_edge == -1) { - int j; - horizontal_edge_target = target; - horizontal_edge = i - 1; - - for (j = (target * 2) + 3; j < (i - 2); j += 2) - graph->mapping[j] = target; - } + if (horizontal_edge == -1) + horizontal_edge = i; } } /* - * Copy the current mapping array into old_mapping - */ - COPY_ARRAY(graph->old_mapping, graph->mapping, graph->mapping_size); - - /* * The new mapping may be 1 smaller than the old mapping */ - if (graph->mapping[graph->mapping_size - 1] < 0) + if (graph->new_mapping[graph->mapping_size - 1] < 0) graph->mapping_size--; /* * Output out a line based on the new mapping info */ for (i = 0; i < graph->mapping_size; i++) { - int target = graph->mapping[i]; + int target = graph->new_mapping[i]; if (target < 0) - graph_line_addch(line, ' '); + strbuf_addch(sb, ' '); else if (target * 2 == i) - graph_line_write_column(line, &graph->new_columns[target], '|'); + strbuf_write_column(sb, &graph->new_columns[target], '|'); else if (target == horizontal_edge_target && i != horizontal_edge - 1) { /* @@ -1272,17 +1170,24 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l * won't continue into the next line. */ if (i != (target * 2)+3) - graph->mapping[i] = -1; + graph->new_mapping[i] = -1; used_horizontal = 1; - graph_line_write_column(line, &graph->new_columns[target], '_'); + strbuf_write_column(sb, &graph->new_columns[target], '_'); } else { if (used_horizontal && i < horizontal_edge) - graph->mapping[i] = -1; - graph_line_write_column(line, &graph->new_columns[target], '/'); + graph->new_mapping[i] = -1; + strbuf_write_column(sb, &graph->new_columns[target], '/'); } } + graph_pad_horizontally(graph, sb, graph->mapping_size); + + /* + * Swap mapping and new_mapping + */ + SWAP(graph->mapping, graph->new_mapping); + /* * If graph->mapping indicates that all of the branch lines * are already in the correct positions, we are done. @@ -1294,49 +1199,35 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l int graph_next_line(struct git_graph *graph, struct strbuf *sb) { - int shown_commit_line = 0; - struct graph_line line = { .buf = sb, .width = 0 }; - - /* - * We could conceivable be called with a NULL commit - * if our caller has a bug, and invokes graph_next_line() - * immediately after graph_init(), without first calling - * graph_update(). Return without outputting anything in this - * case. - */ - if (!graph->commit) - return -1; - switch (graph->state) { case GRAPH_PADDING: - graph_output_padding_line(graph, &line); - break; + graph_output_padding_line(graph, sb); + return 0; case GRAPH_SKIP: - graph_output_skip_line(graph, &line); - break; + graph_output_skip_line(graph, sb); + return 0; case GRAPH_PRE_COMMIT: - graph_output_pre_commit_line(graph, &line); - break; + graph_output_pre_commit_line(graph, sb); + return 0; case GRAPH_COMMIT: - graph_output_commit_line(graph, &line); - shown_commit_line = 1; - break; + graph_output_commit_line(graph, sb); + return 1; case GRAPH_POST_MERGE: - graph_output_post_merge_line(graph, &line); - break; + graph_output_post_merge_line(graph, sb); + return 0; case GRAPH_COLLAPSING: - graph_output_collapsing_line(graph, &line); - break; + graph_output_collapsing_line(graph, sb); + return 0; } - graph_pad_horizontally(graph, &line); - return shown_commit_line; + assert(0); + return 0; } static void graph_padding_line(struct git_graph *graph, struct strbuf *sb) { int i; - struct graph_line line = { .buf = sb, .width = 0 }; + int chars_written = 0; if (graph->state != GRAPH_COMMIT) { graph_next_line(graph, sb); @@ -1353,17 +1244,20 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb) for (i = 0; i < graph->num_columns; i++) { struct column *col = &graph->columns[i]; - graph_line_write_column(&line, col, '|'); + strbuf_write_column(sb, col, '|'); + chars_written++; if (col->commit == graph->commit && graph->num_parents > 2) { int len = (graph->num_parents - 2) * 2; - graph_line_addchars(&line, ' ', len); + strbuf_addchars(sb, ' ', len); + chars_written += len; } else { - graph_line_addch(&line, ' '); + strbuf_addch(sb, ' '); + chars_written++; } } - graph_pad_horizontally(graph, &line); + graph_pad_horizontally(graph, sb, chars_written); /* * Update graph->prev_state since we have output a padding line diff --git a/third_party/git/graph.h b/third_party/git/graph.h index 8313e293c7..af623390b6 100644 --- a/third_party/git/graph.h +++ b/third_party/git/graph.h @@ -2,103 +2,6 @@ #define GRAPH_H #include "diff.h" -/** - * The graph API is used to draw a text-based representation of the commit - * history. The API generates the graph in a line-by-line fashion. - * - * Calling sequence - * ---------------- - * - * - Create a `struct git_graph` by calling `graph_init()`. When using the - * revision walking API, this is done automatically by `setup_revisions()` if - * the '--graph' option is supplied. - * - * - Use the revision walking API to walk through a group of contiguous commits. - * The `get_revision()` function automatically calls `graph_update()` each time - * it is invoked. - * - * - For each commit, call `graph_next_line()` repeatedly, until - * `graph_is_commit_finished()` returns non-zero. Each call to - * `graph_next_line()` will output a single line of the graph. The resulting - * lines will not contain any newlines. `graph_next_line()` returns 1 if the - * resulting line contains the current commit, or 0 if this is merely a line - * needed to adjust the graph before or after the current commit. This return - * value can be used to determine where to print the commit summary information - * alongside the graph output. - * - * Limitations - * ----------- - * - Check the graph_update() function for its limitations. - * - * - The graph API does not currently support reverse commit ordering. In - * order to implement reverse ordering, the graphing API needs an - * (efficient) mechanism to find the children of a commit. - * - * Sample usage - * ------------ - * - * ------------ - * struct commit *commit; - * struct git_graph *graph = graph_init(opts); - * - * while ((commit = get_revision(opts)) != NULL) { - * while (!graph_is_commit_finished(graph)) - * { - * struct strbuf sb; - * int is_commit_line; - * - * strbuf_init(&sb, 0); - * is_commit_line = graph_next_line(graph, &sb); - * fputs(sb.buf, stdout); - * - * if (is_commit_line) - * log_tree_commit(opts, commit); - * else - * putchar(opts->diffopt.line_termination); - * } - * } - * ------------ - * Sample output - * ------------- - * - * The following is an example of the output from the graph API. This output does - * not include any commit summary information--callers are responsible for - * outputting that information, if desired. - * ------------ - * * - * * - * * - * |\ - * * | - * | | * - * | \ \ - * | \ \ - * *-. \ \ - * |\ \ \ \ - * | | * | | - * | | | | | * - * | | | | | * - * | | | | | * - * | | | | | |\ - * | | | | | | * - * | * | | | | | - * | | | | | * \ - * | | | | | |\ | - * | | | | * | | | - * | | | | * | | | - * * | | | | | | | - * | |/ / / / / / - * |/| / / / / / - * * | | | | | | - * |/ / / / / / - * * | | | | | - * | | | | | * - * | | | | |/ - * | | | | * - * ------------ - * - */ - /* A graph is a pointer to this opaque structure */ struct git_graph; @@ -147,21 +50,6 @@ struct git_graph *graph_init(struct rev_info *opt); * If graph_update() is called before graph_is_commit_finished() returns 1, * the next call to graph_next_line() will output an ellipsis ("...") * to indicate that a portion of the graph is missing. - * - * Limitations: - * ----------- - * - * - `graph_update()` must be called with commits in topological order. It should - * not be called on a commit if it has already been invoked with an ancestor of - * that commit, or the graph output will be incorrect. - * - * - `graph_update()` must be called on a contiguous group of commits. If - * `graph_update()` is called on a particular commit, it should later be called - * on all parents of that commit. Parents must not be skipped, or the graph - * output will appear incorrect. - * - * - `graph_update()` may be used on a pruned set of commits only if the parent list - * has been rewritten so as to include only ancestors from the pruned set. */ void graph_update(struct git_graph *graph, struct commit *commit); @@ -174,10 +62,6 @@ void graph_update(struct git_graph *graph, struct commit *commit); * for this commit. If 0 is returned, graph_next_line() may still be * called without calling graph_update(), and it will merely output * appropriate "vertical padding" in the graph. - * - * If `graph_update()` is called before all lines for the current commit have - * been printed, the next call to `graph_next_line()` will output an ellipsis, - * to indicate that a portion of the graph was omitted. */ int graph_is_commit_finished(struct git_graph const *graph); @@ -228,7 +112,6 @@ void graph_show_padding(struct git_graph *graph); /* * If the graph is non-NULL, print the rest of the history graph for this * commit to stdout. Does not print a terminating newline on the last line. - * Returns 1 if output was printed, and 0 if no output was necessary. */ int graph_show_remainder(struct git_graph *graph); @@ -238,10 +121,6 @@ int graph_show_remainder(struct git_graph *graph); * This is similar to graph_show_strbuf(), but it always prints the * remainder of the graph. * - * It is better than directly calling `graph_show_strbuf()` followed by - * `graph_show_remainder()` since it properly handles buffers that do not end in - * a terminating newline. - * * If the strbuf ends with a newline, the output printed by * graph_show_commit_msg() will end with a newline. If the strbuf is * missing a terminating newline (including if it is empty), the output diff --git a/third_party/git/grep.c b/third_party/git/grep.c index 13232a904a..cd952ef5d3 100644 --- a/third_party/git/grep.c +++ b/third_party/git/grep.c @@ -16,20 +16,6 @@ static int grep_source_is_binary(struct grep_source *gs, static struct grep_opt grep_defaults; -#ifdef USE_LIBPCRE2 -static pcre2_general_context *pcre2_global_context; - -static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data) -{ - return malloc(size); -} - -static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data) -{ - free(pointer); -} -#endif - static const char *color_grep_slots[] = { [GREP_COLOR_CONTEXT] = "context", [GREP_COLOR_FILENAME] = "filename", @@ -164,28 +150,12 @@ int grep_config(const char *var, const char *value, void *cb) * Initialize one instance of grep_opt and copy the * default values from the template we read the configuration * information in an earlier call to git_config(grep_config). - * - * If using PCRE, make sure that the library is configured - * to use the same allocator as Git (e.g. nedmalloc on Windows). - * - * Any allocated memory needs to be released in grep_destroy(). */ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix) { struct grep_opt *def = &grep_defaults; int i; -#if defined(USE_LIBPCRE2) - if (!pcre2_global_context) - pcre2_global_context = pcre2_general_context_create( - pcre2_malloc, pcre2_free, NULL); -#endif - -#ifdef USE_LIBPCRE1 - pcre_malloc = malloc; - pcre_free = free; -#endif - memset(opt, 0, sizeof(*opt)); opt->repo = repo; opt->prefix = prefix; @@ -208,13 +178,6 @@ void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix color_set(opt->colors[i], def->colors[i]); } -void grep_destroy(void) -{ -#ifdef USE_LIBPCRE2 - pcre2_general_context_free(pcre2_global_context); -#endif -} - static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct grep_opt *opt) { /* @@ -405,20 +368,31 @@ static int is_fixed(const char *s, size_t len) return 1; } +static int has_null(const char *s, size_t len) +{ + /* + * regcomp cannot accept patterns with NULs so when using it + * we consider any pattern containing a NUL fixed. + */ + if (memchr(s, 0, len)) + return 1; + + return 0; +} + #ifdef USE_LIBPCRE1 static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt) { const char *error; int erroffset; int options = PCRE_MULTILINE; - int study_options = 0; if (opt->ignore_case) { - if (!opt->ignore_locale && has_non_ascii(p->pattern)) + if (has_non_ascii(p->pattern)) p->pcre1_tables = pcre_maketables(); options |= PCRE_CASELESS; } - if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern)) + if (is_utf8_locale() && has_non_ascii(p->pattern)) options |= PCRE_UTF8; p->pcre1_regexp = pcre_compile(p->pattern, options, &error, &erroffset, @@ -426,31 +400,44 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt) if (!p->pcre1_regexp) compile_regexp_failed(p, error); -#if defined(PCRE_CONFIG_JIT) && !defined(NO_LIBPCRE1_JIT) - pcre_config(PCRE_CONFIG_JIT, &p->pcre1_jit_on); - if (opt->debug) - fprintf(stderr, "pcre1_jit_on=%d\n", p->pcre1_jit_on); - - if (p->pcre1_jit_on) - study_options = PCRE_STUDY_JIT_COMPILE; -#endif - - p->pcre1_extra_info = pcre_study(p->pcre1_regexp, study_options, &error); + p->pcre1_extra_info = pcre_study(p->pcre1_regexp, GIT_PCRE_STUDY_JIT_COMPILE, &error); if (!p->pcre1_extra_info && error) die("%s", error); + +#ifdef GIT_PCRE1_USE_JIT + pcre_config(PCRE_CONFIG_JIT, &p->pcre1_jit_on); + if (p->pcre1_jit_on == 1) { + p->pcre1_jit_stack = pcre_jit_stack_alloc(1, 1024 * 1024); + if (!p->pcre1_jit_stack) + die("Couldn't allocate PCRE JIT stack"); + pcre_assign_jit_stack(p->pcre1_extra_info, NULL, p->pcre1_jit_stack); + } else if (p->pcre1_jit_on != 0) { + BUG("The pcre1_jit_on variable should be 0 or 1, not %d", + p->pcre1_jit_on); + } +#endif } static int pcre1match(struct grep_pat *p, const char *line, const char *eol, regmatch_t *match, int eflags) { - int ovector[30], ret, flags = PCRE_NO_UTF8_CHECK; + int ovector[30], ret, flags = 0; if (eflags & REG_NOTBOL) flags |= PCRE_NOTBOL; - ret = pcre_exec(p->pcre1_regexp, p->pcre1_extra_info, line, - eol - line, 0, flags, ovector, - ARRAY_SIZE(ovector)); +#ifdef GIT_PCRE1_USE_JIT + if (p->pcre1_jit_on) { + ret = pcre_jit_exec(p->pcre1_regexp, p->pcre1_extra_info, line, + eol - line, 0, flags, ovector, + ARRAY_SIZE(ovector), p->pcre1_jit_stack); + } else +#endif + { + ret = pcre_exec(p->pcre1_regexp, p->pcre1_extra_info, line, + eol - line, 0, flags, ovector, + ARRAY_SIZE(ovector)); + } if (ret < 0 && ret != PCRE_ERROR_NOMATCH) die("pcre_exec failed with error code %d", ret); @@ -466,12 +453,15 @@ static int pcre1match(struct grep_pat *p, const char *line, const char *eol, static void free_pcre1_regexp(struct grep_pat *p) { pcre_free(p->pcre1_regexp); -#ifdef PCRE_CONFIG_JIT - if (p->pcre1_jit_on) +#ifdef GIT_PCRE1_USE_JIT + if (p->pcre1_jit_on) { pcre_free_study(p->pcre1_extra_info); - else + pcre_jit_stack_free(p->pcre1_jit_stack); + } else #endif + { pcre_free(p->pcre1_extra_info); + } pcre_free((void *)p->pcre1_tables); } #else /* !USE_LIBPCRE1 */ @@ -498,6 +488,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt PCRE2_UCHAR errbuf[256]; PCRE2_SIZE erroffset; int options = PCRE2_MULTILINE; + const uint8_t *character_tables = NULL; int jitret; int patinforet; size_t jitsizearg; @@ -506,20 +497,15 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt p->pcre2_compile_context = NULL; - /* pcre2_global_context is initialized in append_grep_pattern */ if (opt->ignore_case) { - if (!opt->ignore_locale && has_non_ascii(p->pattern)) { - if (!pcre2_global_context) - BUG("pcre2_global_context uninitialized"); - p->pcre2_tables = pcre2_maketables(pcre2_global_context); + if (has_non_ascii(p->pattern)) { + character_tables = pcre2_maketables(NULL); p->pcre2_compile_context = pcre2_compile_context_create(NULL); - pcre2_set_character_tables(p->pcre2_compile_context, - p->pcre2_tables); + pcre2_set_character_tables(p->pcre2_compile_context, character_tables); } options |= PCRE2_CASELESS; } - if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) && - !(!opt->ignore_case && (p->fixed || p->is_fixed))) + if (is_utf8_locale() && has_non_ascii(p->pattern)) options |= PCRE2_UTF; p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern, @@ -536,9 +522,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt } pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on); - if (opt->debug) - fprintf(stderr, "pcre2_jit_on=%d\n", p->pcre2_jit_on); - if (p->pcre2_jit_on) { + if (p->pcre2_jit_on == 1) { jitret = pcre2_jit_compile(p->pcre2_pattern, PCRE2_JIT_COMPLETE); if (jitret) die("Couldn't JIT the PCRE2 pattern '%s', got '%d'\n", p->pattern, jitret); @@ -563,11 +547,19 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt BUG("pcre2_pattern_info() failed: %d", patinforet); if (jitsizearg == 0) { p->pcre2_jit_on = 0; - if (opt->debug) - fprintf(stderr, "pcre2_jit_on=%d: (*NO_JIT) in regex\n", - p->pcre2_jit_on); return; } + + p->pcre2_jit_stack = pcre2_jit_stack_create(1, 1024 * 1024, NULL); + if (!p->pcre2_jit_stack) + die("Couldn't allocate PCRE2 JIT stack"); + p->pcre2_match_context = pcre2_match_context_create(NULL); + if (!p->pcre2_match_context) + die("Couldn't allocate PCRE2 match context"); + pcre2_jit_stack_assign(p->pcre2_match_context, NULL, p->pcre2_jit_stack); + } else if (p->pcre2_jit_on != 0) { + BUG("The pcre2_jit_on variable should be 0 or 1, not %d", + p->pcre2_jit_on); } } @@ -611,7 +603,8 @@ static void free_pcre2_pattern(struct grep_pat *p) pcre2_compile_context_free(p->pcre2_compile_context); pcre2_code_free(p->pcre2_pattern); pcre2_match_data_free(p->pcre2_match_data); - free((void *)p->pcre2_tables); + pcre2_jit_stack_free(p->pcre2_jit_stack); + pcre2_match_context_free(p->pcre2_match_context); } #else /* !USE_LIBPCRE2 */ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt) @@ -633,6 +626,7 @@ static int pcre2match(struct grep_pat *p, const char *line, const char *eol, static void free_pcre2_pattern(struct grep_pat *p) { } +#endif /* !USE_LIBPCRE2 */ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt) { @@ -653,66 +647,46 @@ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt) compile_regexp_failed(p, errbuf); } } -#endif /* !USE_LIBPCRE2 */ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt) { + int ascii_only; int err; int regflags = REG_NEWLINE; p->word_regexp = opt->word_regexp; p->ignore_case = opt->ignore_case; - p->fixed = opt->fixed; - - if (memchr(p->pattern, 0, p->patternlen) && !opt->pcre2) - die(_("given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2")); + ascii_only = !has_non_ascii(p->pattern); - p->is_fixed = is_fixed(p->pattern, p->patternlen); -#ifdef USE_LIBPCRE2 - if (!p->fixed && !p->is_fixed) { - const char *no_jit = "(*NO_JIT)"; - const int no_jit_len = strlen(no_jit); - if (starts_with(p->pattern, no_jit) && - is_fixed(p->pattern + no_jit_len, - p->patternlen - no_jit_len)) - p->is_fixed = 1; - } -#endif - if (p->fixed || p->is_fixed) { -#ifdef USE_LIBPCRE2 - opt->pcre2 = 1; - if (p->is_fixed) { - compile_pcre2_pattern(p, opt); - } else { - /* - * E.g. t7811-grep-open.sh relies on the - * pattern being restored. - */ - char *old_pattern = p->pattern; - size_t old_patternlen = p->patternlen; - struct strbuf sb = STRBUF_INIT; - - /* - * There is the PCRE2_LITERAL flag, but it's - * only in PCRE v2 10.30 and later. Needing to - * ifdef our way around that and dealing with - * it + PCRE2_MULTILINE being an error is more - * complex than just quoting this ourselves. - */ - strbuf_add(&sb, "\\Q", 2); - strbuf_add(&sb, p->pattern, p->patternlen); - strbuf_add(&sb, "\\E", 2); - - p->pattern = sb.buf; - p->patternlen = sb.len; - compile_pcre2_pattern(p, opt); - p->pattern = old_pattern; - p->patternlen = old_patternlen; - strbuf_release(&sb); - } -#else /* !USE_LIBPCRE2 */ + /* + * Even when -F (fixed) asks us to do a non-regexp search, we + * may not be able to correctly case-fold when -i + * (ignore-case) is asked (in which case, we'll synthesize a + * regexp to match the pattern that matches regexp special + * characters literally, while ignoring case differences). On + * the other hand, even without -F, if the pattern does not + * have any regexp special characters and there is no need for + * case-folding search, we can internally turn it into a + * simple string match using kws. p->fixed tells us if we + * want to use kws. + */ + if (opt->fixed || + has_null(p->pattern, p->patternlen) || + is_fixed(p->pattern, p->patternlen)) + p->fixed = !p->ignore_case || ascii_only; + + if (p->fixed) { + p->kws = kwsalloc(p->ignore_case ? tolower_trans_tbl : NULL); + kwsincr(p->kws, p->pattern, p->patternlen); + kwsprep(p->kws); + return; + } else if (opt->fixed) { + /* + * We come here when the pattern has the non-ascii + * characters we cannot case-fold, and asked to + * ignore-case. + */ compile_fixed_regexp(p, opt); -#endif /* !USE_LIBPCRE2 */ return; } @@ -1079,7 +1053,9 @@ void free_grep_patterns(struct grep_opt *opt) case GREP_PATTERN: /* atom */ case GREP_PATTERN_HEAD: case GREP_PATTERN_BODY: - if (p->pcre1_regexp) + if (p->kws) + kwsfree(p->kws); + else if (p->pcre1_regexp) free_pcre1_regexp(p); else if (p->pcre2_pattern) free_pcre2_pattern(p); @@ -1139,12 +1115,29 @@ static void show_name(struct grep_opt *opt, const char *name) opt->output(opt, opt->null_following_name ? "\0" : "\n", 1); } +static int fixmatch(struct grep_pat *p, char *line, char *eol, + regmatch_t *match) +{ + struct kwsmatch kwsm; + size_t offset = kwsexec(p->kws, line, eol - line, &kwsm); + if (offset == -1) { + match->rm_so = match->rm_eo = -1; + return REG_NOMATCH; + } else { + match->rm_so = offset; + match->rm_eo = match->rm_so + kwsm.size[0]; + return 0; + } +} + static int patmatch(struct grep_pat *p, char *line, char *eol, regmatch_t *match, int eflags) { int hit; - if (p->pcre1_regexp) + if (p->fixed) + hit = !fixmatch(p, line, eol, match); + else if (p->pcre1_regexp) hit = !pcre1match(p, line, eol, match, eflags); else if (p->pcre2_pattern) hit = !pcre2match(p, line, eol, match, eflags); @@ -1540,6 +1533,11 @@ static inline void grep_attr_unlock(void) pthread_mutex_unlock(&grep_attr_mutex); } +/* + * Same as git_attr_mutex, but protecting the thread-unsafe object db access. + */ +pthread_mutex_t grep_read_mutex; + static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bol, char *eol) { xdemitconf_t *xecfg = opt->priv; @@ -1736,20 +1734,13 @@ static int fill_textconv_grep(struct repository *r, } /* - * fill_textconv is not remotely thread-safe; it modifies the global - * diff tempfile structure, writes to the_repo's odb and might - * internally call thread-unsafe functions such as the - * prepare_packed_git() lazy-initializator. Because of the last two, we - * must ensure mutual exclusion between this call and the object reading - * API, thus we use obj_read_lock() here. - * - * TODO: allowing text conversion to run in parallel with object - * reading operations might increase performance in the multithreaded - * non-worktreee git-grep with --textconv. + * fill_textconv is not remotely thread-safe; it may load objects + * behind the scenes, and it modifies the global diff tempfile + * structure. */ - obj_read_lock(); + grep_read_lock(); size = fill_textconv(r, driver, df, &buf); - obj_read_unlock(); + grep_read_unlock(); free_filespec(df); /* @@ -1815,15 +1806,10 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle grep_source_load_driver(gs, opt->repo->index); /* * We might set up the shared textconv cache data here, which - * is not thread-safe. Also, get_oid_with_context() and - * parse_object() might be internally called. As they are not - * currenty thread-safe and might be racy with object reading, - * obj_read_lock() must be called. + * is not thread-safe. */ grep_attr_lock(); - obj_read_lock(); textconv = userdiff_get_textconv(opt->repo, gs->driver); - obj_read_unlock(); grep_attr_unlock(); } @@ -2123,7 +2109,10 @@ static int grep_source_load_oid(struct grep_source *gs) { enum object_type type; + grep_read_lock(); gs->buf = read_object_file(gs->identifier, &type, &gs->size); + grep_read_unlock(); + if (!gs->buf) return error(_("'%s': unable to read %s"), gs->name, diff --git a/third_party/git/grep.h b/third_party/git/grep.h index 9115db8515..1875880f37 100644 --- a/third_party/git/grep.h +++ b/third_party/git/grep.h @@ -3,12 +3,24 @@ #include "color.h" #ifdef USE_LIBPCRE1 #include <pcre.h> -#ifndef PCRE_NO_UTF8_CHECK -#define PCRE_NO_UTF8_CHECK 0 +#ifdef PCRE_CONFIG_JIT +#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32 +#ifndef NO_LIBPCRE1_JIT +#define GIT_PCRE1_USE_JIT +#define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE +#endif +#endif +#endif +#ifndef GIT_PCRE_STUDY_JIT_COMPILE +#define GIT_PCRE_STUDY_JIT_COMPILE 0 +#endif +#if PCRE_MAJOR <= 8 && PCRE_MINOR < 20 +typedef int pcre_jit_stack; #endif #else typedef int pcre; typedef int pcre_extra; +typedef int pcre_jit_stack; #endif #ifdef USE_LIBPCRE2 #define PCRE2_CODE_UNIT_WIDTH 8 @@ -17,7 +29,10 @@ typedef int pcre_extra; typedef int pcre2_code; typedef int pcre2_match_data; typedef int pcre2_compile_context; +typedef int pcre2_match_context; +typedef int pcre2_jit_stack; #endif +#include "kwset.h" #include "thread-utils.h" #include "userdiff.h" @@ -73,15 +88,17 @@ struct grep_pat { regex_t regexp; pcre *pcre1_regexp; pcre_extra *pcre1_extra_info; + pcre_jit_stack *pcre1_jit_stack; const unsigned char *pcre1_tables; int pcre1_jit_on; pcre2_code *pcre2_pattern; pcre2_match_data *pcre2_match_data; pcre2_compile_context *pcre2_compile_context; - const uint8_t *pcre2_tables; + pcre2_match_context *pcre2_match_context; + pcre2_jit_stack *pcre2_jit_stack; uint32_t pcre2_jit_on; + kwset_t kws; unsigned fixed:1; - unsigned is_fixed:1; unsigned ignore_case:1; unsigned word_regexp:1; }; @@ -156,7 +173,6 @@ struct grep_opt { int funcbody; int extended_regexp_option; int pattern_type_option; - int ignore_locale; char colors[NR_GREP_COLORS][COLOR_MAXLEN]; unsigned pre_context; unsigned post_context; @@ -173,7 +189,6 @@ struct grep_opt { void init_grep_defaults(struct repository *); int grep_config(const char *var, const char *value, void *); void grep_init(struct grep_opt *, struct repository *repo, const char *prefix); -void grep_destroy(void); void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt); void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t); @@ -220,5 +235,18 @@ int grep_threads_ok(const struct grep_opt *opt); */ extern int grep_use_locks; extern pthread_mutex_t grep_attr_mutex; +extern pthread_mutex_t grep_read_mutex; + +static inline void grep_read_lock(void) +{ + if (grep_use_locks) + pthread_mutex_lock(&grep_read_mutex); +} + +static inline void grep_read_unlock(void) +{ + if (grep_use_locks) + pthread_mutex_unlock(&grep_read_mutex); +} #endif diff --git a/third_party/git/hashmap.c b/third_party/git/hashmap.c index 09813e1a46..d42f01ff5a 100644 --- a/third_party/git/hashmap.c +++ b/third_party/git/hashmap.c @@ -51,7 +51,7 @@ unsigned int memihash(const void *buf, size_t len) } /* - * Incorporate another chunk of data into a memihash + * Incoporate another chunk of data into a memihash * computation. */ unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len) @@ -140,8 +140,8 @@ static inline struct hashmap_entry **find_entry_ptr(const struct hashmap *map, } static int always_equal(const void *unused_cmp_data, - const struct hashmap_entry *unused1, - const struct hashmap_entry *unused2, + const void *unused1, + const void *unused2, const void *unused_keydata) { return 0; @@ -171,49 +171,41 @@ void hashmap_init(struct hashmap *map, hashmap_cmp_fn equals_function, map->do_count_items = 1; } -void hashmap_free_(struct hashmap *map, ssize_t entry_offset) +void hashmap_free(struct hashmap *map, int free_entries) { if (!map || !map->table) return; - if (entry_offset >= 0) { /* called by hashmap_free_entries */ + if (free_entries) { struct hashmap_iter iter; struct hashmap_entry *e; - hashmap_iter_init(map, &iter); while ((e = hashmap_iter_next(&iter))) - /* - * like container_of, but using caller-calculated - * offset (caller being hashmap_free_entries) - */ - free((char *)e - entry_offset); + free(e); } free(map->table); memset(map, 0, sizeof(*map)); } -struct hashmap_entry *hashmap_get(const struct hashmap *map, - const struct hashmap_entry *key, - const void *keydata) +void *hashmap_get(const struct hashmap *map, const void *key, const void *keydata) { return *find_entry_ptr(map, key, keydata); } -struct hashmap_entry *hashmap_get_next(const struct hashmap *map, - const struct hashmap_entry *entry) +void *hashmap_get_next(const struct hashmap *map, const void *entry) { - struct hashmap_entry *e = entry->next; + struct hashmap_entry *e = ((struct hashmap_entry *) entry)->next; for (; e; e = e->next) if (entry_equals(map, entry, e, NULL)) return e; return NULL; } -void hashmap_add(struct hashmap *map, struct hashmap_entry *entry) +void hashmap_add(struct hashmap *map, void *entry) { unsigned int b = bucket(map, entry); /* add entry */ - entry->next = map->table[b]; + ((struct hashmap_entry *) entry)->next = map->table[b]; map->table[b] = entry; /* fix size and rehash if appropriate */ @@ -224,9 +216,7 @@ void hashmap_add(struct hashmap *map, struct hashmap_entry *entry) } } -struct hashmap_entry *hashmap_remove(struct hashmap *map, - const struct hashmap_entry *key, - const void *keydata) +void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata) { struct hashmap_entry *old; struct hashmap_entry **e = find_entry_ptr(map, key, keydata); @@ -248,8 +238,7 @@ struct hashmap_entry *hashmap_remove(struct hashmap *map, return old; } -struct hashmap_entry *hashmap_put(struct hashmap *map, - struct hashmap_entry *entry) +void *hashmap_put(struct hashmap *map, void *entry) { struct hashmap_entry *old = hashmap_remove(map, entry, NULL); hashmap_add(map, entry); @@ -263,7 +252,7 @@ void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter) iter->next = NULL; } -struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter) +void *hashmap_iter_next(struct hashmap_iter *iter) { struct hashmap_entry *current = iter->next; for (;;) { @@ -286,15 +275,10 @@ struct pool_entry { }; static int pool_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, - const void *keydata) + const struct pool_entry *e1, + const struct pool_entry *e2, + const unsigned char *keydata) { - const struct pool_entry *e1, *e2; - - e1 = container_of(eptr, const struct pool_entry, ent); - e2 = container_of(entry_or_key, const struct pool_entry, ent); - return e1->data != keydata && (e1->len != e2->len || memcmp(e1->data, keydata, e1->len)); } @@ -306,18 +290,18 @@ const void *memintern(const void *data, size_t len) /* initialize string pool hashmap */ if (!map.tablesize) - hashmap_init(&map, pool_entry_cmp, NULL, 0); + hashmap_init(&map, (hashmap_cmp_fn) pool_entry_cmp, NULL, 0); /* lookup interned string in pool */ - hashmap_entry_init(&key.ent, memhash(data, len)); + hashmap_entry_init(&key, memhash(data, len)); key.len = len; - e = hashmap_get_entry(&map, &key, ent, data); + e = hashmap_get(&map, &key, data); if (!e) { /* not found: create it */ FLEX_ALLOC_MEM(e, data, data, len); - hashmap_entry_init(&e->ent, key.ent.hash); + hashmap_entry_init(e, key.ent.hash); e->len = len; - hashmap_add(&map, &e->ent); + hashmap_add(&map, e); } return e->data; } diff --git a/third_party/git/hashmap.h b/third_party/git/hashmap.h index 79ae9f80de..8424911566 100644 --- a/third_party/git/hashmap.h +++ b/third_party/git/hashmap.h @@ -13,7 +13,7 @@ * * struct hashmap map; * struct long2string { - * struct hashmap_entry ent; + * struct hashmap_entry ent; // must be the first member! * long key; * char value[FLEX_ARRAY]; // be careful with allocating on stack! * }; @@ -21,16 +21,12 @@ * #define COMPARE_VALUE 1 * * static int long2string_cmp(const void *hashmap_cmp_fn_data, - * const struct hashmap_entry *eptr, - * const struct hashmap_entry *entry_or_key, + * const struct long2string *e1, + * const struct long2string *e2, * const void *keydata) * { * const char *string = keydata; * unsigned flags = *(unsigned *)hashmap_cmp_fn_data; - * const struct long2string *e1, *e2; - * - * e1 = container_of(eptr, const struct long2string, ent); - * e2 = container_of(entry_or_key, const struct long2string, ent); * * if (flags & COMPARE_VALUE) * return e1->key != e2->key || @@ -45,58 +41,54 @@ * char value[255], action[32]; * unsigned flags = 0; * - * hashmap_init(&map, long2string_cmp, &flags, 0); + * hashmap_init(&map, (hashmap_cmp_fn) long2string_cmp, &flags, 0); * * while (scanf("%s %ld %s", action, &key, value)) { * * if (!strcmp("add", action)) { * struct long2string *e; * FLEX_ALLOC_STR(e, value, value); - * hashmap_entry_init(&e->ent, memhash(&key, sizeof(long))); + * hashmap_entry_init(e, memhash(&key, sizeof(long))); * e->key = key; - * hashmap_add(&map, &e->ent); + * hashmap_add(&map, e); * } * * if (!strcmp("print_all_by_key", action)) { * struct long2string k, *e; - * hashmap_entry_init(&k.ent, memhash(&key, sizeof(long))); + * hashmap_entry_init(&k, memhash(&key, sizeof(long))); * k.key = key; * * flags &= ~COMPARE_VALUE; - * e = hashmap_get_entry(&map, &k, ent, NULL); + * e = hashmap_get(&map, &k, NULL); * if (e) { * printf("first: %ld %s\n", e->key, e->value); - * while ((e = hashmap_get_next_entry(&map, e, - * struct long2string, ent))) { + * while ((e = hashmap_get_next(&map, e))) * printf("found more: %ld %s\n", e->key, e->value); - * } * } * } * * if (!strcmp("has_exact_match", action)) { * struct long2string *e; * FLEX_ALLOC_STR(e, value, value); - * hashmap_entry_init(&e->ent, memhash(&key, sizeof(long))); + * hashmap_entry_init(e, memhash(&key, sizeof(long))); * e->key = key; * * flags |= COMPARE_VALUE; - * printf("%sfound\n", - * hashmap_get(&map, &e->ent, NULL) ? "" : "not "); + * printf("%sfound\n", hashmap_get(&map, e, NULL) ? "" : "not "); * free(e); * } * * if (!strcmp("has_exact_match_no_heap_alloc", action)) { * struct long2string k; - * hashmap_entry_init(&k.ent, memhash(&key, sizeof(long))); + * hashmap_entry_init(&k, memhash(&key, sizeof(long))); * k.key = key; * * flags |= COMPARE_VALUE; - * printf("%sfound\n", - * hashmap_get(&map, &k.ent, value) ? "" : "not "); + * printf("%sfound\n", hashmap_get(&map, &k, value) ? "" : "not "); * } * * if (!strcmp("end", action)) { - * hashmap_free_entries(&map, struct long2string, ent); + * hashmap_free(&map, 1); * break; * } * } @@ -141,7 +133,7 @@ static inline unsigned int oidhash(const struct object_id *oid) /* * struct hashmap_entry is an opaque structure representing an entry in the - * hash table. + * hash table, which must be used as first member of user data structures. * Ideally it should be followed by an int-sized member to prevent unused * memory on 64-bit systems due to alignment. */ @@ -176,8 +168,7 @@ struct hashmap_entry { * The `hashmap_cmp_fn_data` entry is the pointer given in the init function. */ typedef int (*hashmap_cmp_fn)(const void *hashmap_cmp_fn_data, - const struct hashmap_entry *entry, - const struct hashmap_entry *entry_or_key, + const void *entry, const void *entry_or_key, const void *keydata); /* @@ -232,20 +223,13 @@ void hashmap_init(struct hashmap *map, const void *equals_function_data, size_t initial_size); -/* internal function for freeing hashmap */ -void hashmap_free_(struct hashmap *map, ssize_t offset); - -/* - * Frees a hashmap structure and allocated memory, leaves entries undisturbed - */ -#define hashmap_free(map) hashmap_free_(map, -1) - /* - * Frees @map and all entries. @type is the struct type of the entry - * where @member is the hashmap_entry struct used to associate with @map + * Frees a hashmap structure and allocated memory. + * + * If `free_entries` is true, each hashmap_entry in the map is freed as well + * using stdlibs free(). */ -#define hashmap_free_entries(map, type, member) \ - hashmap_free_(map, offsetof(type, member)); +void hashmap_free(struct hashmap *map, int free_entries); /* hashmap_entry functions */ @@ -260,9 +244,9 @@ void hashmap_free_(struct hashmap *map, ssize_t offset); * your structure was allocated with xmalloc(), you can just free(3) it, * and if it is on stack, you can just let it go out of scope). */ -static inline void hashmap_entry_init(struct hashmap_entry *e, - unsigned int hash) +static inline void hashmap_entry_init(void *entry, unsigned int hash) { + struct hashmap_entry *e = entry; e->hash = hash; e->next = NULL; } @@ -302,9 +286,8 @@ static inline unsigned int hashmap_get_size(struct hashmap *map) * If an entry with matching hash code is found, `key` and `keydata` are passed * to `hashmap_cmp_fn` to decide whether the entry matches the key. */ -struct hashmap_entry *hashmap_get(const struct hashmap *map, - const struct hashmap_entry *key, - const void *keydata); +void *hashmap_get(const struct hashmap *map, const void *key, + const void *keydata); /* * Returns the hashmap entry for the specified hash code and key data, @@ -318,10 +301,9 @@ struct hashmap_entry *hashmap_get(const struct hashmap *map, * `entry_or_key` parameter of `hashmap_cmp_fn` points to a hashmap_entry * structure that should not be used in the comparison. */ -static inline struct hashmap_entry *hashmap_get_from_hash( - const struct hashmap *map, - unsigned int hash, - const void *keydata) +static inline void *hashmap_get_from_hash(const struct hashmap *map, + unsigned int hash, + const void *keydata) { struct hashmap_entry key; hashmap_entry_init(&key, hash); @@ -336,8 +318,7 @@ static inline struct hashmap_entry *hashmap_get_from_hash( * `entry` is the hashmap_entry to start the search from, obtained via a previous * call to `hashmap_get` or `hashmap_get_next`. */ -struct hashmap_entry *hashmap_get_next(const struct hashmap *map, - const struct hashmap_entry *entry); +void *hashmap_get_next(const struct hashmap *map, const void *entry); /* * Adds a hashmap entry. This allows to add duplicate entries (i.e. @@ -346,7 +327,7 @@ struct hashmap_entry *hashmap_get_next(const struct hashmap *map, * `map` is the hashmap structure. * `entry` is the entry to add. */ -void hashmap_add(struct hashmap *map, struct hashmap_entry *entry); +void hashmap_add(struct hashmap *map, void *entry); /* * Adds or replaces a hashmap entry. If the hashmap contains duplicate @@ -356,20 +337,7 @@ void hashmap_add(struct hashmap *map, struct hashmap_entry *entry); * `entry` is the entry to add or replace. * Returns the replaced entry, or NULL if not found (i.e. the entry was added). */ -struct hashmap_entry *hashmap_put(struct hashmap *map, - struct hashmap_entry *entry); - -/* - * Adds or replaces a hashmap entry contained within @keyvar, - * where @keyvar is a pointer to a struct containing a - * "struct hashmap_entry" @member. - * - * Returns the replaced pointer which is of the same type as @keyvar, - * or NULL if not found. - */ -#define hashmap_put_entry(map, keyvar, member) \ - container_of_or_null_offset(hashmap_put(map, &(keyvar)->member), \ - OFFSETOF_VAR(keyvar, member)) +void *hashmap_put(struct hashmap *map, void *entry); /* * Removes a hashmap entry matching the specified key. If the hashmap contains @@ -378,24 +346,8 @@ struct hashmap_entry *hashmap_put(struct hashmap *map, * * Argument explanation is the same as in `hashmap_get`. */ -struct hashmap_entry *hashmap_remove(struct hashmap *map, - const struct hashmap_entry *key, - const void *keydata); - -/* - * Removes a hashmap entry contained within @keyvar, - * where @keyvar is a pointer to a struct containing a - * "struct hashmap_entry" @member. - * - * See `hashmap_get` for an explanation of @keydata - * - * Returns the replaced pointer which is of the same type as @keyvar, - * or NULL if not found. - */ -#define hashmap_remove_entry(map, keyvar, member, keydata) \ - container_of_or_null_offset( \ - hashmap_remove(map, &(keyvar)->member, keydata), \ - OFFSETOF_VAR(keyvar, member)) +void *hashmap_remove(struct hashmap *map, const void *key, + const void *keydata); /* * Returns the `bucket` an entry is stored in. @@ -418,10 +370,10 @@ struct hashmap_iter { void hashmap_iter_init(struct hashmap *map, struct hashmap_iter *iter); /* Returns the next hashmap_entry, or NULL if there are no more entries. */ -struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter); +void *hashmap_iter_next(struct hashmap_iter *iter); /* Initializes the iterator and returns the first entry, if any. */ -static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map, +static inline void *hashmap_iter_first(struct hashmap *map, struct hashmap_iter *iter) { hashmap_iter_init(map, iter); @@ -429,64 +381,6 @@ static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map, } /* - * returns the first entry in @map using @iter, where the entry is of - * @type (e.g. "struct foo") and @member is the name of the - * "struct hashmap_entry" in @type - */ -#define hashmap_iter_first_entry(map, iter, type, member) \ - container_of_or_null(hashmap_iter_first(map, iter), type, member) - -/* internal macro for hashmap_for_each_entry */ -#define hashmap_iter_next_entry_offset(iter, offset) \ - container_of_or_null_offset(hashmap_iter_next(iter), offset) - -/* internal macro for hashmap_for_each_entry */ -#define hashmap_iter_first_entry_offset(map, iter, offset) \ - container_of_or_null_offset(hashmap_iter_first(map, iter), offset) - -/* - * iterate through @map using @iter, @var is a pointer to a type - * containing a @member which is a "struct hashmap_entry" - */ -#define hashmap_for_each_entry(map, iter, var, member) \ - for (var = hashmap_iter_first_entry_offset(map, iter, \ - OFFSETOF_VAR(var, member)); \ - var; \ - var = hashmap_iter_next_entry_offset(iter, \ - OFFSETOF_VAR(var, member))) - -/* - * returns a pointer of type matching @keyvar, or NULL if nothing found. - * @keyvar is a pointer to a struct containing a - * "struct hashmap_entry" @member. - */ -#define hashmap_get_entry(map, keyvar, member, keydata) \ - container_of_or_null_offset( \ - hashmap_get(map, &(keyvar)->member, keydata), \ - OFFSETOF_VAR(keyvar, member)) - -#define hashmap_get_entry_from_hash(map, hash, keydata, type, member) \ - container_of_or_null(hashmap_get_from_hash(map, hash, keydata), \ - type, member) -/* - * returns the next equal pointer to @var, or NULL if not found. - * @var is a pointer of any type containing "struct hashmap_entry" - * @member is the name of the "struct hashmap_entry" field - */ -#define hashmap_get_next_entry(map, var, member) \ - container_of_or_null_offset(hashmap_get_next(map, &(var)->member), \ - OFFSETOF_VAR(var, member)) - -/* - * iterate @map starting from @var, where @var is a pointer of @type - * and @member is the name of the "struct hashmap_entry" field in @type - */ -#define hashmap_for_each_entry_from(map, var, member) \ - for (; \ - var; \ - var = hashmap_get_next_entry(map, var, member)) - -/* * Disable item counting and automatic rehashing when adding/removing items. * * Normally, the hashmap keeps track of the number of items in the map @@ -502,7 +396,7 @@ static inline void hashmap_disable_item_counting(struct hashmap *map) } /* - * Re-enable item counting when adding/removing items. + * Re-enable item couting when adding/removing items. * If counting is currently disabled, it will force count them. * It WILL NOT automatically rehash them. */ diff --git a/third_party/git/help.c b/third_party/git/help.c index cf67624a94..5261d83ecf 100644 --- a/third_party/git/help.c +++ b/third_party/git/help.c @@ -34,7 +34,7 @@ static struct category_description main_categories[] = { { CAT_foreignscminterface, N_("Interacting with Others") }, { CAT_plumbingmanipulators, N_("Low-level Commands / Manipulators") }, { CAT_plumbinginterrogators, N_("Low-level Commands / Interrogators") }, - { CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") }, + { CAT_synchingrepositories, N_("Low-level Commands / Synching Repositories") }, { CAT_purehelpers, N_("Low-level Commands / Internal Helpers") }, { 0, NULL } }; @@ -774,8 +774,7 @@ static struct string_list guess_refs(const char *ref) return similar_refs; } -NORETURN void help_unknown_ref(const char *ref, const char *cmd, - const char *error) +void help_unknown_ref(const char *ref, const char *cmd, const char *error) { int i; struct string_list suggested_refs = guess_refs(ref); diff --git a/third_party/git/help.h b/third_party/git/help.h index 7a455beeb7..b8780fbd0f 100644 --- a/third_party/git/help.h +++ b/third_party/git/help.h @@ -43,7 +43,7 @@ void list_commands(unsigned int colopts, struct cmdnames *main_cmds, struct cmdn * call this to die(), when it is suspected that the user mistyped a * ref to the command, to give suggested "correct" refs. */ -NORETURN void help_unknown_ref(const char *ref, const char *cmd, const char *error); +void help_unknown_ref(const char *ref, const char *cmd, const char *error); static inline void list_config_item(struct string_list *list, const char *prefix, diff --git a/third_party/git/hex.c b/third_party/git/hex.c index fd7f00c43f..7850a8879d 100644 --- a/third_party/git/hex.c +++ b/third_party/git/hex.c @@ -90,6 +90,11 @@ char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, return buffer; } +char *sha1_to_hex_r(char *buffer, const unsigned char *sha1) +{ + return hash_to_hex_algop_r(buffer, sha1, &hash_algos[GIT_HASH_SHA1]); +} + char *oid_to_hex_r(char *buffer, const struct object_id *oid) { return hash_to_hex_algop_r(buffer, oid->hash, the_hash_algo); @@ -103,6 +108,11 @@ char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *a return hash_to_hex_algop_r(hexbuffer[bufno], hash, algop); } +char *sha1_to_hex(const unsigned char *sha1) +{ + return hash_to_hex_algop(sha1, &hash_algos[GIT_HASH_SHA1]); +} + char *hash_to_hex(const unsigned char *hash) { return hash_to_hex_algop(hash, the_hash_algo); diff --git a/third_party/git/http-push.c b/third_party/git/http-push.c index 822f326599..0353f9f514 100644 --- a/third_party/git/http-push.c +++ b/third_party/git/http-push.c @@ -501,10 +501,10 @@ static void release_request(struct transfer_request *request) if (request == request_queue_head) { request_queue_head = request->next; } else { - while (entry && entry->next != request) + while (entry->next != NULL && entry->next != request) entry = entry->next; - if (entry) - entry->next = request->next; + if (entry->next == request) + entry->next = entry->next->next; } free(request->url); @@ -981,7 +981,7 @@ static int unlock_remote(struct remote_lock *lock) while (prev && prev->next != lock) prev = prev->next; if (prev) - prev->next = lock->next; + prev->next = prev->next->next; } free(lock->owner); diff --git a/third_party/git/http.c b/third_party/git/http.c index 5f71263482..27aa0a3192 100644 --- a/third_party/git/http.c +++ b/third_party/git/http.c @@ -150,7 +150,7 @@ static unsigned long empty_auth_useless = static struct curl_slist *pragma_header; static struct curl_slist *no_pragma_header; -static struct string_list extra_http_headers = STRING_LIST_INIT_DUP; +static struct curl_slist *extra_http_headers; static struct active_request_slot *active_queue_head; @@ -414,9 +414,11 @@ static int http_options(const char *var, const char *value, void *cb) if (!value) { return config_error_nonbool(var); } else if (!*value) { - string_list_clear(&extra_http_headers, 0); + curl_slist_free_all(extra_http_headers); + extra_http_headers = NULL; } else { - string_list_append(&extra_http_headers, value); + extra_http_headers = + curl_slist_append(extra_http_headers, value); } return 0; } @@ -511,11 +513,9 @@ static void set_proxyauth_name_password(CURL *result) #else struct strbuf s = STRBUF_INIT; - strbuf_addstr_urlencode(&s, proxy_auth.username, - is_rfc3986_unreserved); + strbuf_addstr_urlencode(&s, proxy_auth.username, 1); strbuf_addch(&s, ':'); - strbuf_addstr_urlencode(&s, proxy_auth.password, - is_rfc3986_unreserved); + strbuf_addstr_urlencode(&s, proxy_auth.password, 1); curl_proxyuserpwd = strbuf_detach(&s, NULL); curl_easy_setopt(result, CURLOPT_PROXYUSERPWD, curl_proxyuserpwd); #endif @@ -558,7 +558,6 @@ static int has_cert_password(void) return 0; if (!cert_auth.password) { cert_auth.protocol = xstrdup("cert"); - cert_auth.host = xstrdup(""); cert_auth.username = xstrdup(""); cert_auth.path = xstrdup(ssl_cert); credential_fill(&cert_auth); @@ -681,8 +680,8 @@ static void curl_dump_header(const char *text, unsigned char *ptr, size_t size, for (header = headers; *header; header++) { if (hide_sensitive_header) redact_sensitive_header(*header); - strbuf_insertstr((*header), 0, text); - strbuf_insertstr((*header), strlen(text), ": "); + strbuf_insert((*header), 0, text, strlen(text)); + strbuf_insert((*header), strlen(text), ": ", 2); strbuf_rtrim((*header)); strbuf_addch((*header), '\n'); trace_strbuf(&trace_curl, (*header)); @@ -1074,7 +1073,6 @@ void http_init(struct remote *remote, const char *url, int proactive_auth) git_config(urlmatch_config_entry, &config); free(normalized_url); - string_list_clear(&config.vars, 1); #if LIBCURL_VERSION_NUM >= 0x073800 if (http_ssl_backend) { @@ -1201,7 +1199,8 @@ void http_cleanup(void) #endif curl_global_cleanup(); - string_list_clear(&extra_http_headers, 0); + curl_slist_free_all(extra_http_headers); + extra_http_headers = NULL; curl_slist_free_all(pragma_header); pragma_header = NULL; @@ -1625,11 +1624,10 @@ int run_one_slot(struct active_request_slot *slot, struct curl_slist *http_copy_default_headers(void) { - struct curl_slist *headers = NULL; - const struct string_list_item *item; + struct curl_slist *headers = NULL, *h; - for_each_string_list_item(item, &extra_http_headers) - headers = curl_slist_append(headers, item->string); + for (h = extra_http_headers; h; h = h->next) + headers = curl_slist_append(headers, h->data); return headers; } diff --git a/third_party/git/http.h b/third_party/git/http.h index 5e0ad724f9..b429f1cf04 100644 --- a/third_party/git/http.h +++ b/third_party/git/http.h @@ -25,12 +25,8 @@ #if LIBCURL_VERSION_NUM < 0x070704 #define curl_global_cleanup() do { /* nothing */ } while (0) #endif - #if LIBCURL_VERSION_NUM < 0x070800 #define curl_global_init(a) do { /* nothing */ } while (0) -#elif LIBCURL_VERSION_NUM >= 0x070c00 -#define curl_global_init(a) curl_global_init_mem(a, xmalloc, free, \ - xrealloc, xstrdup, xcalloc) #endif #if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000) diff --git a/third_party/git/kwset.h b/third_party/git/kwset.h index f50ecae573..df99a92178 100644 --- a/third_party/git/kwset.h +++ b/third_party/git/kwset.h @@ -1,6 +1,3 @@ -#ifndef KWSET_H -#define KWSET_H - /* This file has been copied from commit e7ac713d^ in the GNU grep git * repository. A few small changes have been made to adapt the code to * Git. @@ -62,4 +59,3 @@ size_t kwsexec(kwset_t, char const *, size_t, struct kwsmatch *); /* Deallocate the given keyword set and all its associated storage. */ void kwsfree(kwset_t); -#endif /* KWSET_H */ diff --git a/third_party/git/line-log.c b/third_party/git/line-log.c index 9010e00950..3aff1849e7 100644 --- a/third_party/git/line-log.c +++ b/third_party/git/line-log.c @@ -737,38 +737,6 @@ static struct line_log_data *lookup_line_range(struct rev_info *revs, return ret; } -static int same_paths_in_pathspec_and_range(struct pathspec *pathspec, - struct line_log_data *range) -{ - int i; - struct line_log_data *r; - - for (i = 0, r = range; i < pathspec->nr && r; i++, r = r->next) - if (strcmp(pathspec->items[i].match, r->path)) - return 0; - if (i < pathspec->nr || r) - /* different number of pathspec items and ranges */ - return 0; - - return 1; -} - -static void parse_pathspec_from_ranges(struct pathspec *pathspec, - struct line_log_data *range) -{ - struct line_log_data *r; - struct argv_array array = ARGV_ARRAY_INIT; - const char **paths; - - for (r = range; r; r = r->next) - argv_array_push(&array, r->path); - paths = argv_array_detach(&array); - - parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths); - /* strings are now owned by pathspec */ - free(paths); -} - void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args) { struct commit *commit = NULL; @@ -778,7 +746,20 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list range = parse_lines(rev->diffopt.repo, commit, prefix, args); add_line_range(rev, commit, range); - parse_pathspec_from_ranges(&rev->diffopt.pathspec, range); + if (!rev->diffopt.detect_rename) { + struct line_log_data *r; + struct argv_array array = ARGV_ARRAY_INIT; + const char **paths; + + for (r = range; r; r = r->next) + argv_array_push(&array, r->path); + paths = argv_array_detach(&array); + + parse_pathspec(&rev->diffopt.pathspec, 0, + PATHSPEC_PREFER_FULL, "", paths); + /* strings are now owned by pathspec */ + free(paths); + } } static void move_diff_queue(struct diff_queue_struct *dst, @@ -836,29 +817,15 @@ static void queue_diffs(struct line_log_data *range, struct diff_queue_struct *queue, struct commit *commit, struct commit *parent) { - struct object_id *tree_oid, *parent_tree_oid; - assert(commit); - tree_oid = get_commit_tree_oid(commit); - parent_tree_oid = parent ? get_commit_tree_oid(parent) : NULL; - - if (opt->detect_rename && - !same_paths_in_pathspec_and_range(&opt->pathspec, range)) { - clear_pathspec(&opt->pathspec); - parse_pathspec_from_ranges(&opt->pathspec, range); - } DIFF_QUEUE_CLEAR(&diff_queued_diff); - diff_tree_oid(parent_tree_oid, tree_oid, "", opt); - if (opt->detect_rename && diff_might_be_rename()) { - /* must look at the full tree diff to detect renames */ - clear_pathspec(&opt->pathspec); - DIFF_QUEUE_CLEAR(&diff_queued_diff); - - diff_tree_oid(parent_tree_oid, tree_oid, "", opt); - + diff_tree_oid(parent ? get_commit_tree_oid(parent) : NULL, + get_commit_tree_oid(commit), "", opt); + if (opt->detect_rename) { filter_diffs_for_paths(range, 1); - diffcore_std(opt); + if (diff_might_be_rename()) + diffcore_std(opt); filter_diffs_for_paths(range, 0); } move_diff_queue(queue, &diff_queued_diff); diff --git a/third_party/git/list-objects-filter-options.c b/third_party/git/list-objects-filter-options.c index 256bcfbdfe..1cb20c659c 100644 --- a/third_party/git/list-objects-filter-options.c +++ b/third_party/git/list-objects-filter-options.c @@ -6,14 +6,6 @@ #include "list-objects.h" #include "list-objects-filter.h" #include "list-objects-filter-options.h" -#include "promisor-remote.h" -#include "trace.h" -#include "url.h" - -static int parse_combine_filter( - struct list_objects_filter_options *filter_options, - const char *arg, - struct strbuf *errbuf); /* * Parse value of the argument to the "filter" keyword. @@ -37,11 +29,16 @@ static int gently_parse_list_objects_filter( { const char *v0; - if (!arg) - return 0; + if (filter_options->choice) { + if (errbuf) { + strbuf_addstr( + errbuf, + _("multiple filter-specs cannot be combined")); + } + return 1; + } - if (filter_options->choice) - BUG("filter_options already populated"); + filter_options->filter_spec = strdup(arg); if (!strcmp(arg, "blob:none")) { filter_options->choice = LOFC_BLOB_NONE; @@ -55,14 +52,28 @@ static int gently_parse_list_objects_filter( } else if (skip_prefix(arg, "tree:", &v0)) { if (!git_parse_ulong(v0, &filter_options->tree_exclude_depth)) { - strbuf_addstr(errbuf, _("expected 'tree:<depth>'")); + if (errbuf) { + strbuf_addstr( + errbuf, + _("expected 'tree:<depth>'")); + } return 1; } filter_options->choice = LOFC_TREE_DEPTH; return 0; } else if (skip_prefix(arg, "sparse:oid=", &v0)) { - filter_options->sparse_oid_name = xstrdup(v0); + struct object_context oc; + struct object_id sparse_oid; + + /* + * Try to parse <oid-expression> into an OID for the current + * command, but DO NOT complain if we don't have the blob or + * ref locally. + */ + if (!get_oid_with_context(the_repository, v0, GET_OID_BLOB, + &sparse_oid, &oc)) + filter_options->sparse_oid_value = oiddup(&sparse_oid); filter_options->choice = LOFC_SPARSE_OID; return 0; @@ -73,189 +84,26 @@ static int gently_parse_list_objects_filter( _("sparse:path filters support has been dropped")); } return 1; - - } else if (skip_prefix(arg, "combine:", &v0)) { - return parse_combine_filter(filter_options, v0, errbuf); - } /* * Please update _git_fetch() in git-completion.bash when you * add new filters */ - strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg); + if (errbuf) + strbuf_addf(errbuf, _("invalid filter-spec '%s'"), arg); memset(filter_options, 0, sizeof(*filter_options)); return 1; } -static const char *RESERVED_NON_WS = "~`!@#$^&*()[]{}\\;'\",<>?"; - -static int has_reserved_character( - struct strbuf *sub_spec, struct strbuf *errbuf) -{ - const char *c = sub_spec->buf; - while (*c) { - if (*c <= ' ' || strchr(RESERVED_NON_WS, *c)) { - strbuf_addf( - errbuf, - _("must escape char in sub-filter-spec: '%c'"), - *c); - return 1; - } - c++; - } - - return 0; -} - -static int parse_combine_subfilter( - struct list_objects_filter_options *filter_options, - struct strbuf *subspec, - struct strbuf *errbuf) -{ - size_t new_index = filter_options->sub_nr; - char *decoded; - int result; - - ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1, - filter_options->sub_alloc); - - decoded = url_percent_decode(subspec->buf); - - result = has_reserved_character(subspec, errbuf) || - gently_parse_list_objects_filter( - &filter_options->sub[new_index], decoded, errbuf); - - free(decoded); - return result; -} - -static int parse_combine_filter( - struct list_objects_filter_options *filter_options, - const char *arg, - struct strbuf *errbuf) -{ - struct strbuf **subspecs = strbuf_split_str(arg, '+', 0); - size_t sub; - int result = 0; - - if (!subspecs[0]) { - strbuf_addstr(errbuf, _("expected something after combine:")); - result = 1; - goto cleanup; - } - - for (sub = 0; subspecs[sub] && !result; sub++) { - if (subspecs[sub + 1]) { - /* - * This is not the last subspec. Remove trailing "+" so - * we can parse it. - */ - size_t last = subspecs[sub]->len - 1; - assert(subspecs[sub]->buf[last] == '+'); - strbuf_remove(subspecs[sub], last, 1); - } - result = parse_combine_subfilter( - filter_options, subspecs[sub], errbuf); - } - - filter_options->choice = LOFC_COMBINE; - -cleanup: - strbuf_list_free(subspecs); - if (result) { - list_objects_filter_release(filter_options); - memset(filter_options, 0, sizeof(*filter_options)); - } - return result; -} - -static int allow_unencoded(char ch) -{ - if (ch <= ' ' || ch == '%' || ch == '+') - return 0; - return !strchr(RESERVED_NON_WS, ch); -} - -static void filter_spec_append_urlencode( - struct list_objects_filter_options *filter, const char *raw) +int parse_list_objects_filter(struct list_objects_filter_options *filter_options, + const char *arg) { struct strbuf buf = STRBUF_INIT; - strbuf_addstr_urlencode(&buf, raw, allow_unencoded); - trace_printf("Add to combine filter-spec: %s\n", buf.buf); - string_list_append(&filter->filter_spec, strbuf_detach(&buf, NULL)); -} - -/* - * Changes filter_options into an equivalent LOFC_COMBINE filter options - * instance. Does not do anything if filter_options is already LOFC_COMBINE. - */ -static void transform_to_combine_type( - struct list_objects_filter_options *filter_options) -{ - assert(filter_options->choice); - if (filter_options->choice == LOFC_COMBINE) - return; - { - const int initial_sub_alloc = 2; - struct list_objects_filter_options *sub_array = - xcalloc(initial_sub_alloc, sizeof(*sub_array)); - sub_array[0] = *filter_options; - memset(filter_options, 0, sizeof(*filter_options)); - filter_options->sub = sub_array; - filter_options->sub_alloc = initial_sub_alloc; - } - filter_options->sub_nr = 1; - filter_options->choice = LOFC_COMBINE; - string_list_append(&filter_options->filter_spec, xstrdup("combine:")); - filter_spec_append_urlencode( - filter_options, - list_objects_filter_spec(&filter_options->sub[0])); - /* - * We don't need the filter_spec strings for subfilter specs, only the - * top level. - */ - string_list_clear(&filter_options->sub[0].filter_spec, /*free_util=*/0); -} - -void list_objects_filter_die_if_populated( - struct list_objects_filter_options *filter_options) -{ - if (filter_options->choice) - die(_("multiple filter-specs cannot be combined")); -} - -void parse_list_objects_filter( - struct list_objects_filter_options *filter_options, - const char *arg) -{ - struct strbuf errbuf = STRBUF_INIT; - int parse_error; - - if (!filter_options->choice) { - string_list_append(&filter_options->filter_spec, xstrdup(arg)); - - parse_error = gently_parse_list_objects_filter( - filter_options, arg, &errbuf); - } else { - /* - * Make filter_options an LOFC_COMBINE spec so we can trivially - * add subspecs to it. - */ - transform_to_combine_type(filter_options); - - string_list_append(&filter_options->filter_spec, xstrdup("+")); - filter_spec_append_urlencode(filter_options, arg); - ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1, - filter_options->sub_alloc); - - parse_error = gently_parse_list_objects_filter( - &filter_options->sub[filter_options->sub_nr - 1], arg, - &errbuf); - } - if (parse_error) - die("%s", errbuf.buf); + if (gently_parse_list_objects_filter(filter_options, arg, &buf)) + die("%s", buf.buf); + return 0; } int opt_parse_list_objects_filter(const struct option *opt, @@ -263,108 +111,76 @@ int opt_parse_list_objects_filter(const struct option *opt, { struct list_objects_filter_options *filter_options = opt->value; - if (unset || !arg) + if (unset || !arg) { list_objects_filter_set_no_filter(filter_options); - else - parse_list_objects_filter(filter_options, arg); - return 0; -} - -const char *list_objects_filter_spec(struct list_objects_filter_options *filter) -{ - if (!filter->filter_spec.nr) - BUG("no filter_spec available for this filter"); - if (filter->filter_spec.nr != 1) { - struct strbuf concatted = STRBUF_INIT; - strbuf_add_separated_string_list( - &concatted, "", &filter->filter_spec); - string_list_clear(&filter->filter_spec, /*free_util=*/0); - string_list_append( - &filter->filter_spec, strbuf_detach(&concatted, NULL)); + return 0; } - return filter->filter_spec.items[0].string; + return parse_list_objects_filter(filter_options, arg); } -const char *expand_list_objects_filter_spec( - struct list_objects_filter_options *filter) +void expand_list_objects_filter_spec( + const struct list_objects_filter_options *filter, + struct strbuf *expanded_spec) { - if (filter->choice == LOFC_BLOB_LIMIT) { - struct strbuf expanded_spec = STRBUF_INIT; - strbuf_addf(&expanded_spec, "blob:limit=%lu", + strbuf_init(expanded_spec, strlen(filter->filter_spec)); + if (filter->choice == LOFC_BLOB_LIMIT) + strbuf_addf(expanded_spec, "blob:limit=%lu", filter->blob_limit_value); - string_list_clear(&filter->filter_spec, /*free_util=*/0); - string_list_append( - &filter->filter_spec, - strbuf_detach(&expanded_spec, NULL)); - } - - return list_objects_filter_spec(filter); + else if (filter->choice == LOFC_TREE_DEPTH) + strbuf_addf(expanded_spec, "tree:%lu", + filter->tree_exclude_depth); + else + strbuf_addstr(expanded_spec, filter->filter_spec); } void list_objects_filter_release( struct list_objects_filter_options *filter_options) { - size_t sub; - - if (!filter_options) - return; - string_list_clear(&filter_options->filter_spec, /*free_util=*/0); - free(filter_options->sparse_oid_name); - for (sub = 0; sub < filter_options->sub_nr; sub++) - list_objects_filter_release(&filter_options->sub[sub]); - free(filter_options->sub); + free(filter_options->filter_spec); + free(filter_options->sparse_oid_value); memset(filter_options, 0, sizeof(*filter_options)); } void partial_clone_register( const char *remote, - struct list_objects_filter_options *filter_options) + const struct list_objects_filter_options *filter_options) { - char *cfg_name; - char *filter_name; + /* + * Record the name of the partial clone remote in the + * config and in the global variable -- the latter is + * used throughout to indicate that partial clone is + * enabled and to expect missing objects. + */ + if (repository_format_partial_clone && + *repository_format_partial_clone && + strcmp(remote, repository_format_partial_clone)) + die(_("cannot change partial clone promisor remote")); - /* Check if it is already registered */ - if (!promisor_remote_find(remote)) { - git_config_set("core.repositoryformatversion", "1"); + git_config_set("core.repositoryformatversion", "1"); + git_config_set("extensions.partialclone", remote); - /* Add promisor config for the remote */ - cfg_name = xstrfmt("remote.%s.promisor", remote); - git_config_set(cfg_name, "true"); - free(cfg_name); - } + repository_format_partial_clone = xstrdup(remote); /* * Record the initial filter-spec in the config as * the default for subsequent fetches from this remote. */ - filter_name = xstrfmt("remote.%s.partialclonefilter", remote); - /* NEEDSWORK: 'expand' result leaking??? */ - git_config_set(filter_name, - expand_list_objects_filter_spec(filter_options)); - free(filter_name); - - /* Make sure the config info are reset */ - promisor_remote_reinit(); + core_partial_clone_filter_default = + xstrdup(filter_options->filter_spec); + git_config_set("core.partialclonefilter", + core_partial_clone_filter_default); } void partial_clone_get_default_filter_spec( - struct list_objects_filter_options *filter_options, - const char *remote) + struct list_objects_filter_options *filter_options) { - struct promisor_remote *promisor = promisor_remote_find(remote); - struct strbuf errbuf = STRBUF_INIT; - /* * Parse default value, but silently ignore it if it is invalid. */ - if (!promisor) + if (!core_partial_clone_filter_default) return; - - string_list_append(&filter_options->filter_spec, - promisor->partial_clone_filter); gently_parse_list_objects_filter(filter_options, - promisor->partial_clone_filter, - &errbuf); - strbuf_release(&errbuf); + core_partial_clone_filter_default, + NULL); } diff --git a/third_party/git/list-objects-filter-options.h b/third_party/git/list-objects-filter-options.h index 2ffb39222c..c54f0000fb 100644 --- a/third_party/git/list-objects-filter-options.h +++ b/third_party/git/list-objects-filter-options.h @@ -2,7 +2,7 @@ #define LIST_OBJECTS_FILTER_OPTIONS_H #include "parse-options.h" -#include "string-list.h" +#include "strbuf.h" /* * The list of defined filters for list-objects. @@ -13,7 +13,6 @@ enum list_objects_filter_choice { LOFC_BLOB_LIMIT, LOFC_TREE_DEPTH, LOFC_SPARSE_OID, - LOFC_COMBINE, LOFC__COUNT /* must be last */ }; @@ -24,10 +23,8 @@ struct list_objects_filter_options { * commands that launch filtering sub-processes, or for communication * over the network, don't use this value; use the result of * expand_list_objects_filter_spec() instead. - * To get the raw filter spec given by the user, use the result of - * list_objects_filter_spec(). */ - struct string_list filter_spec; + char *filter_spec; /* * 'choice' is determined by parsing the filter-spec. This indicates @@ -41,40 +38,19 @@ struct list_objects_filter_options { unsigned int no_filter : 1; /* - * BEGIN choice-specific parsed values from within the filter-spec. Only - * some values will be defined for any given choice. + * Parsed values (fields) from within the filter-spec. These are + * choice-specific; not all values will be defined for any given + * choice. */ - - char *sparse_oid_name; + struct object_id *sparse_oid_value; unsigned long blob_limit_value; unsigned long tree_exclude_depth; - - /* LOFC_COMBINE values */ - - /* This array contains all the subfilters which this filter combines. */ - size_t sub_nr, sub_alloc; - struct list_objects_filter_options *sub; - - /* - * END choice-specific parsed values. - */ }; /* Normalized command line arguments */ #define CL_ARG__FILTER "filter" -void list_objects_filter_die_if_populated( - struct list_objects_filter_options *filter_options); - -/* - * Parses the filter spec string given by arg and either (1) simply places the - * result in filter_options if it is not yet populated or (2) combines it with - * the filter already in filter_options if it is already populated. In the case - * of (2), the filter specs are combined as if specified with 'combine:'. - * - * Dies and prints a user-facing message if an error occurs. - */ -void parse_list_objects_filter( +int parse_list_objects_filter( struct list_objects_filter_options *filter_options, const char *arg); @@ -89,22 +65,13 @@ int opt_parse_list_objects_filter(const struct option *opt, /* * Translates abbreviated numbers in the filter's filter_spec into their * fully-expanded forms (e.g., "limit:blob=1k" becomes "limit:blob=1024"). - * Returns a string owned by the list_objects_filter_options object. * - * This form should be used instead of the raw list_objects_filter_spec() - * value when communicating with a remote process or subprocess. - */ -const char *expand_list_objects_filter_spec( - struct list_objects_filter_options *filter); - -/* - * Returns the filter spec string more or less in the form as the user - * entered it. This form of the filter_spec can be used in user-facing - * messages. Returns a string owned by the list_objects_filter_options - * object. + * This form should be used instead of the raw filter_spec field when + * communicating with a remote process or subprocess. */ -const char *list_objects_filter_spec( - struct list_objects_filter_options *filter); +void expand_list_objects_filter_spec( + const struct list_objects_filter_options *filter, + struct strbuf *expanded_spec); void list_objects_filter_release( struct list_objects_filter_options *filter_options); @@ -118,9 +85,8 @@ static inline void list_objects_filter_set_no_filter( void partial_clone_register( const char *remote, - struct list_objects_filter_options *filter_options); + const struct list_objects_filter_options *filter_options); void partial_clone_get_default_filter_spec( - struct list_objects_filter_options *filter_options, - const char *remote); + struct list_objects_filter_options *filter_options); #endif /* LIST_OBJECTS_FILTER_OPTIONS_H */ diff --git a/third_party/git/list-objects-filter.c b/third_party/git/list-objects-filter.c index 1e8d4e763d..36e1f774bc 100644 --- a/third_party/git/list-objects-filter.c +++ b/third_party/git/list-objects-filter.c @@ -26,46 +26,11 @@ */ #define FILTER_SHOWN_BUT_REVISIT (1<<21) -struct subfilter { - struct filter *filter; - struct oidset seen; - struct oidset omits; - struct object_id skip_tree; - unsigned is_skipping_tree : 1; -}; - -struct filter { - enum list_objects_filter_result (*filter_object_fn)( - struct repository *r, - enum list_objects_filter_situation filter_situation, - struct object *obj, - const char *pathname, - const char *filename, - struct oidset *omits, - void *filter_data); - - /* - * Optional. If this function is supplied and the filter needs - * to collect omits, then this function is called once before - * free_fn is called. - * - * This is required because the following two conditions hold: - * - * a. A tree filter can add and remove objects as an object - * graph is traversed. - * b. A combine filter's omit set is the union of all its - * subfilters, which may include tree: filters. - * - * As such, the omits sets must be separate sets, and can only - * be unioned after the traversal is completed. - */ - void (*finalize_omits_fn)(struct oidset *omits, void *filter_data); - - void (*free_fn)(void *filter_data); - - void *filter_data; - - /* If non-NULL, the filter collects a list of the omitted OIDs here. */ +/* + * A filter for list-objects to omit ALL blobs from the traversal. + * And to OPTIONALLY collect a list of the omitted OIDs. + */ +struct filter_blobs_none_data { struct oidset *omits; }; @@ -75,9 +40,10 @@ static enum list_objects_filter_result filter_blobs_none( struct object *obj, const char *pathname, const char *filename, - struct oidset *omits, void *filter_data_) { + struct filter_blobs_none_data *filter_data = filter_data_; + switch (filter_situation) { default: BUG("unknown filter_situation: %d", filter_situation); @@ -95,18 +61,24 @@ static enum list_objects_filter_result filter_blobs_none( assert(obj->type == OBJ_BLOB); assert((obj->flags & SEEN) == 0); - if (omits) - oidset_insert(omits, &obj->oid); + if (filter_data->omits) + oidset_insert(filter_data->omits, &obj->oid); return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */ } } -static void filter_blobs_none__init( +static void *filter_blobs_none__init( + struct oidset *omitted, struct list_objects_filter_options *filter_options, - struct filter *filter) + filter_object_fn *filter_fn, + filter_free_fn *filter_free_fn) { - filter->filter_object_fn = filter_blobs_none; - filter->free_fn = free; + struct filter_blobs_none_data *d = xcalloc(1, sizeof(*d)); + d->omits = omitted; + + *filter_fn = filter_blobs_none; + *filter_free_fn = free; + return d; } /* @@ -114,6 +86,8 @@ static void filter_blobs_none__init( * Can OPTIONALLY collect a list of the omitted OIDs. */ struct filter_trees_depth_data { + struct oidset *omits; + /* * Maps trees to the minimum depth at which they were seen. It is not * necessary to re-traverse a tree at deeper or equal depths than it has @@ -136,16 +110,16 @@ struct seen_map_entry { /* Returns 1 if the oid was in the omits set before it was invoked. */ static int filter_trees_update_omits( struct object *obj, - struct oidset *omits, + struct filter_trees_depth_data *filter_data, int include_it) { - if (!omits) + if (!filter_data->omits) return 0; if (include_it) - return oidset_remove(omits, &obj->oid); + return oidset_remove(filter_data->omits, &obj->oid); else - return oidset_insert(omits, &obj->oid); + return oidset_insert(filter_data->omits, &obj->oid); } static enum list_objects_filter_result filter_trees_depth( @@ -154,7 +128,6 @@ static enum list_objects_filter_result filter_trees_depth( struct object *obj, const char *pathname, const char *filename, - struct oidset *omits, void *filter_data_) { struct filter_trees_depth_data *filter_data = filter_data_; @@ -179,7 +152,7 @@ static enum list_objects_filter_result filter_trees_depth( return LOFR_ZERO; case LOFS_BLOB: - filter_trees_update_omits(obj, omits, include_it); + filter_trees_update_omits(obj, filter_data, include_it); return include_it ? LOFR_MARK_SEEN | LOFR_DO_SHOW : LOFR_ZERO; case LOFS_BEGIN_TREE: @@ -200,12 +173,12 @@ static enum list_objects_filter_result filter_trees_depth( filter_res = LOFR_SKIP_TREE; } else { int been_omitted = filter_trees_update_omits( - obj, omits, include_it); + obj, filter_data, include_it); seen_info->depth = filter_data->current_depth; if (include_it) filter_res = LOFR_DO_SHOW; - else if (omits && !been_omitted) + else if (filter_data->omits && !been_omitted) /* * Must update omit information of children * recursively; they have not been omitted yet. @@ -228,18 +201,21 @@ static void filter_trees_free(void *filter_data) { free(d); } -static void filter_trees_depth__init( +static void *filter_trees_depth__init( + struct oidset *omitted, struct list_objects_filter_options *filter_options, - struct filter *filter) + filter_object_fn *filter_fn, + filter_free_fn *filter_free_fn) { struct filter_trees_depth_data *d = xcalloc(1, sizeof(*d)); + d->omits = omitted; oidmap_init(&d->seen_at_depth, 0); d->exclude_depth = filter_options->tree_exclude_depth; d->current_depth = 0; - filter->filter_data = d; - filter->filter_object_fn = filter_trees_depth; - filter->free_fn = filter_trees_free; + *filter_fn = filter_trees_depth; + *filter_free_fn = filter_trees_free; + return d; } /* @@ -247,6 +223,7 @@ static void filter_trees_depth__init( * And to OPTIONALLY collect a list of the omitted OIDs. */ struct filter_blobs_limit_data { + struct oidset *omits; unsigned long max_bytes; }; @@ -256,7 +233,6 @@ static enum list_objects_filter_result filter_blobs_limit( struct object *obj, const char *pathname, const char *filename, - struct oidset *omits, void *filter_data_) { struct filter_blobs_limit_data *filter_data = filter_data_; @@ -294,27 +270,30 @@ static enum list_objects_filter_result filter_blobs_limit( if (object_length < filter_data->max_bytes) goto include_it; - if (omits) - oidset_insert(omits, &obj->oid); + if (filter_data->omits) + oidset_insert(filter_data->omits, &obj->oid); return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */ } include_it: - if (omits) - oidset_remove(omits, &obj->oid); + if (filter_data->omits) + oidset_remove(filter_data->omits, &obj->oid); return LOFR_MARK_SEEN | LOFR_DO_SHOW; } -static void filter_blobs_limit__init( +static void *filter_blobs_limit__init( + struct oidset *omitted, struct list_objects_filter_options *filter_options, - struct filter *filter) + filter_object_fn *filter_fn, + filter_free_fn *filter_free_fn) { struct filter_blobs_limit_data *d = xcalloc(1, sizeof(*d)); + d->omits = omitted; d->max_bytes = filter_options->blob_limit_value; - filter->filter_data = d; - filter->filter_object_fn = filter_blobs_limit; - filter->free_fn = free; + *filter_fn = filter_blobs_limit; + *filter_free_fn = free; + return d; } /* @@ -328,12 +307,12 @@ static void filter_blobs_limit__init( */ struct frame { /* - * default_match is the usual default include/exclude value that + * defval is the usual default include/exclude value that * should be inherited as we recurse into directories based * upon pattern matching of the directory itself or of a * containing directory. */ - enum pattern_match_result default_match; + int defval; /* * 1 if the directory (recursively) contains any provisionally @@ -347,7 +326,8 @@ struct frame { }; struct filter_sparse_data { - struct pattern_list pl; + struct oidset *omits; + struct exclude_list el; size_t nr, alloc; struct frame *array_frame; @@ -359,13 +339,11 @@ static enum list_objects_filter_result filter_sparse( struct object *obj, const char *pathname, const char *filename, - struct oidset *omits, void *filter_data_) { struct filter_sparse_data *filter_data = filter_data_; - int dtype; + int val, dtype; struct frame *frame; - enum pattern_match_result match; switch (filter_situation) { default: @@ -374,15 +352,15 @@ static enum list_objects_filter_result filter_sparse( case LOFS_BEGIN_TREE: assert(obj->type == OBJ_TREE); dtype = DT_DIR; - match = path_matches_pattern_list(pathname, strlen(pathname), - filename, &dtype, &filter_data->pl, - r->index); - if (match == UNDECIDED) - match = filter_data->array_frame[filter_data->nr - 1].default_match; + val = is_excluded_from_list(pathname, strlen(pathname), + filename, &dtype, &filter_data->el, + r->index); + if (val < 0) + val = filter_data->array_frame[filter_data->nr - 1].defval; ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1, filter_data->alloc); - filter_data->array_frame[filter_data->nr].default_match = match; + filter_data->array_frame[filter_data->nr].defval = val; filter_data->array_frame[filter_data->nr].child_prov_omit = 0; filter_data->nr++; @@ -436,14 +414,14 @@ static enum list_objects_filter_result filter_sparse( frame = &filter_data->array_frame[filter_data->nr - 1]; dtype = DT_REG; - match = path_matches_pattern_list(pathname, strlen(pathname), - filename, &dtype, &filter_data->pl, + val = is_excluded_from_list(pathname, strlen(pathname), + filename, &dtype, &filter_data->el, r->index); - if (match == UNDECIDED) - match = frame->default_match; - if (match == MATCHED) { - if (omits) - oidset_remove(omits, &obj->oid); + if (val < 0) + val = frame->defval; + if (val > 0) { + if (filter_data->omits) + oidset_remove(filter_data->omits, &obj->oid); return LOFR_MARK_SEEN | LOFR_DO_SHOW; } @@ -457,8 +435,8 @@ static enum list_objects_filter_result filter_sparse( * Leave the LOFR_ bits unset so that if the blob appears * again in the traversal, we will be asked again. */ - if (omits) - oidset_insert(omits, &obj->oid); + if (filter_data->omits) + oidset_insert(filter_data->omits, &obj->oid); /* * Remember that at least 1 blob in this tree was @@ -478,169 +456,33 @@ static void filter_sparse_free(void *filter_data) free(d); } -static void filter_sparse_oid__init( +static void *filter_sparse_oid__init( + struct oidset *omitted, struct list_objects_filter_options *filter_options, - struct filter *filter) + filter_object_fn *filter_fn, + filter_free_fn *filter_free_fn) { struct filter_sparse_data *d = xcalloc(1, sizeof(*d)); - struct object_context oc; - struct object_id sparse_oid; - - if (get_oid_with_context(the_repository, - filter_options->sparse_oid_name, - GET_OID_BLOB, &sparse_oid, &oc)) - die(_("unable to access sparse blob in '%s'"), - filter_options->sparse_oid_name); - if (add_patterns_from_blob_to_list(&sparse_oid, "", 0, &d->pl) < 0) - die(_("unable to parse sparse filter data in %s"), - oid_to_hex(&sparse_oid)); + d->omits = omitted; + if (add_excludes_from_blob_to_list(filter_options->sparse_oid_value, + NULL, 0, &d->el) < 0) + die("could not load filter specification"); ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc); - d->array_frame[d->nr].default_match = 0; /* default to include */ + d->array_frame[d->nr].defval = 0; /* default to include */ d->array_frame[d->nr].child_prov_omit = 0; d->nr++; - filter->filter_data = d; - filter->filter_object_fn = filter_sparse; - filter->free_fn = filter_sparse_free; -} - -/* A filter which only shows objects shown by all sub-filters. */ -struct combine_filter_data { - struct subfilter *sub; - size_t nr; -}; - -static enum list_objects_filter_result process_subfilter( - struct repository *r, - enum list_objects_filter_situation filter_situation, - struct object *obj, - const char *pathname, - const char *filename, - struct subfilter *sub) -{ - enum list_objects_filter_result result; - - /* - * Check and update is_skipping_tree before oidset_contains so - * that is_skipping_tree gets unset even when the object is - * marked as seen. As of this writing, no filter uses - * LOFR_MARK_SEEN on trees that also uses LOFR_SKIP_TREE, so the - * ordering is only theoretically important. Be cautious if you - * change the order of the below checks and more filters have - * been added! - */ - if (sub->is_skipping_tree) { - if (filter_situation == LOFS_END_TREE && - oideq(&obj->oid, &sub->skip_tree)) - sub->is_skipping_tree = 0; - else - return LOFR_ZERO; - } - if (oidset_contains(&sub->seen, &obj->oid)) - return LOFR_ZERO; - - result = list_objects_filter__filter_object( - r, filter_situation, obj, pathname, filename, sub->filter); - - if (result & LOFR_MARK_SEEN) - oidset_insert(&sub->seen, &obj->oid); - - if (result & LOFR_SKIP_TREE) { - sub->is_skipping_tree = 1; - sub->skip_tree = obj->oid; - } - - return result; + *filter_fn = filter_sparse; + *filter_free_fn = filter_sparse_free; + return d; } -static enum list_objects_filter_result filter_combine( - struct repository *r, - enum list_objects_filter_situation filter_situation, - struct object *obj, - const char *pathname, - const char *filename, - struct oidset *omits, - void *filter_data) -{ - struct combine_filter_data *d = filter_data; - enum list_objects_filter_result combined_result = - LOFR_DO_SHOW | LOFR_MARK_SEEN | LOFR_SKIP_TREE; - size_t sub; - - for (sub = 0; sub < d->nr; sub++) { - enum list_objects_filter_result sub_result = process_subfilter( - r, filter_situation, obj, pathname, filename, - &d->sub[sub]); - if (!(sub_result & LOFR_DO_SHOW)) - combined_result &= ~LOFR_DO_SHOW; - if (!(sub_result & LOFR_MARK_SEEN)) - combined_result &= ~LOFR_MARK_SEEN; - if (!d->sub[sub].is_skipping_tree) - combined_result &= ~LOFR_SKIP_TREE; - } - - return combined_result; -} - -static void filter_combine__free(void *filter_data) -{ - struct combine_filter_data *d = filter_data; - size_t sub; - for (sub = 0; sub < d->nr; sub++) { - list_objects_filter__free(d->sub[sub].filter); - oidset_clear(&d->sub[sub].seen); - if (d->sub[sub].omits.set.size) - BUG("expected oidset to be cleared already"); - } - free(d->sub); -} - -static void add_all(struct oidset *dest, struct oidset *src) { - struct oidset_iter iter; - struct object_id *src_oid; - - oidset_iter_init(src, &iter); - while ((src_oid = oidset_iter_next(&iter)) != NULL) - oidset_insert(dest, src_oid); -} - -static void filter_combine__finalize_omits( - struct oidset *omits, - void *filter_data) -{ - struct combine_filter_data *d = filter_data; - size_t sub; - - for (sub = 0; sub < d->nr; sub++) { - add_all(omits, &d->sub[sub].omits); - oidset_clear(&d->sub[sub].omits); - } -} - -static void filter_combine__init( - struct list_objects_filter_options *filter_options, - struct filter* filter) -{ - struct combine_filter_data *d = xcalloc(1, sizeof(*d)); - size_t sub; - - d->nr = filter_options->sub_nr; - d->sub = xcalloc(d->nr, sizeof(*d->sub)); - for (sub = 0; sub < d->nr; sub++) - d->sub[sub].filter = list_objects_filter__init( - filter->omits ? &d->sub[sub].omits : NULL, - &filter_options->sub[sub]); - - filter->filter_data = d; - filter->filter_object_fn = filter_combine; - filter->free_fn = filter_combine__free; - filter->finalize_omits_fn = filter_combine__finalize_omits; -} - -typedef void (*filter_init_fn)( +typedef void *(*filter_init_fn)( + struct oidset *omitted, struct list_objects_filter_options *filter_options, - struct filter *filter); + filter_object_fn *filter_fn, + filter_free_fn *filter_free_fn); /* * Must match "enum list_objects_filter_choice". @@ -651,14 +493,14 @@ static filter_init_fn s_filters[] = { filter_blobs_limit__init, filter_trees_depth__init, filter_sparse_oid__init, - filter_combine__init, }; -struct filter *list_objects_filter__init( +void *list_objects_filter__init( struct oidset *omitted, - struct list_objects_filter_options *filter_options) + struct list_objects_filter_options *filter_options, + filter_object_fn *filter_fn, + filter_free_fn *filter_free_fn) { - struct filter *filter; filter_init_fn init_fn; assert((sizeof(s_filters) / sizeof(s_filters[0])) == LOFC__COUNT); @@ -668,44 +510,10 @@ struct filter *list_objects_filter__init( filter_options->choice); init_fn = s_filters[filter_options->choice]; - if (!init_fn) - return NULL; - - filter = xcalloc(1, sizeof(*filter)); - filter->omits = omitted; - init_fn(filter_options, filter); - return filter; -} - -enum list_objects_filter_result list_objects_filter__filter_object( - struct repository *r, - enum list_objects_filter_situation filter_situation, - struct object *obj, - const char *pathname, - const char *filename, - struct filter *filter) -{ - if (filter && (obj->flags & NOT_USER_GIVEN)) - return filter->filter_object_fn(r, filter_situation, obj, - pathname, filename, - filter->omits, - filter->filter_data); - /* - * No filter is active or user gave object explicitly. In this case, - * always show the object (except when LOFS_END_TREE, since this tree - * had already been shown when LOFS_BEGIN_TREE). - */ - if (filter_situation == LOFS_END_TREE) - return 0; - return LOFR_MARK_SEEN | LOFR_DO_SHOW; -} - -void list_objects_filter__free(struct filter *filter) -{ - if (!filter) - return; - if (filter->finalize_omits_fn && filter->omits) - filter->finalize_omits_fn(filter->omits, filter->filter_data); - filter->free_fn(filter->filter_data); - free(filter); + if (init_fn) + return init_fn(omitted, filter_options, + filter_fn, filter_free_fn); + *filter_fn = NULL; + *filter_free_fn = NULL; + return NULL; } diff --git a/third_party/git/list-objects-filter.h b/third_party/git/list-objects-filter.h index cfd784e203..1d45a4ad57 100644 --- a/third_party/git/list-objects-filter.h +++ b/third_party/git/list-objects-filter.h @@ -60,36 +60,30 @@ enum list_objects_filter_situation { LOFS_BLOB }; -struct filter; - -/* - * Constructor for the set of defined list-objects filters. - * The `omitted` set is optional. It is populated with objects that the - * filter excludes. This set should not be considered finalized until - * after list_objects_filter__free is called on the returned `struct - * filter *`. - */ -struct filter *list_objects_filter__init( - struct oidset *omitted, - struct list_objects_filter_options *filter_options); - -/* - * Lets `filter` decide how to handle the `obj`. If `filter` is NULL, this - * function behaves as expected if no filter is configured: all objects are - * included. - */ -enum list_objects_filter_result list_objects_filter__filter_object( +typedef enum list_objects_filter_result (*filter_object_fn)( struct repository *r, enum list_objects_filter_situation filter_situation, struct object *obj, const char *pathname, const char *filename, - struct filter *filter); + void *filter_data); + +typedef void (*filter_free_fn)(void *filter_data); /* - * Destroys `filter` and finalizes the `omitted` set, if present. Does - * nothing if `filter` is null. + * Constructor for the set of defined list-objects filters. + * Returns a generic "void *filter_data". + * + * The returned "filter_fn" will be used by traverse_commit_list() + * to filter the results. + * + * The returned "filter_free_fn" is a destructor for the + * filter_data. */ -void list_objects_filter__free(struct filter *filter); +void *list_objects_filter__init( + struct oidset *omitted, + struct list_objects_filter_options *filter_options, + filter_object_fn *filter_fn, + filter_free_fn *filter_free_fn); #endif /* LIST_OBJECTS_FILTER_H */ diff --git a/third_party/git/list-objects.c b/third_party/git/list-objects.c index e19589baa0..b5651ddd5b 100644 --- a/third_party/git/list-objects.c +++ b/third_party/git/list-objects.c @@ -18,7 +18,8 @@ struct traversal_context { show_object_fn show_object; show_commit_fn show_commit; void *show_data; - struct filter *filter; + filter_object_fn filter_fn; + void *filter_data; }; static void process_blob(struct traversal_context *ctx, @@ -28,7 +29,7 @@ static void process_blob(struct traversal_context *ctx, { struct object *obj = &blob->object; size_t pathlen; - enum list_objects_filter_result r; + enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW; if (!ctx->revs->blob_objects) return; @@ -53,10 +54,11 @@ static void process_blob(struct traversal_context *ctx, pathlen = path->len; strbuf_addstr(path, name); - r = list_objects_filter__filter_object(ctx->revs->repo, - LOFS_BLOB, obj, - path->buf, &path->buf[pathlen], - ctx->filter); + if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) + r = ctx->filter_fn(ctx->revs->repo, + LOFS_BLOB, obj, + path->buf, &path->buf[pathlen], + ctx->filter_data); if (r & LOFR_MARK_SEEN) obj->flags |= SEEN; if (r & LOFR_DO_SHOW) @@ -155,7 +157,7 @@ static void process_tree(struct traversal_context *ctx, struct object *obj = &tree->object; struct rev_info *revs = ctx->revs; int baselen = base->len; - enum list_objects_filter_result r; + enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW; int failed_parse; if (!revs->tree_objects) @@ -184,10 +186,11 @@ static void process_tree(struct traversal_context *ctx, } strbuf_addstr(base, name); - r = list_objects_filter__filter_object(ctx->revs->repo, - LOFS_BEGIN_TREE, obj, - base->buf, &base->buf[baselen], - ctx->filter); + if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) + r = ctx->filter_fn(ctx->revs->repo, + LOFS_BEGIN_TREE, obj, + base->buf, &base->buf[baselen], + ctx->filter_data); if (r & LOFR_MARK_SEEN) obj->flags |= SEEN; if (r & LOFR_DO_SHOW) @@ -200,14 +203,16 @@ static void process_tree(struct traversal_context *ctx, else if (!failed_parse) process_tree_contents(ctx, tree, base); - r = list_objects_filter__filter_object(ctx->revs->repo, - LOFS_END_TREE, obj, - base->buf, &base->buf[baselen], - ctx->filter); - if (r & LOFR_MARK_SEEN) - obj->flags |= SEEN; - if (r & LOFR_DO_SHOW) - ctx->show_object(obj, base->buf, ctx->show_data); + if ((obj->flags & NOT_USER_GIVEN) && ctx->filter_fn) { + r = ctx->filter_fn(ctx->revs->repo, + LOFS_END_TREE, obj, + base->buf, &base->buf[baselen], + ctx->filter_data); + if (r & LOFR_MARK_SEEN) + obj->flags |= SEEN; + if (r & LOFR_DO_SHOW) + ctx->show_object(obj, base->buf, ctx->show_data); + } strbuf_setlen(base, baselen); free_tree_buffer(tree); @@ -365,9 +370,7 @@ static void do_traverse(struct traversal_context *ctx) * an uninteresting boundary commit may not have its tree * parsed yet, but we are not going to show them anyway */ - if (!ctx->revs->tree_objects) - ; /* do not bother loading tree */ - else if (get_commit_tree(commit)) { + if (get_commit_tree(commit)) { struct tree *tree = get_commit_tree(commit); tree->object.flags |= NOT_USER_GIVEN; add_pending_tree(ctx->revs, tree); @@ -399,7 +402,8 @@ void traverse_commit_list(struct rev_info *revs, ctx.show_commit = show_commit; ctx.show_object = show_object; ctx.show_data = show_data; - ctx.filter = NULL; + ctx.filter_fn = NULL; + ctx.filter_data = NULL; do_traverse(&ctx); } @@ -412,12 +416,17 @@ void traverse_commit_list_filtered( struct oidset *omitted) { struct traversal_context ctx; + filter_free_fn filter_free_fn = NULL; ctx.revs = revs; ctx.show_object = show_object; ctx.show_commit = show_commit; ctx.show_data = show_data; - ctx.filter = list_objects_filter__init(omitted, filter_options); + ctx.filter_fn = NULL; + + ctx.filter_data = list_objects_filter__init(omitted, filter_options, + &ctx.filter_fn, &filter_free_fn); do_traverse(&ctx); - list_objects_filter__free(ctx.filter); + if (ctx.filter_data && filter_free_fn) + filter_free_fn(ctx.filter_data); } diff --git a/third_party/git/ll-merge.c b/third_party/git/ll-merge.c index d65a8971db..5b8d46aede 100644 --- a/third_party/git/ll-merge.c +++ b/third_party/git/ll-merge.c @@ -32,20 +32,6 @@ struct ll_merge_driver { char *cmdline; }; -static struct attr_check *merge_attributes; -static struct attr_check *load_merge_attributes(void) -{ - if (!merge_attributes) - merge_attributes = attr_check_initl("merge", "conflict-marker-size", NULL); - return merge_attributes; -} - -void reset_merge_attributes(void) -{ - attr_check_free(merge_attributes); - merge_attributes = NULL; -} - /* * Built-in low-levels */ @@ -368,7 +354,7 @@ int ll_merge(mmbuffer_t *result_buf, struct index_state *istate, const struct ll_merge_options *opts) { - struct attr_check *check = load_merge_attributes(); + static struct attr_check *check; static const struct ll_merge_options default_opts; const char *ll_driver_name = NULL; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; @@ -383,6 +369,9 @@ int ll_merge(mmbuffer_t *result_buf, normalize_file(theirs, path, istate); } + if (!check) + check = attr_check_initl("merge", "conflict-marker-size", NULL); + git_check_attr(istate, path, check); ll_driver_name = check->items[0].value; if (check->items[1].value) { diff --git a/third_party/git/ll-merge.h b/third_party/git/ll-merge.h index aceb1b2413..b9e2af1c88 100644 --- a/third_party/git/ll-merge.h +++ b/third_party/git/ll-merge.h @@ -7,87 +7,16 @@ #include "xdiff/xdiff.h" -/** - * - * Calling sequence: - * ---------------- - * - * - Prepare a `struct ll_merge_options` to record options. - * If you have no special requests, skip this and pass `NULL` - * as the `opts` parameter to use the default options. - * - * - Allocate an mmbuffer_t variable for the result. - * - * - Allocate and fill variables with the file's original content - * and two modified versions (using `read_mmfile`, for example). - * - * - Call `ll_merge()`. - * - * - Read the merged content from `result_buf.ptr` and `result_buf.size`. - * - * - Release buffers when finished. A simple - * `free(ancestor.ptr); free(ours.ptr); free(theirs.ptr); - * free(result_buf.ptr);` will do. - * - * If the modifications do not merge cleanly, `ll_merge` will return a - * nonzero value and `result_buf` will generally include a description of - * the conflict bracketed by markers such as the traditional `<<<<<<<` - * and `>>>>>>>`. - * - * The `ancestor_label`, `our_label`, and `their_label` parameters are - * used to label the different sides of a conflict if the merge driver - * supports this. - */ - - struct index_state; -/** - * This describes the set of options the calling program wants to affect - * the operation of a low-level (single file) merge. - */ struct ll_merge_options { - - /** - * Behave as though this were part of a merge between common ancestors in - * a recursive merge (merges of binary files may need to be handled - * differently in such cases, for example). If a helper program is - * specified by the `[merge "<driver>"] recursive` configuration, it will - * be used. - */ unsigned virtual_ancestor : 1; - - /** - * Resolve local conflicts automatically in favor of one side or the other - * (as in 'git merge-file' `--ours`/`--theirs`/`--union`). Can be `0`, - * `XDL_MERGE_FAVOR_OURS`, `XDL_MERGE_FAVOR_THEIRS`, - * or `XDL_MERGE_FAVOR_UNION`. - */ - unsigned variant : 2; - - /** - * Resmudge and clean the "base", "theirs" and "ours" files before merging. - * Use this when the merge is likely to have overlapped with a change in - * smudge/clean or end-of-line normalization rules. - */ + unsigned variant : 2; /* favor ours, favor theirs, or union merge */ unsigned renormalize : 1; - - /** - * Increase the length of conflict markers so that nested conflicts - * can be differentiated. - */ unsigned extra_marker_size; - - /* Extra xpparam_t flags as defined in xdiff/xdiff.h. */ long xdl_opts; }; -/** - * Perform a three-way single-file merge in core. This is a thin wrapper - * around `xdl_merge` that takes the path and any merge backend specified in - * `.gitattributes` or `.git/info/attributes` into account. - * Returns 0 for a clean merge. - */ int ll_merge(mmbuffer_t *result_buf, const char *path, mmfile_t *ancestor, const char *ancestor_label, @@ -97,6 +26,5 @@ int ll_merge(mmbuffer_t *result_buf, const struct ll_merge_options *opts); int ll_merge_marker_size(struct index_state *istate, const char *path); -void reset_merge_attributes(void); #endif diff --git a/third_party/git/log-tree.c b/third_party/git/log-tree.c index 52127427ff..1e56df62a7 100644 --- a/third_party/git/log-tree.c +++ b/third_party/git/log-tree.c @@ -77,7 +77,6 @@ void add_name_decoration(enum decoration_type type, const char *name, struct obj const struct name_decoration *get_name_decoration(const struct object *obj) { - load_ref_decorations(NULL, DECORATE_SHORT_REFS); return lookup_decoration(&name_decoration, obj); } @@ -500,8 +499,7 @@ static int show_one_mergetag(struct commit *commit, int status, nth; size_t payload_size, gpg_message_offset; - hash_object_file(the_hash_algo, extra->value, extra->len, - type_name(OBJ_TAG), &oid); + hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid); tag = lookup_tag(the_repository, &oid); if (!tag) return -1; /* error message already given */ @@ -516,7 +514,7 @@ static int show_one_mergetag(struct commit *commit, "merged tag '%s'\n", tag->tag); else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0) strbuf_addf(&verify_message, "tag %s names a non-parent %s\n", - tag->tag, oid_to_hex(&tag->tagged->oid)); + tag->tag, tag->tagged->oid.hash); else strbuf_addf(&verify_message, "parent #%d, tagged '%s'\n", nth + 1, tag->tag); @@ -679,7 +677,9 @@ void show_log(struct rev_info *opt) raw = (opt->commit_format == CMIT_FMT_USERFORMAT); format_display_notes(&commit->object.oid, ¬ebuf, get_log_output_encoding(), raw); - ctx.notes_message = strbuf_detach(¬ebuf, NULL); + ctx.notes_message = notebuf.len + ? strbuf_detach(¬ebuf, NULL) + : xcalloc(1, 1); } /* @@ -771,7 +771,7 @@ void show_log(struct rev_info *opt) opts.use_color = opt->diffopt.use_color; diff_setup_done(&opts); show_range_diff(opt->rdiff1, opt->rdiff2, - opt->creation_factor, 1, &opts, NULL); + opt->creation_factor, 1, &opts); memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); } diff --git a/third_party/git/mailinfo.c b/third_party/git/mailinfo.c index 742fa376ab..b395adbdf2 100644 --- a/third_party/git/mailinfo.c +++ b/third_party/git/mailinfo.c @@ -19,7 +19,8 @@ static void cleanup_space(struct strbuf *sb) static void get_sane_name(struct strbuf *out, struct strbuf *name, struct strbuf *email) { struct strbuf *src = name; - if (name->len < 3 || 60 < name->len || strpbrk(name->buf, "@<>")) + if (name->len < 3 || 60 < name->len || strchr(name->buf, '@') || + strchr(name->buf, '<') || strchr(name->buf, '>')) src = email; else if (name == out) return; @@ -253,7 +254,7 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line) mi->delsp = has_attr_value(line->buf, "delsp=", "yes"); if (slurp_attr(line->buf, "boundary=", boundary)) { - strbuf_insertstr(boundary, 0, "--"); + strbuf_insert(boundary, 0, "--", 2); if (++mi->content_top >= &mi->content[MAX_BOUNDARIES]) { error("Too many boundaries to handle"); mi->input_error = -1; @@ -345,17 +346,11 @@ static const char *header[MAX_HDR_PARSED] = { "From","Subject","Date", }; -static inline int skip_header(const struct strbuf *line, const char *hdr, - const char **outval) +static inline int cmp_header(const struct strbuf *line, const char *hdr) { - const char *val; - if (!skip_iprefix(line->buf, hdr, &val) || - *val++ != ':') - return 0; - while (isspace(*val)) - val++; - *outval = val; - return 1; + int len = strlen(hdr); + return !strncasecmp(line->buf, hdr, len) && line->len > len && + line->buf[len] == ':' && isspace(line->buf[len + 1]); } static int is_format_patch_separator(const char *line, int len) @@ -548,36 +543,22 @@ release_return: mi->input_error = -1; } -/* - * Returns true if "line" contains a header matching "hdr", in which case "val" - * will contain the value of the header with any RFC2047 B and Q encoding - * unwrapped, and optionally normalize the meta information to utf8. - */ -static int parse_header(const struct strbuf *line, - const char *hdr, - struct mailinfo *mi, - struct strbuf *val) -{ - const char *val_str; - - if (!skip_header(line, hdr, &val_str)) - return 0; - strbuf_addstr(val, val_str); - decode_header(mi, val); - return 1; -} - static int check_header(struct mailinfo *mi, const struct strbuf *line, struct strbuf *hdr_data[], int overwrite) { - int i, ret = 0; + int i, ret = 0, len; struct strbuf sb = STRBUF_INIT; /* search for the interesting parts */ for (i = 0; header[i]; i++) { - if ((!hdr_data[i] || overwrite) && - parse_header(line, header[i], mi, &sb)) { + int len = strlen(header[i]); + if ((!hdr_data[i] || overwrite) && cmp_header(line, header[i])) { + /* Unwrap inline B and Q encoding, and optionally + * normalize the meta information to utf8. + */ + strbuf_add(&sb, line->buf + len + 2, line->len - len - 2); + decode_header(mi, &sb); handle_header(&hdr_data[i], &sb); ret = 1; goto check_header_out; @@ -585,17 +566,27 @@ static int check_header(struct mailinfo *mi, } /* Content stuff */ - if (parse_header(line, "Content-Type", mi, &sb)) { + if (cmp_header(line, "Content-Type")) { + len = strlen("Content-Type: "); + strbuf_add(&sb, line->buf + len, line->len - len); + decode_header(mi, &sb); + strbuf_insert(&sb, 0, "Content-Type: ", len); handle_content_type(mi, &sb); ret = 1; goto check_header_out; } - if (parse_header(line, "Content-Transfer-Encoding", mi, &sb)) { + if (cmp_header(line, "Content-Transfer-Encoding")) { + len = strlen("Content-Transfer-Encoding: "); + strbuf_add(&sb, line->buf + len, line->len - len); + decode_header(mi, &sb); handle_content_transfer_encoding(mi, &sb); ret = 1; goto check_header_out; } - if (parse_header(line, "Message-Id", mi, &sb)) { + if (cmp_header(line, "Message-Id")) { + len = strlen("Message-Id: "); + strbuf_add(&sb, line->buf + len, line->len - len); + decode_header(mi, &sb); if (mi->add_message_id) mi->message_id = strbuf_detach(&sb, NULL); ret = 1; @@ -616,9 +607,8 @@ static int is_inbody_header(const struct mailinfo *mi, const struct strbuf *line) { int i; - const char *val; for (i = 0; header[i]; i++) - if (!mi->s_hdr_data[i] && skip_header(line, header[i], &val)) + if (!mi->s_hdr_data[i] && cmp_header(line, header[i])) return 1; return 0; } diff --git a/third_party/git/merge-recursive.c b/third_party/git/merge-recursive.c index 7a4e6f20fa..6b812d67e3 100644 --- a/third_party/git/merge-recursive.c +++ b/third_party/git/merge-recursive.c @@ -4,40 +4,30 @@ * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 */ #include "cache.h" -#include "merge-recursive.h" - +#include "config.h" #include "advice.h" -#include "alloc.h" -#include "attr.h" -#include "blob.h" -#include "builtin.h" +#include "lockfile.h" #include "cache-tree.h" +#include "object-store.h" +#include "repository.h" #include "commit.h" -#include "commit-reach.h" -#include "config.h" +#include "blob.h" +#include "builtin.h" +#include "tree-walk.h" #include "diff.h" #include "diffcore.h" -#include "dir.h" -#include "ll-merge.h" -#include "lockfile.h" -#include "object-store.h" -#include "repository.h" -#include "revision.h" -#include "string-list.h" -#include "submodule.h" #include "tag.h" -#include "tree-walk.h" +#include "alloc.h" #include "unpack-trees.h" +#include "string-list.h" #include "xdiff-interface.h" - -struct merge_options_internal { - int call_depth; - int needed_rename_limit; - struct hashmap current_file_dir_set; - struct string_list df_conflict_file_set; - struct unpack_trees_options unpack_opts; - struct index_state orig_index; -}; +#include "ll-merge.h" +#include "attr.h" +#include "merge-recursive.h" +#include "dir.h" +#include "submodule.h" +#include "revision.h" +#include "commit-reach.h" struct path_hashmap_entry { struct hashmap_entry e; @@ -45,16 +35,14 @@ struct path_hashmap_entry { }; static int path_hashmap_cmp(const void *cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *keydata) { - const struct path_hashmap_entry *a, *b; + const struct path_hashmap_entry *a = entry; + const struct path_hashmap_entry *b = entry_or_key; const char *key = keydata; - a = container_of(eptr, const struct path_hashmap_entry, e); - b = container_of(entry_or_key, const struct path_hashmap_entry, e); - if (ignore_case) return strcasecmp(a->path, key ? key : b->path); else @@ -66,24 +54,6 @@ static unsigned int path_hash(const char *path) return ignore_case ? strihash(path) : strhash(path); } -/* - * For dir_rename_entry, directory names are stored as a full path from the - * toplevel of the repository and do not include a trailing '/'. Also: - * - * dir: original name of directory being renamed - * non_unique_new_dir: if true, could not determine new_dir - * new_dir: final name of directory being renamed - * possible_new_dirs: temporary used to help determine new_dir; see comments - * in get_directory_renames() for details - */ -struct dir_rename_entry { - struct hashmap_entry ent; - char *dir; - unsigned non_unique_new_dir:1; - struct strbuf new_dir; - struct string_list possible_new_dirs; -}; - static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, char *dir) { @@ -91,20 +61,18 @@ static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, if (dir == NULL) return NULL; - hashmap_entry_init(&key.ent, strhash(dir)); + hashmap_entry_init(&key, strhash(dir)); key.dir = dir; - return hashmap_get_entry(hashmap, &key, ent, NULL); + return hashmap_get(hashmap, &key, NULL); } static int dir_rename_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct dir_rename_entry *e1, *e2; - - e1 = container_of(eptr, const struct dir_rename_entry, ent); - e2 = container_of(entry_or_key, const struct dir_rename_entry, ent); + const struct dir_rename_entry *e1 = entry; + const struct dir_rename_entry *e2 = entry_or_key; return strcmp(e1->dir, e2->dir); } @@ -117,46 +85,34 @@ static void dir_rename_init(struct hashmap *map) static void dir_rename_entry_init(struct dir_rename_entry *entry, char *directory) { - hashmap_entry_init(&entry->ent, strhash(directory)); + hashmap_entry_init(entry, strhash(directory)); entry->dir = directory; entry->non_unique_new_dir = 0; strbuf_init(&entry->new_dir, 0); string_list_init(&entry->possible_new_dirs, 0); } -struct collision_entry { - struct hashmap_entry ent; - char *target_file; - struct string_list source_files; - unsigned reported_already:1; -}; - static struct collision_entry *collision_find_entry(struct hashmap *hashmap, char *target_file) { struct collision_entry key; - hashmap_entry_init(&key.ent, strhash(target_file)); + hashmap_entry_init(&key, strhash(target_file)); key.target_file = target_file; - return hashmap_get_entry(hashmap, &key, ent, NULL); + return hashmap_get(hashmap, &key, NULL); } -static int collision_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, +static int collision_cmp(void *unused_cmp_data, + const struct collision_entry *e1, + const struct collision_entry *e2, const void *unused_keydata) { - const struct collision_entry *e1, *e2; - - e1 = container_of(eptr, const struct collision_entry, ent); - e2 = container_of(entry_or_key, const struct collision_entry, ent); - return strcmp(e1->target_file, e2->target_file); } static void collision_init(struct hashmap *map) { - hashmap_init(map, collision_cmp, NULL, 0); + hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0); } static void flush_output(struct merge_options *opt) @@ -224,6 +180,17 @@ static struct commit *make_virtual_commit(struct repository *repo, return commit; } +/* + * Since we use get_tree_entry(), which does not put the read object into + * the object pool, we cannot rely on a == b. + */ +static int oid_eq(const struct object_id *a, const struct object_id *b) +{ + if (!a && !b) + return 2; + return a && b && oideq(a, b); +} + enum rename_type { RENAME_NORMAL = 0, RENAME_VIA_DIR, @@ -317,8 +284,7 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type, static int show(struct merge_options *opt, int v) { - return (!opt->priv->call_depth && opt->verbosity >= v) || - opt->verbosity >= 5; + return (!opt->call_depth && opt->verbosity >= v) || opt->verbosity >= 5; } __attribute__((format (printf, 3, 4))) @@ -329,7 +295,7 @@ static void output(struct merge_options *opt, int v, const char *fmt, ...) if (!show(opt, v)) return; - strbuf_addchars(&opt->obuf, ' ', opt->priv->call_depth * 2); + strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2); va_start(ap, fmt); strbuf_vaddf(&opt->obuf, fmt, ap); @@ -344,7 +310,7 @@ static void output_commit_title(struct merge_options *opt, struct commit *commit { struct merge_remote_desc *desc; - strbuf_addchars(&opt->obuf, ' ', opt->priv->call_depth * 2); + strbuf_addchars(&opt->obuf, ' ', opt->call_depth * 2); desc = merge_remote_util(commit); if (desc) strbuf_addf(&opt->obuf, "virtual %s\n", desc->name); @@ -392,11 +358,6 @@ static int add_cacheinfo(struct merge_options *opt, return ret; } -static inline int merge_detect_rename(struct merge_options *opt) -{ - return (opt->detect_renames >= 0) ? opt->detect_renames : 1; -} - static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree) { parse_tree(tree); @@ -412,43 +373,74 @@ static int unpack_trees_start(struct merge_options *opt, struct tree_desc t[3]; struct index_state tmp_index = { NULL }; - memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts)); - if (opt->priv->call_depth) - opt->priv->unpack_opts.index_only = 1; + memset(&opt->unpack_opts, 0, sizeof(opt->unpack_opts)); + if (opt->call_depth) + opt->unpack_opts.index_only = 1; else - opt->priv->unpack_opts.update = 1; - opt->priv->unpack_opts.merge = 1; - opt->priv->unpack_opts.head_idx = 2; - opt->priv->unpack_opts.fn = threeway_merge; - opt->priv->unpack_opts.src_index = opt->repo->index; - opt->priv->unpack_opts.dst_index = &tmp_index; - opt->priv->unpack_opts.aggressive = !merge_detect_rename(opt); - setup_unpack_trees_porcelain(&opt->priv->unpack_opts, "merge"); + opt->unpack_opts.update = 1; + opt->unpack_opts.merge = 1; + opt->unpack_opts.head_idx = 2; + opt->unpack_opts.fn = threeway_merge; + opt->unpack_opts.src_index = opt->repo->index; + opt->unpack_opts.dst_index = &tmp_index; + opt->unpack_opts.aggressive = !merge_detect_rename(opt); + setup_unpack_trees_porcelain(&opt->unpack_opts, "merge"); init_tree_desc_from_tree(t+0, common); init_tree_desc_from_tree(t+1, head); init_tree_desc_from_tree(t+2, merge); - rc = unpack_trees(3, t, &opt->priv->unpack_opts); + rc = unpack_trees(3, t, &opt->unpack_opts); cache_tree_free(&opt->repo->index->cache_tree); /* - * Update opt->repo->index to match the new results, AFTER saving a - * copy in opt->priv->orig_index. Update src_index to point to the - * saved copy. (verify_uptodate() checks src_index, and the original - * index is the one that had the necessary modification timestamps.) + * Update opt->repo->index to match the new results, AFTER saving a copy + * in opt->orig_index. Update src_index to point to the saved copy. + * (verify_uptodate() checks src_index, and the original index is + * the one that had the necessary modification timestamps.) */ - opt->priv->orig_index = *opt->repo->index; + opt->orig_index = *opt->repo->index; *opt->repo->index = tmp_index; - opt->priv->unpack_opts.src_index = &opt->priv->orig_index; + opt->unpack_opts.src_index = &opt->orig_index; return rc; } static void unpack_trees_finish(struct merge_options *opt) { - discard_index(&opt->priv->orig_index); - clear_unpack_trees_porcelain(&opt->priv->unpack_opts); + discard_index(&opt->orig_index); + clear_unpack_trees_porcelain(&opt->unpack_opts); +} + +struct tree *write_tree_from_memory(struct merge_options *opt) +{ + struct tree *result = NULL; + struct index_state *istate = opt->repo->index; + + if (unmerged_index(istate)) { + int i; + fprintf(stderr, "BUG: There are unmerged index entries:\n"); + for (i = 0; i < istate->cache_nr; i++) { + const struct cache_entry *ce = istate->cache[i]; + if (ce_stage(ce)) + fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce), + (int)ce_namelen(ce), ce->name); + } + BUG("unmerged index entries in merge-recursive.c"); + } + + if (!istate->cache_tree) + istate->cache_tree = cache_tree(); + + if (!cache_tree_fully_valid(istate->cache_tree) && + cache_tree_update(istate, 0) < 0) { + err(opt, _("error building trees")); + return NULL; + } + + result = lookup_tree(opt->repo, &istate->cache_tree->oid); + + return result; } static int save_files_dirs(const struct object_id *oid, @@ -462,8 +454,8 @@ static int save_files_dirs(const struct object_id *oid, strbuf_addstr(base, path); FLEX_ALLOC_MEM(entry, path, base->buf, base->len); - hashmap_entry_init(&entry->e, path_hash(entry->path)); - hashmap_add(&opt->priv->current_file_dir_set, &entry->e); + hashmap_entry_init(entry, path_hash(entry->path)); + hashmap_add(&opt->current_file_dir_set, entry); strbuf_setlen(base, baselen); return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); @@ -594,7 +586,7 @@ static void record_df_conflict_files(struct merge_options *opt, * If we're merging merge-bases, we don't want to bother with * any working directory changes. */ - if (opt->priv->call_depth) + if (opt->call_depth) return; /* Ensure D/F conflicts are adjacent in the entries list. */ @@ -606,7 +598,7 @@ static void record_df_conflict_files(struct merge_options *opt, df_sorted_entries.cmp = string_list_df_name_compare; string_list_sort(&df_sorted_entries); - string_list_clear(&opt->priv->df_conflict_file_set, 1); + string_list_clear(&opt->df_conflict_file_set, 1); for (i = 0; i < df_sorted_entries.nr; i++) { const char *path = df_sorted_entries.items[i].string; int len = strlen(path); @@ -622,7 +614,7 @@ static void record_df_conflict_files(struct merge_options *opt, len > last_len && memcmp(path, last_file, last_len) == 0 && path[last_len] == '/') { - string_list_insert(&opt->priv->df_conflict_file_set, last_file); + string_list_insert(&opt->df_conflict_file_set, last_file); } /* @@ -689,8 +681,8 @@ static void update_entry(struct stage_data *entry, static int remove_file(struct merge_options *opt, int clean, const char *path, int no_wd) { - int update_cache = opt->priv->call_depth || clean; - int update_working_directory = !opt->priv->call_depth && !no_wd; + int update_cache = opt->call_depth || clean; + int update_working_directory = !opt->call_depth && !no_wd; if (update_cache) { if (remove_file_from_index(opt->repo->index, path)) @@ -720,9 +712,7 @@ static void add_flattened_path(struct strbuf *out, const char *s) out->buf[i] = '_'; } -static char *unique_path(struct merge_options *opt, - const char *path, - const char *branch) +static char *unique_path(struct merge_options *opt, const char *path, const char *branch) { struct path_hashmap_entry *entry; struct strbuf newpath = STRBUF_INIT; @@ -733,16 +723,16 @@ static char *unique_path(struct merge_options *opt, add_flattened_path(&newpath, branch); base_len = newpath.len; - while (hashmap_get_from_hash(&opt->priv->current_file_dir_set, + while (hashmap_get_from_hash(&opt->current_file_dir_set, path_hash(newpath.buf), newpath.buf) || - (!opt->priv->call_depth && file_exists(newpath.buf))) { + (!opt->call_depth && file_exists(newpath.buf))) { strbuf_setlen(&newpath, base_len); strbuf_addf(&newpath, "_%d", suffix++); } FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len); - hashmap_entry_init(&entry->e, path_hash(entry->path)); - hashmap_add(&opt->priv->current_file_dir_set, &entry->e); + hashmap_entry_init(entry, path_hash(entry->path)); + hashmap_add(&opt->current_file_dir_set, entry); return strbuf_detach(&newpath, NULL); } @@ -774,8 +764,7 @@ static int dir_in_way(struct index_state *istate, const char *path, strbuf_release(&dirpath); return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) && - !(empty_ok && is_empty_dir(path)) && - !has_symlink_leading_path(path, strlen(path)); + !(empty_ok && is_empty_dir(path)); } /* @@ -785,7 +774,7 @@ static int dir_in_way(struct index_state *istate, const char *path, static int was_tracked_and_matches(struct merge_options *opt, const char *path, const struct diff_filespec *blob) { - int pos = index_name_pos(&opt->priv->orig_index, path, strlen(path)); + int pos = index_name_pos(&opt->orig_index, path, strlen(path)); struct cache_entry *ce; if (0 > pos) @@ -793,8 +782,8 @@ static int was_tracked_and_matches(struct merge_options *opt, const char *path, return 0; /* See if the file we were tracking before matches */ - ce = opt->priv->orig_index.cache[pos]; - return (oideq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode); + ce = opt->orig_index.cache[pos]; + return (oid_eq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode); } /* @@ -802,7 +791,7 @@ static int was_tracked_and_matches(struct merge_options *opt, const char *path, */ static int was_tracked(struct merge_options *opt, const char *path) { - int pos = index_name_pos(&opt->priv->orig_index, path, strlen(path)); + int pos = index_name_pos(&opt->orig_index, path, strlen(path)); if (0 <= pos) /* we were tracking this path before the merge */ @@ -859,12 +848,12 @@ static int was_dirty(struct merge_options *opt, const char *path) struct cache_entry *ce; int dirty = 1; - if (opt->priv->call_depth || !was_tracked(opt, path)) + if (opt->call_depth || !was_tracked(opt, path)) return !dirty; - ce = index_file_exists(opt->priv->unpack_opts.src_index, + ce = index_file_exists(opt->unpack_opts.src_index, path, strlen(path), ignore_case); - dirty = verify_uptodate(ce, &opt->priv->unpack_opts) != 0; + dirty = verify_uptodate(ce, &opt->unpack_opts) != 0; return dirty; } @@ -874,8 +863,8 @@ static int make_room_for_path(struct merge_options *opt, const char *path) const char *msg = _("failed to create path '%s'%s"); /* Unlink any D/F conflict files that are in the way */ - for (i = 0; i < opt->priv->df_conflict_file_set.nr; i++) { - const char *df_path = opt->priv->df_conflict_file_set.items[i].string; + for (i = 0; i < opt->df_conflict_file_set.nr; i++) { + const char *df_path = opt->df_conflict_file_set.items[i].string; size_t pathlen = strlen(path); size_t df_pathlen = strlen(df_path); if (df_pathlen < pathlen && @@ -885,7 +874,7 @@ static int make_room_for_path(struct merge_options *opt, const char *path) _("Removing %s to make room for subdirectory\n"), df_path); unlink(df_path); - unsorted_string_list_delete_item(&opt->priv->df_conflict_file_set, + unsorted_string_list_delete_item(&opt->df_conflict_file_set, i, 0); break; } @@ -926,7 +915,7 @@ static int update_file_flags(struct merge_options *opt, { int ret = 0; - if (opt->priv->call_depth) + if (opt->call_depth) update_wd = 0; if (update_wd) { @@ -945,11 +934,9 @@ static int update_file_flags(struct merge_options *opt, } buf = read_object_file(&contents->oid, &type, &size); - if (!buf) { - ret = err(opt, _("cannot read object %s '%s'"), - oid_to_hex(&contents->oid), path); - goto free_buf; - } + if (!buf) + return err(opt, _("cannot read object %s '%s'"), + oid_to_hex(&contents->oid), path); if (type != OBJ_BLOB) { ret = err(opt, _("blob expected for %s '%s'"), oid_to_hex(&contents->oid), path); @@ -957,8 +944,7 @@ static int update_file_flags(struct merge_options *opt, } if (S_ISREG(contents->mode)) { struct strbuf strbuf = STRBUF_INIT; - if (convert_to_working_tree(opt->repo->index, - path, buf, size, &strbuf)) { + if (convert_to_working_tree(opt->repo->index, path, buf, size, &strbuf)) { free(buf); size = strbuf.len; buf = strbuf_detach(&strbuf, NULL); @@ -998,13 +984,10 @@ static int update_file_flags(struct merge_options *opt, free(buf); } update_index: - if (!ret && update_cache) { - int refresh = (!opt->priv->call_depth && - contents->mode != S_IFGITLINK); - if (add_cacheinfo(opt, contents, path, 0, refresh, + if (!ret && update_cache) + if (add_cacheinfo(opt, contents, path, 0, update_wd, ADD_CACHE_OK_TO_ADD)) return -1; - } return ret; } @@ -1014,7 +997,7 @@ static int update_file(struct merge_options *opt, const char *path) { return update_file_flags(opt, contents, path, - opt->priv->call_depth || clean, !opt->priv->call_depth); + opt->call_depth || clean, !opt->call_depth); } /* Low level file merging, update and removal */ @@ -1036,22 +1019,22 @@ static int merge_3way(struct merge_options *opt, { mmfile_t orig, src1, src2; struct ll_merge_options ll_opts = {0}; - char *base, *name1, *name2; + char *base_name, *name1, *name2; int merge_status; ll_opts.renormalize = opt->renormalize; ll_opts.extra_marker_size = extra_marker_size; ll_opts.xdl_opts = opt->xdl_opts; - if (opt->priv->call_depth) { + if (opt->call_depth) { ll_opts.virtual_ancestor = 1; ll_opts.variant = 0; } else { switch (opt->recursive_variant) { - case MERGE_VARIANT_OURS: + case MERGE_RECURSIVE_OURS: ll_opts.variant = XDL_MERGE_FAVOR_OURS; break; - case MERGE_VARIANT_THEIRS: + case MERGE_RECURSIVE_THEIRS: ll_opts.variant = XDL_MERGE_FAVOR_THEIRS; break; default: @@ -1060,13 +1043,16 @@ static int merge_3way(struct merge_options *opt, } } - assert(a->path && b->path && o->path && opt->ancestor); - if (strcmp(a->path, b->path) || strcmp(a->path, o->path) != 0) { - base = mkpathdup("%s:%s", opt->ancestor, o->path); + assert(a->path && b->path); + if (strcmp(a->path, b->path) || + (opt->ancestor != NULL && strcmp(a->path, o->path) != 0)) { + base_name = opt->ancestor == NULL ? NULL : + mkpathdup("%s:%s", opt->ancestor, o->path); name1 = mkpathdup("%s:%s", branch1, a->path); name2 = mkpathdup("%s:%s", branch2, b->path); } else { - base = mkpathdup("%s", opt->ancestor); + base_name = opt->ancestor == NULL ? NULL : + mkpathdup("%s", opt->ancestor); name1 = mkpathdup("%s", branch1); name2 = mkpathdup("%s", branch2); } @@ -1075,11 +1061,11 @@ static int merge_3way(struct merge_options *opt, read_mmblob(&src1, &a->oid); read_mmblob(&src2, &b->oid); - merge_status = ll_merge(result_buf, a->path, &orig, base, + merge_status = ll_merge(result_buf, a->path, &orig, base_name, &src1, name1, &src2, name2, opt->repo->index, &ll_opts); - free(base); + free(base_name); free(name1); free(name2); free(orig.ptr); @@ -1174,7 +1160,7 @@ static int merge_submodule(struct merge_options *opt, struct object_array merges; int i; - int search = !opt->priv->call_depth; + int search = !opt->call_depth; /* store a in result in case we fail */ oidcpy(result, a); @@ -1309,7 +1295,7 @@ static int merge_mode_and_contents(struct merge_options *opt, oidcpy(&result->blob.oid, &b->oid); } } else { - if (!oideq(&a->oid, &o->oid) && !oideq(&b->oid, &o->oid)) + if (!oid_eq(&a->oid, &o->oid) && !oid_eq(&b->oid, &o->oid)) result->merge = 1; /* @@ -1325,9 +1311,9 @@ static int merge_mode_and_contents(struct merge_options *opt, } } - if (oideq(&a->oid, &b->oid) || oideq(&a->oid, &o->oid)) + if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &o->oid)) oidcpy(&result->blob.oid, &b->oid); - else if (oideq(&b->oid, &o->oid)) + else if (oid_eq(&b->oid, &o->oid)) oidcpy(&result->blob.oid, &a->oid); else if (S_ISREG(a->mode)) { mmbuffer_t result_buf; @@ -1358,15 +1344,15 @@ static int merge_mode_and_contents(struct merge_options *opt, &b->oid); } else if (S_ISLNK(a->mode)) { switch (opt->recursive_variant) { - case MERGE_VARIANT_NORMAL: + case MERGE_RECURSIVE_NORMAL: oidcpy(&result->blob.oid, &a->oid); - if (!oideq(&a->oid, &b->oid)) + if (!oid_eq(&a->oid, &b->oid)) result->clean = 0; break; - case MERGE_VARIANT_OURS: + case MERGE_RECURSIVE_OURS: oidcpy(&result->blob.oid, &a->oid); break; - case MERGE_VARIANT_THEIRS: + case MERGE_RECURSIVE_THEIRS: oidcpy(&result->blob.oid, &b->oid); break; } @@ -1392,11 +1378,10 @@ static int handle_rename_via_dir(struct merge_options *opt, const struct rename *ren = ci->ren1; const struct diff_filespec *dest = ren->pair->two; char *file_path = dest->path; - int mark_conflicted = (opt->detect_directory_renames == - MERGE_DIRECTORY_RENAMES_CONFLICT); + int mark_conflicted = (opt->detect_directory_renames == 1); assert(ren->dir_rename_original_dest); - if (!opt->priv->call_depth && would_lose_untracked(opt, dest->path)) { + if (!opt->call_depth && would_lose_untracked(opt, dest->path)) { mark_conflicted = 1; file_path = unique_path(opt, dest->path, ren->branch); output(opt, 1, _("Error: Refusing to lose untracked file at %s; " @@ -1439,12 +1424,12 @@ static int handle_change_delete(struct merge_options *opt, const char *update_path = path; int ret = 0; - if (dir_in_way(opt->repo->index, path, !opt->priv->call_depth, 0) || - (!opt->priv->call_depth && would_lose_untracked(opt, path))) { + if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0) || + (!opt->call_depth && would_lose_untracked(opt, path))) { update_path = alt_path = unique_path(opt, path, change_branch); } - if (opt->priv->call_depth) { + if (opt->call_depth) { /* * We cannot arbitrarily accept either a_sha or b_sha as * correct; since there is no true "middle point" between @@ -1519,14 +1504,14 @@ static int handle_rename_delete(struct merge_options *opt, opt->branch2 : opt->branch1); if (handle_change_delete(opt, - opt->priv->call_depth ? orig->path : dest->path, - opt->priv->call_depth ? NULL : orig->path, + opt->call_depth ? orig->path : dest->path, + opt->call_depth ? NULL : orig->path, orig, dest, rename_branch, delete_branch, _("rename"), _("renamed"))) return -1; - if (opt->priv->call_depth) + if (opt->call_depth) return remove_file_from_index(opt->repo->index, dest->path); else return update_stages(opt, dest->path, NULL, @@ -1560,13 +1545,42 @@ static int handle_file_collision(struct merge_options *opt, b, a); } + /* + * In the recursive case, we just opt to undo renames + */ + if (opt->call_depth && (prev_path1 || prev_path2)) { + /* Put first file (a->oid, a->mode) in its original spot */ + if (prev_path1) { + if (update_file(opt, 1, a, prev_path1)) + return -1; + } else { + if (update_file(opt, 1, a, collide_path)) + return -1; + } + + /* Put second file (b->oid, b->mode) in its original spot */ + if (prev_path2) { + if (update_file(opt, 1, b, prev_path2)) + return -1; + } else { + if (update_file(opt, 1, b, collide_path)) + return -1; + } + + /* Don't leave something at collision path if unrenaming both */ + if (prev_path1 && prev_path2) + remove_file(opt, 1, collide_path, 0); + + return 0; + } + /* Remove rename sources if rename/add or rename/rename(2to1) */ if (prev_path1) remove_file(opt, 1, prev_path1, - opt->priv->call_depth || would_lose_untracked(opt, prev_path1)); + opt->call_depth || would_lose_untracked(opt, prev_path1)); if (prev_path2) remove_file(opt, 1, prev_path2, - opt->priv->call_depth || would_lose_untracked(opt, prev_path2)); + opt->call_depth || would_lose_untracked(opt, prev_path2)); /* * Remove the collision path, if it wouldn't cause dirty contents @@ -1608,12 +1622,12 @@ static int handle_file_collision(struct merge_options *opt, null.mode = 0; if (merge_mode_and_contents(opt, &null, a, b, collide_path, - branch1, branch2, opt->priv->call_depth * 2, &mfi)) + branch1, branch2, opt->call_depth * 2, &mfi)) return -1; mfi.clean &= !alt_path; if (update_file(opt, mfi.clean, &mfi.blob, update_path)) return -1; - if (!mfi.clean && !opt->priv->call_depth && + if (!mfi.clean && !opt->call_depth && update_stages(opt, collide_path, NULL, a, b)) return -1; free(alt_path); @@ -1653,7 +1667,7 @@ static int handle_rename_add(struct merge_options *opt, &ci->ren1->src_entry->stages[other_stage], prev_path_desc, opt->branch1, opt->branch2, - 1 + opt->priv->call_depth * 2, &mfi)) + 1 + opt->call_depth * 2, &mfi)) return -1; free(prev_path_desc); @@ -1671,7 +1685,7 @@ static char *find_path_for_conflict(struct merge_options *opt, const char *branch2) { char *new_path = NULL; - if (dir_in_way(opt->repo->index, path, !opt->priv->call_depth, 0)) { + if (dir_in_way(opt->repo->index, path, !opt->call_depth, 0)) { new_path = unique_path(opt, path, branch1); output(opt, 1, _("%s is a directory in %s adding " "as %s instead"), @@ -1686,14 +1700,6 @@ static char *find_path_for_conflict(struct merge_options *opt, return new_path; } -/* - * Toggle the stage number between "ours" and "theirs" (2 and 3). - */ -static inline int flip_stage(int stage) -{ - return (2 + 3) - stage; -} - static int handle_rename_rename_1to2(struct merge_options *opt, struct rename_conflict_info *ci) { @@ -1710,66 +1716,95 @@ static int handle_rename_rename_1to2(struct merge_options *opt, "rename \"%s\"->\"%s\" in \"%s\"%s"), o->path, a->path, ci->ren1->branch, o->path, b->path, ci->ren2->branch, - opt->priv->call_depth ? _(" (left unresolved)") : ""); + opt->call_depth ? _(" (left unresolved)") : ""); path_desc = xstrfmt("%s and %s, both renamed from %s", a->path, b->path, o->path); if (merge_mode_and_contents(opt, o, a, b, path_desc, ci->ren1->branch, ci->ren2->branch, - opt->priv->call_depth * 2, &mfi)) + opt->call_depth * 2, &mfi)) return -1; free(path_desc); - if (opt->priv->call_depth) - remove_file_from_index(opt->repo->index, o->path); - - /* - * For each destination path, we need to see if there is a - * rename/add collision. If not, we can write the file out - * to the specified location. - */ - add = &ci->ren1->dst_entry->stages[flip_stage(2)]; - if (is_valid(add)) { - add->path = mfi.blob.path = a->path; - if (handle_file_collision(opt, a->path, - NULL, NULL, - ci->ren1->branch, - ci->ren2->branch, - &mfi.blob, add) < 0) - return -1; - } else { - char *new_path = find_path_for_conflict(opt, a->path, - ci->ren1->branch, - ci->ren2->branch); - if (update_file(opt, 0, &mfi.blob, - new_path ? new_path : a->path)) - return -1; - free(new_path); - if (!opt->priv->call_depth && - update_stages(opt, a->path, NULL, a, NULL)) + if (opt->call_depth) { + /* + * FIXME: For rename/add-source conflicts (if we could detect + * such), this is wrong. We should instead find a unique + * pathname and then either rename the add-source file to that + * unique path, or use that unique path instead of src here. + */ + if (update_file(opt, 0, &mfi.blob, o->path)) return -1; - } - add = &ci->ren2->dst_entry->stages[flip_stage(3)]; - if (is_valid(add)) { - add->path = mfi.blob.path = b->path; - if (handle_file_collision(opt, b->path, - NULL, NULL, - ci->ren1->branch, - ci->ren2->branch, - add, &mfi.blob) < 0) - return -1; + /* + * Above, we put the merged content at the merge-base's + * path. Now we usually need to delete both a->path and + * b->path. However, the rename on each side of the merge + * could also be involved in a rename/add conflict. In + * such cases, we should keep the added file around, + * resolving the conflict at that path in its favor. + */ + add = &ci->ren1->dst_entry->stages[2 ^ 1]; + if (is_valid(add)) { + if (update_file(opt, 0, add, a->path)) + return -1; + } + else + remove_file_from_index(opt->repo->index, a->path); + add = &ci->ren2->dst_entry->stages[3 ^ 1]; + if (is_valid(add)) { + if (update_file(opt, 0, add, b->path)) + return -1; + } + else + remove_file_from_index(opt->repo->index, b->path); } else { - char *new_path = find_path_for_conflict(opt, b->path, - ci->ren2->branch, - ci->ren1->branch); - if (update_file(opt, 0, &mfi.blob, - new_path ? new_path : b->path)) - return -1; - free(new_path); - if (!opt->priv->call_depth && - update_stages(opt, b->path, NULL, NULL, b)) - return -1; + /* + * For each destination path, we need to see if there is a + * rename/add collision. If not, we can write the file out + * to the specified location. + */ + add = &ci->ren1->dst_entry->stages[2 ^ 1]; + if (is_valid(add)) { + add->path = mfi.blob.path = a->path; + if (handle_file_collision(opt, a->path, + NULL, NULL, + ci->ren1->branch, + ci->ren2->branch, + &mfi.blob, add) < 0) + return -1; + } else { + char *new_path = find_path_for_conflict(opt, a->path, + ci->ren1->branch, + ci->ren2->branch); + if (update_file(opt, 0, &mfi.blob, + new_path ? new_path : a->path)) + return -1; + free(new_path); + if (update_stages(opt, a->path, NULL, a, NULL)) + return -1; + } + + add = &ci->ren2->dst_entry->stages[3 ^ 1]; + if (is_valid(add)) { + add->path = mfi.blob.path = b->path; + if (handle_file_collision(opt, b->path, + NULL, NULL, + ci->ren1->branch, + ci->ren2->branch, + add, &mfi.blob) < 0) + return -1; + } else { + char *new_path = find_path_for_conflict(opt, b->path, + ci->ren2->branch, + ci->ren1->branch); + if (update_file(opt, 0, &mfi.blob, + new_path ? new_path : b->path)) + return -1; + free(new_path); + if (update_stages(opt, b->path, NULL, NULL, b)) + return -1; + } } return 0; @@ -1799,19 +1834,19 @@ static int handle_rename_rename_2to1(struct merge_options *opt, path_side_1_desc = xstrfmt("version of %s from %s", path, a->path); path_side_2_desc = xstrfmt("version of %s from %s", path, b->path); ostage1 = ci->ren1->branch == opt->branch1 ? 3 : 2; - ostage2 = flip_stage(ostage1); + ostage2 = ostage1 ^ 1; ci->ren1->src_entry->stages[ostage1].path = a->path; ci->ren2->src_entry->stages[ostage2].path = b->path; if (merge_mode_and_contents(opt, a, c1, &ci->ren1->src_entry->stages[ostage1], path_side_1_desc, opt->branch1, opt->branch2, - 1 + opt->priv->call_depth * 2, &mfi_c1) || + 1 + opt->call_depth * 2, &mfi_c1) || merge_mode_and_contents(opt, b, &ci->ren2->src_entry->stages[ostage2], c2, path_side_2_desc, opt->branch1, opt->branch2, - 1 + opt->priv->call_depth * 2, &mfi_c2)) + 1 + opt->call_depth * 2, &mfi_c2)) return -1; free(path_side_1_desc); free(path_side_2_desc); @@ -1845,15 +1880,17 @@ static struct diff_queue_struct *get_diffpairs(struct merge_options *opt, */ if (opts.detect_rename > DIFF_DETECT_RENAME) opts.detect_rename = DIFF_DETECT_RENAME; - opts.rename_limit = (opt->rename_limit >= 0) ? opt->rename_limit : 1000; + opts.rename_limit = opt->merge_rename_limit >= 0 ? opt->merge_rename_limit : + opt->diff_rename_limit >= 0 ? opt->diff_rename_limit : + 1000; opts.rename_score = opt->rename_score; opts.show_rename_progress = opt->show_rename_progress; opts.output_format = DIFF_FORMAT_NO_OUTPUT; diff_setup_done(&opts); diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts); diffcore_std(&opts); - if (opts.needed_rename_limit > opt->priv->needed_rename_limit) - opt->priv->needed_rename_limit = opts.needed_rename_limit; + if (opts.needed_rename_limit > opt->needed_rename_limit) + opt->needed_rename_limit = opts.needed_rename_limit; ret = xmalloc(sizeof(*ret)); *ret = diff_queued_diff; @@ -1893,16 +1930,6 @@ static char *apply_dir_rename(struct dir_rename_entry *entry, return NULL; oldlen = strlen(entry->dir); - if (entry->new_dir.len == 0) - /* - * If someone renamed/merged a subdirectory into the root - * directory (e.g. 'some/subdir' -> ''), then we want to - * avoid returning - * '' + '/filename' - * as the rename; we need to make old_path + oldlen advance - * past the '/' character. - */ - oldlen++; newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1; strbuf_grow(&new_path, newlen); strbuf_addbuf(&new_path, &entry->new_dir); @@ -1915,8 +1942,8 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path, char **old_dir, char **new_dir) { char *end_of_old, *end_of_new; + int old_len, new_len; - /* Default return values: NULL, meaning no rename */ *old_dir = NULL; *new_dir = NULL; @@ -1927,91 +1954,43 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path, * "a/b/c/d" was renamed to "a/b/some/thing/else" * so, for this example, this function returns "a/b/c/d" in * *old_dir and "a/b/some/thing/else" in *new_dir. - */ - - /* - * If the basename of the file changed, we don't care. We want - * to know which portion of the directory, if any, changed. + * + * Also, if the basename of the file changed, we don't care. We + * want to know which portion of the directory, if any, changed. */ end_of_old = strrchr(old_path, '/'); end_of_new = strrchr(new_path, '/'); - /* - * If end_of_old is NULL, old_path wasn't in a directory, so there - * could not be a directory rename (our rule elsewhere that a - * directory which still exists is not considered to have been - * renamed means the root directory can never be renamed -- because - * the root directory always exists). - */ - if (end_of_old == NULL) - return; /* Note: *old_dir and *new_dir are still NULL */ - - /* - * If new_path contains no directory (end_of_new is NULL), then we - * have a rename of old_path's directory to the root directory. - */ - if (end_of_new == NULL) { - *old_dir = xstrndup(old_path, end_of_old - old_path); - *new_dir = xstrdup(""); + if (end_of_old == NULL || end_of_new == NULL) return; - } - - /* Find the first non-matching character traversing backwards */ while (*--end_of_new == *--end_of_old && end_of_old != old_path && end_of_new != new_path) ; /* Do nothing; all in the while loop */ - - /* - * If both got back to the beginning of their strings, then the - * directory didn't change at all, only the basename did. - */ - if (end_of_old == old_path && end_of_new == new_path && - *end_of_old == *end_of_new) - return; /* Note: *old_dir and *new_dir are still NULL */ - /* - * If end_of_new got back to the beginning of its string, and - * end_of_old got back to the beginning of some subdirectory, then - * we have a rename/merge of a subdirectory into the root, which - * needs slightly special handling. - * - * Note: There is no need to consider the opposite case, with a - * rename/merge of the root directory into some subdirectory - * because as noted above the root directory always exists so it - * cannot be considered to be renamed. + * We've found the first non-matching character in the directory + * paths. That means the current directory we were comparing + * represents the rename. Move end_of_old and end_of_new back + * to the full directory name. */ - if (end_of_new == new_path && - end_of_old != old_path && end_of_old[-1] == '/') { - *old_dir = xstrndup(old_path, --end_of_old - old_path); - *new_dir = xstrdup(""); - return; - } + if (*end_of_old == '/') + end_of_old++; + if (*end_of_old != '/') + end_of_new++; + end_of_old = strchr(end_of_old, '/'); + end_of_new = strchr(end_of_new, '/'); /* - * We've found the first non-matching character in the directory - * paths. That means the current characters we were looking at - * were part of the first non-matching subdir name going back from - * the end of the strings. Get the whole name by advancing both - * end_of_old and end_of_new to the NEXT '/' character. That will - * represent the entire directory rename. - * - * The reason for the increment is cases like - * a/b/star/foo/whatever.c -> a/b/tar/foo/random.c - * After dropping the basename and going back to the first - * non-matching character, we're now comparing: - * a/b/s and a/b/ - * and we want to be comparing: - * a/b/star/ and a/b/tar/ - * but without the pre-increment, the one on the right would stay - * a/b/. + * It may have been the case that old_path and new_path were the same + * directory all along. Don't claim a rename if they're the same. */ - end_of_old = strchr(++end_of_old, '/'); - end_of_new = strchr(++end_of_new, '/'); + old_len = end_of_old - old_path; + new_len = end_of_new - new_path; - /* Copy the old and new directories into *old_dir and *new_dir. */ - *old_dir = xstrndup(old_path, end_of_old - old_path); - *new_dir = xstrndup(new_path, end_of_new - new_path); + if (old_len != new_len || strncmp(old_path, new_path, old_len)) { + *old_dir = xstrndup(old_path, old_len); + *new_dir = xstrndup(new_path, new_len); + } } static void remove_hashmap_entries(struct hashmap *dir_renames, @@ -2022,7 +2001,7 @@ static void remove_hashmap_entries(struct hashmap *dir_renames, for (i = 0; i < items_to_remove->nr; i++) { entry = items_to_remove->items[i].util; - hashmap_remove(dir_renames, &entry->ent, NULL); + hashmap_remove(dir_renames, entry, NULL); } string_list_clear(items_to_remove, 0); } @@ -2145,8 +2124,8 @@ static void handle_directory_level_conflicts(struct merge_options *opt, struct string_list remove_from_head = STRING_LIST_INIT_NODUP; struct string_list remove_from_merge = STRING_LIST_INIT_NODUP; - hashmap_for_each_entry(dir_re_head, &iter, head_ent, - ent /* member name */) { + hashmap_iter_init(dir_re_head, &iter); + while ((head_ent = hashmap_iter_next(&iter))) { merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir); if (merge_ent && !head_ent->non_unique_new_dir && @@ -2170,8 +2149,8 @@ static void handle_directory_level_conflicts(struct merge_options *opt, remove_hashmap_entries(dir_re_head, &remove_from_head); remove_hashmap_entries(dir_re_merge, &remove_from_merge); - hashmap_for_each_entry(dir_re_merge, &iter, merge_ent, - ent /* member name */) { + hashmap_iter_init(dir_re_merge, &iter); + while ((merge_ent = hashmap_iter_next(&iter))) { head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir); if (tree_has_path(opt->repo, merge, merge_ent->dir)) { /* 2. This wasn't a directory rename after all */ @@ -2250,7 +2229,7 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs) if (!entry) { entry = xmalloc(sizeof(*entry)); dir_rename_entry_init(entry, old_dir); - hashmap_put(dir_renames, &entry->ent); + hashmap_put(dir_renames, entry); } else { free(old_dir); } @@ -2275,8 +2254,8 @@ static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs) * we set non_unique_new_dir. Once we've determined the winner (or * that there is no winner), we no longer need possible_new_dirs. */ - hashmap_for_each_entry(dir_renames, &iter, entry, - ent /* member name */) { + hashmap_iter_init(dir_renames, &iter); + while ((entry = hashmap_iter_next(&iter))) { int max = 0; int bad_max = 0; char *best = NULL; @@ -2379,9 +2358,8 @@ static void compute_collisions(struct hashmap *collisions, if (!collision_ent) { collision_ent = xcalloc(1, sizeof(struct collision_entry)); - hashmap_entry_init(&collision_ent->ent, - strhash(new_path)); - hashmap_put(collisions, &collision_ent->ent); + hashmap_entry_init(collision_ent, strhash(new_path)); + hashmap_put(collisions, collision_ent); collision_ent->target_file = new_path; } else { free(new_path); @@ -2634,12 +2612,12 @@ static struct string_list *get_renames(struct merge_options *opt, entries); } - hashmap_for_each_entry(&collisions, &iter, e, - ent /* member name */) { + hashmap_iter_init(&collisions, &iter); + while ((e = hashmap_iter_next(&iter))) { free(e->target_file); string_list_clear(&e->source_files, 0); } - hashmap_free_entries(&collisions, struct collision_entry, ent); + hashmap_free(&collisions, 1); return renames; } @@ -2778,15 +2756,15 @@ static int process_renames(struct merge_options *opt, dst_other.mode = ren1->dst_entry->stages[other_stage].mode; try_merge = 0; - if (oideq(&src_other.oid, &null_oid) && + if (oid_eq(&src_other.oid, &null_oid) && ren1->dir_rename_original_type == 'A') { setup_rename_conflict_info(RENAME_VIA_DIR, opt, ren1, NULL); - } else if (oideq(&src_other.oid, &null_oid)) { + } else if (oid_eq(&src_other.oid, &null_oid)) { setup_rename_conflict_info(RENAME_DELETE, opt, ren1, NULL); } else if ((dst_other.mode == ren1->pair->two->mode) && - oideq(&dst_other.oid, &ren1->pair->two->oid)) { + oid_eq(&dst_other.oid, &ren1->pair->two->oid)) { /* * Added file on the other side identical to * the file being renamed: clean merge. @@ -2801,7 +2779,7 @@ static int process_renames(struct merge_options *opt, 1, /* update_cache */ 0 /* update_wd */)) clean_merge = -1; - } else if (!oideq(&dst_other.oid, &null_oid)) { + } else if (!oid_eq(&dst_other.oid, &null_oid)) { /* * Probably not a clean merge, but it's * premature to set clean_merge to 0 here, @@ -2852,13 +2830,13 @@ static void initial_cleanup_rename(struct diff_queue_struct *pairs, struct hashmap_iter iter; struct dir_rename_entry *e; - hashmap_for_each_entry(dir_renames, &iter, e, - ent /* member name */) { + hashmap_iter_init(dir_renames, &iter); + while ((e = hashmap_iter_next(&iter))) { free(e->dir); strbuf_release(&e->new_dir); /* possible_new_dirs already cleared in get_directory_renames */ } - hashmap_free_entries(dir_renames, struct dir_rename_entry, ent); + hashmap_free(dir_renames, 1); free(dir_renames); free(pairs->queue); @@ -2885,9 +2863,8 @@ static int detect_and_process_renames(struct merge_options *opt, head_pairs = get_diffpairs(opt, common, head); merge_pairs = get_diffpairs(opt, common, merge); - if ((opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE) || - (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT && - !opt->priv->call_depth)) { + if ((opt->detect_directory_renames == 2) || + (opt->detect_directory_renames == 1 && !opt->call_depth)) { dir_re_head = get_directory_renames(head_pairs); dir_re_merge = get_directory_renames(merge_pairs); @@ -2979,7 +2956,7 @@ static int blob_unchanged(struct merge_options *opt, if (a->mode != o->mode) return 0; - if (oideq(&o->oid, &a->oid)) + if (oid_eq(&o->oid, &a->oid)) return 1; if (!renormalize) return 0; @@ -3044,13 +3021,13 @@ static int handle_content_merge(struct merge_file_info *mfi, reason = _("add/add"); assert(o->path && a->path && b->path); - if (ci && dir_in_way(opt->repo->index, path, !opt->priv->call_depth, + if (ci && dir_in_way(opt->repo->index, path, !opt->call_depth, S_ISGITLINK(ci->ren1->pair->two->mode))) df_conflict_remains = 1; if (merge_mode_and_contents(opt, o, a, b, path, opt->branch1, opt->branch2, - opt->priv->call_depth * 2, mfi)) + opt->call_depth * 2, mfi)) return -1; /* @@ -3066,7 +3043,7 @@ static int handle_content_merge(struct merge_file_info *mfi, output(opt, 3, _("Skipped %s (merged same as existing)"), path); if (add_cacheinfo(opt, &mfi->blob, path, - 0, (!opt->priv->call_depth && !is_dirty), 0)) + 0, (!opt->call_depth && !is_dirty), 0)) return -1; /* * However, add_cacheinfo() will delete the old cache entry @@ -3074,8 +3051,8 @@ static int handle_content_merge(struct merge_file_info *mfi, * flag to avoid making the file appear as if it were * deleted by the user. */ - pos = index_name_pos(&opt->priv->orig_index, path, strlen(path)); - ce = opt->priv->orig_index.cache[pos]; + pos = index_name_pos(&opt->orig_index, path, strlen(path)); + ce = opt->orig_index.cache[pos]; if (ce_skip_worktree(ce)) { pos = index_name_pos(opt->repo->index, path, strlen(path)); ce = opt->repo->index->cache[pos]; @@ -3096,7 +3073,7 @@ static int handle_content_merge(struct merge_file_info *mfi, if (df_conflict_remains || is_dirty) { char *new_path; - if (opt->priv->call_depth) { + if (opt->call_depth) { remove_file_from_index(opt->repo->index, path); } else { if (!mfi->clean) { @@ -3145,8 +3122,7 @@ static int handle_rename_normal(struct merge_options *opt, clean = handle_content_merge(&mfi, opt, path, was_dirty(opt, path), o, a, b, ci); - if (clean && - opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT && + if (clean && opt->detect_directory_renames == 1 && ren->dir_rename_original_dest) { if (update_stages(opt, path, NULL, @@ -3191,12 +3167,12 @@ static int warn_about_dir_renamed_entries(struct merge_options *opt, return clean; /* Sanity checks */ - assert(opt->detect_directory_renames > MERGE_DIRECTORY_RENAMES_NONE); + assert(opt->detect_directory_renames > 0); assert(ren->dir_rename_original_type == 'A' || ren->dir_rename_original_type == 'R'); /* Check whether to treat directory renames as a conflict */ - clean = (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE); + clean = (opt->detect_directory_renames == 2); is_add = (ren->dir_rename_original_type == 'A'); if (ren->dir_rename_original_type == 'A' && clean) { @@ -3355,7 +3331,7 @@ static int process_entry(struct merge_options *opt, conf = _("directory/file"); } if (dir_in_way(opt->repo->index, path, - !opt->priv->call_depth && !S_ISGITLINK(a->mode), + !opt->call_depth && !S_ISGITLINK(a->mode), 0)) { char *new_path = unique_path(opt, path, add_branch); clean_merge = 0; @@ -3364,7 +3340,7 @@ static int process_entry(struct merge_options *opt, conf, path, other_branch, path, new_path); if (update_file(opt, 0, contents, new_path)) clean_merge = -1; - else if (opt->priv->call_depth) + else if (opt->call_depth) remove_file_from_index(opt->repo->index, path); free(new_path); } else { @@ -3404,32 +3380,37 @@ static int process_entry(struct merge_options *opt, return clean_merge; } -static int merge_trees_internal(struct merge_options *opt, - struct tree *head, - struct tree *merge, - struct tree *merge_base, - struct tree **result) +int merge_trees(struct merge_options *opt, + struct tree *head, + struct tree *merge, + struct tree *common, + struct tree **result) { struct index_state *istate = opt->repo->index; int code, clean; + struct strbuf sb = STRBUF_INIT; + + if (!opt->call_depth && repo_index_has_changes(opt->repo, head, &sb)) { + err(opt, _("Your local changes to the following files would be overwritten by merge:\n %s"), + sb.buf); + return -1; + } if (opt->subtree_shift) { - merge = shift_tree_object(opt->repo, head, merge, - opt->subtree_shift); - merge_base = shift_tree_object(opt->repo, head, merge_base, - opt->subtree_shift); + merge = shift_tree_object(opt->repo, head, merge, opt->subtree_shift); + common = shift_tree_object(opt->repo, head, common, opt->subtree_shift); } - if (oideq(&merge_base->object.oid, &merge->object.oid)) { + if (oid_eq(&common->object.oid, &merge->object.oid)) { output(opt, 0, _("Already up to date!")); *result = head; return 1; } - code = unpack_trees_start(opt, merge_base, head, merge); + code = unpack_trees_start(opt, common, head, merge); if (code != 0) { - if (show(opt, 4) || opt->priv->call_depth) + if (show(opt, 4) || opt->call_depth) err(opt, _("merging of trees %s and %s failed"), oid_to_hex(&head->object.oid), oid_to_hex(&merge->object.oid)); @@ -3448,13 +3429,12 @@ static int merge_trees_internal(struct merge_options *opt, * opposed to decaring a local hashmap is for convenience * so that we don't have to pass it to around. */ - hashmap_init(&opt->priv->current_file_dir_set, path_hashmap_cmp, - NULL, 512); + hashmap_init(&opt->current_file_dir_set, path_hashmap_cmp, NULL, 512); get_files_dirs(opt, head); get_files_dirs(opt, merge); entries = get_unmerged(opt->repo->index); - clean = detect_and_process_renames(opt, merge_base, head, merge, + clean = detect_and_process_renames(opt, common, head, merge, entries, &re_info); record_df_conflict_files(opt, entries); if (clean < 0) @@ -3485,8 +3465,7 @@ static int merge_trees_internal(struct merge_options *opt, string_list_clear(entries, 1); free(entries); - hashmap_free_entries(&opt->priv->current_file_dir_set, - struct path_hashmap_entry, e); + hashmap_free(&opt->current_file_dir_set, 1); if (clean < 0) { unpack_trees_finish(opt); @@ -3498,8 +3477,7 @@ static int merge_trees_internal(struct merge_options *opt, unpack_trees_finish(opt); - if (opt->priv->call_depth && - !(*result = write_in_core_index_as_tree(opt->repo))) + if (opt->call_depth && !(*result = write_tree_from_memory(opt))) return -1; return clean; @@ -3520,18 +3498,16 @@ static struct commit_list *reverse_commit_list(struct commit_list *list) * Merge the commits h1 and h2, return the resulting virtual * commit object and a flag indicating the cleanness of the merge. */ -static int merge_recursive_internal(struct merge_options *opt, - struct commit *h1, - struct commit *h2, - struct commit_list *merge_bases, - struct commit **result) +int merge_recursive(struct merge_options *opt, + struct commit *h1, + struct commit *h2, + struct commit_list *ca, + struct commit **result) { struct commit_list *iter; - struct commit *merged_merge_bases; - struct tree *result_tree; + struct commit *merged_common_ancestors; + struct tree *mrtree; int clean; - const char *ancestor_name; - struct strbuf merge_base_abbrev = STRBUF_INIT; if (show(opt, 4)) { output(opt, 4, _("Merging:")); @@ -3539,43 +3515,32 @@ static int merge_recursive_internal(struct merge_options *opt, output_commit_title(opt, h2); } - if (!merge_bases) { - merge_bases = get_merge_bases(h1, h2); - merge_bases = reverse_commit_list(merge_bases); + if (!ca) { + ca = get_merge_bases(h1, h2); + ca = reverse_commit_list(ca); } if (show(opt, 5)) { - unsigned cnt = commit_list_count(merge_bases); + unsigned cnt = commit_list_count(ca); output(opt, 5, Q_("found %u common ancestor:", "found %u common ancestors:", cnt), cnt); - for (iter = merge_bases; iter; iter = iter->next) + for (iter = ca; iter; iter = iter->next) output_commit_title(opt, iter->item); } - merged_merge_bases = pop_commit(&merge_bases); - if (merged_merge_bases == NULL) { + merged_common_ancestors = pop_commit(&ca); + if (merged_common_ancestors == NULL) { /* if there is no common ancestor, use an empty tree */ struct tree *tree; tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree); - merged_merge_bases = make_virtual_commit(opt->repo, tree, - "ancestor"); - ancestor_name = "empty tree"; - } else if (opt->ancestor && !opt->priv->call_depth) { - ancestor_name = opt->ancestor; - } else if (merge_bases) { - ancestor_name = "merged common ancestors"; - } else { - strbuf_add_unique_abbrev(&merge_base_abbrev, - &merged_merge_bases->object.oid, - DEFAULT_ABBREV); - ancestor_name = merge_base_abbrev.buf; + merged_common_ancestors = make_virtual_commit(opt->repo, tree, "ancestor"); } - for (iter = merge_bases; iter; iter = iter->next) { + for (iter = ca; iter; iter = iter->next) { const char *saved_b1, *saved_b2; - opt->priv->call_depth++; + opt->call_depth++; /* * When the merge fails, the result contains files * with conflict markers. The cleanness flag is @@ -3589,134 +3554,45 @@ static int merge_recursive_internal(struct merge_options *opt, saved_b2 = opt->branch2; opt->branch1 = "Temporary merge branch 1"; opt->branch2 = "Temporary merge branch 2"; - if (merge_recursive_internal(opt, merged_merge_bases, iter->item, - NULL, &merged_merge_bases) < 0) + if (merge_recursive(opt, merged_common_ancestors, iter->item, + NULL, &merged_common_ancestors) < 0) return -1; opt->branch1 = saved_b1; opt->branch2 = saved_b2; - opt->priv->call_depth--; + opt->call_depth--; - if (!merged_merge_bases) + if (!merged_common_ancestors) return err(opt, _("merge returned no commit")); } discard_index(opt->repo->index); - if (!opt->priv->call_depth) + if (!opt->call_depth) repo_read_index(opt->repo); - opt->ancestor = ancestor_name; - clean = merge_trees_internal(opt, - repo_get_commit_tree(opt->repo, h1), - repo_get_commit_tree(opt->repo, h2), - repo_get_commit_tree(opt->repo, - merged_merge_bases), - &result_tree); - strbuf_release(&merge_base_abbrev); - opt->ancestor = NULL; /* avoid accidental re-use of opt->ancestor */ + opt->ancestor = "merged common ancestors"; + clean = merge_trees(opt, get_commit_tree(h1), get_commit_tree(h2), + get_commit_tree(merged_common_ancestors), + &mrtree); if (clean < 0) { flush_output(opt); return clean; } - if (opt->priv->call_depth) { - *result = make_virtual_commit(opt->repo, result_tree, - "merged tree"); + if (opt->call_depth) { + *result = make_virtual_commit(opt->repo, mrtree, "merged tree"); commit_list_insert(h1, &(*result)->parents); commit_list_insert(h2, &(*result)->parents->next); } - return clean; -} - -static int merge_start(struct merge_options *opt, struct tree *head) -{ - struct strbuf sb = STRBUF_INIT; - - /* Sanity checks on opt */ - assert(opt->repo); - - assert(opt->branch1 && opt->branch2); - - assert(opt->detect_renames >= -1 && - opt->detect_renames <= DIFF_DETECT_COPY); - assert(opt->detect_directory_renames >= MERGE_DIRECTORY_RENAMES_NONE && - opt->detect_directory_renames <= MERGE_DIRECTORY_RENAMES_TRUE); - assert(opt->rename_limit >= -1); - assert(opt->rename_score >= 0 && opt->rename_score <= MAX_SCORE); - assert(opt->show_rename_progress >= 0 && opt->show_rename_progress <= 1); - - assert(opt->xdl_opts >= 0); - assert(opt->recursive_variant >= MERGE_VARIANT_NORMAL && - opt->recursive_variant <= MERGE_VARIANT_THEIRS); - - assert(opt->verbosity >= 0 && opt->verbosity <= 5); - assert(opt->buffer_output <= 2); - assert(opt->obuf.len == 0); - - assert(opt->priv == NULL); - - /* Sanity check on repo state; index must match head */ - if (repo_index_has_changes(opt->repo, head, &sb)) { - err(opt, _("Your local changes to the following files would be overwritten by merge:\n %s"), - sb.buf); - strbuf_release(&sb); - return -1; - } - - opt->priv = xcalloc(1, sizeof(*opt->priv)); - string_list_init(&opt->priv->df_conflict_file_set, 1); - return 0; -} - -static void merge_finalize(struct merge_options *opt) -{ flush_output(opt); - if (!opt->priv->call_depth && opt->buffer_output < 2) + if (!opt->call_depth && opt->buffer_output < 2) strbuf_release(&opt->obuf); if (show(opt, 2)) diff_warn_rename_limit("merge.renamelimit", - opt->priv->needed_rename_limit, 0); - FREE_AND_NULL(opt->priv); -} - -int merge_trees(struct merge_options *opt, - struct tree *head, - struct tree *merge, - struct tree *merge_base) -{ - int clean; - struct tree *ignored; - - assert(opt->ancestor != NULL); - - if (merge_start(opt, head)) - return -1; - clean = merge_trees_internal(opt, head, merge, merge_base, &ignored); - merge_finalize(opt); - + opt->needed_rename_limit, 0); return clean; } -int merge_recursive(struct merge_options *opt, - struct commit *h1, - struct commit *h2, - struct commit_list *merge_bases, - struct commit **result) -{ - int clean; - - assert(opt->ancestor == NULL || - !strcmp(opt->ancestor, "constructed merge base")); - - if (merge_start(opt, repo_get_commit_tree(opt->repo, h1))) - return -1; - clean = merge_recursive_internal(opt, h1, h2, merge_bases, result); - merge_finalize(opt); - - return clean; -} - -static struct commit *get_ref(struct repository *repo, - const struct object_id *oid, +static struct commit *get_ref(struct repository *repo, const struct object_id *oid, const char *name) { struct object *object; @@ -3737,8 +3613,8 @@ static struct commit *get_ref(struct repository *repo, int merge_recursive_generic(struct merge_options *opt, const struct object_id *head, const struct object_id *merge, - int num_merge_bases, - const struct object_id **merge_bases, + int num_base_list, + const struct object_id **base_list, struct commit **result) { int clean; @@ -3747,18 +3623,15 @@ int merge_recursive_generic(struct merge_options *opt, struct commit *next_commit = get_ref(opt->repo, merge, opt->branch2); struct commit_list *ca = NULL; - if (merge_bases) { + if (base_list) { int i; - for (i = 0; i < num_merge_bases; ++i) { + for (i = 0; i < num_base_list; ++i) { struct commit *base; - if (!(base = get_ref(opt->repo, merge_bases[i], - oid_to_hex(merge_bases[i])))) + if (!(base = get_ref(opt->repo, base_list[i], oid_to_hex(base_list[i])))) return err(opt, _("Could not parse object '%s'"), - oid_to_hex(merge_bases[i])); + oid_to_hex(base_list[i])); commit_list_insert(base, &ca); } - if (num_merge_bases == 1) - opt->ancestor = "constructed merge base"; } repo_hold_locked_index(opt->repo, &lock, LOCK_DIE_ON_ERROR); @@ -3780,25 +3653,22 @@ static void merge_recursive_config(struct merge_options *opt) { char *value = NULL; git_config_get_int("merge.verbosity", &opt->verbosity); - git_config_get_int("diff.renamelimit", &opt->rename_limit); - git_config_get_int("merge.renamelimit", &opt->rename_limit); + git_config_get_int("diff.renamelimit", &opt->diff_rename_limit); + git_config_get_int("merge.renamelimit", &opt->merge_rename_limit); if (!git_config_get_string("diff.renames", &value)) { - opt->detect_renames = git_config_rename("diff.renames", value); + opt->diff_detect_rename = git_config_rename("diff.renames", value); free(value); } if (!git_config_get_string("merge.renames", &value)) { - opt->detect_renames = git_config_rename("merge.renames", value); + opt->merge_detect_rename = git_config_rename("merge.renames", value); free(value); } if (!git_config_get_string("merge.directoryrenames", &value)) { int boolval = git_parse_maybe_bool(value); if (0 <= boolval) { - opt->detect_directory_renames = boolval ? - MERGE_DIRECTORY_RENAMES_TRUE : - MERGE_DIRECTORY_RENAMES_NONE; + opt->detect_directory_renames = boolval ? 2 : 0; } else if (!strcasecmp(value, "conflict")) { - opt->detect_directory_renames = - MERGE_DIRECTORY_RENAMES_CONFLICT; + opt->detect_directory_renames = 1; } /* avoid erroring on values from future versions of git */ free(value); } @@ -3810,25 +3680,23 @@ void init_merge_options(struct merge_options *opt, { const char *merge_verbosity; memset(opt, 0, sizeof(struct merge_options)); - opt->repo = repo; - - opt->detect_renames = -1; - opt->detect_directory_renames = MERGE_DIRECTORY_RENAMES_CONFLICT; - opt->rename_limit = -1; - opt->verbosity = 2; opt->buffer_output = 1; - strbuf_init(&opt->obuf, 0); - + opt->diff_rename_limit = -1; + opt->merge_rename_limit = -1; opt->renormalize = 0; - + opt->diff_detect_rename = -1; + opt->merge_detect_rename = -1; + opt->detect_directory_renames = 1; merge_recursive_config(opt); merge_verbosity = getenv("GIT_MERGE_VERBOSITY"); if (merge_verbosity) opt->verbosity = strtol(merge_verbosity, NULL, 10); if (opt->verbosity >= 5) opt->buffer_output = 0; + strbuf_init(&opt->obuf, 0); + string_list_init(&opt->df_conflict_file_set, 1); } int parse_merge_opt(struct merge_options *opt, const char *s) @@ -3838,9 +3706,9 @@ int parse_merge_opt(struct merge_options *opt, const char *s) if (!s || !*s) return -1; if (!strcmp(s, "ours")) - opt->recursive_variant = MERGE_VARIANT_OURS; + opt->recursive_variant = MERGE_RECURSIVE_OURS; else if (!strcmp(s, "theirs")) - opt->recursive_variant = MERGE_VARIANT_THEIRS; + opt->recursive_variant = MERGE_RECURSIVE_THEIRS; else if (!strcmp(s, "subtree")) opt->subtree_shift = ""; else if (skip_prefix(s, "subtree=", &arg)) @@ -3871,16 +3739,16 @@ int parse_merge_opt(struct merge_options *opt, const char *s) else if (!strcmp(s, "no-renormalize")) opt->renormalize = 0; else if (!strcmp(s, "no-renames")) - opt->detect_renames = 0; + opt->merge_detect_rename = 0; else if (!strcmp(s, "find-renames")) { - opt->detect_renames = 1; + opt->merge_detect_rename = 1; opt->rename_score = 0; } else if (skip_prefix(s, "find-renames=", &arg) || skip_prefix(s, "rename-threshold=", &arg)) { if ((opt->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0) return -1; - opt->detect_renames = 1; + opt->merge_detect_rename = 1; } /* * Please update $__git_merge_strategy_options in diff --git a/third_party/git/merge-recursive.h b/third_party/git/merge-recursive.h index 978847e672..c2b7bb65c6 100644 --- a/third_party/git/merge-recursive.h +++ b/third_party/git/merge-recursive.h @@ -1,124 +1,104 @@ #ifndef MERGE_RECURSIVE_H #define MERGE_RECURSIVE_H -#include "strbuf.h" +#include "string-list.h" +#include "unpack-trees.h" struct commit; -struct commit_list; -struct object_id; + struct repository; -struct tree; -struct merge_options_internal; struct merge_options { - struct repository *repo; - - /* ref names used in console messages and conflict markers */ const char *ancestor; const char *branch1; const char *branch2; - - /* rename related options */ - int detect_renames; enum { - MERGE_DIRECTORY_RENAMES_NONE = 0, - MERGE_DIRECTORY_RENAMES_CONFLICT = 1, - MERGE_DIRECTORY_RENAMES_TRUE = 2 - } detect_directory_renames; - int rename_limit; - int rename_score; - int show_rename_progress; - - /* xdiff-related options (patience, ignore whitespace, ours/theirs) */ - long xdl_opts; - enum { - MERGE_VARIANT_NORMAL = 0, - MERGE_VARIANT_OURS, - MERGE_VARIANT_THEIRS + MERGE_RECURSIVE_NORMAL = 0, + MERGE_RECURSIVE_OURS, + MERGE_RECURSIVE_THEIRS } recursive_variant; - - /* console output related options */ - int verbosity; - unsigned buffer_output; /* 1: output at end, 2: keep buffered */ - struct strbuf obuf; /* output buffer; if buffer_output == 2, caller - * must handle and call strbuf_release */ - - /* miscellaneous control options */ const char *subtree_shift; + unsigned buffer_output; /* 1: output at end, 2: keep buffered */ unsigned renormalize : 1; - - /* internal fields used by the implementation */ - struct merge_options_internal *priv; + long xdl_opts; + int verbosity; + int detect_directory_renames; + int diff_detect_rename; + int merge_detect_rename; + int diff_rename_limit; + int merge_rename_limit; + int rename_score; + int needed_rename_limit; + int show_rename_progress; + int call_depth; + struct strbuf obuf; + struct hashmap current_file_dir_set; + struct string_list df_conflict_file_set; + struct unpack_trees_options unpack_opts; + struct index_state orig_index; + struct repository *repo; }; -void init_merge_options(struct merge_options *opt, struct repository *repo); - -/* parse the option in s and update the relevant field of opt */ -int parse_merge_opt(struct merge_options *opt, const char *s); - /* - * RETURN VALUES: All the merge_* functions below return a value as follows: - * > 0 Merge was clean - * = 0 Merge had conflicts - * < 0 Merge hit an unexpected and unrecoverable problem (e.g. disk - * full) and aborted merge part-way through. - */ - -/* - * rename-detecting three-way merge, no recursion. + * For dir_rename_entry, directory names are stored as a full path from the + * toplevel of the repository and do not include a trailing '/'. Also: * - * Outputs: - * - See RETURN VALUES above - * - No commit is created - * - opt->repo->index has the new index - * - $GIT_INDEX_FILE is not updated - * - The working tree is updated with results of the merge + * dir: original name of directory being renamed + * non_unique_new_dir: if true, could not determine new_dir + * new_dir: final name of directory being renamed + * possible_new_dirs: temporary used to help determine new_dir; see comments + * in get_directory_renames() for details */ -int merge_trees(struct merge_options *opt, - struct tree *head, - struct tree *merge, - struct tree *merge_base); +struct dir_rename_entry { + struct hashmap_entry ent; /* must be the first member! */ + char *dir; + unsigned non_unique_new_dir:1; + struct strbuf new_dir; + struct string_list possible_new_dirs; +}; -/* - * merge_recursive is like merge_trees() but with recursive ancestor - * consolidation and, if the commit is clean, creation of a commit. - * - * NOTE: empirically, about a decade ago it was determined that with more - * than two merge bases, optimal behavior was found when the - * merge_bases were passed in the order of oldest commit to newest - * commit. Also, merge_bases will be consumed (emptied) so make a - * copy if you need it. - * - * Outputs: - * - See RETURN VALUES above - * - If merge is clean, a commit is created and its address written to *result - * - opt->repo->index has the new index - * - $GIT_INDEX_FILE is not updated - * - The working tree is updated with results of the merge - */ -int merge_recursive(struct merge_options *opt, +struct collision_entry { + struct hashmap_entry ent; /* must be the first member! */ + char *target_file; + struct string_list source_files; + unsigned reported_already:1; +}; + +static inline int merge_detect_rename(struct merge_options *o) +{ + return o->merge_detect_rename >= 0 ? o->merge_detect_rename : + o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1; +} + +/* merge_trees() but with recursive ancestor consolidation */ +int merge_recursive(struct merge_options *o, struct commit *h1, struct commit *h2, - struct commit_list *merge_bases, + struct commit_list *ancestors, struct commit **result); +/* rename-detecting three-way merge, no recursion */ +int merge_trees(struct merge_options *o, + struct tree *head, + struct tree *merge, + struct tree *common, + struct tree **result); + /* - * merge_recursive_generic can operate on trees instead of commits, by - * wrapping the trees into virtual commits, and calling merge_recursive(). - * It also writes out the in-memory index to disk if the merge is successful. - * - * Outputs: - * - See RETURN VALUES above - * - If merge is clean, a commit is created and its address written to *result - * - opt->repo->index has the new index - * - $GIT_INDEX_FILE is updated - * - The working tree is updated with results of the merge + * "git-merge-recursive" can be fed trees; wrap them into + * virtual commits and call merge_recursive() proper. */ -int merge_recursive_generic(struct merge_options *opt, +int merge_recursive_generic(struct merge_options *o, const struct object_id *head, const struct object_id *merge, - int num_merge_bases, - const struct object_id **merge_bases, + int num_ca, + const struct object_id **ca, struct commit **result); +void init_merge_options(struct merge_options *o, + struct repository *repo); +struct tree *write_tree_from_memory(struct merge_options *o); + +int parse_merge_opt(struct merge_options *out, const char *s); + #endif diff --git a/third_party/git/midx.c b/third_party/git/midx.c index 1527e464a7..d649644420 100644 --- a/third_party/git/midx.c +++ b/third_party/git/midx.c @@ -19,7 +19,8 @@ #define MIDX_BYTE_NUM_PACKS 8 #define MIDX_HASH_VERSION 1 #define MIDX_HEADER_SIZE 12 -#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz) +#define MIDX_HASH_LEN 20 +#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + MIDX_HASH_LEN) #define MIDX_MAX_CHUNKS 5 #define MIDX_CHUNK_ALIGNMENT 4 @@ -92,7 +93,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local hash_version = m->data[MIDX_BYTE_HASH_VERSION]; if (hash_version != MIDX_HASH_VERSION) die(_("hash version %u does not match"), hash_version); - m->hash_len = the_hash_algo->rawsz; + m->hash_len = MIDX_HASH_LEN; m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS]; @@ -233,7 +234,7 @@ int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result) { return bsearch_hash(oid->hash, m->chunk_oid_fanout, m->chunk_oid_lookup, - the_hash_algo->rawsz, result); + MIDX_HASH_LEN, result); } struct object_id *nth_midxed_object_oid(struct object_id *oid, @@ -448,8 +449,6 @@ struct pack_list { uint32_t nr; uint32_t alloc; struct multi_pack_index *m; - struct progress *progress; - unsigned pack_paths_checked; }; static void add_pack_to_midx(const char *full_path, size_t full_path_len, @@ -458,7 +457,6 @@ static void add_pack_to_midx(const char *full_path, size_t full_path_len, struct pack_list *packs = (struct pack_list *)data; if (ends_with(file_name, ".idx")) { - display_progress(packs->progress, ++packs->pack_paths_checked); if (packs->m && midx_contains_pack(packs->m, file_name)) return; @@ -534,7 +532,7 @@ static void fill_pack_entry(uint32_t pack_int_id, uint32_t cur_object, struct pack_midx_entry *entry) { - if (nth_packed_object_id(&entry->oid, p, cur_object) < 0) + if (!nth_packed_object_oid(&entry->oid, p, cur_object)) die(_("failed to locate object %d in packfile"), cur_object); entry->pack_int_id = pack_int_id; @@ -788,7 +786,7 @@ static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_off } static int write_midx_internal(const char *object_dir, struct multi_pack_index *m, - struct string_list *packs_to_drop, unsigned flags) + struct string_list *packs_to_drop) { unsigned char cur_chunk, num_chunks = 0; char *midx_name; @@ -802,7 +800,6 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * uint64_t chunk_offsets[MIDX_MAX_CHUNKS + 1]; uint32_t nr_entries, num_large_offsets = 0; struct pack_midx_entry *entries = NULL; - struct progress *progress = NULL; int large_offsets_needed = 0; int pack_name_concat_len = 0; int dropped_packs = 0; @@ -837,14 +834,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * } } - packs.pack_paths_checked = 0; - if (flags & MIDX_PROGRESS) - packs.progress = start_progress(_("Adding packfiles to multi-pack-index"), 0); - else - packs.progress = NULL; - for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs); - stop_progress(&packs.progress); if (packs.m && packs.nr == packs.m->num_packs && !packs_to_drop) goto cleanup; @@ -938,7 +928,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * cur_chunk++; chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS; - chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * the_hash_algo->rawsz; + chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_HASH_LEN; cur_chunk++; chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_CHUNK_OFFSET_WIDTH; @@ -969,9 +959,6 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * written += MIDX_CHUNKLOOKUP_WIDTH; } - if (flags & MIDX_PROGRESS) - progress = start_progress(_("Writing chunks to multi-pack-index"), - num_chunks); for (i = 0; i < num_chunks; i++) { if (written != chunk_offsets[i]) BUG("incorrect chunk offset (%"PRIu64" != %"PRIu64") for chunk id %"PRIx32, @@ -989,7 +976,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * break; case MIDX_CHUNKID_OIDLOOKUP: - written += write_midx_oid_lookup(f, the_hash_algo->rawsz, entries, nr_entries); + written += write_midx_oid_lookup(f, MIDX_HASH_LEN, entries, nr_entries); break; case MIDX_CHUNKID_OBJECTOFFSETS: @@ -1004,10 +991,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index * BUG("trying to write unknown chunk id %"PRIx32, chunk_ids[i]); } - - display_progress(progress, i + 1); } - stop_progress(&progress); if (written != chunk_offsets[num_chunks]) BUG("incorrect final offset %"PRIu64" != %"PRIu64, @@ -1033,9 +1017,9 @@ cleanup: return result; } -int write_midx_file(const char *object_dir, unsigned flags) +int write_midx_file(const char *object_dir) { - return write_midx_internal(object_dir, NULL, NULL, flags); + return write_midx_internal(object_dir, NULL, NULL); } void clear_midx_file(struct repository *r) @@ -1093,20 +1077,19 @@ static int compare_pair_pos_vs_id(const void *_a, const void *_b) display_progress(progress, _n); \ } while (0) -int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags) +int verify_midx_file(struct repository *r, const char *object_dir) { struct pair_pos_vs_id *pairs = NULL; uint32_t i; - struct progress *progress = NULL; + struct progress *progress; struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); verify_midx_error = 0; if (!m) return 0; - if (flags & MIDX_PROGRESS) - progress = start_progress(_("Looking for referenced packfiles"), - m->num_packs); + progress = start_progress(_("Looking for referenced packfiles"), + m->num_packs); for (i = 0; i < m->num_packs; i++) { if (prepare_midx_pack(r, m, i)) midx_report("failed to load pack in position %d", i); @@ -1124,9 +1107,8 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag i, oid_fanout1, oid_fanout2, i + 1); } - if (flags & MIDX_PROGRESS) - progress = start_sparse_progress(_("Verifying OID order in multi-pack-index"), - m->num_objects - 1); + progress = start_sparse_progress(_("Verifying OID order in MIDX"), + m->num_objects - 1); for (i = 0; i < m->num_objects - 1; i++) { struct object_id oid1, oid2; @@ -1153,15 +1135,13 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i); } - if (flags & MIDX_PROGRESS) - progress = start_sparse_progress(_("Sorting objects by packfile"), - m->num_objects); + progress = start_sparse_progress(_("Sorting objects by packfile"), + m->num_objects); display_progress(progress, 0); /* TODO: Measure QSORT() progress */ QSORT(pairs, m->num_objects, compare_pair_pos_vs_id); stop_progress(&progress); - if (flags & MIDX_PROGRESS) - progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects); + progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects); for (i = 0; i < m->num_objects; i++) { struct object_id oid; struct pack_entry e; @@ -1204,34 +1184,23 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag return verify_midx_error; } -int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags) +int expire_midx_packs(struct repository *r, const char *object_dir) { uint32_t i, *count, result = 0; struct string_list packs_to_drop = STRING_LIST_INIT_DUP; struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); - struct progress *progress = NULL; if (!m) return 0; count = xcalloc(m->num_packs, sizeof(uint32_t)); - - if (flags & MIDX_PROGRESS) - progress = start_progress(_("Counting referenced objects"), - m->num_objects); for (i = 0; i < m->num_objects; i++) { int pack_int_id = nth_midxed_pack_int_id(m, i); count[pack_int_id]++; - display_progress(progress, i + 1); } - stop_progress(&progress); - if (flags & MIDX_PROGRESS) - progress = start_progress(_("Finding and deleting unreferenced packfiles"), - m->num_packs); for (i = 0; i < m->num_packs; i++) { char *pack_name; - display_progress(progress, i + 1); if (count[i]) continue; @@ -1249,12 +1218,11 @@ int expire_midx_packs(struct repository *r, const char *object_dir, unsigned fla unlink_pack_path(pack_name, 0); free(pack_name); } - stop_progress(&progress); free(count); if (packs_to_drop.nr) - result = write_midx_internal(object_dir, m, &packs_to_drop, flags); + result = write_midx_internal(object_dir, m, &packs_to_drop); string_list_clear(&packs_to_drop, 0); return result; @@ -1348,7 +1316,7 @@ static int fill_included_packs_batch(struct repository *r, return 0; } -int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags) +int midx_repack(struct repository *r, const char *object_dir, size_t batch_size) { int result = 0; uint32_t i; @@ -1373,12 +1341,6 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, strbuf_addstr(&base_name, object_dir); strbuf_addstr(&base_name, "/pack/pack"); argv_array_push(&cmd.args, base_name.buf); - - if (flags & MIDX_PROGRESS) - argv_array_push(&cmd.args, "--progress"); - else - argv_array_push(&cmd.args, "-q"); - strbuf_release(&base_name); cmd.git_cmd = 1; @@ -1409,7 +1371,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, goto cleanup; } - result = write_midx_internal(object_dir, m, NULL, flags); + result = write_midx_internal(object_dir, m, NULL); m = NULL; cleanup: diff --git a/third_party/git/midx.h b/third_party/git/midx.h index e6fa356b5c..f0ae656b5d 100644 --- a/third_party/git/midx.h +++ b/third_party/git/midx.h @@ -37,8 +37,6 @@ struct multi_pack_index { char object_dir[FLEX_ARRAY]; }; -#define MIDX_PROGRESS (1 << 0) - struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local); int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t pack_int_id); int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result); @@ -49,11 +47,11 @@ int fill_midx_entry(struct repository *r, const struct object_id *oid, struct pa int midx_contains_pack(struct multi_pack_index *m, const char *idx_or_pack_name); int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, int local); -int write_midx_file(const char *object_dir, unsigned flags); +int write_midx_file(const char *object_dir); void clear_midx_file(struct repository *r); -int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags); -int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags); -int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags); +int verify_midx_file(struct repository *r, const char *object_dir); +int expire_midx_packs(struct repository *r, const char *object_dir); +int midx_repack(struct repository *r, const char *object_dir, size_t batch_size); void close_midx(struct multi_pack_index *m); diff --git a/third_party/git/name-hash.c b/third_party/git/name-hash.c index fb526a3775..695908609f 100644 --- a/third_party/git/name-hash.c +++ b/third_party/git/name-hash.c @@ -17,16 +17,14 @@ struct dir_entry { }; static int dir_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *keydata) { - const struct dir_entry *e1, *e2; + const struct dir_entry *e1 = entry; + const struct dir_entry *e2 = entry_or_key; const char *name = keydata; - e1 = container_of(eptr, const struct dir_entry, ent); - e2 = container_of(entry_or_key, const struct dir_entry, ent); - return e1->namelen != e2->namelen || strncasecmp(e1->name, name ? name : e2->name, e1->namelen); } @@ -35,9 +33,9 @@ static struct dir_entry *find_dir_entry__hash(struct index_state *istate, const char *name, unsigned int namelen, unsigned int hash) { struct dir_entry key; - hashmap_entry_init(&key.ent, hash); + hashmap_entry_init(&key, hash); key.namelen = namelen; - return hashmap_get_entry(&istate->dir_hash, &key, ent, name); + return hashmap_get(&istate->dir_hash, &key, name); } static struct dir_entry *find_dir_entry(struct index_state *istate, @@ -70,9 +68,9 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate, if (!dir) { /* not found, create it and add to hash table */ FLEX_ALLOC_MEM(dir, name, ce->name, namelen); - hashmap_entry_init(&dir->ent, memihash(ce->name, namelen)); + hashmap_entry_init(dir, memihash(ce->name, namelen)); dir->namelen = namelen; - hashmap_add(&istate->dir_hash, &dir->ent); + hashmap_add(&istate->dir_hash, dir); /* recursively add missing parent directories */ dir->parent = hash_dir_entry(istate, ce, namelen); @@ -97,7 +95,7 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce) struct dir_entry *dir = hash_dir_entry(istate, ce, ce_namelen(ce)); while (dir && !(--dir->nr)) { struct dir_entry *parent = dir->parent; - hashmap_remove(&istate->dir_hash, &dir->ent, NULL); + hashmap_remove(&istate->dir_hash, dir, NULL); free(dir); dir = parent; } @@ -108,23 +106,20 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce) if (ce->ce_flags & CE_HASHED) return; ce->ce_flags |= CE_HASHED; - hashmap_entry_init(&ce->ent, memihash(ce->name, ce_namelen(ce))); - hashmap_add(&istate->name_hash, &ce->ent); + hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce))); + hashmap_add(&istate->name_hash, ce); if (ignore_case) add_dir_entry(istate, ce); } static int cache_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *remove) { - const struct cache_entry *ce1, *ce2; - - ce1 = container_of(eptr, const struct cache_entry, ent); - ce2 = container_of(entry_or_key, const struct cache_entry, ent); - + const struct cache_entry *ce1 = entry; + const struct cache_entry *ce2 = entry_or_key; /* * For remove_name_hash, find the exact entry (pointer equality); for * index_file_exists, find all entries with matching hash code and @@ -138,7 +133,7 @@ static int lazy_nr_dir_threads; /* * Set a minimum number of cache_entries that we will handle per - * thread and use that to decide how many threads to run (up to + * thread and use that to decide how many threads to run (upto * the number on the system). * * For guidance setting the lower per-thread bound, see: @@ -218,7 +213,7 @@ static int lookup_lazy_params(struct index_state *istate) * However, the hashmap is going to put items into bucket * chains based on their hash values. Use that to create n * mutexes and lock on mutex[bucket(hash) % n]. This will - * decrease the collision rate by (hopefully) a factor of n. + * decrease the collision rate by (hopefully) by a factor of n. */ static void init_dir_mutex(void) { @@ -285,10 +280,10 @@ static struct dir_entry *hash_dir_entry_with_parent_and_prefix( dir = find_dir_entry__hash(istate, prefix->buf, prefix->len, hash); if (!dir) { FLEX_ALLOC_MEM(dir, name, prefix->buf, prefix->len); - hashmap_entry_init(&dir->ent, hash); + hashmap_entry_init(dir, hash); dir->namelen = prefix->len; dir->parent = parent; - hashmap_add(&istate->dir_hash, &dir->ent); + hashmap_add(&istate->dir_hash, dir); if (parent) { unlock_dir_mutex(lock_nr); @@ -477,8 +472,8 @@ static void *lazy_name_thread_proc(void *_data) for (k = 0; k < d->istate->cache_nr; k++) { struct cache_entry *ce_k = d->istate->cache[k]; ce_k->ce_flags |= CE_HASHED; - hashmap_entry_init(&ce_k->ent, d->lazy_entries[k].hash_name); - hashmap_add(&d->istate->name_hash, &ce_k->ent); + hashmap_entry_init(ce_k, d->lazy_entries[k].hash_name); + hashmap_add(&d->istate->name_hash, ce_k); } return NULL; @@ -630,7 +625,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce) if (!istate->name_hash_initialized || !(ce->ce_flags & CE_HASHED)) return; ce->ce_flags &= ~CE_HASHED; - hashmap_remove(&istate->name_hash, &ce->ent, ce); + hashmap_remove(&istate->name_hash, ce, ce); if (ignore_case) remove_dir_entry(istate, ce); @@ -707,15 +702,15 @@ void adjust_dirname_case(struct index_state *istate, char *name) struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int icase) { struct cache_entry *ce; - unsigned int hash = memihash(name, namelen); lazy_init_name_hash(istate); - ce = hashmap_get_entry_from_hash(&istate->name_hash, hash, NULL, - struct cache_entry, ent); - hashmap_for_each_entry_from(&istate->name_hash, ce, ent) { + ce = hashmap_get_from_hash(&istate->name_hash, + memihash(name, namelen), NULL); + while (ce) { if (same_name(ce, name, namelen, icase)) return ce; + ce = hashmap_get_next(&istate->name_hash, ce); } return NULL; } @@ -726,6 +721,6 @@ void free_name_hash(struct index_state *istate) return; istate->name_hash_initialized = 0; - hashmap_free(&istate->name_hash); - hashmap_free_entries(&istate->dir_hash, struct dir_entry, ent); + hashmap_free(&istate->name_hash, 0); + hashmap_free(&istate->dir_hash, 1); } diff --git a/third_party/git/notes-utils.c b/third_party/git/notes-utils.c index 4bf4888d8c..a819410698 100644 --- a/third_party/git/notes-utils.c +++ b/third_party/git/notes-utils.c @@ -52,7 +52,7 @@ void commit_notes(struct repository *r, struct notes_tree *t, const char *msg) strbuf_complete_line(&buf); create_notes_commit(r, t, NULL, buf.buf, buf.len, &commit_oid); - strbuf_insertstr(&buf, 0, "notes: "); + strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */ update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0, UPDATE_REFS_DIE_ON_ERR); diff --git a/third_party/git/notes.c b/third_party/git/notes.c index 564baac64d..75c028b300 100644 --- a/third_party/git/notes.c +++ b/third_party/git/notes.c @@ -269,10 +269,8 @@ static int note_tree_insert(struct notes_tree *t, struct int_node *tree, case PTR_TYPE_NOTE: if (oideq(&l->key_oid, &entry->key_oid)) { /* skip concatenation if l == entry */ - if (oideq(&l->val_oid, &entry->val_oid)) { - free(entry); + if (oideq(&l->val_oid, &entry->val_oid)) return 0; - } ret = combine_notes(&l->val_oid, &entry->val_oid); @@ -460,7 +458,7 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree, die("Failed to load %s %s into notes tree " "from %s", type == PTR_TYPE_NOTE ? "note" : "subtree", - oid_to_hex(&object_oid), t->ref); + oid_to_hex(&l->key_oid), t->ref); continue; @@ -576,16 +574,16 @@ redo: * the note tree that have not yet been explored. There * is a direct relationship between subtree entries at * level 'n' in the tree, and the 'fanout' variable: - * Subtree entries at level 'n < 2 * fanout' should be + * Subtree entries at level 'n <= 2 * fanout' should be * preserved, since they correspond exactly to a fanout * directory in the on-disk structure. However, subtree - * entries at level 'n >= 2 * fanout' should NOT be + * entries at level 'n > 2 * fanout' should NOT be * preserved, but rather consolidated into the above * notes tree level. We achieve this by unconditionally * unpacking subtree entries that exist below the * threshold level at 'n = 2 * fanout'. */ - if (n < 2 * fanout && + if (n <= 2 * fanout && flags & FOR_EACH_NOTE_YIELD_SUBTREES) { /* invoke callback with subtree */ unsigned int path_len = @@ -602,7 +600,7 @@ redo: path, cb_data); } - if (n >= 2 * fanout || + if (n > fanout * 2 || !(flags & FOR_EACH_NOTE_DONT_UNPACK_SUBTREES)) { /* unpack subtree and resume traversal */ tree->a[i] = NULL; @@ -723,15 +721,13 @@ static int write_each_note_helper(struct tree_write_stack *tws, struct write_each_note_data { struct tree_write_stack *root; - struct non_note **nn_list; - struct non_note *nn_prev; + struct non_note *next_non_note; }; static int write_each_non_note_until(const char *note_path, struct write_each_note_data *d) { - struct non_note *p = d->nn_prev; - struct non_note *n = p ? p->next : *d->nn_list; + struct non_note *n = d->next_non_note; int cmp = 0, ret; while (n && (!note_path || (cmp = strcmp(n->path, note_path)) <= 0)) { if (note_path && cmp == 0) @@ -742,10 +738,9 @@ static int write_each_non_note_until(const char *note_path, if (ret) return ret; } - p = n; n = n->next; } - d->nn_prev = p; + d->next_non_note = n; return 0; } @@ -1046,39 +1041,6 @@ struct notes_tree **load_notes_trees(struct string_list *refs, int flags) void init_display_notes(struct display_notes_opt *opt) { - memset(opt, 0, sizeof(*opt)); - opt->use_default_notes = -1; -} - -void enable_default_display_notes(struct display_notes_opt *opt, int *show_notes) -{ - opt->use_default_notes = 1; - *show_notes = 1; -} - -void enable_ref_display_notes(struct display_notes_opt *opt, int *show_notes, - const char *ref) { - struct strbuf buf = STRBUF_INIT; - strbuf_addstr(&buf, ref); - expand_notes_ref(&buf); - string_list_append(&opt->extra_notes_refs, - strbuf_detach(&buf, NULL)); - *show_notes = 1; -} - -void disable_display_notes(struct display_notes_opt *opt, int *show_notes) -{ - opt->use_default_notes = -1; - /* we have been strdup'ing ourselves, so trick - * string_list into free()ing strings */ - opt->extra_notes_refs.strdup_strings = 1; - string_list_clear(&opt->extra_notes_refs, 0); - opt->extra_notes_refs.strdup_strings = 0; - *show_notes = 0; -} - -void load_display_notes(struct display_notes_opt *opt) -{ char *display_ref_env; int load_config_refs = 0; display_notes_refs.strdup_strings = 1; @@ -1180,8 +1142,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result) strbuf_init(&root.buf, 256 * (32 + the_hash_algo->hexsz)); /* assume 256 entries */ root.path[0] = root.path[1] = '\0'; cb_data.root = &root; - cb_data.nn_list = &(t->first_non_note); - cb_data.nn_prev = NULL; + cb_data.next_non_note = t->first_non_note; /* Write tree objects representing current notes tree */ flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES | @@ -1283,8 +1244,10 @@ static void format_note(struct notes_tree *t, const struct object_id *object_oid if (!ref || !strcmp(ref, GIT_NOTES_DEFAULT_REF)) { strbuf_addstr(sb, "\nNotes:\n"); } else { - skip_prefix(ref, "refs/", &ref); - skip_prefix(ref, "notes/", &ref); + if (starts_with(ref, "refs/")) + ref += 5; + if (starts_with(ref, "notes/")) + ref += 6; strbuf_addf(sb, "\nNotes (%s):\n", ref); } } @@ -1334,9 +1297,9 @@ void expand_notes_ref(struct strbuf *sb) if (starts_with(sb->buf, "refs/notes/")) return; /* we're happy */ else if (starts_with(sb->buf, "notes/")) - strbuf_insertstr(sb, 0, "refs/"); + strbuf_insert(sb, 0, "refs/", 5); else - strbuf_insertstr(sb, 0, "refs/notes/"); + strbuf_insert(sb, 0, "refs/notes/", 11); } void expand_loose_notes_ref(struct strbuf *sb) diff --git a/third_party/git/notes.h b/third_party/git/notes.h index c1682c39a9..76337f2384 100644 --- a/third_party/git/notes.h +++ b/third_party/git/notes.h @@ -261,26 +261,6 @@ struct display_notes_opt { }; /* - * Initialize a display_notes_opt to its default value. - */ -void init_display_notes(struct display_notes_opt *opt); - -/* - * This family of functions enables or disables the display of notes. In - * particular, 'enable_default_display_notes' will display the default notes, - * 'enable_ref_display_notes' will display the notes ref 'ref' and - * 'disable_display_notes' will disable notes, including those added by previous - * invocations of the 'enable_*_display_notes' functions. - * - * 'show_notes' is a pointer to a boolean which will be set to 1 if notes are - * displayed, else 0. It must not be NULL. - */ -void enable_default_display_notes(struct display_notes_opt *opt, int *show_notes); -void enable_ref_display_notes(struct display_notes_opt *opt, int *show_notes, - const char *ref); -void disable_display_notes(struct display_notes_opt *opt, int *show_notes); - -/* * Load the notes machinery for displaying several notes trees. * * If 'opt' is not NULL, then it specifies additional settings for the @@ -292,16 +272,16 @@ void disable_display_notes(struct display_notes_opt *opt, int *show_notes); * - extra_notes_refs may contain a list of globs (in the same style * as notes.displayRef) where notes should be loaded from. */ -void load_display_notes(struct display_notes_opt *opt); +void init_display_notes(struct display_notes_opt *opt); /* * Append notes for the given 'object_sha1' from all trees set up by - * load_display_notes() to 'sb'. + * init_display_notes() to 'sb'. * * If 'raw' is false the note will be indented by 4 places and * a 'Notes (refname):' header added. * - * You *must* call load_display_notes() before using this function. + * You *must* call init_display_notes() before using this function. */ void format_display_notes(const struct object_id *object_oid, struct strbuf *sb, const char *output_encoding, int raw); diff --git a/third_party/git/object-store.h b/third_party/git/object-store.h index be72fee7d5..7f7b3cdd80 100644 --- a/third_party/git/object-store.h +++ b/third_party/git/object-store.h @@ -6,7 +6,6 @@ #include "list.h" #include "sha1-array.h" #include "strbuf.h" -#include "thread-utils.h" struct object_directory { struct object_directory *next; @@ -61,7 +60,6 @@ struct oid_array *odb_loose_cache(struct object_directory *odb, void odb_clear_loose_cache(struct object_directory *odb); struct packed_git { - struct hashmap_entry packmap_ent; struct packed_git *next; struct list_head mru; struct pack_window *windows; @@ -90,20 +88,6 @@ struct packed_git { struct multi_pack_index; -static inline int pack_map_entry_cmp(const void *unused_cmp_data, - const struct hashmap_entry *entry, - const struct hashmap_entry *entry2, - const void *keydata) -{ - const char *key = keydata; - const struct packed_git *pg1, *pg2; - - pg1 = container_of(entry, const struct packed_git, packmap_ent); - pg2 = container_of(entry2, const struct packed_git, packmap_ent); - - return strcmp(pg1->pack_name, key ? key : pg2->pack_name); -} - struct raw_object_store { /* * Set of all object directories; the main directory is first (and @@ -126,8 +110,6 @@ struct raw_object_store { * (see git-replace(1)). */ struct oidmap *replace_map; - unsigned replace_map_initialized : 1; - pthread_mutex_t replace_mutex; /* protect object replace functions */ struct commit_graph *commit_graph; unsigned commit_graph_attempted : 1; /* if loading has been attempted */ @@ -150,12 +132,6 @@ struct raw_object_store { struct list_head packed_git_mru; /* - * A map of packfiles to packed_git structs for tracking which - * packs have been loaded already. - */ - struct hashmap pack_map; - - /* * A fast, rough count of the number of objects in the repository. * These two fields are not meant for direct access. Use * approximate_object_count() instead. @@ -201,9 +177,8 @@ static inline void *repo_read_object_file(struct repository *r, /* Read and unpack an object file into memory, write memory to an object file */ int oid_object_info(struct repository *r, const struct object_id *, unsigned long *); -int hash_object_file(const struct git_hash_algo *algo, const void *buf, - unsigned long len, const char *type, - struct object_id *oid); +int hash_object_file(const void *buf, unsigned long len, + const char *type, struct object_id *oid); int write_object_file(const void *buf, unsigned long len, const char *type, struct object_id *oid); @@ -212,14 +187,6 @@ int hash_object_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags); -/* - * Add an object file to the in-memory object store, without writing it - * to disk. - * - * Callers are responsible for calling write_object_file to record the - * object in persistent storage before writing any other new objects - * that reference it. - */ int pretend_object_file(void *, unsigned long, enum object_type, struct object_id *oid); @@ -261,46 +228,12 @@ int has_loose_object_nonlocal(const struct object_id *); void assert_oid_type(const struct object_id *oid, enum object_type expect); -/* - * Enabling the object read lock allows multiple threads to safely call the - * following functions in parallel: repo_read_object_file(), read_object_file(), - * read_object_file_extended(), read_object_with_reference(), read_object(), - * oid_object_info() and oid_object_info_extended(). - * - * obj_read_lock() and obj_read_unlock() may also be used to protect other - * section which cannot execute in parallel with object reading. Since the used - * lock is a recursive mutex, these sections can even contain calls to object - * reading functions. However, beware that in these cases zlib inflation won't - * be performed in parallel, losing performance. - * - * TODO: oid_object_info_extended()'s call stack has a recursive behavior. If - * any of its callees end up calling it, this recursive call won't benefit from - * parallel inflation. - */ -void enable_obj_read_lock(void); -void disable_obj_read_lock(void); - -extern int obj_read_use_lock; -extern pthread_mutex_t obj_read_mutex; - -static inline void obj_read_lock(void) -{ - if(obj_read_use_lock) - pthread_mutex_lock(&obj_read_mutex); -} - -static inline void obj_read_unlock(void) -{ - if(obj_read_use_lock) - pthread_mutex_unlock(&obj_read_mutex); -} - struct object_info { /* Request */ enum object_type *typep; unsigned long *sizep; off_t *disk_sizep; - struct object_id *delta_base_oid; + unsigned char *delta_base_sha1; struct strbuf *type_name; void **contentp; @@ -338,6 +271,8 @@ struct object_info { #define OBJECT_INFO_LOOKUP_REPLACE 1 /* Allow reading from a loose object file of unknown/bogus type */ #define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2 +/* Do not check cached storage */ +#define OBJECT_INFO_SKIP_CACHED 4 /* Do not retry packed storage after checking packed and loose storage */ #define OBJECT_INFO_QUICK 8 /* Do not check loose object */ diff --git a/third_party/git/object.c b/third_party/git/object.c index 794c86650e..07bdd5b26e 100644 --- a/third_party/git/object.c +++ b/third_party/git/object.c @@ -7,6 +7,7 @@ #include "commit.h" #include "tag.h" #include "alloc.h" +#include "object-store.h" #include "packfile.h" #include "commit-graph.h" @@ -262,7 +263,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid) if ((obj && obj->type == OBJ_BLOB && repo_has_object_file(r, oid)) || (!obj && repo_has_object_file(r, oid) && oid_object_info(r, oid, NULL) == OBJ_BLOB)) { - if (check_object_signature(r, repl, NULL, 0, NULL) < 0) { + if (check_object_signature(repl, NULL, 0, NULL) < 0) { error(_("hash mismatch %s"), oid_to_hex(oid)); return NULL; } @@ -272,8 +273,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid) buffer = repo_read_object_file(r, oid, &type, &size); if (buffer) { - if (check_object_signature(r, repl, buffer, size, - type_name(type)) < 0) { + if (check_object_signature(repl, buffer, size, type_name(type)) < 0) { free(buffer); error(_("hash mismatch %s"), oid_to_hex(repl)); return NULL; @@ -308,15 +308,6 @@ int object_list_contains(struct object_list *list, struct object *obj) return 0; } -void object_list_free(struct object_list **list) -{ - while (*list) { - struct object_list *p = *list; - *list = p->next; - free(p); - } -} - /* * A zero-length string to which object_array_entry::name can be * initialized without requiring a malloc/free. @@ -489,8 +480,6 @@ struct raw_object_store *raw_object_store_new(void) memset(o, 0, sizeof(*o)); INIT_LIST_HEAD(&o->packed_git_mru); - hashmap_init(&o->pack_map, pack_map_entry_cmp, NULL, 0); - pthread_mutex_init(&o->replace_mutex, NULL); return o; } @@ -518,7 +507,6 @@ void raw_object_store_clear(struct raw_object_store *o) oidmap_free(o->replace_map, 1); FREE_AND_NULL(o->replace_map); - pthread_mutex_destroy(&o->replace_mutex); free_commit_graph(o->commit_graph); o->commit_graph = NULL; @@ -531,8 +519,6 @@ void raw_object_store_clear(struct raw_object_store *o) INIT_LIST_HEAD(&o->packed_git_mru); close_object_store(o); o->packed_git = NULL; - - hashmap_free(&o->pack_map); } void parsed_object_pool_clear(struct parsed_object_pool *o) diff --git a/third_party/git/object.h b/third_party/git/object.h index 2dbabfca0a..0120892bbd 100644 --- a/third_party/git/object.h +++ b/third_party/git/object.h @@ -68,8 +68,7 @@ struct object_array { * bisect.c: 16 * bundle.c: 16 * http-push.c: 16-----19 - * commit-graph.c: 15 - * commit-reach.c: 16-----19 + * commit-reach.c: 15-------19 * sha1-name.c: 20 * list-objects-filter.c: 21 * builtin/fsck.c: 0--3 @@ -151,8 +150,6 @@ struct object_list *object_list_insert(struct object *item, int object_list_contains(struct object_list *list, struct object *obj); -void object_list_free(struct object_list **list); - /* Object array handling .. */ void add_object_array(struct object *obj, const char *name, struct object_array *array); void add_object_array_with_path(struct object *obj, const char *name, struct object_array *array, unsigned mode, const char *path); diff --git a/third_party/git/oidmap.c b/third_party/git/oidmap.c index 423aa014a3..6d6e840d03 100644 --- a/third_party/git/oidmap.c +++ b/third_party/git/oidmap.c @@ -2,18 +2,14 @@ #include "oidmap.h" static int oidmap_neq(const void *hashmap_cmp_fn_data, - const struct hashmap_entry *e1, - const struct hashmap_entry *e2, + const void *entry, const void *entry_or_key, const void *keydata) { - const struct oidmap_entry *a, *b; - - a = container_of(e1, const struct oidmap_entry, internal_entry); - b = container_of(e2, const struct oidmap_entry, internal_entry); - + const struct oidmap_entry *entry_ = entry; if (keydata) - return !oideq(&a->oid, (const struct object_id *) keydata); - return !oideq(&a->oid, &b->oid); + return !oideq(&entry_->oid, (const struct object_id *) keydata); + return !oideq(&entry_->oid, + &((const struct oidmap_entry *) entry_or_key)->oid); } void oidmap_init(struct oidmap *map, size_t initial_size) @@ -25,9 +21,7 @@ void oidmap_free(struct oidmap *map, int free_entries) { if (!map) return; - - /* TODO: make oidmap itself not depend on struct layouts */ - hashmap_free_(&map->map, free_entries ? 0 : -1); + hashmap_free(&map->map, free_entries); } void *oidmap_get(const struct oidmap *map, const struct object_id *key) @@ -57,5 +51,5 @@ void *oidmap_put(struct oidmap *map, void *entry) oidmap_init(map, 0); hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid)); - return hashmap_put(&map->map, &to_put->internal_entry); + return hashmap_put(&map->map, to_put); } diff --git a/third_party/git/oidmap.h b/third_party/git/oidmap.h index c66a83ab1d..7a939461ff 100644 --- a/third_party/git/oidmap.h +++ b/third_party/git/oidmap.h @@ -78,16 +78,14 @@ static inline void oidmap_iter_init(struct oidmap *map, struct oidmap_iter *iter static inline void *oidmap_iter_next(struct oidmap_iter *iter) { - /* TODO: this API could be reworked to do compile-time type checks */ - return (void *)hashmap_iter_next(&iter->h_iter); + return hashmap_iter_next(&iter->h_iter); } static inline void *oidmap_iter_first(struct oidmap *map, struct oidmap_iter *iter) { oidmap_iter_init(map, iter); - /* TODO: this API could be reworked to do compile-time type checks */ - return (void *)oidmap_iter_next(iter); + return oidmap_iter_next(iter); } #endif diff --git a/third_party/git/pack-bitmap-write.c b/third_party/git/pack-bitmap-write.c index a7a4964b50..fa78a460c9 100644 --- a/third_party/git/pack-bitmap-write.c +++ b/third_party/git/pack-bitmap-write.c @@ -144,7 +144,7 @@ static inline void reset_all_seen(void) static uint32_t find_object_pos(const struct object_id *oid) { - struct object_entry *entry = packlist_find(writer.to_pack, oid); + struct object_entry *entry = packlist_find(writer.to_pack, oid, NULL); if (!entry) { die("Failed to write bitmap index. Packfile doesn't have full closure " diff --git a/third_party/git/pack-bitmap.c b/third_party/git/pack-bitmap.c index 49a8d10d0c..ed2befaac6 100644 --- a/third_party/git/pack-bitmap.c +++ b/third_party/git/pack-bitmap.c @@ -12,7 +12,6 @@ #include "packfile.h" #include "repository.h" #include "object-store.h" -#include "list-objects-filter-options.h" /* * An entry on the bitmap index, representing the bitmap for a given @@ -170,7 +169,7 @@ static int load_bitmap_header(struct bitmap_index *index) static struct stored_bitmap *store_bitmap(struct bitmap_index *index, struct ewah_bitmap *root, - const struct object_id *oid, + const unsigned char *hash, struct stored_bitmap *xor_with, int flags) { @@ -182,7 +181,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index, stored->root = root; stored->xor = xor_with; stored->flags = flags; - oidcpy(&stored->oid, oid); + oidread(&stored->oid, hash); hash_pos = kh_put_oid_map(index->bitmaps, stored->oid, &ret); @@ -190,7 +189,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index, * because the SHA1 already existed on the map. this is bad, there * shouldn't be duplicated commits in the index */ if (ret == 0) { - error("Duplicate entry in bitmap index: %s", oid_to_hex(oid)); + error("Duplicate entry in bitmap index: %s", hash_to_hex(hash)); return NULL; } @@ -222,13 +221,13 @@ static int load_bitmap_entries_v1(struct bitmap_index *index) struct ewah_bitmap *bitmap = NULL; struct stored_bitmap *xor_bitmap = NULL; uint32_t commit_idx_pos; - struct object_id oid; + const unsigned char *sha1; commit_idx_pos = read_be32(index->map, &index->map_pos); xor_offset = read_u8(index->map, &index->map_pos); flags = read_u8(index->map, &index->map_pos); - nth_packed_object_id(&oid, index->pack, commit_idx_pos); + sha1 = nth_packed_object_sha1(index->pack, commit_idx_pos); bitmap = read_bitmap_1(index); if (!bitmap) @@ -245,7 +244,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index) } recent_bitmaps[i % MAX_XOR_OFFSET] = store_bitmap( - index, bitmap, &oid, xor_bitmap, flags); + index, bitmap, sha1, xor_bitmap, flags); } return 0; @@ -327,13 +326,6 @@ failed: munmap(bitmap_git->map, bitmap_git->map_size); bitmap_git->map = NULL; bitmap_git->map_size = 0; - - kh_destroy_oid_map(bitmap_git->bitmaps); - bitmap_git->bitmaps = NULL; - - kh_destroy_oid_pos(bitmap_git->ext_index.positions); - bitmap_git->ext_index.positions = NULL; - return -1; } @@ -607,7 +599,6 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git, } static void show_extended_objects(struct bitmap_index *bitmap_git, - struct rev_info *revs, show_reachable_fn show_reach) { struct bitmap *objects = bitmap_git->result; @@ -621,48 +612,17 @@ static void show_extended_objects(struct bitmap_index *bitmap_git, continue; obj = eindex->objects[i]; - if ((obj->type == OBJ_BLOB && !revs->blob_objects) || - (obj->type == OBJ_TREE && !revs->tree_objects) || - (obj->type == OBJ_TAG && !revs->tag_objects)) - continue; - show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0); } } -static void init_type_iterator(struct ewah_iterator *it, - struct bitmap_index *bitmap_git, - enum object_type type) -{ - switch (type) { - case OBJ_COMMIT: - ewah_iterator_init(it, bitmap_git->commits); - break; - - case OBJ_TREE: - ewah_iterator_init(it, bitmap_git->trees); - break; - - case OBJ_BLOB: - ewah_iterator_init(it, bitmap_git->blobs); - break; - - case OBJ_TAG: - ewah_iterator_init(it, bitmap_git->tags); - break; - - default: - BUG("object type %d not stored by bitmap type index", type); - break; - } -} - static void show_objects_for_type( struct bitmap_index *bitmap_git, + struct ewah_bitmap *type_filter, enum object_type object_type, show_reachable_fn show_reach) { - size_t i = 0; + size_t pos = 0, i = 0; uint32_t offset; struct ewah_iterator it; @@ -670,15 +630,13 @@ static void show_objects_for_type( struct bitmap *objects = bitmap_git->result; - init_type_iterator(&it, bitmap_git, object_type); + if (bitmap_git->reuse_objects == bitmap_git->pack->num_objects) + return; - for (i = 0; i < objects->word_alloc && - ewah_iterator_next(&filter, &it); i++) { - eword_t word = objects->words[i] & filter; - size_t pos = (i * BITS_IN_EWORD); + ewah_iterator_init(&it, type_filter); - if (!word) - continue; + while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) { + eword_t word = objects->words[i] & filter; for (offset = 0; offset < BITS_IN_EWORD; ++offset) { struct object_id oid; @@ -690,14 +648,20 @@ static void show_objects_for_type( offset += ewah_bit_ctz64(word >> offset); + if (pos + offset < bitmap_git->reuse_objects) + continue; + entry = &bitmap_git->pack->revindex[pos + offset]; - nth_packed_object_id(&oid, bitmap_git->pack, entry->nr); + nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr); if (bitmap_git->hashes) hash = get_be32(bitmap_git->hashes + entry->nr); show_reach(&oid, object_type, 0, hash, bitmap_git->pack, entry->offset); } + + pos += BITS_IN_EWORD; + i++; } } @@ -715,179 +679,7 @@ static int in_bitmapped_pack(struct bitmap_index *bitmap_git, return 0; } -static struct bitmap *find_tip_blobs(struct bitmap_index *bitmap_git, - struct object_list *tip_objects) -{ - struct bitmap *result = bitmap_new(); - struct object_list *p; - - for (p = tip_objects; p; p = p->next) { - int pos; - - if (p->item->type != OBJ_BLOB) - continue; - - pos = bitmap_position(bitmap_git, &p->item->oid); - if (pos < 0) - continue; - - bitmap_set(result, pos); - } - - return result; -} - -static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git, - struct object_list *tip_objects, - struct bitmap *to_filter) -{ - struct eindex *eindex = &bitmap_git->ext_index; - struct bitmap *tips; - struct ewah_iterator it; - eword_t mask; - uint32_t i; - - /* - * The non-bitmap version of this filter never removes - * blobs which the other side specifically asked for, - * so we must match that behavior. - */ - tips = find_tip_blobs(bitmap_git, tip_objects); - - /* - * We can use the blob type-bitmap to work in whole words - * for the objects that are actually in the bitmapped packfile. - */ - for (i = 0, init_type_iterator(&it, bitmap_git, OBJ_BLOB); - i < to_filter->word_alloc && ewah_iterator_next(&mask, &it); - i++) { - if (i < tips->word_alloc) - mask &= ~tips->words[i]; - to_filter->words[i] &= ~mask; - } - - /* - * Clear any blobs that weren't in the packfile (and so would not have - * been caught by the loop above. We'll have to check them - * individually. - */ - for (i = 0; i < eindex->count; i++) { - uint32_t pos = i + bitmap_git->pack->num_objects; - if (eindex->objects[i]->type == OBJ_BLOB && - bitmap_get(to_filter, pos) && - !bitmap_get(tips, pos)) - bitmap_unset(to_filter, pos); - } - - bitmap_free(tips); -} - -static unsigned long get_size_by_pos(struct bitmap_index *bitmap_git, - uint32_t pos) -{ - struct packed_git *pack = bitmap_git->pack; - unsigned long size; - struct object_info oi = OBJECT_INFO_INIT; - - oi.sizep = &size; - - if (pos < pack->num_objects) { - struct revindex_entry *entry = &pack->revindex[pos]; - if (packed_object_info(the_repository, pack, - entry->offset, &oi) < 0) { - struct object_id oid; - nth_packed_object_id(&oid, pack, entry->nr); - die(_("unable to get size of %s"), oid_to_hex(&oid)); - } - } else { - struct eindex *eindex = &bitmap_git->ext_index; - struct object *obj = eindex->objects[pos - pack->num_objects]; - if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0) - die(_("unable to get size of %s"), oid_to_hex(&obj->oid)); - } - - return size; -} - -static void filter_bitmap_blob_limit(struct bitmap_index *bitmap_git, - struct object_list *tip_objects, - struct bitmap *to_filter, - unsigned long limit) -{ - struct eindex *eindex = &bitmap_git->ext_index; - struct bitmap *tips; - struct ewah_iterator it; - eword_t mask; - uint32_t i; - - tips = find_tip_blobs(bitmap_git, tip_objects); - - for (i = 0, init_type_iterator(&it, bitmap_git, OBJ_BLOB); - i < to_filter->word_alloc && ewah_iterator_next(&mask, &it); - i++) { - eword_t word = to_filter->words[i] & mask; - unsigned offset; - - for (offset = 0; offset < BITS_IN_EWORD; offset++) { - uint32_t pos; - - if ((word >> offset) == 0) - break; - offset += ewah_bit_ctz64(word >> offset); - pos = i * BITS_IN_EWORD + offset; - - if (!bitmap_get(tips, pos) && - get_size_by_pos(bitmap_git, pos) >= limit) - bitmap_unset(to_filter, pos); - } - } - - for (i = 0; i < eindex->count; i++) { - uint32_t pos = i + bitmap_git->pack->num_objects; - if (eindex->objects[i]->type == OBJ_BLOB && - bitmap_get(to_filter, pos) && - !bitmap_get(tips, pos) && - get_size_by_pos(bitmap_git, pos) >= limit) - bitmap_unset(to_filter, pos); - } - - bitmap_free(tips); -} - -static int filter_bitmap(struct bitmap_index *bitmap_git, - struct object_list *tip_objects, - struct bitmap *to_filter, - struct list_objects_filter_options *filter) -{ - if (!filter || filter->choice == LOFC_DISABLED) - return 0; - - if (filter->choice == LOFC_BLOB_NONE) { - if (bitmap_git) - filter_bitmap_blob_none(bitmap_git, tip_objects, - to_filter); - return 0; - } - - if (filter->choice == LOFC_BLOB_LIMIT) { - if (bitmap_git) - filter_bitmap_blob_limit(bitmap_git, tip_objects, - to_filter, - filter->blob_limit_value); - return 0; - } - - /* filter choice not handled */ - return -1; -} - -static int can_filter_bitmap(struct list_objects_filter_options *filter) -{ - return !filter_bitmap(NULL, NULL, NULL, filter); -} - -struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, - struct list_objects_filter_options *filter) +struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs) { unsigned int i; @@ -897,22 +689,9 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, struct bitmap *wants_bitmap = NULL; struct bitmap *haves_bitmap = NULL; - struct bitmap_index *bitmap_git; - - /* - * We can't do pathspec limiting with bitmaps, because we don't know - * which commits are associated with which object changes (let alone - * even which objects are associated with which paths). - */ - if (revs->prune) - return NULL; - - if (!can_filter_bitmap(filter)) - return NULL; - + struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git)); /* try to open a bitmapped pack, but don't parse it yet * because we may not need to use it */ - bitmap_git = xcalloc(1, sizeof(*bitmap_git)); if (open_pack_bitmap(revs->repo, bitmap_git) < 0) goto cleanup; @@ -930,7 +709,9 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, else object_list_insert(object, &wants); - object = parse_object_or_die(get_tagged_oid(tag), NULL); + if (!tag->tagged) + die("bad tag"); + object = parse_object_or_die(&tag->tagged->oid, NULL); } if (object->flags & UNINTERESTING) @@ -979,173 +760,93 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, if (haves_bitmap) bitmap_and_not(wants_bitmap, haves_bitmap); - filter_bitmap(bitmap_git, wants, wants_bitmap, filter); - bitmap_git->result = wants_bitmap; bitmap_git->haves = haves_bitmap; - object_list_free(&wants); - object_list_free(&haves); - return bitmap_git; cleanup: free_bitmap_index(bitmap_git); - object_list_free(&wants); - object_list_free(&haves); return NULL; } -static void try_partial_reuse(struct bitmap_index *bitmap_git, - size_t pos, - struct bitmap *reuse, - struct pack_window **w_curs) +int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git, + struct packed_git **packfile, + uint32_t *entries, + off_t *up_to) { - struct revindex_entry *revidx; - off_t offset; - enum object_type type; - unsigned long size; - - if (pos >= bitmap_git->pack->num_objects) - return; /* not actually in the pack */ - - revidx = &bitmap_git->pack->revindex[pos]; - offset = revidx->offset; - type = unpack_object_header(bitmap_git->pack, w_curs, &offset, &size); - if (type < 0) - return; /* broken packfile, punt */ - - if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA) { - off_t base_offset; - int base_pos; - - /* - * Find the position of the base object so we can look it up - * in our bitmaps. If we can't come up with an offset, or if - * that offset is not in the revidx, the pack is corrupt. - * There's nothing we can do, so just punt on this object, - * and the normal slow path will complain about it in - * more detail. - */ - base_offset = get_delta_base(bitmap_git->pack, w_curs, - &offset, type, revidx->offset); - if (!base_offset) - return; - base_pos = find_revindex_position(bitmap_git->pack, base_offset); - if (base_pos < 0) - return; - - /* - * We assume delta dependencies always point backwards. This - * lets us do a single pass, and is basically always true - * due to the way OFS_DELTAs work. You would not typically - * find REF_DELTA in a bitmapped pack, since we only bitmap - * packs we write fresh, and OFS_DELTA is the default). But - * let's double check to make sure the pack wasn't written with - * odd parameters. - */ - if (base_pos >= pos) - return; - - /* - * And finally, if we're not sending the base as part of our - * reuse chunk, then don't send this object either. The base - * would come after us, along with other objects not - * necessarily in the pack, which means we'd need to convert - * to REF_DELTA on the fly. Better to just let the normal - * object_entry code path handle it. - */ - if (!bitmap_get(reuse, base_pos)) - return; - } - /* - * If we got here, then the object is OK to reuse. Mark it. + * Reuse the packfile content if we need more than + * 90% of its objects */ - bitmap_set(reuse, pos); -} + static const double REUSE_PERCENT = 0.9; -int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git, - struct packed_git **packfile_out, - uint32_t *entries, - struct bitmap **reuse_out) -{ struct bitmap *result = bitmap_git->result; - struct bitmap *reuse; - struct pack_window *w_curs = NULL; - size_t i = 0; - uint32_t offset; + uint32_t reuse_threshold; + uint32_t i, reuse_objects = 0; assert(result); - while (i < result->word_alloc && result->words[i] == (eword_t)~0) - i++; - - /* Don't mark objects not in the packfile */ - if (i > bitmap_git->pack->num_objects / BITS_IN_EWORD) - i = bitmap_git->pack->num_objects / BITS_IN_EWORD; + for (i = 0; i < result->word_alloc; ++i) { + if (result->words[i] != (eword_t)~0) { + reuse_objects += ewah_bit_ctz64(~result->words[i]); + break; + } - reuse = bitmap_word_alloc(i); - memset(reuse->words, 0xFF, i * sizeof(eword_t)); + reuse_objects += BITS_IN_EWORD; + } - for (; i < result->word_alloc; ++i) { - eword_t word = result->words[i]; - size_t pos = (i * BITS_IN_EWORD); +#ifdef GIT_BITMAP_DEBUG + { + const unsigned char *sha1; + struct revindex_entry *entry; - for (offset = 0; offset < BITS_IN_EWORD; ++offset) { - if ((word >> offset) == 0) - break; + entry = &bitmap_git->reverse_index->revindex[reuse_objects]; + sha1 = nth_packed_object_sha1(bitmap_git->pack, entry->nr); - offset += ewah_bit_ctz64(word >> offset); - try_partial_reuse(bitmap_git, pos + offset, reuse, &w_curs); - } + fprintf(stderr, "Failed to reuse at %d (%016llx)\n", + reuse_objects, result->words[i]); + fprintf(stderr, " %s\n", hash_to_hex(sha1)); } +#endif - unuse_pack(&w_curs); - - *entries = bitmap_popcount(reuse); - if (!*entries) { - bitmap_free(reuse); + if (!reuse_objects) return -1; + + if (reuse_objects >= bitmap_git->pack->num_objects) { + bitmap_git->reuse_objects = *entries = bitmap_git->pack->num_objects; + *up_to = -1; /* reuse the full pack */ + *packfile = bitmap_git->pack; + return 0; } - /* - * Drop any reused objects from the result, since they will not - * need to be handled separately. - */ - bitmap_and_not(result, reuse); - *packfile_out = bitmap_git->pack; - *reuse_out = reuse; - return 0; -} + reuse_threshold = bitmap_popcount(bitmap_git->result) * REUSE_PERCENT; -int bitmap_walk_contains(struct bitmap_index *bitmap_git, - struct bitmap *bitmap, const struct object_id *oid) -{ - int idx; + if (reuse_objects < reuse_threshold) + return -1; - if (!bitmap) - return 0; + bitmap_git->reuse_objects = *entries = reuse_objects; + *up_to = bitmap_git->pack->revindex[reuse_objects].offset; + *packfile = bitmap_git->pack; - idx = bitmap_position(bitmap_git, oid); - return idx >= 0 && bitmap_get(bitmap, idx); + return 0; } void traverse_bitmap_commit_list(struct bitmap_index *bitmap_git, - struct rev_info *revs, show_reachable_fn show_reachable) { assert(bitmap_git->result); - show_objects_for_type(bitmap_git, OBJ_COMMIT, show_reachable); - if (revs->tree_objects) - show_objects_for_type(bitmap_git, OBJ_TREE, show_reachable); - if (revs->blob_objects) - show_objects_for_type(bitmap_git, OBJ_BLOB, show_reachable); - if (revs->tag_objects) - show_objects_for_type(bitmap_git, OBJ_TAG, show_reachable); + show_objects_for_type(bitmap_git, bitmap_git->commits, + OBJ_COMMIT, show_reachable); + show_objects_for_type(bitmap_git, bitmap_git->trees, + OBJ_TREE, show_reachable); + show_objects_for_type(bitmap_git, bitmap_git->blobs, + OBJ_BLOB, show_reachable); + show_objects_for_type(bitmap_git, bitmap_git->tags, + OBJ_TAG, show_reachable); - show_extended_objects(bitmap_git, revs, show_reachable); + show_extended_objects(bitmap_git, show_reachable); } static uint32_t count_object_type(struct bitmap_index *bitmap_git, @@ -1158,7 +859,26 @@ static uint32_t count_object_type(struct bitmap_index *bitmap_git, struct ewah_iterator it; eword_t filter; - init_type_iterator(&it, bitmap_git, type); + switch (type) { + case OBJ_COMMIT: + ewah_iterator_init(&it, bitmap_git->commits); + break; + + case OBJ_TREE: + ewah_iterator_init(&it, bitmap_git->trees); + break; + + case OBJ_BLOB: + ewah_iterator_init(&it, bitmap_git->blobs); + break; + + case OBJ_TAG: + ewah_iterator_init(&it, bitmap_git->tags); + break; + + default: + return 0; + } while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) { eword_t word = objects->words[i++] & filter; @@ -1342,8 +1062,8 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git, struct object_entry *oe; entry = &bitmap_git->pack->revindex[i]; - nth_packed_object_id(&oid, bitmap_git->pack, entry->nr); - oe = packlist_find(mapping, &oid); + nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr); + oe = packlist_find(mapping, &oid, NULL); if (oe) reposition[i] = oe_in_pack_pos(mapping, oe) + 1; @@ -1400,6 +1120,16 @@ void free_bitmap_index(struct bitmap_index *b) int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git, const struct object_id *oid) { - return bitmap_git && - bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid); + int pos; + + if (!bitmap_git) + return 0; /* no bitmap loaded */ + if (!bitmap_git->haves) + return 0; /* walk had no "haves" */ + + pos = bitmap_position_packfile(bitmap_git, oid); + if (pos < 0) + return 0; + + return bitmap_get(bitmap_git->haves, pos); } diff --git a/third_party/git/pack-bitmap.h b/third_party/git/pack-bitmap.h index 1203120c43..00de3ec8e4 100644 --- a/third_party/git/pack-bitmap.h +++ b/third_party/git/pack-bitmap.h @@ -3,24 +3,22 @@ #include "ewah/ewok.h" #include "khash.h" -#include "pack.h" #include "pack-objects.h" struct commit; struct repository; struct rev_info; -struct list_objects_filter_options; - -static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'}; struct bitmap_disk_header { - char magic[ARRAY_SIZE(BITMAP_IDX_SIGNATURE)]; + char magic[4]; uint16_t version; uint16_t options; uint32_t entry_count; unsigned char checksum[GIT_MAX_RAWSZ]; }; +static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'}; + #define NEEDS_BITMAP (1u<<22) enum pack_bitmap_opts { @@ -46,20 +44,15 @@ struct bitmap_index *prepare_bitmap_git(struct repository *r); void count_bitmap_commit_list(struct bitmap_index *, uint32_t *commits, uint32_t *trees, uint32_t *blobs, uint32_t *tags); void traverse_bitmap_commit_list(struct bitmap_index *, - struct rev_info *revs, show_reachable_fn show_reachable); void test_bitmap_walk(struct rev_info *revs); -struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs, - struct list_objects_filter_options *filter); +struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs); int reuse_partial_packfile_from_bitmap(struct bitmap_index *, struct packed_git **packfile, - uint32_t *entries, - struct bitmap **reuse_out); + uint32_t *entries, off_t *up_to); int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping, kh_oid_map_t *reused_bitmaps, int show_progress); void free_bitmap_index(struct bitmap_index *); -int bitmap_walk_contains(struct bitmap_index *, - struct bitmap *bitmap, const struct object_id *oid); /* * After a traversal has been performed by prepare_bitmap_walk(), this can be diff --git a/third_party/git/pack-check.c b/third_party/git/pack-check.c index dad6d8ae7f..2cc3603189 100644 --- a/third_party/git/pack-check.c +++ b/third_party/git/pack-check.c @@ -8,6 +8,10 @@ struct idx_entry { off_t offset; + union idx_entry_object { + const unsigned char *hash; + struct object_id *oid; + } oid; unsigned int nr; }; @@ -63,23 +67,23 @@ static int verify_packfile(struct repository *r, if (!is_pack_valid(p)) return error("packfile %s cannot be accessed", p->pack_name); - r->hash_algo->init_fn(&ctx); + the_hash_algo->init_fn(&ctx); do { unsigned long remaining; unsigned char *in = use_pack(p, w_curs, offset, &remaining); offset += remaining; if (!pack_sig_ofs) - pack_sig_ofs = p->pack_size - r->hash_algo->rawsz; + pack_sig_ofs = p->pack_size - the_hash_algo->rawsz; if (offset > pack_sig_ofs) remaining -= (unsigned int)(offset - pack_sig_ofs); - r->hash_algo->update_fn(&ctx, in, remaining); + the_hash_algo->update_fn(&ctx, in, remaining); } while (offset < pack_sig_ofs); - r->hash_algo->final_fn(hash, &ctx); + the_hash_algo->final_fn(hash, &ctx); pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL); if (!hasheq(hash, pack_sig)) err = error("%s pack checksum mismatch", p->pack_name); - if (!hasheq(index_base + index_size - r->hash_algo->hexsz, pack_sig)) + if (!hasheq(index_base + index_size - the_hash_algo->hexsz, pack_sig)) err = error("%s pack checksum does not match its index", p->pack_name); unuse_pack(w_curs); @@ -93,6 +97,9 @@ static int verify_packfile(struct repository *r, entries[nr_objects].offset = pack_sig_ofs; /* first sort entries by pack offset, since unpacking them is more efficient that way */ for (i = 0; i < nr_objects; i++) { + entries[i].oid.hash = nth_packed_object_sha1(p, i); + if (!entries[i].oid.hash) + die("internal error pack-check nth-packed-object"); entries[i].offset = nth_packed_object_offset(p, i); entries[i].nr = i; } @@ -100,16 +107,11 @@ static int verify_packfile(struct repository *r, for (i = 0; i < nr_objects; i++) { void *data; - struct object_id oid; enum object_type type; unsigned long size; off_t curpos; int data_valid; - if (nth_packed_object_id(&oid, p, entries[i].nr) < 0) - BUG("unable to get oid of object %lu from %s", - (unsigned long)entries[i].nr, p->pack_name); - if (p->index_version > 1) { off_t offset = entries[i].offset; off_t len = entries[i+1].offset - offset; @@ -117,7 +119,7 @@ static int verify_packfile(struct repository *r, if (check_pack_crc(p, w_curs, offset, len, nr)) err = error("index CRC mismatch for object %s " "from %s at offset %"PRIuMAX"", - oid_to_hex(&oid), + oid_to_hex(entries[i].oid.oid), p->pack_name, (uintmax_t)offset); } @@ -140,14 +142,14 @@ static int verify_packfile(struct repository *r, if (data_valid && !data) err = error("cannot unpack %s from %s at offset %"PRIuMAX"", - oid_to_hex(&oid), p->pack_name, + oid_to_hex(entries[i].oid.oid), p->pack_name, (uintmax_t)entries[i].offset); - else if (check_object_signature(r, &oid, data, size, type_name(type))) + else if (check_object_signature(entries[i].oid.oid, data, size, type_name(type))) err = error("packed %s from %s is corrupt", - oid_to_hex(&oid), p->pack_name); + oid_to_hex(entries[i].oid.oid), p->pack_name); else if (fn) { int eaten = 0; - err |= fn(&oid, type, size, data, &eaten); + err |= fn(entries[i].oid.oid, type, size, data, &eaten); if (eaten) data = NULL; } diff --git a/third_party/git/pack-objects.c b/third_party/git/pack-objects.c index f2a433885a..52560293b6 100644 --- a/third_party/git/pack-objects.c +++ b/third_party/git/pack-objects.c @@ -68,7 +68,8 @@ static void rehash_objects(struct packing_data *pdata) } struct object_entry *packlist_find(struct packing_data *pdata, - const struct object_id *oid) + const struct object_id *oid, + uint32_t *index_pos) { uint32_t i; int found; @@ -78,6 +79,9 @@ struct object_entry *packlist_find(struct packing_data *pdata, i = locate_object_entry_hash(pdata, oid, &found); + if (index_pos) + *index_pos = i; + if (!found) return NULL; @@ -119,10 +123,7 @@ void oe_map_new_pack(struct packing_data *pack) { uint32_t i; - if (pack->in_pack) - BUG("packing_data has already been converted to pack array"); - - ALLOC_ARRAY(pack->in_pack, pack->nr_alloc); + REALLOC_ARRAY(pack->in_pack, pack->nr_alloc); for (i = 0; i < pack->nr_objects; i++) pack->in_pack[i] = oe_in_pack(pack, pack->objects + i); @@ -152,7 +153,8 @@ void prepare_packing_data(struct repository *r, struct packing_data *pdata) } struct object_entry *packlist_alloc(struct packing_data *pdata, - const struct object_id *oid) + const unsigned char *sha1, + uint32_t index_pos) { struct object_entry *new_entry; @@ -175,19 +177,12 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, new_entry = pdata->objects + pdata->nr_objects++; memset(new_entry, 0, sizeof(*new_entry)); - oidcpy(&new_entry->idx.oid, oid); + hashcpy(new_entry->idx.oid.hash, sha1); if (pdata->index_size * 3 <= pdata->nr_objects * 4) rehash_objects(pdata); - else { - int found; - uint32_t pos = locate_object_entry_hash(pdata, - &new_entry->idx.oid, - &found); - if (found) - BUG("duplicate object inserted into hash"); - pdata->index[pos] = pdata->nr_objects; - } + else + pdata->index[index_pos] = pdata->nr_objects; if (pdata->in_pack) pdata->in_pack[pdata->nr_objects - 1] = NULL; @@ -203,14 +198,14 @@ struct object_entry *packlist_alloc(struct packing_data *pdata, void oe_set_delta_ext(struct packing_data *pdata, struct object_entry *delta, - const struct object_id *oid) + const unsigned char *sha1) { struct object_entry *base; ALLOC_GROW(pdata->ext_bases, pdata->nr_ext + 1, pdata->alloc_ext); base = &pdata->ext_bases[pdata->nr_ext++]; memset(base, 0, sizeof(*base)); - oidcpy(&base->idx.oid, oid); + hashcpy(base->idx.oid.hash, sha1); /* These flags mark that we are not part of the actual pack output. */ base->preferred_base = 1; diff --git a/third_party/git/pack-objects.h b/third_party/git/pack-objects.h index 9d88e3e518..857d43850b 100644 --- a/third_party/git/pack-objects.h +++ b/third_party/git/pack-objects.h @@ -183,10 +183,12 @@ static inline void packing_data_unlock(struct packing_data *pdata) } struct object_entry *packlist_alloc(struct packing_data *pdata, - const struct object_id *oid); + const unsigned char *sha1, + uint32_t index_pos); struct object_entry *packlist_find(struct packing_data *pdata, - const struct object_id *oid); + const struct object_id *oid, + uint32_t *index_pos); static inline uint32_t pack_name_hash(const char *name) { @@ -251,21 +253,12 @@ static inline void oe_set_in_pack(struct packing_data *pack, struct object_entry *e, struct packed_git *p) { - if (pack->in_pack_by_idx) { - if (p->index) { - e->in_pack_idx = p->index; - return; - } - /* - * We're accessing packs by index, but this pack doesn't have - * an index (e.g., because it was added since we created the - * in_pack_by_idx array). Bail to oe_map_new_pack(), which - * will convert us to using the full in_pack array, and then - * fall through to our in_pack handling. - */ + if (!p->index) oe_map_new_pack(pack); - } - pack->in_pack[e - pack->objects] = p; + if (pack->in_pack_by_idx) + e->in_pack_idx = p->index; + else + pack->in_pack[e - pack->objects] = p; } static inline struct object_entry *oe_delta( @@ -292,7 +285,7 @@ static inline void oe_set_delta(struct packing_data *pack, void oe_set_delta_ext(struct packing_data *pack, struct object_entry *e, - const struct object_id *oid); + const unsigned char *sha1); static inline struct object_entry *oe_delta_child( const struct packing_data *pack, diff --git a/third_party/git/pack-write.c b/third_party/git/pack-write.c index f0017beb9d..29d17a9bec 100644 --- a/third_party/git/pack-write.c +++ b/third_party/git/pack-write.c @@ -349,7 +349,7 @@ void finish_tmp_packfile(struct strbuf *name_buffer, struct pack_idx_entry **written_list, uint32_t nr_written, struct pack_idx_option *pack_idx_opts, - unsigned char hash[]) + unsigned char sha1[]) { const char *idx_tmp_name; int basename_len = name_buffer->len; @@ -358,18 +358,18 @@ void finish_tmp_packfile(struct strbuf *name_buffer, die_errno("unable to make temporary pack file readable"); idx_tmp_name = write_idx_file(NULL, written_list, nr_written, - pack_idx_opts, hash); + pack_idx_opts, sha1); if (adjust_shared_perm(idx_tmp_name)) die_errno("unable to make temporary index file readable"); - strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash)); + strbuf_addf(name_buffer, "%s.pack", sha1_to_hex(sha1)); if (rename(pack_tmp_name, name_buffer->buf)) die_errno("unable to rename temporary pack file"); strbuf_setlen(name_buffer, basename_len); - strbuf_addf(name_buffer, "%s.idx", hash_to_hex(hash)); + strbuf_addf(name_buffer, "%s.idx", sha1_to_hex(sha1)); if (rename(idx_tmp_name, name_buffer->buf)) die_errno("unable to rename temporary index file"); diff --git a/third_party/git/packfile.c b/third_party/git/packfile.c index f4e752996d..fc43a6c52c 100644 --- a/third_party/git/packfile.c +++ b/third_party/git/packfile.c @@ -6,6 +6,7 @@ #include "mergesort.h" #include "packfile.h" #include "delta.h" +#include "list.h" #include "streaming.h" #include "sha1-lookup.h" #include "commit.h" @@ -16,15 +17,14 @@ #include "object-store.h" #include "midx.h" #include "commit-graph.h" -#include "promisor-remote.h" char *odb_pack_name(struct strbuf *buf, - const unsigned char *hash, + const unsigned char *sha1, const char *ext) { strbuf_reset(buf); strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(), - hash_to_hex(hash), ext); + sha1_to_hex(sha1), ext); return buf->buf; } @@ -287,6 +287,13 @@ static int unuse_one_window(struct packed_git *current) return 0; } +void release_pack_memory(size_t need) +{ + size_t cur = pack_mapped; + while (need >= (cur - pack_mapped) && unuse_one_window(NULL)) + ; /* nothing */ +} + void close_pack_windows(struct packed_git *p) { while (p->windows) { @@ -510,6 +517,7 @@ static int open_packed_git_1(struct packed_git *p) struct pack_header hdr; unsigned char hash[GIT_MAX_RAWSZ]; unsigned char *idx_hash; + long fd_flag; ssize_t read_result; const unsigned hashsz = the_hash_algo->rawsz; @@ -553,6 +561,16 @@ static int open_packed_git_1(struct packed_git *p) } else if (p->pack_size != st.st_size) return error("packfile %s size changed", p->pack_name); + /* We leave these file descriptors open with sliding mmap; + * there is no point keeping them open across exec(), though. + */ + fd_flag = fcntl(p->pack_fd, F_GETFD, 0); + if (fd_flag < 0) + return error("cannot determine file descriptor flags"); + fd_flag |= FD_CLOEXEC; + if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1) + return error("cannot set FD_CLOEXEC"); + /* Verify we recognize this pack file format. */ read_result = read_in_full(p->pack_fd, &hdr, sizeof(hdr)); if (read_result < 0) @@ -576,8 +594,9 @@ static int open_packed_git_1(struct packed_git *p) " while index indicates %"PRIu32" objects", p->pack_name, ntohl(hdr.hdr_entries), p->num_objects); - read_result = pread_in_full(p->pack_fd, hash, hashsz, - p->pack_size - hashsz); + if (lseek(p->pack_fd, p->pack_size - hashsz, SEEK_SET) == -1) + return error("end of packfile %s is unavailable", p->pack_name); + read_result = read_in_full(p->pack_fd, hash, hashsz); if (read_result < 0) return error_errno("error reading from %s", p->pack_name); if (read_result != hashsz) @@ -691,12 +710,23 @@ void unuse_pack(struct pack_window **w_cursor) } } +static void try_to_free_pack_memory(size_t size) +{ + release_pack_memory(size); +} + struct packed_git *add_packed_git(const char *path, size_t path_len, int local) { + static int have_set_try_to_free_routine; struct stat st; size_t alloc; struct packed_git *p; + if (!have_set_try_to_free_routine) { + have_set_try_to_free_routine = 1; + set_try_to_free_routine(try_to_free_pack_memory); + } + /* * Make sure a corresponding .pack file exists and that * the index looks sane. @@ -745,9 +775,6 @@ void install_packed_git(struct repository *r, struct packed_git *pack) pack->next = r->objects->packed_git; r->objects->packed_git = pack; - - hashmap_entry_init(&pack->packmap_ent, strhash(pack->pack_name)); - hashmap_add(&r->objects->pack_map, &pack->packmap_ent); } void (*report_garbage)(unsigned seen_bits, const char *path); @@ -847,18 +874,20 @@ static void prepare_pack(const char *full_name, size_t full_name_len, if (strip_suffix_mem(full_name, &base_len, ".idx") && !(data->m && midx_contains_pack(data->m, file_name))) { - struct hashmap_entry hent; - char *pack_name = xstrfmt("%.*s.pack", (int)base_len, full_name); - unsigned int hash = strhash(pack_name); - hashmap_entry_init(&hent, hash); - /* Don't reopen a pack we already have. */ - if (!hashmap_get(&data->r->objects->pack_map, &hent, pack_name)) { + for (p = data->r->objects->packed_git; p; p = p->next) { + size_t len; + if (strip_suffix(p->pack_name, ".pack", &len) && + len == base_len && + !memcmp(p->pack_name, full_name, len)) + break; + } + + if (!p) { p = add_packed_git(full_name, full_name_len, data->local); if (p) install_packed_git(data->r, p); } - free(pack_name); } if (!report_garbage) @@ -1004,14 +1033,12 @@ void reprepare_packed_git(struct repository *r) { struct object_directory *odb; - obj_read_lock(); for (odb = r->objects->odb; odb; odb = odb->next) odb_clear_loose_cache(odb); r->objects->approximate_object_count_valid = 0; r->objects->packed_git_initialized = 0; prepare_packed_git(r); - obj_read_unlock(); } struct packed_git *get_packed_git(struct repository *r) @@ -1088,23 +1115,7 @@ unsigned long get_size_from_delta(struct packed_git *p, do { in = use_pack(p, w_curs, curpos, &stream.avail_in); stream.next_in = in; - /* - * Note: the window section returned by use_pack() must be - * available throughout git_inflate()'s unlocked execution. To - * ensure no other thread will modify the window in the - * meantime, we rely on the packed_window.inuse_cnt. This - * counter is incremented before window reading and checked - * before window disposal. - * - * Other worrying sections could be the call to close_pack_fd(), - * which can close packs even with in-use windows, and to - * reprepare_packed_git(). Regarding the former, mmap doc says: - * "closing the file descriptor does not unmap the region". And - * for the latter, it won't re-open already available packs. - */ - obj_read_unlock(); st = git_inflate(&stream, Z_FINISH); - obj_read_lock(); curpos += stream.next_in - in; } while ((st == Z_OK || st == Z_BUF_ERROR) && stream.total_out < sizeof(delta_head)); @@ -1180,11 +1191,11 @@ const struct packed_git *has_packed_and_bad(struct repository *r, return NULL; } -off_t get_delta_base(struct packed_git *p, - struct pack_window **w_curs, - off_t *curpos, - enum object_type type, - off_t delta_obj_offset) +static off_t get_delta_base(struct packed_git *p, + struct pack_window **w_curs, + off_t *curpos, + enum object_type type, + off_t delta_obj_offset) { unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL); off_t base_offset; @@ -1225,32 +1236,30 @@ off_t get_delta_base(struct packed_git *p, * the final object lookup), but more expensive for OFS deltas (we * have to load the revidx to convert the offset back into a sha1). */ -static int get_delta_base_oid(struct packed_git *p, - struct pack_window **w_curs, - off_t curpos, - struct object_id *oid, - enum object_type type, - off_t delta_obj_offset) +static const unsigned char *get_delta_base_sha1(struct packed_git *p, + struct pack_window **w_curs, + off_t curpos, + enum object_type type, + off_t delta_obj_offset) { if (type == OBJ_REF_DELTA) { unsigned char *base = use_pack(p, w_curs, curpos, NULL); - oidread(oid, base); - return 0; + return base; } else if (type == OBJ_OFS_DELTA) { struct revindex_entry *revidx; off_t base_offset = get_delta_base(p, w_curs, &curpos, type, delta_obj_offset); if (!base_offset) - return -1; + return NULL; revidx = find_pack_revindex(p, base_offset); if (!revidx) - return -1; + return NULL; - return nth_packed_object_id(oid, p, revidx->nr); + return nth_packed_object_sha1(p, revidx->nr); } else - return -1; + return NULL; } static int retry_bad_packed_offset(struct repository *r, @@ -1263,7 +1272,7 @@ static int retry_bad_packed_offset(struct repository *r, revidx = find_pack_revindex(p, obj_offset); if (!revidx) return OBJ_BAD; - nth_packed_object_id(&oid, p, revidx->nr); + nth_packed_object_oid(&oid, p, revidx->nr); mark_bad_packed_object(p, oid.hash); type = oid_object_info(r, &oid, NULL); if (type <= OBJ_NONE) @@ -1352,7 +1361,7 @@ struct delta_base_cache_key { }; struct delta_base_cache_entry { - struct hashmap_entry ent; + struct hashmap hash; struct delta_base_cache_key key; struct list_head lru; void *data; @@ -1372,7 +1381,7 @@ static unsigned int pack_entry_hash(struct packed_git *p, off_t base_offset) static struct delta_base_cache_entry * get_delta_base_cache_entry(struct packed_git *p, off_t base_offset) { - struct hashmap_entry entry, *e; + struct hashmap_entry entry; struct delta_base_cache_key key; if (!delta_base_cache.cmpfn) @@ -1381,8 +1390,7 @@ get_delta_base_cache_entry(struct packed_git *p, off_t base_offset) hashmap_entry_init(&entry, pack_entry_hash(p, base_offset)); key.p = p; key.base_offset = base_offset; - e = hashmap_get(&delta_base_cache, &entry, &key); - return e ? container_of(e, struct delta_base_cache_entry, ent) : NULL; + return hashmap_get(&delta_base_cache, &entry, &key); } static int delta_base_cache_key_eq(const struct delta_base_cache_key *a, @@ -1392,16 +1400,11 @@ static int delta_base_cache_key_eq(const struct delta_base_cache_key *a, } static int delta_base_cache_hash_cmp(const void *unused_cmp_data, - const struct hashmap_entry *va, - const struct hashmap_entry *vb, + const void *va, const void *vb, const void *vkey) { - const struct delta_base_cache_entry *a, *b; + const struct delta_base_cache_entry *a = va, *b = vb; const struct delta_base_cache_key *key = vkey; - - a = container_of(va, const struct delta_base_cache_entry, ent); - b = container_of(vb, const struct delta_base_cache_entry, ent); - if (key) return !delta_base_cache_key_eq(&a->key, key); else @@ -1420,7 +1423,7 @@ static int in_delta_base_cache(struct packed_git *p, off_t base_offset) */ static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent) { - hashmap_remove(&delta_base_cache, &ent->ent, &ent->key); + hashmap_remove(&delta_base_cache, ent, &ent->key); list_del(&ent->lru); delta_base_cached -= ent->size; free(ent); @@ -1465,14 +1468,6 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset, struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent)); struct list_head *lru, *tmp; - /* - * Check required to avoid redundant entries when more than one thread - * is unpacking the same object, in unpack_entry() (since its phases I - * and III might run concurrently across multiple threads). - */ - if (in_delta_base_cache(p, base_offset)) - return; - delta_base_cached += base_size; list_for_each_safe(lru, tmp, &delta_base_cache_lru) { @@ -1492,8 +1487,8 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset, if (!delta_base_cache.cmpfn) hashmap_init(&delta_base_cache, delta_base_cache_hash_cmp, NULL, 0); - hashmap_entry_init(&ent->ent, pack_entry_hash(p, base_offset)); - hashmap_add(&delta_base_cache, &ent->ent); + hashmap_entry_init(ent, pack_entry_hash(p, base_offset)); + hashmap_add(&delta_base_cache, ent); } int packed_object_info(struct repository *r, struct packed_git *p, @@ -1558,16 +1553,20 @@ int packed_object_info(struct repository *r, struct packed_git *p, } } - if (oi->delta_base_oid) { + if (oi->delta_base_sha1) { if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) { - if (get_delta_base_oid(p, &w_curs, curpos, - oi->delta_base_oid, - type, obj_offset) < 0) { + const unsigned char *base; + + base = get_delta_base_sha1(p, &w_curs, curpos, + type, obj_offset); + if (!base) { type = OBJ_BAD; goto out; } + + hashcpy(oi->delta_base_sha1, base); } else - oidclr(oi->delta_base_oid); + hashclr(oi->delta_base_sha1); } oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED : @@ -1598,15 +1597,7 @@ static void *unpack_compressed_entry(struct packed_git *p, do { in = use_pack(p, w_curs, curpos, &stream.avail_in); stream.next_in = in; - /* - * Note: we must ensure the window section returned by - * use_pack() will be available throughout git_inflate()'s - * unlocked execution. Please refer to the comment at - * get_size_from_delta() to see how this is done. - */ - obj_read_unlock(); st = git_inflate(&stream, Z_FINISH); - obj_read_lock(); if (!stream.avail_out) break; /* the payload is larger than it should be */ curpos += stream.next_in - in; @@ -1691,7 +1682,7 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset, off_t len = revidx[1].offset - obj_offset; if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) { struct object_id oid; - nth_packed_object_id(&oid, p, revidx->nr); + nth_packed_object_oid(&oid, p, revidx->nr); error("bad packed object CRC for %s", oid_to_hex(&oid)); mark_bad_packed_object(p, oid.hash); @@ -1780,7 +1771,7 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset, struct object_id base_oid; revidx = find_pack_revindex(p, obj_offset); if (revidx) { - nth_packed_object_id(&base_oid, p, revidx->nr); + nth_packed_object_oid(&base_oid, p, revidx->nr); error("failed to read delta base object %s" " at offset %"PRIuMAX" from %s", oid_to_hex(&base_oid), (uintmax_t)obj_offset, @@ -1867,27 +1858,36 @@ int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32 index_lookup, index_lookup_width, result); } -int nth_packed_object_id(struct object_id *oid, - struct packed_git *p, - uint32_t n) +const unsigned char *nth_packed_object_sha1(struct packed_git *p, + uint32_t n) { const unsigned char *index = p->index_data; const unsigned int hashsz = the_hash_algo->rawsz; if (!index) { if (open_pack_index(p)) - return -1; + return NULL; index = p->index_data; } if (n >= p->num_objects) - return -1; + return NULL; index += 4 * 256; if (p->index_version == 1) { - oidread(oid, index + (hashsz + 4) * n + 4); + return index + (hashsz + 4) * n + 4; } else { index += 8; - oidread(oid, index + hashsz * n); + return index + hashsz * n; } - return 0; +} + +const struct object_id *nth_packed_object_oid(struct object_id *oid, + struct packed_git *p, + uint32_t n) +{ + const unsigned char *hash = nth_packed_object_sha1(p, n); + if (!hash) + return NULL; + hashcpy(oid->hash, hash); + return oid; } void check_pack_index_ptr(const struct packed_git *p, const void *vptr) @@ -2066,7 +2066,7 @@ int for_each_object_in_pack(struct packed_git *p, else pos = i; - if (nth_packed_object_id(&oid, p, pos) < 0) + if (!nth_packed_object_oid(&oid, p, pos)) return error("unable to get sha1 of object %u in %s", pos, p->pack_name); @@ -2139,7 +2139,7 @@ static int add_promisor_object(const struct object_id *oid, oidset_insert(set, &parents->item->object.oid); } else if (obj->type == OBJ_TAG) { struct tag *tag = (struct tag *) obj; - oidset_insert(set, get_tagged_oid(tag)); + oidset_insert(set, &tag->tagged->oid); } return 0; } @@ -2150,7 +2150,7 @@ int is_promisor_object(const struct object_id *oid) static int promisor_objects_prepared; if (!promisor_objects_prepared) { - if (has_promisor_remote()) { + if (repository_format_partial_clone) { for_each_packed_object(add_promisor_object, &promisor_objects, FOR_EACH_OBJECT_PROMISOR_ONLY); diff --git a/third_party/git/packfile.h b/third_party/git/packfile.h index 240aa73b95..3e98910bdd 100644 --- a/third_party/git/packfile.h +++ b/third_party/git/packfile.h @@ -100,7 +100,7 @@ struct packed_git *add_packed_git(const char *path, size_t path_len, int local); * Does not unlink if 'force_delete' is false and the pack-file is * marked as ".keep". */ -void unlink_pack_path(const char *pack_name, int force_delete); +extern void unlink_pack_path(const char *pack_name, int force_delete); /* * Make sure that a pointer access into an mmap'd index file is within bounds, @@ -121,11 +121,18 @@ void check_pack_index_ptr(const struct packed_git *p, const void *ptr); int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32_t *result); /* - * Write the oid of the nth object within the specified packfile into the first - * parameter. Open the index if it is not already open. Returns 0 on success, - * negative otherwise. + * Return the SHA-1 of the nth object within the specified packfile. + * Open the index if it is not already open. The return value points + * at the SHA-1 within the mmapped index. Return NULL if there is an + * error. */ -int nth_packed_object_id(struct object_id *, struct packed_git *, uint32_t n); +const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n); +/* + * Like nth_packed_object_sha1, but write the data into the object specified by + * the the first argument. Returns the first argument on success, and NULL on + * error. + */ +const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n); /* * Return the offset of the nth object within the specified packfile. @@ -144,9 +151,6 @@ void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep); unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t); int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *); -off_t get_delta_base(struct packed_git *p, struct pack_window **w_curs, - off_t *curpos, enum object_type type, - off_t delta_obj_offset); void release_pack_memory(size_t); diff --git a/third_party/git/parse-options-cb.c b/third_party/git/parse-options-cb.c index a28b55be48..1240a8514e 100644 --- a/third_party/git/parse-options-cb.c +++ b/third_party/git/parse-options-cb.c @@ -159,32 +159,39 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset) return 0; } -static size_t parse_options_count(const struct option *opt) -{ - size_t n = 0; - - for (; opt && opt->type != OPTION_END; opt++) - n++; - return n; -} - struct option *parse_options_dup(const struct option *o) { - struct option no_options[] = { OPT_END() }; + struct option *opts; + int nr = 0; - return parse_options_concat(o, no_options); + while (o && o->type != OPTION_END) { + nr++; + o++; + } + + ALLOC_ARRAY(opts, nr + 1); + memcpy(opts, o - nr, sizeof(*o) * nr); + memset(opts + nr, 0, sizeof(*opts)); + opts[nr].type = OPTION_END; + return opts; } -struct option *parse_options_concat(const struct option *a, - const struct option *b) +struct option *parse_options_concat(struct option *a, struct option *b) { struct option *ret; - size_t a_len = parse_options_count(a); - size_t b_len = parse_options_count(b); + size_t i, a_len = 0, b_len = 0; + + for (i = 0; a[i].type != OPTION_END; i++) + a_len++; + for (i = 0; b[i].type != OPTION_END; i++) + b_len++; ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1)); - COPY_ARRAY(ret, a, a_len); - COPY_ARRAY(ret + a_len, b, b_len + 1); /* + 1 for final OPTION_END */ + for (i = 0; i < a_len; i++) + ret[i] = a[i]; + for (i = 0; i < b_len; i++) + ret[a_len + i] = b[i]; + ret[a_len + b_len] = b[b_len]; /* final OPTION_END */ return ret; } diff --git a/third_party/git/parse-options.c b/third_party/git/parse-options.c index 63d6bab60c..87b26a1d92 100644 --- a/third_party/git/parse-options.c +++ b/third_party/git/parse-options.c @@ -61,7 +61,7 @@ static enum parse_opt_result opt_command_mode_error( */ for (that = all_opts; that->type != OPTION_END; that++) { if (that == opt || - !(that->flags & PARSE_OPT_CMDMODE) || + that->type != OPTION_CMDMODE || that->value != opt->value || that->defval != *(int *)opt->value) continue; @@ -95,14 +95,6 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p, if (!(flags & OPT_SHORT) && p->opt && (opt->flags & PARSE_OPT_NOARG)) return error(_("%s takes no value"), optname(opt, flags)); - /* - * Giving the same mode option twice, although unnecessary, - * is not a grave error, so let it pass. - */ - if ((opt->flags & PARSE_OPT_CMDMODE) && - *(int *)opt->value && *(int *)opt->value != opt->defval) - return opt_command_mode_error(opt, all_opts, flags); - switch (opt->type) { case OPTION_LOWLEVEL_CALLBACK: return opt->ll_callback(p, opt, NULL, unset); @@ -138,6 +130,16 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p, *(int *)opt->value = unset ? 0 : opt->defval; return 0; + case OPTION_CMDMODE: + /* + * Giving the same mode option twice, although is unnecessary, + * is not a grave error, so let it pass. + */ + if (*(int *)opt->value && *(int *)opt->value != opt->defval) + return opt_command_mode_error(opt, all_opts, flags); + *(int *)opt->value = opt->defval; + return 0; + case OPTION_STRING: if (unset) *(const char **)opt->value = NULL; @@ -355,7 +357,8 @@ is_abbreviated: } /* negated? */ if (!starts_with(arg, "no-")) { - if (skip_prefix(long_name, "no-", &long_name)) { + if (starts_with(long_name, "no-")) { + long_name += 3; opt_flags |= OPT_UNSET; goto again; } @@ -417,7 +420,7 @@ static void check_typos(const char *arg, const struct option *options) return; if (starts_with(arg, "no-")) { - error(_("did you mean `--%s` (with two dashes)?"), arg); + error(_("did you mean `--%s` (with two dashes ?)"), arg); exit(129); } @@ -425,7 +428,7 @@ static void check_typos(const char *arg, const struct option *options) if (!options->long_name) continue; if (starts_with(options->long_name, arg)) { - error(_("did you mean `--%s` (with two dashes)?"), arg); + error(_("did you mean `--%s` (with two dashes ?)"), arg); exit(129); } } @@ -620,7 +623,7 @@ static int show_gitcomp(const struct option *opts) * Scan and may produce a new option[] array, which should be used * instead of the original 'options'. * - * Right now this is only used to preprocess and substitute + * Right now this is only used to preprocess and substitue * OPTION_ALIAS. */ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx, @@ -777,8 +780,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, continue; } - if (!arg[2] /* "--" */ || - !strcmp(arg + 2, "end-of-options")) { + if (!arg[2]) { /* "--" */ if (!(ctx->flags & PARSE_OPT_KEEP_DASHDASH)) { ctx->argc--; ctx->argv++; diff --git a/third_party/git/parse-options.h b/third_party/git/parse-options.h index fece5ba628..a4bd40bb6a 100644 --- a/third_party/git/parse-options.h +++ b/third_party/git/parse-options.h @@ -1,10 +1,6 @@ #ifndef PARSE_OPTIONS_H #define PARSE_OPTIONS_H -/** - * Refer to Documentation/technical/api-parse-options.txt for the API doc. - */ - enum parse_opt_type { /* special types */ OPTION_END, @@ -18,6 +14,7 @@ enum parse_opt_type { OPTION_BITOP, OPTION_COUNTUP, OPTION_SET_INT, + OPTION_CMDMODE, /* options with arguments (usually) */ OPTION_STRING, OPTION_INTEGER, @@ -46,17 +43,7 @@ enum parse_opt_option_flags { PARSE_OPT_LITERAL_ARGHELP = 64, PARSE_OPT_SHELL_EVAL = 256, PARSE_OPT_NOCOMPLETE = 512, - PARSE_OPT_COMP_ARG = 1024, - PARSE_OPT_CMDMODE = 2048 -}; - -enum parse_opt_result { - PARSE_OPT_COMPLETE = -3, - PARSE_OPT_HELP = -2, - PARSE_OPT_ERROR = -1, /* must be the same as error() */ - PARSE_OPT_DONE = 0, /* fixed so that "return 0" works */ - PARSE_OPT_NON_OPTION, - PARSE_OPT_UNKNOWN + PARSE_OPT_COMP_ARG = 1024 }; struct option; @@ -168,8 +155,8 @@ struct option { #define OPT_BOOL(s, l, v, h) OPT_BOOL_F(s, l, v, h, 0) #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \ (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1} -#define OPT_CMDMODE(s, l, v, h, i) { OPTION_SET_INT, (s), (l), (v), NULL, \ - (h), PARSE_OPT_CMDMODE|PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) } +#define OPT_CMDMODE(s, l, v, h, i) { OPTION_CMDMODE, (s), (l), (v), NULL, \ + (h), PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) } #define OPT_INTEGER(s, l, v, h) OPT_INTEGER_F(s, l, v, h, 0) #define OPT_MAGNITUDE(s, l, v, h) { OPTION_MAGNITUDE, (s), (l), (v), \ N_("n"), (h), PARSE_OPT_NONEG } @@ -254,6 +241,15 @@ const char *optname(const struct option *opt, int flags); /*----- incremental advanced APIs -----*/ +enum parse_opt_result { + PARSE_OPT_COMPLETE = -3, + PARSE_OPT_HELP = -2, + PARSE_OPT_ERROR = -1, /* must be the same as error() */ + PARSE_OPT_DONE = 0, /* fixed so that "return 0" works */ + PARSE_OPT_NON_OPTION, + PARSE_OPT_UNKNOWN +}; + /* * It's okay for the caller to consume argv/argc in the usual way. * Other fields of that structure are private to parse-options and should not @@ -281,7 +277,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, int parse_options_end(struct parse_opt_ctx_t *ctx); struct option *parse_options_dup(const struct option *a); -struct option *parse_options_concat(const struct option *a, const struct option *b); +struct option *parse_options_concat(struct option *a, struct option *b); /*----- some often used options -----*/ int parse_opt_abbrev_cb(const struct option *, const char *, int); @@ -334,7 +330,5 @@ int parse_opt_passthru_argv(const struct option *, const char *, int); #define OPT_WITH(v, h) _OPT_CONTAINS_OR_WITH("with", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG) #define OPT_WITHOUT(v, h) _OPT_CONTAINS_OR_WITH("without", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG) #define OPT_CLEANUP(v) OPT_STRING(0, "cleanup", v, N_("mode"), N_("how to strip spaces and #comments from message")) -#define OPT_PATHSPEC_FROM_FILE(v) OPT_FILENAME(0, "pathspec-from-file", v, N_("read pathspec from file")) -#define OPT_PATHSPEC_FILE_NUL(v) OPT_BOOL(0, "pathspec-file-nul", v, N_("with --pathspec-from-file, pathspec elements are separated with NUL character")) #endif diff --git a/third_party/git/patch-ids.c b/third_party/git/patch-ids.c index 12aa6d494b..e8c150d0c9 100644 --- a/third_party/git/patch-ids.c +++ b/third_party/git/patch-ids.c @@ -36,16 +36,14 @@ int commit_patch_id(struct commit *commit, struct diff_options *options, * any significance; only that it is non-zero matters. */ static int patch_id_neq(const void *cmpfn_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { /* NEEDSWORK: const correctness? */ struct diff_options *opt = (void *)cmpfn_data; - struct patch_id *a, *b; - - a = container_of(eptr, struct patch_id, ent); - b = container_of(entry_or_key, struct patch_id, ent); + struct patch_id *a = (void *)entry; + struct patch_id *b = (void *)entry_or_key; if (is_null_oid(&a->patch_id) && commit_patch_id(a->commit, opt, &a->patch_id, 0, 0)) @@ -71,7 +69,7 @@ int init_patch_ids(struct repository *r, struct patch_ids *ids) int free_patch_ids(struct patch_ids *ids) { - hashmap_free_entries(&ids->patches, struct patch_id, ent); + hashmap_free(&ids->patches, 1); return 0; } @@ -85,7 +83,7 @@ static int init_patch_id_entry(struct patch_id *patch, if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0)) return -1; - hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id)); + hashmap_entry_init(patch, oidhash(&header_only_patch_id)); return 0; } @@ -101,7 +99,7 @@ struct patch_id *has_commit_patch_id(struct commit *commit, if (init_patch_id_entry(&patch, commit, ids)) return NULL; - return hashmap_get_entry(&ids->patches, &patch, ent, NULL); + return hashmap_get(&ids->patches, &patch, NULL); } struct patch_id *add_commit_patch_id(struct commit *commit, @@ -118,6 +116,6 @@ struct patch_id *add_commit_patch_id(struct commit *commit, return NULL; } - hashmap_add(&ids->patches, &key->ent); + hashmap_add(&ids->patches, key); return key; } diff --git a/third_party/git/path.c b/third_party/git/path.c index 88cf593007..25e97b8c3f 100644 --- a/third_party/git/path.c +++ b/third_party/git/path.c @@ -11,7 +11,6 @@ #include "path.h" #include "packfile.h" #include "object-store.h" -#include "lockfile.h" static int get_st_mode_bits(const char *path, int *mode) { @@ -102,36 +101,36 @@ struct common_dir { /* Not considered garbage for report_linked_checkout_garbage */ unsigned ignore_garbage:1; unsigned is_dir:1; - /* Belongs to the common dir, though it may contain paths that don't */ - unsigned is_common:1; - const char *path; + /* Not common even though its parent is */ + unsigned exclude:1; + const char *dirname; }; static struct common_dir common_list[] = { - { 0, 1, 1, "branches" }, - { 0, 1, 1, "common" }, - { 0, 1, 1, "hooks" }, - { 0, 1, 1, "info" }, - { 0, 0, 0, "info/sparse-checkout" }, - { 1, 1, 1, "logs" }, - { 1, 0, 0, "logs/HEAD" }, - { 0, 1, 0, "logs/refs/bisect" }, - { 0, 1, 0, "logs/refs/rewritten" }, - { 0, 1, 0, "logs/refs/worktree" }, - { 0, 1, 1, "lost-found" }, - { 0, 1, 1, "objects" }, - { 0, 1, 1, "refs" }, - { 0, 1, 0, "refs/bisect" }, - { 0, 1, 0, "refs/rewritten" }, - { 0, 1, 0, "refs/worktree" }, - { 0, 1, 1, "remotes" }, - { 0, 1, 1, "worktrees" }, - { 0, 1, 1, "rr-cache" }, - { 0, 1, 1, "svn" }, - { 0, 0, 1, "config" }, - { 1, 0, 1, "gc.pid" }, - { 0, 0, 1, "packed-refs" }, - { 0, 0, 1, "shallow" }, + { 0, 1, 0, "branches" }, + { 0, 1, 0, "common" }, + { 0, 1, 0, "hooks" }, + { 0, 1, 0, "info" }, + { 0, 0, 1, "info/sparse-checkout" }, + { 1, 1, 0, "logs" }, + { 1, 1, 1, "logs/HEAD" }, + { 0, 1, 1, "logs/refs/bisect" }, + { 0, 1, 1, "logs/refs/rewritten" }, + { 0, 1, 1, "logs/refs/worktree" }, + { 0, 1, 0, "lost-found" }, + { 0, 1, 0, "objects" }, + { 0, 1, 0, "refs" }, + { 0, 1, 1, "refs/bisect" }, + { 0, 1, 1, "refs/rewritten" }, + { 0, 1, 1, "refs/worktree" }, + { 0, 1, 0, "remotes" }, + { 0, 1, 0, "worktrees" }, + { 0, 1, 0, "rr-cache" }, + { 0, 1, 0, "svn" }, + { 0, 0, 0, "config" }, + { 1, 0, 0, "gc.pid" }, + { 0, 0, 0, "packed-refs" }, + { 0, 0, 0, "shallow" }, { 0, 0, 0, NULL } }; @@ -237,41 +236,30 @@ static void *add_to_trie(struct trie *root, const char *key, void *value) return old; } -typedef int (*match_fn)(const char *unmatched, void *value, void *baton); +typedef int (*match_fn)(const char *unmatched, void *data, void *baton); /* * Search a trie for some key. Find the longest /-or-\0-terminated - * prefix of the key for which the trie contains a value. If there is - * no such prefix, return -1. Otherwise call fn with the unmatched - * portion of the key and the found value. If fn returns 0 or - * positive, then return its return value. If fn returns negative, - * then call fn with the next-longest /-terminated prefix of the key - * (i.e. a parent directory) for which the trie contains a value, and - * handle its return value the same way. If there is no shorter - * /-terminated prefix with a value left, then return the negative - * return value of the most recent fn invocation. + * prefix of the key for which the trie contains a value. Call fn + * with the unmatched portion of the key and the found value, and + * return its return value. If there is no such prefix, return -1. * * The key is partially normalized: consecutive slashes are skipped. * - * For example, consider the trie containing only [logs, - * logs/refs/bisect], both with values, but not logs/refs. + * For example, consider the trie containing only [refs, + * refs/worktree] (both with values). + * + * | key | unmatched | val from node | return value | + * |-----------------|------------|---------------|--------------| + * | a | not called | n/a | -1 | + * | refs | \0 | refs | as per fn | + * | refs/ | / | refs | as per fn | + * | refs/w | /w | refs | as per fn | + * | refs/worktree | \0 | refs/worktree | as per fn | + * | refs/worktree/ | / | refs/worktree | as per fn | + * | refs/worktree/a | /a | refs/worktree | as per fn | + * |-----------------|------------|---------------|--------------| * - * | key | unmatched | prefix to node | return value | - * |--------------------|----------------|------------------|--------------| - * | a | not called | n/a | -1 | - * | logstore | not called | n/a | -1 | - * | logs | \0 | logs | as per fn | - * | logs/ | / | logs | as per fn | - * | logs/refs | /refs | logs | as per fn | - * | logs/refs/ | /refs/ | logs | as per fn | - * | logs/refs/b | /refs/b | logs | as per fn | - * | logs/refs/bisected | /refs/bisected | logs | as per fn | - * | logs/refs/bisect | \0 | logs/refs/bisect | as per fn | - * | logs/refs/bisect/ | / | logs/refs/bisect | as per fn | - * | logs/refs/bisect/a | /a | logs/refs/bisect | as per fn | - * | (If fn in the previous line returns -1, then fn is called once more:) | - * | logs/refs/bisect/a | /refs/bisect/a | logs | as per fn | - * |--------------------|----------------|------------------|--------------| */ static int trie_find(struct trie *root, const char *key, match_fn fn, void *baton) @@ -300,13 +288,9 @@ static int trie_find(struct trie *root, const char *key, match_fn fn, /* Matched the entire compressed section */ key += i; - if (!*key) { + if (!*key) /* End of key */ - if (root->value) - return fn(key, root->value, baton); - else - return -1; - } + return fn(key, root->value, baton); /* Partial path normalization: skip consecutive slashes */ while (key[0] == '/' && key[1] == '/') @@ -336,8 +320,8 @@ static void init_common_trie(void) if (common_trie_done_setup) return; - for (p = common_list; p->path; p++) - add_to_trie(&common_trie, p->path, p); + for (p = common_list; p->dirname; p++) + add_to_trie(&common_trie, p->dirname, p); common_trie_done_setup = 1; } @@ -350,11 +334,14 @@ static int check_common(const char *unmatched, void *value, void *baton) { struct common_dir *dir = value; + if (!dir) + return 0; + if (dir->is_dir && (unmatched[0] == 0 || unmatched[0] == '/')) - return dir->is_common; + return !dir->exclude; if (!dir->is_dir && unmatched[0] == 0) - return dir->is_common; + return !dir->exclude; return 0; } @@ -363,14 +350,9 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len, const char *common_dir) { char *base = buf->buf + git_dir_len; - int has_lock_suffix = strbuf_strip_suffix(buf, LOCK_SUFFIX); - init_common_trie(); if (trie_find(&common_trie, base, check_common, NULL) > 0) replace_dir(buf, git_dir_len, common_dir); - - if (has_lock_suffix) - strbuf_addstr(buf, LOCK_SUFFIX); } void report_linked_checkout_garbage(void) @@ -383,8 +365,8 @@ void report_linked_checkout_garbage(void) return; strbuf_addf(&sb, "%s/", get_git_dir()); len = sb.len; - for (p = common_list; p->path; p++) { - const char *path = p->path; + for (p = common_list; p->dirname; p++) { + const char *path = p->dirname; if (p->ignore_garbage) continue; strbuf_setlen(&sb, len); @@ -1077,8 +1059,6 @@ const char *remove_leading_path(const char *in, const char *prefix) /* * It is okay if dst == src, but they should not overlap otherwise. - * The "dst" buffer must be at least as long as "src"; normalizing may shrink - * the size of the path, but will never grow it. * * Performs the following normalizations on src, storing the result in dst: * - Ensures that components are separated by '/' (Windows only) @@ -1241,52 +1221,31 @@ static inline int chomp_trailing_dir_sep(const char *path, int len) } /* - * If path ends with suffix (complete path components), returns the offset of - * the last character in the path before the suffix (sans trailing directory - * separators), and -1 otherwise. + * If path ends with suffix (complete path components), returns the + * part before suffix (sans trailing directory separators). + * Otherwise returns NULL. */ -static ssize_t stripped_path_suffix_offset(const char *path, const char *suffix) +char *strip_path_suffix(const char *path, const char *suffix) { int path_len = strlen(path), suffix_len = strlen(suffix); while (suffix_len) { if (!path_len) - return -1; + return NULL; if (is_dir_sep(path[path_len - 1])) { if (!is_dir_sep(suffix[suffix_len - 1])) - return -1; + return NULL; path_len = chomp_trailing_dir_sep(path, path_len); suffix_len = chomp_trailing_dir_sep(suffix, suffix_len); } else if (path[--path_len] != suffix[--suffix_len]) - return -1; + return NULL; } if (path_len && !is_dir_sep(path[path_len - 1])) - return -1; - return chomp_trailing_dir_sep(path, path_len); -} - -/* - * Returns true if the path ends with components, considering only complete path - * components, and false otherwise. - */ -int ends_with_path_components(const char *path, const char *components) -{ - return stripped_path_suffix_offset(path, components) != -1; -} - -/* - * If path ends with suffix (complete path components), returns the - * part before suffix (sans trailing directory separators). - * Otherwise returns NULL. - */ -char *strip_path_suffix(const char *path, const char *suffix) -{ - ssize_t offset = stripped_path_suffix_offset(path, suffix); - - return offset == -1 ? NULL : xstrndup(path, offset); + return NULL; + return xstrndup(path, chomp_trailing_dir_sep(path, path_len)); } int daemon_avoid_alias(const char *p) @@ -1336,77 +1295,37 @@ int daemon_avoid_alias(const char *p) } } -/* - * On NTFS, we need to be careful to disallow certain synonyms of the `.git/` - * directory: - * - * - For historical reasons, file names that end in spaces or periods are - * automatically trimmed. Therefore, `.git . . ./` is a valid way to refer - * to `.git/`. - * - * - For other historical reasons, file names that do not conform to the 8.3 - * format (up to eight characters for the basename, three for the file - * extension, certain characters not allowed such as `+`, etc) are associated - * with a so-called "short name", at least on the `C:` drive by default. - * Which means that `git~1/` is a valid way to refer to `.git/`. - * - * Note: Technically, `.git/` could receive the short name `git~2` if the - * short name `git~1` were already used. In Git, however, we guarantee that - * `.git` is the first item in a directory, therefore it will be associated - * with the short name `git~1` (unless short names are disabled). - * - * - For yet other historical reasons, NTFS supports so-called "Alternate Data - * Streams", i.e. metadata associated with a given file, referred to via - * `<filename>:<stream-name>:<stream-type>`. There exists a default stream - * type for directories, allowing `.git/` to be accessed via - * `.git::$INDEX_ALLOCATION/`. - * - * When this function returns 1, it indicates that the specified file/directory - * name refers to a `.git` file or directory, or to any of these synonyms, and - * Git should therefore not track it. - * - * For performance reasons, _all_ Alternate Data Streams of `.git/` are - * forbidden, not just `::$INDEX_ALLOCATION`. - * - * This function is intended to be used by `git fsck` even on platforms where - * the backslash is a regular filename character, therefore it needs to handle - * backlash characters in the provided `name` specially: they are interpreted - * as directory separators. - */ -int is_ntfs_dotgit(const char *name) +static int only_spaces_and_periods(const char *path, size_t len, size_t skip) { - char c; - - /* - * Note that when we don't find `.git` or `git~1` we end up with `name` - * advanced partway through the string. That's okay, though, as we - * return immediately in those cases, without looking at `name` any - * further. - */ - c = *(name++); - if (c == '.') { - /* .git */ - if (((c = *(name++)) != 'g' && c != 'G') || - ((c = *(name++)) != 'i' && c != 'I') || - ((c = *(name++)) != 't' && c != 'T')) - return 0; - } else if (c == 'g' || c == 'G') { - /* git ~1 */ - if (((c = *(name++)) != 'i' && c != 'I') || - ((c = *(name++)) != 't' && c != 'T') || - *(name++) != '~' || - *(name++) != '1') - return 0; - } else + if (len < skip) return 0; - - for (;;) { - c = *(name++); - if (!c || c == '\\' || c == '/' || c == ':') - return 1; - if (c != '.' && c != ' ') + len -= skip; + path += skip; + while (len-- > 0) { + char c = *(path++); + if (c != ' ' && c != '.') return 0; } + return 1; +} + +int is_ntfs_dotgit(const char *name) +{ + size_t len; + + for (len = 0; ; len++) + if (!name[len] || name[len] == '\\' || is_dir_sep(name[len])) { + if (only_spaces_and_periods(name, len, 4) && + !strncasecmp(name, ".git", 4)) + return 1; + if (only_spaces_and_periods(name, len, 5) && + !strncasecmp(name, "git~1", 5)) + return 1; + if (name[len] != '\\') + return 0; + name += len + 1; + len = -1; + } } static int is_ntfs_dot_generic(const char *name, @@ -1422,7 +1341,7 @@ static int is_ntfs_dot_generic(const char *name, only_spaces_and_periods: for (;;) { char c = name[i++]; - if (!c || c == ':') + if (!c) return 1; if (c != ' ' && c != '.') return 0; diff --git a/third_party/git/path.h b/third_party/git/path.h index 14d6dcad16..2ba6ca58c8 100644 --- a/third_party/git/path.h +++ b/third_party/git/path.h @@ -193,7 +193,4 @@ const char *git_path_merge_head(struct repository *r); const char *git_path_fetch_head(struct repository *r); const char *git_path_shallow(struct repository *r); - -int ends_with_path_components(const char *path, const char *components); - #endif /* PATH_H */ diff --git a/third_party/git/pathspec.c b/third_party/git/pathspec.c index 8243e06eab..12c2b322b3 100644 --- a/third_party/git/pathspec.c +++ b/third_party/git/pathspec.c @@ -3,8 +3,6 @@ #include "dir.h" #include "pathspec.h" #include "attr.h" -#include "argv-array.h" -#include "quote.h" /* * Finds which of the given pathspecs match items in the index. @@ -438,13 +436,8 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags, } else { match = prefix_path_gently(prefix, prefixlen, &prefixlen, copyfrom); - if (!match) { - const char *hint_path = get_git_work_tree(); - if (!hint_path) - hint_path = get_git_dir(); - die(_("%s: '%s' is outside repository at '%s'"), elt, - copyfrom, absolute_path(hint_path)); - } + if (!match) + die(_("%s: '%s' is outside repository"), elt, copyfrom); } item->match = match; @@ -620,42 +613,6 @@ void parse_pathspec(struct pathspec *pathspec, } } -void parse_pathspec_file(struct pathspec *pathspec, unsigned magic_mask, - unsigned flags, const char *prefix, - const char *file, int nul_term_line) -{ - struct argv_array parsed_file = ARGV_ARRAY_INIT; - strbuf_getline_fn getline_fn = nul_term_line ? strbuf_getline_nul : - strbuf_getline; - struct strbuf buf = STRBUF_INIT; - struct strbuf unquoted = STRBUF_INIT; - FILE *in; - - if (!strcmp(file, "-")) - in = stdin; - else - in = xfopen(file, "r"); - - while (getline_fn(&buf, in) != EOF) { - if (!nul_term_line && buf.buf[0] == '"') { - strbuf_reset(&unquoted); - if (unquote_c_style(&unquoted, buf.buf, NULL)) - die(_("line is badly quoted: %s"), buf.buf); - strbuf_swap(&buf, &unquoted); - } - argv_array_push(&parsed_file, buf.buf); - strbuf_reset(&buf); - } - - strbuf_release(&unquoted); - strbuf_release(&buf); - if (in != stdin) - fclose(in); - - parse_pathspec(pathspec, magic_mask, flags, prefix, parsed_file.argv); - argv_array_clear(&parsed_file); -} - void copy_pathspec(struct pathspec *dst, const struct pathspec *src) { int i, j; diff --git a/third_party/git/pathspec.h b/third_party/git/pathspec.h index 454ce364fa..1c18a2c90c 100644 --- a/third_party/git/pathspec.h +++ b/third_party/git/pathspec.h @@ -22,11 +22,6 @@ struct index_state; #define PATHSPEC_ONESTAR 1 /* the pathspec pattern satisfies GFNM_ONESTAR */ -/** - * See glossary-context.txt for the syntax of pathspec. - * In memory, a pathspec set is represented by "struct pathspec" and is - * prepared by parse_pathspec(). - */ struct pathspec { int nr; unsigned int has_wildcard:1; @@ -78,56 +73,18 @@ struct pathspec { */ #define PATHSPEC_LITERAL_PATH (1<<6) -/** +/* * Given command line arguments and a prefix, convert the input to * pathspec. die() if any magic in magic_mask is used. * * Any arguments used are copied. It is safe for the caller to modify * or free 'prefix' and 'args' after calling this function. - * - * - magic_mask specifies what features that are NOT supported by the following - * code. If a user attempts to use such a feature, parse_pathspec() can reject - * it early. - * - * - flags specifies other things that the caller wants parse_pathspec to - * perform. - * - * - prefix and args come from cmd_* functions - * - * parse_pathspec() helps catch unsupported features and reject them politely. - * At a lower level, different pathspec-related functions may not support the - * same set of features. Such pathspec-sensitive functions are guarded with - * GUARD_PATHSPEC(), which will die in an unfriendly way when an unsupported - * feature is requested. - * - * The command designers are supposed to make sure that GUARD_PATHSPEC() never - * dies. They have to make sure all unsupported features are caught by - * parse_pathspec(), not by GUARD_PATHSPEC. grepping GUARD_PATHSPEC() should - * give the designers all pathspec-sensitive codepaths and what features they - * support. - * - * A similar process is applied when a new pathspec magic is added. The designer - * lifts the GUARD_PATHSPEC restriction in the functions that support the new - * magic. At the same time (s)he has to make sure this new feature will be - * caught at parse_pathspec() in commands that cannot handle the new magic in - * some cases. grepping parse_pathspec() should help. */ void parse_pathspec(struct pathspec *pathspec, unsigned magic_mask, unsigned flags, const char *prefix, const char **args); -/* - * Same as parse_pathspec() but uses file as input. - * When 'file' is exactly "-" it uses 'stdin' instead. - */ -void parse_pathspec_file(struct pathspec *pathspec, - unsigned magic_mask, - unsigned flags, - const char *prefix, - const char *file, - int nul_term_line); - void copy_pathspec(struct pathspec *dst, const struct pathspec *src); void clear_pathspec(struct pathspec *); diff --git a/third_party/git/perl/Git.pm b/third_party/git/perl/Git.pm index 54c9ed0dde..62c472e0ce 100644 --- a/third_party/git/perl/Git.pm +++ b/third_party/git/perl/Git.pm @@ -563,7 +563,7 @@ sub get_record { Query user C<PROMPT> and return answer from user. Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying -the user. If no *_ASKPASS variable is set or an error occurred, +the user. If no *_ASKPASS variable is set or an error occoured, the terminal is tried as a fallback. If C<ISPASSWORD> is set and true, the terminal disables echo. diff --git a/third_party/git/perl/Git/SVN.pm b/third_party/git/perl/Git/SVN.pm index 4b28b87784..76b2965905 100644 --- a/third_party/git/perl/Git/SVN.pm +++ b/third_party/git/perl/Git/SVN.pm @@ -1491,10 +1491,6 @@ sub call_authors_prog { sub check_author { my ($author) = @_; - if (defined $author) { - $author =~ s/^\s+//g; - $author =~ s/\s+$//g; - } if (!defined $author || length $author == 0) { $author = '(no author)'; } diff --git a/third_party/git/pkt-line.h b/third_party/git/pkt-line.h index fef3a0d792..5c62015db4 100644 --- a/third_party/git/pkt-line.h +++ b/third_party/git/pkt-line.h @@ -77,7 +77,7 @@ int packet_read(int fd, char **src_buffer, size_t *src_len, char /* * Read a packetized line into a buffer like the 'packet_read()' function but * returns an 'enum packet_read_status' which indicates the status of the read. - * The number of bytes read will be assigned to *pktlen if the status of the + * The number of bytes read will be assigined to *pktlen if the status of the * read was 'PACKET_READ_NORMAL'. */ enum packet_read_status { diff --git a/third_party/git/po/TEAMS b/third_party/git/po/TEAMS index dbcce4b40f..00472a4713 100644 --- a/third_party/git/po/TEAMS +++ b/third_party/git/po/TEAMS @@ -56,10 +56,6 @@ Language: sv (Swedish) Repository: https://github.com/nafmo/git-l10n-sv/ Leader: Peter Krefting <peter@softwolves.pp.se> -Language: tr (Turkish) -Repository: https://github.com/bitigchi/git-po/ -Leader: Emir SARI <bitigchi@me.com> - Language: vi (Vietnamese) Repository: https://github.com/vnwildman/git/ Leader: Trần Ngọc Quân <vnwildman AT gmail.com> @@ -71,8 +67,3 @@ Leader: Jiang Xin <worldhello.net AT gmail.com> Members: Ray Chen <oldsharp AT gmail.com> 依云 <lilydjwg AT gmail.com> Fangyi Zhou <me AT fangyi.io> - -Language: zh_TW (Traditional Chinese) -Respository: https://github.com/l10n-tw/git-po -Leader: Yi-Jyun Pan <pan93412 AT gmail.com> -Members: Franklin Weng <franklin AT goodhorse.idv.tw> diff --git a/third_party/git/po/bg.po b/third_party/git/po/bg.po index 79903137a4..e1d10db688 100644 --- a/third_party/git/po/bg.po +++ b/third_party/git/po/bg.po @@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019. # # ======================== # DICTIONARY TO MERGE IN GIT GUI @@ -31,7 +31,7 @@ # am прилагам поредица от кръпки # working directory/tree — винаги работно дърво, git следи цялото дърво, а не директории, работна директория за cwd # switch to branch преминавам към клон -# sparse entry/blob частично изтеглена директория/път/обект-BLOB +# sparse entry частично изтеглена директория/път # revision range диапазон на версиите # cover letter придружаващо писмо # reference repository еталонно хранилище @@ -139,10 +139,6 @@ # split (commit-graphr) раздробен (граф с подавания) # clobber (a tag) презаписвам (етикет) # blame извеждане на авторство -# refname име на указател -# cone pattern matching пътеводно напасване -# negative pattern отрицателен шаблон -# colored hunk/diff оцветено парче/разлика # ------------------------ # „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$ # ------------------------ @@ -159,10 +155,10 @@ # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n msgid "" msgstr "" -"Project-Id-Version: git 2.25\n" +"Project-Id-Version: git 2.22\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-12 00:03+0100\n" +"POT-Creation-Date: 2019-08-10 12:25+0300\n" +"PO-Revision-Date: 2019-08-10 12:33+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -171,740 +167,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "Неуспешен анализ — „%s“." - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "индексът не може да бъде прочетен" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "двоично" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "нищо" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "няма промени" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Обновяване" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "неуспешно добавяне в индекса на „%s“" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "индексът не може да бъде записан" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "%d файл обновен\n" -msgstr[1] "%d файла обновени\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Отмяна" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "Указателят „HEAD^{tree}“ не може да бъде анализиран" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "%d файл с отменени промени\n" -msgstr[1] "%d файла с отменени промени\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "Няма неследени файлове.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "Добавяне на неследени" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "%d файл добавен\n" -msgstr[1] "%d файла добавени\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "пренебрегване на неслятото: „%s“" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Само двоични файлове са променени.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Няма промени.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Обновяване на кръпка" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Преглед на разликата" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "извеждане на пътищата с промени" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "добавяне на състоянието на работното дърво към промените в индекса" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "връщане на състоянието на индекса към соченото от „HEAD“" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "интерактивни избор и промяна на парчета код" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "разлика между соченото от „HEAD“ и индекса" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "добавяне на съдържанието на неследените файлове към индекса" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "Помощ:" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "избор на eдин елемент" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "избор на поредица от елементи" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "избор на няколко поредици от елементи" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "избор на базата на уникален префикс" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "изваждане на указаното от избора" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "избор на всички елементи" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(празно) приключване на избирането" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "избор на номериран елемент" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(празно) без избор на нищо" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "●●● Команди ●●●" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Избор на следващо действие" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "в индекса" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "извън индекса" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "път" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "индексът не може да бъде обновен" - -# -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Изход.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно " -"добавено към индекса." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 — добавяне на парчето в индекса\n" -"n — без добавяне на парчето в индекса\n" -"q — изход, без добавяне на това и всички оставащи парчета от файла\n" -"a — добавяне на това и всички следващи парчета от файла в индекса\n" -"d — без добавяне на това и всички следващи парчета от файла в индекса\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно " -"скътано." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y — скатаване на парчето\n" -"n — без скатаване на парчето\n" -"q — изход, без скатаване на това и всички оставащи парчета\n" -"a — скатаване на това и всички следващи парчета от файла\n" -"d — без скатаване на това и всички следващи парчета от файла\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно " -"извадено от индекса." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 — изваждане на парчето от индекса\n" -"n — без изваждане на парчето от индекса\n" -"q — изход, без изваждане на това и всички оставащи парчета от индекса\n" -"a — изваждане на това и всички следващи парчета от файла от индекса\n" -"d — без изваждане на това и всички следващи парчета от файла от индекса\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "" -"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" -"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно " -"набелязано за прилагане." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y — прилагане на парчето към индекса\n" -"n — без прилагане на парчето към индекса\n" -"q — изход, без прилагане на това и всички оставащи парчета към индекса\n" -"a — прилагане на това и всички следващи парчета от файла към индекса\n" -"d — без прилагане на това и всички следващи парчета от файла към индекса\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d" -"%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно " -"набелязано за зануляване." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y — премахване на парчето от работното дърво\n" -"n — без премахване на парчето от работното дърво\n" -"q — изход, без премахване на това и всички оставащи парчета от работното " -"дърво\n" -"a — премахване на това и всички следващи парчета от файла от работното " -"дърво\n" -"d — без премахване на това и всички следващи парчета от файла от работното " -"дърво\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Премахване на промяната в правата за достъп от индекса и работното дърво [y," -"n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y — премахване на парчето от индекса и работното дърво\n" -"n — без премахване на парчето от индекса и работното дърво\n" -"q — изход, без премахване на това и всички оставащи парчета от индекса и " -"работното дърво\n" -"a — премахване на това и всички следващи парчета от файла от индекса и " -"работното дърво\n" -"d — без премахване на това и всички следващи парчета от файла от индекса и " -"работното дърво\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n," -"q,a,d%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y — прилагане на парчето от индекса и работното дърво\n" -"n — без прилагане на парчето от индекса и работното дърво\n" -"q — изход, без прилагане на това и всички оставащи парчета от индекса и " -"работното дърво\n" -"a — прилагане на това и всички следващи парчета от файла от индекса и " -"работното дърво\n" -"d — без прилагане на това и всички следващи парчета от файла от индекса и " -"работното дърво\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y — прилагане на парчето към работното дърво\n" -"n — без прилагане на парчето към работното дърво\n" -"q — изход, без прилагане на това и всички оставащи парчета\n" -"a — прилагане на това и всички следващи парчета от файла\n" -"d — без прилагане на това и всички следващи парчета от файла\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "заглавната част на парчето „%.*s“ не може да се анализира" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "заглавната част на оцветеното парче „%.*s“ не може да се анализира" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "разликата не може да се анализира" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "оцветената разлика не може да се анализира" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "неуспешно изпълнение на „%s“" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "изходът от „interactive.diffFilter“ не напасва" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Обработените редове на изхода на ползвания филтър, трябва\n" -"да се отнасят едно към едно спрямо редовете на входа." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"очаква се ред №%d от контекста в\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"парчетата код не се припокриват:\n" -"%.*s\n" -" не завършва с:\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"———\n" -"За да пропуснете редовете, започващи с „%c“: заменете знака с „ “ (стават " -"контекст)\n" -"За да пропуснете редовете, започващи с „%c“: изтрийте ги.\n" -"Редовете, които започват с „%c“ ще бъдат пропуснати.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Ако е невъзможно чисто прилагане на кода, ще може пак да редактирате. Ако\n" -"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n" -"редактирането — отказано.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "заглавната част парчето не може да се анализира" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "неуспешно изпълнение на „git apply --cached“" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Редактираното парче не може да се приложи. Да се продължи ли с " -"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ " -"„n“ (не)? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "Избраните парчета не могат да се добавят в индекса!" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Да се приложат ли към работното дърво? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Нищо не е приложено.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j — без решение за парчето, към следващото парче без решение\n" -"J — без решение за парчето, към следващото парче\n" -"k — без решение за парчето, към предишното парче без решение\n" -"K — без решение за парчето, към предишното парче\n" -"g — избор към кое парче да се премине\n" -"/ — търсене на парче, напасващо към даден регулярен израз\n" -"s — разделяне на текущото парче на по-малки\n" -"e — ръчно редактиране на текущото парче\n" -"? — извеждане не помощта\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "Няма друго парче преди това" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "Няма друго парче след това" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "Няма други парчета" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "към кое парче да се придвижи? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Неправилен номер: „%s“" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Има само %d парче." -msgstr[1] "Има само %d парчета." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "Няма други парчета за търсене" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "да се търси с регулярен израз? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Сгрешен регулярен израз „%s“: %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "Никое парче не напасва на регулярния израз" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Това парче не може да бъде разделено" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "Разделяне на %d парчета." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Това парче не може да бъде редактирано" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "неуспешно изпълнение на „git apply“" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sподсказка: %.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Отбирането на подавания е блокирано от неслети файлове." -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "Подаването е блокирано от неслети файлове." -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "Сливането е блокирано от неслети файлове." -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "Издърпването е блокирано от неслети файлове." -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "Отмяната е блокирана от неслети файлове." -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Действието „%s“ е блокирано от неслети файлове." -#: advice.c:186 +#: advice.c:180 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." @@ -912,23 +205,23 @@ msgstr "" "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n" "за да отбележите коригирането им. След това извършете подаването." -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Изход от програмата заради некоригиран конфликт." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)." -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Промените трябва да се подадат преди сливане." -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Изход от програмата заради незавършено сливане." -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1062,7 +355,17 @@ msgstr "грешен режим на ред №%d: %s" msgid "inconsistent header lines %d and %d" msgstr "несъвместими заглавни части на редове №%d и №%d" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "част от кръпка без заглавна част на ред %d: %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1077,81 +380,71 @@ msgstr[1] "" "След съкращаването на първите %d части от компонентите на пътя, в заглавната " "част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "част от кръпка без заглавна част на ред %d: %.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "новият файл зависи от старото съдържание на файла" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "изтритият файл не е празен" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "грешка в кръпката на ред %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "новият файл „%s“ зависи от старото съдържание на файла" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "изтритият файл „%s“ не е празен" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "грешка в двоичната кръпка на ред %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неразпозната двоичната кръпка на ред %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "кръпката е с изцяло повредени данни на ред %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "файлът „%s“ не може да бъде отворен или прочетен" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "неправилно начало на ред: „%c“" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -1160,13 +453,13 @@ msgstr[0] "" msgstr[1] "" "%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)." -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" "Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1175,312 +468,317 @@ msgstr "" "при търсене за:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "липсват данните за двоичната кръпка за „%s“" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "двоичната кръпка не може да се приложи в обратна посока, когато обратното " "парче за „%s“ липсва" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание." -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" "необходимият резултат след операцията — „%s“ за „%s“ не може да бъде " "прочетен" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "двоичната кръпка не може да бъде приложена върху „%s“" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а " "бе получено: „%s“)" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "неуспешно прилагане на кръпка: „%s:%ld“" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "„%s“ не може да се изтегли" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "файлът „%s“ не може да бъде прочетен" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "изчитане на „%s“ след проследяване на символна връзка" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "обектът с път „%s“ е преименуван или изтрит" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "„%s“ не съществува в индекса" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "„%s“ не съответства на индекса" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "в хранилището липсват необходимите обекти-BLOB, за да се премине към тройно " "сливане." -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Преминаване към тройно сливане…\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "текущото съдържание на „%s“ не може да бъде прочетено" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Неуспешно преминаване към тройно сливане…\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Конфликти при прилагането на кръпката към „%s“.\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Кръпката бе приложена чисто към „%s“.\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "изтриващата кръпка оставя файла непразен" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "„%s“: неправилен вид" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "„%s“ е от вид „%o“, а се очакваше „%o“" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "неправилен път: „%s“" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "„%s“: вече съществува в индекса" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "„%s“: вече съществува в работното дърво" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "засегнатият файл „%s“ е след символна връзка" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "Кръпката „%s“ не може да бъде приложена" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Проверяване на кръпката „%s“…" -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)." -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)." -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "„%s“ не може да се добави към временния индекс" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "временният индекс не може да се запази в „%s“" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "„%s“ не може да се извади от индекса" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "повредена кръпка за модула „%s“" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" "не може да се получи информация чрез „stat“ за новосъздадения файл „%s“" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "не може да се за създаде мястото за съхранение на новосъздадения файл „%s“" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "не може да се добави запис в кеша за „%s“" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "в „%s“ не може да се пише" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "затваряне на файла „%s“" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Кръпката „%s“ бе приложена чисто." -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "вътрешна грешка" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…" msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…" -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "„%s“ не може да бъде отворен" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "%d-то парче бе успешно приложено." -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "%d-то парче бе отхвърлено." -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Пропусната кръпка: „%s“" -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "непознат вход" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "индексът не може да бъде записан" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "кръпката „%s“ не може да бъде отворена: %s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "пренебрегната е %d грешка в знаците за интервали" msgstr[1] "пренебрегнати са %d грешки в знаците за интервали" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ред добавя грешки в знаците за интервали." msgstr[1] "%d реда добавят грешки в знаците за интервали." -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1489,135 +787,144 @@ msgstr[0] "" msgstr[1] "" "Добавени са %d реда след корекцията на грешките в знаците за интервали." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Новият индекс не може да бъде записан" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "път" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "без прилагане на промените напасващи на дадения път" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "прилагане на промените напасващи на дадения път" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "БРОЙ" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "игнориране на редовете добавени от тази кръпка" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "извеждане на статистика на промените без прилагане на кръпката" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "извеждане на броя на добавените и изтритите редове" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "извеждане на статистика на входните данни без прилагане на кръпката" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "проверка дали кръпката може да се приложи, без действително прилагане" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "проверка дали кръпката може да бъде приложена към текущия индекс" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "отбелязване на новите файлове с „git add --intent-to-add“" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "прилагане на кръпката без промяна на работното дърво" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "прилагане на кръпка, която променя и файлове извън работното дърво" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--" "summary“" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" "създаване на временен индекс на база на включената информация за индекса" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "разделяне на пътищата с нулевия знак „NUL“" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "действие" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "засичане на нови или променени редове с грешки в знаците за интервали" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "" "игнориране на промените в знаците за интервали при откриване на контекста" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "прилагане на кръпката в обратна посока" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "без изискване на дори и един ред контекст" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "позволяване на застъпващи се парчета" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "повече подробности" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "без доверяване на номерата на редовете в заглавните части на парчетата" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "НАЧАЛНА_ДИРЕКТОРИЯ" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "добавяне на тази НАЧАЛНА_ДИРЕКТОРИЯ към имената на всички файлове" @@ -1640,7 +947,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "пътят „%s“ не съвпада с никой файл" @@ -1672,7 +979,7 @@ msgstr "ФОРМАТ" msgid "archive format" msgstr "ФОРМАТ на архива" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "ПРЕФИКС" @@ -1680,12 +987,11 @@ msgstr "ПРЕФИКС" msgid "prepend prefix to each pathname in the archive" msgstr "добавяне на този ПРЕФИКС към всеки път в архива" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "ФАЙЛ" @@ -1703,7 +1009,7 @@ msgstr "извеждане на архивираните файлове на с #: archive.c:465 msgid "store only" -msgstr "съхранение без компресиране" +msgstr "само съхранение без компресиране" #: archive.c:466 msgid "compress faster" @@ -1718,7 +1024,7 @@ msgid "list supported archive formats" msgstr "извеждане на списъка с поддържаните формати" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "хранилище" @@ -1726,7 +1032,7 @@ msgstr "хранилище" msgid "retrieve the archive from remote repository <repo>" msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "команда" @@ -1757,66 +1063,66 @@ msgstr "Непознат формат на архив: „%s“" msgid "Argument not supported for format '%s': -%d" msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "обектът-BLOB „%s“ не може да бъде обработен" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "филтърът „%s“ не може да бъде стартиран" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "дескрипторът не може да бъде пренасочен" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "филтърът „%s“ върна грешка" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "пътят не е правилно кодиран в UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "твърде дълъг път (%d знака, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "грешка при декомпресиране с „deflate“ (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "времевата стойност е твърде голяма за тази система: %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "„%.*s“ е неправилно име за атрибут" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s: командата не е позволена: „%s:%d“" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1834,12 +1140,12 @@ msgstr "Неправилно цитирано съдържание във фай msgid "We cannot bisect more!\n" msgstr "Повече не може да се търси двоично!\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "Неправилно име на подаване „%s“" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1848,7 +1154,7 @@ msgstr "" "Неправилна база за сливане: %s.\n" "Следователно грешката е коригирана между „%s“ и [%s].\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1857,7 +1163,7 @@ msgstr "" "Нова база за сливане: %s.\n" "Свойството е променено между „%s“ и [%s].\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1866,7 +1172,7 @@ msgstr "" "Базата за сливане „%s“ е %s.\n" "Следователно първото %s подаване е между „%s“ и [%s].\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1877,7 +1183,7 @@ msgstr "" "Двоичното търсене с git bisect няма да работи правилно.\n" "Дали не сте объркали указателите „%s“ и „%s“?\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1888,36 +1194,36 @@ msgstr "" "Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n" "Двоичното търсене продължава." -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Двоично търсене: трябва да се провери база за сливане\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "необходима е версия „%s“" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "файлът „%s“ не може да бъде създаден" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "неуспешно прочитане на указателите за двоично търсене" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "„%s“ e както „%s“, така и „%s“\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1926,7 +1232,7 @@ msgstr "" "Липсва подходящо за тестване подаване.\n" "Проверете параметрите за пътищата.\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1936,48 +1242,48 @@ msgstr[1] "(приблизително %d стъпки)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Двоично търсене: остава %d версия след тази %s\n" msgstr[1] "Двоично търсене: остават %d версии след тази %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "Опциите „--contents“ и „--reverse“ са несъвместими" -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на крайно подаване" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "неуспешно настройване на обхождането на версиите" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква " "указването на диапазон по веригата на първите наследници" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "няма път на име „%s“ в „%s“" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен" @@ -2130,8 +1436,8 @@ msgstr "Файлът „%s“ не изглежда да е пратка на gi msgid "unrecognized header: %s%s (%d)" msgstr "непозната заглавна част: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "„%s“ не може да се отвори" @@ -2162,63 +1468,63 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Пратката изисква следния указател:" msgstr[1] "Пратката изисква следните %d указатели:" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "неуспешно дублиране на дескриптора на пратката с „dup“" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Командата „git pack-objects“ не може да бъде стартирана" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "Командата „git pack-objects“ не завърши успешно" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "Командата „git rev-list“ не завърши успешно" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" "указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "непознат аргумент: %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Създаването на празна пратка е невъзможно." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "Файлът „%s“ не може да бъде създаден" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "Командата „git index-pack“ не завърши успешно" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "неправилна стойност за цвят: %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "„%s“ не може да се анализира" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s не е подаване!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2237,33 +1543,33 @@ msgstr "" "\n" " git replace --convert-graft-file\n" "\n" -"За да изключите това съобщение, изпълнете:\n" +"За да изключите това съобщение, ползвайте командата:\n" "\n" " git config advice.graftFileDeprecated false" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“." -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“." -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Подаването „%s“ е без подпис от GPG." -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2273,178 +1579,168 @@ msgstr "" "Може да поправите подаването заедно със съобщението или може да\n" "зададете ползваното кодиране в настройката „i18n.commitencoding“.\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "файлът с гра̀фа на подаванията е твърде малък" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "версията на гра̀фа с подаванията %X не съвпада с %X" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "записът в таблицата за откъси липсва, файлът за гра̀фа може да е непълен" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "неправилно отместване на откъс: %08x%08x" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "откъсът %08x се явява многократно" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "базовият откъс липсва в гра̀фа с подаванията" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "веригата на гра̀фа с подаванията не съвпада" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "неправилна позиция на подаването. Вероятно графът с подаванията е повреден" -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "подаването „%s“ не може да бъде открито" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "подаването не може да бъде анализирано: %s" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "видът на обекта „%s“ не може да бъде определен" -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Зареждане на познатите подавания в гра̀фа с подаванията" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Разширяване на достижимите подавания в гра̀фа" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл" msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "грешка при добавяне на пакетен файл „%s“" -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "грешка при отваряне на индекса на „%s“" -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Откриване на подаванията в гра̀фа измежду %d указател" msgstr[1] "Откриване на подаванията в гра̀фа измежду %d указатели" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "неправилен идентификатор на обект-подаване: „%s“" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Преброяване на различните подавания в гра̀фа" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Откриване на още върхове в гра̀фа с подаванията" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "правилният брой на базовите идентификатори не може да се запише" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "пакетният файл „%s“ не може да бъде създаден" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Запазване на гра̀фа с подаванията в %d пас" msgstr[1] "Запазване на гра̀фа с подаванията в %d паса" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори" -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван" -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван" -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "Търсене на подаванията със сливания" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "неочакван, повтарящ се идентификатор на подаване: %s" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "Сливане на гра̀фа с подаванията" @@ -2457,25 +1753,25 @@ msgstr "форматът на гра̀фа с подаванията не мож msgid "too many commits to write graph" msgstr "прекалено много подавания за записване на гра̀фа" -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден" -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" "неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ " "е преди „%s“, а не трябва" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а " "трябва да е %u" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира" @@ -2484,36 +1780,36 @@ msgstr "подаване „%s“ в гра̀фа с подаванията не msgid "Verifying commits in commit graph" msgstr "Проверка на подаванията в гра̀фа" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се " "анализира" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с " "подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2521,7 +1817,7 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде " "не е" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2529,14 +1825,14 @@ msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а " "другаде е" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" "номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а " "другаде е %u" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2585,7 +1881,7 @@ msgstr "ключът не съдържа раздел: „%s“" msgid "key does not contain variable name: %s" msgstr "ключът не съдържа име на променлива: „%s“" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "неправилен ключ: „%s“" @@ -2725,7 +2021,7 @@ msgstr "" "„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, " "от който се издърпва) или „current“ (клонът със същото име)" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "неправилно ниво на компресиране при пакетиране: %d" @@ -2750,107 +2046,114 @@ msgstr "обектът-BLOB „%s“ с конфигурации не може msgid "failed to parse %s" msgstr "„%s“ не може да бъде анализиран" -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "неправилни настройки от командния ред" -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "неочаквана грешка при изчитането на конфигурационните файлове" -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "Неправилен %s: „%s“" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва " +"стандартната стойност „keep“ (запазване)" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не " "%d" -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "неразпозната стойност „%s“ от командния ред" -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "неправилно име на раздел: „%s“" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "зададени са няколко стойности за „%s“" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "новият конфигурационен файл „%s“ не може да бъде запазен" -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "конфигурационният файл „%s“ не може да бъде заключен" -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "отваряне на „%s“" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "неправилен шаблон: %s" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "неправилен конфигурационен файл: „%s“" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "неуспешно изпълнение на „fstat“ върху „%s“" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "неуспешно изпълнение на „mmap“ върху „%s“" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "неуспешна смяна на права с „chmod“ върху „%s“" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "конфигурационният файл „%s“ не може да бъде записан" -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "„%s“ не може да се зададе да е „%s“" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "„%s“ не може да се премахне" -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "неправилно име на раздел: %s" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "липсва стойност за „%s“" @@ -2975,7 +2278,7 @@ msgstr "„%s“ не може да се открие (%s)" msgid "unknown port %s" msgstr "непознат порт „%s“" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "необичайното име на хост „%s“ е блокирано" @@ -2990,62 +2293,62 @@ msgstr "необичайният порт „%s“ е блокиран" msgid "cannot start proxy %s" msgstr "посредникът „%s“ не може да се стартира" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "не е указан път. Проверете синтаксиса с командата:\n" "\n" " git help pull" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "" "вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "необичайният път „%s“ е блокиран" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "неуспешно създаване на процес" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Проверка на свързаността" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Командата „git rev-list“ не може да бъде изпълнена." -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "неуспешен запис на списъка с версиите" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "стандартният вход на списъка с версиите не може да бъде затворен" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "неправилно действие за край на ред: %d" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "Всяка последователност от знаци „CRLF“ ще бъдe заменена с „LF“ в „%s“." -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -3055,13 +2358,13 @@ msgstr "" "Файлът ще остане с първоначалните знаци за край на ред в работната ви " "директория." -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" "Всеки знак „LF“ ще бъдe заменен с последователността от знаци „CRLF“ в „%s“." -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -3072,21 +2375,21 @@ msgstr "" "Файлът ще остане с първоначалните знаци за край на ред в работната ви " "директория." -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" "„%s“ не трябва да съдържа маркер за поредността на байтовете (BOM) при " "кодиране „%s“" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" "Файлът „%s“ съдържа маркер за поредността на байтовете (BOM). Използвайте " -"„UTF-%.*s“ като кодиране за работното дърво." +"„UTF-%s“ като кодиране за работното дърво." #: convert.c:304 #, c-format @@ -3105,50 +2408,50 @@ msgstr "" "на работното дърво използвайте UTF-%sBE или UTF-%sLE (в зависимост от " "поредността на байтовете)." -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "неуспешно прекодиране на „%s“ от „%s“ към „%s“" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно променя файла" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "неуспешно създаване на процес за външен филтър „%s“" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "входът не може да бъде подаден на външния филтър „%s“" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "неуспешно изпълнение на външния филтър „%s“: %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "неуспешно четене от външния филтър „%s“" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "неуспешно изпълнение на външния филтър „%s“" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "неочакван вид филтър" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "пътят е прекалено дълъг за външен филтър" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3157,67 +2460,67 @@ msgstr "" "външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са " "филтрирани" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "„true“/„false“ не може да са кодирания на работното дърво" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: неуспешно изпълнение на кодиращ филтър „%s“" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "в бъдещето" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "преди %<PRIuMAX> секунда" msgstr[1] "преди %<PRIuMAX> секунди" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "преди %<PRIuMAX> минута" msgstr[1] "преди %<PRIuMAX> минути" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "преди %<PRIuMAX> час" msgstr[1] "преди %<PRIuMAX> часа" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "преди %<PRIuMAX> ден" msgstr[1] "преди %<PRIuMAX> дена" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "преди %<PRIuMAX> седмица" msgstr[1] "преди %<PRIuMAX> седмици" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "преди %<PRIuMAX> месец" msgstr[1] "преди %<PRIuMAX> месеца" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3225,14 +2528,14 @@ msgstr[0] "%<PRIuMAX> година" msgstr[1] "%<PRIuMAX> години" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "преди %s и %<PRIuMAX> месец" msgstr[1] "преди %s и %<PRIuMAX> месеца" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3270,7 +2573,7 @@ msgstr "Отбелязани са %d групи, работата приключ msgid "failed to read orderfile '%s'" msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Търсене на преименувания на обекти съчетани с промени" @@ -3342,38 +2645,38 @@ msgstr "" "Грешки в настройката „diff.dirstat“:\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "" "външната програма за разлики завърши неуспешно. Спиране на работата при „%s“" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими " "една с друга" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "Опцията „--follow“ изисква точно един път" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "неправилна стойност за „--stat“: %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "опцията „%s“ очаква число за аргумент" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3382,44 +2685,44 @@ msgstr "" "Неразпознат параметър към опцията „--dirstat/-X“:\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "непозната стойност след „ws-error-highlight=%.*s“" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "„%s“ не може да се открие" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "" "опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/" "МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "опцията „%s“ изисква знак, а не: „%s“" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "неправилен аргумент за „--color-moved“: „%s“" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "неправилен режим „%s“ за „ --color-moved-ws“" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3428,153 +2731,153 @@ msgstr "" "Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и " "„histogram“ (хистограмен)" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "неправилен аргумент към „%s“" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "неразпознат параметър към опцията „--submodule“: „%s“" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "неправилен аргумент към „--word-diff“: „%s“" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Формат на изхода за разликите" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "създаване на кръпки" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "без извеждане на разликите" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "БРОЙ" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "файловете с разлики да са в суров формат" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "псевдоним на „-p --stat“" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "„--stat“ във формат за четене от програма" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "извеждане само на последния ред на „--stat“" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …" -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "извеждане на разпределението на промените за всяка поддиректория" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "псевдоним на „--dirstat=cumulative“" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“" -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "предупреждаване, ако промените водят до маркери за конфликт или грешки в " "празните знаци" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "съкратено резюме на създадените, преименуваните и файловете с промяна на " "режима на достъп" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "извеждане само на имената на променените файлове" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "извеждане само на имената и статистиката за променените файлове" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "извеждане на статистика за промените" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "ШИРОЧИНА" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "статистика с такава ШИРОЧИНА за промените" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "статистика за промените с такава ШИРОЧИНА на имената" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "БРОЙ" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "ограничаване на БРОя на редовете в статистиката за промените" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "кратко резюме в статистиката за промените" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "извеждане на двоична разлика във вид за прилагане" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "показване на пълните имена на обекти в редовете за индекса при вариантите " "преди и след промяната" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "разлики в цвят" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "ВИД" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3582,7 +2885,7 @@ msgstr "" "грешките в празните знаци да се указват в редовете за контекста, вариантите " "преди и след разликата," -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3590,257 +2893,257 @@ msgstr "" "без преименуване на пътищата. Да се използват нулеви байтове за разделители " "на полета в изхода при ползване на опцията „--raw“ или „--numstat“" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "ПРЕФИКС" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "префикс вместо „a/“ за източник" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "префикс вместо „b/“ за цел" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "добавяне на допълнителен префикс за всеки ред на изхода" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "без префикс за източника и целта" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "извеждане на контекст между последователните парчета с разлики от указания " "БРОЙ редове" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "ЗНАК" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "знак вместо „+“ за нов вариант на ред" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "знак вместо „-“ за стар вариант на ред" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "знак вместо „ “ за контекст" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Настройки за разлики с преименуване" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "заместване на пълните промени с последователност от изтриване и създаване" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "засичане на преименуванията" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "без предварителен вариант при изтриване" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "засичане на копиранията" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "търсене на копирано и от непроменените файлове" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "без търсене на преименувания" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "празни обекти като източник при преименувания" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "" "продължаване на извеждането на историята — без отрязването при преименувания " "на файл" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" "без засичане на преименувания/копирания, ако броят им надвишава тази стойност" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Опции към алгоритъма за разлики" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "търсене на възможно най-малка разлика" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "без промени в празните знаци при сравняване на редове" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "без промени в празните знаци" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "без промени в празните знаци в края на редовете" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "без промени в знаците за край на ред" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "без промени в редовете, които са изцяло от празни знаци" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "евристика за преместване на границите на парчетата за улесняване на четенето" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "разлика чрез алгоритъм за подредба като пасианс" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "разлика по хистограмния алгоритъм" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "АЛГОРИТЪМ" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "избор на АЛГОРИТЪМа за разлики" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "ТЕКСТ" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "разлика чрез алгоритъма със закотвяне" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "РЕЖИМ" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "РЕГУЛЯРЕН_ИЗРАЗ" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "различен цвят за извеждане на преместените редове" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "" "режим за прескачането на празните знаци при задаването на „--color-moved“" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "Други опции за разлики" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "при изпълнение от поддиректория да се пренебрегват разликите извън нея и да " "се ползват относителни пътища" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "обработка на всички файлове като текстови" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "размяна на двата входа — обръщане на разликата" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" "завършване с код за състояние 1 при наличието на разлики, а в противен " "случай — с 0" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "без всякакъв изход от програмата" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "позволяване на изпълнение на външна помощна програма за разлики" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "изпълнение на външни програми-филтри при сравнението на двоични файлове" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "КОГА" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "игнориране на промените в подмодулите при извеждането на разликите" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "ФОРМАТ" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "начин за извеждане на промените в подмодулите" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "без включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "включване в индекса на записите, добавени с „git add -N“" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "НИЗ" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "търсене на разлики, които променят броя на поява на указаните низове" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3848,118 +3151,97 @@ msgstr "" "търсене на разлики, които променят броя на поява на низовете, които напасват " "на регулярния израз" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "извеждане на всички промени с „-G“/„-S“" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "управление на подредбата на файловете в изхода" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "търсене на разлики, които променят броя на поява на указания обект" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "избор на файловете по вид разлика" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "ФАЙЛ" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Изход към указания файл" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "търсенето на преименувания на обекти съчетани с промени се прескача поради " "многото файлове." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "установени са само точните копия на променените пътища поради многото " "файлове." -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата." -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "пътят „%s“ не съвпада с никой файл в git" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "непознат шаблон: „%s“" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "непознат отрицателен шаблон: „%s“" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" -"файлът определящ частичността на изтегленото хранилище може да има проблем: " -"шаблонът „%s“ се повтаря" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "изключване на пътеводното напасване" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "директорията „%s“ не може да бъде отворена" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "името и версията на ядрото не бяха получени" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "" "кешът за неследените файлове е изключен на тази система или местоположение" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "файлът с индекса е повреден в хранилището „%s“" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "директориите за „%s“ не може да бъдат създадени" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "директорията на git не може да се мигрира от „%s“ до „%s“" @@ -3978,12 +3260,12 @@ msgstr "Филтриране на съдържанието" msgid "could not stat file '%s'" msgstr "неуспешно изпълнение на „stat“ върху файла „%s“" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "неправилен път към пространства от имена „%s“" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "GIT_DIR не може да се зададе да е „%s“" @@ -3993,273 +3275,269 @@ msgstr "GIT_DIR не може да се зададе да е „%s“" msgid "too many args to run %s" msgstr "прекалено много аргументи за изпълнение „%s“" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Липсва адрес за отдалеченото хранилище" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: очаква се плитък списък" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" "git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "невъзможно писане към отдалечено хранилище" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "неправилен плитък ред: „%s“" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "неправилен неплитък ред: „%s“" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "обектът „%s“ липсва" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "грешка в обекта: „%s“" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "не е открит плитък обект: %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "очаква се плитък или не обект, а бе получено: „%s“" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "получено бе %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "неправилно подаване: „%s“" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "преустановяване" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "действието завърши" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "получено бе %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Отбелязване на „%s“ като пълно" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "вече има „%s“ (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не може да се създаде процес за демултиплексора" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "протоколна грешка: неправилна заглавна част на пакет" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не може да се създаде процес за „%s“" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "неуспешно изпълнение на „%s“" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "грешка в демултиплексора" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "Версията на сървъра е: %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "Сървърът поддържа „%s“" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "Сървърът не поддържа плитки клиенти" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Сървърът не поддържа опцията „--shallow-since“" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Сървърът не поддържа опцията „--shallow-exclude“" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Сървърът не поддържа опцията „--deepen“" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "няма общи подавания" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: неуспешно доставяне." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Сървърът не поддържа плитки заявки" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "Сървърът поддържа филтри" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "невъзможно писане към отдалечено хранилище" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "грешка при прочитане на заглавната част на раздел „%s“" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "очаква се „%s“, а бе получено „%s“" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "неочакван ред за потвърждение: „%s“" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "грешка при обработка на потвържденията: %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "" "очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "очакваше се след липса на отговор за готовност (ready) да не се се пращат " "други раздели" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "очаква се искан указател, а бе получено: „%s“" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "неочакван искан указател: „%s“" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "грешка при обработката на исканите указатели: %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "отдалеченото хранилище не изпрати всички необходими обекти." -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "такъв отдалечен указател няма: %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сървърът не позволява заявка за необявен обект „%s“" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "Програмата „gpg“ не подписа данните." -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "не може да се създаде временен файл" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Програмата не успя да запише самостоятелния подпис в „%s“" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“). Това се поддържа " -"в комбинация с „-P“ само при ползването на „PCRE v2“" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "„%s“: изчитането върна по-малко байтове от очакваното" @@ -4290,11 +3568,11 @@ msgstr "Основни команди от потребителско ниво" #: help.c:32 msgid "Ancillary Commands / Manipulators" -msgstr "Помощни команди / Променящи" +msgstr "Помощни команди/Променящи" #: help.c:33 msgid "Ancillary Commands / Interrogators" -msgstr "Помощни команди / Запитващи" +msgstr "Помощни команди/Запитващи" #: help.c:34 msgid "Interacting with Others" @@ -4302,19 +3580,19 @@ msgstr "Съвместна работа с други хора" #: help.c:35 msgid "Low-level Commands / Manipulators" -msgstr "Команди от ниско ниво / Променящи" +msgstr "Команди от ниско ниво/Променящи" #: help.c:36 msgid "Low-level Commands / Interrogators" -msgstr "Команди от ниско ниво / Запитващи" +msgstr "Команди от ниско ниво/Запитващи" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" -msgstr "Команди от ниско ниво / Синхронизация на хранилища" +msgid "Low-level Commands / Synching Repositories" +msgstr "Команди от ниско ниво/Синхронизация на хранилища" #: help.c:38 msgid "Low-level Commands / Internal Helpers" -msgstr "Команди от ниско ниво / Допълнителни инструменти" +msgstr "Команди от ниско ниво/Допълнителни инструменти" #: help.c:298 #, c-format @@ -4406,12 +3684,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [ОПЦИЯ…]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4482,62 +3760,46 @@ msgstr "не може да се ползва празно име като иде msgid "name consists only of disallowed characters: %s" msgstr "името съдържа само непозволени знаци: „%s“" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "неправилен формат на дата: %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "обект „%s“ в дървото „%s“ е отбелязан като дърво, но не е" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "обект „%s“ в дървото „%s“ е отбелязан като BLOB, но не е" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "кореновото дърво за подаване „%s“ не може да се зареди" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "няма достъп до частично изтегления обект-BLOB в „%s“" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "" -"данните от филтъра за частични изтегляния в „%s“ не може да бъдат анализирани" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "не може да комбинирате множество филтри" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "очаква се „tree:ДЪЛБОЧИНА“" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "поддръжката на филтри със „sparse:path“ е премахната" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "неправилен филтър: „%s“" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "знак за екраниране в подфилтър: „%c“" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "добавете нещо след комбинирането:" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "не може да комбинирате множество филтри" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "не може да промените хранилището-гарант на непълно хранилище" #: lockfile.c:151 #, c-format @@ -4567,122 +3829,126 @@ msgstr "Файлът-ключалка „%s.lock“ не може да бъде msgid "failed to read the cache" msgstr "кешът не може да бъде прочетен" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "неуспешно записване на новия индекс" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(лошо подаване)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "неуспешно изпълнение на „add_cacheinfo“ за пътя „%s“. Сливането е " "преустановено." -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "неуспешно изпълнение на „add_cacheinfo“ за обновяването на пътя „%s“. " "Сливането е преустановено." -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "грешка при изграждане на дърветата" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "грешка при създаването на пътя „%s“%s" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": възможно е да има конфликт директория/файл." -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" "преустановяване на действието, за да не се изтрие неследеният файл „%s“" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "обектът „%s“ (%s) не може да бъде прочетен" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "„%s“ не може да се отвори: %s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "неуспешно създаване на символната връзка „%s“: %s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" "не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества " "подаванията)" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Превъртане на подмодула „%s“ до следното подаване:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Превъртане на подмодула „%s“" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Неуспешно сливане на подмодула „%s“ (липсва сливането, което се предшества " "от подаванията)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Неуспешно сливане на подмодула „%s“ (не е превъртане)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" "Открито е сливане, което може да решава проблема със сливането на " "подмодула:\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4698,31 +3964,31 @@ msgstr "" "\n" "Това приема предложеното.\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Неуспешно сливане на подмодула „%s“ (открити са множество сливания)" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Неуспешно вътрешно сливане" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "„%s“ не може да се добави в базата с данни" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Автоматично сливане на „%s“" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Грешка: за да не се изтрие неследеният файл „%s“, се записва в „%s“." -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4731,7 +3997,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото." -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4740,7 +4006,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото." -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4749,7 +4015,7 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ " "е оставена в дървото: %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4758,45 +4024,45 @@ msgstr "" "КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в " "%s. Версия %s на „%s“ е оставена в дървото: %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "преименуване" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "преименуван" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Отказ да се загуби неследеният файл „%s“, защото е на място, където пречи." -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а " "„%s“ е добавен в „%s“" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Преустановяване на действието, за да не се изгуби неследеният файл „%s“. " "Вместо него се добавя „%s“" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4805,18 +4071,18 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s." -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (некоригиран конфликт)" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4827,7 +4093,7 @@ msgstr "" "постави „%s“, защото няколко нови директории поделят съдържанието на " "директория „%s“, като никоя не съдържа мнозинство от файловете ѝ." -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4836,7 +4102,7 @@ msgstr "" "КОНФЛИКТ (косвено преименуване на директория): следният файл или директория " "„%s“ не позволяват косвеното преименуване на следния път/ища: %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4846,7 +4112,7 @@ msgstr "" "съответства на „%s“. Косвено преименуване на директория води до поставянето " "на тези пътища там: %s." -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4855,7 +4121,7 @@ msgstr "" "КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон " "„%s“, а „%s“ е преименуван на „%s“ в „%s“" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4864,52 +4130,52 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото " "„%s“ също е с променено име." -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "обектът „%s“ не може да се прочете" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "обектът „%s“ не е BLOB" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "промяна" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "променен" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "съдържание" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "добавяне/добавяне" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "ПОДМОДУЛ" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Добавяне като „%s“" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4918,7 +4184,7 @@ msgstr "" "Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в " "„%s“. Обектът се мести в „%s“." -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4927,7 +4193,7 @@ msgstr "" "КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е " "преименувана в „%s“. Предложението е да преместите обекта в „%s“." -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4936,7 +4202,7 @@ msgstr "" "Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е " "преименувана в „%s“. Обектът се мести в „%s“." -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4945,187 +4211,179 @@ msgstr "" "КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, " "която е преименувана в „%s“. Предложението е да преместите обекта в „%s“." -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Изтриване на „%s“" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "файл/директория" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "директория/файл" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "КОНФЛИКТ (%s): Съществува директория на име „%s“ в „%s“. Добавяне на „%s“ " "като „%s“" -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Добавяне на „%s“" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Сливането ще презапише локалните промени на тези файлове:\n" +" %s" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "Вече е обновено!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "неуспешно сливане на дърветата „%s“ и „%s“" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Сливане:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "открит е %u общ предшественик:" msgstr[1] "открити са %u общи предшественици:" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "сливането не върна подаване" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Сливането ще презапише локалните промени на тези файлове:\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "Неуспешен анализ на обекта „%s“" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Индексът не може да бъде прочетен" -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "файлът с индекса за множество пакети „%s“ е твърде малък" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "непозната версия на индекс за множество пакети — %d" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "версията на отпечатъка %u не съвпада" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "неправилно (прекалено голямо) отместване на откъс" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "идентификаторът за краен откъс на индекс за множество пакети се явява по-" "рано от очакваното" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "липсва откъс (pack-name) от индекс за множество пакети" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "липсва откъс (OID fanout) от индекс за множество пакети" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "липсва откъс (OID lookup) от индекс за множество пакети" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "неправилна подредба на имената в индекс за множество пакети: „%s“ се появи " "преди „%s“" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" "неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "индексът за множество пакети съдържа 64-битови отмествания, но размерът на " "„off_t“ е недостатъчен" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "" "грешка при създаването на пакетен файл на базата на индекс за множество " "пакети" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "пакетният файл „%s“ не може да бъде добавен" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "индексът за пакети „%s“ не може да бъде отворен" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "обект %d в пакетния файл липсва" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Добавяне на пакетни файлове към индекс за множество пакети" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "пакетният файл за триене „%s“ не може да се открие" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "Запис на откъси към индекс за множество пакети" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "индексът за множество пакети не може да бъде изчистен при „%s“" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Търсене на указаните пакетни файлове" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -5133,68 +4391,60 @@ msgstr "" "неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > " "%<PRIx32> = fanout[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" msgstr "" -"Проверка на подредбата на идентификатори на обекти във файл с индекс към " -"множество пакетни файлове" +"Проверка на подредбата на идентификатори на обекти в MIDX (файл с индекс към " +"множество пакетни файлове)" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" "неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Подредба на обектите по пакетни файлове" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Проверка на отместването на обекти" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "индексът на пакета „%s“ не може да бъде зареден" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Преброяване на свързаните обекти" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Търсене и изтриване на несвързаните пакетни файлове" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "командата „pack-objects“ не може да бъде стартирана" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "командата „pack-objects“ не може да бъде завършена" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "не може да се създаде нишка за директории: %s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "не може да се създаде нишка за имена: %s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "не може да се изчака нишка за имена: %s" @@ -5247,32 +4497,32 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Зададена е лоша стойност на променливата „%s“: „%s“" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "неправилен вид обект: „%s“" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "обектът „%s“ е %s, а не %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "обектът „%s“ е непознат вид: %d" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "обектът „%s“ не може да бъде анализиран" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "разлика в контролната сума: „%s“" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "" "отместване преди края на пакетния файл (възможно е индексът да е повреден)" @@ -5291,11 +4541,6 @@ msgstr "" "отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът " "да е отрязан)" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "размерът на „%s“ не може да бъде получен" - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -5311,7 +4556,7 @@ msgstr "опциите „%s“ и „%s“ са несъвместими" msgid "%s : incompatible with something else" msgstr "опцията „%s“ е несъвместима с нещо" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "опцията „%s“ не приема аргументи" @@ -5321,42 +4566,42 @@ msgstr "опцията „%s“ не приема аргументи" msgid "%s isn't available" msgstr "опцията „%s“ не е налична" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" "„%s“ очаква неотрицателно цяло число, евентуално със суфикс „k“/„m“/„g“" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "нееднозначна опция: „%s“ (може да е „--%s%s“ или „--%s%s“)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" +msgid "did you mean `--%s` (with two dashes ?)" msgstr "„--%s“ (с 2 тирета) ли имахте предвид?" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "непозната опция: „%s“" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "непознат флаг „%c“" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "непозната стойност извън „ascii“ в низа: „%s“" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "…" -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "употреба: %s" @@ -5364,21 +4609,21 @@ msgstr "употреба: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-ЧИСЛО" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "псевдоним на „--%s“" @@ -5405,34 +4650,34 @@ msgstr "" msgid "malformed object name '%s'" msgstr "неправилно име на обект „%s“" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Екраниращият знак „\\“не може да е последен знак в стойността на атрибут" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Позволено е само едно указване на „attr:“." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "„attr:“ трябва да указва стойност" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "неправилно име на атрибут: „%s“" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "глобалните настройки за пътища „glob“ и „noglob“ са несъвместими" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5440,55 +4685,50 @@ msgstr "" "глобалната настройка за дословни пътища „literal“ е несъвместима с всички " "други глобални настройки за пътища" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "неправилен параметър за опцията за магически пътища „prefix“" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Неправилна стойност за опцията за магически пътища „%.*s“ в „%s“" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Знакът „)“ липсва в опцията за магически пътища в „%s“" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Магическите пътища „%c“ са без реализация за „%s“" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: опциите „literal“ и „glob“ са несъвместими" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: „%s“ е извън хранилището при „%s“" +msgid "%s: '%s' is outside repository" +msgstr "%s: „%s“ е извън хранилището" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "„%s“ (клавиш: „%c“)" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магическите пътища не се поддържат от командата „%s“" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "пътят „%s“ е след символна връзка" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "неправилно цитиран ред: %s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "пакетът за изчистване на буферите не може да се запише" @@ -5551,44 +4791,34 @@ msgstr "Обновяване на индекса" msgid "unable to create threaded lstat: %s" msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "аргументът към опцията „--pretty“ не може да се анализира" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Липсва адрес за отдалеченото хранилище" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "" -"името отдалеченото хранилище-гарант не може за започва със знака „/“: %s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "командата за журнала с подавания „log“ не може да се стартира" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "" "изходът от командата за журнала с подавания „log“ не може да се прочете" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "подаването „%s“ не може да бъде анализирано" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "заглавната част на git „%.*s“ не може да се анализира" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "неуспешно търсене на разлика" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "журналът с подаванията на „%s“ не може да бъде анализиран" @@ -5630,16 +4860,16 @@ msgstr "„%s“ не може да се добави в индекса" msgid "unable to stat '%s'" msgstr "„stat“ не може да се изпълни върху „%s“" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "„%s“ съществува и като файл, и като директория" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Обновяване на индекса" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5648,7 +4878,7 @@ msgstr "" "Зададена е неправилна стойност на настройката „index.version“.\n" "Ще се ползва версия %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5658,157 +4888,146 @@ msgstr "" "„GIT_INDEX_VERSION“.\n" "Ще се ползва версия %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "неправилен подпис: „0x%08x“" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "неправилна версия на индекса %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" "индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git" -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "игнориране на разширението „%.4s“" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "непознат формат на запис в индекса: „0x%08x“" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "неправилно име на поле в индекса близо до пътя „%s“" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "неподредени записи в индекса" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "множество записи за слетия файл „%s“" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "неподредени записи за „%s“" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "файлът с индекса е повреден" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "не може да се създаде нишка за зареждане на обектите от кеша: %s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "не може да се изчака нишка за зареждане на обектите от кеша: %s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: неуспешно отваряне на файла на индекса" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: не може да се получи информация за отворения индекс със „stat“" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: файлът на индекса е по-малък от очакваното" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: неуспешно заделяне на съответстваща памет чрез „mmap“ на индекса" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" "не може да се създаде нишка за зареждане на разширенията на индекса: %s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" "не може да се създаде нишка за зареждане на разширенията на индекса: %s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "споделеният индекс „%s“ не може да се обнови" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "„%s“ не може да се затвори" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "неуспешно изпълнение на „stat“ върху „%s“" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "не може да се отвори директорията на git: %s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "неуспешно изтриване на „%s“" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "правата за достъп до „%s“ не могат да бъдат поправени" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: не може да се премине към етап №0" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Може да промените това с командите „git rebase --edit-todo“ и „git rebase --" -"continue“ след това.\n" -"Може и да преустановите пребазирането с командата „git rebase --abort“.\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -5816,7 +5035,7 @@ msgstr "" "Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“. " "Настройката се прескача." -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5863,14 +5082,14 @@ msgstr "" "Може да променяте последователността на редовете — те се изпълняват\n" "последователно отгоре-надолу.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)" msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5879,7 +5098,7 @@ msgstr "" "Не изтривайте редове. Подаванията могат да се прескачат с командата " "„drop“.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5887,7 +5106,7 @@ msgstr "" "\n" "Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5902,7 +5121,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5912,19 +5131,22 @@ msgstr "" "Ако изтриете всичко, пребазирането ще бъде преустановено.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Празните подавания са коментирани" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "„%s“ не може да се запише" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "„%s“ не може да се запише." +msgid "could not copy '%s' to '%s'." +msgstr "„%s“ не може да се копира като „%s“." -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5933,7 +5155,7 @@ msgstr "" "Предупреждение: някои подавания може да са пропуснати.\n" "Пропуснати подавания (новите са най-отгоре):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5950,13 +5172,6 @@ msgstr "" "предупреждение)\n" "или „error“ (считане за грешка).\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "от „%s“ не може да се чете." - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5967,7 +5182,7 @@ msgstr "„%s“ не сочи към позволен обект!" msgid "ignoring dangling symref %s" msgstr "игнориране на указател на обект извън клон „%s“" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "игнориране на повредения указател „%s“" @@ -5992,15 +5207,14 @@ msgstr "указателят „%s“ вече съществува" msgid "unexpected object ID when writing '%s'" msgstr "неочакван идентификатор на обект при записването на „%s“" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "в „%s“ не може да се пише" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "„%s“ не може да бъде отворен за запис" @@ -6035,37 +5249,37 @@ msgstr "указател не може да се обнови с грешно и msgid "update_ref failed for ref '%s': %s" msgstr "неуспешно обновяване на указателя „%s“: %s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "не са позволени повече от една промени на указателя „%s“" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "обновяванията на указатели са забранени в среди под карантина" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "„%s“ съществува, не може да се създаде „%s“" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "Указателят „%s“ не може да бъде изтрит" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "Указателят „%s“ не може да бъде изтрит: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "Указателите не може да бъдат изтрити: %s" @@ -6075,7 +5289,7 @@ msgstr "Указателите не може да бъдат изтрити: %s" msgid "invalid refspec '%s'" msgstr "неправилен указател: „%s“" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "изтрит" @@ -6094,281 +5308,281 @@ msgstr "назад с %d" msgid "ahead %d, behind %d" msgstr "напред с %d, назад с %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "очакван формат: %%(color:ЦВЯТ)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "непознат цвят: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "очаква се цяло число за „refname:lstrip=%s“" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "очаква се цяло число за „refname:rstrip=%s“" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "непознат аргумент за „%%(%s)“: %s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) не приема аргументи" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "непознат аргумент за %%(objectsize): %s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) не приема аргументи" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) не приема аргументи" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) не приема аргументи" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "непознат аргумент „%%(trailers)“: %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "очаква се положителна стойност за „contents:lines=%s“" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "непознат аргумент за %%(contents): %s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "очаква се положителна стойност за „objectname:short=%s“" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "непознат аргумент за %%(objectname): %s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "непозната позиция: %s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "непозната широчина: %s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "непознат аргумент за %%(align): %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "очаква се положителна широчина с лексемата „%%(align)“" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "непознат аргумент за „%%(if)“: %s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "неправилно име на обект: „%.*s“" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "непознато име на обект: „%.*s“" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: лексемата %%(then) е използвана повече от един път" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: лексемата %%(then) е използвана след %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: лексемата %%(else) е използвана повече от един път" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: лексемата %%(end) е използвана без съответната ѝ" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "неправилен форматиращ низ „%s“" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "извън клон, пребазиране на „%s“" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "извън клон, пребазиране на несвързан указател „HEAD“ при „%s“" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "извън клон, двоично търсене от „%s“" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "извън клон" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "обектът „%s“ липсва за „%s“" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "обект със сгрешен формат при „%s“" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнориране на указателя с грешно име „%s“" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "грешка във форма̀та: липсва лексемата %%(end)" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "опциите „%s“ и „--merged“ са несъвместими" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "опциите „%s“ и „--no-merged“ са несъвместими" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "неправилно име на обект „%s“" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "опцията „%s“ не сочи към подаване" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "съкращението за отдалечено хранилище не може за започва със знака „/“: %s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "зададен е повече от един пакет за получаване, ще се ползва първият" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "„%s“ обикновено следи „%s“, а не „%s“" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "„%s“ следи както „%s“, така и „%s“" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "ключ „%s“ на шаблона не съдържа „*“" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "стойност „%s“ на шаблона не съдържа „*“" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "указателят на версия-източник „%s“ не съвпада с никой обект" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект" @@ -6377,7 +5591,7 @@ msgstr "указателят на версия-източник „%s“ съв #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6390,7 +5604,7 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -"Зададената цел не е пълно име на указател (не започва с „refs/“).\n" +"Зададената цел не е пълен указател (не започва с „refs/“).\n" "Бяха пробвани следните варианти:\n" "\n" " ⁃ указател от отдалеченото хранилище, който да съответства на „%s“;\n" @@ -6401,7 +5615,7 @@ msgstr "" "Никой от вариантите не сработи. Трябва сами да укажете пълното име на\n" "указателя." -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6412,7 +5626,7 @@ msgstr "" "като\n" "изтласкате към „%s:refs/heads/%s“?" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6423,7 +5637,7 @@ msgstr "" "като\n" "изтласкате към „%s:refs/tags/%s“?" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6433,7 +5647,7 @@ msgstr "" "ИЗТОЧНИКът е обект-дърво. Не целите ли всъщност да създадете нов клон като\n" "изтласкате към „%s:refs/tags/%s“?" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6443,118 +5657,118 @@ msgstr "" "ИЗТОЧНИКът е обект-BLOB. Не целите ли всъщност да създадете нов клон като\n" "изтласкате към „%s:refs/tags/%s“?" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "не е открит клон съответстващ на „%s“" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" "указателят на версия-цел „%s“ съответства и ще получава от повече от един " "източник" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "Указателят „HEAD“ не сочи към клон" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "няма клон на име „%s“" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "не е зададен клон-източник за клона „%s“" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "клонът-източник „%s“ не е съхранен като следящ клон" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "липсва локален следящ клон за местоположението за изтласкване „%s“ в " "хранилището „%s“" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "няма информация клонът „%s“ да следи някой друг" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "указателят за изтласкване на „%s“ не включва „%s“" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "простото (simple) изтласкване не съответства на една цел" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "отдалеченият указател „%s“ не може да бъде открит" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "• прескачане на неочаквания локален указател „%s“" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Клонът е актуализиран към „%s“.\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Клонът ви и „%s“ сочат към различни подавания.\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (за повече информация ползвайте „%s“)\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n" msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (публикувайте локалните си промени чрез „git push“)\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6562,11 +5776,11 @@ msgid_plural "" msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n" msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (обновете локалния си клон чрез „git pull“)\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6581,11 +5795,11 @@ msgstr[1] "" "Текущият клон се е отделил от „%s“,\n" "двата имат съответно по %d и %d несъвпадащи подавания.\n" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "очакваното име на обект „%s“ не може да бъде анализирано" @@ -6600,7 +5814,7 @@ msgstr "неправилно име на указател за замяна: „ msgid "duplicate replace ref: %s" msgstr "повтарящ се указател за замяна: „%s“" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "дълбочината на замяна е прекалено голяма за обекта: „%s“" @@ -6666,8 +5880,8 @@ msgstr "излишният обект „%s“ не може да се изтр msgid "Recorded preimage for '%s'" msgstr "Предварителният вариант на „%s“ е запазен" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "Директорията „%s“ не може да бъде създадена" @@ -6701,20 +5915,20 @@ msgstr "Запазената корекция на конфликт при „%s msgid "unable to open rr-cache directory" msgstr "директорията „rr-cache“ не може да се отвори" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "Текущият клон е повреден" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Текущият клон „%s“ е без подавания " -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" "опцията „-L“ поддържа единствено форматирането на разликите според опциите „-" @@ -6739,32 +5953,32 @@ msgstr "" "За да изключите това предупреждение, изпълнете:\n" " git config advice.ignoredHook false" -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "неочакван изчистващ пакет „flush“ при изчитане на състоянието от " "отдалеченото разпакетиране" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" "състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "неуспешно отдалечено разпакетиране: %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "сертификатът за изтласкване не може да бъде подписан" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6772,47 +5986,47 @@ msgstr "" "отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се " "използва сертификат" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "отсрещната страна не поддържа опции при изтласкване" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "„%s“ не може да бъде изтрит" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "„%s“ не може да бъде изтрит" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "отмяна" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "отбиране" -#: sequencer.c:329 -msgid "rebase" -msgstr "пребазиране" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "rebase -i" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "неизвестно действие: %d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6820,7 +6034,7 @@ msgstr "" "след коригирането на конфликтите, отбележете съответните\n" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“." -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6830,110 +6044,115 @@ msgstr "" "пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n" "подайте резултата с командата „git commit'“." -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "„%s“ не може да се заключи" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "краят на ред не може да се запише в „%s“" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "„%s“ не може да се завърши" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "локалните ви промени ще бъдат презаписани при %s." -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "подайте или скатайте промените, за да продължите" -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: превъртане" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Несъществуващ режим на изчистване „%s“" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: новият индекс не може да бъде запазен" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "дървото на кеша не може да бъде обновено" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "в „%.*s“ няма ключове" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "цитирането на стойността на „%s“ не може да бъде изчистено" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "файлът не може да бъде прочетен: „%s“" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "непозната променлива „%s“" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "неправилен формат на дата „%s“ в „%s“" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6962,13 +6181,17 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "запазване на начално подаване" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "" "неуспешно изпълнение на куката при промяна на съобщението при подаване " "(prepare-commit-msg)" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6997,7 +6220,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7023,337 +6246,338 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "току що създаденото подаване не може да бъде открито" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "току що създаденото подаване не може да бъде анализирано" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "" "състоянието сочено от указателя „HEAD“ не може да бъде открито след " "подаването" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "несвързан връх „HEAD“" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (начално подаване)" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "указателят „HEAD“ не може да бъде анализиран" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "върховото подаване „HEAD“ не може да бъде прочетено" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "авторът на подаването не може да бъде анализиран" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "Командата „git write-tree“ не успя да запише обект-дърво" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "съобщението за подаване не може да бъде прочетено от „%s“" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "обектът за подаването не може да бъде записан" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "подаването „%s“ не може да бъде анализирано" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "родителското подаване „%s“ не може да бъде анализирано" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "непозната команда: %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Това е обединение от %d подавания" -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "указателят „HEAD“ не може да се прочете" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "" "съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "„%s“ не може да се запази" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Това е 1-то съобщение при подаване:" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "съобщението за подаване към „%s“ не може да бъде прочетено" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Това е съобщение при подаване №%d:" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Съобщение при подаване №%d ще бъде прескочено:" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "индексът не е слят." -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "началното подаване не може да се вкара в предходното му" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“" -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "подаването „%s“ няма родител %d" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "неуспешно извличане на съобщението за подаване на „%s“" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: неразпозната стойност за родителското подаване „%s“" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "„%s“ не може да се преименува на „%s“" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "подаването „%s“… не може да бъде отменено: „%s“" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "подаването „%s“… не може да бъде приложено: „%s“" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "прескачане на %s %s — кръпката вече е приложена\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: неуспешно изчитане на индекса" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: неуспешно обновяване на индекса" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "„%s“ не приема аргументи: „%s“" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "„%s“ изисква аргументи" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "„%s“ не може да се анализира" +msgid "could not parse '%.*s'" +msgstr "„%.*s“ не може да се анализира" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "неправилен ред %d: %.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Без предишно подаване не може да се изпълни „%s“" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "от „%s“ не може да се чете." + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "преустановяване на извършваното в момента отбиране на подавания" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "преустановяване на извършваното в момента отмяна на подаване" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "коригирайте това чрез „git rebase --edit-todo“." -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "неизползваем файл с описание на предстоящите действия: „%s“" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "никое от подаванията не може да се разпознае." -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "" "по време на отмяна на подаване не може да се извърши отбиране на подаване." -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "по време на отбиране не може да се извърши отмяна на подаване." -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "неправилна стойност за „%s“: „%s“" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "подаването, в което другите да се вкарат, не може да се използва" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "неправилен файл с опции: „%s“" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "зададено е празно множество от подавания" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "в момента вече се извършва отмяна на подавания" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "в момента вече се извършва отбиране на подавания" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" "директорията за определянето на последователността „%s“ не може да бъде " "създадена" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "указателят „HEAD“ не може да се заключи" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "" "в момента не се извършва отбиране на подавания или пребазиране на клона" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "" "действието не може да бъде преустановено, когато сте на клон, който тепърва " "предстои да бъде създаден" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "„%s“ не може да бъде отворен" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "„%s“ не може да бъде прочетен: %s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "неочакван край на файл" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е " "повреден" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n" "Не се правят промени." -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "в момента не тече пребазиране" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "в момента не се извършва отбиране на подавания" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "неуспешно прескачане на подаването" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "няма какво да се прескочи" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7363,21 +6587,21 @@ msgstr "" "\n" " git %s --continue" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "„%s“ не може да се обнови" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "указателят „HEAD“ не може да бъде прочетен" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7396,22 +6620,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Невъзможно сливане на „%.*s“" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "„%s“ не може да се копира като „%s“" -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "индексът не може да бъде прочетен" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7426,11 +6655,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "и променѝ индекса и/или работното дърво\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7447,72 +6676,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "неправилно име на етикет: „%.*s“" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "запазване на фалшиво начално подаване" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "запазване на подаването, в което другите да се вкарат" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "дървото, сочено от „%s“, не може да бъде открито" -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "индексът не може да бъде записан" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "„%s“ не може да бъде открит" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "без текущо подаване не може да се слива" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "„%.*s“ не може да се анализира" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "няма нищо за сливане: „%.*s“" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "върху начално подаване не може да се извърши множествено сливане" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "съобщението за подаване към „%s“ не може да бъде получено" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "сливането на „%.*s“ не може даже да започне" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "сливане: новият индекс не може да бъде запазен" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Автоматично скатаното е приложено.\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7523,26 +6756,31 @@ msgstr "" "надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n" "или да ги изхвърлите чрез „git stash drop“, когато поискате.\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "„%s“ не може да се изтегли" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "„%s“ е неправилен идентификатор на обект" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "указателят „HEAD“ не може да се отдели" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Бе спряно при „HEAD“\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Бе спряно при „%s“\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7565,48 +6803,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Спиране при „%s“… %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "непозната команда %d" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "указателят за „orig-head“ не може да се прочете" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "указателят за „onto“ не може да се прочете" -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "„HEAD“ не може да бъде обновен до „%s“" -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "не може да пребазирате, защото има промени, които не са в индекса." -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "несъществуващо подаване не може да се поправи" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "неправилен файл: „%s“" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "неправилно съдържание: „%s“" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7616,59 +6854,69 @@ msgstr "" "В работното дърво има неподадени промени. Първо ги подайте, а след това\n" "отново изпълнете „git rebase --continue“." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "файлът „%s“ не може да бъде записан" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "промените в индекса не могат да бъдат подадени." -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не може да се отбере „%s“" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: неправилна версия" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "първоначалното подаване не може да бъде отменено" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: неподдържани опции" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: грешка при подготовката на версии" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Може да промените това с командите „git rebase --edit-todo“ и „git rebase --" +"continue“ след това.\n" +"Може и да преустановите пребазирането с командата „git rebase --abort“.\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "няма какво да се прави" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "излишните команди за отбиране не бяха прескочени" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "скриптът вече е преподреден." -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "„%s“ е извън хранилището при „%s“" +msgid "'%s' is outside repository" +msgstr "„%s“ е извън хранилището" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7679,7 +6927,7 @@ msgstr "" "\n" " git КОМАНДА -- ПЪТ…" -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7692,12 +6940,12 @@ msgstr "" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7709,95 +6957,95 @@ msgstr "" "\n" " git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" "не може да се зададе текуща работна директория при неправилни настройки" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "тази команда трябва да се изпълни в работно дърво" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Очаква се версия на хранилището на git <= %d, а не %d" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "открити са непознати разширения в хранилището:" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "„%s“ не може да се отвори" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "прекалено голям файл „.git“: „%s“" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "грешка при прочитане на „%s“" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "неправилен формат на gitfile: %s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "липсва път в gitfile: „%s“" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "не е хранилище на Git: %s" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "„%s“ е прекалено голям" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "не е хранилище на git: „%s“" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "не може да се влезе в директорията „%s“" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "процесът не може да се върне към предишната работна директория" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Текущата работна директория не може да бъде прочетена" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "не може да се влезе в директорията „%s“" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" "нито тази, нито която и да е от по-горните директории, не е хранилище на " "git: %s" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7808,7 +7056,7 @@ msgstr "" "Git работи в рамките на една файлова система, защото променливата на средата " "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена." -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7818,291 +7066,291 @@ msgstr "" "(0%.3o).\n" "Собственикът на файла трябва да има права за писане и четене." -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "неуспешно създаване на процес чрез „fork“" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "неуспешно изпълнение на „setsid“" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "директорията за обекти „%s“ не съществува, проверете „.git/objects/info/" "alternates“" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: алтернативните хранилища за обекти се пренебрегват поради прекалено " "дълбоко влагане" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "директорията за обекти „%s“ не може да бъде нормализирана" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "файлът с алтернативите не може да бъде прочетен" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "новият файл с алтернативите не може да бъде преместен на мястото му" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "пътят „%s“ не съществува." -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "еталонното хранилище „%s“ не е локално" -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "еталонното хранилище „%s“ е плитко" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "еталонното хранилище „%s“ е с присаждане" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "неправилен ред при анализа на алтернативните указатели: „%s“" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" "неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "неуспешно изпълнение на „mmap“" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "файлът с обектите „%s“ е празен" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "непакетираният обект „%s“ е повреден" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "грешни данни в края на непакетирания обект „%s“" -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "неправилен вид обект" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" "заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-" "type“" -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "заглавната част на „%s“ не може да бъде разпакетирана" -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" "заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“" -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "заместителят „%s“ на „%s“ не може да бъде открит" -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "непакетираният обект „%s“ (в „%s“) е повреден" -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "пакетираният обект „%s“ (в „%s“) е повреден" -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "файлът „%s“ не може да бъде записан" -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "правата за достъп до „%s“ не могат да бъдат зададени" -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "грешка при запис на файл" -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "грешка при затварянето на файла с непакетиран обект" -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "няма права за добавяне на обект към базата от данни на хранилището „%s“" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "не може да бъде създаден временен файл" -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "грешка при записа на файла с непакетиран обект" -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d" -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "неуспешно приключване на „deflate“ върху „%s“: %d" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "грешка поради нестабилния източник данни за обектите „%s“" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“" -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "обектът за „%s“ не може да се прочете" -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "повредено подаване" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "повреден етикет" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "грешка при четене по време на индексиране на „%s“" -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "непълно прочитане по време на индексиране на „%s“" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "„%s“ не може да се вмъкне в базата от данни" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "неподдържан вид файл: „%s“" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "„%s“ е неправилен обект" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "„%s“ е неправилен обект от вид „%s“" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "обектът „%s“ не може да бъде отворен" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "неправилна контролна сума за „%s“ (трябва да е %s)" -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "неуспешно изпълнение на „mmap“ върху „%s“" -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "заглавната част на „%s“ не може да бъде разпакетирана" -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "съдържанието на „%s“ не може да бъде разпакетирано" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "късият SHA1 „%s“ не е еднозначен" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Възможностите са:" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -8114,122 +7362,57 @@ msgid "" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" -"При нормална работа Git никога не създава указатели, които завършват\n" -"с 40 шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n" +"При нормална работа Git никога не създава указатели, които завършват с 40\n" +"шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n" "Възможно е такива указатели да са създадени случайно. Например:\n" "\n" " git switch -c $BRANCH $(git rev-parse …)\n" "\n" -"където стойността на променливата на средата BRANCH е празна, при което\n" -"се създава подобен указател. Прегледайте тези указатели и ги изтрийте.\n" -"За да изключите това съобщение, изпълнете:\n" +"където стойността на променливата на средата BRANCH е празна, при което се\n" +"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Може " +"да\n" +"спрете това съобщение като изпълните командата:\n" "\n" " git config advice.objectNameWarning false" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "журналът за „%.*s“ стига само до „%s“" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "журналът за „%.*s“ съдържа само %d записа" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "пътят „%s“ съществува на диска, но не и в „%.*s“" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"пътят „%s“ съществува на диска, но не е в „%s“\n" -"Пробвайте с „%.*s:%s“, което е същото като „%.*s:./%s“." - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "пътят „%s“ не съществува в „%.*s“" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"пътят „%s“ е в индекса, но не версия %d\n" -"Пробвайте с „%d:%s“." - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"пътят „%s“ е в индекса, но не в „%s“\n" -"Пробвайте с „%d:%s“, което е същото като „%d:./%s“." - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "пътят „%s“ съществува на диска, но не е в индекса" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "пътят „%s“ не съществува нито на диска, нито в индекса" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "относителен път не може да се ползва извън работното дърво" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "неправилно име на обект: „%.*s“" - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8237,18 +7420,13 @@ msgstr[0] "%u байт" msgstr[1] "%u байта" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u байт/сек." msgstr[1] "%u байта/сек." -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "„%s“ не може да се редактира" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -8279,129 +7457,51 @@ msgstr "в неподготвения подмодул „%s“" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Пътят „%s“ е в подмодула „%.*s“" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "неправилен аргумент за „--ignore-submodules“: „%s“" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"Подмодулът при подаване %s на пътя „%s“ е различен от другия модул със " -"същото име, затова първият се прескача." - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"Командата „git rev-list ПОДАВАНИЯ --not --remotes -n 1“ не може да се " -"изпълни в подмодула „%s“" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "процесът за подмодула „%s“ завърши неуспешно" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не може да се открие към какво сочи указателят „HEAD“" -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "Изтласкване на подмодула „%s“\n" - -#: submodule.c:1161 +#: submodule.c:1481 #, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "Подмодулът „%s“ не може да бъде изтласкан\n" +msgid "Could not access submodule '%s'" +msgstr "Подмодулът „%s“ не може да бъде достъпен" -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "Доставяне на подмодула „%s%s“\n" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "Подмодулът „%s“ не може да бъде достъпен\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Грешки при доставяне на подмодул:\n" -"%s" - -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "„%s“ не е хранилище на git" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "" -"Командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "" -"командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "командата „git status“ не може да се изпълни в подмодула „%s“" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "командата „git status“ не може да се изпълни в подмодула „%s“" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Настройката „core.worktree“ не може да се изтрие в подмодула „%s“" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "неуспешна обработка на поддиректориите в подмодула „%s“" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "неуспешно зануляване на индекса на подмодула" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "индексът на подмодула „%s“ не е чист" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Подмодулът „%s“ не може да се обнови." -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "„%s“ (директория на подмодул) е в директорията на git: „%.*s“" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8409,17 +7509,12 @@ msgstr "" "не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно " "работно дърво" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "името на подмодула „%s“ не може да бъде намерено" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "„%s“ не може да се премести в съществуваща директория на git" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8430,37 +7525,42 @@ msgstr "" "„%s“ към\n" "„%s“\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "неуспешна обработка на поддиректориите в подмодула „%s“" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "„ls-stat“ не може да се стартира в „..“" -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "„ls-tree“ завърши с неочакван изходен код: %d" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "игнориране на подозрително име на подмодул: „%s“" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "настройката „submodule.fetchjobs“ не приема отрицателни стойности" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "„%s“ се прескача, защото е възможно да се тълкува като опция за командния " "ред: %s" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "Неправилна стойност за „%s“" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен" @@ -8476,7 +7576,7 @@ msgstr "неуспешно изпълнение на завършващата к msgid "unknown value '%s' for key '%s'" msgstr "непозната стойност „%s“ за настройката „%s“" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "стойността „%s“ се повтаря в настройките" @@ -8495,7 +7595,7 @@ msgstr "входният файл „%s“ не може да бъде проч msgid "could not read from stdin" msgstr "от стандартния вход не може да се чете" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "Не може да се получи информация чрез „stat“ за „%s“" @@ -8524,48 +7624,48 @@ msgstr "временният файл не може да се преименув msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Клонът „%s“ ще следи „%s“ от „%s“\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "пратката на git „%s“ не може да бъде прочетена" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: неправилна опция за дълбочина: %s" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "" "За повече информация вижте раздела „protocol.version“ в „git help config“" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "опциите на сървъра изискват поне версия 2 на протокола" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "стойността на настройката „transport.color.*“ не може да се разпознае" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "протокол версия 2 все още не се поддържа" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "непозната стойност за настройката „%s“: „%s“" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "преносът по „%s“ не е позволен" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "командата „git-over-rsync“ вече не се поддържа" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8574,7 +7674,7 @@ msgstr "" "Следните пътища за подмодули съдържат промени,\n" "които липсват от всички отдалечени хранилища:\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8599,34 +7699,34 @@ msgstr "" " git push\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "Преустановяване на действието." -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "неуспешно изтласкване на всички необходими подмодули" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "опцията не се поддържа от протокола" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "неуспешен пълен запис към насрещната помощна програма" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "насрещната помощна програма за „%s“ не може да бъде открита" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "" "файловият дескриптор от насрещната помощна програма не може да се дублира с " "„dup“" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8635,111 +7735,106 @@ msgstr "" "непозната задължителна способност „%s“. Насрещната помощна програма " "вероятно изисква нова версия на Git" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "" "насрещната помощна програма трябва да поддържа способност за изброяване на " "указатели" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "„%s“ неочаквано върна: „%s“" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "„%s“ заключи и „%s“" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "неуспешно изпълнение на бързо внасяне" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "грешка при изпълнението на бързо внасяне" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "указателят „%s“ не може да се прочете" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "неочакван отговор при свързване: „%s“" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "протоколът не поддържа задаването на път на отдалечената услуга" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "неправилен път на отдалечената услуга" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "неуспешно свързване към подуслугата „%s“" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" "очаква се или успех, или грешка, но насрещната помощна програма върна „%s“" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" "насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "насрещната помощна програма не поддържа изтласкване. Необходимо е " "изброяване на указателите" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "" "насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "не може да се извърши бързо изнасяне" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "грешка при изпълнението на командата за бързо изнасяне" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8748,67 +7843,67 @@ msgstr "" "Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n" "направено. Пробвайте да укажете клон, напр. “master“.\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "неправилен отговор в списъка с указатели: „%s“" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "неуспешно четене на „%s“" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "неуспешен запис в „%s“" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "неуспешно изпълнение на нишката „%s“" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "завършването на нишката „%s“ не може да се изчака: „%s“" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "неуспешно изпълнение на „%s“" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "неуспешно стартиране на нишка за копиране на данните" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "прекалено кратък обект-дърво" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "неправилни права за достъп в запис в дърво" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "празно име на файл в запис в дърво" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "прекалено кратък файл-дърво" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8817,7 +7912,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да преминете към нов клон." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8826,7 +7921,7 @@ msgstr "" "Изтеглянето ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8835,7 +7930,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да слеете." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8844,7 +7939,7 @@ msgstr "" "Сливането ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8853,7 +7948,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%sПодайте или скатайте промените, за да извършите „%s“." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8862,7 +7957,7 @@ msgstr "" "„%s“ ще презапише локалните промени на тези файлове:\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8871,7 +7966,7 @@ msgstr "" "Обновяването на следните директории ще изтрие неследените файлове в тях:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8880,7 +7975,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да преминете на друг клон." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8889,7 +7984,7 @@ msgstr "" "Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8898,7 +7993,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8907,7 +8002,7 @@ msgstr "" "Сливането ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8916,7 +8011,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8925,7 +8020,7 @@ msgstr "" "„%s“ ще изтрие тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8935,7 +8030,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да смените клон." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8945,7 +8040,7 @@ msgstr "" "Изтеглянето ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8954,7 +8049,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да слеете." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8963,7 +8058,7 @@ msgstr "" "Сливането ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8972,7 +8067,7 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%sПреместете ги или ги изтрийте, за да извършите „%s“." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8981,12 +8076,12 @@ msgstr "" "„%s“ ще презапише тези неследени файлове в работното дърво:\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8996,7 +8091,7 @@ msgstr "" "актуални:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -9007,7 +8102,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -9018,7 +8113,7 @@ msgstr "" "дърво:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -9027,16 +8122,16 @@ msgstr "" "Подмодулът не може да бъде обновен:\n" "„%s“" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Преустановяване на действието\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "Обновяване на файлове" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -9046,10 +8141,6 @@ msgstr "" "във файлови системи, които не различават главни от малки букви)\n" "и само един от участниците в конфликта е в работното дърво:\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "Обновяване на флаговете на индекса" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "неправилна схема за адрес или суфиксът „://“ липсва" @@ -9079,52 +8170,48 @@ msgstr "неправилен номер на порт" msgid "invalid '..' path segment" msgstr "неправилна част от пътя „..“" -#: walker.c:170 -msgid "Fetching objects" -msgstr "Доставяне на обектите" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "„%s“ не може да бъде прочетен" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "„%s“ в основното работно дърво не е директорията на хранилището" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "„%s“ не съществува." -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "„%s“ не е файл на .git, код за грешка: %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "„%s“ не сочи към обратно към „%s“" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "„%s“ не може да бъде отворен и за четене, и за запис" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "няма достъп до „%s“" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "текущата работна директория е недостъпна" @@ -9471,94 +8558,86 @@ msgstr "" " (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (използвайте „git cherry-pick --skip“, за да пропуснете тази кръпка)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (използвайте „git cherry-pick --abort“, за да отмените всички действия с " "отбиране)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "В момента тече отмяна на подаване." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "В момента отменяте подаване „%s“." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (за да продължите, изпълнете „git revert --continue“)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (използвайте „git revert --skip“, за да пропуснете тази кръпка)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (използвайте „git revert --abort“, за да преустановите отмяната на " "подаване)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "В момента търсите двоично, като сте стартирали от клон „%s“." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "В момента търсите двоично." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (използвайте „git bisect reset“, за да се върнете към първоначалното " "състояние и клон)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "На клон " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "извършвате интерактивно пребазиране върху " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "извършвате пребазиране върху " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Извън всички клони." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Първоначално подаване" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Все още липсват подавания" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Неследени файлове" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Игнорирани файлове" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9570,32 +8649,32 @@ msgstr "" "изпълнението, но ще трябва да добавяте новите файлове ръчно.\n" "За повече подробности погледнете „git status help“." -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Неследените файлове не са изведени%s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Няма промени" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "към индекса за подаване не са добавени промени (използвайте „git add“ и/или " "„git commit -a“)\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "към индекса за подаване не са добавени промени\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9604,205 +8683,201 @@ msgstr "" "към индекса за подаване не са добавени промени, но има нови файлове " "(използвайте „git add“, за да започне тяхното следене)\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "липсват каквито и да е промени (създайте или копирайте файлове и използвайте " "„git add“, за да започне тяхното следене)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "липсват каквито и да е промени\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и " "неследените файлове)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "липсват каквито и да е промени, работното дърво е чисто\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Все още липсват подавания в " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (извън клон)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "различен" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "назад с " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "напред с " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не може да извършите „%s“, защото има промени, които не са в индекса." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "освен това в индекса има неподадени промени." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "не може да извършите „%s“, защото в индекса има неподадени промени." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#: compat/precompose_utf8.c:58 builtin/clone.c:453 #, c-format msgid "failed to unlink '%s'" msgstr "неуспешно изтриване на „%s“" -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [ОПЦИЯ…] [--] ПЪТ…" -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "неочакван изходен код при генериране на разлика: %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "неуспешно обновяване на файловете" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "изтриване на „%s“\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "Промени, които и след обновяването на индекса не са добавени към него:" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "Индексът не може да бъде прочетен" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "Файлът „%s“ не може да бъде отворен за запис." -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "Кръпката не може да бъде записана" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "неуспешно редактиране на кръпка" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "Не може да се получи информация чрез „stat“ за файла „%s“" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Празна кръпка, преустановяване на действието." -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "Кръпката „%s“ не може да бъде приложена" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "пробно изпълнение" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "интерактивно отбиране на промени" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "интерактивен избор на парчета код" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "редактиране на текущата разлика и прилагане" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "добавяне и на иначе игнорираните файлове" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "обновяване на следените файлове" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "добавяне на всички промени в следените и неследените файлове" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "игнориране на пътищата, които са изтрити от работното дърво (същото като „--" "no-all“)" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "без добавяне на нови файлове, само обновяване на индекса" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "" "прескачане на файловете, които не могат да бъдат добавени поради грешки" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "" "проверка, че при пробно изпълнение всички файлове, дори и изтритите, се " "игнорират" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "изрично задаване на стойността на флага дали файлът е изпълним" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "предупреждаване при добавяне на вградено хранилище" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "реализация на „git stash -p“" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9833,180 +8908,151 @@ msgstr "" "\n" "За повече информация погледнете „git help submodule“." -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "добавяне на вградено хранилище: %s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Ползвайте опцията „-f“, ако наистина искате да ги добавите.\n" -"За да изключите това съобщение, изпълнете:\n" -"\n" -" git config advice.addIgnoredFile false" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "неуспешно добавяне на файлове" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "" -"опцията „--pathspec-from-file“ е несъвместима с всяка от опциите „--" -"interactive“/„--patch“" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "опциите „--pathspec-from-file“ и „--edit“ са несъвместими" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "опциите „-A“ и „-u“ са несъвместими" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "Опцията „--ignore-missing“ изисква „--dry-run“" +msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "" -"опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Нищо не е зададено и нищо не е добавено.\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"„git add .“ ли искахте да изпълните?\n" -"За да изключите това съобщение, изпълнете:\n" -"\n" -" git config advice.addEmptyPathspec false" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Вероятно искахте да използвате „git add .“?\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "скриптът за автор не може да се анализира" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "„%s“ бе изтрит от куката „applypatch-msg“" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Даденият входен ред е с неправилен формат: „%s“." -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Бележката не може да се копира от „%s“ към „%s“" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "неуспешно изпълнение на „fseek“" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "кръпката „%s“ не може да се анализира" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "" "Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "неправилна стойност за време" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "неправилен ред за дата „Date“" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "неправилно отместване на часовия пояс" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Форматът на кръпката не може да бъде определен." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Кръпките не могат да бъдат разделени." -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "индексът не може да бъде записан" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "След коригирането на този проблем изпълнете „%s --continue“." -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“." -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“." -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Кръпката е пратена с форматиране „format=flowed“. Празните знаци в края на " "редовете може да се загубят." -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Кръпката е празна." -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "липсва ред за авторство в подаването „%s“" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "грешен ред с идентичност: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "подаването не може да бъде анализирано: %s" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В хранилището липсват необходимите обекти-BLOB, за да се премине към тройно " "сливане." -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "Базовото дърво се реконструира от информацията в индекса…" -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10014,24 +9060,24 @@ msgstr "" "Кръпката не може да се приложи към обектите-BLOB в индекса.\n" "Да не би да сте я редактирали на ръка?" -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…" -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Неуспешно сливане на промените." -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "прилагане върху празна история" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "не може да се продължи — „%s“ не съществува." -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Тялото на кръпката за прилагане е:" @@ -10039,45 +9085,40 @@ msgstr "Тялото на кръпката за прилагане е:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане " "на всичко:" -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "индексът не може да бъде записан" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" "Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Прилагане: %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Без промени — кръпката вече е приложена." -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "Неуспешно прилагане на кръпка при %s %.*s“" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -"За да видите неуспешно приложени кръпки, използвайте:\n" -"\n" -" git am --show-current-patch=diff" +"За да видите неуспешно приложени кръпки, използвайте опцията „git am --show-" +"current-patch“ to see the failed patch" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10087,7 +9128,7 @@ msgstr "" "Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n" "кръпка е довела до същите промени и в такъв случай просто пропуснете тази." -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10098,17 +9139,17 @@ msgstr "" "След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n" "За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "„%s“ не е разпознат като обект." -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "индексът не може да бъде изчистен" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10119,160 +9160,149 @@ msgstr "" "сочи към\n" "„ORIG_HEAD“" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправилна стойност за „--patch-format“: „%s“" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Неправилна стойност за „--show-current-patch“: „%s“" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "" -"опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ са несъвместими" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "интерактивна работа" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "изоставена опция, съществува по исторически причини, нищо не прави" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "да се преминава към тройно сливане при нужда." -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "без извеждане на информация" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "прекодиране в UTF-8 (стандартно)" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "подаване на опцията „-k“ на командата „git-mailinfo“" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "подаване на опцията „-b“ на командата „git-mailinfo“" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "подаване на опцията „-m“ на командата „git-mailinfo“" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" "подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо " "от „am.keepcr“" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "пропускане на всичко преди реда за отрязване" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "прекарване през „git-apply“" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "БРОЙ" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "ФОРМАТ" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "формат на кръпките" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "избрано от вас съобщение за грешка при прилагане на кръпки" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "продължаване на прилагането на кръпки след коригирането на конфликт" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "псевдоними на „--continue“" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "прескачане на текущата кръпка" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "" "възстановяване на първоначалното състояние на клона и преустановяване на " "прилагането на кръпката." -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "" "преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“." -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "показване на прилаганата кръпка" +#: builtin/am.c:2244 +msgid "show the patch being applied." +msgstr "показване на прилаганата кръпка." -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "дата за подаване различна от първоначалната" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "използване на текущото време като това за автор" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "подписване на подаванията с GPG" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(ползва се вътрешно за „git-rebase“)" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10280,18 +9310,18 @@ msgstr "" "Опциите „-b“/„--binary“ отдавна не правят нищо и\n" "ще бъдат премахнати в бъдеще. Не ги ползвайте." -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "неуспешно изчитане на индекса" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "предишната директория за пребазиране „%s“ все още съществува, а е зададен " "файл „mbox“." -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -10300,11 +9330,11 @@ msgstr "" "Открита е излишна директория „%s“.\n" "Можете да я изтриете с командата „git am --abort“." -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "В момента не тече операция по коригиране и няма как да се продължи." -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "интерактивният режим изисква кръпки на командния ред" @@ -10425,7 +9455,7 @@ msgstr "В момента не се извършва двоично търсен msgid "'%s' is not a valid commit" msgstr "„%s“ не е подаване" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10433,27 +9463,27 @@ msgstr "" "първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n" "изтеглено. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "файлът „%s“ не може да бъде отворен" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Неправилна команда: в момента се изпълнява двоично търсене по %s/%s." -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10462,7 +9492,7 @@ msgstr "" "Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n" "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)" -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10473,7 +9503,7 @@ msgstr "" "Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n" "направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)" -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "двоично търсене само по „%s“ подаване." @@ -10482,15 +9512,15 @@ msgstr "двоично търсене само по „%s“ подаване." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "не са указани управляващи думи" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10499,7 +9529,7 @@ msgstr "" "Текущите управляващи думи са: %s за старото състояние\n" "и %s за новото състояние.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10508,287 +9538,291 @@ msgstr "" "на „git bisect terms“ е подаден неправилен аргумент „%s“\n" "Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "непозната опция: %s" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "„%s“ не изглежда като указател към версия" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "Неправилен указател „HEAD“" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "Неуспешно преминаване към „%s“. Изпълнете командата „git bisect start " "СЪЩЕСТВУВАЩ_КЛОН“." -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "" "не може да се търси двоично, когато е изпълнена командата „cg-seek“ от " "„cogito“" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "Неправилен указател „HEAD“ — необичаен символен указател" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "неправилен указател: „%s“" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "извършване на „git bisect next“" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "изчистване на състоянието на двоичното търсене" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "проверка за очакваните версии" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "изчистване на състоянието на двоичното търсене" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "запис на състоянието на двоичното търсене в „BISECT_LOG“" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "" "проверка и задаване на управляващи думи към състоянието на двоичното търсене" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "извеждане на управляващите думи" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "начало на двоично търсене" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "липсва запис за „BISECT_WRITE“" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "опцията „--write-terms“ изисква точно 2 аргумента" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "опцията „--bisect-clean-state“ не приема аргументи" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "опцията „--bisect-write“ изисква 4 или 5 аргумента" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "опцията „--check-and-set-terms“ изисква 3 аргумента" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "трябва да е цвят: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "трябва да завършва с цвят" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "неправилна стойност за „blame.coloring“" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "версията за прескачане „%s“ не може да бъде открита" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "Извеждане на авторството с намирането му, последователно" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Извеждане на празни суми по SHA1 за граничните подавания (стандартно опцията " "е изключена)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Началните подавания да не се считат за гранични (стандартно опцията е " "изключена)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Извеждане на статистика за извършените действия" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Принудително извеждане на напредъка" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Извеждане на допълнителна информация за определянето на авторството" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "" "Извеждане на първоначалното име на файл (стандартно това е автоматично)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "" "Извеждане на първоначалният номер на ред (стандартно опцията е изключена)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Извеждане във формат за по-нататъшна обработка" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "" "Извеждане във формат за команди от потребителско ниво с информация на всеки " "ред" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Използване на същия формат като „git-annotate“ (стандартно опцията е " "изключена)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "" "Извеждане на е-пощата на автора, а не името му (стандартно опцията е " "изключена)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Без разлики в знаците за интервали" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "ВЕРС" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" msgstr "Прескачане на ВЕРСията при извеждане на авторството" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "Прескачане на версиите указани във ФАЙЛа при извеждане на авторството" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "" "оцветяване на повтарящите се метаданни от предишния ред в различен цвят" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "оцветяване на редовете по възраст" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Подобряване на разликите чрез експериментална евристика" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Допълнителни изчисления за по-добри резултати" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Използване на съдържанието на ФАЙЛа като крайно положение" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "напасване на редовете" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "" "Търсене на копирани редове както в рамките на един файл, така и от един файл " "към друг" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "" "Търсене на преместени редове както в рамките на един файл, така и от един " "файл към друг" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "" "Информация само за редовете в диапазона от n до m включително. Броенето " "започва от 1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите " @@ -10802,18 +9836,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "преди 4 години и 11 месеца" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "има само %2$lu ред във файла „%1$s“" msgstr[1] "има само %2$lu реда във файла „%1$s“" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Редове с авторство" @@ -11025,7 +10059,7 @@ msgstr "задаване на режима на следене (виж git-pull( msgid "do not use" msgstr "да не се ползва" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "клон-източник" @@ -11034,8 +10068,8 @@ msgid "change the upstream info" msgstr "смяна на клона-източник" #: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "изчистване на информацията за клон-източник" +msgid "Unset the upstream info" +msgstr "без клон-източник" #: builtin/branch.c:628 msgid "use colored output" @@ -11137,7 +10171,7 @@ msgstr "подредбата и филтрирането третират едн msgid "format to use for the output" msgstr "ФОРМАТ за изхода" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "В директорията „refs/heads“ липсва файл „HEAD“" @@ -11227,66 +10261,20 @@ msgstr "" "Опцията „--set-upstream“ вече не се поддържа. Използвайте „--track“ или „--" "set-upstream-to“" -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [ОПЦИЯ…] ФАЙЛ АРГУМЕНТ_ЗА_git_rev-list…" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [ОПЦИЯ…] ФАЙЛ…" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "без извеждане на напредъка" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "извеждане на напредъка" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "извеждане на напредъка във фазата на запазване на обектите" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "" -"същото действие като опцията „--all-progress“ при извеждането на напредъка" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "За създаването на пратка е необходимо хранилище." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "без подробна информация за пратките" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "Пратката „%s“ е наред\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "За създаването на пратка е необходимо хранилище." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "За приемането на пратка е необходимо хранилище." -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "повече подробности. Поставя се пред подкоманда" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Непозната подкоманда: %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11294,7 +10282,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -11302,79 +10290,79 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "може да укажете само една пакетна опция" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" "ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), " "„tag“ (етикет)" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "извеждане на вида на обект" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "извеждане на размера на обект" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "изход с 0, когато няма грешка" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "форматирано извеждане на съдържанието на обекта" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "" "да се стартира програмата зададена в настройката „textconv“ за преобразуване " "на съдържанието на обекта-BLOB" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "" "да се стартират програмите за преобразуване на съдържанието на обектите-BLOB" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "обект-BLOB" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "опциите „--textconv“/„--filters“ изискват път" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "буфериране на изхода от „--batch“" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" "извеждане на информация и съдържание на обектите подадени на стандартния вход" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "извеждане на информация за обектите подадени на стандартния вход" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--" "batch-check“)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "без подреждане на изхода от „--batch-all-objects“" @@ -11402,8 +10390,8 @@ msgstr "изчитане на имената на файловете от ста msgid "terminate input and output records by a NUL character" msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -11415,27 +10403,27 @@ msgstr "извеждане на несъвпадащите пътища" msgid "ignore index when checking" msgstr "прескачане на индекса при проверката" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "опцията „--stdin“ е несъвместима с имена на пътища" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "опцията „-z“ изисква „--stdin“" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "не е зададен път" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "опцията „--quiet“ изисква да е подаден точно един път" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "опциите „--quiet“ и „--verbose“ са несъвместими" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "опцията „--non-matching“ изисква „--verbose“" @@ -11493,9 +10481,9 @@ msgid "write the content to temporary files" msgstr "записване на съдържанието във временни файлове" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "НИЗ" @@ -11523,99 +10511,99 @@ msgstr "git switch [ОПЦИЯ…] КЛОН" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "вашата версия липсва в пътя „%s“" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "чуждата версия липсва в пътя „%s“" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "някоя от необходимите версии липсва в пътя „%s“" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "пътят „%s“ не може да бъде слян" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Резултатът за „%s“ не може да бъде слян" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Пресъздаден е %d конфликт при сливане" msgstr[1] "Пресъздадени са %d конфликта при сливане" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Обновен е %d път от „%s“" msgstr[1] "Обновени са %d пътя от „%s“" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Обновен е %d път от индекса" msgstr[1] "Обновени са %d пътя от индекса" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "опцията „%s“ е несъвместима с обновяването на пътища" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“." -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "не е указано нито „%s“, нито „%s“" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "опцията „%3$s“ е несъвместима както с „%1$s“, така и с „%2$s“" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "пътят „%s“ не е слят" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "първо трябва да коригирате индекса си" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11625,50 +10613,55 @@ msgstr "" "индекса:\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "локалните промени в тези файлове ще се презапишат: %s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "Указателят „HEAD“ в момента сочи към" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "Указателят „HEAD“ не може да бъде обновен" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Зануляване на клона „%s“\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Вече сте на „%s“\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Преминаване към клона „%s“ и зануляване на промените\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Преминахте към новия клон „%s“\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Преминахте към клона „%s“\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr "… и още %d.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11690,7 +10683,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11717,19 +10710,28 @@ msgstr[1] "" " git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "вътрешна грешка при обхождането на версиите" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "Преди това „HEAD“ сочеше към" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "В момента сте на клон, който все още не е създаден" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "очаква се само един указател" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "очаква се един указател, а сте подали %d." + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11738,73 +10740,37 @@ msgstr "" "„%s“ може да е както локален файл, така и следящ клон. За уточняване\n" "ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)" -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Ако искате да изтеглите клона от конкретно хранилище, напр. „origin“,\n" -"изрично го укажете към опцията „--track“:\n" -"\n" -" git checkout --track origin/ИМЕ_НА_КЛОН\n" -"\n" -"Ако искате винаги да се предпочита конкретно хранилище при нееднозначно\n" -"ИМЕ_НА_КЛОН, напр. „origin“, задайте следната настройка в конфигурационния\n" -"файл:\n" -"\n" -" checkout.defaultRemote=origin" - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "„%s“ напасва с множество (%d) отдалечени клони" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "очаква се само един указател" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "очаква се един указател, а сте подали %d." - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "неправилен указател: %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "указателят не сочи към обект-дърво: %s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "очаква се клон, а не етикет — „%s“" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "очаква се локален, а не отдалечен клон — „%s“" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "очаква се клон, а не „%s“" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "очаква се клон, а не подаване — „%s“" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11812,7 +10778,7 @@ msgstr "" "по време на сливане не може да преминете към друг клон.\n" "Пробвайте с „git merge --quit“ или „git worktree add“." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11821,7 +10787,7 @@ msgstr "" "клон.\n" "Пробвайте с „git am --quit“ или „git worktree add“." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11829,7 +10795,7 @@ msgstr "" "по време на пребазиране не може да преминете към друг клон.\n" "Пробвайте с „git rebase --quit“ или „git worktree add“." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11837,7 +10803,7 @@ msgstr "" "по време на отбиране на подавания не може да преминете към друг клон.\n" "Пробвайте с „git cherry-pick --quit“ или „git worktree add“." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11845,144 +10811,139 @@ msgstr "" "по време на отмяна на подавания не може да преминете към друг клон.\n" "Пробвайте с „git revert --quit“ или „git worktree add“." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "преминаване към друг клон по време на двоично търсене" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "задаването на път е несъвместимо с преминаването от един клон към друг" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "опцията „%s“ е несъвместима с „%s“" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" "За да преминете към клон, подайте указател, който сочи към подаване. „%s“ " "не е такъв" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "липсва аргумент — клон или подаване" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "извеждане на напредъка" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "извършване на тройно сливане с новия клон" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "СТИЛ" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "действие при конфликт (сливане или тройна разлика)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "отделяне на указателя „HEAD“ към указаното подаване" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "задаване на кой клон бива следен при създаването на новия клон" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "принудително изтегляне (вашите промени ще бъдат занулени)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "НОВ_КЛОН" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "нов клон без родител" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "обновяване на игнорираните файлове (стандартно)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "без проверка дали друго работно дърво държи указателя" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "изтегляне на вашата версия на неслетите файлове" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "изтегляне на чуждата версия на неслетите файлове" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "без ограничаване на изброените пътища само до частично изтеглените" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "опциите „-p“ и „--overlay“ са несъвместими" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "опцията „--track“ изисква име на клон" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "липсва име на клон, използвайте опцията „-b“" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "„%s“ не може да бъде открит" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "трябва да укажете поне един път за възстановяване" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "указан е неправилен път" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "опциите „--pathspec-from-file“ и „--detach“ са несъвместими" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "опциите „--pathspec-from-file“ и „--patch“ са несъвместими" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11990,73 +10951,99 @@ msgstr "" "git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n" "са несъвместими с изтегляне от индекса." -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "трябва да укажете поне един път за възстановяване" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"„%s“ съвпада с повече от един отдалечен клон — открити са %d възможности.\n" +"Пробата аргументът да се тълкува като път също бе неуспешна.\n" +"\n" +"Ако искате да изтеглите клона от конкретно хранилище, напр. „origin“,\n" +"изрично го укажете към опцията „--track“:\n" +"\n" +" git checkout --track origin/ИМЕ_НА_КЛОН\n" +"\n" +"Ако искате винаги да се предпочита конкретно хранилище при нееднозначно\n" +"ИМЕ_НА_КЛОН, напр. „origin“, задайте следната настройка в конфигурационния\n" +"файл:\n" +"\n" +" checkout.defaultRemote=origin" -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "клон" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "създаване на журнал на указателите за нов клон" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git checkout " "НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "използване на припокриващ режим (стандартно)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "създаване и преминаване към нов клон" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "създаване/зануляване на клон и преминаване към него" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "" "опит за отгатване на име на клон след неуспешен опит с „git switch " "НЕСЪЩЕСТВУВАЩ_КЛОН“" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "зануляване на локалните промени" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "към кой указател към дърво да се премине" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "възстановяване на индекса" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "възстановяване на работното дърво (стандартно)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "пренебрегване на неслетите елементи" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "използване на припокриващ режим" @@ -12095,7 +11082,7 @@ msgstr "файлът „%s“ не може да бъде изтрит" msgid "could not lstat %s\n" msgstr "не може да се получи информация чрез „lstat“ за „%s“\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12108,7 +11095,7 @@ msgstr "" "ПРЕФИКС — избор на единствен обект по този уникален префикс\n" " — (празно) нищо да не се избира\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12129,33 +11116,39 @@ msgstr "" "* — избиране на всички обекти\n" " — (празно) завършване на избирането\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Неправилен избор (%s).\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблони за игнорирани елементи≫ " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Избиране на обекти за изтриване" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" -#: builtin/clean.c:795 +# +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Изход.\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12173,56 +11166,64 @@ msgstr "" "help — този край\n" "? — подсказка за шаблоните" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "●●● Команди ●●●" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "Избор на следващо действие" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Следният обект ще бъде изтрит:" msgstr[1] "Следните обекти ще бъдат изтрити:" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Файловете за изчистване свършиха. Изход от програмата." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "без извеждане на имената на файловете, които ще бъдат изтрити" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "принудително изтриване" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "интерактивно изтриване" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "изтриване на цели директории" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "ШАБЛОН" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "добавяне на ШАБЛОН от файлове, които да не се трият" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "изтриване и на игнорираните файлове" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "изтриване само на игнорирани файлове" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "опциите „-x“ и „-X“ са несъвместими" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12230,7 +11231,7 @@ msgstr "" "Настройката „clean.requireForce“ е зададена като истина, което изисква някоя " "от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12239,7 +11240,7 @@ msgstr "" "което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши " "изчистване" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]" @@ -12288,18 +11289,18 @@ msgstr "директория с шаблони" msgid "directory from which templates will be used" msgstr "директория, която съдържа шаблоните, които да се ползват" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "еталонно хранилище" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "опцията „--reference“ може да се използва само при клониране" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "ИМЕ" @@ -12315,8 +11316,8 @@ msgstr "изтегляне на този КЛОН, а не соченият от msgid "path to git-upload-pack on the remote" msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "ДЪЛБОЧИНА" @@ -12324,7 +11325,7 @@ msgstr "ДЪЛБОЧИНА" msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИНА" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "ВРЕМЕ" @@ -12332,17 +11333,16 @@ msgstr "ВРЕМЕ" msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "ВЕРСИЯ" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "задълбочаване на историята на плитко хранилище до изключващ указател" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "" "клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично " @@ -12373,23 +11373,23 @@ msgstr "КЛЮЧ=СТОЙНОСТ" msgid "set config inside the new repository" msgstr "задаване на настройките на новото хранилище" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "специфични за сървъра" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "опция за пренос" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "само адреси IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "само адреси IPv6" @@ -12397,13 +11397,7 @@ msgstr "само адреси IPv6" msgid "any cloned submodules will use their remote-tracking branch" msgstr "всички клонирани подмодули ще ползват следящите си клони" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" -"инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) " -"да съдържа само файловете в основната директория" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12411,43 +11405,43 @@ msgstr "" "Името на директорията не може да бъде отгатнато.\n" "Задайте директорията изрично на командния ред" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" "ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "„%s“ съществува и не е директория" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:460 +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "връзката „%s“ не може да бъде създадена" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "файлът не може да бъде копиран като „%s“" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "неуспешно итериране по „%s“" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "действието завърши.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12460,103 +11454,99 @@ msgstr "" "\n" " git restore --source=HEAD :/\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n" "и който следва да бъде изтеглен, не съществува." -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "обектът „%s“ не може да бъде обновен" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "частичното изтегляне не може да се инициализира" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n" "което не съществува. Не може да се изтегли определен клон.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "работното дърво не може да бъде подготвено" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "настройките не могат да бъдат записани в конфигурационния файл" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "не може да се извърши пакетиране за изчистване на файловете" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "временният файл за алтернативни обекти не може да бъде изтрит" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Прекалено много аргументи." -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Трябва да укажете кое хранилище искате да клонирате." -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "опциите „--bare“ и „--origin %s“ са несъвместими." -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими." -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "не съществува хранилище „%s“" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "дълбочината трябва да е положително цяло число, а не „%s“" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевият път „%s“ съществува и не е празна директория." -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "в „%s“ вече съществува работно дърво." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "родителските директории на „%s“ не могат да бъдат създадени" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "работното дърво в „%s“ не може да бъде създадено." -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клониране и създаване на голо хранилище в „%s“…\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клониране и създаване на хранилище в „%s“…\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12564,44 +11554,44 @@ msgstr "" "Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-" "if-able“" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--depth“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-since“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте " "схемата „file://“." -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "При локално клониране опцията „--filter“ се прескача. Ползвайте схемата " "„file://“." -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "опцията „--local“ се прескача" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Изглежда клонирахте празно хранилище." @@ -12650,7 +11640,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "прескачане на повтарящ се родител: „%s“" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "неправилно име на обект: „%s“" @@ -12678,13 +11668,13 @@ msgstr "родител" msgid "id of a parent commit object" msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "СЪОБЩЕНИЕ" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "СЪОБЩЕНИЕ при подаване" @@ -12692,8 +11682,8 @@ msgstr "СЪОБЩЕНИЕ при подаване" msgid "read commit log message from file" msgstr "изчитане на съобщението за подаване от ФАЙЛ" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "подписване на подаването с GPG" @@ -12773,65 +11763,57 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "опциите „-a“ и „--pathspec-from-file“ са несъвместими" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "Опциите „--include“ и „--only“ изискват аргументи." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "временният индекс не може да бъде създаден" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "неуспешно интерактивно добавяне" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "временният индекс не може да бъде обновен" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Дървото на основния кеш не може да бъде обновено" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "новият индекс не може да бъде записан" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "по време на сливане не може да се извърши частично подаване." -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "по време на отбиране не може да се извърши частично подаване." -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "индексът не може да бъде прочетен" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "временният индекс не може да бъде записан" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "заглавната част за автор в подаването „%s“ липсва" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "заглавната част за автор в подаването „%s“ е неправилна" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "неправилен параметър към опцията „--author“" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12839,38 +11821,38 @@ msgstr "" "не може да се избере знак за коментар — в текущото съобщение за подаване са " "използвани всички подобни знаци" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "следното подаване не може да бъде открито: %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(изчитане на съобщението за подаване от стандартния вход)\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "съобщението за подаване не бе прочетено стандартния вход" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "шаблонът за подаване не може да бъде запазен" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12885,7 +11867,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12901,7 +11883,7 @@ msgstr "" " %s\n" "и опитайте отново.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12910,7 +11892,7 @@ msgstr "" "Въведете съобщението за подаване на промените. Редовете, които започват\n" "с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12921,147 +11903,151 @@ msgstr "" "с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n" "съобщение преустановява подаването.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sПодаващ: %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Индексът не може да бъде прочетен" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Грешка при изграждане на дърветата" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с " "никой автор" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Неправилен режим за игнорираните файлове: „%s“" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправилен режим за неследените файлове: „%s“" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "Опциите „--long“ и „-z“ са несъвместими." -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "Опциите „--reset-author“ и „--author“ са несъвместими." -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Няма какво да бъде поправено." -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "В момента се извършва сливане, не можете да поправяте." -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "В момента се извършва отбиране на подаване, не можете да поправяте." -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Опциите „--squash“ и „--fixup“ са несъвместими." -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими." -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“." -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n" "„--amend“." -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n" "несъвместими." -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "Опциите „--include“ и „--only“ изискват аргументи." + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "кратка информация за състоянието" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "информация за клоните" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "информация за скатаното" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "изчисляване на точните стойности напред/назад" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "версия" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "формат на изхода за четене от програма" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "подробна информация за състоянието (стандартно)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "разделяне на елементите с нулевия знак „NUL“" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "РЕЖИМ" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна " "информация), „normal“ (кратка информация), „no“ (без неследените файлове). " "Стандартният РЕЖИМ е: „all“." -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13070,11 +12056,11 @@ msgstr "" "„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните " "файлове). Стандартният РЕЖИМ е: „traditional“." -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "КОГА" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13083,176 +12069,176 @@ msgstr "" "една от „all“ (всички), „dirty“ (тези с неподадени промени), " "„untracked“ (неследени)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "извеждане на неследените файлове в колони" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "без засичане на преименуванията" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "засичане на преименуванията, може да се зададе коефициент на прилика" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "без информация след успешно подаване" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "добавяне на разликата към шаблона за съобщението при подаване" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Опции за съобщението при подаване" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "взимане на съобщението от ФАЙЛ" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "АВТОР" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "задаване на АВТОР за подаването" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "ДАТА" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "задаване на ДАТА за подаването" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "ПОДАВАНЕ" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "преизползване на съобщението от указаното ПОДАВАНЕ" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в " "предходното без следа" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в " "предното" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "добавяне на поле за подпис — „Signed-off-by:“" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "използване на указания шаблонен ФАЙЛ" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "редактиране на подаване" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "вмъкване на състоянието в шаблона за съобщението при подаване" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Опции за избор на файлове при подаване" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "подаване на всички променени файлове" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "добавяне на указаните файлове към индекса за подаване" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "интерактивно добавяне на файлове" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "интерактивно добавяне на промени" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "подаване само на указаните файлове" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "" "без изпълнение на куките преди подаване и при промяна на съобщението за " "подаване (pre-commit и commit-msg)" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "отпечатване на това, което би било подадено" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "поправяне на предишното подаване" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "без изпълнение на куката след презаписване (post-rewrite)" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "позволяване на празни подавания" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "позволяване на подавания с празни съобщения" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "съобщението за подаване не може да бъде прочетено: %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Неизвършване на подаване поради празно съобщение.\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Неизвършване на подаване поради нередактирано съобщение.\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13264,79 +12250,80 @@ msgstr "" "\n" " git restore --staged :/" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--" -"[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir ДИР_ОБЕКТИ]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir ДИР_ОБЕКТИ]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" "git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита" +"reachable|--stdin-packs|--stdin-commits] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "директория" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Графът с подаванията не може да се отвори: „%s“" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "обхождането да започне от всички указатели" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "проверка на подаванията за индексите на пакетите изброени на командния ред" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "започване на обхождането при подаванията подадени на стандартния вход" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "" "включване на всички подавания, които вече са във файла с гра̀фа на подаванията" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "максимален брой подавания в небазово ниво на раздробен граф" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" "максимално отношение на броя подавания в две последователни нива в раздробен " "граф" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" "опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими" @@ -13345,219 +12332,212 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [ОПЦИЯ…]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "непознат аргумент „--type“: %s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "само по един вид" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "Местоположение на конфигурационния файл" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "използване на глобалния конфигурационен файл" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "използване на системния конфигурационен файл" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "използване на конфигурационния файл на хранилището" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "използване на конфигурационния файл на работното копие" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "използване на зададения конфигурационен ФАЙЛ" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "ИДЕНТИФИКАТОР" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "" "изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "Действие" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "" "замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ " "[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "изтриване на раздел: ИМЕ" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "изброяване на всички" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "отваряне на редактор" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "извеждане на зададения цвят: номер [стандартно]" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "извеждане на зададения цвят: номер (стандартният изход е терминал)" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "Вид" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "стойността е от този вид" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа)" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "СТОЙНОСТТА е цяло, десетично число" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "СТОЙНОСТТА е път (до файл или директория)" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "стойността е период на валидност/запазване" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "Други" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "разделяне на стойностите с нулевия знак „NUL“" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "извеждане на имената на променливите" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "при търсене да се уважат и директивите за включване" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "извеждане на мястото на задаване на настройката (файл, стандартен вход, " "обект-BLOB, команден ред)" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"извеждане на обхвата на настройката „worktree“ (работно дърво), " -"„local“ (хранилище), „global“ (потребител), „system“ (система), " -"„command“ (команда)" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "СТОЙНОСТ" -#: builtin/config.c:160 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "с „--get“ се използва стандартна СТОЙНОСТ при липсваща" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "неправилен брой аргументи, трябва да е точно %d" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "неправилен брой аргументи, трябва да е от %d до %d включително" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "неправилен шаблон за ключ: „%s“" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "неуспешно форматиране на стандартната стойност на настройка: %s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "„%s“ не може да се анализира като цвят" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "неразпозната стойност на стандартния цвят" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "не е в директория под Git" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "не се поддържа записване в стандартния вход" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "обекти-BLOB в настройките не се поддържат" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13572,23 +12552,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "само по един конфигурационен файл" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "„--local“ може да се използва само в хранилище" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "„--blob“ може да се използва само в хранилище" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "променливата „HOME“ не е зададена" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13599,20 +12579,20 @@ msgstr "" "повече информация вижте раздела „CONFIGURATION FILE“ в\n" "„git help worktree“" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "опцията „--get-color“ не съответства на вида на променливата" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "само по едно действие" -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" "опцията „--name-only“ е приложима само към опциите „--list“ и „--get-regexp“" -#: builtin/config.c:738 +#: builtin/config.c:712 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -13620,33 +12600,33 @@ msgstr "" "опцията „--show-origin“ е приложима само към опциите „--get“, „--get-all“, " "„--get-regexp“ и „--list“" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "опцията „--default“ е приложима само към опцията „--get“" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "конфигурационният файл „%s“ не може да бъде прочетен" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "грешка при обработката на конфигурационен файл" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "не се поддържа редактиране на стандартния вход" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "не се поддържа редактиране на обекти-BLOB" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "конфигурационният файл „%s“ не може да бъде създаден" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13656,7 +12636,7 @@ msgstr "" "За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--" "replace-all“." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "такъв раззел няма: %s" @@ -13669,57 +12649,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "извеждане на размерите на обектите във формат лесно четим от хора" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [ОПЦИЯ…] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "основно" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "кратко" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "анотирано" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "не съществува анотиран етикет „%s“" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "в анотирания етикет „%s“ липсва вградено име" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "етикетът „%s“ тук е всъщност „%s“" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "никой етикет не напасва точно „%s“" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "Никоя версия и етикет не напасват точно. Търси се по описание\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "търсенето приключи при „%s“\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13728,7 +12708,7 @@ msgstr "" "Никой анотиран етикет не описва „%s“.\n" "Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“." -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13737,12 +12717,12 @@ msgstr "" "Никой етикет не описва „%s“.\n" "Пробвайте с опцията „--always“ или създайте етикети." -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "претърсени са %lu подавания\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13751,93 +12731,93 @@ msgstr "" "открити са над %i етикета, изведени са последните %i,\n" "търсенето бе прекратено при „%s“.\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "описание на „%s“\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "Неправилно име на обект „%s“" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "„%s“ не е нито подаване, нито обект-BLOB" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "откриване на етикета, който следва подаване" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "" "извеждане на информация за трасиране на стратегията за търсене на " "стандартната грешка" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "използване на произволен указател" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "използване на всеки етикет — включително и неанотираните" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "винаги да се ползва дългият формат" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "проследяване само на първия родител" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "извеждане само на точните съвпадения" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "извеждане на съкратено име на обект като резервен вариант" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "МАРКЕР" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "Не са открити имена — нищо не може да бъде описано." -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "опцията „--dirty“ е несъвместима с указател към подаване" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "опцията „--broken“ е несъвместима с указател към подаване" @@ -13874,27 +12854,27 @@ msgstr "зададен е неподдържан обект „%s“." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "неуспешно действие с изходен код: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "символната връзка „%s“ не може да бъде прочетена" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13902,55 +12882,55 @@ msgstr "" "комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n" "в режима за разлики върху директории („-d“ и „--dir-diff“)." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "и двата файла са променени: „%s“ и „%s“." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "работното дърво е изоставено." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "в „%s“ има временни файлове." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "възможно е да ги изчистите или възстановите" -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "използвайте „diff.guitool“ вместо „diff.tool“" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "разлика по директории" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "следване на символните връзки при разлика по директории" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "ПРОГРАМА" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "използване на указаната ПРОГРАМА" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--" "tool“" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13958,31 +12938,31 @@ msgstr "" "„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с " "ненулев код" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "команда за разглеждане на разлики" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "подава се към „diff“" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "не е зададена програма за „--tool=ПРОГРАМА“" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не е зададена команда за „--extcmd=КОМАНДА“" @@ -14022,185 +13002,160 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" -"Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“." - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "Как да се обработват подписаните етикети" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "Как да се обработват етикетите на филтрираните обекти" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "" "как да се обработват съобщенията за подаване, които са в друго кодиране" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Запазване на маркерите в този ФАЙЛ" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Внасяне на маркерите от този ФАЙЛ" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "Внасяне на маркерите от този ФАЙЛ, ако съществува" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Извеждане на цялото дърво за всяко подаване" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Използване на маркер за завършване на потока" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Без извеждане на съдържанието на обектите-BLOB" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "анонимизиране на извежданата информация" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Указване на родителите, които не са в потока на бързо изнасяне, с " "идентификатор на обект" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Извеждане на първоначалните идентификатори на обектите BLOB/подавяния" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "Задаване на идентификатори на маркери на етикетите" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ са несъвместими" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [ОПЦИЯ…] ГРУПА" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [ОПЦИЯ…]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "опцията „fetch.parallel“ трябва да е неотрицателна" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "доставяне от всички отдалечени хранилища" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "задаване на клон за следене за издърпване/доставяне" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "отдалечен път, където да се качи пакетът" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "принудително презаписване на локален указател" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "доставяне от множество отдалечени хранилища" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "доставяне на всички етикети и принадлежащи обекти" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "без доставянето на всички етикети „--no-tags“" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "брой подмодули доставени паралелно" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "окастряне на локалните етикети, които вече не съществуват в отдалеченото " "хранилище и презаписване на променените" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "ПРИ НУЖДА" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "запазване на изтеглените пакети с обекти" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "позволяване на обновяването на указателя „HEAD“" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "задълбочаване на историята на плитко хранилище" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "задълбочаване на историята на плитко хранилище до определено време" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "превръщане в пълно хранилище" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "добавяне на това пред пътя на подмодула" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14208,94 +13163,90 @@ msgstr "" "стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с " "приоритет)" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "приемане на указатели, които обновяват „.git/shallow“" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "КАРТА_С_УКАЗАТЕЛИ" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "докладване, че всички обекти могат са достижими при започване от този" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "изпълняване на „gc --auto“ след доставяне" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "проверка за принудителни обновявания на всички клони" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "запазване на гра̀фа с подаванията след доставяне" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "настройката „fetch.output“ е с неправилна стойност „%s“" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "обектът „%s“ липсва" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[актуализиран]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[отхвърлен]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "в текущия клон не може да се доставя" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[обновяване на етикетите]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "локален указател не може да бъде обновен" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "съществуващ етикет ще бъде презаписан" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[нов етикет]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[нов клон]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[нов указател]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "принудително обновяване" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "същинско сливане" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14306,7 +13257,7 @@ msgstr "" "\n" " git config fetch.showForcedUpdates true" -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14315,29 +13266,29 @@ msgid "" " to avoid this check.\n" msgstr "" "Проверката за принудителни изтласквания отне %.2f сек. Може да я прескочите " -"еднократно с опцията „--no-show-forced-updates“, а за да я изключите за " +"еднократно с опцията „--no-show-forced-updates“, а за да я извключите за " "постоянно, изпълнете:\n" "\n" " git config fetch.showForcedUpdates false\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "хранилището „%s“ не изпрати всички необходими обекти\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат " "обновявани" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "От %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14347,80 +13298,58 @@ msgstr "" "„git remote prune %s“, за да премахнете остарелите клони, които\n" "предизвикват конфликта" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (обектът „%s“ ще се окаже извън клон)" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (обектът „%s“ вече е извън клон)" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[изтрит]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(нищо)" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Опцията „%s“ се прескача при „%s“\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "" -"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "не може да указвате клон за следене на отдалечен етикет" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "не може да указвате клон за следене на отдалечен етикет" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "непознат вид клон" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"не е открит клон за следене.\n" -"Трябва изрично да зададете един клон с опцията „--set-upstream option“." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Доставяне на „%s“\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "„%s“ не може да се достави" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "„%s“ не може да се достави (изходният код е: %d)\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" +"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в " +"настройката „extensions.partialClone“" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14428,45 +13357,45 @@ msgstr "" "Не сте указали отдалечено хранилище. Задайте или адрес, или име\n" "на отдалечено хранилище, откъдето да се доставят новите версии." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Трябва да укажете име на етикет." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" -msgstr "опциите „--deepen“ и „--depth“ са несъвместими" +msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "опциите „--depth“ и „--unshallow“ са несъвместими" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "" "към „git fetch --all“ не можете да добавите аргумент — указател на версия" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Указването на група и указването на версия са несъвместими" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14480,25 +13409,25 @@ msgid "" msgstr "" "git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "" "вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения " "журнал" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" -msgstr "псевдоним на „--log“ (ОСТАРЯЛО)" +msgstr "псевдоним на „--log“ (остаряло)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "ТЕКСТ" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "за начало на съобщението да се ползва ТЕКСТ" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "файл, от който да се чете" @@ -14562,32 +13491,32 @@ msgstr "извеждане само на указателите, които съ msgid "print only refs which don't contain the commit" msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "непознат" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "грешка в %s „%s“: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "предупреждение за %s „%s“: %s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "скъсана връзка от %7s %s" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "неправилен вид обект във връзката" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -14596,217 +13525,217 @@ msgstr "" "скъсана връзка от %7s %s\n" " към %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "липсващ обект: %s „%s“" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "недостижим обект: %s „%s“" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "извън клон: %s „%s“" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "„lost-found“ не може да се създаде" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "„%s“ не може да се завърши" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Проверка на „%s“" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Проверка на свързаността (%d обекта)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Проверяване на %s „%s“" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "скъсани връзки" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "начална директория „%s“" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "приложен етикет „%s“ върху „%s“ (%s) в „%s“" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: липсващ или повреден обект" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: неправилен запис в журнала за указатели „%s“" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Проверка на журнала на указателите: „%s“ до „%s“" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "„%s“: неправилен указател за SHA1: „%s“" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: не е подаване!" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "внимание: няма указатели по подразбиране" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "„%s“: липсващ обект: „%s“" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "„%s“: не може да се анализира: „%s“" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "неправилен ред с контролна сума по SHA1: „%s“" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Проверка на директория с обекти" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Проверка на директориите с обекти" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Проверка на връзките на „%s“" # -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "неправилен указател „%s“" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "„%s“ сочи към нещо необичайно (%s)" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Проверка на дървото на кеша" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "в дървото на кеша има нещо, което не е дърво" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "показване на недостижимите обекти" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "показване на обектите извън клоните" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "показване на етикетите" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "показване на кореновите възли" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "задаване на обекти от индекса да са коренови" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "проследяване и на указателите от журнала с указателите (стандартно)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "допълнително да се проверяват пакетите и алтернативните обекти" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "проверка само на връзката" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "по-строги проверки" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "показване на напредъка" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "показване на подробни имена на достижимите обекти" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Проверка на обектите" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "„%s“: липсващ обект" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [ОПЦИЯ…]" @@ -14820,17 +13749,17 @@ msgstr "Неуспешно изпълнение на „fstat“ върху „% msgid "failed to parse '%s' value '%s'" msgstr "стойността на „%s“ — „%s“ не може да се анализира" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "не може да се получи информация чрез „stat“ за директорията „%s“" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "файлът „%s“ не може да бъде прочетен" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14847,58 +13776,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "окастряне на обектите, към които нищо не сочи" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "включване на автоматичното събиране на боклука (auto-gc)" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "" "изрично стартиране на събирането на боклука, дори и ако вече работи друго " "събиране" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "препакетиране на всичко без най-големия пакет" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "неразпозната стойност на „gc.logexpiry“ %s" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "неразпозната стойност на периода за окастряне: %s" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Автоматично пакетиране на заден фон на хранилището за по-добра " "производителност.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" "Погледнете ръководството за повече информация как да изпълните „git help " "gc“.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14907,14 +13836,14 @@ msgstr "" "процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n" "опцията „--force“)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Има прекалено много недостижими, непакетирани обекти.\n" "Използвайте „git prune“, за да ги окастрите." -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]" @@ -14932,271 +13861,272 @@ msgstr "зададен е неправилен брой нишки (%d) за %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "дървото не може да бъде прочетено (%s)" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "не може да се изпълни „grep“ от обект от вида %s" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "опцията „%c“ очаква число за аргумент" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "търсене в индекса, а не в работното дърво" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "търсене и във файловете, които не са под управлението на git" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "търсене и в следените, и в неследените файлове" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "игнориране на файловете указани в „.gitignore“" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "рекурсивно търсене във всички подмодули" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "извеждане на редовете, които не съвпадат" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "без значение на регистъра на буквите (главни/малки)" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "напасване на шаблоните само по границите на думите" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "обработване на двоичните файлове като текстови" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "прескачане на двоичните файлове" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "" "обработване на двоичните файлове чрез филтри за преобразуване към текст" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "търсене в поддиректориите (стандартно)" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "разширени регулярни изрази по POSIX" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "основни регулярни изрази по POSIX (стандартно)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "шаблоните са дословни низове" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "регулярни изрази на Perl" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "извеждане на номерата на редовете" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "извеждане на номера на колоната на първото напасване" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "без извеждане на имената на файловете" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "извеждане на имената на файловете" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "" "извеждане на относителните имена на файловете спрямо основната директория на " "хранилището" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "извеждане само на имената на файловете без напасващите редове" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "псевдоним на „--files-with-matches“" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "" "извеждане само на имената на файловете, които не съдържат ред, напасващ на " "шаблона" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "извеждане само на частите на редовете, които съвпадат" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "извеждане на броя на съвпаденията вместо напасващите редове" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "оцветяване на напасванията" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "извеждане на празен ред между напасванията от различни файлове" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "извеждане на името на файла само веднъж за всички напасвания от този файл" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "извеждане на такъв БРОЙ редове преди и след напасванията" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "извеждане на такъв БРОЙ редове преди напасванията" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "извеждане на такъв БРОЙ редове след напасванията" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "използване на такъв БРОЙ работещи нишки" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "псевдоним на „-C БРОЙ“" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "извеждане на обхващащата функция" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "изчитане на шаблоните от ФАЙЛ" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "напасване на ШАБЛОН" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "комбиниране на шаблоните указани с опцията „-e“" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "" "без извеждане на стандартния изход. Изходният код указва наличието на " "напасване" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "извеждане на редове само от файловете, които напасват на всички шаблони" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "извеждане на дървото за анализ на регулярния израз" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "програма за преглед по страници" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "извеждане на съвпадащите файлове в програма за преглед по страници" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" "позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази " "опция)" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "не сте задали шаблон" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии." -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "версията „%s“ не може бъде открита" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "опциите „--untracked“ и „--recurse-submodules“ са несъвместими" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "зададен е неправилен брой нишки: %d" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" -msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво" +msgstr "" +"опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво" + +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "опцията е несъвместима с „--recurse-submodules“" -#: builtin/grep.c:1127 +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени " "файлове" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "опцията „--cached“ е несъвместима със задаване на дърво" @@ -15384,11 +14314,11 @@ msgstr "грешка при четене на входните данни" msgid "used more bytes than were available" msgstr "използвани са повече от наличните байтове" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "пакетният файл надвишава максималния възможен размер" @@ -15444,200 +14374,200 @@ msgstr[1] "неочакван край на файл, липсват %<PRIuMAX> msgid "serious inflate inconsistency" msgstr "сериозна грешка при декомпресиране с „inflate“" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" "СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "обектът „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "съществуващият обект в „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "съществуващият обект „%s“ не може да бъде прочетен" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "неправилен обект-BLOB „%s“" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "грешка при проверката на пакетирани обекти" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "разликата не може да бъде приложена" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Получаване на обекти" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Индексиране на обекти" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакетният файл е повреден (нееднакви суми по SHA1)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "не може да се получи информация за пакетния файл с „fstat“" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "в края на пакетния файл има повредени данни" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" "фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Откриване на съответните разлики" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "не може да се създаде нишка: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "" "фатална грешка във функцията „conclude_pack“. Това е грешка в Git, " "докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger." "kernel.org“." -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "действието завърши с %d локален обект" msgstr[1] "действието завърши с %d локални обекта" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в " "диска)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "в пакета има %d ненапасваща разлика" msgstr[1] "в пакета има %d ненапасващи разлики" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "добавеният обект не може да се компресира с „deflate“: %d" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "локалният обект „%s“ е повреден" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "името на пакетния файл „%s“ не завършва на „.pack“" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "грешка при запис на файла „%s“ „%s“" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "грешка при затварянето на записания файл „%s“ „%s“" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "грешка при затварянето на пакетния файл" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "пакетният файл не може да бъде запазен" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "файлът за индекса не може да бъде съхранен" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "%d обект не е разлика" msgstr[1] "%d обекта не са разлика" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "дължината на веригата е %d: %lu обект" msgstr[1] "дължината на веригата е %d: %lu обекта" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Процесът не може да се върне към предишната работна директория" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "неправилна стойност „%s“" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "опцията „--fix-thin“ изисква „--stdin“" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "„--stdin“ изисква хранилище на git" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "опцията „--verify“ изисква име на пакетен файл" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "грешка при проверка с „fsck“ на пакетните обекти" @@ -15823,130 +14753,125 @@ msgstr "опцията „--trailer“ е несъвместима с „--name- msgid "no input file given for in-place editing" msgstr "не е зададен входен файл за редактиране на място" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [ОПЦИЯ…] ОБЕКТ…" -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "неправилна опция „--decorate“: %s" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "извеждане на изходния код" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "" "Използване на файл за съответствията на имената и адресите на е-поща („." "mailmap“)" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "специален формат само на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "без специален формат на указателите напасващи на ШАБЛОНа" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "настройки на форма̀та на извежданата информация" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "" "Обработване само на редовете във файла в диапазона от n до m включително. " "Броенето започва от 1" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Резултат: %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: повреден файл" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "обектът не може да бъде прочетен: %s" -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "неизвестен вид: %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s: неправилно придружаващо писмо от режима на описание" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "не е зададена стойност на „format.headers“" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "прекалено дълго име на директорията за изходната информация" -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "файлът-кръпка „%s“ не може да бъде отворен" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "трябва да зададете точно един диапазон" -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "не е диапазон" -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "придружаващото писмо трябва да е форматирано като е-писмо" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "неуспешно създаване на придружаващо писмо" -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s" -#: builtin/log.c:1255 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "може да укажете максимум една директория за изход" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "непознато подаване: „%s“" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "„%s“ не е указател или не сочи към нищо" -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "точната база за сливане не може да бъде открита" -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15956,291 +14881,281 @@ msgstr "" "зададете, използвайте „git branch --set-upstream-to“.\n" "Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“." -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "точната база при сливане не може да бъде открита" -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "базовото подаване трябва да е предшественикът на списъка с версиите" -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "базовото подаване не може да е в списъка с версиите" -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "идентификаторът на кръпката не може да бъде получен" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "неуспешно определяне на диапазоните за разлика" -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "номерация „[PATCH]“ дори и при множество кръпки" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "извеждане на кръпките на стандартния изход" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "създаване на придружаващо писмо" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "проста числова последователност за имената на файловете-кръпки" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "ЗНАЦИ" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "режим-придружаващо-писмо-по-описание" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "" -"генериране на частите на придружаващото писмо на базата на описанието на " -"клона" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "без добавяне/махане на префикса „[PATCH]“" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "без извеждане на разлики между двоични файлове" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "без кръпки, които присъстват в следения клон" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "" "извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "Опции при изпращане" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "Е-ПОЩА" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "добавяне на заглавна част „To:“ (до)" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "добавяне на заглавна част „Cc:“ (и до)" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "ИДЕНТИЧНОСТ" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако " "не е зададена такава, се взима адреса на подаващия" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "" "първото съобщение да е в отговор на е-писмото с този " "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "граница" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "прикрепяне на кръпката" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "включване на кръпката в текста на писмата" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "" "използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или " "„deep“ (дълбок)" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "подпис" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "добавяне на поле за подпис" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "БАЗОВО_ПОДАВАНЕ" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "добавяне на подпис от файл" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "без извеждане на имената на кръпките" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "извеждане на напредъка във фазата на създаване на кръпките" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "показване на промените спрямо ВЕРСията в придружаващото писмо или единствена " "кръпка" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "показване на промените спрямо указателя на ВЕРСията в придружаващото писмо " "или единствена кръпка" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "процент за претегляне при оценка на създаването" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "грешна идентичност: %s" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "опциите „-n“ и „-k“ са несъвместими" -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими" -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "опцията „--check“ е несъвместима с генерирането на кръпки" -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "" "изходът може да или стандартният, или да е в директория, но не и двете." -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "" "опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Разлика в разликите:" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Разлика в разликите спрямо v%d:" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "опцията „--creation-factor“ изисква опция „--range-diff“" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "" "опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка" -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Диапазонна разлика:" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Диапазонна разлика спрямо v%d:" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "файлът „%s“ с подпис не може да бъде прочетен" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Създаване на кръпки" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "неуспешно създаване на изходни файлове" -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16368,7 +15283,7 @@ msgstr "" msgid "do not print remote URL" msgstr "без извеждане на адресите на отдалечените хранилища" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "КОМАНДА" @@ -16455,153 +15370,152 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "опцията „-m“ изисква стойност" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "опцията „%s“ изисква стойност" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Няма такава стратегия за сливане: „%s“.\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Наличните стратегии са:" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Допълнителните стратегии са:" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "без извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "извеждане на статистиката след завършване на сливане" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(псевдоним на „--stat“)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението " "за подаване" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "създаване на едно подаване вместо извършване на сливане" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "извършване на подаване при успешно сливане (стандартно действие)" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "редактиране на съобщението преди подаване" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "позволяване на превъртане (стандартно действие)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "преустановяване, ако превъртането е невъзможно" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "проверка, че указаното подаване е с правилен подпис на GPG" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "СТРАТЕГИЯ" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "СТРАТЕГИЯ за сливане, която да се ползва" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "ОПЦИЯ=СТОЙНОСТ" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "ОПЦИЯ за избраната стратегия за сливане" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "преустановяване на текущото сливане" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "преустановяване без промяна на индекса и работното дърво" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "продължаване на текущото сливане" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "позволяване на сливане на независими истории" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" msgstr "" -"без изпълнение на куките преди подаване и сливане и при промяна на " -"съобщението за подаване (pre-merge-commit и commit-msg)" +"проверка на куката при промяна на съобщението при подаване (commit-msg)" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "не може да се извърши скатаване" -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "неуспешно скатаване" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "неправилен обект: „%s“" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "неуспешно прочитане на обект-дърво" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (няма какво да се вкара)" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" "Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "„%s“ не сочи към подаване" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“" @@ -16654,76 +15568,76 @@ msgstr "" "Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n" "съобщение преустановява подаването.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Празно съобщение при подаване." -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Първият етап на сливането завърши.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Неуспешно автоматично сливане — коригирайте конфликтите и подайте " "резултата.\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Няма текущ клон." -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Текущият клон не следи никой клон." -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Никой клон не следи клона „%s“ от хранилището „%s“" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Неправилна стойност „%s“ в средата „%s“" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "не може да се слее в „%s“: %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "не може да се слее" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "опцията „--abort“ не приема аргументи" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Не може да преустановите сливане, защото в момента не се извършва такова " "(липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "опцията „--quit“ не приема аргументи" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "опцията „--continue“ не приема аргументи" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)." -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16731,7 +15645,7 @@ msgstr "" "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n" "Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16739,103 +15653,103 @@ msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува). Подайте промените си, преди да започнете ново сливане." -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n" "съществува)." -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Опцията „--squash“ е несъвместима с „--no-ff“." -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "Опцията „--squash“ е несъвместима с „--commit“." -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена." -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Вкарване на подаване във връх без история все още не се поддържа" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Понеже върхът е без история, всички сливания са превъртания, не може да се " "извърши същинско сливане изисквано от опцията „--no-ff“" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "„%s“ — не е нещо, което може да се слее" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "Можете да слеете точно едно подаване във връх без история" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "независими истории не може да се слеят" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Вече е обновено." -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Обновяване „%s..%s“\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Проба със сливане в рамките на индекса…\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Неуспешно сливане.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Вече е обновено!" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Не може да се извърши превъртане, преустановяване на действието." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Привеждане на дървото към първоначалното…\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Пробване със стратегията за сливане „%s“…\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Никоя стратегия за сливане не може да извърши сливането.\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Неуспешно сливане със стратегия „%s“.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" "Ползва се стратегията „%s“, която ще подготви дървото за коригиране на " "ръка.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16923,33 +15837,33 @@ msgstr "без предупреждения при конфликти" msgid "set labels for file1/orig-file/file2" msgstr "задаване на етикети за ФАЙЛ_1/ОРИГИНАЛ/ФАЙЛ_2" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "непозната опция: „%s“" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "неуспешен анализ на обекта „%s“" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "не се поддържа повече от %d база. „%s“ се прескача." msgstr[1] "не се поддържат повече от %d бази. „%s“ се прескача." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "поддържа се само сливане на точно две истории." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "указателят „%s“ не може да бъде изтрит" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Сливане на „%s“ с „%s“\n" @@ -16972,19 +15886,19 @@ msgstr "разрешаване на създаването на повече о #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [ОПЦИЯ…] (write|verify|expire|repack --batch-" -"size=РАЗМЕР)" +"git multi-pack-index [--object-dir=ДИР_ОБЕКТ] (write|verify|expire|repack --" +"batch-size=РАЗМЕР)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "ДИРекторията_с_ОБЕКТи съдържа множество двойки пакетни файлове със " "съответния им индекс" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -16992,15 +15906,15 @@ msgstr "" "при препакетиране пакетните файлове, които са с по-малък от този размер, да " "се обединяват в пакети с по-голям от този размер" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "прекалено много аргументи" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "опцията „--batch-size“ изисква подкомандата „repack“" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "непозната подкоманда: %s" @@ -17094,54 +16008,54 @@ msgstr "%s, обект: „%s“, цел: „%s“" msgid "Renaming %s to %s\n" msgstr "Преименуване на „%s“ на „%s“\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "неуспешно преименуване на „%s“" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [ОПЦИЯ…] ПОДАВАНЕ…" -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [ОПЦИЯ…] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [ОПЦИЯ…] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "извеждане само на имената (без сумите по SHA1)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "използване само на етикетите за именуване на подаванията" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "използване само на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "игнориране на указателите напасващи на ШАБЛОНа" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "" "извеждане на всички подавания, които могат да бъдат достигнати от всички " "указатели" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "четене от стандартния вход" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "да се извеждат и недефинираните имена (стандартна стойност на опцията)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)" @@ -17547,7 +16461,7 @@ msgstr "опитът за изтриването на несъществуващ msgid "read object names from the standard input" msgstr "изчитане на имената на обектите от стандартния вход" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "само извеждане без действително окастряне" @@ -17563,7 +16477,7 @@ msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" msgid "use notes from <notes-ref>" msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "непозната подкоманда: %s" @@ -17581,107 +16495,130 @@ msgstr "" "git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < " "СПИСЪК_С_ОБЕКТИ]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "лоша контролна сума за пакетирания обект „%s“" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "пакетиран обект с грешки за „%s“" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "рекурсивна разлика за обект „%s“" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "подредени бяха %u обекта, а се очакваха %<PRIu32>" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "неправилен пакетен файл: „%s“" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "пакетният файл „%s“ не може да бъде повторно отворен" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "неуспешно търсене в преизползван пакетен файл" + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "неуспешно четене от преизползван пакетен файл" + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "изключване на записването на битовата маска, пакетите са разделени поради " "стойността на „pack.packSizeLimit“" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Записване на обектите" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "не може да бъде получена информация чрез „stat“ за „%s“" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "бяха записани %<PRIu32> обекти, а се очакваха %<PRIu32>" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "изключване на записването на битовата маска, защото някои обекти няма да се " "пакетират" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "недостижимо начало на отместването за обектите-разлика за „%s“" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Преброяване на обектите" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "размерът на „%s“ не може да бъде получен" + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "заглавната част на „%s“ не може да бъде анализирана" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "обектът „%s“ не може да се прочете" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "обектът „%s“ е с неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "неоптимизиран пакет — паметта свърши" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Делта компресията ще използва до %d нишки" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" "обектите, които могат да бъдат достигнати от етикета „%s“, не може да бъдат " "пакетирани" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Компресиране на обектите" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "неправилен брой разлики" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17690,7 +16627,7 @@ msgstr "" "очаква се идентификатор на краен обект, а не:\n" " %s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17699,252 +16636,267 @@ msgstr "" "очаква се идентификатор на обект, а не:\n" " %s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "неправилна стойност за „--missing“" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "индексът на пакетния файл не може да бъде отворен" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "непакетираният обект в „%s“ не може да бъде анализиран" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "оставането на обекта непакетиран не може да бъде наложено" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "„%s“ не е версия" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "неправилна версия „%s“" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "скорошните обекти не могат да бъдат добавени" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "неподдържана версия на индекса „%s“" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "неправилна версия на индекса „%s“" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "без извеждане на напредъка" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "извеждане на напредъка" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "извеждане на напредъка във фазата на запазване на обектите" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" +"същото действие като опцията „--all-progress“ при извеждането на напредъка" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "" "запазване на индекса на пакетните файлове във форма̀та с указаната версия" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "максимален размер на всеки пакетен файл" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "игнориране на обектите заети от други хранилища на обекти" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "игнориране на пакетираните обекти" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "ограничаване на прозореца за пакетиране по брой обекти" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "" "ограничаване на прозореца за пакетиране и по памет освен по брой обекти" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "максимална дължина на веригата от разлики, която е позволена в пакетния файл" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "преизползване на съществуващите разлики" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "преизползване на съществуващите обекти" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "използване на обекти „OFS_DELTA“" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "" "стартиране на нишки за претърсване на най-добрите съвпадения на разликите" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "без създаване на празен пакетен файл" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "изчитане на версиите от стандартния вход" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "ограничаване до все още непакетираните обекти" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "" "включване на всички обекти, които могат да се достигнат от произволен " "указател" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "включване и на обектите сочени от записите в журнала на указателите" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "включване и на обектите сочени от индекса" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "извеждане на пакета на стандартния изход" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "" "включване и на обектите-етикети, които сочат към обектите, които ще бъдат " "пакетирани" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "запазване на недостижимите обекти" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "пакетиране и на недостижимите обекти" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "използване на алгоритъм за частична достижимост" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "създаване на съкратени пакети" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "пакетиране подходящо за плитко доставяне" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "игнориране на пакетите, които са придружени от файл „.keep“" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "пропускане на този пакет" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "ниво на компресиране при пакетиране" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "" "извеждане на всички родители — дори и тези, които нормално са скрити при " "присажданията" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "използване на съществуващи индекси на база битови маски за ускоряване на " "преброяването на обектите" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "" "запазване и на индекс на база побитова маска, заедно с индекса за пакета" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "записване на индекси на база битови маски при възможност" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "как да се обработват липсващите обекти" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "без пакетиране на обекти в гарантиращи пакети" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "без промяна на групите при делта компресия" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" "Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма. Ще се " "ползва %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "опцията „--max-pack-size“ не може да се използва за създаване на пакетни " "файлове за пренос" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "минималният размер на пакетите е 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "" "опцията „--thin“не може да се използва за създаване на пакетни файлове с " "индекс" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "опцията „-filter“ изисква „-stdout“" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Изброяване на обектите" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" -"Общо: %<PRIu32> (разлики: %<PRIu32>), преизползвани: %<PRIu32> (разлики: " -"%<PRIu32>), преизползвани при пакетиране: %<PRIu32>" +"Общо %<PRIu32> (разлики %<PRIu32>), преизползвани %<PRIu32> (разлики " +"%<PRIu32>)" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17986,53 +16938,53 @@ msgstr "ограничаване на обхождането до обекти msgid "cannot prune in a precious-objects repo" msgstr "хранилище с важни обекти не може да се окастря" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Неправилна стойност за „%s“: „%s“" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "управление на рекурсивното доставяне на подмодулите" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Опции при сливане" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "внасяне на промените чрез пребазиране, а не чрез сливане" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "позволяване на превъртания" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Опции при доставяне" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "принудително презаписване на локалния клон" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "брой подмодули издърпани паралелно" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправилна стойност за „pull.ff“: „%s“" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -18040,14 +16992,14 @@ msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, върху " "който да пребазирате." -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Между указателите, които току що доставихте, няма подходящ кандидат, който " "да слеете." -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -18055,7 +17007,7 @@ msgstr "" "Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в " "отдалеченото хранилище." -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -18066,44 +17018,44 @@ msgstr "" "Понеже това не е хранилището по подразбиране на текущия клон, трябва\n" "да укажете отдалечения клон на командния ред." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Извън всички клони." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Укажете върху кой клон искате да пребазирате." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Укажете кой клон искате да слеете." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "За повече информация погледнете ръководството „git-pull(1)“" -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "КЛОН" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Текущият клон не следи никой." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Ако искате да зададете информация за следен клон, можете да направите това с " "командата:" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -18112,32 +17064,32 @@ msgstr "" "За сливане е указан отдалеченият указател „%s“,\n" "но такъв не е доставен." -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "недостъпно подаване: %s" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "без „--verify-signatures“ при пребазиране" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "опцията „--[no-]autostash“ изисква „--rebase“" -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновяване на все още несъздаден клон с промените от индекса" -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "издърпване с пребазиране" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "трябва да подадете или скатаете промените." -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18147,7 +17099,7 @@ msgstr "" "доставянето обнови върха на текущия клон. Работното\n" "ви копие бе превъртяно от подаване „%s“." -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18164,15 +17116,15 @@ msgstr "" " git reset --hard\n" "за връщане към нормално състояние." -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Не може да сливате множество клони в празен върхов указател." -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Не може да пребазирате върху повече от един клон." -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "пребазирането е невъзможно заради локално записаните промени по подмодулите" @@ -18181,15 +17133,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "съкращение за етикет без ЕТИКЕТ" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "опцията „--delete“ приема за цел само прости имена на указатели" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -18198,7 +17150,7 @@ msgstr "" "За да включите тази опция за постоянно, погледнете документацията за " "настройката „push.default“ в „git help config“." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -18223,7 +17175,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -18237,7 +17189,7 @@ msgstr "" "\n" " git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18251,14 +17203,14 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Текущият клон „%s“ следи няколко отдалечени клона, не можете просто да " "изтласкате." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18270,14 +17222,14 @@ msgstr "" "Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения " "клон." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Не сте указали версия за подаване, а настройката „push.default“ е " "„nothing“ (нищо без изрично указана версия да не се изтласква)" -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18291,7 +17243,7 @@ msgstr "" "преди отново да изтласкате промените. За повече информация вижте раздела\n" "„Note about fast-forwards“ в страницата от ръководството „git push --help“." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18305,7 +17257,7 @@ msgstr "" "информация погледнете раздела „Note about fast-forwards“ в страницата от\n" "ръководството „git push --help“." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18324,14 +17276,14 @@ msgstr "" "страницата\n" "от ръководството „git push --help“." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува " "етикет,\n" "който ще припокриете с етикет от вашето хранилище." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18341,144 +17293,144 @@ msgstr "" "указател, който вече сочи към обект, който не е подаване, както и тепърва\n" "да го промените да сочи към подобен обект.\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "Изтласкване към „%s“\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "част от указателите не бяха изтласкани към „%s“" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "неправилно указано хранилище „%s“" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Не е указано хранилище, към което да се изтласква.\n" +"Или укажете адреса на командния ред, или настройте отдалечено хранилище с " +"командата:\n" +"\n" +" git remote add ИМЕ АДРЕС\n" +"\n" +"и след това изтласкайте, като укажете името на отдалеченото хранилище:\n" +"\n" +" git push ИМЕ\n" + +#: builtin/push.c:554 msgid "repository" msgstr "хранилище" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "изтласкване на всички указатели" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "огледално копие на всички указатели" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "изтриване на указателите" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "принудително обновяване" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" -msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ" +msgstr "УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "управление на рекурсивното изтласкване на подмодулите" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "използване на съкратени пакети" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "програма за получаването на пакети" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "задаване на отдалеченото хранилище за командите „git pull/status“" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "окастряне на указателите, които са премахнати от локалното хранилище" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "без изпълнение на куката преди изтласкване (pre-push)" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "" "изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото " "изтласкване, етикети" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "подписване на изтласкването с GPG" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "изискване на атомарни операции от отсрещната страна" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" "опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "опцията „--delete“ изисква поне един указател на версия" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "неправилно указано хранилище „%s“" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Не е указано хранилище, към което да се изтласква.\n" -"Или укажете адреса на командния ред, или настройте отдалечено хранилище с " -"командата:\n" -"\n" -" git remote add ИМЕ АДРЕС\n" -"\n" -"и след това изтласкайте, като укажете името на отдалеченото хранилище:\n" -"\n" -" git push ИМЕ\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "опциите „--all“ и „--tags“ са несъвместими" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "опцията „--all“ е несъвместима с указването на версия" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "опциите „--mirror“ и „--tags“ са несъвместими" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "опцията „--mirror“ е несъвместима с указването на версия" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "опциите „--all“ и „--mirror“ са несъвместими" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред" @@ -18494,32 +17446,24 @@ msgstr "git range-diff [ОПЦИЯ…] СТАР_ВРЪХ...НОВ_ВРЪХ" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [ОПЦИЯ…] БАЗА СТАР_ВРЪХ НОВ_ВРЪХ" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "Процент за оценка на създаването" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "използване на прости цветове за разликите" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "бележки" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "подава се на командата „git log“" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "„..“ липсва в диапазона „%s“" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "вариантът с единствен аргумент изисква симетричен диапазон" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "необходими са два диапазона с подавания" @@ -18602,17 +17546,13 @@ msgstr "изчистване на грешки в командата „unpack-t msgid "suppress feedback messages" msgstr "без информационни съобщения" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Първо трябва да коригирате индекса си" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА | --keep-base] " -"[КЛОН_ИЗТОЧНИК [КЛОН]]" +"git rebase [-i] [ОПЦИЯ…] [--exec КОМАНДА] [--onto НОВА_БАЗА] [КЛОН_ИЗТОЧНИК] " +"[КЛОН]" #: builtin/rebase.c:34 msgid "" @@ -18624,211 +17564,220 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "неуспешно изтриване на списъка за изпълнение: „%s“" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "„%s“ не може да се запише." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "Липсва указател „HEAD“" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "не може да се създаде временна директория „%s“" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "невъзможно задаване на интерактивна работа" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "файлът с командите не може да се генерира" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [ОПЦИЯ…]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(ОСТАРЯЛО) запазване на празните подавания" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "запазване на празните подавания" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "позволяване на празни съобщения при подаване" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "пребазиране на подаванията със сливания" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "" "запазване на първоначалните точки на разклоняване на сестринските клони" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "подписване на подаванията" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "продължаване на пребазирането" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "прескачане на подаване" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "редактиране на списъка с команди за изпълнение" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "извеждане на текущата кръпка" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "съкратени идентификатори в списъка за изпълнение" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "пълни идентификатори в списъка за изпълнение" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "проверка на списъка за изпълнение" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "" "преподреждане на редовете за вкарване на подаванията подаванията в " "предходните им със и без смени на съобщението" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "вмъкване на командите за изпълнение в списъка за изпълнение" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "върху" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "ограничена версия" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "ограничена версия" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "подаване, в което другите да се вкарат" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "подаване на източника" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "име на върха" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "име на върха" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "стратегия на пребазиране" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "опции на стратегията" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "опции на стратегията" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "преминаване към" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "клонът, към който да се премине" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "име на база" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "име на база" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "команда" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "команда за изпълнение" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "" "автоматично подаване за повторно изпълнение на командите завършили с неуспех" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "„%s“ изисква интерактивно пребазиране" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "не може да се премине към новата база, зададена с „onto“: „%s“" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "неправилен указател към първоначален връх „orig-head“: „%s“" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Пътят „%s“ не може да бъде прочетен" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "„%s“ не може да бъде запазен" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "не може да се определи към какво да сочи указателят „HEAD“" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18842,7 +17791,7 @@ msgstr "" "За да откажете пребазирането и да се върнете към първоначалното състояние,\n" "изпълнете „git rebase --abort“." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18860,16 +17809,7 @@ msgstr "" "\n" "В резултат те не могат да се пребазират." -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"неправилна стойност „%s“: вариантите са „drop“ (прескачане), " -"„keep“ (запазване) и „ask“ (питане)" - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18886,7 +17826,7 @@ msgstr "" " git rebase КЛОН\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18899,143 +17839,135 @@ msgstr "" "\n" " git branch --set-upstream-to=%s/КЛОН %s\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "командите за изпълнение не може да съдържат нови редове" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "празна команда за изпълнение" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "пребазиране върху зададения, а не следения клон" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "за текуща база да се ползва базата за сливане на клона и следеното" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "позволяване на куката преди пребазиране да се изпълни" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "без извеждане на информация. Включва опцията „--no-stat“" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "без извеждане на статистика с промените в следения клон" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "" "добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "подава се на командата „git am“" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "подава се на командата „git apply“" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "отбиране на всички подавания дори да няма промени" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "продължаване" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "прескачане на текущата кръпка и продължаване" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "преустановяване и възстановяване на първоначалния клон" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "преустановяване без промяна към какво сочи „HEAD“" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "редактиране на файла с команди при интерактивно пребазиране" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "показване на кръпката, която се прилага или слива" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "при пребазиране да се ползва стратегия с прилагане" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" -msgstr "при пребазиране да се ползва стратегия със сливане" +msgstr "при пребазиране да се ползва стратегия за сливане" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "" "позволяване на потребителя да редактира списъка с подавания за пребазиране" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "(ОСТАРЯЛО) пресъздаване на сливанията вместо да се прескачат" +msgstr "(остаряло) пресъздаване на сливанията вместо да се прескачат" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "как да се обработват оказалите се празни подавания" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "запазване на празните подавания при пребазиране" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" "преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "" "добавяне на редове с команди за изпълнение след всяко подаване в " "редактирания списък" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "позволяване на пребазиране на подавания с празни съобщения" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "опит за пребазиране на сливанията вместо те да се прескачат" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "за доуточняването на следения клон, използвайте:\n" "\n" " git merge-base --fork-point" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "използване на зададената стратегията на сливане" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "опция" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "аргументът да се подаде на стратегията за сливане" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "пребазиране на всички достижими подавания до началното им подаване" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19043,41 +17975,33 @@ msgstr "" "поддръжката на „rebase.useBuiltin“ е премахната.\n" "За повече информация вижте „git help config“." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да " "пребазирате в момента." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо " "нея." -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "опциите „--keep-base“ и „--onto“ са несъвместими" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "опциите „--keep-base“ и „--root“ са несъвместими" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Изглежда в момента не тече пребазиране" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Указателят „HEAD“ не може да бъде прочетен" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19085,16 +18009,16 @@ msgstr "" "Трябва да редактирате всички конфликти при сливането. След това\n" "отбележете коригирането им чрез командата „git add“" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "промените в работното дърво не могат да бъдат занулени" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "връщането към „%s“ е невъзможно" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19115,170 +18039,180 @@ msgstr "" "за\n" "да не загубите случайно промени.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "опцията „C“ очаква число за аргумент" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Неизвестна стратегия: „%s“" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "" "опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "опциите за „apply“ са несъвместими с опциите за сливане" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "Непозната реализация на пребазиране: %s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" "опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--" "interactive“" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "" +"опциите за „am“ са несъвместими с опциите за сливане или за интерактивна " +"работа" + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са " "несъвместими" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "опциите „--rebase-merges“ и „--strategy-option“ са несъвместими" + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "опциите „--rebase-merges“ и „--strategy“ са несъвместими" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "неправилен следен клон: „%s“" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "Не може да се създаде ново начално подаване" -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "„%s“: изисква се точно една база за сливане с клона" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "„%s“: изисква се точно една база за пребазиране" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Указателят „%s“ не сочи към подаване" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Такъв указател няма: %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Не може да се скатае автоматично" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Неочакван резултат при скатаване: „%s“" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Директорията за „%s“ не може да бъде създадена" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Автоматично скатано: „%s“\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "неуспешно изпълнение на „git reset --hard“" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "Указателят „HEAD“ сочи към „%s“" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Промените трябва или да се подадат, или да се скатаят." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "„%s“ не може да се анализира" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "не може да се премине към „%s“" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "Указателят „HEAD“ е напълно актуален." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Текущият клон „%s“ е напълно актуален.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Промените в „%s“:\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Промените от „%s“ към „%s“:\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Първо, указателят „HEAD“ започва да сочи към базата, върху която " "пребазирате…\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Указателят „HEAD“ не може да се отделѝ" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Превъртане на „%s“ към „%s“.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19311,7 +18245,7 @@ msgstr "" "За да заглушите това съобщение, като запазите стандартното поведение,\n" "задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19361,49 +18295,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists УКАЗАТЕЛ" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "„%s“ не е правилна стойност за време" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "Отбелязване на достижимите обекти…" -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "„%s“ не сочи наникъде!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "не е указан журнал с подавания за изтриване" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "„%s“ не е журнал с подавания" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "липсва журнал с подаванията за „%s“" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "неправилен формат на указател: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -19411,83 +18345,83 @@ msgstr "" "git remote add [-t КЛОН] [-m ОСНОВЕН_КЛОН] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] ИМЕ АДРЕС" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename СТАРО_ИМЕ НОВО_ИМЕ" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove ИМЕ" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head ИМЕ (-a | --auto | -d | --delete | КЛОН)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] ИМЕ" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] ИМЕ" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(ГРУПА | " "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ)…]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] ИМЕ КЛОН…" -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] ИМЕ" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] ИМЕ НОВ_АДРЕС [СТАР_АДРЕС]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add ИМЕ НОВ_АДРЕС" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete ИМЕ АДРЕС" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [ОПЦИЯ…] ИМЕ АДРЕС" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches ИМЕ КЛОН…" -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add ИМЕ КЛОН…" -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [ОПЦИЯ…] ИМЕ" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [ОПЦИЯ…] ИМЕ" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [ОПЦИЯ…] [ГРУПА | ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ…]" -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Обновяване на „%s“" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -19495,102 +18429,86 @@ msgstr "" "Използването само на „--mirror“ е опасно. Вместо това\n" "ползвайте „--mirror=fetch“ или „--mirror=push“" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "неправилна стойност за „--mirror“: %s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "отдалечените клони не могат да бъдат доставени" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "внасяне на всички етикети и принадлежащите им обекти при доставяне" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "може и да не се доставят никакви етикети (чрез опцията „--no-tags“)" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "клон/и за следене" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "основен клон" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "настройване на отдалечено хранилище, от което да се издърпва или доставя" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "" "няма смисъл да се указва основен клон при използване на опцията „--mirror“" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "указването на следени клони е смислено само за отдалечени хранилища, от " "които се доставя" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "вече съществува отдалечено хранилище с име „%s“." -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "„%s“ е неправилно име за отдалечено хранилище" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "Основният клон „%s“ не може да бъде настроен" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Обектите за доставяне за указателя „%s“ не могат да бъдат получени" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(съвпадащи)" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(за изтриване)" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "„%s“ не може да се зададе" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"Настройката „remote.pushDefault“ с обхват „%s“ в:\n" -" %s:%d\n" -"използва отдалечено хранилище, което вече не съществува: „%s“" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19601,17 +18519,17 @@ msgstr "" " %s\n" " Променете настройките ръчно, ако е необходимо." -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "неуспешно изтриване на „%s“" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "неуспешно създаване на „%s“" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19625,121 +18543,121 @@ msgstr[1] "" "Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n" "Изтрийте ги чрез командата:" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "Разделът „%s“ в настройките не може да бъде изтрит" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " следен" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " стар (изтрийте чрез „git remote prune“)" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " неясно състояние" # CHECK -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече " "от 1 клон" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "интерактивно пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "интерактивно пребазиране (със сливания) върху отдалечения клон „%s“" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "пребазиране върху отдалечения клон „%s“" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " сливане с отдалечения клон „%s“" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "сливане с отдалечения клон „%s“" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и с отдалечения клон „%s“\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "създаден" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "изтрит" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "актуален" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "може да се превърти" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "локалният е изостанал" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s принудително изтласква към %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s изтласква към %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s принудително изтласква към %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s изтласква към %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "без заявки към отдалечените хранилища" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "● отдалечено хранилище „%s“" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " Адрес за доставяне: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(без адрес)" @@ -19747,25 +18665,25 @@ msgstr "(без адрес)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " Адрес за изтласкване: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " клон сочен от HEAD: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(без проверка)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(непознат)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -19774,161 +18692,170 @@ msgstr "" "хранилище\n" " не е еднозначен и е някой от следните):\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Отдалечен клон:%s" msgstr[1] " Отдалечени клони:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (състоянието не бе проверено)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локален клон настроен за издърпване чрез „git pull“:" msgstr[1] " Локални клони настроени за издърпване чрез „git pull“:" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " Локалните указатели ще бъдат пренесени чрез „ push“" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Локалният указател, настроен за „git push“%s:" msgstr[1] " Локалните указатели, настроени за „git push“%s:" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "изтриване на refs/remotes/ИМЕ/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Не може да се установи отдалеченият връх" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Множество клони с върхове. Изберете изрично някой от тях чрез командата:" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "„%s“ не може да бъде изтрит" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "Неправилен указател: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "„%s“ не може да се настрои" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr "„%s“ ще се превърне в обект извън клоните!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr "„%s“ се превърна в обект извън клоните!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Окастряне на „%s“" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "адрес: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " ● [ще бъде окастрено] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " ● [окастрено] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "окастряне на огледалата на отдалечените хранилища след доставяне" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "Няма отдалечено хранилище на име „%s“" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "добавяне на клон" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "не е указано отдалечено хранилище" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "запитване към адресите за изтласкване, а не за доставяне" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "извеждане на всички адреси" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "не е зададен адрес за отдалеченото хранилище „%s“" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "промяна на адресите за изтласкване" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "добавяне на адреси" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "изтриване на адреси" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "опциите „--add“ и „--delete“ са несъвместими" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправилен (стар) формат за адрес: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "Такъв адрес не е открит: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "повече подробности. Поставя се пред подкоманда" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Непозната подкоманда: %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [ОПЦИЯ…]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19937,126 +18864,126 @@ msgstr "" "Ползвайте опцията --no-write-bitmap-index или изключете настройката\n" "„pack.writebitmaps“." -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "" "командата „pack-objects“ не може да се стартира за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -"repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични " +"repack: от „pack-objects“ се очакват редове само с пълни шестнайсетични " "указатели." -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "командата „pack-objects“ не може да завърши за препакетирането на " "гарантиращите обекти" -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "пакетиране на всичко в пакет" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "" "същото като опцията „-a“. Допълнително — недостижимите обекти да станат " "непакетирани" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "" "премахване на ненужните пакетирани файлове и изпълнение на командата „git-" "prune-packed“" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" "подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "без изпълнение на командата „git-update-server-info“" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "подаване на опцията „--local“ на командата „git-pack-objects“" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "създаване и записване на индекси на база битови маски" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "евристична дата" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "" "при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от " "това" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "с „-a“ — препакетиране на недостижимите обекти" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "размер на прозореца за делта компресията" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "байтове" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "същото като горната опция, но ограничението да е по размер на паметта, а не " "по броя на обектите" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "ограничаване на максималната дълбочина на делтата" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "ограничаване на максималния брой нишки" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "максимален размер на всеки пакет" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "препакетиране на обектите в пакети белязани с „.keep“" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "без препакетиране на този пакет" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "пакетите в хранилище с важни обекти не може да се трият" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Нищо ново за пакетиране" -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -20074,7 +19001,7 @@ msgstr "" "ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n" "ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "директорията „%s“ не може да бъде изтрита" @@ -20182,8 +19109,8 @@ msgstr "„fstat“ не може да се изпълни върху „%s“" msgid "unable to write object to database" msgstr "обектът не може да бъде записан в базата от данни" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "неправилно име на обект: „%s“" @@ -20202,22 +19129,22 @@ msgstr "неуспешно редактиране на файла с обект msgid "new object is the same as the old one: '%s'" msgstr "новият и старият обект са един и същ: „%s“" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "„%s“ не може да се анализира като подаване" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "етикетът при сливане в подаването „%s“ e неправилен" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "етикетът при сливане в подаването „%s“ e неправилен" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -20226,31 +19153,31 @@ msgstr "" "Първоначалното подаване „%s“ съдържа етикета при сливане „%s“, който е " "изхвърлен, затова използвайте опцията „--edit“, а не „--graft“." -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "първоначалното подаване „%s“ е с подпис на GPG" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "Подписът ще бъде премахнат в заменящото подаване!" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "заменящото подаване за „%s“ не може да бъде записано" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "присадката за „%s“ е излишна" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "новото и старото подаване са едно и също: „%s“" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -20259,71 +19186,71 @@ msgstr "" "следните присадки не могат да се преобразуват:\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "извеждане на списъка с указателите за замяна" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "изтриване на указателите за замяна" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "редактиране на съществуващ обект" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "смяна на родителите на подаване" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "преобразуване на файла за присадките" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "замяна на указателя, ако съществува" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "без форматирано извеждане на съдържанието — за опцията „--edit“" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "използване на този ФОРМАТ" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "опцията „--format“ изисква извеждане на списък" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "опцията „-f“ изисква запазването на заместител" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "опцията „--raw“ изисква „--edit“" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "опцията „-d“ изисква поне един аргумент" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "неправилен брой аргументи" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "опцията „-e“ изисква поне един аргумент" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "опцията „-g“ изисква поне един аргумент" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "опцията „--convert-graft-file“ не приема аргументи" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "опцията „-l“ приема точно един шаблон" @@ -20351,130 +19278,117 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОДАВАНЕ]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩА…" +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] УКАЗАТЕЛ_КЪМ_ДЪРВО [--] ПЪТИЩА…" #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] " -"[УКАЗАТЕЛ_КЪМ_ДЪРВО]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [УКАЗАТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩА…]" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "смесено (mixed)" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "меко (soft)" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "пълно (hard)" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "слято (merge)" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "запазващо (keep)" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "Указателят „HEAD“ е повреден." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Дървото, сочено от „%s“, не може да бъде открито." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "Указателят „HEAD“ сочи към „%s“" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Не може да се извърши %s зануляване по време на сливане." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "по-малко подробности, да се извеждат само грешките" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "индекса и указателя „HEAD“, без работното дърво" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "само указателя „HEAD“, без индекса и работното дърво" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "указателя „HEAD“, индекса и работното дърво" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "" "отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Стойността „%s“ не е разпозната като съществуваща версия." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "„%s“ не е разпознат като дърво." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -"опцията „--patch“ е несъвместима с всяка от опциите „--hard“/„--mixed“/„--" -"soft“" +"опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това " "изпълнете „git reset -- ПЪТ…“." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "В голо хранилище не може да извършите %s зануляване" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" -msgstr "Опцията „-N“ изисква опцията „--mixed“" +msgstr "Опцията „-N“ е съвместима само с „--mixed“" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Промени извън индекса след зануляването:" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -20487,30 +19401,35 @@ msgstr "" "Опцията „--quiet“ заглушава това съобщение еднократно. За постоянно\n" "заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Индексът не може да бъде занулен към версия „%s“." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Новият индекс не може да бъде записан." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "филтрирането на обекти изисква опцията „--objects“" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "неправилна частична стойност: %s" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "командата „rev-list“ не поддържа извеждането на бележки" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "опцията „--objects“ е несъвместима с изброяването" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "опцията „--use-bitmap-index“ е несъвместима с филтриране на обектите" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -20678,44 +19597,40 @@ msgid_plural "the following files have local modifications:" msgstr[0] "следният файл е с променено съдържание" msgstr[1] "следните файлове са с променено съдържание" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "да не се извеждат изтритите файлове" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "изтриване само от индекса" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "въпреки проверката за актуалността на съдържанието" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "рекурсивно изтриване" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "" "изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за " "изтриване" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "Не са зададени пътища. Кои файлове да се изтрият?" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "за да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n" "или ги скатайте" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: „%s“ не може да се изтрие" @@ -20971,83 +19886,15 @@ msgstr "" "извеждане на указателите приети от стандартния вход, които липсват в " "локалното хранилище" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) ОПЦИЯ…" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "директорията за частично изтегляне „%s“ не може да бъде създадена" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "инициализиране на частичното изтегляне в пътеводен режим" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "инициализиране на частичното изтегляне" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "„%s“ не може да се отвори" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "пътят „%s“ не може да се нормализира" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | ШАБЛОН…)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчистено" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "шаблоните за частично изтегляне не могат да се заредят" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "изчитане на шаблоните от стандартния вход" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "задаване на шаблоните за частичното изтегляне" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "без използване на частично изтегляне" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "грешка при обновяване на работната директория" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [ОПЦИЯ…]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [ОПЦИЯ…] [СКАТАНО]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [СКАТАНО]" @@ -21055,27 +19902,25 @@ msgstr "git stash drop [-q|--quiet] [СКАТАНО]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [СКАТАНО]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch КЛОН [СКАТАНО]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n" -" [--pathspec-from-file=ФАЙЛ [--pathspec-file-nul]]\n" " [--] [ПЪТ…]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -21083,198 +19928,188 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [СЪОБЩЕНИЕ]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [СКАТАНО]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [СКАТАНО]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message СЪОБЩЕНИЕ] [-q|--quiet] ПОДАВАНЕ" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕНИЕ]\n" -" [--] [ПЪТ…]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "„%s“ не е подаване, приличащо на нещо скатано" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "Указани са прекалено много версии:%s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "Не е открито нищо скатано." -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "„%s“ е неправилно име за указател" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "командата „git stash clear“ не поддържа аргументи" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "по време на сливане не може да приложите нещо скатано" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "файлът с разликите „%s^!“ не може да се генерира" -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "" "в индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "дървото сочено от индекса не може да бъде запазено" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "неследени файлове не могат да се възстановят от скатаното" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "Сливане на „%s“ с „%s“" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "Индексът не е изваден от скатаното." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "опит за повторно създаване на индекса" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "Изтрито: „%s“ (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "Скатаното „%s“ не може да бъде изтрито" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "„%s“ не е указател към нещо скатано" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "Скатаното е запазено в случай, че ви потрябва отново." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Не е указано име на клон" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "съобщение при скатаване" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Не са избрани никакви промени" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Все още липсва първоначално подаване" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Състоянието на текущия индекс не може да бъде запазено" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Неследените файлове не могат да се запазят" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Състоянието на работното дърво не може да бъде запазено" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Пробвайте да използвате „git add“" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Няма никакви локални промени за скатаване" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Скатаването не може да стартира" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Текущото състояние не може да бъде запазено" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Състоянието на работната директория и индекса e запазено: „%s“" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Промените в работното дърво не могат да бъдат занулени" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "запазване на индекса" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "скатаване в режим за кръпки" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "без извеждане на информация" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "скатаване и на неследените файлове" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "скатаване и на игнорираните файлове" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "„%s“ не може да се изпълни" @@ -21295,41 +20130,41 @@ msgstr "пропускане на всички редове, които запо msgid "prepend comment character and space to each line" msgstr "добавяне на „# “ в началото на всеки ред" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Очаква се пълно име на указател, а не „%s“" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" "командата „print-default-remote“ на „submodule--helper“ не приема аргументи" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не може да се махне компонент от адреса „%s“" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "директория за определянето на относителните пътища" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "Влизане в „%s“\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21338,7 +20173,7 @@ msgstr "" "изпълнената команда завърши с ненулев изход за „%s“\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -21349,19 +20184,19 @@ msgstr "" "вложени в „%s“\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Без извеждане на изход при въвеждането на всяка команда за подмодули" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Рекурсивно обхождане на подмодулите" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМАНДА" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -21370,55 +20205,55 @@ msgstr "" "настройката „%s“ липсва. Приема се, че това хранилище е правилният източник " "за себе си." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Без извеждане на информация при инициализирането на подмодул" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "неуспешно рекурсивно обхождане на подмодула „%s“" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Заглушаване на изхода за състоянието на подмодула" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -21426,47 +20261,47 @@ msgstr "" "Използване на подаването указано в индекса, а не това от указателя „HEAD“ на " "подмодула" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "рекурсивно обхождане на подмодулите" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name ПЪТ" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Синхронизиране на адреса на подмодул за „%s“\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Без извеждане на информация при синхронизирането на подмодул" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21475,7 +20310,7 @@ msgstr "" "Работното дърво на подмодул „%s“ съдържа директория „.git“.\n" "(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21484,209 +20319,180 @@ msgstr "" "Работното дърво на подмодул „%s“ съдържа локални промени. Можете да ги " "отхвърлите с опцията „-f“" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Директорията „%s“ е изчистена\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" "Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "празната директория за подмодула „%s“ не може да бъде създадена" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Регистрацията на подмодула „%s“ (%s) за пътя „%s“ е премахната\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Изтриване на работните дървета на подмодулите, дори когато те съдържат " "локални промени" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Премахване на регистрациите на всички подмодули" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Използвайте „--all“, за да премахнете всички подмодули" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"Алтернативният източник, определен от обхващащия проект е неправилен.\n" -"За да позволите на git да клонира без алтернативен източник в този случай,\n" -"задайте настройката „submodule.alternateErrorStrategy“ да е „info“ или\n" -"при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "къде да се клонира новият подмодул" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "име на новия подмодул" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "адрес, от който да се клонира новият подмодул" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "дълбочина на плитките хранилища" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "предотвратяване на клониране в непразна история" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] " -"[--name ИМЕ] [--depth ДЪЛБОЧИНА] [--single-branch] --url АДРЕС --path ПЪТ" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"„%s“ не може нито да се създаде, нито да се ползва в директорията на git на " -"друг подмодул" +"[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "директорията не е празна: „%s“" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "директорията на подмодула „%s“ не може да бъде получена" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Пътят на подмодула „%s“ не е инициализиран" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Вероятно искахте да използвате „update --init“?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Прескачане на неслетия подмодул „%s“" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Прескачане на подмодула „%s“" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "Втори неуспешен опит за клониране на „%s“. Действието се преустановява" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "път към работното дърво" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "път към работното дърво, през границите на вложените подмодули" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "" "„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или " "„none“ (нищо да не се прави)" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Плитко клониране, отрязано до указания брой версии" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "брой паралелни процеси" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "дали първоначалното клониране да е плитко, както се препоръчва" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "без извеждане на напредъка на клонирането" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "неправилен параметър към опцията „--update“" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21695,50 +20501,50 @@ msgstr "" "Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, " "но той не е на никой клон" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "не може да се получи връзка към хранилище за подмодула „%s“" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "рекурсивно обхождане подмодулите" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "проверка дали писането във файла „.gitmodules“ е безопасно" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "изтриване на настройка във файла „.gitmodules“" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset ИМЕ" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "файлът „.gitmodules“ трябва да е в работното дърво" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "„%s“ не поддържа опцията „--super-prefix“" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "„%s“ не е подкоманда на „submodule--helper“" @@ -21992,226 +20798,222 @@ msgstr "етикетът „%s“ вече съществува" msgid "Updated tag '%s' (was %s)\n" msgstr "Обновен етикет „%s“ (бе „%s“)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Разпакетиране на обектите" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "файлът „%s“ не може да бъде създаден" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "файлът „%s“ не може да бъде изтрит" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "директорията „%s“ не може да бъде изтрита" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Проверка на времето на промяна (mtime) на файла „%s“" -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нов файл" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "добавянето на нова директория" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "" "информацията получена чрез „stat“ за директорията се променя след " "обновяването на нов файл" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "информацията получена чрез „stat“ за директорията се променя след добавянето " "на файл в поддиректория" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на файл" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "" "информацията получена чрез „stat“ за директорията не се променя след " "изтриването на директория" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " Добре" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" "продължаване с обновяването, дори когато индексът трябва да бъде обновен" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "подмодулите да се игнорират при обновяването" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "новите файлове да не се игнорират" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "файлове да могат да заменят директории и обратно" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "предупреждаване при липсващи в работното дърво файлове" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "обновяване дори и индексът да съдържа неслети обекти" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "обновяване на информацията от функцията „stat“" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" "като опцията „--refresh“, но да се проверят и обектите, които са били приети " "за непроменени" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "РЕЖИМ,ОБЕКТ,ПЪТ" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "добавяне на изброените обекти към индекса" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "задаване на флаг, че файлът не се променя" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "изчистване на флага, че файлът не се променя" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "задаване на флаг, че файловете са само за индекса" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" -msgstr "изчистване на флага, че файловете са само за индекса" +msgstr "изчистване на флага, че файловете са само за индекса" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "без промяна на файловете само за индекса" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "добавяне само към индекса без добавяне към базата от данни за обектите" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" "при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия " "байт" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "изчитане на списъка с пътища за обновяване от стандартния вход" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "добавяне на елементите от стандартния вход към индекса" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "възстановяване на състоянието преди сливане или нужда от обновяване за " "изброените пътища" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "игнориране на файловете, които липсват в работното дърво" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "извеждане на действията на стандартния изход" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "забравяне на записаната информация за неразрешени конфликти — за командите " "от потребителско ниво" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "записване на индекса в този формат" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "включване или изключване на разделянето на индекса" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "включване/изключване на кеша за неследените файлове" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "проверка дали файловата система поддържа кеш за неследени файлове" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "" "включване на кеша за неследените файлове без проверка на файловата система" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "запис на индекса, дори да не е отбелязан като променен" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "включване или изключване на наблюдението на файловата система" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "отбелязване на файловете, че могат да се следят чрез файловата система" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "изчистване на флага за следенето чрез файловата система" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -22219,7 +21021,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „false“ (лъжа). Сменете я или я " "изтрийте, за да включите разделянето на индекса" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -22227,7 +21029,7 @@ msgstr "" "Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или " "я изтрийте, за да изключите разделянето на индекса." -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -22235,11 +21037,11 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я " "или я изтрийте, за да изключите кеша за неследените файлове" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Кешът за неследените файлове е изключен" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -22247,29 +21049,29 @@ msgstr "" "Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я " "или я изтрийте, за да включите кеша за неследените файлове" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кешът за неследените файлове е включен за „%s“" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите " "следенето чрез файловата система." -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "следенето чрез файловата система е включено" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите " "следенето чрез файловата система." -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "следенето чрез файловата система е изключено" @@ -22364,56 +21166,56 @@ msgstr "git verify-tag [-v | --verbose] [--format=ФОРМАТ] ЕТИКЕТ…" msgid "print tag contents" msgstr "извеждане на съдържанието на ЕТИКЕТи" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [ОПЦИЯ…]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [ОПЦИЯ…]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock [ПЪТ]" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "неуспешно изтриване на „%s“" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -22422,37 +21224,37 @@ msgstr "" "Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното " "(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо " "местоположение" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "докладване на окастрените работни дървета" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "„%s“ вече съществува" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "дървото „%s“ не може да бъде добавено наново" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -22462,7 +21264,7 @@ msgstr "" "За изрично задаване ползвайте „add -f“, а за изчистване — „prune“ или " "„remove“" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22472,125 +21274,125 @@ msgstr "" "За изрично задаване ползвайте „add -f“, а за изчистване — „prune“ или " "„remove“" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "директорията „%s“ не може да бъде създадена" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Приготвяне на работното дърво (нов клон „%s“)" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към " "„%s“)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Приготвяне на работното дърво (изтегляне на „%s“)" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "създаване на нов клон" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "създаване или зануляване на клони" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "подготвяне на новото работно дърво" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "новото работно дърво да остане заключено" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "задаване на режима на следене (виж git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "опит за напасване на името на новия клон с това на следящ клон" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "„--[no-]track“ може да се използва само при създаването на нов клон" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "причина за заключване" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "„%s“ не е работно дърво" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "Основното дърво не може да се отключи или заключи" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "„%s“ вече е заключено, защото „%s“" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "„%s“ вече е заключено" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "„%s“ не е заключено" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "не може да местите или изтривате работни дървета, в които има подмодули" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "" "принудително преместване, дори работното дърво да не е чисто или да е " "заключено" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "„%s“ е основно работно дърво" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "името на целта не може да се определи от „%s“" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "целта „%s“ вече съществува" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22599,7 +21401,7 @@ msgstr "" "не може да преместите заключено работно дърво, причина за заключването: %s\n" "или го отключете, или го преместете принудително с „move -f -f“" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22607,41 +21409,41 @@ msgstr "" "не може да преместите заключено работно дърво:\n" "или го отключете, или го преместете принудително с „move -f -f“" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" "проверките са неуспешни, работното дърво не може да бъде преместено: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "„%s“ не може да се премести в „%s“" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "не може да изпълни „git status“ върху „%s“" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" +msgid "'%s' is dirty, use --force to delete it" msgstr "" -"„%s“ съдържа променени или нови файлове, за принудително изтриване е " -"необходима опцията „--force“" +"работното дърво „%s“ не е чисто, за принудително изтриване е необходима " +"опцията „--force“ " -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" "командата „git status“ не може да се изпълни за „%s“, код за грешка: %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "" "принудително изтриване, дори работното дърво да не е чисто или да е заключено" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22650,7 +21452,7 @@ msgstr "" "не може да изтриете заключено работно дърво, причина за заключването: %s\n" "или го отключете, или го изтрийте принудително с „remove -f -f“" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22658,7 +21460,7 @@ msgstr "" "не може да изтриете заключено работно дърво:\n" "или го отключете, или го изтрийте принудително с „remove -f -f“" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s" @@ -22679,21 +21481,6 @@ msgstr "запис на обект-дърво за поддиректорият msgid "only useful for debugging" msgstr "само за изчистване на грешки" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "очаква се команда „mark“, а бе получена: „%s“" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "очаква се команда „to“, а бе получена: „%s“" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22757,7 +21544,10 @@ msgstr "" "въведения. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а " "за\n" "някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“. За преглед на\n" -"системата за помощ използвайте „git help git“." +"системата за помощ използвайте „git help git“.\n" +"\n" +"Български превод на книгата „Pro Git“ от Чакън и Страуб:\n" +"http://i-can.eu/progit2-bg/progit.html" #: git.c:186 #, c-format @@ -22808,25 +21598,25 @@ msgstr "" "псевдонимът „%s“ променя променливи на средата.\n" "За това може да ползвате „!git“ в псевдонима" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "празен псевдоним за „%s“" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "зациклен псевдоним: „%s“" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "грешка при запис на стандартния изход" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "неизвестна грешка при запис на стандартния изход" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "грешка при затваряне на стандартния изход" @@ -22883,26 +21673,26 @@ msgstr "„CURLSSLOPT_NO_REVOKE“ не се поддържа от cURL < 7.44.0 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Ограничаването на протоколите не се поддържа от cURL < 7.44.0" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Реализацията на SSL не може да се зададе да е „%s“: cURL е компилиран без " "поддръжка на SSL" -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" "Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена " "друга" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22913,167 +21703,156 @@ msgstr "" " ● заявен адрес: %s\n" " ● пренасочване: %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" "неправилно екраниране или цитиране в стойността към опция за изтласкване: " "„%s“" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "" "неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ " "пакет „flush“" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "неправилен отговор от сървъра, бе получено: „%s“" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "хранилището „%s“ липсва" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "Неуспешна идентификация към „%s“" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "няма достъп до „%s“: %s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "пренасочване към „%s“" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "получен е EOF, в режим без поддръжка за това" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "данните за POST не могат да се прочетат наново, пробвайте да увеличите " "настройката „http.postBuffer“" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "Неуспешно отдалечено извикване. %s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "толкова големи изтласквания не може да се изпълнят" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" "заявката не може да бъде декомпресирана, грешка от „zlib“ при " "декомпресиране: %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" "заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "опростеният транспорт по http не поддържа плитки клиенти" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "неуспешно доставяне." -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "умният вариант на http не може да доставя по SHA1" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "транспортът по http не поддържа „%s“" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "неуспешно изпълнение на „git-http-push“" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: грешка при изчитането на потока команди от git" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: опит за доставяне без локално хранилище" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: непозната команда „%s“ от git" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "АРГУМЕНТИ" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "филтриране по вид на обекта" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "период на валидност/запазване" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "нулева операция (за съвместимост с предишни версии)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "повече подробности" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "по-малко подробности" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да се махат от съобщенията" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "изчитане на пътищата от ФАЙЛ" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" -"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия " -"знак „NUL“" - #: ref-filter.h:101 msgid "key" msgstr "КЛЮЧ" @@ -23598,171 +22377,163 @@ msgid "Common Git shell script setup code" msgstr "Настройки на Git за скриптовете на обвивката" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Инициализиране и промяна на частичното изтегляне" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Скатаване на неподадените промени в работното дърво" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Добавяне на съдържанието на файла към индекса" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Извеждане на състоянието на работното дърво" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Премахване на излишните знаци за интервали" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Инициализиране, обновяване или разглеждане на подмодули" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Двупосочна работа между хранилища под Subversion и Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Преминаване към друг клон" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Извеждане, промяна и изтриване на символни указатели" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Разпакетиране на обекти от пакетиран архив" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "Безопасно обновяване на името на обект в указател" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Обновяване на файла с допълнителна информация в помощ на опростените сървъри" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Изпращане на архива обратно към „git-archive“" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Извеждане на логическа променлива на Git" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Проверка на подписите GPG върху подаванията" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Проверка на пакетираните архивни файлове на Git" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Проверка на подписите GPG върху етикетите" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Уеб интерфейс на Git" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Извеждане на журнал с разликите, въведени с всяко подаване" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Управление на множество работни дървета" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Създаване на обект-дърво от текущия индекс" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Указване на атрибути към път" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Команден ред и конвенции на Git" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Въвеждащ урок в Git за разработчици" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git за потребители на CVS" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Настройване на изгледа на разликите" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Полезен минимален набор от команди за ежедневната работа с Git" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Речник с термините на Git" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Куки на Git" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Дефиниране на свойствата на подмодулите" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Пространства от имена на Git" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Устройство на хранилището на Git" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Указване на версии и диапазони в Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Монтиране на едно хранилище в друго" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Въвеждащ урок за Git: втора част" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Въвеждащ урок за Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Общ преглед на препоръчваните начини за работа с Git" @@ -23891,138 +22662,149 @@ msgstr "Опит за просто сливане с „$pretty_name“" msgid "Simple merge did not work, trying automatic merge." msgstr "Простото сливане не сработи, пробва се автоматично сливане." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Временният индекс не може да бъде изтрит" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" "Указателят „${ref_stash}“ не може да бъде обновен да сочи към „${w_commit}“" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "ГРЕШКА: командата „stash push“ не приема опцията „$option“" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" "Състоянието на работната директория и индекса са запазени: „$stash_msg“" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "непозната опция: ${opt}" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Указани са прекалено много версии: „${REV}“" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "Указателят „${reference}“ е грешен" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "„${args}“ не е подаване, приличащо на нещо скатано" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "„${args}“ не е указател към нещо скатано" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "индексът не може да бъде обновен" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "По време на сливане не може да приложите нещо скатано" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "" "В индекса има конфликти. Пробвайте да изпълните командата без опцията „--" "index“." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Дървото сочено от индекса не може да бъде запазено" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "Неследени файлове не могат да се възстановят от скатаното" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Променените файлове не могат да бъдат извадени от индекса" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Изтрито е скатаното „${REV}“ ($s)" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "Скатаното „${REV}“ не може да бъде изтрито" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Относителен път може да се ползва само от основната директория на работното " "дърво" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с " "„./“ или „../“" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "„${sm_path}“ вече съществува в индекса" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "в „${sm_path}“ не е изтеглено подаване" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Следният път се игнорира поради някой от файловете „.gitignore“:\n" +"${sm_path}\n" +"Използвайте опцията „-f“, ако за да го добавите наистина." + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "„${sm_path}“ съществува, а не е хранилище на Git" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Открита е локална директория на Git — „${sm_name}“, която сочи към " "отдалечените хранилища:" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -24039,37 +22821,37 @@ msgstr "" "правилното хранилище или ако не знаете какво означава това, използвайте\n" "друго име като аргумент към опцията „--name“." -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново." -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Неуспешно добавяне на подмодула „${sm_path}“" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Неуспешно регистриране на подмодула „${sm_path}“" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Текущата версия за подмодула в „${displaypath}“ липсва" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -24078,7 +22860,7 @@ msgstr "" "Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ " "липсва" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -24087,7 +22869,7 @@ msgstr "" "Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно " "доставяне на „${sha1}“" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24096,80 +22878,80 @@ msgstr "" "Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n" "„${sha1}“. Директното доставяне на това подаване е неуспешно." -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул " "„${displaypath}“" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "Опциите „--cached“ и „--files“ са несъвместими" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неочакван режим „${mod_dst}“" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" " ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -24496,10 +23278,6 @@ msgstr[0] "" msgstr[1] "" "Пребазиране на $shortrevisions върху $shortonto ($todocount команди)" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Празните подавания са коментирани" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Списъкът с презаписаните подавания не може да бъде създаден" @@ -24572,19 +23350,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Абсолютният път на работното дърво не може да се определи" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%14s %14s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "в индекса" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "извън индекса" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "двоично" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "нищо" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "няма промени" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "%d файл добавен\n" +msgstr[1] "%d файла добавени\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "%d файл обновен\n" +msgstr[1] "%d файла обновени\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "%d файл с отменени промени\n" +msgstr[1] "%d файла с отменени промени\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d файл засегнат\n" msgstr[1] "%d файла засегнати\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Обновяване" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Отмяна" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Добавяне на неследени" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "Няма неследени файлове.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24593,7 +23433,7 @@ msgstr "" "незабавно\n" "добавено към индекса" -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24602,7 +23442,7 @@ msgstr "" "незабавно\n" "скътано" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24611,8 +23451,8 @@ msgstr "" "незабавно\n" "извадено от индекса." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24621,8 +23461,8 @@ msgstr "" "незабавно\n" "набелязано за прилагане." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24631,12 +23471,16 @@ msgstr "" "незабавно\n" "набелязано за зануляване." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -24650,13 +23494,38 @@ msgstr "" "За да пропуснете редовете започващи с „%s“ — изтрийте ги.\n" "Редовете, които започват с „%s“ ще бъдат пропуснати.\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Ако е невъзможно чисто прилагане на кода, ще може пак да редактирате. Ако\n" +"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n" +"редактирането — отказано.\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" "файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Редактираното парче не може да се приложи. Да се продължи ли с " +"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ " +"„n“ (не)? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24670,7 +23539,7 @@ msgstr "" "a — добавяне на това и всички следващи парчета от файла в индекса\n" "d — без добавяне на това и всички следващи парчета от файла в индекса" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24684,7 +23553,7 @@ msgstr "" "a — скатаване на това и всички следващи парчета от файла\n" "d — без скатаване на това и всички следващи парчета от файла" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24698,7 +23567,7 @@ msgstr "" "a — изваждане на това и всички следващи парчета от файла от индекса\n" "d — без изваждане на това и всички следващи парчета от файла от индекса" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24712,7 +23581,7 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла към индекса\n" "d — без прилагане на това и всички следващи парчета от файла към индекса" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24729,7 +23598,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от работното " "дърво" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24746,7 +23615,7 @@ msgstr "" "d — без премахване на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24763,7 +23632,7 @@ msgstr "" "d — без прилагане на това и всички следващи парчета от файла от индекса и " "работното дърво" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24777,7 +23646,7 @@ msgstr "" "a — прилагане на това и всички следващи парчета от файла\n" "d — без прилагане на това и всички следващи парчета от файла" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24799,87 +23668,237 @@ msgstr "" "e — ръчно редактиране на текущото парче\n" "? — извеждане не помощта\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Избраните парчета не могат да се добавят в индекса!\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "Да се приложат ли към работното дърво? " + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "Нищо не е приложено.\n" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "пренебрегване на неслятото: „%s“\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Само двоични файлове са променени.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Няма промени.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Обновяване на кръпка" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "" +"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d" +"%s,?]? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Премахване на промяната в правата за достъп от индекса и работното дърво [y," +"n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n," +"q,a,d%s,?]? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d" "%s,?]? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Няма други парчета\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "към кое парче да се придвижи? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Неправилен номер: „%s“\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Има само %d парче.\n" msgstr[1] "Има само %d парчета.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "Няма други парчета за търсене\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "да се търси с регулярен израз? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Сгрешен регулярен израз „%s“: %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Никое парче не напасва на регулярния израз\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Няма друго парче преди това\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Няма друго парче след това\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Това парче не може да бъде разделено\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Разделяне на %d парче.\n" msgstr[1] "Разделяне на %d парчета.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Това парче не може да бъде редактирано\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Преглед на разликата" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24900,19 +23919,19 @@ msgstr "" " и индекса\n" "add untracked — добавяне на неследените файлове към промените в индекса\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "„--“ липсва" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "неизвестна стратегия за прилагане на кръпка: „%s“" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "указан е неправилен аргумент „%s“, а се очаква „--“." diff --git a/third_party/git/po/ca.po b/third_party/git/po/ca.po index e324c80551..73a08242c3 100644 --- a/third_party/git/po/ca.po +++ b/third_party/git/po/ca.po @@ -1,7 +1,7 @@ # Catalan translations for Git. # This file is distributed under the same license as the Git package. # Alex Henrie <alexhenrie24@gmail.com>, 2014-2016. -# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2020 +# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2019 # # Terminologia i criteris utilitzats # @@ -49,8 +49,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-12-30 08:48+0800\n" -"PO-Revision-Date: 2020-01-09 10:10+0100\n" +"POT-Creation-Date: 2019-07-30 09:59+0800\n" +"PO-Revision-Date: 2019-07-30 08:23+0200\n" "Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -58,464 +58,39 @@ 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 2.2.4\n" +"X-Generator: Poedit 2.2.1\n" -#: add-interactive.c:347 -#, c-format -msgid "Huh (%s)?" -msgstr "Perdó (%s)?" - -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 -#: builtin/rebase.c:2019 builtin/rebase.c:2063 -msgid "could not read index" -msgstr "no s'ha pogut llegir l'índex" - -#: add-interactive.c:555 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "binari" - -#: add-interactive.c:613 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "res" - -#: add-interactive.c:614 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "sense canvis" - -#: add-interactive.c:651 git-add--interactive.perl:643 -msgid "Update" -msgstr "Actualitza" - -#: add-interactive.c:668 add-interactive.c:856 -#, c-format -msgid "could not stage '%s'" -msgstr "no s'ha pogut fer «stage» «%s»" - -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 -#: builtin/rebase.c:895 -msgid "could not write index" -msgstr "no s'ha pogut escriure l'índex" - -#: add-interactive.c:677 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "actualitzat %d camí\n" -msgstr[1] "actualitzats %d camins\n" - -#: add-interactive.c:695 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "nota: %s està ara sense seguiment.\n" - -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry ha fallat per al camí «%s»" - -#: add-interactive.c:730 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Reverteix" - -#: add-interactive.c:746 -msgid "Could not parse HEAD^{tree}" -msgstr "No s'ha pogut analitzar HEAD^{tree}" - -#: add-interactive.c:784 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "revertit %d camí\n" -msgstr[1] "revertits %d camins\n" - -#: add-interactive.c:835 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "Sense fitxers no seguits.\n" - -#: add-interactive.c:839 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "Afegeix sense seguiment" - -#: add-interactive.c:866 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "afegit %d camí\n" -msgstr[1] "afegits %d camins\n" - -#: add-interactive.c:896 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "s'està ignorant allò no fusionat: %s" - -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Només s'han canviat els fitxers binaris.\n" - -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Sense canvis.\n" - -#: add-interactive.c:914 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Actualització del pedaç" - -#: add-interactive.c:953 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Reviseu les diferències" - -#: add-interactive.c:981 -msgid "show paths with changes" -msgstr "mostra els camins amb canvis" - -#: add-interactive.c:983 -msgid "add working tree state to the staged set of changes" -msgstr "" - -#: add-interactive.c:985 -msgid "revert staged set of changes back to the HEAD version" -msgstr "" - -#: add-interactive.c:987 -msgid "pick hunks and update selectively" -msgstr "selecciona els trossos i actualitza selectivament" - -#: add-interactive.c:989 -msgid "view diff between HEAD and index" -msgstr "visualitza les diferències entre HEAD i l'índex" - -#: add-interactive.c:991 -msgid "add contents of untracked files to the staged set of changes" -msgstr "" - -#: add-interactive.c:999 add-interactive.c:1048 -msgid "Prompt help:" -msgstr "Mostra ajuda:" - -#: add-interactive.c:1001 -msgid "select a single item" -msgstr "seleccioneu un únic ítem" - -#: add-interactive.c:1003 -msgid "select a range of items" -msgstr "seleccioneu un rang d'ítems" - -#: add-interactive.c:1005 -msgid "select multiple ranges" -msgstr "seleccioneu rangs múltiples" - -#: add-interactive.c:1007 add-interactive.c:1052 -msgid "select item based on unique prefix" -msgstr "seleccioneu un ítem basant-se en un prefix únic" - -#: add-interactive.c:1009 -msgid "unselect specified items" -msgstr "desselecciona els ítems especificats" - -#: add-interactive.c:1011 -msgid "choose all items" -msgstr "escolliu tots els ítems" - -#: add-interactive.c:1013 -msgid "(empty) finish selecting" -msgstr "(buit) finalitza la selecció" - -#: add-interactive.c:1050 -msgid "select a numbered item" -msgstr "seleccioneu un ítem numerat" - -#: add-interactive.c:1054 -msgid "(empty) select nothing" -msgstr "(buit) no seleccionis res" - -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Ordres ***" - -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "I ara què" - -#: add-interactive.c:1115 git-add--interactive.perl:213 -msgid "staged" -msgstr "staged" - -#: add-interactive.c:1115 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "unstaged" - -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 -msgid "path" -msgstr "camí" - -#: add-interactive.c:1122 -msgid "could not refresh index" -msgstr "no s'ha pogut actualitzar l'índex" - -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Adéu.\n" - -#: add-patch.c:15 -#, c-format -msgid "Stage mode change [y,n,a,q,d%s,?]? " -msgstr "Canvia el mode de «stage» [y,n,a,q,d%s,?]? " - -#: add-patch.c:16 -#, c-format -msgid "Stage deletion [y,n,a,q,d%s,?]? " -msgstr "Suprimeix «stage» [y,n,a,q,d%s,?]? " - -#: add-patch.c:17 -#, c-format -msgid "Stage this hunk [y,n,a,q,d%s,?]? " -msgstr "Fer un «stage» d'aquest tros [y,n,a,q,d%s,?]? " - -#: add-patch.c:111 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "no s'ha pogut analitzar la capçalera del tros «%.*s»" - -#: add-patch.c:130 add-patch.c:134 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "no s'ha pogut analitzar la capçalera del tros acolorida «%.*s»" - -#: add-patch.c:176 -msgid "could not parse diff" -msgstr "no s'ha pogut analitzar el diff" - -#: add-patch.c:194 -msgid "could not parse colored diff" -msgstr "no s'ha pogut analitzar el diff acolorit" - -#: add-patch.c:508 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"s'esperava la línia amb contingut #%d a\n" -"%.*s" - - -#: add-patch.c:523 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" - -#: add-patch.c:799 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" -"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" - -#: add-patch.c:803 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"Per suprimir «%c» línies, convertiu-les a ' ' (context).\n" -"Per suprimir «%c» línies, suprimiu-les.\n" -"Les línies que comencin per %c seran suprimides.\n" - -#: add-patch.c:810 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging.\n" -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per «staging».\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:818 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n" -"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició " -"s'avorta\n" -"i el tros es deixa sense cap canvi.\n" - -#: add-patch.c:851 -msgid "could not parse hunk header" -msgstr "no s'ha pogut analitzar la capçalera del tros" - -#: add-patch.c:895 add-patch.c:1294 -msgid "'git apply --cached' failed" -msgstr "" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:952 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es " -"descartarà) [y/n]? " - -#: add-patch.c:1009 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this and all the remaining hunks\n" -"d - do not stage this hunk nor any of the remaining hunks\n" -msgstr "" -"y - fes «stage» d'aquest tros\n" -"n - no facis «stage» d'aquest tros\n" -"q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" -"a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n" -"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer\n" - -#: add-patch.c:1016 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n" -"J - deixa aquest tros sense decidir, veure el tros següent\n" -"k - deixa aquest tros sense decidir, veure el tros sense decidir anterior\n" -"K - deixa aquest tros sense decidir, veure el tros anterior\n" -"g - selecciona el tros on voleu anar\n" -"/ - cerca un tros que coincideixi amb l'expressió regular donada\n" -"s - divideix el tros actual en trossos més petits\n" -"e - edita manualment el tros actual\n" -"? - mostra l'ajuda\n" - -#: add-patch.c:1137 add-patch.c:1147 -msgid "No previous hunk" -msgstr "Sense tros previ" - -#: add-patch.c:1142 add-patch.c:1152 -msgid "No next hunk" -msgstr "No hi ha tros següent" - -#: add-patch.c:1158 -msgid "No other hunks to goto" -msgstr "No hi ha altres trossos on anar-hi" - -#: add-patch.c:1169 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "vés a quin tros (<ret> per veure'n més)? " - -#: add-patch.c:1170 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "vés a quin tros? " - -#: add-patch.c:1181 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Número no vàlid: «%s»" - -#: add-patch.c:1186 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Només %d tros disponible." -msgstr[1] "Només %d trossos disponibles." - -#: add-patch.c:1195 -msgid "No other hunks to search" -msgstr "No hi ha cap altre tros a cercar" - -#: add-patch.c:1201 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "cerca per expressió regular? " - -#: add-patch.c:1216 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Expressió regular de cerca mal formada %s: %s" - -#: add-patch.c:1233 -msgid "No hunk matches the given pattern" -msgstr "No hi ha trossos que coincideixin amb el patró donat" - -#: add-patch.c:1240 -msgid "Sorry, cannot split this hunk" -msgstr "No es pot dividir aquest tros" - -#: add-patch.c:1244 -#, c-format -msgid "Split into %d hunks." -msgstr "Divideix en %d trossos." - -#: add-patch.c:1248 -msgid "Sorry, cannot edit this hunk" -msgstr "No es pot editar aquest tros" - -#: advice.c:111 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%spista: %.*s%s\n" -#: advice.c:164 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar." -#: advice.c:166 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no és possible perquè teniu fitxers sense fusionar." -#: advice.c:168 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:170 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:172 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#: advice.c:174 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No és possible %s perquè teniu fitxers sense fusionar." -#: advice.c:182 +#: advice.c:180 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." @@ -524,23 +99,23 @@ msgstr "" "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n" "resolució i feu una comissió." -#: advice.c:190 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:195 builtin/merge.c:1332 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." -#: advice.c:197 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Cometeu els vostres canvis abans de fusionar." -#: advice.c:198 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." -#: advice.c:204 +#: advice.c:202 #, fuzzy, c-format msgid "" "Note: switching to '%s'.\n" @@ -562,7 +137,7 @@ msgid "" "false\n" "\n" msgstr "" -"Avís: s'està canviant a «%s».\n" +"Avís: s'està agafant «%s».\n" "\n" "Esteu en un estat de «HEAD separat». Podeu mirar al voltant, fer canvis\n" "experimentals i cometre'ls, i podeu descartar qualsevol comissió que feu\n" @@ -663,7 +238,17 @@ msgstr "mode no vàlid en la línia %d: %s" msgid "inconsistent header lines %d and %d" msgstr "línies de capçalera %d i %d inconsistents" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recompte: línia inesperada: %.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -678,93 +263,83 @@ msgstr[1] "" "a la capçalera de git diff li manca informació de nom de fitxer en eliminar " "%d components de nom de camí inicial (línia %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "a la capçalera de git diff li manca informació de nom de fitxer (línia %d)" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recompte: línia inesperada: %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "pedaç malmès a la línia %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** advertència: el fitxer %s queda buit però no se suprimeix" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la línia %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la línia %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la línia %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de línia no vàlid: «%c»" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)." msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)." -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -773,23 +348,23 @@ msgstr "" "tot cercant:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de «%s»" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa" -#: apply.c:3162 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -797,284 +372,289 @@ msgstr "" "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts " "actuals." -#: apply.c:3170 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el pedaç s'aplica a un «%s» buit però no és buit" -#: apply.c:3188 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "no es pot llegir la postimatge %s necessària per a «%s»" -#: apply.c:3201 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a «%s»" -#: apply.c:3207 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha " "rebut %s)" -#: apply.c:3228 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: apply.c:3351 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" -#: apply.c:3411 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic" -#: apply.c:3440 apply.c:3683 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: apply.c:3526 apply.c:3698 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: apply.c:3535 apply.c:3706 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: apply.c:3570 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." -#: apply.c:3573 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "S'està retrocedint a una fusió de 3 vies...\n" -#: apply.c:3589 apply.c:3593 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no es poden llegir els continguts actuals de «%s»" -#: apply.c:3605 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n" -#: apply.c:3619 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n" -#: apply.c:3624 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "S'ha aplicat el pedaç a «%s» netament.\n" -#: apply.c:3650 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" -#: apply.c:3723 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: apply.c:3725 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1320 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "camí no vàlid: «%s»" -#: apply.c:3934 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: apply.c:3937 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: apply.c:3957 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)" -#: apply.c:3962 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s" -#: apply.c:3982 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic" -#: apply.c:3986 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no s'aplica" -#: apply.c:4001 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "S'està comprovant el pedaç %s..." -#: apply.c:4093 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta la informació sha1 o és inútil per al submòdul %s" -#: apply.c:4100 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "canvi de mode per a %s, el qual no està en la HEAD actual" -#: apply.c:4103 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informació sha1 o és inútil (%s)." -#: apply.c:4112 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry ha fallat per al camí «%s»" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "no s'ha pogut afegir %s a l'índex temporal" -#: apply.c:4122 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "no s'ha pogut escriure l'índex temporal a %s" -#: apply.c:4260 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'índex" -#: apply.c:4294 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç malmès per al submòdul %s" -#: apply.c:4300 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»" -#: apply.c:4308 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " "%s" -#: apply.c:4314 apply.c:4459 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: apply.c:4357 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: apply.c:4361 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "s'està tancant el fitxer «%s»" -#: apply.c:4431 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer «%s» mode %o" -#: apply.c:4529 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: apply.c:4537 +#: apply.c:4526 msgid "internal error" msgstr "error intern" -#: apply.c:4540 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..." msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..." -#: apply.c:4551 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 +#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" -#: apply.c:4573 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: apply.c:4577 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4696 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omès el pedaç «%s»." -#: apply.c:4704 +#: apply.c:4684 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: apply.c:4724 +#: apply.c:4704 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: apply.c:4881 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç «%s»: %s" -#: apply.c:4908 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "s'ha silenciat %d error d'espai en blanc" msgstr[1] "s'han silenciat %d errors d'espai en blanc" -#: apply.c:4914 apply.c:4929 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línia afegeix errors d'espai en blanc." msgstr[1] "%d línies afegeixen errors d'espai en blanc." -#: apply.c:4922 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1083,135 +663,144 @@ msgstr[0] "" msgstr[1] "" "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." -#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'índex nou" -#: apply.c:4966 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "camí" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: apply.c:4969 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: apply.c:4971 builtin/am.c:2206 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "número" -#: apply.c:4972 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqües inicials dels camins de diferència " "tradicionals" -#: apply.c:4975 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:4977 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" -#: apply.c:4981 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" -#: apply.c:4983 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" -#: apply.c:4985 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: apply.c:4987 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: apply.c:4989 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4991 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:4993 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: apply.c:4996 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:4998 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: apply.c:5000 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el caràcter NUL" -#: apply.c:5005 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> línies de context coincideixin" -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 +#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 msgid "action" msgstr "acció" -#: apply.c:5007 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detecta les línies noves o modificades que tinguin errors d'espai en blanc" -#: apply.c:5010 apply.c:5013 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:5016 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:5018 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: apply.c:5020 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:5022 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:5025 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolera una línia nova incorrectament detectada al final del fitxer" -#: apply.c:5028 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos" -#: apply.c:5030 builtin/am.c:2194 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "arrel" -#: apply.c:5031 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" @@ -1234,7 +823,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer" @@ -1266,7 +855,7 @@ msgstr "format" msgid "archive format" msgstr "format d'arxiu" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1597 msgid "prefix" msgstr "prefix" @@ -1274,12 +863,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "fitxer" @@ -1312,7 +900,7 @@ msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "dipòsit" @@ -1320,7 +908,7 @@ msgstr "dipòsit" msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'arxiu del dipòsit remot <dipòsit>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "ordre" @@ -1351,66 +939,66 @@ msgstr "Format d'arxiu desconegut «%s»" msgid "Argument not supported for format '%s': -%d" msgstr "Paràmetre no admès per al format «%s»: -%d" -#: archive-tar.c:125 archive-zip.c:350 -#, c-format +#: archive-tar.c:125 archive-zip.c:345 +#, fuzzy, c-format msgid "cannot stream blob %s" -msgstr "no es pot transmetre el blob %s" +msgstr "no es pot emmagatzemar %s" -#: archive-tar.c:266 archive-zip.c:368 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:358 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "no es pot llegir «%s»" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "no s'ha pogut iniciar el filtre «%s»" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "no s'ha pogut redirigir el descriptor" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "«%s» error reportat pel filtre" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "el camí no és vàlid en UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s" -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: archive-zip.c:614 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no és un nom d'atribut vàlid" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no està permès: %s:%d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1538,41 +1126,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n" msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bé juntes." -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse i --first-parent-together requereixen una última comissió " "especificada" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980 +#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent junts requereixen un rang de la cadena de mares " "primeres" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camí %s en %s" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camí %s" @@ -1736,15 +1324,15 @@ msgstr "«%s» no sembla un fitxer de farcell v2" msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 -#: builtin/commit.c:811 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir «%s»" #: bundle.c:143 msgid "Repository lacks these prerequisite commits:" -msgstr "Al dipòsit li manquen aquestes comissions prerequerides:" +msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" #: bundle.c:146 msgid "need a repository to verify a bundle" @@ -1768,42 +1356,42 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "El farcell requereix aquesta referència:" msgstr[1] "El farcell requereix aquestes %d referències:" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "no s'ha pogut duplicar el descriptor del farcell" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "No s'ha pogut executar el pack-objects" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "El pack-objects s'ha mort" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "El rev-list s'ha mort" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "les opcions de la llista de revisions exclouen la referència «%s»" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "paràmetre no reconegut: %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "S'està refusant crear un farcell buit." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear «%s»" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "L'index-pack s'ha mort" @@ -1812,18 +1400,18 @@ msgstr "L'index-pack s'ha mort" msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s no és una comissió!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1835,27 +1423,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1152 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." -#: commit.c:1155 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s." -#: commit.c:1158 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té signatura GPG." -#: commit.c:1161 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#: commit.c:1415 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1866,266 +1454,245 @@ msgstr "" "la variable de configuració i18n.commitencoding a la codificació que\n" "usi el vostre projecte.\n" -#: commit-graph.c:130 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:195 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" -msgstr "" -"la signatura del graf de comissions %X no coincideix amb la signatura %X" +msgstr "la signatura del graf de comissions %X no coincideix amb la signatura %X" -#: commit-graph.c:202 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la versió del graf de comissions %X no coincideix amb la versió %X" -#: commit-graph.c:209 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "" -"la versió del hash del graf de comissions %X no coincideix amb la versió %X" +msgstr "la versió del hash del graf de comissions %X no coincideix amb la versió %X" -#: commit-graph.c:232 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:243 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:286 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:350 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:360 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "la cadena del graf de comissions no coincideix" -#: commit-graph.c:407 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:433 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "no es poden trobar tots els fitxers del graf de comissions" -#: commit-graph.c:564 commit-graph.c:624 +#: commit-graph.c:553 commit-graph.c:613 msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "" -"posició de la comissió no vàlida. Probablement el graf de comissions està " -"malmès" +msgstr "posició de la comissió no vàlida. Probablement el graf de comissions està malmès" -#: commit-graph.c:585 +#: commit-graph.c:574 #, c-format msgid "could not find commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: commit-graph.c:858 builtin/am.c:1287 -#, c-format -msgid "unable to parse commit %s" -msgstr "no s'ha pogut analitzar la comissió %s" - -#: commit-graph.c:1017 builtin/pack-objects.c:2641 +#: commit-graph.c:1001 builtin/pack-objects.c:2651 #, c-format msgid "unable to get type of object %s" msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s" -#: commit-graph.c:1049 +#: commit-graph.c:1033 msgid "Loading known commits in commit graph" msgstr "S'estan carregant comissions conegudes al graf de comissions" -#: commit-graph.c:1066 +#: commit-graph.c:1050 msgid "Expanding reachable commits in commit graph" msgstr "S'estan expandint les comissions abastables al graf de comissions" -#: commit-graph.c:1085 +#: commit-graph.c:1069 msgid "Clearing commit marks in commit graph" msgstr "S'estan netejant les marques de comissions al graf de comissions" -#: commit-graph.c:1104 +#: commit-graph.c:1088 msgid "Computing commit graph generation numbers" msgstr "S'estan calculant els nombres de generació del graf de comissions" -#: commit-graph.c:1179 +#: commit-graph.c:1162 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet" msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets" -#: commit-graph.c:1192 +#: commit-graph.c:1175 #, c-format msgid "error adding pack %s" msgstr "error en afegir paquet %s" -#: commit-graph.c:1196 +#: commit-graph.c:1179 #, c-format msgid "error opening index for %s" msgstr "s'ha produït un error en obrir l'índex per «%s»" -#: commit-graph.c:1220 +#: commit-graph.c:1203 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" -msgstr[0] "" -"S'estan cercant les comissions pel graf de comissions des de %d referència" -msgstr[1] "" -"S'estan cercant les comissions pel graf de comissions des de %d referències" - -#: commit-graph.c:1240 -#, c-format -msgid "invalid commit object id: %s" -msgstr "identificador d'objecte de comissió no vàlid: %s" +msgstr[0] "S'estan cercant les comissions pel graf de comissions des de %d referència" +msgstr[1] "S'estan cercant les comissions pel graf de comissions des de %d referències" -#: commit-graph.c:1255 +#: commit-graph.c:1237 msgid "Finding commits for commit graph among packed objects" -msgstr "" -"S'estan cercant les comissions pel graf de comissions entre els objectes " -"empaquetats" +msgstr "S'estan cercant les comissions pel graf de comissions entre els objectes empaquetats" -#: commit-graph.c:1270 +#: commit-graph.c:1252 msgid "Counting distinct commits in commit graph" -msgstr "S'estan comptant les comissions diferents al graf de comissions" +msgstr "S'estant comptant les comissions diferents al graf de comissions" -#: commit-graph.c:1300 +#: commit-graph.c:1283 msgid "Finding extra edges in commit graph" msgstr "S'estan cercant les vores addicionals al graf de comissions" -#: commit-graph.c:1346 +#: commit-graph.c:1331 msgid "failed to write correct number of base graph ids" -msgstr "" -"s'ha produït un error en escriure el nombre correcte d'ids base del graf" +msgstr "s'ha produït un error en escriure el nombre correcte d'ids base del graf" -#: commit-graph.c:1379 midx.c:814 +#: commit-graph.c:1364 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 #, c-format msgid "unable to create '%s'" msgstr "no s'ha pogut crear «%s»" -#: commit-graph.c:1451 +#: commit-graph.c:1436 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "S'està escrivint el graf de comissions en %d pas" msgstr[1] "S'està escrivint el graf de comissions en %d passos" -#: commit-graph.c:1492 +#: commit-graph.c:1477 msgid "unable to open commit-graph chain file" msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions" -#: commit-graph.c:1504 +#: commit-graph.c:1489 msgid "failed to rename base commit-graph file" msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions" -#: commit-graph.c:1524 +#: commit-graph.c:1509 msgid "failed to rename temporary commit-graph file" -msgstr "" -"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions" +msgstr "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions" -#: commit-graph.c:1635 +#: commit-graph.c:1620 msgid "Scanning merged commits" msgstr "S'estan escanejant les comissions fusionades" -#: commit-graph.c:1646 +#: commit-graph.c:1631 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de comissió duplicat %s no esperat" -#: commit-graph.c:1670 +#: commit-graph.c:1656 msgid "Merging commit-graph" msgstr "S'està fusionant el graf de comissions" -#: commit-graph.c:1860 +#: commit-graph.c:1842 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "el format del graf de comissions no pot escriure %d comissions" -#: commit-graph.c:1871 +#: commit-graph.c:1853 msgid "too many commits to write graph" msgstr "massa comissions per escriure un graf" -#: commit-graph.c:1961 +#: commit-graph.c:1943 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el fitxer commit-graph (graf de comissions) té una suma de verificació " "incorrecta i probablement és corrupte" -#: commit-graph.c:1971 +#: commit-graph.c:1953 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1981 commit-graph.c:1996 +#: commit-graph.c:1963 commit-graph.c:1978 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1988 +#: commit-graph.c:1970 #, c-format msgid "failed to parse commit %s from commit-graph" -msgstr "" -"s'ha produït un error en analitzar la comissió %s del graf de comissions" +msgstr "s'ha produït un error en analitzar la comissió %s del graf de comissions" -#: commit-graph.c:2006 +#: commit-graph.c:1987 msgid "Verifying commits in commit graph" msgstr "S'estan verificant les comissions al graf de comissions" -#: commit-graph.c:2020 +#: commit-graph.c:2000 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2027 +#: commit-graph.c:2007 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2037 +#: commit-graph.c:2017 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2046 +#: commit-graph.c:2026 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2059 +#: commit-graph.c:2039 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2064 +#: commit-graph.c:2044 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2068 +#: commit-graph.c:2048 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2083 +#: commit-graph.c:2063 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2089 +#: commit-graph.c:2069 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2158,281 +1725,288 @@ msgid "relative config include conditionals must come from files" msgstr "" "els condicionals d'inclusió de configuració relatius han de venir de fitxers" -#: config.c:376 +#: config.c:375 #, c-format msgid "key does not contain a section: %s" msgstr "la clau no conté una secció: «%s»" -#: config.c:382 +#: config.c:381 #, c-format msgid "key does not contain variable name: %s" msgstr "la clau no conté un nom de variable: «%s»" -#: config.c:406 sequencer.c:2530 +#: config.c:405 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "clau no vàlida: %s" -#: config.c:412 +#: config.c:411 #, c-format msgid "invalid key (newline): %s" msgstr "clau no vàlida (línea nova): %s" -#: config.c:448 config.c:460 +#: config.c:447 config.c:459 #, c-format msgid "bogus config parameter: %s" msgstr "paràmetre de configuració erroni: %s" -#: config.c:495 +#: config.c:494 #, c-format msgid "bogus format in %s" msgstr "format erroni a %s" -#: config.c:821 +#: config.c:820 #, c-format msgid "bad config line %d in blob %s" msgstr "línia de configuració %d errònia en el blob %s" -#: config.c:825 +#: config.c:824 #, c-format msgid "bad config line %d in file %s" msgstr "línia de configuració %d errònia en el fitxer %s" -#: config.c:829 +#: config.c:828 #, c-format msgid "bad config line %d in standard input" msgstr "línia de configuració %d errònia en l'entrada estàndard" -#: config.c:833 +#: config.c:832 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "línia de configuració %d errònia en el blob de submòdul %s" -#: config.c:837 +#: config.c:836 #, c-format msgid "bad config line %d in command line %s" msgstr "línia de configuració %d errònia en la línia d'ordres %s" -#: config.c:841 +#: config.c:840 #, c-format msgid "bad config line %d in %s" msgstr "línia de configuració %d errònia en %s" -#: config.c:978 +#: config.c:977 msgid "out of range" msgstr "fora de rang" -#: config.c:978 +#: config.c:977 msgid "invalid unit" msgstr "unitat no vàlida" -#: config.c:979 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor de configuració numèric erroni «%s» per «%s»: %s" -#: config.c:998 +#: config.c:997 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s" -#: config.c:1001 +#: config.c:1000 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s" -#: config.c:1004 +#: config.c:1003 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s" -#: config.c:1007 +#: config.c:1006 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul " "%s: %s" -#: config.c:1010 +#: config.c:1009 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: " "%s" -#: config.c:1013 +#: config.c:1012 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s" -#: config.c:1108 +#: config.c:1107 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»" -#: config.c:1117 +#: config.c:1116 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "«%s» per a «%s» no és una marca de temps vàlida" -#: config.c:1208 +#: config.c:1207 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1222 config.c:1233 +#: config.c:1221 config.c:1232 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib incorrecte %d" -#: config.c:1325 +#: config.c:1324 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1358 +#: config.c:1357 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no vàlid: %s" -#: config.c:1430 +#: config.c:1429 #, c-format msgid "malformed value for %s" msgstr "valor no vàlid per a %s" -#: config.c:1456 +#: config.c:1455 #, c-format msgid "malformed value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: config.c:1457 +#: config.c:1456 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1518 builtin/pack-objects.c:3394 +#: config.c:1517 builtin/pack-objects.c:3399 #, c-format msgid "bad pack compression level %d" msgstr "nivell de compressió de paquet %d Erroni" -#: config.c:1639 +#: config.c:1638 #, c-format msgid "unable to load config blob object '%s'" msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»" -#: config.c:1642 +#: config.c:1641 #, c-format msgid "reference '%s' does not point to a blob" msgstr "la referència «%s» no assenyala a un blob" -#: config.c:1659 +#: config.c:1658 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no s'ha pogut resoldre el blob de configuració: «%s»" -#: config.c:1689 +#: config.c:1688 #, c-format msgid "failed to parse %s" msgstr "s'ha produït un error en analitzar %s" -#: config.c:1745 +#: config.c:1744 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:2096 +#: config.c:2093 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: config.c:2266 +#: config.c:2263 #, c-format msgid "Invalid %s: '%s'" msgstr "%s no vàlid: «%s»" -#: config.c:2311 +#: config.c:2306 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte " +"«keep»" + +#: config.c:2332 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100" -#: config.c:2357 +#: config.c:2378 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres" -#: config.c:2359 +#: config.c:2380 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d" -#: config.c:2440 +#: config.c:2461 #, c-format msgid "invalid section name '%s'" msgstr "nom de secció no vàlid «%s»" -#: config.c:2472 +#: config.c:2493 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2501 +#: config.c:2522 #, c-format msgid "failed to write new configuration file %s" msgstr "no es pot escriure un nou fitxer de configuració %s" -#: config.c:2753 config.c:3077 +#: config.c:2774 config.c:3098 #, c-format msgid "could not lock config file %s" msgstr "no s'ha pogut blocar el fitxer de configuració %s" -#: config.c:2764 +#: config.c:2785 #, c-format msgid "opening %s" msgstr "s'està obrint %s" -#: config.c:2799 builtin/config.c:328 +#: config.c:2820 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "patró no vàlid: %s" -#: config.c:2824 +#: config.c:2845 #, c-format msgid "invalid config file %s" msgstr "fitxer de configuració no vàlid %s" -#: config.c:2837 config.c:3090 +#: config.c:2858 config.c:3111 #, c-format msgid "fstat on %s failed" msgstr "ha fallat «fstat» a %s" -#: config.c:2848 +#: config.c:2869 #, c-format msgid "unable to mmap '%s'" msgstr "no s'ha pogut fer «mmap» «%s»" -#: config.c:2857 config.c:3095 +#: config.c:2878 config.c:3116 #, c-format msgid "chmod on %s failed" msgstr "ha fallat chmod a %s" -#: config.c:2942 config.c:3192 +#: config.c:2963 config.c:3213 #, c-format msgid "could not write config file %s" msgstr "no s'ha pogut escriure el fitxer de configuració «%s»" -#: config.c:2976 +#: config.c:2997 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir «%s» a «%s»" -#: config.c:2978 builtin/remote.c:781 +#: config.c:2999 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desassignar «%s»" -#: config.c:3068 +#: config.c:3089 #, c-format msgid "invalid section name: %s" msgstr "nom de secció no vàlida: %s" -#: config.c:3235 +#: config.c:3256 #, c-format msgid "missing value for '%s'" msgstr "falta el valor per «%s»" @@ -2557,7 +2131,7 @@ msgstr "no s'ha pogut trobar %s (%s)" msgid "unknown port %s" msgstr "port desconegut %s" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»" @@ -2572,60 +2146,58 @@ msgstr "s'ha bloquejat el port estrany «%s»" msgid "cannot start proxy %s" msgstr "no s'ha pogut iniciar servidor intermediari «%s»" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "" -"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per " -"URL" +msgstr "no s'ha especificat un camí; vegeu «git help pull» per la sintaxis vàlida per URL" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "la variant «simple» d'ssh no és compatible amb -4" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "la variant «simple» d'ssh no és compatible amb -6" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "la variant «simple» d'ssh no permet definir el port" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" -msgstr "s'ha bloquejat el nom de fitxer estrany «%s»" +msgstr "s'ha bloquejat el nom de fitxer extrany «%s»" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "no s'ha pogut bifurcar" -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "S'està comprovant la connectivitat" -#: connected.c:101 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "No s'ha pogut executar 'git rev-list'" -#: connected.c:121 +#: connected.c:118 msgid "failed write to rev-list" msgstr "escriptura fallada al rev-list" -#: connected.c:128 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "s'ha produït un error en tancar l'stdin del rev-list" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" -msgstr "CRLF es reemplaçà per LF en %s" +msgstr "CRLF es reemplaçà per LF en %s." -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2633,14 +2205,14 @@ msgid "" msgstr "" "CRLF serà reemplaçat per LF en %s.\n" "El fitxer tindrà els seus terminadors de línia originals en el vostre " -"directori de treball" +"directori de treball." -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF es reemplaçà per LF en %s" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2648,18 +2220,18 @@ msgid "" msgstr "" "LF serà reemplaçat per CRLF en %s.\n" "El fitxer tindrà els seus terminadors de línia originals en el vostre " -"directori de treball" +"directori de treball." -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" #: convert.c:304 @@ -2674,117 +2246,117 @@ msgid "" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "s'ha produït un error en codificar «%s» des de %s a %s" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no es pot bifurcar per a executar el filtre extern «%s»" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "no es pot alimentar l'entrada al filtre extern «%s»" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "el filtre extern «%s» ha fallat %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "la lectura del filtre extern «%s» ha fallat" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "el filtre extern «%s» ha fallat" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "tipus de filtre inesperat" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: el filtre de netejat «%s» ha fallat" -#: convert.c:1489 +#: convert.c:1476 #, fuzzy, c-format msgid "%s: smudge filter %s failed" msgstr "s'ha produït un error en actualitzar els fitxers" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "en el futur" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "fa %<PRIuMAX> segon" msgstr[1] "fa %<PRIuMAX> segons" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "fa %<PRIuMAX> minut" msgstr[1] "fa %<PRIuMAX> minuts" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "fa %<PRIuMAX> hora" msgstr[1] "fa %<PRIuMAX> hores" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "fa %<PRIuMAX> dia" msgstr[1] "fa %<PRIuMAX> dies" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "fa %<PRIuMAX> setmana" msgstr[1] "fa %<PRIuMAX> setmanes" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "fa %<PRIuMAX> mes" msgstr[1] "fa %<PRIuMAX> mesos" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2792,14 +2364,14 @@ msgstr[0] "%<PRIuMAX> any" msgstr[1] "%<PRIuMAX> anys" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "fa %s i %<PRIuMAX> mes" msgstr[1] "fa %s i %<PRIuMAX> mesos" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2838,7 +2410,7 @@ msgstr "Marcades %d illes, fet.\n" msgid "failed to read orderfile '%s'" msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "S'està realitzant una detecció inexacta de canvis de nom" @@ -2854,6 +2426,7 @@ msgstr "" "No és un dipòsit Git. Useu --no-index per a comparar dos camins fora del " "directori de treball" + #: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" @@ -2902,35 +2475,35 @@ msgstr "" "S'han trobat errors en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check i -s són mútuament excloents" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S and --find-object són mútuament excloents" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:4676 -#, c-format +#: diff.c:4689 +#, c-format msgid "invalid --stat value: %s" msgstr "valor --stat no vàlid: %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numèric" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2939,498 +2512,499 @@ msgstr "" "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconegut després de ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "no s'ha pogut resoldre «%s»" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperava un caràcter, s'ha rebut «%s»" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "paràmetre --color-moved incorrecte: %s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode «%s» no vàlid en -color-moved-ws" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»" +"l'opció diff-algorithm accepta «myers», «minimalminimal», \"patience\" and " +"«histogram»" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "argument no vàlid a %s" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" "s'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "paràmetre --word-diff incorrecte: %s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Opcions del format de sortida del diff" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "generant pedaç" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:182 msgid "suppress diff output" msgstr "omet la sortida de diferències" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "genera diffs amb <n> línies de context" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "genera el diff en format cru" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "sinònim de per a «-p --raw»" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "sinònim de per a «-p --stat»" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "llegible per màquina --stat" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "mostra només l'última línia de --stat" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "sinònim per -dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinònim per --dirstat=files,param1,param2..." -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "mostra només els noms de fitxers canviats" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "mostra només els noms i l'estat dels fitxers canviats" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<amplada>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "genera diffstat amb una amplada donada" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "genera diffstat amb un nom d'amplada donat" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "genera diffstat amb una amplada de graf donada" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<comptador>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "genera diffstat amb línies limitades" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "genera un resum compacte a diffstat" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "diff amb sortida binaria que pot ser aplicada" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "mostra un diff amb colors" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "afegir un prefix addicional per a cada línia de sortida" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "no mostris cap prefix d'origen o destí" -#: diff.c:5358 +#: diff.c:5371 #, fuzzy msgid "show context between diff hunks up to the specified number of lines" msgstr "Crea un clon superficial truncat al nombre de revisions especificat" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<char>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" -msgstr "" -"especifiqueu el caràcter per a indicar una línia nova en comptes de «+»" +msgstr "especifiqueu el caràcter per a indicar una línia nova en comptes de «+»" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" -msgstr "" -"especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»" +msgstr "especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "especifiqueu el caràcter per a indicar context en comptes de « »" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Opcions de canvi de nom del diff" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" -msgstr "" -"divideix els canvis de reescriptura completa en parells de suprimir i crear" +msgstr "divideix els canvis de reescriptura completa en parells de suprimir i crear" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "detecta els canvis de noms" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "omet les preimatges per les supressions" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "detecta còpies" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "usa els fitxers no modificats com a font per trobar còpies" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "inhabilita la detecció de canvis de nom" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "usa els blobs buits com a font de canvi de nom" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" -msgstr "" -"continua llistant l'històric d'un un fitxer més enllà dels canvis de nom" +msgstr "continua llistant l'històric d'un un fitxer més enllà dels canvis de nom" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Opcions d'algorisme Diff" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "produeix el diff més petit possible" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignora els espai en blanc en comparar línies" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignora els canvis en la quantitat d'espai en blanc" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignora els canvis d'espai en blanc al final de la línia" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignora els retorns de línia al final de la línia" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignora els canvis en línies que estan en blanc" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera diff usant l'algorisme «patience diff»" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera diff usant l'algorisme «histogram diff»" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algorisme>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "escolliu un algorisme pel diff" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<text>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera diff usant l'algorisme «anchored diff»" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<mode>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<regex>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" -msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent" +msgstr "" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" -msgstr "com s'ignoren els espais en blanc a --color-moved" +msgstr "" -#: diff.c:5456 +#: diff.c:5469 +#, fuzzy msgid "Other diff options" -msgstr "Altres opcions diff" +msgstr "Opcions genèriques" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els camins relatius" +msgstr "" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "tracta tots els fitxers com a text" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" -msgstr "intercanvia les dues entrades, inverteix el diff" +msgstr "" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "inhabilita totes les sortides del programa" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<quan>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "ignora els canvis als submòduls en la generació del diff" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<format>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "especifiqueu com es mostren els canvis als submòduls" -#: diff.c:5483 +#: diff.c:5496 #, fuzzy msgid "hide 'git add -N' entries from the index" msgstr "usa .gitattributes només des de l'índex" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<cadena>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5495 +#: diff.c:5508 +#, fuzzy msgid "show all changes in the changeset with -S or -G" -msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G" +msgstr "mostra els fitxers coincidents en el paginador" -#: diff.c:5498 +#: diff.c:5511 +#, fuzzy msgid "treat <string> in -S as extended POSIX regular expression" -msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada" +msgstr "usa les expressions regulars POSIX ampliades" -#: diff.c:5501 +#: diff.c:5514 +#, fuzzy msgid "control the order in which files appear in the output" -msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida" +msgstr "mostra en la sortida els altres fitxers" -#: diff.c:5502 +#: diff.c:5515 +#, fuzzy msgid "<object-id>" -msgstr "<id de l'objecte>" +msgstr "objecte" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" -msgstr "seleccioneu els fitxers per tipus de diff" +msgstr "seleccioneu els fitxer per tipus de diff" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<fitxer>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Sortida a un fitxer específic" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." -msgstr "" -"s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers." +msgstr "s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "només s'han trobat còpies des de camins modificats a causa de massa fitxers." -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3438,61 +3012,42 @@ msgstr "" "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " "l'ordre." -#: dir.c:554 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui" -#: dir.c:664 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "patró no reconegut: «%s»" - -#: dir.c:682 dir.c:696 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "patró negatiu no reconegut: «%s»" - -#: dir.c:714 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" - -#: dir.c:724 -msgid "disabling cone pattern matching" -msgstr "inhabilita la coincidència de patrons «cone»" - -#: dir.c:1101 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" -msgstr "no es pot usar %s com a fitxer d'exclusió" +msgstr "no es pot usar %s com a fitxer d'exclusió" -#: dir.c:2078 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "no s'ha pogut obrir el directori «%s»" -#: dir.c:2415 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli" -#: dir.c:2539 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "" "la memòria cau no seguida està inhabilitada en aquest sistema o ubicació" -#: dir.c:3343 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "el fitxer d'índex al dipòsit %s és malmès" -#: dir.c:3388 dir.c:3393 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "no s'han pogut crear directoris per %s" -#: dir.c:3422 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no s'ha pogut migrar el directori de «%s» a «%s»" @@ -3511,12 +3066,12 @@ msgstr "S'està filtrant el contingut" msgid "could not stat file '%s'" msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no s'ha pogut establir GIT_DIR a «%s»" @@ -3526,268 +3081,266 @@ msgstr "no s'ha pogut establir GIT_DIR a «%s»" msgid "too many args to run %s" msgstr "hi ha massa arguments per a executar %s" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Remot sense URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:153 +#: fetch-pack.c:154 #, fuzzy msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "no s'ha pogut escriure al remot" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requereix multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "línia de shallow no vàlida: %s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "línia d'unshallow no vàlida: %s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "objecte no trobat: %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "error en objecte: %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "no s'ha trobat cap shallow: %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "s'ha rebut %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "comissió no vàlida %s" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "s'abandona" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "fet" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "s'ha rebut %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "S'està marcant %s com a complet" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "ja es té %s (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "error de protocol: capçalera de paquet errònia" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no es pot bifurcar de %s" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s ha fallat" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "error en desmultiplexor de banda lateral" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "La versió del servidor és %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "El servidor accepta %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "El servidor no permet clients superficials" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "El servidor no admet --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "El servidor no admet --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "El servidor no admet --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "cap comissió en comú" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: l'obtenció ha fallat." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "El servidor no permet peticions superficials" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "El servidor accepta filtratge" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "no s'ha pogut escriure la petició al remot" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "error en llegir la capçalera de la secció «%s»" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "s'esperava «%s», s'ha rebut «%s»" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "línia de confirmació inesperada: «%s»" -#: fetch-pack.c:1308 -#, c-format +#: fetch-pack.c:1252 +#, fuzzy, c-format msgid "error processing acks: %d" -msgstr "s'ha produït un error en processar els acks: %d" +msgstr "error en llegir %s" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "s'espera l'enviament del fitxer de paquet després de «ready»" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "s'espera que cap altra seccions s'enviï després de no «ready»" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "s'ha produït un error en processar la informació superficial: %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "s'esperava wanted-ref, s'ha rebut «%s»" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperat: «%s»" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "s'ha produït un error en processar les referències desitjades: %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" -#: fetch-pack.c:1785 builtin/clone.c:688 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "no existeix la referència remota %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permet sol·licitar objectes no anunciats %s" -#: gpg-interface.c:223 +#: gpg-interface.c:321 +msgid "gpg failed to sign the data" +msgstr "gpg ha fallat en signar les dades" + +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "no s'ha pogut crear el fitxer temporal" -#: gpg-interface.c:226 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "s'ha produït un error en escriure la signatura separada a «%s»" -#: gpg-interface.c:390 -msgid "gpg failed to sign the data" -msgstr "gpg ha fallat en signar les dades" - -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora el color no vàlid «%.*s» en log.graphColors" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" - -#: grep.c:2124 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: no s'ha pogut llegir %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a «%s»" -#: grep.c:2152 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "«%s»: lectura curta" @@ -3837,7 +3390,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Ordres de baix nivell / Interrogadors" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "Ordres de baix nivell / Sincronització de dipòsits" #: help.c:38 @@ -3932,12 +3485,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<opcions>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4009,62 +3562,47 @@ msgstr "nom d'identitat buit (per <%s>) no és permès" msgid "name consists only of disallowed characters: %s" msgstr "el nom conté només caràcters no permesos: %s" -#: ident.c:436 builtin/commit.c:631 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "l'entrada «%s» a l'arbre %s té mode blob, però no és un blob" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s" -#: list-objects-filter.c:492 -#, fuzzy, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "no s'ha pogut accedir a «%s»" - -#: list-objects-filter.c:495 -#, fuzzy, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "no s'ha pogut llegir %s" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "no es poden combinar múltiples especificacions de filtratge" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "s'esperava «tree:<profunditat>»" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "filtre d'especificació no vàlid: «%s»" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" msgstr "" -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "no es poden combinar múltiples especificacions de filtratge" - #: lockfile.c:151 #, c-format msgid "" @@ -4094,114 +3632,117 @@ msgstr "No s'ha pogut crear «%s.lock»: %s" msgid "failed to read the cache" msgstr "s'ha produït un error en llegir la memòria cau" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: merge-recursive.c:367 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(comissió errònia)\n" -#: merge-recursive.c:390 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache ha fallat per al camí «%s»; interrompent la fusió." -#: merge-recursive.c:399 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "" -"addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió." +msgstr "addinfo_cache ha fallat al refrescar el camí «%s»; interrompent la fusió." + +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "error en construir arbres" -#: merge-recursive.c:885 +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "s'ha produït un error en crear el camí «%s»%s" -#: merge-recursive.c:896 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:919 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "s'està refusant perdre el fitxer no seguit a «%s»" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: merge-recursive.c:965 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s «%s»" -#: merge-recursive.c:990 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "s'ha produït un error en obrir «%s»: %s" -#: merge-recursive.c:1001 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s" -#: merge-recursive.c:1006 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se sap què fer amb %06o %s «%s»" -#: merge-recursive.c:1199 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "S'ha produït un error en fusionar el submòdul %s (no està agafat)" -#: merge-recursive.c:1206 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)" -#: merge-recursive.c:1213 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (les comissions no " "segueixen merge-base)" -#: merge-recursive.c:1221 merge-recursive.c:1233 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avançament ràpid del submòdul %s a la següent comissió:" -#: merge-recursive.c:1224 merge-recursive.c:1236 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avançament ràpid al submòdul %s" -#: merge-recursive.c:1259 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1263 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (sense avançament ràpid)" -#: merge-recursive.c:1264 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "S'ha trobat una possible resolució de fusió pel submòdul:\n" -#: merge-recursive.c:1267 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4212,35 +3753,33 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1276 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "S'ha produït un error en fusionar el submòdul %s (s'han trobat múltiples " "fusions)" -#: merge-recursive.c:1349 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "S'ha produït un error en executar la fusió interna" -#: merge-recursive.c:1354 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "No s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1386 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "S'està autofusionant %s" -#: merge-recursive.c:1410 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "" -"Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha " -"escrit a %s." +msgstr "Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha escrit a %s." -#: merge-recursive.c:1482 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4249,7 +3788,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre." -#: merge-recursive.c:1487 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4258,7 +3797,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " "de %s s'ha deixat en l'arbre." -#: merge-recursive.c:1494 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4267,7 +3806,7 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " "s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1499 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4276,66 +3815,64 @@ msgstr "" "CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " "de %s s'ha deixat en l'arbre a %s." -#: merge-recursive.c:1534 +#: merge-recursive.c:1511 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1534 +#: merge-recursive.c:1511 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "S'està refusant a perdre el fitxer brut a %s" -#: merge-recursive.c:1624 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "" -"S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig " -"de l'operació." +msgstr "S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig de l'operació." -#: merge-recursive.c:1682 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit " -"%s a %s" +"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s. S'ha afegit %s a " +"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1718 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint " "com a %s" -#: merge-recursive.c:1737 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca " -"«%s» canvi de nom «%s»->«%s» en «%s»%s" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la " +"branca «%s» canvi de nom «%s»->«%s» en «%s»%s" -#: merge-recursive.c:1742 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1851 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " "nom %s->%s en %s" -#: merge-recursive.c:2114 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4343,348 +3880,330 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2146 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2156 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2248 -#, c-format +#: merge-recursive.c:2169 +#, fuzzy, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de " -"nom de directori %s->%s en %s" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " +"nom %s->%s en %s" -#: merge-recursive.c:2493 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell " -"mateix ja havia canviat de nom." +"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell mateix ja havia canviat de nom." -#: merge-recursive.c:3019 +#: merge-recursive.c:2937 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:3022 +#: merge-recursive.c:2940 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no és un blob" -#: merge-recursive.c:3086 +#: merge-recursive.c:3004 msgid "modify" msgstr "modificació" -#: merge-recursive.c:3086 +#: merge-recursive.c:3004 msgid "modified" msgstr "modificat" -#: merge-recursive.c:3098 +#: merge-recursive.c:3016 msgid "content" msgstr "contingut" -#: merge-recursive.c:3102 +#: merge-recursive.c:3020 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:3125 +#: merge-recursive.c:3043 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "S'ha omès %s (el fusionat és igual a l'existent)" -#: merge-recursive.c:3147 git-submodule.sh:993 +#: merge-recursive.c:3065 git-submodule.sh:937 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:3148 +#: merge-recursive.c:3066 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:3178 +#: merge-recursive.c:3096 #, c-format msgid "Adding as %s instead" msgstr "S'està afegint com a %s en lloc d'això" -#: merge-recursive.c:3261 +#: merge-recursive.c:3178 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3264 +#: merge-recursive.c:3181 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3268 +#: merge-recursive.c:3185 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-recursive.c:3271 +#: merge-recursive.c:3188 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3385 +#: merge-recursive.c:3302 #, c-format msgid "Removing %s" msgstr "S'està eliminant %s" -#: merge-recursive.c:3408 +#: merge-recursive.c:3325 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:3413 +#: merge-recursive.c:3330 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:3420 +#: merge-recursive.c:3337 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a " "%s" -#: merge-recursive.c:3429 +#: merge-recursive.c:3346 #, c-format msgid "Adding %s" msgstr "S'està afegint %s" -#: merge-recursive.c:3438 +#: merge-recursive.c:3355 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s" -#: merge-recursive.c:3482 +#: merge-recursive.c:3393 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" +" %s" + +#: merge-recursive.c:3404 msgid "Already up to date!" msgstr "Ja està al dia!" -#: merge-recursive.c:3491 +#: merge-recursive.c:3413 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:3595 +#: merge-recursive.c:3512 msgid "Merging:" msgstr "S'està fusionant:" -#: merge-recursive.c:3608 +#: merge-recursive.c:3525 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat en comú:" msgstr[1] "s'han trobat %u avantpassats en comú:" -#: merge-recursive.c:3658 +#: merge-recursive.c:3564 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:3717 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n" -" %s" - -#: merge-recursive.c:3814 +#: merge-recursive.c:3630 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte «%s»" -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:94 +#: midx.c:95 #, fuzzy, c-format msgid "hash version %u does not match" msgstr "el camí «%s» no té la seva versió" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:472 +#: midx.c:470 #, fuzzy, c-format msgid "failed to add packfile '%s'" msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»" -#: midx.c:478 +#: midx.c:476 #, fuzzy, c-format msgid "failed to open pack-index '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: midx.c:538 +#: midx.c:536 #, fuzzy, c-format msgid "failed to locate object %d in packfile" msgstr "s'ha produït un error en llegir l'objecte «%s»." -#: midx.c:842 -#, fuzzy -msgid "Adding packfiles to multi-pack-index" -msgstr "s'ha produït un error en netejar l'índex" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "" - -#: midx.c:1052 +#: midx.c:1036 #, fuzzy, c-format msgid "failed to clear multi-pack-index at %s" msgstr "s'ha produït un error en netejar l'índex" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "S'estan cercant fitxers de paquets referenciats" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" msgstr "" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "S'estan ordenant els objectes per fitxer de paquet" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "S'estan verificant els desplaçaments dels objectes" -#: midx.c:1180 +#: midx.c:1160 #, fuzzy, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: midx.c:1186 +#: midx.c:1166 #, fuzzy, c-format msgid "failed to load pack-index for packfile %s" msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "S'estan comptant els objectes referenciats" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "no s'ha pogut executar el pack-objects" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "no s'ha pogut finalitzar el pack-objects" -#: name-hash.c:537 +#: name-hash.c:532 #, fuzzy, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: name-hash.c:559 +#: name-hash.c:554 #, fuzzy, c-format msgid "unable to create lazy_name thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: name-hash.c:565 +#: name-hash.c:560 #, fuzzy, c-format msgid "unable to join lazy_name thread: %s" msgstr "no s'ha pogut crear fil: %s" @@ -4728,42 +4247,42 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor erroni de %s: «%s»" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "tipus d'objecte «%s» no vàlid" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'objecte %s és %s, no pas %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "l'objecte %s té un identificador de tipus %d desconegut" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: object.c:266 object.c:277 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:641 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: packfile.c:1888 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)" -#: packfile.c:1892 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4809,26 +4328,26 @@ msgstr "" msgid "did you mean `--%s` (with two dashes ?)" msgstr "" -#: parse-options.c:860 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "opció desconeguda «%s»" -#: parse-options.c:862 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "«switch» «%c» desconegut" -#: parse-options.c:864 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opció no ascii desconeguda en la cadena: «%s»" -#: parse-options.c:888 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:907 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "ús: %s" @@ -4836,21 +4355,21 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:916 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:955 +#: parse-options.c:954 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:969 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "àlies de --%s" @@ -4875,37 +4394,37 @@ msgstr "l'opció «%s» espera «always», «auto» o «never»" msgid "malformed object name '%s'" msgstr "nom d'objecte «%s» mal format" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "No s'ha pogut fer %s escrivible pel grup" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "El caràcter d'escapament «\\» no està permès com a últim caràcter en un " "valor d'un atribut" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Només es permet una especificació «attr:»." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "una especificació d'atribut no pot estar buida" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "nom d'atribut no vàlid %s" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "els paràmetres d'especificació de camí «glob» i «noglob» globals són " "incompatibles" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4913,56 +4432,51 @@ msgstr "" "el paràmetre d'especificació de camí «literal» global és incompatible amb " "tots els altres paràmetres d'especificació de camí globals" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paràmetre no vàlid per a la màgia d'especificació de camí «prefix»" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "«)» mancant al final de la màgia d'especificació de camí en «%s»" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: «literal» i «glob» són incompatibles" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: «%s» és fora del dipòsit" -#: pathspec.c:516 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "«%s» (mnemònic: «%c»)" -#: pathspec.c:526 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s" -#: pathspec.c:593 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic" -#: pathspec.c:638 -#, c-format -msgid "line is badly quoted: %s" -msgstr "" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "no s'ha pogut escriure el paquet de buidatge" @@ -5025,42 +4539,33 @@ msgstr "S'està actualitzant l'índex" msgid "unable to create threaded lstat: %s" msgstr "no s'ha pogut crear fil: %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Remot sense URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "no s'ha pogut iniciar «log»" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "no s'ha pogut llegir la sortida de «log»" -#: range-diff.c:96 sequencer.c:5163 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "no s'ha pogut llegir la capçalera de la gif «%.*s»" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "s'ha produït un error en generar el diff" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre per «%s»" @@ -5077,8 +4582,7 @@ msgstr "no es pot crear un blob buit a la base de dades d'objectes" #: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "" -"%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git" +msgstr "%s: només pot afegir fitxers normals, enllaços simbolics o directoris git" #: read-cache.c:723 #, fuzzy, c-format @@ -5096,20 +4600,20 @@ msgid "unable to add '%s' to index" msgstr "no s'ha pogut afegir «%s» a l'índex" #: read-cache.c:805 -#, c-format +#, fuzzy, c-format msgid "unable to stat '%s'" -msgstr "no s'ha pogut fer «stat» a «%s»" +msgstr "no s'ha pogut actualitzar %s" -#: read-cache.c:1325 -#, c-format +#: read-cache.c:1314 +#, fuzzy, c-format msgid "'%s' appears as both a file and as a directory" -msgstr "«%s» apareix com a fitxer i com a directori" +msgstr "%s existeix i no és directori" -#: read-cache.c:1531 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Actualitza l'índex" -#: read-cache.c:1646 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5118,7 +4622,7 @@ msgstr "" "index.version està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1656 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5127,138 +4631,138 @@ msgstr "" "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1712 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "signatura malmesa 0x%08x" -#: read-cache.c:1715 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "versió d'índex incorrecta %d" -#: read-cache.c:1724 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "signatura sha1 malmesa al fitxer d'índex" -#: read-cache.c:1754 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'índex usa l'extensió %.4s, que no es pot entendre" -#: read-cache.c:1756 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "s'està ignorant l'extensió %.4s" -#: read-cache.c:1793 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" -msgstr "format d'entrada d'índex desconeguda «0x%08x»" +msgstr "Format d'entrada d'índex desconeguda «0x%08x»" -#: read-cache.c:1809 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "camp del nom mal formatat l'index, camí a prop «%s»" -#: read-cache.c:1866 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1869 +#: read-cache.c:1836 #, fuzzy, c-format msgid "multiple stage entries for merged file '%s'" msgstr "nom d'identitat buit (per <%s>) no és permès" -#: read-cache.c:1872 +#: read-cache.c:1839 #, fuzzy, c-format msgid "unordered stage entries for '%s'" msgstr "no s'han pogut crear directoris per %s" -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: read-cache.c:2119 +#: read-cache.c:2087 #, fuzzy, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2132 +#: read-cache.c:2100 #, fuzzy, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2165 +#: read-cache.c:2133 #, fuzzy, c-format msgid "%s: index file open failed" -msgstr "%s: s'ha produït un error en actualitzar els fitxers" +msgstr "s'ha produït un error en actualitzar els fitxers" -#: read-cache.c:2169 +#: read-cache.c:2137 #, fuzzy, c-format msgid "%s: cannot stat the open index" msgstr "no es pot llegir l'índex" -#: read-cache.c:2173 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: fitxer d'índex més petit que s'esperava" -#: read-cache.c:2177 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: no es pot mapar el fitxer d'índex" -#: read-cache.c:2219 +#: read-cache.c:2187 #, fuzzy, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2246 +#: read-cache.c:2214 #, fuzzy, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: read-cache.c:2278 -#, c-format +#: read-cache.c:2246 +#, fuzzy, c-format msgid "could not freshen shared index '%s'" -msgstr "no s'ha pogut refrescar l'índex compartit «%s»" +msgstr "no s'ha pogut llegir el fitxer «%s»" -#: read-cache.c:2325 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "índex malmès, s'esperava %s a %s, s'ha rebut %s" -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a «%s»" -#: read-cache.c:3137 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "no s'ha pogut obrir el directori git: %s" -#: read-cache.c:3149 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "no s'ha pogut desenllaçar: %s" -#: read-cache.c:3174 +#: read-cache.c:3142 #, fuzzy, c-format msgid "cannot fix permission bits on '%s'" msgstr "no s'ha pogut resoldre la revisió: %s" -#: read-cache.c:3323 +#: read-cache.c:3291 #, fuzzy, c-format msgid "%s: cannot drop to stage #0" msgstr "no es pot canviar de directori a %s" @@ -5359,8 +4863,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Tingueu en compte que les comissions buides estan comentades" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "no s'ha pogut escriure «%s»" @@ -5407,7 +4911,7 @@ msgstr "%s no apunta a un objecte vàlid" msgid "ignoring dangling symref %s" msgstr "s'està ignorant la referència trencada %s" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "s'està ignorant la referència trencada %s" @@ -5432,15 +4936,14 @@ msgstr "la referència «%s» ja existeix" msgid "unexpected object ID when writing '%s'" msgstr "ID d'objecte no esperat en escriure «%s»" -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1031 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir «%s» per a escriptura" @@ -5475,21 +4978,21 @@ msgstr "s'està refusant la referència amb nom malmès «%s»" msgid "update_ref failed for ref '%s': %s" msgstr "s'ha produït un error en obrir «%s»: %s" -#: refs.c:2023 +#: refs.c:2012 #, fuzzy, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "nom d'identitat buit (per <%s>) no és permès" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "no està permès actualitzar les referències en un entorn de quarantena" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "«%s» existeix; no es pot crear «%s»" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no es poden processar «%s» i «%s» a la vegada" @@ -5499,23 +5002,23 @@ msgstr "no es poden processar «%s» i «%s» a la vegada" msgid "could not remove reference %s" msgstr "no s'ha pogut eliminar la referència %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "no s'han pogut suprimir les referències: %s" #: refspec.c:137 -#, c-format +#, fuzzy, c-format msgid "invalid refspec '%s'" -msgstr "refspec no vàlida: «%s»" +msgstr "fitxer no vàlid: «%s»" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "no hi és" @@ -5534,280 +5037,280 @@ msgstr "darrere per %d" msgid "ahead %d, behind %d" msgstr "davant per %d, darrere per %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format esperat: %%(color:<color>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconegut: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" -msgstr "Valor enter esperat pel nom de referència:lstrip=%s" +msgstr "valor enter esperat pel nom de referència:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" -msgstr "Valor enter esperat pel nom de referència:rstrip=%s" +msgstr "valor enter esperat pel nom de referència:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "paràmetre %%(%s) desconegut: %s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(subject) no accepta paràmetres" -#: ref-filter.c:272 -#, c-format +#: ref-filter.c:269 +#, fuzzy, c-format msgid "unrecognized %%(objectsize) argument: %s" -msgstr "paràmetre %%(objectsize) no reconegut: %s" +msgstr "paràmetre %%(objectname) no reconegut: %s" -#: ref-filter.c:280 -#, c-format +#: ref-filter.c:277 +#, fuzzy, c-format msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) no accepta paràmetres" +msgstr "%%(objectsize) no accepta paràmetres" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no accepta paràmetres" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no accepta paràmetres" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "paràmetre %%(trailers) desconegut: %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positiu esperat conté:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "paràmetre %%(contents) no reconegut: %s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positiu esperat nom d'objecte:curt=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "paràmetre %%(objectname) no reconegut: %s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format esperat: %%(align:<amplada>,<posició>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "posició no reconeguda:%s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "paràmetre %%(align) no reconegut: %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'àtom %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "paràmetre %%(if) no reconegut: %s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: s'ha usat l'àtom %%(then) més d'un cop" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: s'ha usat l'àtom %%(else) més d'un cop" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:1488 -#, c-format +#: ref-filter.c:1485 +#, fuzzy, c-format msgid "no branch, rebasing %s" -msgstr "sense branca, s'està fent «rebase» %s" +msgstr "(cap branca, s'està fent «rebase» %s)" -#: ref-filter.c:1491 -#, c-format +#: ref-filter.c:1488 +#, fuzzy, c-format msgid "no branch, rebasing detached HEAD %s" -msgstr "sense branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat" +msgstr "(cap branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat)" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" -msgstr "(sense branca, bisecció començada en %s)" +msgstr "(cap branca, bisecció començada en %s)" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "sense branca" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer ha fallat en %s per a %s" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a «%s»" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "s'està ignorant la referència amb nom malmès %s" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "format: manca l'àtom %%(end)" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'opció «%s» és incompatible amb --merged" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'opció «%s» és incompatible amb --no-merged" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opció «%s» ha d'apuntar a una comissió" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:413 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:421 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:611 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No es poden obtenir ambdós %s i %s a %s" -#: remote.c:615 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:619 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:687 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:697 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1003 +#: remote.c:1000 #, fuzzy, c-format msgid "src refspec %s does not match any" msgstr "%s: no coincideix amb l'índex" -#: remote.c:1008 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5816,7 +5319,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1023 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5830,7 +5333,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1043 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5838,7 +5341,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1048 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5846,7 +5349,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1053 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5854,7 +5357,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1058 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5862,115 +5365,115 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1094 -#, c-format +#: remote.c:1091 +#, c-format msgid "%s cannot be resolved to branch" msgstr "«%s» no es pot resoldre a una branca" -#: remote.c:1105 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no s'ha pogut suprimir «%s»: la referència remota no existeix" -#: remote.c:1117 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1124 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1627 remote.c:1728 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1636 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "no existeix la branca: «%s»" -#: remote.c:1639 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca «%s»" -#: remote.c:1645 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" -#: remote.c:1660 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot" -#: remote.c:1672 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca «%s» no té cap remot al qual pujar" -#: remote.c:1682 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referència de «%s» no inclouen «%s»" -#: remote.c:1695 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "push no té destí (push.default és «nothing)" -#: remote.c:1717 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "no es pot resoldre una pujada 'simple' a un sol destí" -#: remote.c:1843 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "no s'ha pogut trobar la referència remota %s" -#: remote.c:1856 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2019 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "La vostra branca està basada en «%s», però la font no hi és.\n" -#: remote.c:2023 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:2026 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "La vostra branca està al dia amb «%s».\n" -#: remote.c:2030 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n" -#: remote.c:2033 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2037 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n" msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n" -#: remote.c:2043 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:2046 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5982,11 +5485,11 @@ msgstr[1] "" "La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-" "se ràpidament.\n" -#: remote.c:2054 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n" -#: remote.c:2057 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6001,42 +5504,43 @@ msgstr[1] "" "La vostra branca i «%s» han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2067 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (useu «git pull» per a fusionar la branca remota amb la vostra)\n" +msgstr " (useu «git pull» per a fusionar la branca remota a la vostra)\n" -#: remote.c:2250 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no es pot analitzar el nom de l'objecte esperat «%s»" #: replace-object.c:21 -#, c-format +#, fuzzy, c-format msgid "bad replace ref name: %s" -msgstr "nom de la referència reemplaçada incorrecte: %s" +msgstr "suprimeix les referències reemplaçades" #: replace-object.c:30 -#, c-format +#, fuzzy, c-format msgid "duplicate replace ref: %s" -msgstr "duplica les referències reemplaçades: %s" +msgstr "suprimeix les referències reemplaçades" #: replace-object.c:73 -#, c-format +#, fuzzy, c-format msgid "replace depth too high for object %s" -msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s" +msgstr "reemplaça l'etiqueta si existeix" #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" -msgstr "MERGE_RR corrupte" +msgstr "" #: rerere.c:264 rerere.c:269 +#, fuzzy msgid "unable to write rerere record" -msgstr "no s'ha pogut escriure el registre «rerere»" +msgstr "no s'ha pogut escriure l'objecte de nota" #: rerere.c:495 -#, c-format +#, fuzzy, c-format msgid "there were errors while writing '%s' (%s)" -msgstr "s'han produït errors en escriure «%s» (%s)" +msgstr "error en llegir %s" #: rerere.c:498 #, fuzzy, c-format @@ -6044,19 +5548,19 @@ msgid "failed to flush '%s'" msgstr "s'ha produït un error en fer stat a «%s»" #: rerere.c:503 rerere.c:1039 -#, c-format +#, fuzzy, c-format msgid "could not parse conflict hunks in '%s'" -msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»" +msgstr "no s'ha pogut analitzar la comissió «%s»" #: rerere.c:684 -#, c-format +#, fuzzy, c-format msgid "failed utime() on '%s'" -msgstr "s'ha produït un error en fer «failed utime()» a «%s»" +msgstr "s'ha produït un error en obrir «%s»" #: rerere.c:694 -#, c-format +#, fuzzy, c-format msgid "writing '%s' failed" -msgstr "s'ha produït un error en escriure «%s»" +msgstr "la creació de «%s» ha fallat" #: rerere.c:714 #, c-format @@ -6066,12 +5570,12 @@ msgstr "" #: rerere.c:753 #, c-format msgid "Recorded resolution for '%s'." -msgstr "Es recorda la resolució per a «%s»." +msgstr "" #: rerere.c:788 #, c-format msgid "Resolved '%s' using previous resolution." -msgstr "S'ha resolt «%s» usant una resolució anterior." +msgstr "" #: rerere.c:803 #, fuzzy, c-format @@ -6083,8 +5587,8 @@ msgstr "no es pot fer symlink en «%s» «%s»" msgid "Recorded preimage for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori «%s»" @@ -6100,9 +5604,9 @@ msgid "no remembered resolution for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" #: rerere.c:1077 -#, c-format +#, fuzzy, c-format msgid "cannot unlink '%s'" -msgstr "no es pot fer «unlink» de «%s»" +msgstr "no es pot fer readlink en «%s»" #: rerere.c:1087 #, fuzzy, c-format @@ -6115,67 +5619,68 @@ msgid "Forgot resolution for '%s'\n" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" #: rerere.c:1199 +#, fuzzy msgid "unable to open rr-cache directory" -msgstr "no s'ha pogut obrir el directori rr-cache" +msgstr "no s'ha pogut actualitzar l'arbre cau" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "la vostra branca actual sembla malmesa" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "la branca actual «%s» encara no té cap comissió" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent és incompatible amb --bisect" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»" +msgstr "" -#: run-command.c:762 +#: run-command.c:763 msgid "open /dev/null failed" msgstr "s'ha produït un error en obrir /dev/null" -#: run-command.c:1268 -#, c-format +#: run-command.c:1269 +#, fuzzy, c-format msgid "cannot create async thread: %s" -msgstr "no s'ha pogut crear fil «async»: %s" +msgstr "no s'ha pogut crear fil: %s" -#: run-command.c:1332 +#: run-command.c:1333 #, c-format 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 "" -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de neteja no esperat quan estava llegint l'estat del desempaquetament " "remot" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "s'ha produït un error en el desempaquetament remot: %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "s'ha produït un error en signar el certificat de pujada" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6183,47 +5688,47 @@ msgstr "" "no s'està enviant una certificació de pujada perquè el destí receptor no " "admet pujar --signed" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "el destí receptor no admet pujar --atomic" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "el destí receptor no admet opcions de pujada" -#: sequencer.c:189 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de neteja «%s» no vàlid en la comissió del missatge" -#: sequencer.c:294 -#, c-format +#: sequencer.c:292 +#, fuzzy, c-format msgid "could not delete '%s'" -msgstr "no s'ha pogut suprimir «%s»" +msgstr "No s'ha pogut suprimir %s" -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "no s'ha pogut suprimir «%s»" -#: sequencer.c:323 +#: sequencer.c:321 msgid "revert" msgstr "revertir" -#: sequencer.c:325 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:327 +#: sequencer.c:325 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:329 -#, c-format +#: sequencer.c:327 +#, fuzzy, c-format msgid "unknown action: %d" -msgstr "acció desconeguda: %d" +msgstr "Acció desconeguda: %d" -#: sequencer.c:387 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6231,7 +5736,7 @@ msgstr "" "després de resoldre els conflictes, marqueu els camins\n" "corregits amb 'git add <camins>' o 'git rm <camins>'" -#: sequencer.c:390 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6241,44 +5746,44 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:403 sequencer.c:2993 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar «%s»" -#: sequencer.c:410 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de línia a «%s»" -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 -#: sequencer.c:3277 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "s'ha produït un error en finalitzar «%s»" -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 -#: builtin/rebase.c:589 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir «%s»" -#: sequencer.c:464 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:468 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." -#: sequencer.c:500 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: avanç ràpid" -#: sequencer.c:539 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" @@ -6286,69 +5791,70 @@ msgstr "Mode de neteja no vàlid %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:633 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:650 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "no s'ha pogut actualitzar l'arbre cau" -#: sequencer.c:664 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "no s'ha pogut resoldre la comissió HEAD" -#: sequencer.c:744 -#, c-format +#: sequencer.c:743 +#, fuzzy, c-format msgid "no key present in '%.*s'" -msgstr "no hi ha una clau a «%.*s»" +msgstr "no s'ha pogut analitzar «%.*s»" -#: sequencer.c:755 +#: sequencer.c:754 #, fuzzy, c-format msgid "unable to dequote value of '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir «%s» per a lectura" -#: sequencer.c:802 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»" -#: sequencer.c:807 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»" -#: sequencer.c:812 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»" -#: sequencer.c:816 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "variable «%s» desconeguda" -#: sequencer.c:821 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta «GIT_AUTHOR_NAME»" -#: sequencer.c:823 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta «GIT_AUTHOR_EMAIL»" -#: sequencer.c:825 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta «GIT_AUTHOR_DATE»" -#: sequencer.c:902 sequencer.c:1427 -msgid "malformed ident line" -msgstr "línia d'identitat mal formada" +#: sequencer.c:884 +#, fuzzy, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "format de data no vàlid: %s" -#: sequencer.c:925 +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6378,11 +5884,16 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1218 +#: sequencer.c:995 +#, fuzzy +msgid "writing root commit" +msgstr "no hi ha res a cometre\n" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "el lligam «prepare-commit-msg» ha fallat" -#: sequencer.c:1224 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6409,7 +5920,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1237 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6435,351 +5946,355 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1279 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: sequencer.c:1281 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: sequencer.c:1327 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "no s'ha pogut resoldre HEAD després de crear la comissió" -#: sequencer.c:1329 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "HEAD separat" -#: sequencer.c:1333 +#: sequencer.c:1332 msgid " (root-commit)" -msgstr " (comissió arrel)" +msgstr " (comissió d'arrel)" -#: sequencer.c:1354 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "no s'ha pogut analitzar HEAD" -#: sequencer.c:1356 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s no és una comissió!" -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: sequencer.c:1411 sequencer.c:2055 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "no s'ha pogut analitzar l'autor de la comissió" -#: sequencer.c:1431 -msgid "corrupted author without date information" -msgstr "autor malmès sense informació de data" - -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: sequencer.c:1480 sequencer.c:1550 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»" -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: sequencer.c:1577 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: sequencer.c:1582 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "no s'ha pogut analitzar la comissió pare %s" -#: sequencer.c:1656 sequencer.c:1767 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "ordre desconeguda: %d" -#: sequencer.c:1714 sequencer.c:1739 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Això és una combinació de %d comissions." -#: sequencer.c:1724 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:1726 sequencer.c:3304 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:1728 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" -#: sequencer.c:1734 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure «%s»" -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Aquest és el 1r missatge de comissió:" -#: sequencer.c:1749 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:1756 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest és el missatge de comissió #%d:" -#: sequencer.c:1762 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissió núm. #%d s'ometrà:" -#: sequencer.c:1850 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "el vostre fitxer d'índex està sense fusionar." -#: sequencer.c:1857 +#: sequencer.c:1805 +#, fuzzy msgid "cannot fixup root commit" -msgstr "no es pot arreglar la comissió arrel" +msgstr "no es pot trobar la comissió %s (%s)" -#: sequencer.c:1876 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:1884 sequencer.c:1892 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissió %s no té pare %d" -#: sequencer.c:1898 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "no es pot obtenir el missatge de comissió de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1917 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:1982 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom «%s» a «%s»" -#: sequencer.c:2037 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:2038 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:2105 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha produït un error en llegir l'índex" -#: sequencer.c:2112 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha produït un error en actualitzar l'índex" -#: sequencer.c:2189 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no accepta paràmetres: «%s»" -#: sequencer.c:2198 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "falten els arguments per %s" -#: sequencer.c:2235 -#, c-format +#: sequencer.c:2174 +#, fuzzy, c-format msgid "could not parse '%.*s'" -msgstr "no s'ha pogut analitzar «%.*s»" +msgstr "no s'ha pogut analitzar «%s»" -#: sequencer.c:2289 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "línia no vàlida %d: %.*s" -#: sequencer.c:2300 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" -msgstr "no es pot «%s» sense una comissió prèvia" +msgstr "No es pot «%s» sense una comissió prèvia" -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 -#: builtin/rebase.c:223 builtin/rebase.c:248 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "no s'ha pogut llegir «%s»." -#: sequencer.c:2384 +#: sequencer.c:2323 +#, fuzzy msgid "cancelling a cherry picking in progress" -msgstr "s'està cancel·lant un «cherry pick» en curs" +msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2391 +#: sequencer.c:2330 +#, fuzzy msgid "cancelling a revert in progress" -msgstr "s'està cancel·lant la reversió en curs" +msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2435 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corregiu-ho usant «git rebase --edit-todo»." -#: sequencer.c:2437 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: «%s»" -#: sequencer.c:2442 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissió." -#: sequencer.c:2453 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:2455 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:2533 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: sequencer.c:2630 +#: sequencer.c:2553 msgid "unusable squash-onto" -msgstr "«squash-onto» no usable" +msgstr "" -#: sequencer.c:2646 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: «%s»" -#: sequencer.c:2736 sequencer.c:4463 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "conjunt de comissions buit passat" -#: sequencer.c:2752 +#: sequencer.c:2668 +#, fuzzy msgid "revert is already in progress" -msgstr "una reversió ja està en curs" +msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:2754 -#, c-format +#: sequencer.c:2670 +#, fuzzy, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" -msgstr "intenteu «git revert (--continue | %s--abort | --quit)»" +msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2757 +#: sequencer.c:2673 +#, fuzzy msgid "cherry-pick is already in progress" -msgstr "un «cherry pick» ja està en curs" +msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:2759 -#, c-format +#: sequencer.c:2675 +#, fuzzy, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" -msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»" +msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2773 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador «%s»" -#: sequencer.c:2788 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:2848 sequencer.c:4209 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2850 sequencer.c:2861 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:2852 sequencer.c:2896 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:2882 builtin/grep.c:736 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir «%s»" -#: sequencer.c:2884 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir «%s»: %s" -#: sequencer.c:2885 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:2891 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès" -#: sequencer.c:2902 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD" -#: sequencer.c:2943 +#: sequencer.c:2859 +#, fuzzy msgid "no revert in progress" -msgstr "no hi ha cap reversió en curs" +msgstr "No hi ha un «rebase» en curs?" -#: sequencer.c:2951 +#: sequencer.c:2867 +#, fuzzy msgid "no cherry-pick in progress" -msgstr "ni hi ha cap «cherry pick» en curs" +msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2961 +#: sequencer.c:2877 +#, fuzzy msgid "failed to skip the commit" -msgstr "s'ha produït un error en ometre la comissió" +msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: sequencer.c:2968 +#: sequencer.c:2884 msgid "there is nothing to skip" -msgstr "no hi ha res a ometre" +msgstr "" -#: sequencer.c:2971 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3095 sequencer.c:4121 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "no s'ha pogut actualitzar %s" -#: sequencer.c:3134 sequencer.c:4101 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" -msgstr "no es pot llegir HEAD" +msgstr "No es pot llegir HEAD" -#: sequencer.c:3151 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3159 -#, c-format +#: sequencer.c:3074 +#, fuzzy, c-format msgid "" "You can amend the commit now, with\n" "\n" @@ -6791,28 +6306,33 @@ msgid "" msgstr "" "Podeu esmenar la comissió ara, amb\n" "\n" -" git commit --amend %s\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" "\n" "Una vegada que estigueu satisfet amb els vostres canvis, executeu\n" "\n" -" git rebase --continue\n" +"\tgit rebase --continue" -#: sequencer.c:3169 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "No s'ha pogut aplicar %s... %.*s" -#: sequencer.c:3176 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "No s'ha pogut fusionar %.*s" -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:3221 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "no s'ha pogut llegir l'índex" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -6827,11 +6347,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3227 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n" -#: sequencer.c:3233 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -6847,72 +6367,79 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3294 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom d'etiqueta no permès: «%.*s»" -#: sequencer.c:3348 +#: sequencer.c:3263 +#, fuzzy msgid "writing fake root commit" -msgstr "s'està escrivint una comissió arrel falsa" +msgstr "no hi ha res a cometre\n" -#: sequencer.c:3353 +#: sequencer.c:3268 msgid "writing squash-onto" -msgstr "s'està escrivint «squash-onto»" +msgstr "" -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 -#, c-format +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#, fuzzy, c-format msgid "failed to find tree of %s" -msgstr "s'ha produït un error en cercar l'arbre de %s" +msgstr "S'ha produït un error en cercar l'arbre de %s." + +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "no s'ha pogut escriure l'índex" -#: sequencer.c:3436 +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "no s'ha pogut resoldre «%s»" -#: sequencer.c:3467 +#: sequencer.c:3379 +#, fuzzy msgid "cannot merge without a current revision" -msgstr "no es pot fusionar sense una revisió actual" +msgstr "No es pot «%s» sense una comissió prèvia" -#: sequencer.c:3489 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "no s'ha pogut analitzar «%.*s»" -#: sequencer.c:3498 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "no hi ha res per fusionar «%.*s»" -#: sequencer.c:3510 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3526 -#, c-format +#: sequencer.c:3437 +#, fuzzy, c-format msgid "could not get commit message of '%s'" -msgstr "no s'ha pogut llegir el missatge de comissió de «%s»" +msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:3688 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no s'ha pogut fusionar «%.*s»" -#: sequencer.c:3704 +#: sequencer.c:3606 +#, fuzzy msgid "merge: Unable to write new index file" -msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou" +msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:3773 builtin/rebase.c:733 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "S'ha aplicat el «stash» automàticament.\n" -#: sequencer.c:3785 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6923,31 +6450,31 @@ msgstr "" "Els vostres canvis estan segurs en el «stash».\n" "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" -#: sequencer.c:3849 -#, c-format +#: sequencer.c:3751 +#, fuzzy, c-format msgid "could not checkout %s" msgstr "no es pot agafar %s" -#: sequencer.c:3863 -#, c-format +#: sequencer.c:3765 +#, fuzzy, c-format msgid "%s: not a valid OID" -msgstr "%s: no és un OID vàlid" +msgstr "«%s» no és un terme vàlid" -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no s'ha pogut separar HEAD" -#: sequencer.c:3883 -#, c-format +#: sequencer.c:3785 +#, fuzzy, c-format msgid "Stopped at HEAD\n" -msgstr "Aturat a HEAD\n" +msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:3885 -#, c-format +#: sequencer.c:3787 +#, fuzzy, c-format msgid "Stopped at %s\n" -msgstr "Aturat a %s\n" +msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:3893 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -6960,48 +6487,48 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3979 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:4050 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:4109 +#: sequencer.c:4003 msgid "could not read orig-head" -msgstr "no s'ha pogut llegir orig-head" +msgstr "No s'ha pogut llegir orig-head" -#: sequencer.c:4114 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "no s'ha pogut llegir 'onto'" -#: sequencer.c:4128 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:4221 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." -#: sequencer.c:4230 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissió no existent" -#: sequencer.c:4232 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no vàlid: «%s»" -#: sequencer.c:4234 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no vàlid: «%s»" -#: sequencer.c:4237 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7009,44 +6536,44 @@ msgid "" msgstr "" "\n" "Teniu canvis no comesos en el vostre arbre de treball. \n" -"Cometeu-los primer i després executeu «git rebase --continue» de nou." +"Primer cometeu-los i després executeu 'git rebase --continue' de nou." -#: sequencer.c:4273 sequencer.c:4312 -#, c-format +#: sequencer.c:4167 sequencer.c:4205 +#, fuzzy, c-format msgid "could not write file: '%s'" -msgstr "no s'ha pogut escriure el fitxer: «%s»" +msgstr "no s'ha pogut crear el fitxer «%s»" -#: sequencer.c:4327 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4334 +#: sequencer.c:4227 msgid "could not commit staged changes." -msgstr "no s'han pogut cometre els canvis «staged»." +msgstr "No s'han pogut cometre els canvis «staged»." -#: sequencer.c:4440 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:4444 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: revisió incorrecta" -#: sequencer.c:4479 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" -#: sequencer.c:4952 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: opcions no gestionades" -#: sequencer.c:4955 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: s'ha produït un error en preparar les revisions" -#: sequencer.c:5113 +#: sequencer.c:4971 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -7055,24 +6582,24 @@ msgstr "" "Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --" "continue'.\n" -#: sequencer.c:5226 sequencer.c:5243 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "res a fer" -#: sequencer.c:5257 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "no s'han pogut ometre les ordres «picks» no necessàries" -#: sequencer.c:5351 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "l'script ja estava endreçat." -#: setup.c:124 +#: setup.c:123 #, c-format msgid "'%s' is outside repository" msgstr "«%s» és fora del dipòsit" -#: setup.c:174 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7082,7 +6609,7 @@ msgstr "" "Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin " "localment." -#: setup.c:187 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7094,12 +6621,12 @@ msgstr "" "Useu «--» per a separar els camins de les revisions:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:236 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "l'opció «%s» ha de venir abans dels arguments opcionals" -#: setup.c:255 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7110,104 +6637,104 @@ msgstr "" "Useu '--' per a separar els camins de les revisions:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:391 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" "no s'ha pogut configurar un arbre de treball utilitzant una configuració no " "vàlida" -#: setup.c:395 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "aquesta operació s'ha d'executar en un arbre de treball" -#: setup.c:541 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d" -#: setup.c:549 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: setup.c:568 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: setup.c:570 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "massa larg per a ser un fitxer .git: «%s»" -#: setup.c:572 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "error en llegir %s" -#: setup.c:574 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "format gitfile no vàlid: %s" -#: setup.c:576 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "sense camí al gitfile: %s" -#: setup.c:578 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "no és un dipòsit de git: %s" -#: setup.c:677 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "«$%s» massa gran" -#: setup.c:691 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "no és un dipòsit de git: «%s»" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "no es pot canviar de directori a «%s»" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "no es pot tornar al directori de treball actual" -#: setup.c:852 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "s'ha produït un error en fer stat a «%*s%s%s»" -#: setup.c:1090 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:1099 setup.c:1105 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "no es pot canviar a «%s»" -#: setup.c:1110 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s" -#: setup.c:1116 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -"no és un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n" +"no un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n" "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "no està establert)." -#: setup.c:1227 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7218,288 +6745,294 @@ msgstr "" "El propietari dels fitxers sempre ha de tenir permisos de lectura i " "escriptura." -#: setup.c:1271 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "s'ha produït un error en obrir /dev/null o dup" -#: setup.c:1286 +#: setup.c:1279 msgid "fork failed" msgstr "el «fork» ha fallat" -#: setup.c:1291 +#: setup.c:1284 msgid "setsid failed" msgstr "l'«stash» ha fallat" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates" +msgstr "" -#: sha1-file.c:503 -#, c-format +#: sha1-file.c:504 +#, fuzzy, c-format msgid "unable to normalize alternate object path: %s" -msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s" +msgstr "no s'ha pogut analitzar l'objecte: %s" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:582 -#, c-format +#: sha1-file.c:583 +#, fuzzy, c-format msgid "unable to normalize object directory: %s" -msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s" +msgstr "no s'ha pogut analitzar l'objecte: %s" -#: sha1-file.c:625 +#: sha1-file.c:626 #, fuzzy msgid "unable to fdopen alternates lockfile" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: sha1-file.c:643 +#: sha1-file.c:644 +#, fuzzy msgid "unable to read alternates file" -msgstr "no es pot llegir el fitxer «alternates»" +msgstr "no es pot llegir el fitxer d'índex" -#: sha1-file.c:650 +#: sha1-file.c:651 +#, fuzzy msgid "unable to move new alternates file into place" -msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc" +msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "el camí «%s» no existeix" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència «%s» no és un dipòsit local." -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència «%s» és superficial" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència «%s» és empeltat" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" -msgstr "línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s" +msgstr "" #: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:964 +#: sha1-file.c:968 msgid "mmap failed" msgstr "mmap ha fallat" -#: sha1-file.c:1128 +#: sha1-file.c:1132 #, c-format msgid "object file %s is empty" msgstr "el tipus d'objecte %s és buit" -#: sha1-file.c:1252 sha1-file.c:2392 +#: sha1-file.c:1256 sha1-file.c:2395 #, fuzzy, c-format msgid "corrupt loose object '%s'" msgstr "no s'ha pogut analitzar l'objecte «%s»" -#: sha1-file.c:1254 sha1-file.c:2396 +#: sha1-file.c:1258 sha1-file.c:2399 #, fuzzy, c-format msgid "garbage at end of loose object '%s'" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: sha1-file.c:1296 +#: sha1-file.c:1300 +#, fuzzy msgid "invalid object type" -msgstr "tipus d'objecte és incorrecte" +msgstr "el tipus d'objecte és incorrecte." -#: sha1-file.c:1380 +#: sha1-file.c:1384 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type" +msgstr "" -#: sha1-file.c:1383 -#, c-format +#: sha1-file.c:1387 +#, fuzzy, c-format msgid "unable to unpack %s header" -msgstr "no s'ha pogut desempaquetar la capçalera %s" +msgstr "no s'ha pogut actualitzar %s" -#: sha1-file.c:1389 +#: sha1-file.c:1393 #, c-format msgid "unable to parse %s header with --allow-unknown-type" -msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type" +msgstr "" -#: sha1-file.c:1392 -#, c-format +#: sha1-file.c:1396 +#, fuzzy, c-format msgid "unable to parse %s header" -msgstr "no s'ha pogut analitzar la capçalera %s" +msgstr "no s'ha pogut actualitzar %s" -#: sha1-file.c:1584 -#, c-format +#: sha1-file.c:1587 +#, fuzzy, c-format msgid "failed to read object %s" -msgstr "s'ha produït un error en llegir l'objecte %s" +msgstr "s'ha produït un error en llegir l'objecte «%s»." -#: sha1-file.c:1588 +#: sha1-file.c:1591 #, fuzzy, c-format msgid "replacement %s not found for %s" msgstr "no s'han trobat les plantilles %s" -#: sha1-file.c:1592 +#: sha1-file.c:1595 #, fuzzy, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objecte local %s és malmès" -#: sha1-file.c:1596 +#: sha1-file.c:1599 #, fuzzy, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objecte local %s és malmès" -#: sha1-file.c:1699 -#, c-format +#: sha1-file.c:1702 +#, fuzzy, c-format msgid "unable to write file %s" -msgstr "no s'ha pogut escriure al fitxer %s" +msgstr "no s'ha pogut escriure %s" -#: sha1-file.c:1706 +#: sha1-file.c:1709 #, fuzzy, c-format msgid "unable to set permission to '%s'" msgstr "no s'ha pogut resoldre la revisió: %s" -#: sha1-file.c:1713 +#: sha1-file.c:1716 +#, fuzzy msgid "file write error" -msgstr "s'ha produït un error en escriure al fitxer" +msgstr "escriptura fallada al rev-list" -#: sha1-file.c:1732 +#: sha1-file.c:1735 #, fuzzy msgid "error when closing loose object file" msgstr "error en tancar el fitxer de paquet" -#: sha1-file.c:1797 +#: sha1-file.c:1800 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1799 +#: sha1-file.c:1802 +#, fuzzy msgid "unable to create temporary file" -msgstr "no s'ha pogut crear un fitxer temporal" +msgstr "no s'ha pogut crear un índex temporal" -#: sha1-file.c:1823 +#: sha1-file.c:1826 #, fuzzy msgid "unable to write loose object file" msgstr "no s'ha pogut escriure l'objecte de nota" -#: sha1-file.c:1829 +#: sha1-file.c:1832 #, fuzzy, c-format msgid "unable to deflate new object %s (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: sha1-file.c:1833 +#: sha1-file.c:1836 #, fuzzy, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "ha fallat fstat a %s" -#: sha1-file.c:1837 +#: sha1-file.c:1840 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1847 builtin/pack-objects.c:925 +#: sha1-file.c:1850 builtin/pack-objects.c:920 #, fuzzy, c-format msgid "failed utime() on %s" msgstr "s'ha produït un error en obrir «%s»" -#: sha1-file.c:1922 +#: sha1-file.c:1925 #, fuzzy, c-format msgid "cannot read object for %s" msgstr "no es pot llegir l'objecte %s" -#: sha1-file.c:1962 +#: sha1-file.c:1965 #, fuzzy msgid "corrupt commit" msgstr "autor corregit de la comissió" -#: sha1-file.c:1970 +#: sha1-file.c:1973 #, fuzzy msgid "corrupt tag" msgstr "informa de les etiquetes" -#: sha1-file.c:2069 +#: sha1-file.c:2072 #, fuzzy, c-format msgid "read error while indexing %s" msgstr "error en llegir %s" -#: sha1-file.c:2072 +#: sha1-file.c:2075 #, fuzzy, c-format msgid "short read while indexing %s" msgstr "no es pot llegir l'índex" -#: sha1-file.c:2145 sha1-file.c:2154 +#: sha1-file.c:2148 sha1-file.c:2157 #, fuzzy, c-format msgid "%s: failed to insert into database" msgstr "gpg ha fallat en signar les dades" -#: sha1-file.c:2160 +#: sha1-file.c:2163 #, fuzzy, c-format msgid "%s: unsupported file type" msgstr "versió d'índex no compatible %s" -#: sha1-file.c:2184 +#: sha1-file.c:2187 #, fuzzy, c-format msgid "%s is not a valid object" msgstr "«%s» no és una terme vàlid" -#: sha1-file.c:2186 +#: sha1-file.c:2189 #, fuzzy, c-format msgid "%s is not a valid '%s' object" msgstr "%s no és un objecte de «%s» vàlid" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2216 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: sha1-file.c:2403 sha1-file.c:2455 +#: sha1-file.c:2406 sha1-file.c:2458 #, c-format msgid "hash mismatch for %s (expected %s)" -msgstr "no coincideix la suma per a %s (s'esperava %s)" +msgstr "" -#: sha1-file.c:2427 -#, c-format +#: sha1-file.c:2430 +#, fuzzy, c-format msgid "unable to mmap %s" -msgstr "no s'ha pogut fer «mmap» %s" +msgstr "no s'ha pogut obrir %s" -#: sha1-file.c:2432 -#, c-format +#: sha1-file.c:2435 +#, fuzzy, c-format msgid "unable to unpack header of %s" -msgstr "no s'ha pogut desempaquetar la capçalera de %s" +msgstr "no s'ha pogut actualitzar %s" -#: sha1-file.c:2438 -#, c-format +#: sha1-file.c:2441 +#, fuzzy, c-format msgid "unable to parse header of %s" -msgstr "no s'ha pogut analitzar la capçalera de %s" +msgstr "no s'ha pogut llegir %s" -#: sha1-file.c:2449 -#, c-format +#: sha1-file.c:2452 +#, fuzzy, c-format msgid "unable to unpack contents of %s" -msgstr "no s'han pogut desempaquetar els continguts de %s" +msgstr "no s'ha pogut analitzar el contacte: %s" -#: sha1-name.c:487 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "l'SHA1 %s curt és ambigu" -#: sha1-name.c:498 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Els candidats són:" -#: sha1-name.c:797 +#: sha1-name.c:800 +#, fuzzy msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7516,69 +7049,64 @@ msgstr "" "hexadecimals. Aquestes referències es poden crear per error. Per\n" "exemple,\n" "\n" -" git switch -c $br $(git rev-parse ...)\n" +" git checkout -b $br $(git rev-parse ...)\n" "\n" -"on «$br» és buida per algun motiu i es crea una referència de 40 caràcters\n" +"on «$br» és d'alguna manera buida i una referència de 40 caràcters\n" "hexadecimals. Examineu aquestes referències i potser\n" "suprimiu-les. Desactiveu aquest missatge executant\n" "«git config advice.objectNameWarning false»" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:822 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u GiB" +msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:824 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u GiB/s" +msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:832 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u MiB" +msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:834 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u MiB/s" +msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:841 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u KiB" +msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:843 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u KiB/s" +msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:849 -#, c-format +#: strbuf.c:848 +#, fuzzy, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:851 -#, c-format +#: strbuf.c:850 +#, fuzzy, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" -msgstr[0] "%u byte/s" -msgstr[1] "%u bytes/s" - -#: strbuf.c:1149 -#, c-format -msgid "could not edit '%s'" -msgstr "no s'ha pogut editar «%s»" +msgstr[0] "octets" +msgstr[1] "octets" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" @@ -7615,14 +7143,14 @@ msgstr "L'especificació «%s» és en el submòdul «%.*s»" msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida." #: submodule.c:1481 -#, c-format +#, fuzzy, c-format msgid "Could not access submodule '%s'" -msgstr "no s'ha pogut accedir al submòdul «%s»" +msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»" #: submodule.c:1651 #, c-format @@ -7650,16 +7178,11 @@ msgid "submodule '%s' has dirty index" msgstr "el submòdul «%s» té l'índex brut" #: submodule.c:1959 -#, c-format +#, fuzzy, c-format msgid "Submodule '%s' could not be updated." -msgstr "No s'ha pogut actualitzar el submòdul «%s»" - -#: submodule.c:2027 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "" +msgstr "Submòduls canviats però no actualitzats:" -#: submodule.c:2048 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7667,17 +7190,12 @@ msgstr "" "no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de " "treball" -#: submodule.c:2060 submodule.c:2119 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no s'ha trobat el nom pel submòdul «%s»" -#: submodule.c:2064 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "" - -#: submodule.c:2071 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7688,40 +7206,40 @@ msgstr "" "«%s» a\n" "«%s»\n" -#: submodule.c:2154 +#: submodule.c:2109 #, c-format msgid "could not recurse into submodule '%s'" msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»" -#: submodule.c:2198 +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "no s'ha pogut iniciar ls-files a .." -#: submodule.c:2237 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" -#: submodule-config.c:236 -#, c-format +#: submodule-config.c:232 +#, fuzzy, c-format msgid "ignoring suspicious submodule name: %s" -msgstr "s'està ignorant el nom de submòdul sospitòs %s" +msgstr "s'està ignorant la referència amb nom malmès %s" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "no es permeten els valors negatius a submodule.fetchjobs" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "valor no vàlid per a %s" -#: submodule-config.c:769 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" @@ -7756,7 +7274,7 @@ msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»" msgid "could not read from stdin" msgstr "no s'ha pogut llegir des de stdin" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "no s'ha pogut fer stat a %s" @@ -7785,48 +7303,48 @@ msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Canviaria la font de «%s» a «%s» de «%s»\n" -#: transport.c:145 +#: transport.c:142 #, fuzzy, c-format msgid "could not read bundle '%s'" msgstr "no s'ha pogut llegir el fitxer «%s»" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opció de profunditat no vàlida «%s»" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:632 +#: transport.c:625 #, fuzzy msgid "could not parse transport.color.* config" msgstr "no s'ha pogut analitzar l'script d'autor" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:831 +#: transport.c:825 #, fuzzy, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconegut «%s» per a la clau «%s»" -#: transport.c:897 -#, c-format +#: transport.c:891 +#, fuzzy, c-format msgid "transport '%s' not allowed" -msgstr "no es permet el transport «%s»" +msgstr "no s'ha trobat la branca «%s»." -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7835,7 +7353,7 @@ msgstr "" "Els camins de submòdul següents contenen canvis que no\n" "es poden trobar en cap remot:\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -7861,189 +7379,186 @@ msgstr "" "\n" "per a pujar-los a un remot.\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "S'està avortant." -#: transport.c:1201 +#: transport.c:1193 #, fuzzy msgid "failed to push all needed submodules" msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»" -#: transport.c:1345 transport-helper.c:656 +#: transport.c:1340 transport-helper.c:645 +#, fuzzy msgid "operation not supported by protocol" -msgstr "opció no admesa pel protocol" +msgstr "opció no admesa amb --recurse-submodules." -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 #, fuzzy msgid "full write to remote helper failed" msgstr "imprimeix l'estat des de l'ajudant remot" -#: transport-helper.c:144 -#, c-format +#: transport-helper.c:134 +#, fuzzy, c-format msgid "unable to find remote helper for '%s'" -msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»" +msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: transport-helper.c:160 transport-helper.c:570 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:284 transport-helper.c:424 +#: transport-helper.c:274 transport-helper.c:414 #, fuzzy, c-format msgid "%s unexpectedly said: '%s'" msgstr "blob esperat per a %s «%s»" -#: transport-helper.c:413 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s també ha bloquejat %s" -#: transport-helper.c:492 +#: transport-helper.c:481 +#, fuzzy msgid "couldn't run fast-import" -msgstr "no s'ha pogut executar «fast-import»" +msgstr "no s'ha pogut executar «stash»." -#: transport-helper.c:515 +#: transport-helper.c:504 #, fuzzy msgid "error while running fast-import" msgstr "error en tancar el fitxer de paquet" -#: transport-helper.c:544 transport-helper.c:1133 -#, c-format +#: transport-helper.c:533 transport-helper.c:1105 +#, fuzzy, c-format msgid "could not read ref %s" -msgstr "no s'ha pogut llegir la referència %s" +msgstr "No s'ha pogut llegir la referència %s" -#: transport-helper.c:589 +#: transport-helper.c:578 #, fuzzy, c-format msgid "unknown response to connect: %s" msgstr "opció desconeguda: %s\n" -#: transport-helper.c:611 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:613 +#: transport-helper.c:602 #, fuzzy msgid "invalid remote service path" msgstr "referència no vàlida: %s" -#: transport-helper.c:659 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" -msgstr "no es pot connectar al subservei %s" +msgstr "" -#: transport-helper.c:735 +#: transport-helper.c:720 #, fuzzy, c-format msgid "expected ok/error, helper said '%s'" msgstr "blob esperat per a %s «%s»" -#: transport-helper.c:788 +#: transport-helper.c:773 #, fuzzy, c-format msgid "helper reported unexpected status of %s" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" -#: transport-helper.c:849 +#: transport-helper.c:834 #, fuzzy, c-format msgid "helper %s does not support dry-run" msgstr "El servidor no admet --deepen" -#: transport-helper.c:852 +#: transport-helper.c:837 #, fuzzy, c-format msgid "helper %s does not support --signed" msgstr "El servidor no admet --shallow-since" -#: transport-helper.c:855 +#: transport-helper.c:840 #, fuzzy, c-format msgid "helper %s does not support --signed=if-asked" msgstr "el destí receptor no admet pujar --signed" -#: transport-helper.c:860 -#, fuzzy, c-format -msgid "helper %s does not support --atomic" -msgstr "El servidor no admet --shallow-since" - -#: transport-helper.c:866 +#: transport-helper.c:847 #, fuzzy, c-format msgid "helper %s does not support 'push-option'" msgstr "el destí receptor no admet opcions de pujada" -#: transport-helper.c:964 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:969 +#: transport-helper.c:950 #, fuzzy, c-format msgid "helper %s does not support 'force'" msgstr "El servidor no admet --deepen" -#: transport-helper.c:1016 +#: transport-helper.c:997 #, fuzzy msgid "couldn't run fast-export" msgstr "no s'ha pogut executar «stash»." -#: transport-helper.c:1021 +#: transport-helper.c:1002 #, fuzzy msgid "error while running fast-export" msgstr "error en tancar el fitxer de paquet" -#: transport-helper.c:1046 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1119 +#: transport-helper.c:1091 #, fuzzy, c-format msgid "malformed response in ref list: %s" msgstr "full d'opcions mal format: «%s»" -#: transport-helper.c:1271 +#: transport-helper.c:1244 #, fuzzy, c-format msgid "read(%s) failed" msgstr "%s ha fallat" -#: transport-helper.c:1298 +#: transport-helper.c:1271 #, fuzzy, c-format msgid "write(%s) failed" msgstr "%s ha fallat" -#: transport-helper.c:1347 +#: transport-helper.c:1320 #, fuzzy, c-format msgid "%s thread failed" msgstr "%s ha fallat" -#: transport-helper.c:1351 +#: transport-helper.c:1324 #, fuzzy, c-format msgid "%s thread failed to join: %s" msgstr "s'ha produït un error en obrir «%s»" -#: transport-helper.c:1370 transport-helper.c:1374 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1411 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1415 +#: transport-helper.c:1388 #, fuzzy, c-format msgid "%s process failed" msgstr "%s ha fallat" -#: transport-helper.c:1433 transport-helper.c:1442 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "" @@ -8059,16 +7574,11 @@ msgstr "mode mal format en entrada d'arbre" msgid "empty filename in tree entry" msgstr "nom de fitxer buit en una entrada d'arbre" -#: tree-walk.c:48 -#, c-format -msgid "filename in tree entry contains backslash: '%s'" -msgstr "" - -#: tree-walk.c:124 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8078,7 +7588,7 @@ msgstr "" "agafar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8088,7 +7598,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8098,7 +7608,7 @@ msgstr "" "fusionar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de fusionar." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8108,7 +7618,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8117,7 +7627,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%sCometeu els vostres canvis o feu «stash» abans de %s." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8126,7 +7636,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8135,7 +7645,7 @@ msgstr "" "En actualitzar els directoris següents perdria fitxers no seguits en el:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8145,7 +7655,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8155,7 +7665,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8165,7 +7675,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8175,7 +7685,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8184,7 +7694,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%sMoveu-los o elimineu-los abans de %s." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8193,7 +7703,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8204,7 +7714,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8215,7 +7725,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8225,7 +7735,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8235,7 +7745,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8245,7 +7755,7 @@ msgstr "" "%s:\n" "%%sMoveu-los o elimineu-los abans de %s." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8255,12 +7765,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8270,7 +7780,7 @@ msgstr "" "dia:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8281,7 +7791,7 @@ msgstr "" "actualitzar l'agafament parcial:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8292,7 +7802,7 @@ msgstr "" "l'agafament parcial:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8301,27 +7811,23 @@ msgstr "" "No es pot actualitzar el submòdul:\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "S'està avortant\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 +#, fuzzy msgid "Updating files" -msgstr "S'estan actualitzant els fitxers" +msgstr "S'està actualitzant %s" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1441 -#, fuzzy -msgid "Updating index flags" -msgstr "S'estan actualitzant els fitxers" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'" @@ -8351,7 +7857,7 @@ msgstr "número de port no vàlid" msgid "invalid '..' path segment" msgstr "segment de camí '..' no vàlid" -#: worktree.c:258 builtin/am.c:2084 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "s'ha produït un error en llegir «%s»" @@ -8381,17 +7887,17 @@ msgstr "«%s» no és un fitxer .git, codi d'error %d" msgid "'%s' does not point back to '%s'" msgstr "«%s» no assenyala de tornada a «%s»" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "no s'ha pogut accedir a «%s»" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" @@ -8651,20 +8157,20 @@ msgstr "Actualment esteu fent «rebase»." #: wt-status.c:1371 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -" (arregleu els conflictes i després executeu «git rebase --continue»)" +" (arregleu els conflictes i després executeu \"git rebase --continue\")" #: wt-status.c:1373 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (useu «git rebase --skip» per a ometre aquest pedaç)" +msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)" #: wt-status.c:1375 msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " (useu «git rebase --abort» per a agafar la branca original)" +msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" #: wt-status.c:1382 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -" (tots els conflictes estan arreglats: executeu «git rebase --continue»)" +" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" #: wt-status.c:1386 #, c-format @@ -8707,8 +8213,9 @@ msgstr "" "vostres canvis)" #: wt-status.c:1419 +#, fuzzy msgid "Cherry-pick currently in progress." -msgstr "Hi ha «cherry pick» actualment en curs." +msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" #: wt-status.c:1422 #, c-format @@ -8717,7 +8224,7 @@ msgstr "Actualment esteu fent «cherry pick» a la comissió %s." #: wt-status.c:1429 msgid " (fix conflicts and run \"git cherry-pick --continue\")" -msgstr " (arregleu els conflictes i executeu «git cherry-pick --continue»)" +msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" #: wt-status.c:1432 #, fuzzy @@ -8726,97 +8233,91 @@ msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" #: wt-status.c:1435 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu «git cherry-pick --continue»)" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" +"\")" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (useu «git cherry-pick --skip» per a ometre aquest pedaç)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry " "pick»)" -#: wt-status.c:1449 +#: wt-status.c:1447 +#, fuzzy msgid "Revert currently in progress." -msgstr "Una reversió està actualment en curs." +msgstr "avorta la fusió en curs actual" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1459 #, fuzzy msgid " (run \"git revert --continue\" to continue)" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1466 -#, fuzzy -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "«rebase» interactiu en curs; sobre " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "«rebase» en curs; sobre " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Actualment no s'és en cap branca." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" -msgstr "No s'ha fet cap comissió encara" +msgstr "No s'ha fet cap comissió encara." -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8828,31 +8329,31 @@ msgstr "" "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" "'git help status')." -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Sense canvis" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8861,197 +8362,192 @@ msgstr "" "no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add" "\" per a seguir-los)\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" "los)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "no hi ha res a cometre, l'arbre de treball està net\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "No s'ha fet cap comissió encara a " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "diferent" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "darrere " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "davant per " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no es pot %s: Teniu canvis «unstaged»." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "addicionalment, el vostre índex conté canvis sense cometre." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre índex conté canvis sense cometre." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "s'ha produït un error en desenllaçar «%s»" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opcions>] [--] <especificació-de-camí>..." -#: builtin/add.c:87 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:92 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "s'ha produït un error en actualitzar els fitxers" -#: builtin/add.c:102 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "elimina «%s»\n" -#: builtin/add.c:177 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:252 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" -#: builtin/add.c:263 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "No s'ha pogut obrir «%s» per a escriptura." -#: builtin/add.c:267 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "No s'ha pogut escriure el pedaç" -#: builtin/add.c:270 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "l'edició del pedaç ha fallat" -#: builtin/add.c:273 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "No s'ha pogut fer stat a «%s»" -#: builtin/add.c:275 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "El pedaç és buit. S'ha avortat." -#: builtin/add.c:280 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "No s'ha pogut aplicar «%s»" -#: builtin/add.c:288 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" -#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 -#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:311 +#: builtin/add.c:293 msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:313 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "edita la diferència actual i aplica-la" -#: builtin/add.c:314 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:315 +#: builtin/add.c:297 msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: builtin/add.c:316 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:317 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "registra només el fet que el camí s'afegirà més tard" -#: builtin/add.c:318 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:321 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)" -#: builtin/add.c:323 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "no afegeixis, només actualitza l'índex" -#: builtin/add.c:324 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "només omet els fitxers que no es poden afegir a causa d'errors" -#: builtin/add.c:325 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "" "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" -#: builtin/add.c:327 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/add.c:329 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "avisa'm quan s'afegeixi un dipòsit incrustat" -#: builtin/add.c:347 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9069,7 +8565,7 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" "Heu afegit un altre dipòsit git dins del dipòsit actual.\n" -"Els clons de dipòsits externs no contindran els continguts\n" +"Els clons de dipòsits externs no contindran els continguts de\n" "del dipòsit incrustat i no sabran com obtenir-ho.\n" "Si volíeu afegir un submòdul, useu:\n" "\n" @@ -9082,168 +8578,151 @@ msgstr "" "\n" "Vegeu \"git help submodule\" per a més informació." -#: builtin/add.c:375 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "s'està afegint un dipòsit incrustat: %s" -#: builtin/add.c:393 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Useu -f si realment els voleu afegir.\n" -#: builtin/add.c:400 +#: builtin/add.c:379 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" -#: builtin/add.c:428 builtin/commit.c:348 -#, fuzzy -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--first-parent és incompatible amb --bisect" - -#: builtin/add.c:434 -#, fuzzy -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--first-parent és incompatible amb --bisect" - -#: builtin/add.c:446 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A i -u són mútuament incompatibles" -#: builtin/add.c:449 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run" -#: builtin/add.c:453 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x" -#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 -#: builtin/reset.c:327 -#, fuzzy -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--patch és incompatible amb --{hard,mixed,soft}" - -#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 -#: builtin/reset.c:333 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "" - -#: builtin/add.c:482 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "No s'ha especificat res, no s'ha afegit res.\n" -#: builtin/add.c:483 +#: builtin/add.c:446 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Potser volíeu dir «git add .»?\n" -#: builtin/am.c:347 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:431 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit «%s» pel lligam applypatch-msg" -#: builtin/am.c:473 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: «%s»." -#: builtin/am.c:511 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»" -#: builtin/am.c:537 +#: builtin/am.c:538 msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:725 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaç «%s»" -#: builtin/am.c:790 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada" -#: builtin/am.c:838 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "marca de temps no vàlida" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "línia Date no vàlida" -#: builtin/am.c:850 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "desplaçament de zona de temps no vàlid" -#: builtin/am.c:943 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:948 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori «%s»" -#: builtin/am.c:953 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1084 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "no s'ha pogut escriure el fitxer d'índex" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." -#: builtin/am.c:1085 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." -#: builtin/am.c:1086 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort" "\"." -#: builtin/am.c:1169 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1197 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "El pedaç està buit." -#: builtin/am.c:1262 -#, fuzzy, c-format -msgid "missing author line in commit %s" -msgstr "Manca el nom de branca; proveu -b" - -#: builtin/am.c:1265 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "línia d'identitat no vàlida: %.*s" -#: builtin/am.c:1484 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "no s'ha pogut analitzar la comissió %s" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " "vies." -#: builtin/am.c:1486 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..." -#: builtin/am.c:1505 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9251,24 +8730,24 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: builtin/am.c:1511 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..." -#: builtin/am.c:1537 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1569 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1638 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "El cos de la comissió és:" @@ -9276,41 +8755,37 @@ msgstr "El cos de la comissió és:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls " "tots: " -#: builtin/am.c:1695 builtin/commit.c:394 -msgid "unable to write index file" -msgstr "no s'ha pogut escriure el fitxer d'índex" - -#: builtin/am.c:1699 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1756 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1762 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/am.c:1766 +#: builtin/am.c:1777 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1810 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9320,7 +8795,7 @@ msgstr "" "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n" "introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: builtin/am.c:1817 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9333,17 +8808,17 @@ msgstr "" "Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel " "fitxer." -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "No s'ha pogut analitzar l'objecte «%s»." -#: builtin/am.c:1976 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "s'ha produït un error en netejar l'índex" -#: builtin/am.c:2020 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9351,144 +8826,144 @@ msgstr "" "Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" "No s'està rebobinant a ORIG_HEAD" -#: builtin/am.c:2117 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor no vàlid per a --patch-format: %s" -#: builtin/am.c:2153 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]" -#: builtin/am.c:2154 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opcions>] (--continue | --skip | --abort)" -#: builtin/am.c:2160 +#: builtin/am.c:2171 msgid "run interactively" msgstr "executa interactivament" -#: builtin/am.c:2162 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "opció històrica -- no-op" -#: builtin/am.c:2164 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:811 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:307 builtin/stash.c:806 msgid "be quiet" msgstr "silenciós" -#: builtin/am.c:2167 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "afegeix una línia «Signed-off-by» al missatge de comissió" -#: builtin/am.c:2170 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "recodifica en utf8 (per defecte)" -#: builtin/am.c:2172 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "passa l'indicador -k a git-mailinfo" -#: builtin/am.c:2174 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "passa l'indicador -b a git-mailinfo" -#: builtin/am.c:2176 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "passa l'indicador -m a git-mailinfo" -#: builtin/am.c:2178 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox" -#: builtin/am.c:2181 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr" -#: builtin/am.c:2184 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una línia de tisores" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "passa-ho a través de git-apply" -#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 -#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2210 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "el format en el qual estan els pedaços" -#: builtin/am.c:2216 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç" -#: builtin/am.c:2218 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/am.c:2221 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "sinònims de --continue" -#: builtin/am.c:2224 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "omet el pedaç actual" -#: builtin/am.c:2227 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "restaura la branca original i avorta l'operació d'apedaçament." -#: builtin/am.c:2230 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2244 msgid "show the patch being applied." msgstr "mostra el pedaç que s'està aplicant." -#: builtin/am.c:2237 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "menteix sobre la data del comitent" -#: builtin/am.c:2239 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 -#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ID de clau" -#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "signa les comissions amb GPG" -#: builtin/am.c:2245 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(ús intern per a git-rebase)" -#: builtin/am.c:2263 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9496,18 +8971,18 @@ msgstr "" "Fa molt que l'opció -b/--binary no ha fet res, i\n" "s'eliminarà. No l'useu més." -#: builtin/am.c:2270 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/am.c:2285 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "un directori de «rebase» anterior %s encara existeix però s'ha donat una " "bústia." -#: builtin/am.c:2309 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -9516,11 +8991,11 @@ msgstr "" "S'ha trobat un directori %s extraviat.\n" "Useu \"git am --abort\" per a eliminar-lo." -#: builtin/am.c:2315 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Una operació de resolució no està en curs; no reprenem." -#: builtin/am.c:2325 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "" @@ -9571,8 +9046,9 @@ msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" #: builtin/bisect--helper.c:25 +#, fuzzy msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<comissió>]" +msgstr "git bisect--helper --bisect-clean-state" #: builtin/bisect--helper.c:26 #, fuzzy @@ -9637,11 +9113,11 @@ msgid "We are not bisecting.\n" msgstr "No estem bisecant." #: builtin/bisect--helper.c:163 -#, c-format +#, fuzzy, c-format msgid "'%s' is not a valid commit" -msgstr "«%s» no és una comissió vàlida" +msgstr "«%s» no és un terme vàlid" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, fuzzy, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9649,28 +9125,28 @@ msgstr "" "No s'ha pogut agafar la HEAD original '$branch'.\n" "Proveu 'git bisect reset <comissió>'." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, fuzzy, c-format msgid "Bad bisect_write argument: %s" msgstr "Paràmetre bisect_write incorrecte: $state" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, fuzzy, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no es pot canviar el significat del terme «%s»" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, fuzzy, c-format msgid "couldn't open the file '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, fuzzy, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" "Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD." -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, fuzzy, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9679,7 +9155,7 @@ msgstr "" "Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n" "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)" -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, fuzzy, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9690,316 +9166,321 @@ msgstr "" "Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n" "(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)" -#: builtin/bisect--helper.c:322 -#, c-format +#: builtin/bisect--helper.c:321 +#, fuzzy, c-format msgid "bisecting only with a %s commit" -msgstr "bisecant amb només una comissió %s" +msgstr "Advertència: bisecant amb només comissió $TERM_BAD." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:330 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " -#: builtin/bisect--helper.c:377 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "cap terme definit" -#: builtin/bisect--helper.c:380 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:390 -#, c-format +#: builtin/bisect--helper.c:389 +#, fuzzy, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -"paràmetre no vàlid %s per a 'git bisect terms'.\n" +"paràmetre no vàlid $arg per a 'git bisect terms'.\n" "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new." -#: builtin/bisect--helper.c:476 -#, c-format +#: builtin/bisect--helper.c:475 +#, fuzzy, c-format msgid "unrecognized option: '%s'" -msgstr "opció no reconeguda: «%s»" +msgstr "posició no reconeguda:%s" -#: builtin/bisect--helper.c:480 -#, c-format +#: builtin/bisect--helper.c:479 +#, fuzzy, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "«%s» no sembla ser una revisió vàlida" +msgstr "'$arg' no sembla una revisió vàlida" -#: builtin/bisect--helper.c:512 +#: builtin/bisect--helper.c:511 +#, fuzzy msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorrecte - Cal un HEAD" -#: builtin/bisect--helper.c:527 -#, c-format +#: builtin/bisect--helper.c:526 +#, fuzzy, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-" -"vàlida>»." +"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-" +"vàlida>'." -#: builtin/bisect--helper.c:548 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek" -#: builtin/bisect--helper.c:551 +#: builtin/bisect--helper.c:550 #, fuzzy msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorrecte - referència simbòlica estranya" -#: builtin/bisect--helper.c:575 +#: builtin/bisect--helper.c:574 #, fuzzy, c-format msgid "invalid ref: '%s'" msgstr "fitxer no vàlid: «%s»" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "realitza 'git bisect next'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "escriu els termes a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "comprova les revisions esperades" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:638 #, fuzzy msgid "reset the bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:640 #, fuzzy msgid "write out the bisection state in BISECT_LOG" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:642 #, fuzzy msgid "check and set terms in a bisection state" msgstr "neteja l'estat de la bisecció" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:646 #, fuzzy msgid "print out the bisect terms" msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms requereix dos paràmetres" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:680 #, fuzzy msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:685 +#: builtin/bisect--helper.c:684 #, fuzzy msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:691 +#: builtin/bisect--helper.c:690 #, fuzzy msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:696 #, fuzzy msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/bisect--helper.c:703 +#: builtin/bisect--helper.c:702 #, fuzzy msgid "--bisect-terms requires 0 or 1 argument" msgstr "--write-terms requereix dos paràmetres" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, fuzzy, c-format msgid "expecting a color: %s" msgstr "respecta els colors del format" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, fuzzy, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "ignora el color no vàlid «%.*s» en log.graphColors" -#: builtin/blame.c:747 +#: builtin/blame.c:748 #, fuzzy msgid "invalid value for blame.coloring" msgstr "valor no vàlid per a --missing" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, fuzzy, c-format msgid "cannot find revision %s to ignore" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per línia" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "" "Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: " "desactivat)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1646 msgid "rev" msgstr "rev" -#: builtin/blame.c:860 +#: builtin/blame.c:861 #, fuzzy msgid "Ignore <rev> when blaming" msgstr "ignora l'índex en comprovar" -#: builtin/blame.c:861 +#: builtin/blame.c:862 #, fuzzy msgid "Ignore revisions from <file>" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Usa un heurístic experimental per a millorar les diferències" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "puntuació" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Troba còpies de línia dins i a través dels fitxers" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de línies n,m, comptant des d'1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -10012,18 +9493,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "el fitxer %s té només %lu línia" msgstr[1] "el fitxer %s té només %lu línies" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "S'està fent un «blame»" @@ -10239,7 +9720,7 @@ msgstr "configura el mode de seguiment (vegeu git-pull(1))" msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:505 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "font" @@ -10248,8 +9729,7 @@ msgid "change the upstream info" msgstr "canvia la informació de font" #: builtin/branch.c:627 -#, fuzzy -msgid "unset the upstream info" +msgid "Unset the upstream info" msgstr "Desassigna la informació de font" #: builtin/branch.c:628 @@ -10348,11 +9828,11 @@ msgid "sorting and filtering are case insensitive" msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules" #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 -#: builtin/verify-tag.c:38 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:684 builtin/clone.c:784 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" @@ -10441,68 +9921,20 @@ msgstr "" "L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-" "upstream-to." -#: builtin/bundle.c:15 builtin/bundle.c:23 -#, fuzzy -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git remote add [<opcions>] <nom> <url>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -#, fuzzy -msgid "git bundle verify [<options>] <file>" -msgstr "git rm [<opcions>] [--] <fitxer>..." - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3228 -msgid "do not show progress meter" -msgstr "no mostris l'indicador de progrés" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3230 -msgid "show progress meter" -msgstr "mostra l'indicador de progrés" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3232 -msgid "show progress meter during object writing phase" -msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3235 -msgid "similar to --all-progress when progress meter is shown" -msgstr "similar a --all-progress quan l'indicador de progrés es mostra" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "Cal un dipòsit per a fer un farcell." - -#: builtin/bundle.c:104 -#, fuzzy -msgid "do not show bundle details" -msgstr "no mostris les etiquetes pelades" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s està bé\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "Cal un dipòsit per a fer un farcell." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/bundle.c:168 builtin/remote.c:1609 -msgid "be verbose; must be placed before a subcommand" -msgstr "sigues detallat; s'ha de col·locar abans d'un subordre" - -#: builtin/bundle.c:190 builtin/remote.c:1640 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Subordre desconeguda: %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10510,7 +9942,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10518,75 +9950,75 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 #, fuzzy msgid "only one batch option may be specified" msgstr "Cap nom de branca especificat" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "" "en els objectes de blob, executa els filtres en el contingut de l'objecte" -#: builtin/cat-file.c:645 git-submodule.sh:992 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "usa un camí específic per a --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "posa la sortida de --batch en memòria intermèdia" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "mostra tots els objectes amb --batch o --batch-check" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "" @@ -10614,8 +10046,8 @@ msgstr "llegeix els noms de fitxer de stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "omet els informes de progrés" @@ -10706,9 +10138,9 @@ msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 -#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "cadena" @@ -10738,149 +10170,156 @@ msgstr "git checkout [<opcions>] <branca>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "el camí «%s» no té la nostra versió" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "el camí «%s» no té la seva versió" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "el camí «%s» no té totes les versions necessàries" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camí «%s» no té les versions necessàries" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "camí «%s»: no es pot fusionar" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, fuzzy, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "etiqueta de fusió incorrecta en la comissió «%s»" msgstr[1] "etiqueta de fusió incorrecta en la comissió «%s»" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, fuzzy, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "actualitzat %d camí\n" msgstr[1] "actualitzats %d camins\n" -#: builtin/checkout.c:389 -#, c-format +#: builtin/checkout.c:386 +#, fuzzy, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" -msgstr[0] "S'ha actualitzat un camí des de l'índex" -msgstr[1] "S'ha actualitzat %d camins des de l'índex" +msgstr[0] "S'ha produït un error en llegir l'índex" +msgstr[1] "S'ha produït un error en llegir l'índex" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» no es pot usar amb actualització de camins" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "«%s» no es pot usar amb %s" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "No es poden actualitzar els camins i canviar a la branca «%s» a la vegada." -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, fuzzy, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, fuzzy, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "%s: %s no es pot usar amb %s" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "el camí «%s» està sense fusionar" -#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:732 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:835 +#: builtin/checkout.c:736 +#, fuzzy, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "" +"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" +"%%s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No es pot fer reflog per a «%s»: %s\n" -#: builtin/checkout.c:877 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:881 builtin/clone.c:716 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:885 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca «%s»\n" -#: builtin/checkout.c:888 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Ja en «%s»\n" -#: builtin/checkout.c:892 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca «%s»\n" -#: builtin/checkout.c:894 builtin/checkout.c:1291 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova «%s»\n" -#: builtin/checkout.c:896 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca «%s»\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:953 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10903,7 +10342,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:972 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10930,213 +10369,217 @@ msgstr[1] "" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:1051 builtin/checkout.c:1286 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1176 #, fuzzy msgid "only one reference expected" msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1193 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1232 +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1258 builtin/checkout.c:1622 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1303 #, fuzzy, c-format msgid "a branch is expected, got tag '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: builtin/checkout.c:1307 +#: builtin/checkout.c:1305 #, fuzzy, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" "La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»." -#: builtin/checkout.c:1308 builtin/checkout.c:1316 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, fuzzy, c-format msgid "a branch is expected, got '%s'" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: builtin/checkout.c:1311 +#: builtin/checkout.c:1309 #, fuzzy, c-format msgid "a branch is expected, got commit '%s'" msgstr "La vostra branca està al dia amb «%s».\n" -#: builtin/checkout.c:1327 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1331 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1335 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1339 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1343 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1347 +#: builtin/checkout.c:1345 #, fuzzy msgid "you are switching branch while bisecting" msgstr "Actualment esteu bisecant." -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "«%s» no es pot usar amb canvi de branca" -#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 -#: builtin/checkout.c:1380 builtin/checkout.c:1385 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1380 #, fuzzy, c-format msgid "'%s' cannot take <start-point>" msgstr "«%s» no es pot usar amb actualització de camins" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a la no comissió «%s»" -#: builtin/checkout.c:1397 +#: builtin/checkout.c:1395 #, fuzzy msgid "missing branch or commit argument" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 -#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 -#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318 msgid "style" msgstr "estil" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1454 builtin/worktree.c:503 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1461 builtin/merge.c:288 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1464 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si altre arbre de treball té la referència donada" -#: builtin/checkout.c:1477 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1480 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mútuament excloents" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1536 #, fuzzy msgid "-p and --overlay are mutually exclusive" msgstr "-n i -k són mútuament excloents." -#: builtin/checkout.c:1577 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1582 +#: builtin/checkout.c:1578 #, fuzzy msgid "missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1615 +#: builtin/checkout.c:1611 #, fuzzy, c-format msgid "could not resolve %s" msgstr "no s'ha pogut resoldre «%s»" +#: builtin/checkout.c:1623 +#, fuzzy +msgid "you must specify path(s) to restore" +msgstr "Heu d'especificar un directori." + #: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "especificació de camí no vàlida" @@ -11153,17 +10596,7 @@ msgstr "" msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»" -#: builtin/checkout.c:1651 -#, fuzzy -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--first-parent és incompatible amb --bisect" - -#: builtin/checkout.c:1654 builtin/reset.c:324 -#, fuzzy -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--first-parent és incompatible amb --bisect" - -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11171,12 +10604,7 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n" "agafar de l'índex." -#: builtin/checkout.c:1670 -#, fuzzy -msgid "you must specify path(s) to restore" -msgstr "Heu d'especificar un directori." - -#: builtin/checkout.c:1689 +#: builtin/checkout.c:1666 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -11193,75 +10621,75 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 -#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1715 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1720 +#: builtin/checkout.c:1697 #, fuzzy msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1698 #, fuzzy msgid "use overlay mode (default)" msgstr "poda les referències soltes (per defecte)" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1734 #, fuzzy msgid "create and switch to a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1736 #, fuzzy msgid "create/reset and switch to a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1738 #, fuzzy msgid "second guess 'git switch <no-such-branch>'" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1740 #, fuzzy msgid "throw away local modifications" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1804 +#: builtin/checkout.c:1772 #, fuzzy -msgid "which tree-ish to checkout from" +msgid "where the checkout from" msgstr "llegeix l'objecte des de stdin" -#: builtin/checkout.c:1806 +#: builtin/checkout.c:1774 #, fuzzy msgid "restore the index" msgstr "S'ha produït un error en llegir l'índex" -#: builtin/checkout.c:1808 +#: builtin/checkout.c:1776 #, fuzzy msgid "restore the working tree (default)" msgstr "Mostra l'estat de l'arbre de treball" -#: builtin/checkout.c:1810 +#: builtin/checkout.c:1778 #, fuzzy msgid "ignore unmerged entries" msgstr "s'està ignorant %s no fusionat\n" -#: builtin/checkout.c:1811 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "" @@ -11301,7 +10729,7 @@ msgstr "s'ha produït un error en eliminar %s" msgid "could not lstat %s\n" msgstr "no s'ha pogut fer stat a %s" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11314,7 +10742,7 @@ msgstr "" "foo - selecciona un ítem basat en un prefix únic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11335,33 +10763,38 @@ msgstr "" "* - tria tots els ítems\n" " - (buit) finalitza la selecció\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Introduïu els patrons a ignorar>> " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Selecciona els ítems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Adéu.\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11379,56 +10812,64 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avís" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** Ordres ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "I ara què" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'ítem següent:" msgstr[1] "Eliminaria els ítems següents:" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; s'està sortint." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "força" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patró" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "afegiu <patró> per a ignorar les regles" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11436,7 +10877,7 @@ msgstr "" "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11444,7 +10885,7 @@ msgstr "" "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]" @@ -11492,18 +10933,18 @@ msgstr "directori-de-plantilla" msgid "directory from which templates will be used" msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 -#: builtin/submodule--helper.c:1885 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:118 builtin/submodule--helper.c:1394 -#: builtin/submodule--helper.c:1887 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:327 +#: builtin/pack-objects.c:3308 builtin/repack.c:330 msgid "name" msgstr "nom" @@ -11519,8 +10960,8 @@ msgstr "agafa <branca> en lloc de la HEAD del remot" msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "profunditat" @@ -11528,7 +10969,7 @@ msgstr "profunditat" msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297 msgid "time" msgstr "hora" @@ -11536,12 +10977,12 @@ msgstr "hora" msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una hora específica" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1445 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "revisió" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" @@ -11574,23 +11015,23 @@ msgstr "clau=valor" msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "específic al servidor" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opció a transmetre" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "usa només adreces IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" @@ -11599,11 +11040,7 @@ msgstr "usa només adreces IPv6" msgid "any cloned submodules will use their remote-tracking branch" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11611,42 +11048,47 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Especifiqueu un directori en la línia d'ordres" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, fuzzy, c-format msgid "failed to start iterator over '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "s'ha produït un error en desenllaçar «%s»" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "s'ha produït un error en crear l'enllaç «%s»" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha produït un error en copiar el fitxer a «%s»" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, fuzzy, c-format msgid "failed to iterate over '%s'" msgstr "s'ha produït un error en eliminar «%s»" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 #, fuzzy msgid "" "Clone succeeded, but checkout failed.\n" @@ -11658,102 +11100,97 @@ msgstr "" "'git status' i tornar a intentar l'agafament amb\n" "'git checkout -f HEAD'\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la branca remota %s per a clonar." -#: builtin/clone.c:704 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" #: builtin/clone.c:752 -#, fuzzy -msgid "failed to initialize sparse-checkout" -msgstr "s'ha produït un error en finalitzar «%s»" - -#: builtin/clone.c:775 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:806 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:856 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:919 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:921 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:959 builtin/receive-pack.c:1948 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:963 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:976 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:979 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:992 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit «%s» no existeix" -#: builtin/clone.c:998 builtin/fetch.c:1787 +#: builtin/clone.c:977 builtin/fetch.c:1653 #, c-format msgid "depth %s is not a positive number" -msgstr "la profunditat %s no és un nombre positiu" +msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:1008 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "el camí destí «%s» ja existeix i no és un directori buit." -#: builtin/clone.c:1018 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball «%s» ja existeix." -#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: builtin/clone.c:1038 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»" -#: builtin/clone.c:1058 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu «%s»...\n" -#: builtin/clone.c:1060 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a «%s»...\n" -#: builtin/clone.c:1084 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11761,38 +11198,38 @@ msgstr "" "clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" -#: builtin/clone.c:1148 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1150 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1152 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1154 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1157 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1162 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1237 builtin/clone.c:1245 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:1248 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -11839,7 +11276,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "suprimeix les referències reemplaçades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542 #, fuzzy, c-format msgid "not a valid object name %s" msgstr "no és un nom d'objecte vàlid: %s" @@ -11869,13 +11306,13 @@ msgstr "pare" msgid "id of a parent commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "missatge" -#: builtin/commit-tree.c:115 builtin/commit.c:1496 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "missatge de comissió" @@ -11884,8 +11321,8 @@ msgstr "missatge de comissió" msgid "read commit log message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" @@ -11954,66 +11391,57 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:351 -#, fuzzy -msgid "--pathspec-from-file with -a does not make sense" -msgstr "-a no té sentit amb camins." - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "--include/--only no té sentit sense camí." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "no s'ha pogut crear un índex temporal" -#: builtin/commit.c:382 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:396 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'índex temporal" -#: builtin/commit.c:398 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau" -#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:475 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:477 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "no es pot fer una comissió parcial durant un «cherry pick»." -#: builtin/commit.c:485 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "no es pot llegir l'índex" -#: builtin/commit.c:504 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:602 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió «%s» li manca la capçalera d'autor" -#: builtin/commit.c:604 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió «%s» té una línia d'autor mal formada" -#: builtin/commit.c:623 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:676 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12021,38 +11449,38 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:726 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n" -#: builtin/commit.c:728 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard" -#: builtin/commit.c:732 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: builtin/commit.c:763 builtin/commit.c:779 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:770 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:830 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:849 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12067,7 +11495,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:854 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12082,7 +11510,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:867 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12092,7 +11520,7 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:875 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12104,142 +11532,146 @@ msgstr "" "vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:892 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:900 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:907 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:925 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:992 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:1006 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1050 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1064 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "mode ignorat no vàlid «%s»" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid «%s»" -#: builtin/commit.c:1122 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1166 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1175 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1178 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1180 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar." -#: builtin/commit.c:1183 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1193 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1195 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/." -#: builtin/commit.c:1203 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author només es pot usar amb -C, -c o --amend." -#: builtin/commit.c:1220 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1226 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "--include/--only no té sentit sense camí." + +#: builtin/commit.c:1208 #, fuzzy, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1357 builtin/commit.c:1519 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1359 builtin/commit.c:1521 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1361 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "mostra la informació de «stash»" -#: builtin/commit.c:1363 builtin/commit.c:1523 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1347 msgid "version" msgstr "versió" -#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 -#: builtin/worktree.c:650 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1368 builtin/commit.c:1527 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1371 builtin/commit.c:1530 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "mode" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1378 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12247,11 +11679,11 @@ msgstr "" "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. " "(Per defecte: traditional, matching, no.)" -#: builtin/commit.c:1380 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "quan" -#: builtin/commit.c:1381 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12259,173 +11691,173 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1384 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "no detectis canvis de noms" -#: builtin/commit.c:1386 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança" -#: builtin/commit.c:1406 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1489 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1490 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1492 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "author" msgstr "autor" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1495 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "data" -#: builtin/commit.c:1495 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 -#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "comissió" -#: builtin/commit.c:1497 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat de «squash» automàtic per a corregir la comissió " "especificada" -#: builtin/commit.c:1500 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat de «squash» automàtic per a «squash» a la comissió " "especificada" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1506 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1511 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1512 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1513 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1514 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els lligams de precomissió i missatge de comissió" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1531 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1532 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "evita el lligam de post escriptura" -#: builtin/commit.c:1539 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1541 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1614 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1621 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1640 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1647 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1652 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "S'està avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1686 +#: builtin/commit.c:1688 #, fuzzy msgid "" "repository has been updated, but unable to write\n" @@ -12437,66 +11869,74 @@ msgstr "" "que no s'hagi excedit la quota, i després feu \n" "«git reset HEAD» per a recuperar-ho." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" msgstr "" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 -#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1601 msgid "dir" msgstr "directori" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:51 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, fuzzy, c-format msgid "Could not open commit-graph '%s'" msgstr "no s'ha pogut analitzar la comissió «%s»" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:108 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:110 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:112 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:115 +#: builtin/commit-graph.c:172 #, fuzzy msgid "allow writing an incremental commit-graph file" msgstr "Escriu i verifica els fitxers commit-graph de Git" -#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:119 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -12812,57 +12252,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible pels humans" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opcions>] [<comissió>...]" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<opcions>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "davant per" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "lleuger" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "anotat" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'etiqueta anotada %s no té nom incrustat" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'etiqueta «%s» realment és «%s» aquí" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb «%s»" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:407 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12871,7 +12311,7 @@ msgstr "" "Cap etiqueta anotada pot descriure «%s».\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:411 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12880,12 +12320,12 @@ msgstr "" "Cap etiqueta pot descriure «%s».\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:441 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:444 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12894,90 +12334,90 @@ msgstr "" "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n" "s'ha renunciat la cerca a %s\n" -#: builtin/describe.c:512 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "descriu %s\n" -#: builtin/describe.c:515 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte vàlid" -#: builtin/describe.c:523 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no és una comissió o un blob" -#: builtin/describe.c:537 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:538 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:539 +#: builtin/describe.c:537 msgid "use any ref" msgstr "usa qualsevol referència" -#: builtin/describe.c:540 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:541 +#: builtin/describe.c:539 msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:542 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "només segueix la primera mare" -#: builtin/describe.c:545 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:547 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "considera les <n> etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:549 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "només considera les etiquetes que coincideixen amb <patró>" -#: builtin/describe.c:551 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "no consideris les etiquetes que no coincideixen amb <patró>" -#: builtin/describe.c:553 builtin/name-rev.c:473 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "marca" -#: builtin/describe.c:555 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")" -#: builtin/describe.c:558 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")" -#: builtin/describe.c:576 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long és incompatible amb --abbrev=0" -#: builtin/describe.c:605 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:656 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty és incompatible amb les comissions" -#: builtin/describe.c:658 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken és incompatible amb les comissions" @@ -13014,27 +12454,27 @@ msgstr "s'ha donat l'objecte no gestionat «%s»." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "ha fallat: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13042,54 +12482,54 @@ msgstr "" "els formats de diff combinats ('-c' and '--cc') no són admesos \n" "en el mode diff per directoris ('-d' and '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdós fitxers: «%s» i «%s»." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a «%s»." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utilitza `diff.guitool` en comptes de `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaços simbòlics en mode dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "eina" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "utilitza l'eina de diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "imprimeix una llista de totes les eines diff que podeu usar amb `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13097,31 +12537,31 @@ msgstr "" "fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de " "sortida diferent de zero" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "especifiqueu un ordre personalitzat per veure diffs" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "passa-ho a «diff»" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool requereix worktree o --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff és incompatible amb --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool and --extcmd són mútuament excloents" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "no s'ha proporcionat <tool> per --tool=<tool>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>" @@ -13157,182 +12597,156 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" -#: builtin/fast-export.c:852 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "mostra el progrés després de <n> objectes" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "selecciona la gestió de les etiquetes signades" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 #, fuzzy msgid "select handling of commit messages in an alternate encoding" msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Bolca les marques a aquest fitxer" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Importa les marques d'aquest fitxer" -#: builtin/fast-export.c:1169 -#, fuzzy -msgid "Import marks from this file if it exists" -msgstr "Importa les marques d'aquest fitxer" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Imprimeix l'arbre complet de cada comissió" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Usa la característica done per a acabar el corrent" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Omet l'emissió de dades de blob" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1649 msgid "refspec" msgstr "especificació de referència" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Aplica l'especificació de referència a les referències exportades" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opcions>] <grup>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opcions>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "" - -#: builtin/fetch.c:139 builtin/pull.c:204 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:141 builtin/pull.c:248 -#, fuzzy -msgid "set upstream for git pull/fetch" -msgstr "estableix la font per a git pull/status" - -#: builtin/fetch.c:143 builtin/pull.c:207 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:145 builtin/pull.c:210 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "camí al qual pujar el paquet al costat remot" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "força la sobreescriptura de la referència local" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:150 builtin/pull.c:214 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "nombre de submòduls obtinguts en paral·lel" -#: builtin/fetch.c:156 builtin/pull.c:217 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/fetch.c:164 builtin/pull.c:225 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "retén el paquet baixat" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "aprofundeix la història d'un clon superficial basat en temps" -#: builtin/fetch.c:177 builtin/pull.c:231 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13340,128 +12754,107 @@ msgstr "" "per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " "els fitxers de configuració)" -#: builtin/fetch.c:187 builtin/pull.c:234 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:236 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:189 builtin/pull.c:237 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" -msgstr "específica l'obtenció del mapa de referències" +msgstr "mostra el mapa de referències d'obtenció" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 #, fuzzy msgid "run 'gc --auto' after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/fetch.c:201 builtin/pull.c:246 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:203 -#, fuzzy -msgid "write the commit-graph after fetching" -msgstr "poda els remots després d'obtenir-los" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuració fetch.output conté un valor no vàlid %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "sense avanç ràpid" -#: builtin/fetch.c:877 -msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." -msgstr "" - -#: builtin/fetch.c:881 -#, c-format -msgid "" -"It took %.2f seconds to check forced updates. You can use\n" -"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " -"false'\n" -" to avoid this check.\n" -msgstr "" - -#: builtin/fetch.c:911 +#: builtin/fetch.c:879 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:932 +#: builtin/fetch.c:900 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:1017 builtin/fetch.c:1155 +#: builtin/fetch.c:991 builtin/fetch.c:1124 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:1028 +#: builtin/fetch.c:1002 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13471,80 +12864,80 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:1125 +#: builtin/fetch.c:1008 +msgid "" +"Fetch normally indicates which branches had a forced update, but that check " +"has been disabled." +msgstr "" + +#: builtin/fetch.c:1009 +msgid "" +"To re-enable, use '--show-forced-updates' flag or run 'git config fetch." +"showForcedUpdates true'." +msgstr "" + +#: builtin/fetch.c:1011 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use '--no-show-forced-" +"updates'\n" +msgstr "" + +#: builtin/fetch.c:1013 +msgid "" +"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" +msgstr "" + +#: builtin/fetch.c:1094 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:1126 +#: builtin/fetch.c:1095 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1127 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:1159 builtin/remote.c:1035 +#: builtin/fetch.c:1128 builtin/remote.c:1036 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1151 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:1201 +#: builtin/fetch.c:1170 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció «%s» amb valor «%s» no és vàlida per a %s" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1173 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció «%s» per a %s\n" -#: builtin/fetch.c:1412 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "" - -#: builtin/fetch.c:1427 -#, fuzzy -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" - -#: builtin/fetch.c:1429 -#, fuzzy -msgid "not setting upstream for a remote tag" -msgstr "estableix la font per a git pull/status" - -#: builtin/fetch.c:1431 -#, fuzzy -msgid "unknown branch type" -msgstr "tipus d'objecte desconegut %d" - -#: builtin/fetch.c:1433 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" - -#: builtin/fetch.c:1559 builtin/fetch.c:1622 +#: builtin/fetch.c:1477 #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 +#: builtin/fetch.c:1479 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1581 -#, fuzzy, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "no s'ha pogut establir «%s» a «%s»" +#: builtin/fetch.c:1525 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" -#: builtin/fetch.c:1684 +#: builtin/fetch.c:1549 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13552,44 +12945,44 @@ msgstr "" "Cap dipòsit remot especificat. Especifiqueu un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1721 +#: builtin/fetch.c:1586 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1771 +#: builtin/fetch.c:1637 msgid "Negative depth in --deepen is not supported" msgstr "No s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:1773 +#: builtin/fetch.c:1639 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen i --depth són mútuament excloents" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1644 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1646 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1796 +#: builtin/fetch.c:1662 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1798 +#: builtin/fetch.c:1664 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1673 #, c-format msgid "No such remote or remote group: %s" msgstr "No existeix un remot ni un grup remot: %s" -#: builtin/fetch.c:1814 +#: builtin/fetch.c:1680 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:1696 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13601,23 +12994,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "emplena el registre amb <n> entrades del registre curt com a màxim" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "àlies per --log (en desús)" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:681 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "usa <text> com a inici de missatge" -#: builtin/fmt-merge-msg.c:682 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "fitxer del qual llegir" @@ -13683,249 +13076,249 @@ msgstr "imprimeix només les referències que continguin la comissió" msgid "print only refs which don't contain the commit" msgstr "imprimeix només les referències que no continguin la comissió" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "desconegut" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "error en %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "tipus d'objecte incorrecte en l'enllaç" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "manca %s %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "inabastable %s %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, fuzzy, c-format msgid "dangling %s %s" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 #, fuzzy msgid "could not create lost-found" msgstr "no s'ha pogut crear el fitxer «%s»" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "no s'ha pogut finalitzar «%s»" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "S'està comprovant %s" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "S'està comprovant la connectivitat (%d objectes)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "S'està comprovant %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "enllaços trencats" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "arrel %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecte corrupte o no trobat" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr " %s: entrada de referència no vàlida %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, fuzzy, c-format msgid "Checking reflog %s->%s" msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: punter sha1 no vàlid: %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: no és una comissió" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "avís: no hi ha referències per defecte" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objecte corrupte o no trobat: %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no s'ha pogut analitzar l'objecte: %s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "fitxer sha1 malmès: %s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "S'està comprovant el directori d'objecte" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "S'estan comprovant els directoris d'objecte" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "S'està comprovant l'enllaç %s" -#: builtin/fsck.c:695 builtin/index-pack.c:842 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, fuzzy, c-format msgid "%s points to something strange (%s)" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "S'està comprovant l'arbre de la memòria cau" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, fuzzy, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opcions>] [<objecte>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "mostra els objectes penjants" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "fes els objectes d'índex nodes de cap" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "fes que els registres de referències siguin nodes de cap (per defecte)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "també considera els paquets i els objectes alternatius" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "comprova només la connectivitat" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "habilita la comprovació més estricta" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes penjants a .git/lost-found" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "mostra el progrés" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "S'estan comprovant els objectes" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, fuzzy, c-format msgid "%s: object missing" msgstr "mostra la mida de l'objecte" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, fuzzy, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<opcions>]" @@ -13939,17 +13332,17 @@ msgstr "S'ha produït un error en fer fstat %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "s'ha produït un error en moure «%s» a «%s»" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "no es pot fer stat en «%s»" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir «%s»" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13964,62 +13357,62 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, fuzzy, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, fuzzy, c-format msgid "failed to parse prune expiry value %s" msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "S'està empaquetant el dipòsit automàticament en el rerefons per a un " "rendiment òptim.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "S'està empaquetant automàticament el dipòsit per a un rendiment òptim.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu «git help gc» per a neteja manual.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -14045,262 +13438,262 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/pack-objects.c:2722 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, s'està ignorant %s" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:650 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "no es pot fer grep des d'un objecte de tipus %s" -#: builtin/grep.c:716 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció «%c» espera un valor numèric" -#: builtin/grep.c:815 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "cerca en l'índex en lloc de l'arbre de treball" -#: builtin/grep.c:817 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:819 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:821 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:823 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:826 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:828 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:830 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:832 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:834 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:837 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:839 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "cerca als subdirectories (per defecte)" -#: builtin/grep.c:841 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "descendeix com a màxim <profunditat> nivells" -#: builtin/grep.c:845 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX ampliades" -#: builtin/grep.c:848 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:851 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:854 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:857 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:858 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "mostra el nombre de columna de la primera coincidència" -#: builtin/grep.c:859 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:860 +#: builtin/grep.c:858 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:862 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:864 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "mostra només els noms de fitxer en lloc de les línies coincidents" -#: builtin/grep.c:866 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:869 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:871 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:874 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "mostra només les parts de coincidents de la línia" -#: builtin/grep.c:876 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "mostra el nombre de coincidències en lloc de les línies coincidents" -#: builtin/grep.c:877 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:879 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:881 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "mostra el nom de fitxer només una vegada a dalt de les coincidències del " "mateix fitxer" -#: builtin/grep.c:884 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "mostra <n> línies de context abans i després d'una coincidència" -#: builtin/grep.c:887 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "mostra <n> línies de context abans d'una coincidència" -#: builtin/grep.c:889 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "mostra <n> línies de context després d'una coincidència" -#: builtin/grep.c:891 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "usa <n> fils de treball" -#: builtin/grep.c:892 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:895 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "mostra una línia amb el nom de funció abans de les coincidències" -#: builtin/grep.c:897 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:900 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:902 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "coincideix amb <patró>" -#: builtin/grep.c:904 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:916 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:918 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "mostra només les coincidències dels fitxers que coincideixin amb tots els " "patrons" -#: builtin/grep.c:920 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisi de l'expressió grep" -#: builtin/grep.c:924 +#: builtin/grep.c:922 msgid "pager" msgstr "paginador" -#: builtin/grep.c:924 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:928 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:992 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "no s'ha donat cap patró" -#: builtin/grep.c:1028 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1036 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/grep.c:1067 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "combinació d'opcions no vàlida, s'està ignorant --threads" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1068 builtin/pack-objects.c:3405 msgid "no threads support, ignoring --threads" msgstr "no hi ha suport de fils, s'està ignorant --threads" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:1096 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager només funciona en l'arbre de treball" -#: builtin/grep.c:1119 +#: builtin/grep.c:1117 msgid "option not supported with --recurse-submodules" -msgstr "opció no admesa amb --recurse-submodules" +msgstr "opció no admesa amb --recurse-submodules." -#: builtin/grep.c:1125 +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:1131 +#: builtin/grep.c:1129 #, fuzzy msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." -#: builtin/grep.c:1139 +#: builtin/grep.c:1137 #, fuzzy msgid "both --cached and trees are given" msgstr "s'han donat ambdós --caches i arbres." @@ -14489,11 +13882,11 @@ msgstr "error de lectura d'entrada" msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "paquet massa gran per a la definició actual d'off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "el paquet supera la mida màxima permesa" @@ -14557,8 +13950,8 @@ msgstr "hi ha una inconsistència seriosa d'inflació" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:153 +#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" @@ -14620,7 +14013,7 @@ msgstr "confusió més enllà de la bogeria en parse_pack_objects()" msgid "Resolving deltas" msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" @@ -14685,7 +14078,7 @@ msgstr "no es pot emmagatzemar el fitxer empaquetat" msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorrecte" @@ -14736,7 +14129,7 @@ msgstr "--stdin requereix un dipòsit git" msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 #, fuzzy msgid "fsck error in pack objects" msgstr "error en objecte: %s" @@ -14920,132 +14313,139 @@ msgstr "--trailer amb --only-input no té sentit" msgid "no input file given for in-place editing" msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<opcions>] <objecte>..." -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "opció --decorate no vàlida: %s" -#: builtin/log.c:174 +#: builtin/log.c:160 +msgid "" +"log.mailmap is not set; its implicit value will change in an\n" +"upcoming release. To squelch this message and preserve current\n" +"behaviour, set the log.mailmap configuration value to false.\n" +"\n" +"To squelch this message and adopt the new behaviour now, set the\n" +"log.mailmap configuration value to true.\n" +"\n" +"See 'git help config' and search for 'log.mailmap' for further information." +msgstr "" + +#: builtin/log.c:183 msgid "show source" msgstr "mostra la font" -#: builtin/log.c:175 +#: builtin/log.c:184 msgid "Use mail map file" msgstr "Usa el fitxer de mapa de correu" -#: builtin/log.c:177 +#: builtin/log.c:186 msgid "only decorate refs that match <pattern>" msgstr "només decora les referències que coincideixin amb <patró>" -#: builtin/log.c:179 +#: builtin/log.c:188 msgid "do not decorate refs that match <pattern>" msgstr "no decoris les referències que coincideixen amb <patró>" -#: builtin/log.c:180 +#: builtin/log.c:189 msgid "decorate options" msgstr "opcions de decoració" -#: builtin/log.c:183 +#: builtin/log.c:192 msgid "Process line range n,m in file, counting from 1" msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1" -#: builtin/log.c:281 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:551 #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer incorrecte" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:566 builtin/log.c:660 #, fuzzy, c-format msgid "could not read object %s" msgstr "No es pot llegir l'objecte %s" -#: builtin/log.c:670 +#: builtin/log.c:685 #, fuzzy, c-format msgid "unknown type: %d" msgstr "Tipus desconegut: %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "" - -#: builtin/log.c:821 +#: builtin/log.c:808 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:936 +#: builtin/log.c:925 msgid "name of output directory is too long" msgstr "el nom del directori de sortida és massa llarg" -#: builtin/log.c:952 +#: builtin/log.c:941 #, fuzzy, c-format msgid "cannot open patch file %s" msgstr "No es pot obrir el fitxer de pedaç %s" -#: builtin/log.c:969 +#: builtin/log.c:958 #, fuzzy msgid "need exactly one range" msgstr "Cal exactament un rang." -#: builtin/log.c:979 +#: builtin/log.c:968 #, fuzzy msgid "not a range" msgstr "No és un rang." -#: builtin/log.c:1143 +#: builtin/log.c:1091 #, fuzzy msgid "cover letter needs email format" msgstr "La carta de presentació necessita el format de correu electrònic" -#: builtin/log.c:1149 +#: builtin/log.c:1097 #, fuzzy msgid "failed to create cover-letter file" msgstr "S'ha produït un error en crear els fitxers de sortida" -#: builtin/log.c:1228 +#: builtin/log.c:1176 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1255 +#: builtin/log.c:1203 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]" -#: builtin/log.c:1313 +#: builtin/log.c:1261 #, fuzzy msgid "two output directories?" msgstr "Hi ha dos directoris de sortida?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, fuzzy, c-format msgid "unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida" -#: builtin/log.c:1439 +#: builtin/log.c:1387 #, fuzzy msgid "could not find exact merge base" msgstr "No s'ha pogut trobar la base exacta de fusió." -#: builtin/log.c:1443 +#: builtin/log.c:1391 #, fuzzy msgid "" "failed to get upstream, if you want to record base commit automatically,\n" @@ -15058,282 +14458,274 @@ msgstr "" "seguir una branca remota. O podeu especificar la comissió base manualment\n" "amb --base=<id-de-comissió-base>." -#: builtin/log.c:1463 +#: builtin/log.c:1411 #, fuzzy msgid "failed to find exact merge base" msgstr "S'ha produït un error en trobar la base exacta de fusió." -#: builtin/log.c:1474 +#: builtin/log.c:1422 msgid "base commit should be the ancestor of revision list" msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions" -#: builtin/log.c:1478 +#: builtin/log.c:1426 msgid "base commit shouldn't be in revision list" msgstr "la comissió base no ha de ser en la llista de revisions" -#: builtin/log.c:1531 +#: builtin/log.c:1479 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1583 +#: builtin/log.c:1531 #, fuzzy msgid "failed to infer range-diff ranges" msgstr "s'ha produït un error en executar «%s»" -#: builtin/log.c:1629 +#: builtin/log.c:1576 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç" -#: builtin/log.c:1632 +#: builtin/log.c:1579 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:1636 +#: builtin/log.c:1583 msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:1638 +#: builtin/log.c:1585 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1640 +#: builtin/log.c:1587 msgid "use simple number sequence for output file names" msgstr "usa una seqüència de números per als noms dels fitxers de sortida" -#: builtin/log.c:1641 +#: builtin/log.c:1588 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1642 +#: builtin/log.c:1589 msgid "use <sfx> instead of '.patch'" msgstr "usa <sufix> en lloc de '.patch'" -#: builtin/log.c:1644 +#: builtin/log.c:1591 msgid "start numbering patches at <n> instead of 1" msgstr "comença numerant els pedaços a <n> en lloc d'1" -#: builtin/log.c:1646 +#: builtin/log.c:1593 msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:1648 +#: builtin/log.c:1595 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] en lloc de [PATCH]" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "" - -#: builtin/log.c:1654 +#: builtin/log.c:1598 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefix>] en lloc de [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1601 msgid "store resulting files in <dir>" msgstr "emmagatzema els fitxers resultants a <directori>" -#: builtin/log.c:1660 +#: builtin/log.c:1604 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1607 msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:1665 +#: builtin/log.c:1609 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capçalera From" -#: builtin/log.c:1667 +#: builtin/log.c:1611 msgid "don't include a patch matching a commit upstream" msgstr "no incloguis pedaços que coincideixin amb comissions a la font" -#: builtin/log.c:1669 +#: builtin/log.c:1613 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" -#: builtin/log.c:1671 +#: builtin/log.c:1615 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1672 +#: builtin/log.c:1616 msgid "header" msgstr "capçalera" -#: builtin/log.c:1673 +#: builtin/log.c:1617 msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1618 builtin/log.c:1620 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1674 +#: builtin/log.c:1618 msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:1676 +#: builtin/log.c:1620 msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1678 +#: builtin/log.c:1622 msgid "ident" msgstr "identitat" -#: builtin/log.c:1679 +#: builtin/log.c:1623 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "estableix l'adreça From a <identitat> (o la identitat del comitent si manca)" -#: builtin/log.c:1681 +#: builtin/log.c:1625 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1682 +#: builtin/log.c:1626 msgid "make first mail a reply to <message-id>" msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1627 builtin/log.c:1630 msgid "boundary" msgstr "límit" -#: builtin/log.c:1684 +#: builtin/log.c:1628 msgid "attach the patch" msgstr "adjunta el pedaç" -#: builtin/log.c:1687 +#: builtin/log.c:1631 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1691 +#: builtin/log.c:1635 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1693 +#: builtin/log.c:1637 msgid "signature" msgstr "signatura" -#: builtin/log.c:1694 +#: builtin/log.c:1638 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1695 +#: builtin/log.c:1639 msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:1696 +#: builtin/log.c:1640 msgid "add prerequisite tree info to the patch series" msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços" -#: builtin/log.c:1698 +#: builtin/log.c:1642 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1699 +#: builtin/log.c:1643 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1701 +#: builtin/log.c:1645 msgid "show progress while generating patches" msgstr "mostra el progrés durant la generació de pedaços" -#: builtin/log.c:1703 +#: builtin/log.c:1647 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1706 +#: builtin/log.c:1650 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1708 +#: builtin/log.c:1652 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1792 +#: builtin/log.c:1727 #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat no vàlida: %s" -#: builtin/log.c:1807 +#: builtin/log.c:1742 #, fuzzy msgid "-n and -k are mutually exclusive" msgstr "-n i -k són mútuament excloents." -#: builtin/log.c:1809 +#: builtin/log.c:1744 #, fuzzy msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc i -k són mútuament excloents." -#: builtin/log.c:1817 +#: builtin/log.c:1752 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1819 +#: builtin/log.c:1754 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1821 +#: builtin/log.c:1756 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1854 +#: builtin/log.c:1788 msgid "standard output, or directory, which one?" msgstr "sortida estàndard o directori, quin dels dos?" -#: builtin/log.c:1958 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1962 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1963 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1969 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1973 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1981 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1982 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1993 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura «%s»" -#: builtin/log.c:2029 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "S'estan generant els pedaços" -#: builtin/log.c:2073 +#: builtin/log.c:1992 #, fuzzy msgid "failed to create output files" msgstr "S'ha produït un error en crear els fitxers de sortida" -#: builtin/log.c:2132 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15462,7 +14854,7 @@ msgstr "" msgid "do not print remote URL" msgstr "no imprimeixis l'URL remot" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "executable" @@ -15572,33 +14964,33 @@ msgstr "Les estratègies disponibles són:" msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "mostra les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" @@ -15606,28 +14998,28 @@ msgstr "edita el missatge abans de cometre" msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" @@ -15648,14 +15040,13 @@ msgstr "restableix HEAD, l'índex i l'arbre de treball" msgid "continue the current in-progress merge" msgstr "continua la fusió en curs actual" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" #: builtin/merge.c:290 -#, fuzzy -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "evita els lligams de precomissió i missatge de comissió" +msgid "verify commit-msg hook" +msgstr "verifica el lligam de missatge de comissió" #: builtin/merge.c:307 msgid "could not run stash." @@ -15698,32 +15089,32 @@ msgstr "«%s» no assenyala una comissió" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" -#: builtin/merge.c:705 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "No s'està gestionant res a part de la fusió de dos caps." -#: builtin/merge.c:719 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:734 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:786 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de «%s»" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n" -#: builtin/merge.c:801 +#: builtin/merge.c:804 #, fuzzy msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -15737,12 +15128,12 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:806 +#: builtin/merge.c:809 #, fuzzy msgid "An empty message aborts the commit.\n" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:809 +#: builtin/merge.c:812 #, fuzzy, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15752,75 +15143,75 @@ msgstr "" "S'ignoraran les línies que comencin amb «%c», i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/merge.c:862 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:877 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:938 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el " "resultat.\n" -#: builtin/merge.c:977 +#: builtin/merge.c:972 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:979 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:981 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "No hi ha cap font per defecte definida per a la branca actual." -#: builtin/merge.c:986 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" -#: builtin/merge.c:1043 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte «%s» en l'entorn «%s»" -#: builtin/merge.c:1146 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1180 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "no és quelcom que puguem fusionar" -#: builtin/merge.c:1283 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1287 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1296 +#: builtin/merge.c:1291 #, fuzzy msgid "--quit expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1309 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue no accepta paràmetres" -#: builtin/merge.c:1313 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)." -#: builtin/merge.c:1329 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15828,7 +15219,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1336 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15836,99 +15227,99 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1339 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1353 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1355 +#: builtin/merge.c:1350 #, fuzzy msgid "You cannot combine --squash with --commit." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1371 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hi ha una comissió especificada i merge.defaultToUpstream no està " "establert." -#: builtin/merge.c:1388 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a un HEAD buit encara no es permet" -#: builtin/merge.c:1390 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit" -#: builtin/merge.c:1395 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1397 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només una comissió a un HEAD buit" -#: builtin/merge.c:1476 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1485 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Ja està al dia." -#: builtin/merge.c:1495 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1537 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "S'està intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1544 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1569 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1575 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1602 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1654 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1656 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1665 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "S'està usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1677 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16016,33 +15407,33 @@ msgstr "no avisis de conflictes" msgid "set labels for file1/orig-file/file2" msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "opció desconeguda %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "no s'ha pogut analitzar l'objecte «%s»" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s." msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "no s'està gestionant res a part de la fusió de dos caps." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "no s'ha pogut resoldre la referència «%s»" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "S'està fusionant %s amb %s\n" @@ -16065,36 +15456,36 @@ msgstr "permet la creació de més d'un arbre" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "hi ha massa paràmetres" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, fuzzy, c-format msgid "unrecognized subcommand: %s" msgstr "subordre desconeguda: %s" #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" -msgstr "git mv [<opcions>] <origen>... <destí>" +msgstr "git mv [<opcions>] <font>... <destí>" #: builtin/mv.c:83 #, c-format @@ -16132,7 +15523,7 @@ msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n" #: builtin/mv.c:184 msgid "bad source" -msgstr "origen incorrecte" +msgstr "font incorrecta" #: builtin/mv.c:187 msgid "can not move directory into itself" @@ -16144,7 +15535,7 @@ msgstr "no es pot moure un directori sobre un fitxer" #: builtin/mv.c:199 msgid "source directory is empty" -msgstr "el directori d'origen està buit" +msgstr "el directori font està buit" #: builtin/mv.c:224 msgid "not under version control" @@ -16165,7 +15556,7 @@ msgstr "No es pot sobreescriure" #: builtin/mv.c:241 msgid "multiple sources for the same target" -msgstr "múltiples orígens per al mateix destí" +msgstr "múltiples fonts per al mateix destí" #: builtin/mv.c:243 msgid "destination directory does not exist" @@ -16181,52 +15572,52 @@ msgstr "%s, origen=%s, destí=%s" msgid "Renaming %s to %s\n" msgstr "S'està canviant el nom de %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de «%s» ha fallat" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opcions>] <comissió>..." -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opcions>] --all" -#: builtin/name-rev.c:405 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opcions>] --stdin" -#: builtin/name-rev.c:462 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "imprimeix només els noms (sense SHA-1)" -#: builtin/name-rev.c:463 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "només usa les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignora les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:469 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:470 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "llegeix de stdin" -#: builtin/name-rev.c:471 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms `undefined` (per defecte)" -#: builtin/name-rev.c:477 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "desreferencia les etiquetes en l'entrada (ús intern)" @@ -16457,7 +15848,7 @@ msgid "" "existing notes" msgstr "" "No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. " -"Useu '-f' per a sobreescriure les notes existents" +"Useu '-f' per a sobreescriure les notes existents." #: builtin/notes.c:463 builtin/notes.c:544 #, c-format @@ -16629,7 +16020,7 @@ msgstr "l'intent d'eliminar una nota no existent no és un error" msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "no eliminis, només mostra" @@ -16645,7 +16036,7 @@ msgstr "referència de notes" msgid "use notes from <notes-ref>" msgstr "usa les notes de <referència-de-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" @@ -16664,380 +16055,391 @@ msgstr "" "git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < " "<llista-de-objectes>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:424 #, fuzzy, c-format msgid "bad packed object CRC for %s" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:435 #, fuzzy, c-format msgid "corrupt packed object for %s" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:566 #, fuzzy, c-format msgid "recursive delta detected for object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:777 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:794 +#: builtin/pack-objects.c:790 #, fuzzy, c-format msgid "packfile is invalid: %s" msgstr "%s no vàlid" -#: builtin/pack-objects.c:798 +#: builtin/pack-objects.c:794 #, fuzzy, c-format msgid "unable to open packfile for reuse: %s" msgstr "no s'ha pogut obrir o llegir %s" -#: builtin/pack-objects.c:802 +#: builtin/pack-objects.c:798 #, fuzzy msgid "unable to seek in reused packfile" msgstr "no es pot llegir el fitxer d'índex" -#: builtin/pack-objects.c:813 +#: builtin/pack-objects.c:809 #, fuzzy msgid "unable to read from reused packfile" msgstr "no es pot llegir el fitxer d'índex" -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:837 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets " "a causa de pack.packSizeLimit" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:850 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:917 builtin/update-index.c:90 +#: builtin/pack-objects.c:912 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "s'ha produït un error en fer stat a %s" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:965 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1161 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'empaqueten" -#: builtin/pack-objects.c:1592 +#: builtin/pack-objects.c:1591 #, fuzzy, c-format msgid "delta base offset overflow in pack for %s" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/pack-objects.c:1601 +#: builtin/pack-objects.c:1600 #, fuzzy, c-format msgid "delta base offset out of bound for %s" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/pack-objects.c:1870 +#: builtin/pack-objects.c:1869 msgid "Counting objects" msgstr "S'estan comptant els objectes" -#: builtin/pack-objects.c:2000 +#: builtin/pack-objects.c:1999 #, fuzzy, c-format msgid "unable to get size of %s" msgstr "no s'ha pogut moure %s a %s" -#: builtin/pack-objects.c:2015 +#: builtin/pack-objects.c:2014 #, fuzzy, c-format msgid "unable to parse object header of %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 -#: builtin/pack-objects.c:2111 +#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 +#: builtin/pack-objects.c:2110 #, fuzzy, c-format msgid "object %s cannot be read" msgstr "objecte %s no trobat" -#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 +#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2125 +#: builtin/pack-objects.c:2124 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2450 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2582 #, fuzzy, c-format msgid "unable to pack objects reachable from tag %s" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2669 msgid "Compressing objects" msgstr "S'estan comprimint els objectes" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2675 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2742 +#: builtin/pack-objects.c:2756 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2748 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2860 msgid "invalid value for --missing" msgstr "valor no vàlid per a --missing" -#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 +#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 #, fuzzy msgid "cannot open pack index" msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:2950 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3035 #, fuzzy msgid "unable to force loose object" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/pack-objects.c:3113 +#: builtin/pack-objects.c:3127 #, fuzzy, c-format msgid "not a rev '%s'" msgstr "no es pot llegir «%s»" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3130 #, c-format msgid "bad revision '%s'" msgstr "revisió incorrecte «%s»" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3155 msgid "unable to add recent objects" msgstr "no s'han pogut afegir els objectes recents" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3208 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3212 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex incorrecta «%s»" -#: builtin/pack-objects.c:3236 +#: builtin/pack-objects.c:3242 +msgid "do not show progress meter" +msgstr "no mostris l'indicador de progrés" + +#: builtin/pack-objects.c:3244 +msgid "show progress meter" +msgstr "mostra l'indicador de progrés" + +#: builtin/pack-objects.c:3246 +msgid "show progress meter during object writing phase" +msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" + +#: builtin/pack-objects.c:3249 +msgid "similar to --all-progress when progress meter is shown" +msgstr "similar a --all-progress quan l'indicador de progrés es mostra" + +#: builtin/pack-objects.c:3250 msgid "<version>[,<offset>]" msgstr "<versió>[,<desplaçament>]" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3251 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'índex de paquet en la versió de format d'índex " "especificada" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3254 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer empaquetat de sortida" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3256 msgid "ignore borrowed objects from alternate object store" msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3258 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3260 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3262 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3264 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longitud màxima de la cadena de diferències permesa en el paquet resultant" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3266 msgid "reuse existing deltas" msgstr "reusa les diferències existents" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3268 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3270 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3272 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de diferències" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3274 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3276 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3278 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als quals encara no s'hagin empaquetat" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3281 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3284 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3287 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3290 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3292 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3294 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3296 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3298 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3301 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3303 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3305 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per a les obtencions superficials" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3307 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:3295 +#: builtin/pack-objects.c:3309 #, fuzzy msgid "ignore this pack" msgstr "usa el paquet prim" -#: builtin/pack-objects.c:3297 +#: builtin/pack-objects.c:3311 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3313 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3315 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un índex de mapa de bits, si està disponible, per a accelerar el " "recompte d'objectes" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3317 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet" -#: builtin/pack-objects.c:3307 -#, fuzzy -msgid "write a bitmap index if possible" -msgstr "escriu índex de mapa de bits" - -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3320 msgid "handling for missing objects" msgstr "gestió dels objectes absents" -#: builtin/pack-objects.c:3314 +#: builtin/pack-objects.c:3323 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3316 +#: builtin/pack-objects.c:3325 #, fuzzy msgid "respect islands during delta compression" msgstr "mida de la finestra que s'usa per a compressió de diferències" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3350 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3355 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3409 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3411 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3416 #, fuzzy msgid "--thin cannot be used to build an indexable pack" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3419 #, fuzzy msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable i -A són incompatibles" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3425 #, fuzzy msgid "cannot use --filter without --stdout" msgstr "no es pot usar -a amb -d" -#: builtin/pack-objects.c:3481 +#: builtin/pack-objects.c:3486 msgid "Enumerating objects" msgstr "S'estan enumerant els objectes" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3516 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -17093,45 +16495,45 @@ msgstr "Valor no vàlid per a %s: %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/pull.c:142 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/pull.c:146 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Opcions relacionades amb fusionar" -#: builtin/pull.c:149 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora els canvis fent «rebase» en lloc de fusionar" -#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permet l'avanç ràpid" -#: builtin/pull.c:186 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "" "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»" -#: builtin/pull.c:202 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Opcions relacionades amb obtenir" -#: builtin/pull.c:212 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "força la sobreescriptura de la branca local" -#: builtin/pull.c:220 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "nombre de submòduls baixats en paral·lel" -#: builtin/pull.c:320 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor no vàlid per a pull.ff: %s" -#: builtin/pull.c:437 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17139,13 +16541,13 @@ msgstr "" "No hi ha cap candidat sobre el qual fer «rebase» entre les referències que " "acabeu d'obtenir." -#: builtin/pull.c:439 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir." -#: builtin/pull.c:440 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17153,7 +16555,7 @@ msgstr "" "Generalment això vol dir que heu proveït una especificació de\n" "referència de comodí que no tenia cap coincidència en el costat remot." -#: builtin/pull.c:443 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17164,44 +16566,44 @@ msgstr "" "Perquè aquest no és el remot configurat per defecte per a la vostra\n" "branca actual, heu d'especificar una branca en la línia d'ordres." -#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Actualment no sou en cap branca." -#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." -msgstr "Especifiqueu sobre quina branca voleu fer «rebase»." +msgstr "Especifiqueu sobre què branca voleu fer «rebase»." -#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Especifiqueu amb quina branca voleu fusionar." -#: builtin/pull.c:453 builtin/pull.c:468 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Vegeu git-pull(1) per detalls." -#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 -#: builtin/rebase.c:1381 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remot>" -#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branca>" -#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hi ha cap informació de seguiment per a la branca actual." -#: builtin/pull.c:472 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho " "amb:" -#: builtin/pull.c:477 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17210,33 +16612,33 @@ msgstr "" "La vostra configuració especifica fusionar amb la referència «%s»\n" "del remot, però no s'ha obtingut tal referència." -#: builtin/pull.c:587 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "no s'ha pogut accedir a la comissió %s" -#: builtin/pull.c:867 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "s'està ignorant --verify-signatures en fer «rebase»" -#: builtin/pull.c:922 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase." -#: builtin/pull.c:930 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "" "S'està actualitzant una branca no nascuda amb canvis afegits a l'índex." -#: builtin/pull.c:934 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "baixar fent «rebase»" -#: builtin/pull.c:935 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "cometeu-los o emmagatzemeu-los." -#: builtin/pull.c:960 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17247,7 +16649,7 @@ msgstr "" "s'està avançant ràpidament el vostre arbre de treball des de\n" "la comissió %s." -#: builtin/pull.c:966 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17265,15 +16667,15 @@ msgstr "" "$ git reset --hard\n" "per a recuperar." -#: builtin/pull.c:981 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "No es poden fusionar múltiples branques a un HEAD buit." -#: builtin/pull.c:985 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "No es pot fer «rebase» sobre múltiples branques." -#: builtin/pull.c:992 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no es pot fer «rebase» amb modificacions als submòduls enregistrades " @@ -17283,15 +16685,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "abreviatura d'etiqueta sense <tag>" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete només accepta noms de referència de destí senzills" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17300,7 +16702,7 @@ msgstr "" "Per a triar qualsevol opció permanentment, vegeu push.default a 'git help " "config'." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17325,7 +16727,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17340,7 +16742,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-branca-remota>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17353,13 +16755,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branca actual %s té múltiples branques fonts, s'està refusant pujar." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17370,14 +16772,14 @@ msgstr "" "branca actual «%s», sense dir-me què pujar per a actualitzar\n" "quina branca remota." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No heu especificat cap especificació de referència a pujar, i push.default " "és \"nothing\"." -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17389,7 +16791,7 @@ msgstr "" "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17402,7 +16804,7 @@ msgstr "" "abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17417,12 +16819,12 @@ msgstr "" "pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -17433,141 +16835,141 @@ msgstr "" "fer que assenyali un objecte no de comissió, sense usar l'opció\n" "'--force'.\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "S'està pujant a %s\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "s'ha produït un error en pujar algunes referències a «%s»" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "dipòsit incorrecte «%s»" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"No hi ha cap destí de pujada configurat.\n" +"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot " +"fent servir\n" +"\n" +" git remote add <nom> <url>\n" +"\n" +"i després pugeu fent servir el nom remot\n" +"\n" +" git push <nom>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "dipòsit" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "puja totes les referències" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<nom-de-referència>:<esperat>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "poda les referències eliminades localment" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "evita el lligam de prepujada" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signa la pujada amb GPG" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "demana una transacció atòmica al costat remot" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "dipòsit incorrecte «%s»" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"No hi ha cap destí de pujada configurat.\n" -"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot " -"fent servir\n" -"\n" -" git remote add <nom> <url>\n" -"\n" -"i després pugeu fent servir el nom remot\n" -"\n" -" git push <nom>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all i --tags són incompatibles" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all no es pot combinar amb especificacions de referència" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror i --tags són incompatibles" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no es pot combinar amb especificacions de referència" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all i --mirror són incompatibles" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "les opcions de pujada no han de tenir caràcters de línia nova" @@ -17585,34 +16987,24 @@ msgstr "git merge [<opcions>] [<comissió>...]" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git mv [<opcions>] <font>... <destí>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "utilitza colors simples de diff" -#: builtin/range-diff.c:26 -#, fuzzy -msgid "notes" -msgstr "notes" - -#: builtin/range-diff.c:26 -#, fuzzy -msgid "passed to 'git log'" -msgstr "passa-ho a «git am»" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "cap .. en rang: «%s»" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "el format de l'argument únic ha de ser de rang simètric" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "calen dos rangs de comissió" @@ -17695,16 +17087,11 @@ msgstr "depura unpack-trees" msgid "suppress feedback messages" msgstr "omet els missatges informatius" -#: builtin/read-tree.c:188 -#, fuzzy -msgid "You need to resolve your current index first" -msgstr "heu de primer resoldre el vostre índex actual" - #: builtin/rebase.c:32 #, fuzzy msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" "git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> " "[<camí>...]" @@ -17718,227 +17105,227 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "llista per a fer inestable: «%s»" -#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 #, c-format msgid "could not write '%s'." msgstr "no s'ha pogut escriure a «%s»." -#: builtin/rebase.c:271 +#: builtin/rebase.c:252 msgid "no HEAD?" msgstr "no hi ha cap HEAD?" -#: builtin/rebase.c:298 +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "no s'ha pogut crear el fitxer temporal %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "no s'ha pogut marcar com a interactiu" -#: builtin/rebase.c:362 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "no s'ha pogut generar la llista per a fer" -#: builtin/rebase.c:402 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:457 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opcions>]" -#: builtin/rebase.c:469 +#: builtin/rebase.c:449 msgid "keep empty commits" msgstr "mantén les comissions buides" -#: builtin/rebase.c:471 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/rebase.c:472 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "fes «rebase» de les comissions de fusió" -#: builtin/rebase.c:474 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:476 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:477 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "signa les comissions" -#: builtin/rebase.c:479 builtin/rebase.c:1455 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "continua el «rebase»" -#: builtin/rebase.c:483 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "omet la comissió" -#: builtin/rebase.c:484 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "edita la llista a fer" -#: builtin/rebase.c:486 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "mostra el pedaç actual" -#: builtin/rebase.c:489 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "escurça els ids de les comissions en la llista per a fer" -#: builtin/rebase.c:491 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "expandeix els ids de les comissions en la llista per a fer" -#: builtin/rebase.c:493 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "comprova la llista a fer" -#: builtin/rebase.c:495 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "reorganitza les línies «fixup/pick»" -#: builtin/rebase.c:497 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "expandeix les ordres exec en la llista per a fer" -#: builtin/rebase.c:498 +#: builtin/rebase.c:478 msgid "onto" msgstr "" -#: builtin/rebase.c:501 +#: builtin/rebase.c:481 #, fuzzy msgid "restrict-revision" msgstr "revisió" -#: builtin/rebase.c:501 +#: builtin/rebase.c:481 #, fuzzy msgid "restrict revision" msgstr "revisió" -#: builtin/rebase.c:503 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:504 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "" -#: builtin/rebase.c:506 +#: builtin/rebase.c:486 #, fuzzy msgid "the upstream commit" msgstr "Desassigna la informació de font" -#: builtin/rebase.c:508 +#: builtin/rebase.c:488 #, fuzzy msgid "head-name" msgstr "canvi de nom" -#: builtin/rebase.c:508 +#: builtin/rebase.c:488 #, fuzzy msgid "head name" msgstr "davant per " -#: builtin/rebase.c:513 +#: builtin/rebase.c:493 #, fuzzy msgid "rebase strategy" msgstr "estratègia de fusió" -#: builtin/rebase.c:514 +#: builtin/rebase.c:494 #, fuzzy msgid "strategy-opts" msgstr "estratègia" -#: builtin/rebase.c:515 +#: builtin/rebase.c:495 #, fuzzy msgid "strategy options" msgstr "opcions de decoració" -#: builtin/rebase.c:516 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "" -#: builtin/rebase.c:517 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:498 #, fuzzy msgid "onto-name" msgstr "nom" -#: builtin/rebase.c:518 +#: builtin/rebase.c:498 #, fuzzy msgid "onto name" msgstr "nom del remot" -#: builtin/rebase.c:519 +#: builtin/rebase.c:499 #, fuzzy msgid "cmd" msgstr "ordre" -#: builtin/rebase.c:519 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "l'ordre a executar" -#: builtin/rebase.c:522 builtin/rebase.c:1540 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:540 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:556 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requereix un «rebase» interactiu" -#: builtin/rebase.c:608 +#: builtin/rebase.c:586 #, fuzzy, c-format msgid "could not get 'onto': '%s'" msgstr "no s'ha pogut establir «%s» a «%s»" -#: builtin/rebase.c:623 +#: builtin/rebase.c:601 #, fuzzy, c-format msgid "invalid orig-head: '%s'" msgstr "fitxer no vàlid: «%s»" -#: builtin/rebase.c:648 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:724 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "No s'ha pogut llegir «%s»" -#: builtin/rebase.c:742 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "No es pot emmagatzemar %s" -#: builtin/rebase.c:849 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "no s'ha pogut determinar la revisió de HEAD" -#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17947,13 +17334,13 @@ msgid "" "abort\"." msgstr "" "Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n" -"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --" +"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --" "continue».\n" "Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n" "Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», " "executeu «git rebase --abort»." -#: builtin/rebase.c:1060 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -17965,7 +17352,7 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -17982,7 +17369,7 @@ msgstr "" " git rebase '<branca>'\n" "\n" -#: builtin/rebase.c:1383 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17996,195 +17383,165 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1364 #, fuzzy msgid "exec commands cannot contain newlines" msgstr "expandeix les ordres exec en la llista per a fer" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "fes un «rebase» en la branca donada en comptes de la font" -#: builtin/rebase.c:1448 -#, fuzzy -msgid "use the merge-base of upstream and branch as the current base" -msgstr "la branca font demanada «%s» no existeix" - -#: builtin/rebase.c:1450 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "permet al lligam pre-rebase executar-se" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "silenciós. Implica --no-stat" -#: builtin/rebase.c:1458 +#: builtin/rebase.c:1406 #, fuzzy msgid "do not show diffstat of what changed upstream" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1409 #, fuzzy msgid "add a Signed-off-by: line to each commit" msgstr "afegeix una línia «Signed-off-by» al missatge de comissió" -#: builtin/rebase.c:1464 -#, fuzzy -msgid "make committer date match author date" -msgstr "Agrupa per «comitter» en comptes de per autor" - -#: builtin/rebase.c:1466 -msgid "ignore author date and use current date" -msgstr "" - -#: builtin/rebase.c:1468 -#, fuzzy -msgid "synonym of --reset-author-date" -msgstr "sinònim de --files-with-matches" +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +msgid "passed to 'git am'" +msgstr "passa-ho a «git am»" -#: builtin/rebase.c:1470 builtin/rebase.c:1474 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "passa-ho a «git-apply»" -#: builtin/rebase.c:1472 -#, fuzzy -msgid "ignore changes in whitespace" -msgstr "ignora els canvis d'espai en blanc al final de la línia" - -#: builtin/rebase.c:1476 builtin/rebase.c:1479 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "«cherry pick» totes les comissions, inclús les no canviades" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1428 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "omet el pedaç actual i continua" -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "interromp i agafa la branca original" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "interromp però manté HEAD on és" -#: builtin/rebase.c:1490 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "edita la llista de coses a fer durant un «rebase» interactiu" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "mostra el pedaç que s'està aplicant o fusionant" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1443 #, fuzzy msgid "use merging strategies to rebase" msgstr "estratègia de fusió a usar" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1451 #, fuzzy msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "intenta recrear les " -#: builtin/rebase.c:1509 +#: builtin/rebase.c:1455 #, fuzzy msgid "preserve empty commits during rebase" msgstr "preserva les comissions inicialment buides" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1517 +#: builtin/rebase.c:1463 #, fuzzy msgid "automatically stash/stash pop before and after" msgstr "" "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»" -#: builtin/rebase.c:1519 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1469 #, fuzzy msgid "allow rebasing commits with empty messages" msgstr "permet les comissions amb missatges buits" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1529 +#: builtin/rebase.c:1475 #, fuzzy msgid "use 'merge-base --fork-point' to refine upstream" msgstr "git merge-base --fork-point <referència> [<comissió>]" -#: builtin/rebase.c:1531 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "utilitza l'estratègia de fusió donada" -#: builtin/rebase.c:1533 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "opció" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "passa l'argument a l'estratègia de fusió" -#: builtin/rebase.c:1537 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" -msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel" +msgstr "fes «rebase» de totes les comissions accessibles fins l'arrel" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»." -#: builtin/rebase.c:1601 +#: builtin/rebase.c:1547 #, fuzzy msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»" -#: builtin/rebase.c:1606 -#, fuzzy -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»" - -#: builtin/rebase.c:1608 -#, fuzzy -msgid "cannot combine '--keep-base' with '--root'" -msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»" - -#: builtin/rebase.c:1612 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "No hi ha un «rebase» en curs?" -#: builtin/rebase.c:1616 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu." -#: builtin/rebase.c:1639 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "No es pot llegir HEAD" -#: builtin/rebase.c:1651 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18192,16 +17549,16 @@ msgstr "" "Heu d'editar tots els conflictes de fusió i després\n" "marcar-los com a resolts fent servir git add" -#: builtin/rebase.c:1670 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "no s'han pogut descartar els canvis de l'arbre de treball" -#: builtin/rebase.c:1689 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "no s'ha pogut tornar a %s" -#: builtin/rebase.c:1734 +#: builtin/rebase.c:1673 #, fuzzy, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18222,161 +17579,171 @@ msgstr "" "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n" "de valor." -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "«switch» «c» espera un valor numèric" -#: builtin/rebase.c:1798 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Mode desconegut: %s" -#: builtin/rebase.c:1820 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requereix --merge o --interactive" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1797 #, fuzzy msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--strategy requereix --merge o --interactive" -#: builtin/rebase.c:1872 +#: builtin/rebase.c:1809 msgid "cannot combine am options with either interactive or merge options" msgstr "" -#: builtin/rebase.c:1891 +#: builtin/rebase.c:1828 #, fuzzy msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1832 #, fuzzy msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1838 +#, fuzzy +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy-option»" + +#: builtin/rebase.c:1841 +#, fuzzy +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "font no vàlida: «%s»" -#: builtin/rebase.c:1925 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "no s'ha pogut crear una comissió arrel nova" -#: builtin/rebase.c:1951 -#, fuzzy, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "Cal exactament un rang." - -#: builtin/rebase.c:1954 +#: builtin/rebase.c:1889 #, fuzzy, c-format msgid "'%s': need exactly one merge base" msgstr "Cal exactament un rang." -#: builtin/rebase.c:1962 +#: builtin/rebase.c:1896 #, fuzzy, c-format msgid "Does not point to a valid commit '%s'" msgstr "No assenyala una comissió vàlida: $onto_name" -#: builtin/rebase.c:1987 +#: builtin/rebase.c:1921 #, fuzzy, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no hi ha tal branca: $branch_name" -#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1961 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -#: builtin/rebase.c:2006 +#: builtin/rebase.c:1940 #, fuzzy msgid "Could not resolve HEAD to a revision" msgstr "no s'ha pogut resoldre la comissió HEAD" -#: builtin/rebase.c:2044 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "No es pot emmagatzemar automàticament" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:1984 #, fuzzy, c-format msgid "Unexpected stash response: '%s'" msgstr "final de fitxer inesperat" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1990 #, fuzzy, c-format msgid "Could not create directory for '%s'" msgstr "No s'ha pogut crear el directori «%s»" -#: builtin/rebase.c:2056 +#: builtin/rebase.c:1993 #, fuzzy, c-format msgid "Created autostash: %s\n" msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" -#: builtin/rebase.c:2059 +#: builtin/rebase.c:1996 #, fuzzy msgid "could not reset --hard" msgstr "No s'ha pogut llegir orig-head" -#: builtin/rebase.c:2068 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ara és a %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Cometeu-los o emmagatzemeu-los." -#: builtin/rebase.c:2095 +#: builtin/rebase.c:2040 #, c-format msgid "could not parse '%s'" msgstr "no s'ha pogut analitzar «%s»" -#: builtin/rebase.c:2108 +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "no s'ha pogut commutar a %s" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD està al dia." -#: builtin/rebase.c:2121 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branca actual %s està al dia.\n" -#: builtin/rebase.c:2129 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "La branca actual està al dia, «rebase» forçat." -#: builtin/rebase.c:2131 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branca actual %s està al dia; «rebase» forçat.\n" -#: builtin/rebase.c:2139 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»." -#: builtin/rebase.c:2146 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Canvis a %s:\n" -#: builtin/rebase.c:2149 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Canvis de %s a %s:\n" -#: builtin/rebase.c:2174 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al " "damunt...\n" -#: builtin/rebase.c:2183 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "No s'ha pogut separar HEAD" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avanç ràpid %s a %s.\n" @@ -18385,7 +17752,7 @@ msgstr "Avanç ràpid %s a %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18416,7 +17783,7 @@ msgstr "" "predeterminat, establiu la variable de configuració\n" "'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18438,11 +17805,11 @@ msgstr "" "\n" "Per a silenciar aquest missatge, podeu establir-la a 'refuse'." -#: builtin/receive-pack.c:1936 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "silenciós" -#: builtin/receive-pack.c:1950 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "Heu d'especificar un directori." @@ -18665,7 +18032,7 @@ msgstr "(coincident)" msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "No existeix el remot «%s»" @@ -18687,17 +18054,17 @@ msgstr "" "\t%s\n" "\tActualitzeu la configuració manualment si és necessari." -#: builtin/remote.c:701 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "la supressió de «%s» ha fallat" -#: builtin/remote.c:735 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "la creació de «%s» ha fallat" -#: builtin/remote.c:801 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18712,118 +18079,118 @@ msgstr[1] "" "eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:815 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secció de configuració «%s»" -#: builtin/remote.c:916 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)" -#: builtin/remote.c:919 +#: builtin/remote.c:920 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:921 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " estancat (useu 'git remote prune' per a eliminar)" -#: builtin/remote.c:923 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:964 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca" -#: builtin/remote.c:973 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "es fa «rebase» interactivament sobre el remot %s" -#: builtin/remote.c:975 +#: builtin/remote.c:976 #, fuzzy, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "es fa «rebase» interactivament sobre el remot %s" -#: builtin/remote.c:978 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "es fa «rebase» sobre el remot %s" -#: builtin/remote.c:982 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:985 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:988 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s i amb el remot %s\n" -#: builtin/remote.c:1031 +#: builtin/remote.c:1032 msgid "create" msgstr "crea" -#: builtin/remote.c:1034 +#: builtin/remote.c:1035 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1038 +#: builtin/remote.c:1039 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1041 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "avanç ràpid possible" -#: builtin/remote.c:1044 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1051 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1054 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1058 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1061 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1129 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1156 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1157 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obtenció: %s" -#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(sense URL)" @@ -18831,185 +18198,194 @@ msgstr "(sense URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1172 builtin/remote.c:1174 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1176 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(no consultat)" -#: builtin/remote.c:1178 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(desconegut)" -#: builtin/remote.c:1182 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n" -#: builtin/remote.c:1194 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1197 builtin/remote.c:1223 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1206 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branca local configurada per a «git pull»:" msgstr[1] " Branques locals configurades per a «git pull»:" -#: builtin/remote.c:1214 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " «git push» reflectirà les referències locals" -#: builtin/remote.c:1220 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referència local configurada per a «git push»%s:" msgstr[1] " Referències locals configurades per a «git push»%s:" -#: builtin/remote.c:1241 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1243 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1258 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar la HEAD remota" -#: builtin/remote.c:1260 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:" -#: builtin/remote.c:1270 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1278 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència vàlida: %s" -#: builtin/remote.c:1280 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1298 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà penjant!" -#: builtin/remote.c:1299 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1309 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "S'està podant %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1329 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1374 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot «%s»" -#: builtin/remote.c:1453 +#: builtin/remote.c:1454 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1460 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1477 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "consulta els URL de pujada en lloc dels URL d'obtenció" -#: builtin/remote.c:1479 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "retorna tots els URL" -#: builtin/remote.c:1507 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "cap URL configurat per al remot «%s»" -#: builtin/remote.c:1533 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1535 +#: builtin/remote.c:1536 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1537 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "suprimeix els URL" -#: builtin/remote.c:1544 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1583 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic no vàlid: %s" -#: builtin/remote.c:1591 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1593 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "sigues detallat; s'ha de col·locar abans d'un subordre" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Subordre desconeguda: %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<opcions>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19019,116 +18395,116 @@ msgstr "" "--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack." "writebitmaps." -#: builtin/repack.c:191 +#: builtin/repack.c:201 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:240 builtin/repack.c:418 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:254 +#: builtin/repack.c:257 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:292 +#: builtin/repack.c:295 msgid "pack everything in a single pack" msgstr "empaqueta-ho tot en un únic paquet" -#: builtin/repack.c:294 +#: builtin/repack.c:297 msgid "same as -a, and turn unreachable objects loose" msgstr "el mateix que -a, i solta els objectes inabastables" -#: builtin/repack.c:297 +#: builtin/repack.c:300 msgid "remove redundant packs, and run git-prune-packed" msgstr "elimina els paquets redundants, i executeu git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:302 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passa --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:304 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passa --no-reuse-object a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:306 msgid "do not run git-update-server-info" msgstr "no executis git-update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:309 msgid "pass --local to git-pack-objects" msgstr "passa --local a git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:311 msgid "write bitmap index" msgstr "escriu índex de mapa de bits" -#: builtin/repack.c:310 +#: builtin/repack.c:313 #, fuzzy msgid "pass --delta-islands to git-pack-objects" msgstr "passa --local a git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:314 msgid "approxidate" msgstr "data aproximada" -#: builtin/repack.c:312 +#: builtin/repack.c:315 msgid "with -A, do not loosen objects older than this" msgstr "amb -A, no soltis els objectes més vells que aquest" -#: builtin/repack.c:314 +#: builtin/repack.c:317 msgid "with -a, repack unreachable objects" msgstr "amb -a, reempaqueta els objectes inabastables" -#: builtin/repack.c:316 +#: builtin/repack.c:319 msgid "size of the window used for delta compression" msgstr "mida de la finestra que s'usa per a compressió de diferències" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:320 builtin/repack.c:326 msgid "bytes" msgstr "octets" -#: builtin/repack.c:318 +#: builtin/repack.c:321 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "el mateix que l'anterior, però limita la mida de memòria en lloc del nombre " "d'entrades" -#: builtin/repack.c:320 +#: builtin/repack.c:323 msgid "limits the maximum delta depth" msgstr "limita la profunditat màxima de les diferències" -#: builtin/repack.c:322 +#: builtin/repack.c:325 msgid "limits the maximum number of threads" msgstr "limita el nombre màxim de fils" -#: builtin/repack.c:324 +#: builtin/repack.c:327 msgid "maximum size of each packfile" msgstr "mida màxima de cada fitxer de paquet" -#: builtin/repack.c:326 +#: builtin/repack.c:329 msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:328 +#: builtin/repack.c:331 #, fuzzy msgid "do not repack this pack" msgstr "crea paquets prims" -#: builtin/repack.c:338 +#: builtin/repack.c:341 msgid "cannot delete packs in a precious-objects repo" msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos" -#: builtin/repack.c:342 +#: builtin/repack.c:345 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable i -A són incompatibles" -#: builtin/repack.c:425 +#: builtin/repack.c:427 #, fuzzy msgid "Nothing new to pack." msgstr "usa el paquet prim" -#: builtin/repack.c:486 +#: builtin/repack.c:488 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19140,7 +18516,7 @@ msgid "" "WARNING: Please rename them in %s manually:\n" msgstr "" -#: builtin/repack.c:534 +#: builtin/repack.c:536 #, c-format msgid "failed to remove '%s'" msgstr "s'ha produït un error en eliminar «%s»" @@ -19248,8 +18624,8 @@ msgstr "no s'ha pogut actualitzar %s" msgid "unable to write object to database" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 -#: builtin/replace.c:453 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, fuzzy, c-format msgid "not a valid object name: '%s'" msgstr "No és un nom d'objecte vàlid: «%s»" @@ -19269,22 +18645,22 @@ msgstr "la lectura de les referències de bisecció ha fallat" msgid "new object is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, fuzzy, c-format msgid "could not parse %s as a commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/replace.c:415 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "etiqueta de fusió incorrecta en la comissió «%s»" -#: builtin/replace.c:417 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "etiqueta de fusió mal formada en la comissió «%s»" -#: builtin/replace.c:429 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19293,105 +18669,105 @@ msgstr "" "la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; " "useu --edit en lloc de --graft" -#: builtin/replace.c:468 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "la comissió original «%s» té una signatura gpg" -#: builtin/replace.c:469 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "s'eliminarà la signatura en la comissió de reemplaçament!" -#: builtin/replace.c:479 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»" -#: builtin/replace.c:487 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:491 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "la comissió nova és la mateixa que l'antiga: «%s»" -#: builtin/replace.c:526 +#: builtin/replace.c:525 #, fuzzy, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "Eliminaria l'ítem següent:" -#: builtin/replace.c:547 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "llista les referències reemplaçades" -#: builtin/replace.c:548 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "suprimeix les referències reemplaçades" -#: builtin/replace.c:549 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "edita un objecte existent" -#: builtin/replace.c:550 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "canvia les mares d'una comissió" -#: builtin/replace.c:551 +#: builtin/replace.c:550 #, fuzzy msgid "convert existing graft file" msgstr "força la sobreescriptura de fitxers existents" -#: builtin/replace.c:552 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "reemplaça la referència si existeix" -#: builtin/replace.c:554 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "no imprimeixis bellament els continguts per a --edit" -#: builtin/replace.c:555 +#: builtin/replace.c:554 msgid "use this format" msgstr "usa aquest format" -#: builtin/replace.c:568 +#: builtin/replace.c:567 #, fuzzy msgid "--format cannot be used when not listing" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/replace.c:576 +#: builtin/replace.c:575 #, fuzzy msgid "-f only makes sense when writing a replacement" msgstr "-z només té sentit amb --stdin" -#: builtin/replace.c:580 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw només té sentit amb --edit" -#: builtin/replace.c:586 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:592 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "nombre incorrecte d'arguments" -#: builtin/replace.c:598 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e necessita exactament un argument" -#: builtin/replace.c:604 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g necessita almenys un argument" -#: builtin/replace.c:610 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file arguments" -#: builtin/replace.c:616 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "només es pot especificar un patró amb -l" @@ -19419,127 +18795,115 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]" #: builtin/reset.c:33 -#, fuzzy -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<arbre>] [--] <camins>..." #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" - -#: builtin/reset.c:35 -#, fuzzy -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<arbre>] [--] [<camins>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "mixt" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "suau" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "dur" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "fusió" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "reteniment" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "No teniu un HEAD vàlid." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "S'ha produït un error en trobar l'arbre de HEAD." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "S'ha produït un error en cercar l'arbre de %s." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD ara és a %s" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "No es pot fer un restabliment de %s enmig d'una fusió." -#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "sigues silenciós, només informa d'errors" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "restableix HEAD i l'índex" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "restableix només HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "restableix HEAD, l'índex i l'arbre de treball" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "restableix HEAD però retén els canvis locals" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "registra només el fet que els camins eliminats s'afegiran després" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "S'ha produït un error en resoldre «%s» com a arbre vàlid." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch és incompatible amb --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed amb camins està en desús; useu 'git reset -- <camins>' en lloc " "d'això." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "No es pot restablir de %s amb camins." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "el restabliment de %s no es permet en un dipòsit nu" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N només es pot usar amb --mixed" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Canvis «unstaged» després del restabliment:" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -19548,28 +18912,33 @@ msgid "" "to make this the default.\n" msgstr "" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'índex nou." -#: builtin/rev-list.c:411 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no es pot combinar --exclude-promisor-objects i --missing" -#: builtin/rev-list.c:472 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "el filtratge d'objectes requereix --objects" -#: builtin/rev-list.c:522 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valor parcial no vàlid: «%s»" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" -#: builtin/rev-list.c:525 +#: builtin/rev-list.c:530 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes" @@ -19766,7 +19135,7 @@ msgstr "" #: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "no s'ha suprimit «%s» recursivament sense -r" +msgstr "no s'està eliminant «%s» recursivament sense -r" #: builtin/rm.c:346 #, c-format @@ -19802,12 +19171,14 @@ msgid "print status from remote helper" msgstr "imprimeix l'estat des de l'ajudant remot" #: builtin/shortlog.c:14 +#, fuzzy msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] <camí>...]" +msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]" #: builtin/shortlog.c:15 +#, fuzzy msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "git log --pretty=short | git shortlog [<opcions>]" +msgstr "git worktree list [<opcions>]" #: builtin/shortlog.c:264 msgid "Group by committer rather than author" @@ -19828,15 +19199,16 @@ msgstr "Mostra l'adreça electrònica de cada autor" #: builtin/shortlog.c:271 msgid "<w>[,<i1>[,<i2>]]" -msgstr "<w>[,<i1>[,<i2>]]" +msgstr "" #: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Ajusta les línies de la sortida" #: builtin/shortlog.c:301 +#, fuzzy msgid "too many arguments given outside repository" -msgstr "hi ha massa arguments donats fora del dipòsit" +msgstr "hi ha massa arguments per a desassignar la font" #: builtin/show-branch.c:13 msgid "" @@ -20019,64 +19391,15 @@ msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències de stdin que no siguin en el dipòsit local" -#: builtin/sparse-checkout.c:20 -msgid "git sparse-checkout (init|list|set|disable) <options>" -msgstr "git sparse-checkout (init|list|set|disable) <opcions>" - -#: builtin/sparse-checkout.c:61 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" - -#: builtin/sparse-checkout.c:220 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "" - -#: builtin/sparse-checkout.c:237 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:256 -msgid "initialize the sparse-checkout in cone mode" -msgstr "" - -#: builtin/sparse-checkout.c:262 -#, fuzzy -msgid "initialize sparse-checkout" -msgstr "omet l'aplicació del filtre d'agafament parcial" - -#: builtin/sparse-checkout.c:295 -#, c-format -msgid "failed to open '%s'" -msgstr "s'ha produït un error en obrir «%s»" - -#: builtin/sparse-checkout.c:361 -msgid "git sparse-checkout set (--stdin | <patterns>)" -msgstr "git sparse-checkout set (--stdin | <patrons>)" - -#: builtin/sparse-checkout.c:378 -msgid "read patterns from standard in" -msgstr "llegeix els patrons de l'entrada estàndard" - -#: builtin/sparse-checkout.c:384 -#, msgid "set sparse-checkout patterns" -msgid "set sparse-checkout patterns" -msgstr "estableix els patrons «sparse-checkout»" - -#: builtin/sparse-checkout.c:447 -msgid "disable sparse-checkout" -msgstr "inhabilita «sparse-checkout»" - -#: builtin/sparse-checkout.c:459 -msgid "error while refreshing working directory" -msgstr "s'ha produït un error en actualitzar el directori de treball" - #: builtin/stash.c:22 builtin/stash.c:37 +#, fuzzy msgid "git stash list [<options>]" -msgstr "git stash list [<opcions>]" +msgstr "git worktree list [<opcions>]" #: builtin/stash.c:23 builtin/stash.c:42 +#, fuzzy msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<opcions>] [<stash>]" +msgstr "git remote show [<opcions>] <nom>" #: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" @@ -20087,12 +19410,13 @@ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "" #: builtin/stash.c:26 builtin/stash.c:62 +#, fuzzy msgid "git stash branch <branchname> [<stash>]" -msgstr "git stash branch <nom-de-branca> [<stash>]" +msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]" #: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" -msgstr "git stash clear" +msgstr "" #: builtin/stash.c:28 builtin/stash.c:77 msgid "" @@ -20100,198 +19424,205 @@ msgid "" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" " [--] [<pathspec>...]]" msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n" -" [--] [<pathspec>...]]" #: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<missatge>]" #: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "" #: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "" #: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <missatge>] [-q|--quiet] <commit>" +msgstr "" #: builtin/stash.c:127 -#, c-format +#, fuzzy, c-format msgid "'%s' is not a stash-like commit" -msgstr "«%s» no és una comissió de tipus «stash»" +msgstr "'$args' no és una comissió de tipus magatzem" #: builtin/stash.c:147 -#, c-format +#, fuzzy, c-format msgid "Too many revisions specified:%s" -msgstr "S'han especificat massa revisions:%s" +msgstr "S'han especificat massa revisions: $REV" -#: builtin/stash.c:161 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "No s'ha trobat cap «stash»." #: builtin/stash.c:175 -#, c-format +#, fuzzy, c-format msgid "%s is not a valid reference" -msgstr "«%s» no és una referència vàlida" +msgstr "«%s» no és un nom de remot vàlid" #: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear amb paràmetres no està implementat" #: builtin/stash.c:403 +#, fuzzy msgid "cannot apply a stash in the middle of a merge" -msgstr "no es pot aplicar un «stash» enmig d'una fusió" +msgstr "No es pot aplicar un magatzem enmig d'una fusió" #: builtin/stash.c:414 -#, c-format +#, fuzzy, c-format msgid "could not generate diff %s^!." -msgstr "no s'ha pogut generar diff %s^!." +msgstr "no s'ha pogut generar la llista per a fer" #: builtin/stash.c:421 +#, fuzzy msgid "conflicts in index.Try without --index." -msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index." +msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index." #: builtin/stash.c:427 +#, fuzzy msgid "could not save index tree" -msgstr "no s'ha pogut desar l'arbre d'índex" +msgstr "No s'ha pogut desar l'arbre d'índex" -#: builtin/stash.c:436 +#: builtin/stash.c:434 +#, fuzzy msgid "could not restore untracked files from stash" -msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»" +msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»" -#: builtin/stash.c:450 -#, c-format +#: builtin/stash.c:448 +#, fuzzy, c-format msgid "Merging %s with %s" -msgstr "S'està fusionant %s amb %s" +msgstr "S'està fusionant %s amb %s\n" -#: builtin/stash.c:460 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." -msgstr "L'índex no estava «unstashed»" +msgstr "L'índex no estava sense emmagatzemar." -#: builtin/stash.c:521 builtin/stash.c:620 +#: builtin/stash.c:516 builtin/stash.c:615 +#, fuzzy msgid "attempt to recreate the index" -msgstr "intenta tornar a crear l'índex" +msgstr "S'ha produït un error en llegir l'índex" -#: builtin/stash.c:554 -#, c-format +#: builtin/stash.c:549 +#, fuzzy, c-format msgid "Dropped %s (%s)" -msgstr "Descartat %s (%s)" +msgstr "${REV} ($s) descartada" -#: builtin/stash.c:557 -#, c-format +#: builtin/stash.c:552 +#, fuzzy, c-format msgid "%s: Could not drop stash entry" -msgstr "%s: no s'ha pogut descartar l'entrada «stash»" +msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" -#: builtin/stash.c:582 -#, c-format +#: builtin/stash.c:577 +#, fuzzy, c-format msgid "'%s' is not a stash reference" -msgstr "«%s» no és una referència «stash»" +msgstr "'$args' no és una referència de magatzem" -#: builtin/stash.c:632 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada." -#: builtin/stash.c:655 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Cap nom de branca especificat" -#: builtin/stash.c:795 builtin/stash.c:832 -#, c-format +#: builtin/stash.c:790 builtin/stash.c:827 +#, fuzzy, c-format msgid "Cannot update %s with %s" -msgstr "No es pot actualitzar %s amb %s" +msgstr "No es pot actualitzar $ref_stash amb $w_commit" -#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#, fuzzy msgid "stash message" -msgstr "missatge «stash»" +msgstr "missatge d'etiqueta" -#: builtin/stash.c:823 +#: builtin/stash.c:818 +#, fuzzy msgid "\"git stash store\" requires one <commit> argument" -msgstr "«git stash store» requereix un paràmetre <comissió>" +msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/stash.c:1045 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "No hi ha canvis seleccionats" -#: builtin/stash.c:1145 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Encara no teniu la comissió inicial" -#: builtin/stash.c:1172 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "No es pot desar l'estat d'índex actual" -#: builtin/stash.c:1181 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "No es poden desar els fitxers no seguits" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "No es pot desar l'estat d'arbre de treball actual" -#: builtin/stash.c:1229 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "No es pot registrar l'estat de l'arbre de treball" -#: builtin/stash.c:1278 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "No es poden usar --patch i --include-untracked o --all a la vegada" +msgstr "No es poden usar --patch i --include-untracked o --all a la vegada." -#: builtin/stash.c:1294 +#: builtin/stash.c:1285 +#, fuzzy msgid "Did you forget to 'git add'?" -msgstr "Heu oblidat de fer «git add»?" +msgstr "Potser volíeu dir «git add .»?\n" -#: builtin/stash.c:1309 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "No hi ha canvis locals a desar" -#: builtin/stash.c:1316 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "No es pot inicialitzar el magatzem" -#: builtin/stash.c:1331 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "No es pot desar l'estat actual" -#: builtin/stash.c:1336 -#, c-format +#: builtin/stash.c:1327 +#, fuzzy, c-format msgid "Saved working directory and index state %s" -msgstr "S'han desat el directori de treball i l'estat d'índex %s" +msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg" -#: builtin/stash.c:1426 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:1452 builtin/stash.c:1488 +#, fuzzy msgid "keep index" -msgstr "mantén l'índex" +msgstr "Actualitza l'índex" -#: builtin/stash.c:1463 builtin/stash.c:1499 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1464 builtin/stash.c:1500 +#: builtin/stash.c:1455 builtin/stash.c:1491 +#, fuzzy msgid "quiet mode" -msgstr "mode silenciós" +msgstr "silenciós" -#: builtin/stash.c:1466 builtin/stash.c:1502 +#: builtin/stash.c:1457 builtin/stash.c:1493 +#, fuzzy msgid "include untracked files in stash" -msgstr "inclou els fitxers no seguits a «stash»" +msgstr "mostra els fitxers no seguits en columnes" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1459 builtin/stash.c:1495 +#, fuzzy msgid "include ignore files" -msgstr "inclou els fitxers ignorats" +msgstr "elimina només els fitxers ignorats" -#: builtin/stash.c:1564 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "no s'ha pogut executar %s" @@ -20313,47 +19644,47 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteposa el caràcter de comentari i un espai a cada línia" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "S'espera un nom de referència ple, s'ha rebut %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no es pot despullar un component de l'url «%s»" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "àncora alternativa per als camins relatius" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "S'està entrant a «%s»\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20361,19 +19692,20 @@ msgid "" "." msgstr "" -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Omet la sortida en entrar l'ordre de cada submòdul" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" -msgstr "Inclou recursivament els submòduls imbricats" +msgstr "Inclou recursivament els submòduls imbrincats" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 +#, fuzzy msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] [<ordre>]" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -20382,105 +19714,106 @@ msgstr "" "no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és " "el seu dipòsit font autoritzat." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "advertència: se suggereix el mode d'actualització per ordre per al submòdul " "«%s»\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "S'ha produït un error en registrar el mode d'actualització per al camí de " "submòdul «%s»" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Omet la sortida d'inicialitzar un submòdul" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 +#, fuzzy msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<opcions>] [<camí>]" +msgstr "git submodule--helper init [<camí>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»" -#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»" -#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Suprimeix la sortida de l'estat del submòdul" -#: builtin/submodule--helper.c:879 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:880 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" -msgstr "inclou recursivament els submòduls imbricats" +msgstr "inclou recursivament els submòduls imbrincats" -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]" -#: builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <camí>" -#: builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»" -#: builtin/submodule--helper.c:1051 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Omet la sortida de la sincronització de l'url del submòdul" -#: builtin/submodule--helper.c:1058 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20489,7 +19822,7 @@ msgstr "" "L'arbre de treball de submòdul «%s» conté un directori .git\n" "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" -#: builtin/submodule--helper.c:1124 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20498,94 +19831,82 @@ msgstr "" "L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' " "per a descartar-les" -#: builtin/submodule--helper.c:1132 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "S'ha netejat el directori «%s»\n" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n" -#: builtin/submodule--helper.c:1145 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "no s'ha pogut crear el directori de submòdul buit %s" -#: builtin/submodule--helper.c:1161 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n" -#: builtin/submodule--helper.c:1190 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis " "locals" -#: builtin/submodule--helper.c:1191 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Desregistra recursivament tots els submòduls" -#: builtin/submodule--helper.c:1196 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]" -#: builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls" -#: builtin/submodule--helper.c:1275 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" - -#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "el submòdul «%s» no pot afegir un alternatiu: %s" -#: builtin/submodule--helper.c:1353 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy" -#: builtin/submodule--helper.c:1360 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation" -#: builtin/submodule--helper.c:1383 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "a on es clonarà el submòdul nou" -#: builtin/submodule--helper.c:1386 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "nom del submòdul nou" -#: builtin/submodule--helper.c:1389 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "url del qual clonar el submòdul" -#: builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "profunditat dels clons superficials" -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "força el progrés del clonatge" -#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 -msgid "disallow cloning into non-empty directory" -msgstr "no permetis clonar en un directori no buit" - -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -20593,103 +19914,93 @@ msgstr "" "git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference " "<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>" -#: builtin/submodule--helper.c:1431 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" - -#: builtin/submodule--helper.c:1442 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat" -#: builtin/submodule--helper.c:1446 -#, c-format -msgid "directory not empty: '%s'" -msgstr "directori no buit: «%s»" - -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»" -#: builtin/submodule--helper.c:1494 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Mode d'actualització «%s» no vàlid per al camí de submòdul «%s»" -#: builtin/submodule--helper.c:1498 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Mode d'actualització «%s» configurat no vàlid per al camí de submòdul «%s»" -#: builtin/submodule--helper.c:1594 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "El camí de submòdul «%s» no està inicialitzat" -#: builtin/submodule--helper.c:1598 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Potser voleu usar 'update --init'?" -#: builtin/submodule--helper.c:1628 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "S'està ometent el submòdul no fusionat %s" -#: builtin/submodule--helper.c:1657 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "S'està ometent el submòdul «%s»" -#: builtin/submodule--helper.c:1803 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent" -#: builtin/submodule--helper.c:1814 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant" -#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "camí a l'arbre de treball" -#: builtin/submodule--helper.c:1879 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" -#: builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncat al nombre de revisions especificat" -#: builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "tasques paral·leles" -#: builtin/submodule--helper.c:1894 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat" -#: builtin/submodule--helper.c:1895 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "no imprimeixis el progrés del clonatge" -#: builtin/submodule--helper.c:1904 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:1917 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "valor incorrecte per al paràmetre update" -#: builtin/submodule--helper.c:1965 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20698,55 +20009,56 @@ msgstr "" "La branca de submòdul (%s) està configurada per a heretar la branca del " "superprojecte, però el superprojecte no és en cap branca" -#: builtin/submodule--helper.c:2088 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no s'ha pogut obtenir el gestor del dipòsit pel submòdul «%s»" -#: builtin/submodule--helper.c:2121 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "inclou recursivament als submòduls" -#: builtin/submodule--helper.c:2127 +#: builtin/submodule--helper.c:2100 +#, fuzzy msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]" +msgstr "git submodule--helper embed-git-dir [<camí>...]" -#: builtin/submodule--helper.c:2183 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "comprova si és segur escriure al fitxer .gitmodules" -#: builtin/submodule--helper.c:2186 +#: builtin/submodule--helper.c:2159 #, fuzzy msgid "unset the config in the .gitmodules file" msgstr "l'allistament del .gitmodules actualitzat ha fallat" -#: builtin/submodule--helper.c:2191 +#: builtin/submodule--helper.c:2164 #, fuzzy msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config name [valor]" -#: builtin/submodule--helper.c:2192 +#: builtin/submodule--helper.c:2165 #, fuzzy msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config name [valor]" -#: builtin/submodule--helper.c:2193 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2212 git-submodule.sh:173 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, fuzzy, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos " "per a procedir" -#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no admet --super-prefix" -#: builtin/submodule--helper.c:2268 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» no és un subordre vàlid de submodule--helper" @@ -20997,216 +20309,212 @@ msgstr "l'etiqueta «%s» ja existeix" msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta «%s» actualitzada (era %s)\n" -#: builtin/unpack-objects.c:501 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "S'estan desempaquetant els objectes" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "s'ha produït un error en crear el directori %s" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "s'ha produït un error en crear el fitxer %s" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "s'ha produït un error en suprimir el fitxer %s" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "s'ha produït un error en suprimir el directori %s" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "S'està provant mtime en «%s» " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "" "la informació d'stat de directori no canvia després d'afegir un fitxer nou" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" "la informació d'stat de directori no canvia després d'afegir un directori nou" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "" "la informació d'stat de directori canvia després d'actualitzar un fitxer" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "la informació d'stat de directori canvia després d'afegir un fitxer dins " "d'un subdirectori" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "" "la informació d'stat de directori no canvia després de suprimir un fitxer" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "" "la informació d'stat de directori no canvia després de suprimir un directori" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " D'acord" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opcions>] [--] [<fitxer>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" "continua l'actualització encara que l'índex necessiti una actualització" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submòduls" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "tingues en compte els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'índex contingui entrades no fusionades" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "actualitza la informació d'estadístiques" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, però ignora el paràmetre assume-unchanged" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<camí>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'índex" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "marca els fitxers com a \"no canviant\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "neteja el bit assumed-unchanged" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "marca els fitxers com a \"només índex\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "neteja el bit skip-worktree" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" "només afegeix a l'índex; no afegeixis el contingut a la base de dades " "d'objectes" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" "elimina els camins anomenats encara que estiguin presents en l'arbre de " "treball" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "afegeix les entrades de l'entrada estàndard a l'índex" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "reemplena les «stage» #2 i #3 per als camins llistats" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "només actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "ignora els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "informa de les accions en la sortida estàndard" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "escriu l'índex en aquest format" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "habilita o inhabilita l'índex dividit" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "habilita/inhabilita la memòria cau no seguida" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "prova si el sistema de fitxers admet la memòria cau no seguida" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "habilita o inhabilita el monitor del sistema de fitxers" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "marca els fitxers com a vàlids pel fsmonitor" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "neteja el bit de validesa del fsmonitor" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21214,7 +20522,7 @@ msgstr "" "core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment " "voleu habilitar l'índex dividit" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21222,7 +20530,7 @@ msgstr "" "core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment " "voleu inhabilitar l'índex dividit" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21230,11 +20538,11 @@ msgstr "" "core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si " "realment voleu inhabilitar el cau no seguit" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "La memòria cau no seguida està inhabilitada" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -21242,29 +20550,29 @@ msgstr "" "core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si " "realment voleu habilitar el cau no seguit" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "La memòria cau no seguida està habilitada per a «%s»" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu " "habilitar fsmonitor" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor habilitat" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor està establert a cert; elimineu-lo si realment voleu " "inhabilitar fsmonitor" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor inhabilitat" @@ -21326,15 +20634,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "interromp la transferència després de <n> segons d'inactivitat" -#: builtin/verify-commit.c:19 +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <comissió>..." -#: builtin/verify-commit.c:68 +#: builtin/verify-commit.c:69 msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" -#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:70 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "imprimeix la sortida crua de l'estat gpg" @@ -21350,63 +20658,63 @@ msgstr "detallat" msgid "show statistics only" msgstr "mostra només estadístiques" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "imprimeix els continguts de l'etiqueta" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opcions>] <camí> [<commit-ish>" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<opcions>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opcions>] <camí>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre de treball> <camí-nou>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opcions>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree lock [<opcions>] <arbre de treball>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <camí>" -#: builtin/worktree.c:60 builtin/worktree.c:898 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "s'ha produït un error en suprimir «%s»" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Eliminació de worktrees/%s: no és un directori vàlid" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -21415,223 +20723,225 @@ msgstr "" "S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven " "%<PRIuMAX> bytes, llegits %<PRIuMAX>)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no " "existent" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "informa dels arbres de treball podats" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "fes caducar els arbres de treball més vells que <hora>" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "«%s» ja existeix" -#: builtin/worktree.c:251 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "no s'ha pogut tornar a afegir a l'arbre de treball «%s»" -#: builtin/worktree.c:256 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:258 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use 'add -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:308 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "no s'ha pogut crear directori de «%s»" -#: builtin/worktree.c:439 builtin/worktree.c:445 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "S'està preparant l'arbre de treball (branca nova «%s»)" -#: builtin/worktree.c:441 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:450 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)" -#: builtin/worktree.c:456 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "S'està preparant l'arbre de treball (HEAD %s separat)" -#: builtin/worktree.c:497 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball" -#: builtin/worktree.c:500 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "crea una branca nova" -#: builtin/worktree.c:502 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "crea o restableix una branca" -#: builtin/worktree.c:504 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" -#: builtin/worktree.c:505 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "mantén l'arbre de treball nou bloquejat" -#: builtin/worktree.c:508 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "configura el mode de seguiment (vegeu git-branch(1))" -#: builtin/worktree.c:511 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "prova de fer coincidir el nom de la branca nova amb una branca amb seguiment " "remot" -#: builtin/worktree.c:519 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B i --detach són mútuament excloents" -#: builtin/worktree.c:580 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track només es pot usar si es crea una branca nova" -#: builtin/worktree.c:680 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "raó per bloquejar" -#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 -#: builtin/worktree.c:926 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "«%s» no és un arbre de treball" -#: builtin/worktree.c:694 builtin/worktree.c:727 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal" -#: builtin/worktree.c:699 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "«%s» ja està bloquejat, raó: «%s»" -#: builtin/worktree.c:701 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "«%s» ja està bloquejat" -#: builtin/worktree.c:729 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "«%s» no està bloquejat" -#: builtin/worktree.c:770 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" -msgstr "els arbres de treball que contenen submòduls no es poden moure o suprimir" +msgstr "" -#: builtin/worktree.c:778 +#: builtin/worktree.c:779 +#, fuzzy msgid "force move even if worktree is dirty or locked" -msgstr "força el moviment encara que l'arbre de treball estigui brut o bloquejat" +msgstr "força el moviment / canvi de nom encara que el destí existeixi" -#: builtin/worktree.c:801 builtin/worktree.c:928 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "«%s» és un arbre de treball principal" -#: builtin/worktree.c:806 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no s'ha pogut deduir el nom de destí des de «%s»" -#: builtin/worktree.c:812 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "el destí «%s» ja existeix" -#: builtin/worktree.c:820 +#: builtin/worktree.c:821 #, fuzzy, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:822 +#: builtin/worktree.c:823 #, fuzzy msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:825 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s" -#: builtin/worktree.c:830 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "s'ha produït un error en moure «%s» a «%s»" -#: builtin/worktree.c:878 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "no s'ha pogut executar «git status» a «%s»" -#: builtin/worktree.c:882 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" +msgid "'%s' is dirty, use --force to delete it" msgstr "" -#: builtin/worktree.c:887 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no s'ha pogut executar «git status» a «%s», codi %d" -#: builtin/worktree.c:910 +#: builtin/worktree.c:911 +#, fuzzy msgid "force removal even if worktree is dirty or locked" -msgstr "força la supressió encara que l'arbre de treball estigui brut o bloquejat" +msgstr "força el moviment / canvi de nom encara que el destí existeixi" -#: builtin/worktree.c:933 +#: builtin/worktree.c:934 #, fuzzy, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:935 +#: builtin/worktree.c:936 #, fuzzy msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:938 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -21652,21 +20962,6 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>" msgid "only useful for debugging" msgstr "només útil per a la depuració" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "S'esperava l'ordre «mark», s'ha rebut %s" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "S'esperava l'ordre «to», s'ha rebut «%s»" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21695,12 +20990,14 @@ msgid "too many commits marked reachable" msgstr "masses comission marcades com abastable" #: t/helper/test-serve-v2.c:7 +#, fuzzy msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<opcions>]" +msgstr "git serve [<opcions>]" #: t/helper/test-serve-v2.c:19 +#, fuzzy msgid "exit immediately after advertising capabilities" -msgstr "surt immediatament després d'anunciar les funcionalitats" +msgstr "surt immediatament després de l'anunci inicial de referència" #: git.c:27 msgid "" @@ -21740,9 +21037,9 @@ msgid "no directory given for --work-tree\n" msgstr "no s'ha especificat un directori per --work-tree\n" #: git.c:228 -#, c-format +#, fuzzy, c-format msgid "no prefix given for --super-prefix\n" -msgstr "no s'ha especificat cap prefix per a --super-prefix\n" +msgstr "%s no admet --super-prefix" #: git.c:250 #, c-format @@ -21771,39 +21068,39 @@ msgid "" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "àlies recursiu: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "fallada d'escriptura en la sortida estàndard" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "fallada d'escriptura desconeguda en la sortida estàndard" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "ha fallat el tancament en la sortida estàndard" -#: git.c:793 +#: git.c:796 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:843 +#: git.c:846 #, fuzzy, c-format msgid "cannot handle %s as a builtin" msgstr "no es pot usar %s com a fitxer d'exclusió" -#: git.c:856 +#: git.c:859 #, c-format msgid "" "usage: %s\n" @@ -21812,12 +21109,12 @@ msgstr "" "ús: %s\n" "\n" -#: git.c:876 +#: git.c:879 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:888 +#: git.c:891 #, c-format msgid "failed to run command '%s': %s\n" msgstr "s'ha produït un error en executar l'ordre «%s»: %s\n" @@ -21845,22 +21142,22 @@ msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1097 +#: http.c:1096 #, fuzzy, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "No s'ha pogut tornar a $head_name" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21871,164 +21168,153 @@ msgstr "" " petició: %s\n" " redirecció: %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, fuzzy, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "valor parcial no vàlid: «%s»" -#: remote-curl.c:263 +#: remote-curl.c:254 #, fuzzy, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "«%s» no reconegut com un dipòsit git" -#: remote-curl.c:364 +#: remote-curl.c:355 #, fuzzy msgid "invalid server response; expected service, got flush packet" msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja" -#: remote-curl.c:395 +#: remote-curl.c:386 #, fuzzy, c-format msgid "invalid server response; got '%s'" msgstr "referència no vàlida: %s" -#: remote-curl.c:455 -#, c-format +#: remote-curl.c:446 +#, fuzzy, c-format msgid "repository '%s' not found" -msgstr "no s'ha trobat el dipòsit «%s»" +msgstr "no s'ha trobat la branca «%s»." -#: remote-curl.c:459 -#, c-format +#: remote-curl.c:450 +#, fuzzy, c-format msgid "Authentication failed for '%s'" -msgstr "S'ha produït un error en autenticar per «%s»" +msgstr "falta el valor per «%s»" -#: remote-curl.c:463 -#, c-format +#: remote-curl.c:454 +#, fuzzy, c-format msgid "unable to access '%s': %s" -msgstr "no s'ha pogut accedir a «%s»: %s" +msgstr "no s'ha pogut accedir a '%s': %s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "s'està redirigint a %s" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:733 +#: remote-curl.c:724 #, fuzzy, c-format msgid "RPC failed; %s" msgstr "STARTTLS ha fallat! %s" -#: remote-curl.c:773 +#: remote-curl.c:764 #, fuzzy msgid "cannot handle pushes this big" msgstr "no es pot usar %s com a fitxer d'exclusió" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1023 +#: remote-curl.c:1014 #, fuzzy msgid "dumb http transport does not support shallow capabilities" msgstr "El servidor no permet clients superficials" -#: remote-curl.c:1037 +#: remote-curl.c:1028 #, fuzzy msgid "fetch failed." msgstr "l'«stash» ha fallat" -#: remote-curl.c:1085 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1129 remote-curl.c:1135 +#: remote-curl.c:1120 remote-curl.c:1126 #, fuzzy, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" "s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»" -#: remote-curl.c:1147 remote-curl.c:1261 +#: remote-curl.c:1138 remote-curl.c:1252 #, fuzzy, c-format msgid "http transport does not support %s" msgstr "la variant «simple» d'ssh no és compatible amb -4" -#: remote-curl.c:1183 +#: remote-curl.c:1174 #, fuzzy msgid "git-http-push failed" msgstr "l'«stash» ha fallat" -#: remote-curl.c:1367 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1399 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1406 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1446 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "args" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "filtratge d'objecte" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "data-de-caducitat" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "operació nul·la (per a compatibilitat amb versions anteriors)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "sigues més detallat" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" -msgstr "sigues més discret" +msgstr "sigues més callat" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> xifres per presentar els SHA-1" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "com suprimir els espais i #comentaris del missatge" -#: parse-options.h:337 -#, fuzzy -msgid "read pathspec from file" -msgstr "llegeix els patrons des d'un fitxer" - -#: parse-options.h:338 -#, fuzzy -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "els camins se separen amb el caràcter NUL" - #: ref-filter.h:101 msgid "key" msgstr "clau" @@ -22042,11 +21328,11 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "actualitza l'índex amb la resolució de conflicte reusada si és possible" -#: wt-status.h:67 +#: wt-status.h:68 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.h:68 +#: wt-status.h:69 msgid "HEAD detached from " msgstr "HEAD separat de " @@ -22196,13 +21482,12 @@ msgstr "Un servidor realment senzill per a dipòsits Git" #: command-list.h:85 msgid "Give an object a human readable name based on an available ref" -msgstr "" -"Dóna un nom llegible per humans basant-se en les referències disponibles" +msgstr "Dóna un nom llegible per humans basant-se en les referències disponibles" #: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "" -"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc" +"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." #: command-list.h:87 msgid "Compares files in the working tree and the index" @@ -22254,7 +21539,7 @@ msgstr "Prepara pedaços per enviar-los per correu electrònic" #: command-list.h:99 msgid "Verifies the connectivity and validity of the objects in the database" -msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades" +msgstr "Verifica la connectivitat i validesa del objectes a la base de dades" #: command-list.h:100 msgid "Cleanup unnecessary files and optimize the local repository" @@ -22323,7 +21608,7 @@ msgstr "Mostra els registres de comissió" #: command-list.h:116 msgid "Show information about files in the index and the working tree" -msgstr "Mostra informació sobre els fitxers a l'índex i a l'arbre de treball" +msgstr "Mostra informació sobre els fitxer a l'índex i a l'arbre de treball" #: command-list.h:117 msgid "List references in a remote repository" @@ -22366,8 +21651,7 @@ msgstr "" #: command-list.h:126 msgid "Run merge conflict resolution tools to resolve merge conflicts" -msgstr "" -"Executa eines de resolució de conflictes per a resoldre conflictes de fussió" +msgstr "Executa eines de resolució de conflictes per a resoldre conflictes de fussió" #: command-list.h:127 msgid "Show three-way merge without touching index" @@ -22516,7 +21800,7 @@ msgstr "Elimina fitxers de l'arbre de treball i de l'índex" #: command-list.h:161 msgid "Send a collection of patches as emails" -msgstr "Envia una col·lecció de pedaços com a correus electrònics" +msgstr "Envia una col·leció de pedaços com a correus electrònics" #: command-list.h:162 msgid "Push objects over Git protocol to another repository" @@ -22555,175 +21839,167 @@ msgid "Common Git shell script setup code" msgstr "Codi de scripts de configuració comuns pel Git shell" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "" - -#: command-list.h:172 #, fuzzy msgid "Stash the changes in a dirty working directory away" msgstr "%s: ja existeix en el directori de treball" -#: command-list.h:173 +#: command-list.h:172 #, fuzzy msgid "Add file contents to the staging area" msgstr "Afegeix els continguts dels fitxers a l'índex" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Mostra l'estat de l'arbre de treball" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Suprimeix l'espai en blanc innecessari" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Inicialitza, actualitza o inspecciona submòduls" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operació bidireccional entre un dipòsit a Subversion i Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Commuta branques" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Llegeix, modifica i suprimeix referències simbòliques" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un fitxer temporal amb els continguts dels blobs" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objectes d'un arxiu empaquetat" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Registra els continguts del fitxer en l'arbre de treball a l'índex" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "" "Actualitza el nom de l'objecte emmagatzema en una referència de forma segura" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Envia l'arxiu de tornada al git-archive" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Mostra una variable lògica del Git" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Verifica la signatura GPG de les comissions" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Valida els fitxers d'arxius Git empaquetats" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Verifica la signatura GPG de les etiquetes" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfície web del Git (interfície web pels dipòsits Git)" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Mostra registres amb la diferència introduïda per cada comissió" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Gestiona múltiples arbres de treball" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Crea un objecte arbre des de l'índex actual" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "La definició d'atributs per camí" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Interfície i convencions de la línia d'ordres del Git" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Un tutorial bàsic del Git per a desenvolupadors" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git per a usuaris del CVS" -#: command-list.h:200 +#: command-list.h:199 #, fuzzy msgid "Tweaking diff output" msgstr "omet la sortida de diferències" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunt mínim útil d'ordres diàries del Git" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Un glossari de Git" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Lligams utilitzats pel Git" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica els fitxers intencionalment no seguits a ignorar" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "La definició de les propietats de submòduls" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Espais de noms del Git" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Disposició del dipòsit del Git" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "L'especificació de revisions i rangs per al Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial d'introducció al Git: segona part" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Un tutorial d'introducció al Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git" @@ -22851,115 +22127,115 @@ msgid "Simple merge did not work, trying automatic merge." msgstr "" "La fusió simple no ha funcionat, s'està intentant una fusió automàtica." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "No es pot eliminar l'índex temporal (això no pot passar)" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No es pot actualitzar $ref_stash amb $w_commit" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "opció desconeguda: $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "S'han especificat massa revisions: $REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no és una referència vàlida" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no és una comissió de tipus magatzem" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no és una referència de magatzem" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "no s'ha pogut actualitzar l'índex" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "No es pot aplicar un magatzem enmig d'una fusió" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "No s'ha pogut desar l'arbre d'índex" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "No es pot fer «unstage» dels fitxers modificats" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) descartada" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" -#: git-submodule.sh:202 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "El camí relatiu només es pot usar des del nivell superior de l'arbre de " "treball" -#: git-submodule.sh:212 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../" -#: git-submodule.sh:231 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ja existeix en l'índex" -#: git-submodule.sh:234 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ja existeix en l'índex i no és submòdul" -#: git-submodule.sh:241 +#: git-submodule.sh:239 #, fuzzy, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "el camí «%s» no té la seva versió" -#: git-submodule.sh:247 +#: git-submodule.sh:245 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -22970,23 +22246,23 @@ msgstr "" "$sm_path\n" "Useu -f si realment voleu afegir-lo." -#: git-submodule.sh:270 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex" -#: git-submodule.sh:272 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid" -#: git-submodule.sh:280 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Es troba un directori de git per a '$sm_name' localment amb els remots:" -#: git-submodule.sh:282 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23003,39 +22279,39 @@ msgstr "" "o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--" "name'." -#: git-submodule.sh:288 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "S'està reactivant el directori de git local per al submòdul '$sm_name'." -#: git-submodule.sh:300 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No s'ha pogut agafar el submòdul '$sm_path'" -#: git-submodule.sh:305 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "S'ha produït un error en afegir el submòdul '$sm_path'" -#: git-submodule.sh:314 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" -#: git-submodule.sh:580 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'" -#: git-submodule.sh:590 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'" -#: git-submodule.sh:595 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23044,94 +22320,92 @@ msgstr "" "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " "camí de submòdul '$sm_path'" -#: git-submodule.sh:613 -#, sh-format +#: git-submodule.sh:606 +#, fuzzy, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" -msgstr "" -"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està " -"intentant obtenir directament $sha1:" +msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'" -#: git-submodule.sh:619 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1. " +"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. " "L'obtenció directa d'aquella comissió ha fallat." -#: git-submodule.sh:626 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "No s'ha pogut agafar «$sha1» en el camí de submòdul «$displaypath»" +msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:627 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»" +msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -"No s'ha pogut fer «rebase» «$sha1»' en el camí de submòdul «$displaypath»" +"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:632 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»" +msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "No s'ha pogut fusionar «$sha1» en el camí de submòdul «$displaypath»" +msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:638 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»" +msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'" -#: git-submodule.sh:643 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -"L'execució de «$command $sha1» ha fallat en el camí de submòdul " -"«$displaypath»" +"L'execució de '$command $sha1' ha fallat en el camí de submòdul " +"'$displaypath'" -#: git-submodule.sh:644 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" -msgstr "Camí de submòdul «$displaypath»: «$command $sha1»" +msgstr "Camí de submòdul '$displaypath': '$command $sha1'" -#: git-submodule.sh:675 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" "S'ha produït un error en recorre recursivament dins del camí de submòdul " -"«$displaypath»" +"'$displaypath'" -#: git-submodule.sh:886 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "L'opció --cached no es pot usar amb l'opció --files" -#: git-submodule.sh:938 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode inesperat $mod_dst" -#: git-submodule.sh:958 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Avís: $display_name no conté la comissió $sha1_src" -#: git-submodule.sh:961 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Avís: $display_name no conté la comissió $sha1_dst" -#: git-submodule.sh:964 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst" @@ -23142,11 +22416,12 @@ msgid "See git-${cmd}(1) for details." msgstr "Vegeu git-${cmd}(1) per detalls." #: git-rebase--preserve-merges.sh:109 +#, fuzzy msgid "Applied autostash." -msgstr "S'ha aplicat l'«autostash»." +msgstr "S'ha aplicat el magatzem automàtic." #: git-rebase--preserve-merges.sh:112 -#, sh-format +#, fuzzy, sh-format msgid "Cannot store $stash_sha1" msgstr "No es pot emmagatzemar $stash_sha1" @@ -23178,11 +22453,11 @@ msgid "" msgstr "" "\n" "Ordres:\n" -" p, pick <comissió> = usa la comissió\n" -" r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n" -" e, edit <comissió> = usa la comissió, però atura't per a esmenar\n" -" s, squash <comissió> = usa la comissió, però fusiona'l a la comissió prèvia\n" -" f, fixup <comissió> = com \"squash\", però descarta el missatge de registre d'aquesta " +" p, pick = usa la comissió\n" +" r, reword = usa la comissió, però edita el missatge de comissió\n" +" e, edit = usa la comissió, però atura't per a esmenar\n" +" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n" +" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta " "comissió\n" " x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret " "d'ordres\n" @@ -23444,8 +22719,8 @@ msgstr "No s'ha pogut marcar com a interactiu" #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)" -msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)" +msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" +msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" @@ -23513,19 +22788,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "No s'ha pogut determinar el camí absolut del directori de git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "staged" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "unstaged" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "binari" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "res" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "sense canvis" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "afegit %d camí\n" +msgstr[1] "afegits %d camins\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "actualitzat %d camí\n" +msgstr[1] "actualitzats %d camins\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "revertit %d camí\n" +msgstr[1] "revertits %d camins\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "modificat %d camí\n" msgstr[1] "modificat %d camins\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Actualitza" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Reverteix" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s està ara sense seguiment.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Afegeix sense seguiment" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "Sense fitxers no seguits.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23533,7 +22870,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «staging»." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23541,7 +22878,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «stashing»." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23549,8 +22886,8 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «unstaging»." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23558,8 +22895,8 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per aplicar-se." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23567,12 +22904,17 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per descartar-se." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -23585,12 +22927,37 @@ msgstr "" "Per suprimir «%s» línies, suprimiu-les.\n" "Les línies que comencin per %s seran suprimides.\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n" +"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició " +"s'avorta\n" +"i el tros es deixa sense cap canvi.\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es " +"descartarà) [y/n]? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23604,7 +22971,7 @@ msgstr "" "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23618,7 +22985,7 @@ msgstr "" "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23632,7 +22999,7 @@ msgstr "" "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23646,7 +23013,7 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23660,7 +23027,7 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23674,7 +23041,7 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23688,7 +23055,8 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 +#, fuzzy msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23696,13 +23064,13 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -"y - aplica aquest tros a l'arbre de treball\n" -"n - no apliquis aquest tros a l'arbre de treball\n" +"y - aplica aquest tros a l'índex i l'arbre de treball\n" +"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n" "q - surt; no apliquis aquest tros ni cap dels pendents\n" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23724,203 +23092,232 @@ msgstr "" "e - edita manualment el tros actual\n" "? - mostra l'ajuda\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Els trossos seleccionats no apliquen a l'índex\n" -#: git-add--interactive.perl:1343 +#: git-add--interactive.perl:1341 msgid "Apply them to the worktree anyway? " msgstr "Voleu aplicar-los igualment a l'arbre de treball? " -#: git-add--interactive.perl:1346 +#: git-add--interactive.perl:1344 msgid "Nothing was applied.\n" msgstr "No s'ha aplicat res.\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "s'està ignorant %s no fusionat\n" -#: git-add--interactive.perl:1428 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Només s'han canviat els fitxers binaris.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Sense canvis.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Actualització del pedaç" + +#: git-add--interactive.perl:1426 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1429 +#: git-add--interactive.perl:1427 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1430 +#: git-add--interactive.perl:1428 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1433 +#: git-add--interactive.perl:1431 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1434 +#: git-add--interactive.perl:1432 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1435 +#: git-add--interactive.perl:1433 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1438 +#: git-add--interactive.perl:1436 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1439 +#: git-add--interactive.perl:1437 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1440 +#: git-add--interactive.perl:1438 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1443 +#: git-add--interactive.perl:1441 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1444 +#: git-add--interactive.perl:1442 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1445 +#: git-add--interactive.perl:1443 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1449 git-add--interactive.perl:1464 +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1450 git-add--interactive.perl:1465 +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1453 +#: git-add--interactive.perl:1451 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d" "%s,?]? " -#: git-add--interactive.perl:1454 +#: git-add--interactive.perl:1452 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1455 +#: git-add--interactive.perl:1453 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1458 +#: git-add--interactive.perl:1456 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1459 +#: git-add--interactive.perl:1457 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1460 +#: git-add--interactive.perl:1458 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 -#, perl-format +#: git-add--interactive.perl:1466 +#, fuzzy, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1469 -#, perl-format +#: git-add--interactive.perl:1467 +#, fuzzy, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 -#, perl-format +#: git-add--interactive.perl:1468 +#, fuzzy, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "No hi ha altres trossos on anar-hi\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "vés a quin tros (<ret> per veure'n més)? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "vés a quin tros? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Número no vàlid: «%s»\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Només %d tros disponible.\n" msgstr[1] "Només %d trossos disponibles.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "No hi ha cap altre tros a cercar\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "Cerca per expressió regular? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Expressió regular de cerca mal formada %s: %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "No hi ha trossos que coincideixin amb el patró donat\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Sense tros previ\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "No hi ha tros següent\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "No es pot dividir aquest tros\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Divideix en %d tros.\n" msgstr[1] "Divideix en %d trossos.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "No es pot editar aquest tros\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Reviseu les diferències" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23939,19 +23336,19 @@ msgstr "" "add untracked - afegeix el contingut dels fitxers no seguits al conjunt de " "canvis «staged»\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "manca --" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "desconegut --patch mode: %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument %s no vàlid, s'esperava --" @@ -24319,3 +23716,154 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " + +#, fuzzy +#~ msgid "hash version %X does not match version %X" +#~ msgstr "el camí «%s» no té la seva versió" + +#~ msgid "option '%s' requires a value" +#~ msgstr "l'opció «%s» requereix un valor" + +#~ msgid "Server supports multi_ack_detailed" +#~ msgstr "El servidor accepta multi_ack_detailed" + +#~ msgid "Server supports no-done" +#~ msgstr "El servidor accepta no-done" + +#~ msgid "Server supports multi_ack" +#~ msgstr "El servidor accepta multi_ack" + +#~ msgid "Server supports side-band-64k" +#~ msgstr "El servidor accepta side-band-64k" + +#~ msgid "Server supports side-band" +#~ msgstr "El servidor accepta banda lateral" + +#~ msgid "Server supports allow-tip-sha1-in-want" +#~ msgstr "El servidor accepta allow-tip-sha1-in-want" + +#~ msgid "Server supports allow-reachable-sha1-in-want" +#~ msgstr "El servidor accepta allow-reachable-sha1-in-want" + +#~ msgid "Server supports ofs-delta" +#~ msgstr "El servidor accepta ofs-delta" + +#~ msgid "(HEAD detached at %s)" +#~ msgstr "(HEAD separat a %s)" + +#~ msgid "(HEAD detached from %s)" +#~ msgstr "(HEAD separat de %s)" + +#~ msgid "could not transform the todo list" +#~ msgstr "no s'ha pogut transformar la llista per a fer" + +#~ msgid "Checking out files" +#~ msgstr "S'estan agafant fitxers" + +#~ msgid "cannot be interactive without stdin connected to a terminal." +#~ msgstr "" +#~ "no es pot ser interactiu sense que stdin estigui connectada a un terminal." + +#~ msgid "failed to stat %s\n" +#~ msgstr "s'ha produït un error en fer stat a '%s'\n" + +#~ msgid "" +#~ "If you wish to skip this commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n" +#~ "the remaining commits.\n" +#~ msgstr "" +#~ "Si voleu ometre aquesta comissió, useu:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Llavors \"git cherry-pick --continue\" reprendrà\n" +#~ "com a «cherry pick» les comissions restants.\n" + +#~ msgid "default" +#~ msgstr "per defecte" + +#~ msgid "Could not create directory '%s'" +#~ msgstr "No s'ha pogut crear el directori «%s»" + +#~ msgid "unrecognized verb: %s" +#~ msgstr "paràmetre no reconegut: %s" + +#~ msgid "could not open %s" +#~ msgstr "no s'ha pogut obrir «%s»" + +#~ msgid "Could not move back to $head_name" +#~ msgstr "No s'ha pogut tornar a $head_name" + +#~ msgid "" +#~ "It seems that there is already a $state_dir_base directory, and\n" +#~ "I wonder if you are in the middle of another rebase. If that is the\n" +#~ "case, please try\n" +#~ "\t$cmd_live_rebase\n" +#~ "If that is not the case, please\n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "and run me again. I am stopping in case you still have something\n" +#~ "valuable there." +#~ msgstr "" +#~ "Sembla que ja hi ha un directori $state_dir_base, i\n" +#~ "em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n" +#~ "cas, proveu\n" +#~ "\t$cmd_live_rebase\n" +#~ "Si no és el cas, \n" +#~ "\t$cmd_clear_stale_rebase\n" +#~ "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n" +#~ "de valor." + +#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" +#~ msgstr "fatal: no es pot combinar «--signoff» amb «--preserve-merges»" + +#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" +#~ msgstr "fatal: no es pot combinar «--preserve-merges» amb «--rebase-merges»" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy-option»" + +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" +#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy»" + +#, fuzzy +#~ msgid "invalid upstream '$upstream_name'" +#~ msgstr "font no vàlida $upstream_name" + +#~ msgid "$onto_name: there are more than one merge bases" +#~ msgstr "$onto_name: ja hi ha més d'una base de fusió" + +#~ msgid "$onto_name: there is no merge base" +#~ msgstr "$onto_name: no hi ha cap base de fusió" + +#~ msgid "Does not point to a valid commit: $onto_name" +#~ msgstr "No assenyala una comissió vàlida: $onto_name" + +#, fuzzy +#~ msgid "fatal: no such branch/commit '$branch_name'" +#~ msgstr "fatal: no hi ha tal branca: $branch_name" + +#~ msgid "Created autostash: $stash_abbrev" +#~ msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" + +#~ msgid "Current branch $branch_name is up to date." +#~ msgstr "La branca actual $branch_name està al dia." + +#~ msgid "Current branch $branch_name is up to date, rebase forced." +#~ msgstr "La branca actual $branch_name està al dia; «rebase» forçat." + +#~ msgid "Changes to $onto:" +#~ msgstr "Canvis a $onto:" + +#~ msgid "Changes from $mb to $onto:" +#~ msgstr "Canvis de $mb a $onto:" + +#~ msgid "Fast-forwarded $branch_name to $onto_name." +#~ msgstr "S'ha avançat $branch_name ràpidament a $onto_name." + +#~ msgid "First, rewinding head to replay your work on top of it..." +#~ msgstr "" +#~ "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al " +#~ "damunt..." diff --git a/third_party/git/po/de.po b/third_party/git/po/de.po index cfe50c1055..6d80cfb158 100644 --- a/third_party/git/po/de.po +++ b/third_party/git/po/de.po @@ -1,15 +1,15 @@ # German translations for Git. # Copyright (C) 2019 Matthias Rüster <matthias.ruester@gmail.com> # This file is distributed under the same license as the Git package. -# Matthias Rüster <matthias.ruester@gmail.com>, 2019-2020. +# Matthias Rüster <matthias.ruester@gmail.com>, 2019. # Ralf Thielow <ralf.thielow@gmail.com>, 2010-2019. # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-14 22:34+0100\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2016-11-28 18:10+0100\n" "Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n" "Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n" "Language: de\n" @@ -18,748 +18,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "Wie bitte (%s)?" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "Index konnte nicht gelesen werden" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "Binär" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "Nichts" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "unverändert" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Aktualisieren" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "Konnte '%s' nicht zum Commit vormerken." - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "Konnte Index nicht schreiben." - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "%d Pfad aktualisiert\n" -msgstr[1] "%d Pfade aktualisiert\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "Hinweis: %s ist nun unversioniert.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Revert" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "Konnte HEAD^{tree} nicht parsen." - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "%d Pfad wiederhergestellt\n" -msgstr[1] "%d Pfade wiederhergestellt\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "Keine unversionierten Dateien.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "unversionierte Dateien hinzufügen" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "%d Pfad hinzugefügt\n" -msgstr[1] "%d Pfade hinzugefügt\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "Ignoriere nicht zusammengeführte Datei: %s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Nur Binärdateien geändert.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Keine Änderungen.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Patch Aktualisierung" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Diff überprüfen" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "Zeige Pfade mit Änderungen" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "Zum Commit vorgemerkte Änderungen auf HEAD-Version zurücksetzen" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "Blöcke und Änderung gezielt auswählen" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "Differenz zwischen HEAD und Index ansehen" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "Inhalte von unversionierten Dateien zum Commit vormerken" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "Hilfe für Eingaben:" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "Ein einzelnes Element auswählen" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "Eine Reihe von Elementen auswählen" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "Mehrere Reihen auswählen" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "Element basierend auf eindeutigen Präfix auswählen" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "Angegebene Elemente abwählen" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "Alle Elemente auswählen" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(leer) Auswählen beenden" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "Ein nummeriertes Element auswählen" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(leer) nichts auswählen" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Befehle ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Was nun" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "zur Staging-Area hinzugefügt" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "aus Staging-Area entfernt" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "Pfad" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "Index konnte nicht aktualisiert werden" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Tschüss.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete " -"Patch-Block direkt für die Staging-Area markiert." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - diesen Patch-Block zum Commit vormerken\n" -"n - diesen Patch-Block nicht zum Commit vormerken\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit " -"vormerken\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit vormerken\n" -"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit " -"vormerken\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Löschung stashen [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete " -"Patch-Block direkt zum Stashen markiert." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - diesen Patch-Block stashen\n" -"n - diesen Patch-Block nicht stashen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht stashen\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete " -"Patch-Block direkt zum Entfernen aus der Staging-Area markiert." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - diesen Patch-Block aus Staging-Area entfernen\n" -"n - diesen Patch-Block nicht aus Staging-Area entfernen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht aus Staging-" -"Area entfernen\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei aus Staging-Area " -"entfernen\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht aus Staging-" -"Area entfernen\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete " -"Patch-Block direkt zum Anwenden markiert." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - diesen Patch-Block auf den Index anwenden\n" -"n - diesen Patch-Block nicht auf den Index anwenden\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index " -"anwenden\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index " -"anwenden\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index " -"anwenden\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete " -"Patch-Block direkt zum Verwerfen markiert." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n" -"n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im " -"Arbeitsverzeichnis verwerfen\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis " -"verwerfen\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " -"Arbeitsverzeichnis verwerfen\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d" -"%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n" -"n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht verwerfen\n" -"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" -"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d" -"%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - diesen Patch-Block im Index und auf das Arbeitsverzeichnis anwenden\n" -"n - diesen Patch-Block nicht im Index und auf das Arbeitsverzeichnis " -"anwenden\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht anwenden\n" -"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" -"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n" -"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n" -"q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n" -"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" -"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "Konnte Block-Header '%.*s' nicht parsen." - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "Konnte farbigen Block-Header '%.*s' nicht parsen." - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "Konnte Differenz nicht parsen." - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "Konnte farbige Differenz nicht parsen." - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "'%s' konnte nicht ausgeführt werden" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "nicht übereinstimmende Ausgabe von interactive.diffFilter" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Der Filter muss eine Eins-zu-Eins-Beziehung\n" -"zwischen den Ein- und Ausgabe-Zeilen einhalten." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"Erwartete Kontextzeile #%d in\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"Patch-Blöcke überlappen sich nicht:\n" -"%.*s\n" -"\tendet nicht mit:\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" -"Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n" -"Kurzanleitung.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"Um '%c' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n" -"Um '%c' Zeilen zu entfernen, löschen Sie diese.\n" -"Zeilen, die mit %c beginnen, werden entfernt.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Wenn das nicht sauber angewendet werden kann, haben Sie die Möglichkeit\n" -"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt " -"werden,\n" -"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "Konnte Block-Header nicht parsen." - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "'git apply --cached' schlug fehl." - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n" -"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?" - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "" -"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Nichts angewendet.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block " -"anzeigen\n" -"J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n" -"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-" -"Block anzeigen\n" -"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n" -"g - Patch-Block zum Hinspringen auswählen\n" -"/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n" -"s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n" -"e - aktuellen Patch-Block manuell editieren\n" -"? - Hilfe anzeigen\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "Kein vorheriger Patch-Block" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "Kein folgender Patch-Block" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "Keine anderen Patch-Blöcke verbleibend" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "zu welchem Patch-Block springen? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Ungültige Nummer: '%s'" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar." -msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "Keine anderen Patch-Blöcke zum Durchsuchen" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "Suche nach regulärem Ausdruck? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "Kein Patch-Block entspricht dem angegebenen Muster" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "In %d Patch-Block aufgeteilt." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "'git apply' schlug fehl" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sHinweis: %.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien " "haben." -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "" "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "" "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:186 +#: advice.c:180 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." @@ -768,23 +63,23 @@ msgstr "" "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n" "und zu committen." -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen." -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Beende wegen nicht abgeschlossenem Merge." -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -917,7 +212,17 @@ msgstr "Ungültiger Modus in Zeile %d: %s" msgid "inconsistent header lines %d and %d" msgstr "Inkonsistente Kopfzeilen %d und %d." -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: unerwartete Zeile: %.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -932,82 +237,72 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile " "%d)" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: unerwartete Zeile: %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -1015,12 +310,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1029,25 +324,25 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n" "umgekehrten Patch-Block auf '%s'" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1055,427 +350,441 @@ msgstr "" "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n" "entspricht" -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht im Index" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version im Index" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n" "zurückzufallen." -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Falle zurück auf 3-Wege-Merge ...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kann aktuelle Inhalte von '%s' nicht lesen" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch auf '%s' mit Konflikten angewendet.\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch auf '%s' sauber angewendet.\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "Ungültiger Pfad '%s'" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s ..." -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)." -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "konnte %s nicht zum temporären Index hinzufügen" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "konnte temporären Index nicht nach %s schreiben" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus dem Index entfernen" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "Fehler beim Schreiben nach '%s'" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "interner Fehler" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ausgelassen." -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "kann Patch '%s' nicht öffnen: %s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu." msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu." -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet." msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "Pfad" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "Anzahl" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " "ausgeben" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "neue Dateien mit `git add --intent-to-add` markieren" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporären Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "Aktion" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "Wurzelverzeichnis" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" @@ -1498,7 +807,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -1530,7 +839,7 @@ msgstr "Format" msgid "archive format" msgstr "Archivformat" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "Präfix" @@ -1538,12 +847,11 @@ msgstr "Präfix" msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "Datei" @@ -1576,7 +884,7 @@ msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "Repository" @@ -1584,7 +892,7 @@ msgstr "Repository" msgid "retrieve the archive from remote repository <repo>" msgstr "Archiv vom Remote-Repository <Repository> abrufen" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "Programm" @@ -1615,66 +923,66 @@ msgstr "Unbekanntes Archivformat '%s'" msgid "Argument not supported for format '%s': -%d" msgstr "Argument für Format '%s' nicht unterstützt: -%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "Kann Blob %s nicht streamen." -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "Kann %s nicht lesen." -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "Konnte '%s' Filter nicht starten." -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "Konnte Descriptor nicht umleiten." -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "'%s' Filter meldete Fehler." -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "Pfad ist kein gültiges UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s ist kein gültiger Attributname" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s nicht erlaubt: %s:%d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1692,12 +1000,12 @@ msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s" msgid "We cannot bisect more!\n" msgstr "Keine binäre Suche mehr möglich!\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "%s ist kein gültiger Commit-Name" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1706,7 +1014,7 @@ msgstr "" "Die Merge-Basis %s ist fehlerhaft.\n" "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1715,7 +1023,7 @@ msgstr "" "Die Merge-Basis %s ist neu.\n" "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1724,7 +1032,7 @@ msgstr "" "Die Merge-Basis %s ist %s.\n" "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1735,7 +1043,7 @@ msgstr "" "git bisect kann in diesem Fall nicht richtig arbeiten.\n" "Vielleicht verwechselten Sie %s und %s Commits?\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1747,36 +1055,36 @@ msgstr "" "erste %s Commit zwischen %s und %s befindet.\n" "Es wird dennoch fortgesetzt." -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "ein %s Commit wird benötigt" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s war sowohl %s als auch %s\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1785,7 +1093,7 @@ msgstr "" "Kein testbarer Commit gefunden.\n" "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1795,50 +1103,50 @@ msgstr[1] "(ungefähr %d Schritte)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n" msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents und --reverse funktionieren gemeinsam nicht." -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "" "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse und --first-parent zusammen erfordern die Angabe eines " "endgültigen\n" "Commits" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n" "\"first-parent\"-Kette" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "Pfad %s nicht in %s" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "kann Blob %s für Pfad '%s' nicht lesen" @@ -1995,8 +1303,8 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" @@ -2027,62 +1335,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Das Paket benötigt diese Referenz:" msgstr[1] "Das Paket benötigt diese %d Referenzen:" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "Konnte dup für Descriptor des Pakets nicht ausführen." -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Konnte Paketobjekte nicht erstellen" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "Erstellung der Paketobjekte abgebrochen" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ist kein Commit!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2103,28 +1411,28 @@ msgstr "" "Sie können diese Meldung unterdrücken, indem Sie\n" "\"git config advice.graftFileDeprecated false\" ausführen." -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s." -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s." -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2136,177 +1444,167 @@ msgstr "" "Encoding,\n" "welches von ihrem Projekt verwendet wird.\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "Commit-Graph-Datei ist zu klein." -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein." -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein." -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein." -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "fehlender Tabelleneintrag für Commit-Graph Chunk-Lookup; Datei " "möglicherweise unvollständig" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor." -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "Commit-Graph hat keinen Basis-Graph-Chunk" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "Commit-Graph Verkettung stimmt nicht überein." -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "Konnte nicht alle Commit-Graph-Dateien finden." -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt." -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "Konnte Commit %s nicht finden." -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "Konnte Commit '%s' nicht parsen." - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "Konnte Art von Objekt '%s' nicht bestimmen." -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Lade bekannte Commits in Commit-Graph" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Erweitere erreichbare Commits in Commit-Graph" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Lösche Commit-Markierungen in Commit-Graph" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" -msgstr "Commit-Graph Generationsnummern berechnen" +msgstr "Commit-Graph Generierungsnummern berechnen" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Suche Commits für Commit-Graph in %d Paket" msgstr[1] "Suche Commits für Commit-Graph in %d Paketen" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "Fehler beim Hinzufügen von Paket %s." -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "Fehler beim Öffnen des Index für %s." -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Suche Commits für Commit-Graph in %d Referenz" msgstr[1] "Suche Commits für Commit-Graph in %d Referenzen" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "ungültige Commit-Objekt-ID: %s" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "Suche Commits für Commit-Graph in gepackten Objekten" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Zähle Commits in Commit-Graph" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Suche zusätzliche Ränder in Commit-Graph" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs." -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Schreibe Commit-Graph in %d Durchgang" msgstr[1] "Schreibe Commit-Graph in %d Durchgängen" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "Konnte Commit-Graph Chain-Datei nicht öffnen." -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen." -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "Konnte temporäre Commit-Graph-Datei nicht umbenennen." -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "Durchsuche zusammengeführte Commits" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "Unerwartete doppelte Commit-ID %s" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "Zusammenführen von Commit-Graph" @@ -2319,23 +1617,23 @@ msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben." msgid "too many commits to write graph" msgstr "Zu viele Commits zum Schreiben des Graphen." -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "Die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich " "beschädigt." -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "Konnte Commit %s von Commit-Graph nicht parsen." @@ -2344,34 +1642,34 @@ msgstr "Konnte Commit %s von Commit-Graph nicht parsen." msgid "Verifying commits in commit graph" msgstr "Commit in Commit-Graph überprüfen" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "Commit-Graph-Vorgänger für %s ist %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2379,7 +1677,7 @@ msgstr "" "Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich " "null" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2387,12 +1685,12 @@ msgstr "" "Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst " "null" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2444,7 +1742,7 @@ msgstr "Schlüssel enthält keine Sektion: %s" msgid "key does not contain variable name: %s" msgstr "Schlüssel enthält keinen Variablennamen: %s" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "Ungültiger Schlüssel: %s" @@ -2588,7 +1886,7 @@ msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" "Muss einer von diesen sein: nothing, matching, simple, upstream, current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung" @@ -2613,111 +1911,117 @@ msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen." msgid "failed to parse %s" msgstr "Fehler beim Parsen von %s." -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungültiger %s: '%s'" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 " "liegen." -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n" "nicht parsen." -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "Ungültiger Sektionsname '%s'" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben." -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht sperren." -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "Öffne %s" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "Ungültiges Muster: %s" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "Ungültige Konfigurationsdatei %s" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "mmap für '%s' fehlgeschlagen" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "chmod auf %s fehlgeschlagen" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "Konnte Konfigurationsdatei %s nicht schreiben." -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "Ungültiger Sektionsname: %s" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "Fehlender Wert für '%s'" @@ -2844,7 +2148,7 @@ msgstr "Fehler bei der Suche nach %s (%s)" msgid "unknown port %s" msgstr "Unbekannter Port %s" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "Merkwürdigen Hostnamen '%s' blockiert." @@ -2859,59 +2163,59 @@ msgstr "Merkwürdigen Port '%s' blockiert." msgid "cannot start proxy %s" msgstr "Kann Proxy %s nicht starten." -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "Kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax." -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "SSH-Variante 'simple' unterstützt kein -4." -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "SSH-Variante 'simple' unterstützt kein -6." -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports." -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "Merkwürdigen Pfadnamen '%s' blockiert." -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "Kann Prozess nicht starten." -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausführen" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "Fehler beim Schreiben nach rev-list" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "Unerlaubte crlf_action %d" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF würde in %s durch LF ersetzt werden." -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2921,12 +2225,12 @@ msgstr "" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF würde in %s durch CRLF ersetzt werden." -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2936,19 +2240,19 @@ msgstr "" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert." -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" -"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie\n" -"UTF-%.*s als Codierung im Arbeitsverzeichnis." +"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%s\n" +"als Codierung im Arbeitsverzeichnis." #: convert.c:304 #, c-format @@ -2965,50 +2269,50 @@ msgstr "" "oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n" "Arbeitsverzeichnis." -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "Fehler beim Codieren von '%s' von %s nach %s." -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "Die Codierung '%s' von %s nach %s und zurück ist nicht dasselbe." -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "Kann externen Filter '%s' nicht starten." -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "Kann Eingaben nicht an externen Filter '%s' übergeben." -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "Externer Filter '%s' fehlgeschlagen %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "Lesen von externem Filter '%s' fehlgeschlagen." -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "Externer Filter '%s' fehlgeschlagen." -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "Unerwartete Filterart." -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "Pfadname zu lang für externen Filter." -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3016,67 +2320,67 @@ msgid "" msgstr "" "Externer Filter '%s' nicht mehr verfügbar. Nicht alle Pfade wurden gefiltert." -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis." -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: clean-Filter '%s' fehlgeschlagen." -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: smudge-Filter '%s' fehlgeschlagen." -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "in der Zukunft" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "vor %<PRIuMAX> Sekunde" msgstr[1] "vor %<PRIuMAX> Sekunden" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "vor %<PRIuMAX> Minute" msgstr[1] "vor %<PRIuMAX> Minuten" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "vor %<PRIuMAX> Stunde" msgstr[1] "vor %<PRIuMAX> Stunden" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "vor %<PRIuMAX> Tag" msgstr[1] "vor %<PRIuMAX> Tagen" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "vor %<PRIuMAX> Woche" msgstr[1] "vor %<PRIuMAX> Wochen" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "vor %<PRIuMAX> Monat" msgstr[1] "vor %<PRIuMAX> Monaten" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3084,14 +2388,14 @@ msgstr[0] "vor %<PRIuMAX> Jahr" msgstr[1] "vor %<PRIuMAX> Jahren" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, und %<PRIuMAX> Monat" msgstr[1] "%s, und %<PRIuMAX> Monaten" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3130,7 +2434,7 @@ msgstr "%d Delta-Islands markiert, fertig.\n" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" @@ -3196,36 +2500,36 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "--name-only, --name-status, --check und -s schließen sich gegenseitig aus" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S und --find-object schließen sich gegenseitig aus" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "Ungültiger --stat Wert: %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s erwartet einen numerischen Wert." -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3234,42 +2538,42 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "Unbekannte Änderungsklasse '%c' in --diff-filter=%s" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "Unbekannter Wert nach ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "konnte '%s' nicht auflösen" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s erwartet die Form <n>/<m>" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s erwartet ein Zeichen, '%s' bekommen" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "Ungültiges --color-moved Argument: %s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "Ungültiger Modus '%s' in --color-moved-ws" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3277,152 +2581,152 @@ msgstr "" "Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "Ungültiges Argument für %s" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "Ungültiges --word-diff Argument: %s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Diff-Optionen zu Ausgabeformaten" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "Erzeuge Patch" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrücken" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "Erstelle Unterschiede im Rohformat" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "Synonym für '-p --raw'" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "Synonym für '-p --stat'" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "maschinenlesbare Ausgabe von --stat" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "nur die letzte Zeile von --stat ausgeben" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<Parameter1,Parameter2>..." -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "Gebe die Verteilung des relativen Umfangs der Änderungen für jedes " "Unterverzeichnis aus" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "Synonym für --dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..." -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "Warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "Gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und " "Änderungen der Datei-Rechte" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "nur Dateinamen der geänderten Dateien anzeigen" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "Generiere Zusammenfassung der Unterschiede" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<Breite>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<Anzahl>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "Gebe eine binäre Differenz aus, dass angewendet werden kann" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "Zeige vollständige Objekt-Namen in den \"index\"-Zeilen" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "Zeige farbige Unterschiede" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "<Art>" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3430,7 +2734,7 @@ msgstr "" "Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den " "Unterschieden hervor" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3438,91 +2742,91 @@ msgstr "" "Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in " "Ausgabefeldern bei --raw oder --numstat" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<Präfix>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "Zeige den gegebenen Quell-Präfix statt \"a/\"" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "Zeige den gegebenen Ziel-Präfix statt \"b/\"" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "Stelle einen zusätzlichen Präfix bei jeder Ausgabezeile voran" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "Zeige keine Quell- oder Ziel-Präfixe an" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "Zeige Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von " "Zeilen." -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<Zeichen>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Diff-Optionen zur Umbenennung" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "Teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und " "\"erstellen\"" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "Umbenennungen erkennen" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "Preimage für Löschungen weglassen." -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "Kopien erkennen" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "Nutze ungeänderte Dateien als Quelle zum Finden von Kopien" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "Erkennung von Umbenennungen deaktivieren" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "Nutze leere Blobs als Quelle von Umbennungen" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "Fortführen der Auflistung der Historie einer Datei nach Umbennung" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3530,159 +2834,159 @@ msgstr "" "Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der " "Ziele für Umbennungen und Kopien das gegebene Limit überschreitet" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Diff Algorithmus-Optionen" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "Erzeuge die kleinstmöglichen Änderungen" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "Änderungen bei der Anzahl von Whitespace ignorieren" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "Whitespace-Änderungen am Zeilenende ignorieren" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "Ignoriere Änderungen in leeren Zeilen" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu " "verschieben" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Patience Diff\"" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Histogram Diff\"" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<Algorithmus>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "Ein Algorithmus für Änderungen wählen" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<Text>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Anchored Diff\"" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<Modus>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "Zeige Wort-Änderungen, nutze <Modus>, um Wörter abzugrenzen" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<Regex>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "Verschobene Codezeilen sind andersfarbig" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "Wie Whitespaces in --color-moved ignoriert werden" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "Andere Diff-Optionen" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "Wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und " "zeige relative Pfade an" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "alle Dateien als Text behandeln" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "Vertausche die beiden Eingaben und drehe die Änderungen um" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" "Beende mit Exit-Status 1, wenn Änderungen vorhanden sind, andernfalls mit 0" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "Keine Ausgaben vom Programm" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "Erlaube die Ausführung eines externes Programms für Änderungen" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht " "werden" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<wann>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "" "Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<Format>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "verstecke 'git add -N' Einträge vom Index" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "Behandle 'git add -N' Einträge im Index als echt" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<Zeichenkette>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3690,7 +2994,7 @@ msgstr "" "Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen " "Zeichenkette verändern" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3698,25 +3002,25 @@ msgstr "" "Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen " "regulären Ausdrucks verändern" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "zeige alle Änderungen im Changeset mit -S oder -G" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "behandle <Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "" "kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "<Objekt-ID>" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3724,33 +3028,33 @@ msgstr "" "Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen " "Objektes verändern" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "Wähle Dateien anhand der Art der Änderung" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<Datei>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Ausgabe zu einer bestimmten Datei" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n" "übersprungen." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden" -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3758,64 +3062,43 @@ msgstr "" "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n" "erneut versuchen." -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein." -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "Unbekanntes Muster: '%s'" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "Unbekanntes verneinendes Muster: '%s'" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" -"Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n" -"Muster '%s' wiederholt sich." - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "Deaktiviere Cone-Muster-Übereinstimmung" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "Kann %s nicht als exclude-Filter benutzen." -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht öffnen." -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert." -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "Index-Datei in Repository %s beschädigt." -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse für '%s' nicht erstellen." -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." @@ -3834,12 +3117,12 @@ msgstr "Filtere Inhalt" msgid "could not stat file '%s'" msgstr "Konnte Datei '%s' nicht lesen." -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "Ungültiger Git-Namespace-Pfad \"%s\"" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "Konnte GIT_DIR nicht zu '%s' setzen." @@ -3849,269 +3132,265 @@ msgstr "Konnte GIT_DIR nicht zu '%s' setzen." msgid "too many args to run %s" msgstr "Zu viele Argumente angegeben, um %s auszuführen." -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Remote-Repository ohne URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: erwartete shallow-Liste" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "konnte nicht zum Remote schreiben" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benötigt multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "Ungültige shallow-Zeile: %s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "Ungültige unshallow-Zeile: %s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "Kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "%s %d %s bekommen" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "Ungültiger Commit %s" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "Gebe auf" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "Fertig" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s bekommen" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Markiere %s als vollständig" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungültiger Pack-Header" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "Server unterstützt %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "Server unterstützt keine shallow-Clients" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Server unterstützt kein --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Server unterstützt kein --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Server unterstützt kein --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Server unterstützt keine shallow-Anfragen." -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "Server unterstützt Filter" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "konnte Anfrage nicht zum Remote schreiben" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "Fehler beim Lesen von Sektionskopf '%s'." -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' erwartet, '%s' empfangen" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "Unerwartete Acknowledgment-Zeile: '%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "Fehler beim Verarbeiten von ACKS: %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "Erwartete Versand einer Packdatei nach 'ready'." -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'." -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref erwartet, '%s' bekommen" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "Unerwartetes wanted-ref: '%s'" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "Fehler beim Verarbeiten von wanted-refs: %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "kein übereinstimmender Remote-Branch" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "keine solche Remote-Referenz %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab." -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "konnte temporäre Datei nicht erstellen" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -" -"Punter PCRE v2 unterstützt." - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "'%s': read() zu kurz" @@ -4161,7 +3440,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Systembefehle / Abfragen" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "Systembefehle / Repositories synchronisieren" #: help.c:38 @@ -4256,12 +3535,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<Optionen>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4329,62 +3608,47 @@ msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt." msgid "name consists only of disallowed characters: %s" msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" "Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden." -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "konnte nicht auf partiellen Blob '%s' zugreifen" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "Konnte partielle Filter-Daten in %s nicht parsen." +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "Mehrere filter-specs können nicht kombiniert werden." #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "'tree:<Tiefe>' erwartet" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "Keine Unterstützung für sparse:path Filter mehr" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "Ungültige filter-spec '%s'" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "erwartete etwas nach 'combine:'" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "Mehrere filter-specs können nicht kombiniert werden." +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "Kann Remote-Repository für partielles Klonen nicht ändern." #: lockfile.c:151 #, c-format @@ -4415,114 +3679,118 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s" msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(ungültiger Commit)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen." -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n" "Merge wird abgebrochen." -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "Fehler beim Öffnen von '%s': %s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Spule Submodul %s zu dem folgenden Commit vor:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Spule Submodul %s vor" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht " "gefunden)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4539,33 +3807,33 @@ msgstr "" "\n" "hinzu, um diesen Vorschlag zu akzeptieren.\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n" "schreibe stattdessen nach %s." -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4574,7 +3842,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4583,7 +3851,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich gelassen." -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4592,7 +3860,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4601,46 +3869,46 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Verweigere geänderte Datei bei %s zu verlieren." -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg " "ist." -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s " "hinzu" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4649,18 +3917,18 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4673,7 +3941,7 @@ msgstr "" "wobei\n" "keines dieser Ziele die Mehrheit der Dateien erhielt." -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4684,7 +3952,7 @@ msgstr "" "Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" "Pfade dahin zu setzen: %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4695,7 +3963,7 @@ msgstr "" "%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" "zu setzen: %s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4704,7 +3972,7 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" "Benenne Verzeichnis um %s->%s in %s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4713,52 +3981,52 @@ msgstr "" "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt " "wurde." -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "ändern" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "geändert" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4767,7 +4035,7 @@ msgstr "" "Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das " "umbenannt wurde in %s; Verschiebe es nach %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4776,7 +4044,7 @@ msgstr "" "KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, " "das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden." -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4785,7 +4053,7 @@ msgstr "" "Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines " "Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s." -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4795,181 +4063,173 @@ msgstr "" "Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s " "verschoben werden." -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" +"überschrieben werden:\n" +" %s" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" -"überschrieben werden:\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-index-Datei %s ist zu klein." -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein." -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index-Version %d nicht erkannt." -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "Hash-Version %u stimmt nicht überein." -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "Ungültiger Chunk-Offset (zu groß)" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "Abschließende multi-pack-index Chunk-Id erscheint eher als erwartet." -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk." -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk." -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk." -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index fehlt erforderlicher object offset Chunk." -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein." -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index." -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "Fehler beim Hinzufügen von Packdatei '%s'." -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "Fehler beim Öffnen von pack-index '%s'" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei." -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Packdateien zum multi-pack-index hinzufügen" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "Pack-Datei %s zum Weglassen nicht gefunden" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "Chunks zum multi-pack-index schreiben" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "Fehler beim Löschen des multi-pack-index bei %s" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Suche nach referenzierten Pack-Dateien" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -4977,65 +4237,57 @@ msgstr "" "Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = " "fanout[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "Verifiziere OID-Reihenfolge im multi-pack-index" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" +msgstr "Verifiziere OID-Reihenfolge in MIDX" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Sortiere Objekte nach Pack-Datei" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Überprüfe Objekt-Offsets" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "Fehler beim Laden des Pack-Index für Packdatei %s" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Referenzierte Objekte zählen" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "Konnte 'pack-objects' nicht ausführen" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "Konnte 'pack-objects' nicht beenden" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "Kann lazy_dir Thread nicht erzeugen: %s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "Kann lazy_name Thread nicht erzeugen: %s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "Kann lazy_name Thread nicht beitreten: %s" @@ -5085,32 +4337,32 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "Ungültiger Objekttyp \"%s\"" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "Objekt %s ist ein %s, kein %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "Hash stimmt nicht mit %s überein." -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" @@ -5124,11 +4376,6 @@ msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)" msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "Konnte Größe von %s nicht bestimmen." - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -5144,7 +4391,7 @@ msgstr "%s ist inkompatibel mit %s." msgid "%s : incompatible with something else" msgstr "%s: inkompatibel mit etwas anderem" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s erwartet keinen Wert" @@ -5154,43 +4401,43 @@ msgstr "%s erwartet keinen Wert" msgid "%s isn't available" msgstr "%s ist nicht verfügbar." -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" "%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g " "Suffix" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "Meinten Sie `--%s` (mit zwei Strichen)?" +msgid "did you mean `--%s` (with two dashes ?)" +msgstr "Meinten Sie `--%s` (mit zwei Strichen?)" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "Unbekannte Option: `%s'" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "Unbekannter Schalter `%c'" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "Unbekannte nicht-Ascii Option in String: `%s'" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" @@ -5198,21 +4445,21 @@ msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "Alias für --%s" @@ -5237,35 +4484,35 @@ msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"." msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Es ist nur eine Angabe von 'attr:' erlaubt." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "Angabe von 'attr:' darf nicht leer sein" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "Ungültiger Attributname %s" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind " "inkompatibel." -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5273,56 +4520,51 @@ msgstr "" "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n" "mit allen anderen Optionen." -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' und 'glob' sind inkompatibel" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'" +msgid "%s: '%s' is outside repository" +msgstr "%s: '%s' liegt außerhalb des Repositories" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (Kürzel: '%c')" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "Zeile enthält falsche Anführungszeichen: %s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "Konnte Flush-Paket nicht schreiben." @@ -5384,42 +4626,33 @@ msgstr "Aktualisiere Index" msgid "unable to create threaded lstat: %s" msgstr "Kann Thread für lstat nicht erzeugen: %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Remote-Repository ohne URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "Konnte `log` nicht starten." -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "Konnte Ausgabe von `log` nicht lesen." -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "Konnte Commit '%s' nicht parsen." -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "Konnte Git-Header '%.*s' nicht parsen." -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "Fehler beim Generieren des Diffs." -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "Konnte Log für '%s' nicht parsen." @@ -5461,16 +4694,16 @@ msgstr "Konnte '%s' nicht dem Index hinzufügen." msgid "unable to stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein." -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Aktualisiere Index" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5479,7 +4712,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5488,154 +4721,143 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "Ungültige Signatur 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "Ungültige Index-Version %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "Ungültige SHA1-Signatur der Index-Datei." -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen." -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "Ignoriere Erweiterung %.4s" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "Unbekanntes Format für Index-Eintrag 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'." -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "Ungeordnete Stage-Einträge im Index." -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'." -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "Ungeordnete Stage-Einträge für '%s'." -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "Index-Datei beschädigt" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: Öffnen der Index-Datei fehlgeschlagen." -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: Kann geöffneten Index nicht lesen." -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: Index-Datei ist kleiner als erwartet." -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: Konnte Index-Datei nicht einlesen." -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "Kann Thread für load_index_extensions nicht beitreten: %s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "Konnte geteilten Index '%s' nicht aktualisieren." -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s." -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen." -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht öffnen: %s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: Kann nicht auf Stufe #0 wechseln." -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n" -"'git rebase --continue' aus.\n" -"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -5643,7 +4865,7 @@ msgstr "" "Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. " "Ignoriere." -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5688,14 +4910,14 @@ msgstr "" "Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n" "ausgeführt.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase von %s auf %s (%d Kommando)" msgstr[1] "Rebase von %s auf %s (%d Kommandos)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5704,7 +4926,7 @@ msgstr "" "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n" "entfernen.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5712,7 +4934,7 @@ msgstr "" "\n" "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5726,7 +4948,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5736,19 +4958,22 @@ msgstr "" "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Leere Commits sind auskommentiert." + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "Konnte '%s' nicht schreiben." -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "Konnte '%s' nicht schreiben." +msgid "could not copy '%s' to '%s'." +msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5757,7 +4982,7 @@ msgstr "" "Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n" "Entfernte Commits (neu zu alt):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5774,13 +4999,6 @@ msgstr "" "Warnungen zu ändern.\n" "Die möglichen Verhaltensweisen sind: ignore, warn, error.\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "Konnte '%s' nicht lesen." - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5791,7 +5009,7 @@ msgstr "%s zeigt auf kein gültiges Objekt!" msgid "ignoring dangling symref %s" msgstr "Ignoriere unreferenzierte symbolische Referenz %s" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "Ignoriere fehlerhafte Referenz %s" @@ -5816,15 +5034,14 @@ msgstr "Referenz '%s' existiert bereits." msgid "unexpected object ID when writing '%s'" msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'." -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." @@ -5859,39 +5076,39 @@ msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'." msgid "update_ref failed for ref '%s': %s" msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "Mehrere Aktualisierungen für Referenz '%s' nicht erlaubt." -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "" "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung " "verboten." -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existiert; kann '%s' nicht erstellen" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "Kann '%s' und '%s' nicht zur selben Zeit verarbeiten." -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht löschen" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" @@ -5901,7 +5118,7 @@ msgstr "Konnte Referenzen nicht entfernen: %s" msgid "invalid refspec '%s'" msgstr "Ungültige Refspec '%s'" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "entfernt" @@ -5920,283 +5137,283 @@ msgstr "%d hinterher" msgid "ahead %d, behind %d" msgstr "%d voraus, %d hinterher" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "nicht erkannte Farbe: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Positiver Wert erwartet refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Positiver Wert erwartet refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "nicht erkanntes %%(%s) Argument: %s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) akzeptiert keine Argumente" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "nicht erkanntes %%(objectsize) Argument: %s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) akzeptiert keine Argumente" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) akzeptiert keine Argumente" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) akzeptiert keine Argumente" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "unbekanntes %%(trailers) Argument: %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "nicht erkanntes %%(contents) Argument: %s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "Positiver Wert erwartet objectname:short=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "nicht erkanntes %%(objectname) Argument: %s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "nicht erkannte Position:%s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "nicht erkanntes %%(align) Argument: %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe für %%(align) erwartet" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "nicht erkanntes %%(if) Argument: %s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten." -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: %%(then) Atom mehr als einmal verwendet" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: %%(then) Atom nach %%(else) verwendet" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "Format: %%(end) Atom mehr als einmal verwendet" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "kein Branch, Rebase von %s" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "kein Branch, Rebase von losgelöstem HEAD %s" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "kein Branch, binäre Suche begonnen bei %s" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "kein Branch" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt für %s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s für %s fehlgeschlagen" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "Die Option `%s' ist inkompatibel mit --merged." -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "Die Option `%s' ist inkompatibel mit --no-merged." -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "Die Option `%s' muss auf einen Commit zeigen." -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' " "beginnen: %s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten." -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten." -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen." -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt üblicherweise %s, nicht %s" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "Schlüssel '%s' des Musters hatte kein '*'." -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "Wert '%s' des Musters hat kein '*'." -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "Src-Refspec %s entspricht keiner Referenz." -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "Src-Refspec %s entspricht mehr als einer Referenz." @@ -6205,7 +5422,7 @@ msgstr "Src-Refspec %s entspricht mehr als einer Referenz." #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6232,7 +5449,7 @@ msgstr "" "Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n" "Referenz mit vollqualifizierten Namen angeben." -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6243,7 +5460,7 @@ msgstr "" "Meinten Sie, einen neuen Branch mittels Push nach\n" "'%s:refs/heads/%s' zu erstellen?" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6254,7 +5471,7 @@ msgstr "" "Meinten Sie, einen neuen Tag mittels Push nach\n" "'%s:refs/tags/%s' zu erstellen?" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6265,7 +5482,7 @@ msgstr "" "Meinten Sie, einen Tag für ein neues Tree-Objekt\n" "mittels Push nach '%s:refs/tags/'%s' zu erstellen?" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6276,117 +5493,117 @@ msgstr "" "Meinten Sie, einen Tag für ein neues Blob-Objekt\n" "mittels Push nach '%s:refs/tags/%s' zu erstellen?" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kann nicht zu Branch aufgelöst werden." -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht." -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "Dst-Refspec %s entspricht mehr als einer Referenz." -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "Kein solcher Branch: '%s'" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten " "Branch" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel für \"push\" (push.default ist 'nothing')" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "Konnte Remote-Referenz %s nicht finden." -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoriere sonderbare Referenz '%s' lokal" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (benutzen Sie \"%s\" für Details)\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n" msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6396,12 +5613,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6416,13 +5633,13 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "Kann erwarteten Objektnamen '%s' nicht parsen." @@ -6437,7 +5654,7 @@ msgstr "ungültiger Name für ersetzende Referenz: %s" msgid "duplicate replace ref: %s" msgstr "doppelte ersetzende Referenz: %s" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "Ersetzungstiefe zu hoch für Objekt %s" @@ -6500,8 +5717,8 @@ msgstr "Kann '%s' nicht löschen." msgid "Recorded preimage for '%s'" msgstr "Preimage für '%s' aufgezeichnet." -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." @@ -6535,20 +5752,20 @@ msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n" msgid "unable to open rr-cache directory" msgstr "Konnte rr-cache Verzeichnis nicht öffnen." -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s" @@ -6571,30 +5788,30 @@ msgstr "" "Sie können diese Warnung mit `git config advice.ignoredHook false` " "deaktivieren." -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status." -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6602,47 +5819,47 @@ msgstr "" "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n" "Versand (\"--signed push\") unterstützt" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "die Gegenseite unterstützt keine Push-Optionen" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen." -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "Konnte '%s' nicht löschen." -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "Konnte '%s' nicht löschen" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "Revert" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "Cherry-Pick" -#: sequencer.c:329 -msgid "rebase" -msgstr "Rebase" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "interaktives Rebase" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "Unbekannte Aktion: %d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6650,7 +5867,7 @@ msgstr "" "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6660,111 +5877,116 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "Fehler beim Fertigstellen von '%s'." -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden." -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "" "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren." -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: Vorspulen" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Index-Datei nicht schreiben" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren." -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "Konnte HEAD-Commit nicht auflösen." -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "Kein Schlüssel in '%.*s' vorhanden." -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "Konnte Anführungszeichen von '%s' nicht entfernen." -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' bereits angegeben." -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben." -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' bereits angegeben." -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "Unbekannte Variable '%s'" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' fehlt." -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' fehlt." -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' fehlt." -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "Ungültiges Datumsformat '%s' in '%s'" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6795,11 +6017,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "Root-Commit schreiben" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' Hook fehlgeschlagen." -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6827,7 +6053,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6853,326 +6079,327 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "Konnte neu erstellten Commit nicht analysieren." -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde." -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (Root-Commit)" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "Konnte HEAD nicht parsen." -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ist kein Commit!" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "Konnte Commit-Autor nicht parsen." -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen." -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "Konnte Commit %s nicht parsen." -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "Konnte Eltern-Commit %s nicht parsen." -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "Unbekannter Befehl: %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "benötige HEAD für fixup" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengeführt." -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "kann fixup nicht auf Root-Commit anwenden" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen." #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s akzeptiert keine Argumente: '%s'" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "Fehlende Argumente für %s." -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "Konnte '%s' nicht parsen." +msgid "could not parse '%.*s'" +msgstr "Konnte '%.*s' nicht parsen." -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungültige Zeile %d: %.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "Konnte '%s' nicht lesen." + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "Abbrechen eines laufenden \"cherry-pick\"" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "Abbrechen eines laufenden \"revert\"" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen." -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht während eines Cherry-Picks ausführen." -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "Unbenutzbares squash-onto." -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "\"revert\" ist bereits im Gange" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "\"cherry-pick\" wird bereits durchgeführt" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gange" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD." -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "Kein Revert im Gange" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "kein \"cherry-pick\" im Gange" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "Überspringen des Commits fehlgeschlagen" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "Nichts zum Überspringen vorhanden" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7181,21 +6408,21 @@ msgstr "" "Haben Sie bereits committet?\n" "Versuchen Sie \"git %s --continue\"" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "Konnte %s nicht aktualisieren." -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7214,22 +6441,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "Konnte %s... (%.*s) nicht anwenden" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Konnte \"%.*s\" nicht zusammenführen." -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "Konnte den Index nicht lesen." + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7245,11 +6477,11 @@ msgstr "" "\n" "ausführen.\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7267,73 +6499,77 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "Unerlaubter Beschriftungsname: '%.*s'" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "unechten Root-Commit schreiben" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "squash-onto schreiben" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "Konnte Index nicht schreiben." + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "Konnte '%s' nicht auflösen." -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "Kann nicht ohne einen aktuellen Commit mergen." -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "Konnte '%.*s' nicht parsen." -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "Nichts zum Zusammenführen: '%.*s'" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "Octupus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden." -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen." -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen." -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "merge: Konnte neue Index-Datei nicht schreiben." -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Automatischen Stash angewendet.\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7344,26 +6580,31 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "Konnte %s nicht auschecken." + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s: keine gültige OID" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "Konnte HEAD nicht loslösen" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Angehalten bei HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Angehalten bei %s\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7385,50 +6626,50 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "Ungültige Datei: '%s'" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "Ungültige Inhalte: '%s'" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7439,59 +6680,69 @@ msgstr "" "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "Konnte Datei nicht schreiben: '%s'" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: unbehandelte Optionen" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: Fehler beim Vorbereiten der Commits" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n" +"'git rebase --continue' aus.\n" +"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "Nichts zu tun." -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen." -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "Das Script wurde bereits umgeordnet." -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s' liegt außerhalb des Repositories von '%s'" +msgid "'%s' is outside repository" +msgstr "'%s' liegt außerhalb des Repositories." -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7501,7 +6752,7 @@ msgstr "" "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n" "nicht existieren." -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7513,13 +6764,13 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind." -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7530,93 +6781,93 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" "Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten." -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden." -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "Unbekannte Repository-Erweiterungen gefunden:" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "Fehler beim Öffnen von '%s'." -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "Zu groß, um eine .git-Datei zu sein: '%s'" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "Fehler beim Lesen von '%s'." -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "Ungültiges gitfile-Format: %s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "Kein Pfad in gitfile: %s" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "Kein Git-Repository: %s" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' zu groß" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "Kein Git-Repository: '%s'" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "Kann nicht in Verzeichnis '%s' wechseln." -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln." -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "Konnte '%*s%s%s' nicht lesen." -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen." -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "Kann nicht nach '%s' wechseln." -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7626,7 +6877,7 @@ msgstr "" "%s)\n" "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)." -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7635,290 +6886,290 @@ msgstr "" "Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n" "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben." -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "Öffnen von /dev/null oder dup fehlgeschlagen." -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "fork fehlgeschlagen" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "setsid fehlgeschlagen" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren." -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren." -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen." -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "Konnte \"alternates\"-Datei nicht lesen." -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen." -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "Pfad '%s' existiert nicht" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "Referenziertes Repository '%s' wird noch nicht als verknüpftes\n" "Arbeitsverzeichnis unterstützt." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>." -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "mmap fehlgeschlagen" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "Objektdatei %s ist leer." -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "Fehlerhaftes loses Objekt '%s'." -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "Nutzlose Daten am Ende von losem Objekt '%s'." -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "ungültiger Objekt-Typ" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken." -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "Konnte %s Kopfbereich nicht entpacken." -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen." -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "Konnte %s Kopfbereich nicht parsen." -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "Konnte Objekt %s nicht lesen." -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "Ersetzung %s für %s nicht gefunden." -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt." -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt." -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "Konnte Datei %s nicht schreiben." -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "Fehler beim Schreiben einer Datei." -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "Fehler beim Schließen der Datei für lose Objekte." -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-" "Datenbank %s" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "Konnte temporäre Datei nicht erstellen." -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "Fehler beim Schreiben der Datei für lose Objekte." -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "Konnte neues Objekt %s (%d) nicht komprimieren." -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "Fehler wegen instabilen Objektquelldaten für %s" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "Fehler beim Aufruf von utime() auf '%s'." -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "Kann Objekt für %s nicht lesen." -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "fehlerhafter Commit" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "fehlerhaftes Tag" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "Lesefehler beim Indizieren von '%s'." -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "read() zu kurz beim Indizieren von '%s'." -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s: Fehler beim Einfügen in die Datenbank" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s: nicht unterstützte Dateiart" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s ist kein gültiges Objekt" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ist kein gültiges '%s' Objekt" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "kann %s nicht öffnen" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "Hash für %s stimmt nicht überein (%s erwartet)." -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "Konnte mmap nicht auf %s ausführen." -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "Konnte Kopfbereich von %s nicht entpacken." -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "Konnte Kopfbereich von %s nicht parsen." -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "Konnte Inhalt von %s nicht entpacken." -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Kurzer SHA-1 %s ist mehrdeutig." -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Die Kandidaten sind:" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7943,112 +7194,44 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "Log für '%.*s' geht nur bis %s zurück" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "Log für '%.*s' hat nur %d Einträge" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"Pfad '%s' existiert, aber nicht '%s'\n" -"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "Pfad '%s' existiert nicht in '%.*s'" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"Pfad '%s' ist im Index, aber nicht in Stufe %d\n" -"Hinweis: Meinten Sie ':%d:%s'?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"Pfad '%s' ist im Index, aber nicht '%s'\n" -"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "" -"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses " -"benutzt werden." - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "ungültiger Objektname '%.*s'." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8056,18 +7239,13 @@ msgstr[0] "%u Byte" msgstr[1] "%u Bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u Byte/s" msgstr[1] "%u Bytes/s" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "Konnte '%s' nicht editieren." - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -8098,128 +7276,51 @@ msgstr "In nicht ausgechecktem Submodul '%s'." msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "ungültiges --ignore-submodules Argument: %s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein " -"Submodul. Wird übersprungen." - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit." -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' " -"ausführen." - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "Prozess für Submodul '%s' fehlgeschlagen" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "Pushe Submodul '%s'\n" - -#: submodule.c:1161 -#, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "Kann Push für Submodul '%s' nicht ausführen\n" - -#: submodule.c:1453 +#: submodule.c:1481 #, c-format -msgid "Fetching submodule %s%s\n" -msgstr "Anfordern des Submoduls %s%s\n" +msgid "Could not access submodule '%s'" +msgstr "Konnte nicht auf Submodul '%s' zugreifen." -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "Konnte nicht auf Submodul '%s' zugreifen\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Fehler während des Anforderns der Submodule:\n" -"%s" - -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nicht als Git-Repository erkannt" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausführen" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen." -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben." -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "konnte Index des Submoduls nicht zurücksetzen" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "Submodul '%s' hat einen geänderten Index." -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submodule '%s' konnte nicht aktualisiert werden." -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "" -"Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten." - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8227,17 +7328,12 @@ msgstr "" "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstützt" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" -msgstr "Konnte Name für Submodul '%s' nicht nachschlagen." - -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert." +msgstr "konnte Name für Submodul '%s' nicht nachschlagen" -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8248,37 +7344,42 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "Konnte 'ls-files' nicht in .. starten" -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "Ignoriere verdächtigen Submodulnamen: %s" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt." -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden " "würde." -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "Ungültiger Wert für %s" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" @@ -8294,7 +7395,7 @@ msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen" msgid "unknown value '%s' for key '%s'" msgstr "unbekannter Wert '%s' für Schlüssel %s" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" @@ -8313,7 +7414,7 @@ msgstr "Konnte Eingabe-Datei '%s' nicht lesen" msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "Konnte '%s' nicht lesen" @@ -8342,47 +7443,47 @@ msgstr "konnte temporäre Datei nicht zu %s umbenennen" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "Konnte Paket '%s' nicht lesen." -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ungültige --depth Option '%s'" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "Siehe protocol.version in 'git help config' für weitere Informationen" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "Konnte transport.color.* Konfiguration nicht parsen." -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "Unterstützung für Protokoll v2 noch nicht implementiert." -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "Unbekannter Wert für Konfiguration '%s': %s" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "Übertragungsart '%s' nicht erlaubt." -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync wird nicht länger unterstützt." -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8391,7 +7492,7 @@ msgstr "" "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n" "Remote-Repository gefunden wurden:\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8418,34 +7519,34 @@ msgstr "" "zum Versenden zu einem Remote-Repository.\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "Abbruch." -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "Fehler beim Versand aller erforderlichen Submodule." -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "Die Operation wird von dem Protokoll nicht unterstützt." -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen." -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Konnte Remote-Helper für '%s' nicht finden." -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "" "Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht " "ausführen." -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8454,105 +7555,100 @@ msgstr "" "Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n" "wahrscheinlich eine neuere Version von Git." -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren." -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "unerwartete Ausgabe von %s: '%s'" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s sperrte auch %s" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "Konnte \"fast-import\" nicht ausführen." -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "Fehler beim Ausführen von 'fast-import'." -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "Unbekannte Antwort auf 'connect': %s" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "" "Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt." -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "Ungültiger Remote-Service Pfad." -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "Kann keine Verbindung zu Subservice %s herstellen." -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus." -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "Remote-Helper meldete unerwarteten Status von %s." -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "Remote-Helper %s unterstützt kein Trockenlauf." -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "Remote-Helper %s unterstützt kein --signed." -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "Remote-Helper %s unterstützt kein --signed=if-asked." -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "Remote-Helper %s unterstützt kein --atomic." - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "Remote-Helper %s unterstützt nicht 'push-option'." -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "Remote-Helper %s unterstützt kein 'force'." -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "Konnte \"fast-export\" nicht ausführen." -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "Fehler beim Ausführen von \"fast-export\"." -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8561,67 +7657,67 @@ msgstr "" "Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n" "Vielleicht sollten Sie einen Branch wie 'master' angeben.\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "Ungültige Antwort in Referenzliste: %s" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "Lesen von %s fehlgeschlagen." -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "Schreiben von %s fehlgeschlagen." -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "Thread %s fehlgeschlagen." -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "Fehler beim Beitreten zu Thread %s: %s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "Fehler beim Warten von Prozess %s." -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "Prozess %s fehlgeschlagen" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "Kann Thread zum Kopieren von Daten nicht starten." -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "zu kurzes Tree-Objekt" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "fehlerhafter Modus in Tree-Eintrag" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "leerer Dateiname in Tree-Eintrag" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "zu kurze Tree-Datei" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8632,7 +7728,7 @@ msgstr "" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n" "wechseln." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8642,7 +7738,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8652,7 +7748,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8662,7 +7758,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8672,7 +7768,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8681,7 +7777,7 @@ msgstr "" "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8691,7 +7787,7 @@ msgstr "" "Dateien in diesen Verzeichnissen verloren gehen:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8701,7 +7797,7 @@ msgstr "" "den Checkout entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8712,7 +7808,7 @@ msgstr "" "Checkout entfernt werden:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8722,7 +7818,7 @@ msgstr "" "den Merge entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8733,7 +7829,7 @@ msgstr "" "Merge entfernt werden:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8743,7 +7839,7 @@ msgstr "" "den %s entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8753,7 +7849,7 @@ msgstr "" "den %s entfernt werden:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8764,7 +7860,7 @@ msgstr "" "den Checkout überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8776,7 +7872,7 @@ msgstr "" "Checkout überschrieben werden:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8786,7 +7882,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8796,7 +7892,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8806,7 +7902,7 @@ msgstr "" "den %s überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8817,12 +7913,12 @@ msgstr "" "%s überschrieben werden:\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8832,7 +7928,7 @@ msgstr "" "sind nicht aktuell:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8843,7 +7939,7 @@ msgstr "" "über einen partiellen Checkout überschrieben werden:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8854,7 +7950,7 @@ msgstr "" "über einen partiellen Checkout entfernt werden:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8863,16 +7959,16 @@ msgstr "" "Kann Submodul nicht aktualisieren:\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Abbruch\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "Aktualisiere Dateien" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8882,10 +7978,6 @@ msgstr "" "auf einem case-insensitiven Dateisystem) und nur einer von der\n" "selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "Aktualisiere Index-Markierungen" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt" @@ -8915,51 +8007,47 @@ msgstr "ungültige Portnummer" msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" -#: walker.c:170 -msgid "Fetching objects" -msgstr "Anfordern der Objekte" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "Fehler beim Lesen von '%s'" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis." -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis." -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' existiert nicht." -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' ist keine .git-Datei, Fehlercode %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' zeigt nicht zurück auf '%s'" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen." -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "konnte nicht auf '%s' zugreifen" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." @@ -9155,7 +8243,7 @@ msgstr "Sie haben nicht zusammengeführte Pfade." #: wt-status.c:1147 msgid " (fix conflicts and run \"git commit\")" -msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" +msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" #: wt-status.c:1149 msgid " (use \"git merge --abort\" to abort the merge)" @@ -9323,96 +8411,87 @@ msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr "" -" (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation " "abzubrechen)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Revert zurzeit im Gange." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade beim Revert von Commit '%s'." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" " "aus)" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Noch keine Commits" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9423,32 +8502,32 @@ msgstr "" "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9457,209 +8536,200 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" "(benutzen Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n" "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien " "anzuzeigen)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Noch keine Commits in " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "unterschiedlich" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "hinterher " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "Konnte '%s' nicht entfernen." - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "lösche '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "Konnte Patch nicht schreiben" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "Bearbeitung des Patches fehlgeschlagen" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "Konnte Verzeichnis '%s' nicht lesen" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Leerer Patch. Abgebrochen." -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "aktuelle Unterschiede editieren und anwenden" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "versionierte Dateien aktualisieren" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert " "-u)" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "" "Änderungen von allen versionierten und unversionierten Dateien hinzufügen" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "nichts hinzufügen, nur den Index aktualisieren" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "" "Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden " "konnten" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "warnen wenn eingebettetes Repository hinzugefügt wird" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "Backend für `git stash -p`" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9693,186 +8763,158 @@ msgstr "" "\n" "Siehe \"git help submodule\" für weitere Informationen." -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "Füge eingebettetes Repository hinzu: %s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Nutzen Sie die Option -f, wenn sie wirklich hinzugefügt werden sollen.\n" -"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "" -"Die Optionen --pathspec-from-file und --interactive/--patch sind " -"inkompatibel." - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "Die Optionen --pathspec-from-file und --edit sind inkompatibel." - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden." -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "" -"Die Option --pathspec-from-file ist inkompatibel mit\n" -"Pfadspezifikation-Argumenten." - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "Die Option --pathspec-file-nul benötigt --pathspec-from-file" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"Eventuell meinten Sie 'git add .'?\n" -"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Meinten Sie vielleicht 'git add .'?\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "konnte Autor-Skript nicht parsen" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' wurde durch den applypatch-msg Hook entfernt" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "\"fseek\" fehlgeschlagen" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "konnte Patch '%s' nicht parsen" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "ungültiger Zeitstempel" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "Ungültige \"Date\"-Zeile" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "Ungültiger Offset in der Zeitzone" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "Konnte Index-Datei nicht schreiben." + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus." -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" "\" aus." -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der " "Patches abzubrechen, führen Sie \"%s --abort\" aus." -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte " "verloren gehen." -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Patch ist leer." -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "Autor-Zeile fehlt in Commit %s" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "Ungültige Identifikationszeile: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "Konnte Commit '%s' nicht parsen." + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge " "zurückzufallen." -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9880,24 +8922,24 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Merge der Änderungen fehlgeschlagen." -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -9905,41 +8947,37 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "Konnte Index-Datei nicht schreiben." - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -"Benutzen Sie 'git am --show-current-patch=diff', um den\n" -"fehlgeschlagenen Patch zu sehen" +"Benutzen Sie 'git am --show-current-patch', um den\n" +"fehlgeschlagenen Patch zu sehen." -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9950,7 +8988,7 @@ msgstr "" "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n" "auslassen." -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9963,17 +9001,17 @@ msgstr "" "Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n" "diese zu akzeptieren." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "Fehler beim Bereinigen des Index" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9981,155 +9019,144 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n" "Keine Zurücksetzung zu ORIG_HEAD." -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Ungültiger Wert für --patch-format: %s" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Ungültiger Wert für --show-current-patch: %s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "" -"--show-current-patch=%s ist inkombatibel mit --show-current-patch=%s" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<Optionen>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "interaktiv ausführen" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "nach UTF-8 umkodieren (Standard)" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "-k an git-mailinfo übergeben" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "-b an git-mailinfo übergeben" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "-m an git-mailinfo übergeben" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "an git-apply übergeben" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "Format" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "Patch-Format" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "Synonyme für --continue" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "" "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen" -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen" -#: builtin/am.c:2288 -msgid "show the patch being applied" +#: builtin/am.c:2244 +msgid "show the patch being applied." msgstr "den Patch, der gerade angewendet wird, anzeigen" -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "Autor-Datum als Commit-Datum verwenden" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(intern für git-rebase verwendet)" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10137,16 +9164,16 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte verwenden Sie diese nicht mehr." -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "Fehler beim Lesen des Index" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben." -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -10155,11 +9182,11 @@ msgstr "" "Stray %s Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile" @@ -10284,7 +9311,7 @@ msgstr "Keine binäre Suche im Gange.\n" msgid "'%s' is not a valid commit" msgstr "'%s' ist kein gültiger Commit." -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10292,27 +9319,27 @@ msgstr "" "Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n" "Versuchen Sie 'git bisect reset <Commit>'." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Ungültiges \"bisect_write\" Argument: %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "Konnte die OID der Revision '%s' nicht erhalten." -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "Konnte die Datei '%s' nicht öffnen." -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ungültiger Befehl: Sie sind gerade bei einer binären %s/%s Suche." -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10321,7 +9348,7 @@ msgstr "" "Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n" "Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen." -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10332,7 +9359,7 @@ msgstr "" "Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n" "Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen." -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "Binäre Suche nur mit einem %s Commit." @@ -10341,15 +9368,15 @@ msgstr "Binäre Suche nur mit einem %s Commit." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "Sind Sie sicher [Y/n]? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "Keine Begriffe definiert." -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10358,7 +9385,7 @@ msgstr "" "Ihre aktuellen Begriffe sind %s für den alten Zustand\n" "und %s für den neuen Zustand.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10367,268 +9394,274 @@ msgstr "" "Ungültiges Argument %s für 'git bisect terms'.\n" "Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "Nicht erkannte Position: '%s'" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' scheint kein gültiger Commit zu sein." -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "Ungültiger HEAD - HEAD wird benötigt." -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start " "<gültiger-Branch>'." -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "" "binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "Ungültiger HEAD - merkwürdige symbolische Referenz." -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "Ungültige Referenz: '%s'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "'git bisect next' ausführen" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "die Begriffe nach .git/BISECT_TERMS schreiben" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "den Zustand der binären Suche aufräumen" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "auf erwartete Commits prüfen" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "den Zustand der binären Suche zurücksetzen" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "den Zustand der binären Suche nach BISECT_LOG schreiben" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "Begriffe innerhalb einer binären Suche prüfen und setzen" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "die Begriffe für die binäre Suche ausgeben" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "Sitzung für binäre Suche starten" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "kein Log für BISECT_WRITE" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms benötigt zwei Argumente." -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state erwartet keine Argumente." -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit." -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write benötigt entweder 4 oder 5 Argumente." -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms benötigt 3 Argumente." -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check benötigt 2 oder 3 Argumente." -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms benötigt 0 oder 1 Argument." -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "Erwarte eine Farbe: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "Muss mit einer Farbe enden." -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "Ungültige Farbe '%s' in color.blame.repeatedLines." -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "Ungültiger Wert für blame.coloring." -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "Konnte Commit %s zum Ignorieren nicht finden" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "Commit" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" msgstr "Ignoriere <rev> beim Ausführen von 'blame'" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "Ignoriere Commits aus <Datei>" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "Zeilen nach Alter einfärben" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "" +"eine experimentelle Heuristik zur Verbesserung der Darstellung\n" +"von Unterschieden verwenden" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n" @@ -10642,18 +9675,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren und 11 Monaten" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "Datei %s hat nur %lu Zeile" msgstr[1] "Datei %s hat nur %lu Zeilen" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Verarbeite Zeilen" @@ -10870,7 +9903,7 @@ msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))" msgid "do not use" msgstr "nicht verwenden" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "Upstream" @@ -10879,7 +9912,7 @@ msgid "change the upstream info" msgstr "Informationen zum Upstream-Branch ändern" #: builtin/branch.c:627 -msgid "unset the upstream info" +msgid "Unset the upstream info" msgstr "Informationen zum Upstream-Branch entfernen" #: builtin/branch.c:628 @@ -10982,7 +10015,7 @@ msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" @@ -11076,65 +10109,20 @@ msgstr "" "Die '--set-upstream' Option wird nicht länger unterstützt.\n" "Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'." -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<Optionen>] <Datei> <git-rev-list Argumente>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<Optionen>] <Datei>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <Datei> [<Referenzname>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <Datei> [<Referenzname>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "keine Fortschrittsanzeige anzeigen" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "Fortschrittsanzeige anzeigen" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "Keine Bundle-Details anzeigen" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s ist in Ordnung\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Unbekannter Unterbefehl: %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11142,7 +10130,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -11150,76 +10138,76 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "Nur eine Batch-Option erlaubt." -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "Blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "einen bestimmten Pfad für --textconv/--filters verwenden" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s und -t mit beschädigten Objekten erlauben" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "Ausgabe von --batch puffern" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" "Eingabe" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit " "--batch oder --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "alle Objekte mit --batch oder --batch-check anzeigen" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "Ausgabe von --batch-all-objects nicht ordnen" @@ -11247,8 +10235,8 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -11260,28 +10248,28 @@ msgstr "Eingabe-Pfade ohne Übereinstimmungen anzeigen" msgid "ignore index when checking" msgstr "Index bei der Prüfung ignorieren" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "Die Option -z kann nur mit --stdin verwendet werden." -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "kein Pfad angegeben" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig." -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "" "Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden." -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching ist nur mit --verbose zulässig" @@ -11341,9 +10329,9 @@ msgid "write the content to temporary files" msgstr "den Inhalt in temporäre Dateien schreiben" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "Zeichenkette" @@ -11372,99 +10360,99 @@ msgstr "git switch [<Optionen>] [<Branch>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d Merge-Konflikt wieder erstellt" msgstr[1] "%d Merge-Konflikte wieder erstellt" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d Pfad von %s aktualisiert" msgstr[1] "%d Pfade von %s aktualisiert" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d Pfad vom Index aktualisiert" msgstr[1] "%d Pfade vom Index aktualisiert" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "Weder '%s' noch '%s' ist angegeben" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11473,50 +10461,57 @@ msgstr "" "Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "" +"Zum Commit vorgemerkte Änderungen in den folgenden Dateien gehen eventuell " +"verloren: %s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11539,7 +10534,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11566,19 +10561,28 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "nur eine Referenz erwartet" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "nur eine Referenz erwartet, %d gegeben." + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11588,74 +10592,37 @@ msgstr "" "Bitte benutzen Sie -- (und optional --no-guess), um diese\n" "eindeutig voneinander zu unterscheiden." -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken " -"wollten,\n" -"können Sie das tun, indem Sie den vollständig qualifizierten Namen mit der\n" -"--track Option angeben:\n" -"\n" -" git checkout --track origin/<Name>\n" -"\n" -"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-" -"Repository\n" -"bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n" -"checkout.defaultRemote=origin in Ihrer Konfiguration setzen." - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "nur eine Referenz erwartet" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "nur eine Referenz erwartet, %d gegeben." - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "Ein Branch wird erwartet, Tag '%s' bekommen" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "Ein Branch wird erwartet, '%s' bekommen" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "Ein Branch wird erwartet, Commit '%s' bekommen" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11663,7 +10630,7 @@ msgstr "" "Der Branch kann nicht während eines Merges gewechselt werden.\n" "Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11672,7 +10639,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11681,7 +10648,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11690,7 +10657,7 @@ msgstr "" "gewechselt werden.\n" "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11699,145 +10666,140 @@ msgstr "" "werden.\n" "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "Sie wechseln den Branch während einer binären Suche" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' kann nicht <Startpunkt> bekommen" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "Branch- oder Commit-Argument fehlt" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "" "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p und --overlay schließen sich gegenseitig aus." -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "Kein Branchname; versuchen Sie -b." -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "Konnte %s nicht auflösen." -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben." + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden." -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "Die Optionen --pathspec-from-file und --detach sind inkompatibel." - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "Die Optionen --pathspec-from-file und --patch sind inkompatibel." - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11845,69 +10807,98 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus dem Index auschecken." -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben." +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"'%s' entspricht mehr als einem Remote-Tracking-Branch.\n" +"Wir fanden %d Remote-Repositories mit einer entsprechenden Referenz, also\n" +"haben wir versucht, das Argument als Pfad aufzulösen, was auch schief ging!\n" +"\n" +"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken " +"wollten,\n" +"können Sie das tun, indem Sie den vollständig qualifizierten Namen mit der\n" +"--track Option angeben:\n" +"\n" +" git checkout --track origin/<Name>\n" +"\n" +"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-" +"Repository\n" +"bevorzugen möchten, z.B. 'origin', könnten Sie die Einstellung\n" +"checkout.defaultRemote=origin in Ihrer Konfiguration setzen." -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)" +msgstr "" +"Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "benutze Overlay-Modus (Standard)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "einen neuen Branch erzeugen und dahin wechseln" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "einen Branch erstellen/umsetzen und dahin wechseln" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "lokale Änderungen verwerfen" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "Von welcher Commit-Referenz ausgecheckt werden soll" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "Index wiederherstellen" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "ignoriere nicht zusammengeführte Einträge" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "benutze Overlay-Modus" @@ -11947,7 +10938,7 @@ msgstr "Fehler beim Löschen von %s" msgid "could not lstat %s\n" msgstr "Konnte 'lstat' nicht für %s ausführen\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11960,7 +10951,7 @@ msgstr "" "foo - Element anhand eines eindeutigen Präfix auswählen\n" " - (leer) nichts auswählen\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11981,33 +10972,38 @@ msgstr "" "* - alle Elemente auswählen\n" " - (leer) Auswahl beenden\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Wie bitte (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Ignorier-Muster eingeben>> " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Wählen Sie Einträge zum Löschen" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Tschüss.\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12025,56 +11021,64 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** Befehle ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "Was nun" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Würde das folgende Element entfernen:" msgstr[1] "Würde die folgenden Elemente entfernen:" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Löschen, beende." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "keine Namen von gelöschten Dateien ausgeben" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien löschen" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "nur ignorierte Dateien löschen" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12082,7 +11086,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12090,7 +11094,7 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" "f gegeben; \"clean\" verweigert" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" @@ -12138,18 +11142,18 @@ msgstr "Vorlagenverzeichnis" msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "Name" @@ -12165,8 +11169,8 @@ msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "Tiefe" @@ -12175,7 +11179,7 @@ msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "Zeit" @@ -12186,19 +11190,18 @@ msgstr "" "Zeit\n" "erstellen" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "Commit" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n" "Ausschluss eines Commits vertiefen" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" @@ -12226,23 +11229,23 @@ msgstr "Schlüssel=Wert" msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "serverspezifisch" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "Option übertragen" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" @@ -12250,13 +11253,7 @@ msgstr "nur IPv6-Adressen benutzen" msgid "any cloned submodules will use their remote-tracking branch" msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" -"Initialisiere Datei für partiellen Checkout, um nur Dateien im\n" -"Root-Verzeichnis einzubeziehen" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12264,42 +11261,47 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "Fehler beim Starten der Iteration über '%s'" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "Konnte '%s' nicht entfernen." + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "Fehler beim Iterieren über '%s'" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12309,101 +11311,97 @@ msgstr "" "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "Fehler beim Initialisieren vom partiellen Checkout." - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12411,45 +11409,45 @@ msgstr "" "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-" "able" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://" -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n" "ignoriere --local" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -12498,7 +11496,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "doppelter Vorgänger %s ignoriert" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "Kein gültiger Objektname: %s" @@ -12526,13 +11524,13 @@ msgstr "Eltern-Commit" msgid "id of a parent commit object" msgstr "ID eines Eltern-Commit-Objektes." -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "Beschreibung" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "Commit-Beschreibung" @@ -12540,8 +11538,8 @@ msgstr "Commit-Beschreibung" msgid "read commit log message from file" msgstr "Commit-Beschreibung von Datei lesen" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" @@ -12616,66 +11614,58 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD." -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "Option --pathspec-from-file mit -a ist nicht sinnvoll." - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "Keine Pfade mit der Option --include/--only ist nicht sinnvoll." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "Konnte temporären Index nicht erstellen." -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "Konnte temporären Index nicht aktualisieren." -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist." -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist." -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "Konnte temporäre Index-Datei nicht schreiben." -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12683,38 +11673,38 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12729,7 +11719,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12744,7 +11734,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12754,7 +11744,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12767,149 +11757,155 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem " "vorhandenen Autor überein" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ungültiger ignored-Modus '%s'." -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden." -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "" +"Die Optionen --include und --only können nur mit der Angabe von Pfaden " +"verwendet werden." + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "Stashinformationen anzeigen" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "voraus/hinterher-Werte berechnen" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "Version" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " "all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12917,11 +11913,11 @@ msgstr "" "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. " "(Standard: traditional)" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "wann" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12929,174 +11925,174 @@ msgstr "" "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "keine Umbenennungen ermitteln" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Nicht unterstützte Kombination von ignored und untracked-files Argumenten." -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "Autor" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "Datum" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "Commit" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "Hooks pre-commit und commit-msg umgehen" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13107,80 +12103,80 @@ msgstr "" "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n" "anschließend \"git restore HEAD --staged :/\" zur Wiederherstellung aus." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--" -"[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <Objektverzeichnis>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <Objektverzeichnis>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" "git commit-graph write [--object-dir <Objektverzeichnis>] [--append|split] " -"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <Split-" -"Optionen>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll" +"[--reachable|--stdin-packs|--stdin-commits] <Split-Optionen>" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "Verzeichnis" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "Das Objektverzeichnis zum Speichern des Graphen." -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Konnte Commit-Graph '%s' nicht öffnen." -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "Durchlauf auf allen Referenzen beginnen" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "" "alle Commits einschließen, die sich bereits in der Commit-Graph-Datei " "befinden" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "Erlaube das Schreiben einer inkrementellen Commit-Graph-Datei" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "Maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" "Maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" "Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-" @@ -13190,214 +12186,208 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<Optionen>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "nicht erkanntes --type Argument, %s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "nur ein Typ erlaubt" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "Ort der Konfigurationsdatei" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "globale Konfigurationsdatei verwenden" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "systemweite Konfigurationsdatei verwenden" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "Konfigurationsdatei des Repositories verwenden" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "Konfigurationsdatei pro Arbeitsverzeichnis verwenden" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "die angegebene Konfigurationsdatei verwenden" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "Blob-Id" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "Konfiguration von angegebenem Blob-Objekt lesen" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "Aktion" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "Wert zurückgeben: Name [Wert-regex]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] " -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "neue Variable hinzufügen: Name Wert" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "eine Variable entfernen: Name [Wert-regex]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "eine Sektion umbenennen: alter-Name neuer-Name" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "eine Sektion entfernen: Name" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "alles auflisten" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "einen Editor öffnen" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "die konfigurierte Farbe finden: Slot [Standard]" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "Typ" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "Wert ist mit diesem Typ angegeben" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "Wert ist \"true\" oder \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "Wert ist eine Dezimalzahl" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "Wert ist --bool oder --int" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "Wert ist ein Verfallsdatum" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "Sonstiges" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "schließt Werte mit NUL-Byte ab" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "nur Variablennamen anzeigen" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, " "Befehlszeile)" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, " -"systemweit, Befehl)" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "Wert" -#: builtin/config.c:160 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "Falsche Anzahl von Argumenten - sollte %d sein." -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "Falsche Anzahl von Argumenten - sollte zwischen %d und %d sein." -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "Ungültiges Schlüsselmuster: %s" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "Kann Farbe '%s' nicht parsen." -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "Nicht in einem Git-Repository." -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "Das Schreiben in die Standard-Eingabe wird nicht unterstützt." -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "" "Das Schreiben von Blob-Objekten für Konfigurationen wird nicht unterstützt." -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13412,23 +12402,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "Nur eine Konfigurationsdatei zu einer Zeit möglich." -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden." -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden." -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "$HOME nicht gesetzt." -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13439,52 +12429,52 @@ msgstr "" "lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" für " "Details" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "Angabe von --get-color und Variablentyp sind ungültig." -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "Nur eine Aktion erlaubt." -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:712 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" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default ist nur anwendbar auf --get" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "Konnte Konfigurationsdatei '%s' nicht lesen." -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)." -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt." -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "Das Bearbeiten von Blobs wird nicht unterstützt." -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13494,7 +12484,7 @@ msgstr "" " Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n" " zu ändern." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "Keine solche Sektion: %s" @@ -13507,59 +12497,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<Optionen>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "Branch" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "nicht-annotiert" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "annotiert" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "annotiertes Tag %s ist nicht verfügbar" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist eigentlich '%s' hier" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "kein Tag entspricht exakt '%s'" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Keine exakte Übereinstimmung bei Referenzen oder Tags, Suche zum " "Beschreiben\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "beendete Suche bei %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13568,7 +12558,7 @@ msgstr "" "Keine annotierten Tags können '%s' beschreiben.\n" "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags." -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13577,12 +12567,12 @@ msgstr "" "Keine Tags können '%s' beschreiben.\n" "Versuchen Sie --always oder erstellen Sie einige Tags." -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "%lu Commits durchlaufen\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13591,93 +12581,94 @@ msgstr "" "mehr als %i Tags gefunden; führe die ersten %i auf\n" "Suche bei %s aufgegeben\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "Beschreibe %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gültiger Objekt-Name" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s ist weder ein Commit, noch ein Blob." -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "das Tag finden, das nach dem Commit kommt" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "alle Referenzen verwenden" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "jedes Tag verwenden, auch nicht-annotierte" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "immer langes Format verwenden" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "nur erstem Elternteil folgen" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "nur exakte Übereinstimmungen ausgeben" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "die jüngsten <n> Tags betrachten (Standard: 10)" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "keine Tags betrachten, die <Muster> entsprechen" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" -msgstr "Markierung" +msgstr "Kennzeichen" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty" +"<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty" "\")" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -"<Markierung> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken\")" +"<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken" +"\")" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "Die Option --broken kann nicht mit Commits verwendet werden." @@ -13714,27 +12705,27 @@ msgstr "unbehandeltes Objekt '%s' angegeben" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "fehlgeschlagen: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13742,54 +12733,54 @@ msgstr "" "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n" "Diff-Modus('-d' und '--dir-diff') nicht unterstützt." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "beide Dateien geändert: '%s' und '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "Datei im Arbeitsverzeichnis belassen." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "Es existieren temporäre Dateien in '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "Sie könnten diese aufräumen oder wiederherstellen." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "`diff.guitool` anstatt `diff.tool` benutzen" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "Diff über ganzes Verzeichnis ausführen" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "Tool" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "das angegebene Diff-Tool benutzen" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13798,31 +12789,31 @@ msgstr "" "Rückkehrwert\n" "verschieden 0 ausgeführt wurde" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "an 'diff' übergeben" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff kann nicht mit --no-index verwendet werden" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "kein <Tool> für --tool=<Tool> angegeben" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> für --extcmd=<Programm> angegeben" @@ -13862,194 +12853,166 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" -"Fehler: Verschachtelte Tags können nicht exportiert werden, außer --mark-" -"tags wurde angegeben." - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "Fortschritt nach <n> Objekten anzeigen" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "Behandlung von signierten Tags wählen" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "" "Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" -msgstr "Markierungen in diese Datei schreiben" +msgstr "Kennzeichen in diese Datei schreiben" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" -msgstr "Markierungen von dieser Datei importieren" +msgstr "Kennzeichen von dieser Datei importieren" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "Markierungen von dieser Datei importieren, wenn diese existiert" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "für jeden Commit das gesamte Verzeichnis ausgeben" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Ausgabe von Blob-Daten überspringen" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "Refspec" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Refspec auf exportierte Referenzen anwenden" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "Ausgabe anonymisieren" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID " "referenzieren" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "originale Objekt-IDs von Blobs/Commits anzeigen" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "Tags mit Markierungs-IDs beschriften" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "" -"--import-marks und --import-marks-if-exists können nicht zusammen " -"weitergegeben werden" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<Optionen>] <Gruppe>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel kann nicht negativ sein" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "Upstream für \"git pull/fetch\" setzen" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "das Überschreiben einer lokalen Referenz erzwingen" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, " "und geänderte Tags aktualisieren" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) auf " "Zeitbasis\n" "vertiefen" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14057,96 +13020,92 @@ msgstr "" "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n" "als Konfigurationsdateien)" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "" "ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar " "sind" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "Führe 'gc --auto' nach \"fetch\" aus" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "Schreibe den Commit-Graph nach \"fetch\"" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Konfiguration fetch.output enthält ungültigen Wert %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "würde bestehende Tags verändern" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "kein Vorspulen" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14157,7 +13116,7 @@ msgstr "" "aktivieren, nutzen Sie die Option '--show-forced-updated' oder führen\n" "Sie 'git config fetch.showForcedUpdates true' aus." -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14170,12 +13129,12 @@ msgstr "" "'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n" "zu umgehen.\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" @@ -14183,12 +13142,12 @@ msgstr "" "unvollständiger\n" "Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14197,81 +13156,60 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch." - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories." - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "Unbekannter Branch-Typ" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"Keinen Quell-Branch gefunden.\n" -"Sie müssen bei der Option --set-upstream genau einen Branch angeben." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" +"--filter kann nur mit den Remote-Repositories verwendet werden,\n" +"die in core.partialClone konfiguriert sind." -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14280,49 +13218,49 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Negative Tiefe wird von --deepen nicht unterstützt." -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen und --depth schließen sich gegenseitig aus" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "" "Die Option --unshallow kann nicht in einem Repository mit vollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" "von Refspecs verwendet werden." -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14337,23 +13275,23 @@ msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file " "<Datei>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "Alias für --log (veraltet)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "Text" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "<Text> als Beschreibungsanfang verwenden" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "Datei zum Einlesen" @@ -14417,32 +13355,32 @@ msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" msgid "print only refs which don't contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "unbekannt" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "Fehler in %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "Warnung in %s %s: %s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "Fehlerhafte Verknüpfung von %7s %s" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "Falscher Objekttyp in Verknüpfung." -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -14451,216 +13389,216 @@ msgstr "" "Fehlerhafte Verknüpfung von %7s %s\n" " nach %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "%s %s fehlt" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "%s %s nicht erreichbar" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "%s %s unreferenziert" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "Konnte lost-found nicht erstellen." -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "Konnte '%s' nicht abschließen." -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Prüfe %s" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Prüfe Konnektivität (%d Objekte)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Prüfe %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "Fehlerhafte Verknüpfungen" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "Wurzel %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "%s %s (%s) in %s getaggt" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: Ungültiger Reflog-Eintrag %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Prüfe Reflog %s->%s" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: Ungültiger SHA1-Zeiger %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: kein Commit" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "Notiz: Keine Standardreferenzen" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: Objekt konnte nicht geparst werden: %s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "Ungültige SHA1-Datei: %s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Prüfe Objekt-Verzeichnis" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Prüfe %s Verknüpfung" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s zeigt auf etwas seltsames (%s)" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: losgelöster HEAD zeigt auf nichts" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Prüfe Cache-Verzeichnis" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "non-tree in Cache-Verzeichnis" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "nur Konnektivität prüfen" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "ausführliche Namen für erreichbare Objekte anzeigen" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Prüfe Objekte" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s: Objekt nicht vorhanden" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" @@ -14674,17 +13612,17 @@ msgstr "Konnte '%s' nicht lesen: %s" msgid "failed to parse '%s' value '%s'" msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "Kann '%s' nicht lesen" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14700,58 +13638,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "" "Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "alle anderen Pakete, außer das größte Paket, neu packen" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry." -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Die Datenbank des Repositories wird für eine optimale Performance im\n" "Hintergrund komprimiert.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance " "komprimiert.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14759,14 +13697,14 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um " "diese zu löschen." -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" @@ -14784,266 +13722,266 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "im Index anstatt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "rekursive Suche in jedem Submodul" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "Zeilen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "nur ganze Wörter suchen" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "binäre Dateien als Text verarbeiten" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "keine Muster in Binärdateien finden" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "in Unterverzeichnissen suchen (Standard)" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "höchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible reguläre Ausdrücke verwenden" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "Nummer der Spalte des ersten Treffers anzeigen" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "Synonym für --files-with-matches" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "nur übereinstimmende Teile der Zeile anzeigen" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "Übereinstimmungen hervorheben" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei " "anzeigen" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "Kurzform für -C NUM" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "Kein Muster angegeben." -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "Konnte Commit nicht auflösen: %s" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert." -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "Keine Unterstützung für Threads, --threads wird ignoriert." -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "" "Die Option --open-files-in-pager kann nur innerhalb des " "Arbeitsverzeichnisses verwendet werden." -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "Die Option wird mit --recurse-submodules nicht unterstützt." + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached und --untracked können nicht mit --no-index verwendet werden." -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet " "werden." -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "--cached und \"Tree\"-Objekte angegeben" @@ -15229,11 +14167,11 @@ msgstr "Fehler beim Lesen der Eingabe" msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "Paket ist zu groß für die aktuelle Definition von off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "Paket überschreitet die maximal erlaubte Größe" @@ -15290,191 +14228,191 @@ msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes" msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "Kann existierende Informationen zu Objekt %s nicht lesen." -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "Kann existierendes Objekt %s nicht lesen." -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "fsck Fehler in gepacktem Objekt" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "abgeschlossen mit %d lokalem Objekt" msgstr[1] "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelösten Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "Kann %s Datei '%s' nicht schreiben." -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen." -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "fsck Fehler beim Packen von Objekten" @@ -15659,127 +14597,121 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "keine Datei zur direkten Bearbeitung angegeben" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<Optionen>] <Objekt>..." -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "Ungültige Option für --decorate: %s" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungültige Datei" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "Konnte Objekt %s nicht lesen." -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "" -"%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "Kein Commit-Bereich." -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "Fehler beim Erstellen der Datei für das Anschreiben." -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1255 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "Konnte keine exakte Merge-Basis finden." -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15790,281 +14722,272 @@ msgstr "" "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n" "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an." -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "Fehler beim Finden einer exakten Merge-Basis." -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein." -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "kann Patch-Id nicht lesen" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "Fehler beim Ableiten des range-diff-Bereichs." -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "[RFC PATCH] anstatt [PATCH] verwenden" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "" -"Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "Nutze [<Präfix>] statt [PATCH]" +msgstr "[<Präfix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "" "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "Header" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "Ident" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "den Patch anhängen" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "Basis-Commit" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "Forschrittsanzeige während der Erzeugung der Patches" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus." -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch." -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff gegen v%d:" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor erfordert --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch." -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Range-Diff:" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Range-Diff gegen v%d:" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Erzeuge Patches" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16195,7 +15118,7 @@ msgstr "" msgid "do not print remote URL" msgstr "URL des Remote-Repositories nicht ausgeben" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "Programm" @@ -16284,151 +15207,151 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "Option `%s' erfordert einen Wert." -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits " "hinzufügen" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "Hooks pre-merge-commit und commit-msg umgehen" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" +msgstr "commit-msg Hook überprüfen" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" @@ -16483,75 +15406,75 @@ msgstr "" "Zeilen, die mit '%c' beginnen, werden ignoriert,\n" "und eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "nichts was wir in %s zusammenführen können: %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "--quit erwartet keine Argumente" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16559,7 +15482,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16567,100 +15490,100 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "Sie können --squash nicht mit --commit kombinieren." -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen." -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen." -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Bereits aktuell." -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16746,33 +15669,33 @@ msgstr "keine Warnung bei Konflikten" msgid "set labels for file1/orig-file/file2" msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "unbekannte Option: %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "kann nicht mit mehr als %d Merge-Basis umgehen. Ignoriere %s." msgstr[1] "kann nicht mit mehr als %d Merge-Basen umgehen. Ignoriere %s." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "Konnte Referenz '%s' nicht auflösen" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Führe %s mit %s zusammen\n" @@ -16795,18 +15718,18 @@ msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [<Optionen>] (write|verify|expire|repack --batch-" -"size=<Größe>)" +"git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify|expire|" +"repack --batch-size=<Größe>)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -16814,15 +15737,15 @@ msgstr "" "Während des Umpackens, sammle Paket-Dateien von geringerer Größe in " "einenStapel, welcher größer ist als diese Größe" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "Zu viele Argumente." -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "Option --batch-size ist nur für den Unterbefehl 'repack'" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "Nicht erkannter Unterbefehl: %s" @@ -16917,52 +15840,52 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<Optionen>] <Commit>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<Optionen>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "nur Namen anzeigen (keine SHA-1)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden, die <Muster> entsprechen" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignoriere Referenzen die <Muster> entsprechen" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" @@ -17368,7 +16291,7 @@ msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" msgid "read object names from the standard input" msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" @@ -17384,7 +16307,7 @@ msgstr "Notiz-Referenz" msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -17403,106 +16326,129 @@ msgstr "" "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "Ungültiges CRC für gepacktes Objekt %s." -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "Fehlerhaftes gepacktes Objekt für %s." -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "Rekursiver Unterschied für Objekt %s festgestellt." -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u Objekte geordnet, %<PRIu32> erwartet." -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "Packdatei ist ungültig: %s" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "Konnte Packdatei nicht zur Wiederverwendung öffnen: %s" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "Konnte \"seek\" nicht in wiederverwendeter Packdatei ausführen." + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "Konnte nicht von wiederverwendeter Packdatei lesen." + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n" "aufgetrennt." -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "Konnte '%s' nicht lesen" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren." -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-" "Datei\n" "geschrieben wurden." -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "\"delta base offset\" Überlauf in Paket für %s" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Zähle Objekte" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "Konnte Größe von %s nicht bestimmen." + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen." -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "Objekt %s kann nicht gelesen werden." -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "ungünstiges Packet - Speicher voll" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Delta-Kompression verwendet bis zu %d Threads." -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind." -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "Inkonsistenz mit der Anzahl von Deltas" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17511,7 +16457,7 @@ msgstr "" "Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17520,247 +16466,261 @@ msgstr "" "Erwartete Objekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "Ungültiger Wert für --missing." -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "Kann Paketindex nicht öffnen." -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "Loses Objekt bei %s konnte nicht untersucht werden." -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "Konnte loses Objekt nicht erzwingen." -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "'%s' ist kein Commit." -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "Ungültiger Commit '%s'." -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "Konnte jüngste Objekte nicht hinzufügen." -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "keine Fortschrittsanzeige anzeigen" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "Fortschrittsanzeige anzeigen" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<Version>[,<Offset>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "dieses Paket ignorieren" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "Bitmap-Index schreiben, wenn möglich" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "Behandlung für fehlende Objekte" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "" "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories " "packen" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "Delta-Islands bei Delta-Kompression beachten" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kann nicht für die Erstellung eines Pakets für eine " "Übertragung\n" "benutzt werden." -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "Minimales Limit für die Paketgröße ist 1 MiB." -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "" "--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen." -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "Kann --filter nicht ohne --stdout benutzen." -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Objekte aufzählen" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta " -"%<PRIu32>), Pack wiederverwendet %<PRIu32>" +"%<PRIu32>)" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17804,53 +16764,53 @@ msgstr "" msgid "cannot prune in a precious-objects repo" msgstr "kann \"prune\" in precious-objects Repository nicht ausführen" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Optionen bezogen auf Merge" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "Vorspulen erlauben" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Optionen bezogen auf Fetch" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "das Überschreiben von lokalen Branches erzwingen" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Ungültiger Wert für pull.ff: %s" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17858,14 +16818,14 @@ msgstr "" "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17873,7 +16833,7 @@ msgstr "" "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n" "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt." -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17885,39 +16845,39 @@ msgstr "" "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen " "möchten." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) für weitere Details." -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Branch>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -17925,7 +16885,7 @@ msgstr "" "Sie\n" "dies tun mit:" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17935,34 +16895,34 @@ msgstr "" "des Remote-Repositories durchzuführen, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "Konnte nicht auf Commit '%s' zugreifen." -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "Ignoriere --verify-signatures für Rebase" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash ist nur mit --rebase zulässig." -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit " "vorgemerkt sind." -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "Pull mit Rebase" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17972,7 +16932,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17989,15 +16949,15 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen." -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausführen." -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen " @@ -18007,15 +16967,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "Kurzschrift für Tag ohne <Tag>" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -18024,7 +16984,7 @@ msgstr "" "Um eine Variante permanent zu verwenden, siehe push.default in 'git help " "config'." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -18050,7 +17010,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -18065,7 +17025,7 @@ msgstr "" "\n" " git push %s HEAD:<Name-des-Remote-Branches>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18079,13 +17039,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18096,14 +17056,14 @@ msgstr "" "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n" "Remote-Branch zu aktualisieren." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Sie haben keine Refspec für \"push\" angegeben, und push.default ist " "\"nothing\"." -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18117,7 +17077,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18131,7 +17091,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18150,13 +17110,13 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n" "im Remote-Repository existiert." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18166,141 +17126,141 @@ msgstr "" "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n" "die Option '--force' zu verwenden.\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" -msgstr "Push nach %s\n" +msgstr "Versende nach %s\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "ungültiges Repository '%s'" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Kein Ziel für \"push\" konfiguriert.\n" +"Entweder spezifizieren Sie die URL von der Befehlszeile oder konfigurieren " +"ein Remote-Repository unter Benutzung von\n" +"\n" +" git remote add <Name> <URL>\n" +"\n" +"und führen \"push\" dann unter Benutzung dieses Namens aus\n" +"\n" +" git push <Name>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "Repository" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "alle Referenzen versenden" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "alle Referenzen spiegeln" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "Referenzen löschen" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "Aktualisierung erzwingen" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<Referenzname>:<Erwartungswert>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "kleinere Pakete verwenden" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "Upstream für \"git pull/status\" setzen" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "lokal gelöschte Referenzen entfernen" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "\"pre-push hook\" umgehen" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signiert \"push\" mit GPG" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "Referenzen atomar versenden" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "ungültiges Repository '%s'" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Kein Ziel für \"push\" konfiguriert.\n" -"Entweder spezifizieren Sie die URL von der Befehlszeile oder konfigurieren " -"ein Remote-Repository unter Benutzung von\n" -"\n" -" git remote add <Name> <URL>\n" -"\n" -"und führen \"push\" dann unter Benutzung dieses Namens aus\n" -"\n" -" git push <Name>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "Die Optionen --all und --tags sind inkompatibel." -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "Die Optionen --mirror und --tags sind inkompatibel." -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben" @@ -18318,32 +17278,24 @@ msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "einfache Diff-Farben benutzen" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "Notizen" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "an 'git log' übergeben" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "Kein .. im Bereich: '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein." -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "Benötige zwei Commit-Bereiche." @@ -18426,17 +17378,13 @@ msgstr "unpack-trees protokollieren" msgid "suppress feedback messages" msgstr "Rückmeldungen unterdrücken" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis> | --" -"keep-base] [<Upstream> [<Branch>]]" +"git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] " +"[<Upstream>] [<Branch>]" #: builtin/rebase.c:34 msgid "" @@ -18449,208 +17397,217 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "Unbenutzbare TODO-Liste: '%s'" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "Konnte '%s' nicht schreiben." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "Kein HEAD?" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen." -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "Markierung auf interaktiven Rebase fehlgeschlagen." -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "Konnte TODO-Liste nicht erzeugen." -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden." -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<Optionen>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(VERALTET) leere Commits behalten" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "leere Commits behalten" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "Commits mit leerer Beschreibung erlauben" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "Rebase auf Merge-Commits ausführen" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "originale Branch-Punkte der Cousins behalten" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "Commits verschieben, die mit squash!/fixup! beginnen" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "Commits signieren" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "" "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "Rebase fortsetzen" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "Commit auslassen" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "die TODO-Liste bearbeiten" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "den aktuellen Patch anzeigen" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste verkürzen" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste erweitern" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "die TODO-Liste prüfen" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "fixup/squash-Zeilen umordnen" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "\"exec\"-Befehle in TODO-Liste einfügen" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "auf" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "Begrenzungscommit" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "Begrenzungscommit" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "der Upstream-Commit" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "head-Name" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "head-Name" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "Rebase-Strategie" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "Strategie-Optionen" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "Strategie-Optionen" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "wechseln zu" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "der Branch oder Commit zum Auschecken" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "onto-Name" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "onto-Name" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "Befehl" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "auszuführender Befehl" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s erfordert ein interaktives Rebase" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "Konnte 'onto' nicht bestimmen: '%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "Ungültiges orig-head: '%s'" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Konnte '%s' nicht lesen." -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "Kann %s nicht speichern." -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "Konnte HEAD-Commit nicht bestimmen." -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18666,7 +17623,7 @@ msgstr "" "Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n" "führen Sie \"git rebase --abort\" aus." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18686,16 +17643,7 @@ msgstr "" "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n" "ausführen." -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"nicht erkannter leerer Typ '%s'; Gültige Werte sind \"drop\", \"keep\", und " -"\"ask\"." - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18713,7 +17661,7 @@ msgstr "" " git rebase '<Branch>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18727,140 +17675,132 @@ msgstr "" " git branch --set-upstream-to=%s/<Branch> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "Leerer \"exec\"-Befehl." -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "Ausführung des pre-rebase-Hooks erlauben" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "weniger Ausgaben (impliziert --no-stat)" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "" "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufügen" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "an 'git am' übergeben" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "an 'git apply' übergeben" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "" "Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "fortsetzen" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "den aktuellen Patch auslassen und fortfahren" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "abbrechen und den ursprünglichen Branch auschecken" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "abbrechen, aber HEAD an aktueller Stelle belassen" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "Strategien von 'git am' bei Rebase verwenden" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "Merge-Strategien beim Rebase verwenden" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "wie sollen Commits behandelt werden, die leer werden" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "leere Commits während des Rebase erhalten" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "automatischer Stash/Stash-Pop davor und danach" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "Rebase von Commits mit leerer Beschreibung erlauben" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "" "versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "angegebene Merge-Strategie verwenden" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "Option" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "Argument zur Merge-Strategie durchreichen" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18868,40 +17808,32 @@ msgstr "" "Die Unterstützung für rebase.useBuiltin wurde entfernt!\n" "Siehe dessen Eintrag in 'git help config' für Details." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--" "rebase-merges'." -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet " "werden." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18909,16 +17841,16 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen." -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "Konnte nicht zu %s zurückgehen." -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18939,170 +17871,179 @@ msgstr "" "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "Schalter `C' erwartet einen numerischen Wert." -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Unbekannter Modus: %s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy erfordert --merge oder --interactive" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "" -"Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert " -"werden." - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "Unbekanntes Rebase-Backend: %s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec erfordert --exec oder --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "" +"Optionen für \"am\" können nicht mit Optionen für \"interactive\" oder " +"\"merge\" kombiniert werden." + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" "'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden." -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' " "kombiniert werden." -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "" +"'--rebase-merges' kann nicht mit '--strategy-option' kombiniert werden." + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "'--rebase-merges' kann nicht mit '--strategy' kombiniert werden." + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "Ungültiger Upstream '%s'" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "Konnte neuen Root-Commit nicht erstellen." -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "'%s': benötige genau eine Merge-Basis mit dem Branch" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': benötige genau eine Merge-Basis" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' zeigt auf keinen gültigen Commit." -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: Branch/Commit '%s' nicht gefunden" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Konnte HEAD zu keinem Commit auflösen." -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Kann automatischen Stash nicht erzeugen." -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Unerwartete 'stash'-Antwort: '%s'" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Konnte Verzeichnis für '%s' nicht erstellen." -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Automatischen Stash erzeugt: %s\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "Konnte 'reset --hard' nicht ausführen." -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ist jetzt bei %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "Konnte '%s' nicht parsen." + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "Konnte nicht zu %s wechseln." -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD ist aktuell." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD ist aktuell, Rebase erzwungen." -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Änderungen zu %s:\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Änderungen von %s zu %s:\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu " "anzuwenden...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Konnte HEAD nicht loslösen." -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Spule %s vor zu %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <Git-Verzeichnis>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19134,7 +18075,7 @@ msgstr "" "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n" "'refuse'." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19185,49 +18126,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <Referenz>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "Markiere nicht erreichbare Objekte..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "%s zeigt auf nichts!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "Kein Reflog zum Löschen angegeben." -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "Kein Reflog: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "Kein Reflog für '%s'." -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "Ungültiges Format für Referenzen: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -19235,82 +18176,82 @@ msgstr "" "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <alt> <neu>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <Name>" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <Name>" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <Name> <Branch>..." -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <Name>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <Name> <neueURL>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <Name> <URL>" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <Name> <Branch>..." -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<Optionen>] <Name>" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<Optionen>] <Name>" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..." -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Aktualisiere %s" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -19318,104 +18259,88 @@ msgstr "" "--mirror ist gefährlich und veraltet; bitte\n" "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "unbekanntes Argument für Option --mirror: %s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "die Remote-Branches anfordern" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "alle Tags und verbundene Objekte beim Anfordern importieren" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "oder fordere gar keine Tags an (--no-tags)" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "Branch(es) zur Übernahme" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "Hauptbranch" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und " "\"fetch\"" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "" "Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet " "werden." -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " "Spiegelarchiven verwendet werden." -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(übereinstimmend)" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "konnte '%s' nicht setzen" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"Die %s Konfiguration remote.pushDefault in:\n" -"\t%s:%d\n" -"benennt jetzt das nicht existierende Remote-Repository '%s'" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "Kein solches Remote-Repository: '%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19426,17 +18351,17 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht löschen" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19452,118 +18377,118 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "interaktiver Rebase auf Remote-Branch %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s und mit Remote-Branch %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(keine URL)" @@ -19571,25 +18496,25 @@ msgstr "(keine URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(nicht abgefragt)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(unbekannt)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -19597,163 +18522,172 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert für 'git pull':" msgstr[1] " Lokale Branches konfiguriert für 'git pull':" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "Branch hinzufügen" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs für Push ausgeben" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs für Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "URL hinzufügen" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "URLs löschen" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Unbekannter Unterbefehl: %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<Optionen>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19762,119 +18696,119 @@ msgstr "" "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n" "Konfiguration." -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "" "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n" "Remote-Repositories nicht starten." -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects." -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n" "Remote-Repositories nicht abschließen." -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "alles in eine einzige Pack-Datei packen" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "--no-reuse-delta an git-pack-objects übergeben" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "--no-reuse-object an git-pack-objects übergeben" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "git-update-server-info nicht ausführen" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "--local an git-pack-objects übergeben" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "Bitmap-Index schreiben" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "--delta-islands an git-pack-objects übergeben" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "Datumsangabe" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "mit -A, keine Objekte älter als dieses Datum löschen" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "mit -a, nicht erreichbare Objekte neu packen" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "Größe des Fensters für die Delta-Kompression" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "Bytes" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "gleiches wie oben, aber die Speichergröße anstatt der\n" "Anzahl der Einträge limitieren" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "die maximale Delta-Tiefe limitieren" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "maximale Anzahl von Threads limitieren" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "maximale Größe für jede Paketdatei" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "dieses Paket nicht neu packen" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable und -A sind inkompatibel" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Nichts Neues zum Packen." -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19893,7 +18827,7 @@ msgstr "" "WARNUNG: ebenfalls fehl.\n" "WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "Fehler beim Löschen von '%s'" @@ -20002,8 +18936,8 @@ msgstr "Kann fstat auf %s nicht ausführen." msgid "unable to write object to database" msgstr "Konnte Objekt nicht in Datenbank schreiben." -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "Kein gültiger Objektname: '%s'" @@ -20022,22 +18956,22 @@ msgstr "Bearbeiten von Objektdatei fehlgeschlagen." msgid "new object is the same as the old one: '%s'" msgstr "Neues Objekt ist dasselbe wie das alte: '%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "Konnte nicht %s als Commit parsen." -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ungültiger Merge-Tag in Commit '%s'" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "fehlerhafter Merge-Tag in Commit '%s'" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -20046,31 +18980,31 @@ msgstr "" "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n" "wird; benutzen Sie --edit anstatt --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "Der originale Commit '%s' hat eine GPG-Signatur." -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "Künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig." -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "Neuer Commit ist derselbe wie der alte: '%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -20079,71 +19013,71 @@ msgstr "" "Konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "ersetzende Referenzen auflisten" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "ersetzende Referenzen löschen" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "existierendes Objekt bearbeiten" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "Eltern-Commits eines Commits ändern" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "die Referenz ersetzen, wenn sie existiert" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "das angegebene Format benutzen" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format kann nicht beim Auflisten verwendet werden." -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn." -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw macht nur mit --edit Sinn." -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d benötigt mindestens ein Argument." -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "Ungültige Anzahl von Argumenten." -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e benötigt genau ein Argument." -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g benötigt mindestens ein Argument." -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file erwartet keine Argumente" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "Mit -l kann nur ein Muster angegeben werden." @@ -20171,127 +19105,115 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfade>..." #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<Commit-" -"Referenz>]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfadspezifikation>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "soft" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "hard" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "zusammenführen" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "keep" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "Sie haben keinen gültigen HEAD." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD ist jetzt bei %s" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "weniger Ausgaben, nur Fehler melden" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "HEAD und Index umsetzen" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "nur HEAD umsetzen" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "HEAD umsetzen, aber lokale Änderungen behalten" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "nur speichern, dass gelöschte Pfade später hinzugefügt werden sollen" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Konnte '%s' nicht als gültigen Commit auflösen." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- " "<Pfade>'." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N kann nur mit -mixed benutzt werden" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -20305,31 +19227,37 @@ msgstr "" "das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n" "auf \"true\", um das zum Standard zu machen.\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" "--exclude-promisor-objects und --missing können nicht kombiniert werden." -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "Das Filtern von Objekten erfordert --objects." -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "Ungültiger \"sparse\"-Wert '%s'." + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list unterstützt keine Anzeige von Notizen" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "markiertes Zählen ist inkompatibel mit der Option --objects" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "" +"--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden." #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -20497,44 +19425,38 @@ msgid_plural "the following files have local modifications:" msgstr[0] "die folgende Datei hat lokale Änderungen:" msgstr[1] "die folgenden Dateien haben lokale Änderungen:" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "keine gelöschten Dateien auflisten" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "nur aus dem Index entfernen" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "die \"up-to-date\" Prüfung überschreiben" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "rekursives Entfernen erlauben" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "" -"Es wurde keine Pfadspezifikation angegeben. Welche Dateien sollen entfernt " -"werden?" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder\n" "benutzen Sie \"stash\", um fortzufahren." -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "'%s' wird nicht ohne -r rekursiv entfernt" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: konnte %s nicht löschen" @@ -20789,85 +19711,15 @@ msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " "Repository befinden" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <Optionen>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"Dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout " -"existiert eventuell nicht)." - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen " -"Checkouts" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "Initialisiere den partiellen Checkout im Cone-Modus" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "Partiellen Checkout initialisieren" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "Fehler beim Öffnen von '%s'" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "konnte Pfad '%s' nicht normalisieren" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "Muster von der Standard-Eingabe lesen" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "setze Muster für partiellen Checkout" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "Partiellen Checkout deaktivieren" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses." - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<Optionen>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<Optionen>] [<Stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<Stash>]" @@ -20875,27 +19727,25 @@ msgstr "git stash drop [-q|--quiet] [<Stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <Branch> [<Stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n" -" [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n" " [--] [<Pfadspezifikation>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20903,199 +19753,189 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<Nachricht>]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n" -" [--] [<Pfadspezifikation>...]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' ist kein \"stash\"-artiger Commit" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "Zu viele Commits angegeben:%s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "Keine Stash-Einträge gefunden." -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "'%s' ist kein gültiger Referenzname." -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear mit Parametern ist nicht implementiert" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "Konnte keinen Diff erzeugen %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen." -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "Führe %s mit %s zusammen" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "Index wurde nicht aus dem Stash zurückgeladen." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "Versuche Index wiederherzustellen." -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "%s (%s) gelöscht" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Konnte Stash-Eintrag nicht löschen" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' ist keine Stash-Referenz" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" "Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal " "benötigen." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Kann nicht %s mit %s aktualisieren." -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "Stash-Beschreibung" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" erwartet ein Argument <Commit>" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Keine Änderungen ausgewählt" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Sie haben bisher noch keinen initialen Commit" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Kann den aktuellen Zustand des Index nicht speichern" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Kann die unversionierten Dateien nicht speichern" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Haben Sie vielleicht 'git add' vergessen?" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Keine lokalen Änderungen zum Speichern" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Kann \"stash\" nicht initialisieren" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Kann den aktuellen Status nicht speichern" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert." -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "behalte Index" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "Stash in Patch-Modus" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "weniger Ausgaben" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "unversionierte Dateien in Stash einbeziehen" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "ignorierte Dateien einbeziehen" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "Konnte 'exec %s' nicht ausführen." @@ -21118,40 +19958,40 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "'submodule--helper print-default-remote' erwartet keine Argumente." -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker für relative Pfade" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "Betrete '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21160,7 +20000,7 @@ msgstr "" "run_command gab nicht-Null Status für '%s' zurück.\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -21172,21 +20012,21 @@ msgstr "" "nicht-Null Status zurück.\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "" "Ausgaben beim Betreten und der Befehlsausführung in einem Submodul " "unterdrücken" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -21195,104 +20035,104 @@ msgstr "" "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n" "Repository sein eigenes verbindliches Upstream-Repository ist." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration." -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n" "Konfiguration." -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<Optionen>] [<Pfad>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen." -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul '%s'." -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Ausgabe über Submodul-Status unterdrücken" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" "Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisiere Submodul-URL für '%s'\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'." -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'." -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'." -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21302,7 +20142,7 @@ msgstr "" "(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n" "löschen möchten)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21311,215 +20151,185 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n" "verwenden Sie '-f', um diese zu verwerfen." -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Verzeichnis '%s' bereinigt.\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen." -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen " "vorliegen" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "alle Submodule austragen" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" "möchten." -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"Eine Alternative, die von einer übergeordneten Projekt-Alternative\n" -"berechnet wurde, ist ungültig.\n" -"Um Git das Klonen ohne Alternative in solch einem Fall zu erlauben, setze\n" -"submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n" -"'--reference-if-able' statt '--reference'." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt." -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "Pfad für neues Submodul" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "Fortschrittsanzeige beim Klonen erzwingen" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "Klonen in ein nicht leeres Verzeichnis verbieten" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference " -"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url " -"<URL> --path <Pfad>" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"Erstellung/Benutzung von '%s' in einem anderen Submodul-Git-Verzeichnis\n" -"verweigert." +"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth " +"<Tiefe>] --url <URL> --path <Pfad>" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" -msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen." - -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "Verzeichnis ist nicht leer: '%s'" +msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen" -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s'." -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ungültiger Aktualisierungsmodus '%s' für Submodul-Pfad '%s' konfiguriert." -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Submodul-Pfad '%s' nicht initialisiert" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Meinten Sie vielleicht 'update --init'?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Überspringe nicht zusammengeführtes Submodul %s" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Überspringe Submodul '%s'" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab." -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" "Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten " "bei\n" "der angegebenen Anzahl von Commits." -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "Parallele Ausführungen" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" "ob das initiale Klonen den Empfehlungen für eine unvollständige\n" "Historie (shallow) folgen soll" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "Fehlerhafter Wert für --update Parameter" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21528,52 +20338,52 @@ msgstr "" "Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n" "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch." -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten." -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "Rekursion in Submodule durchführen" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "Konfiguration in der .gitmodules-Datei entfernen" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <name> [<Wert>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <Name>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "Bitte stellen Sie sicher, dass sich die Datei .gitmodules im " "Arbeitsverzeichnis befindet." -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" @@ -21829,223 +20639,219 @@ msgstr "Tag '%s' existiert bereits" msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Entpacke Objekte" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "Konnte Datei '%s' nicht erstellen" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "Konnte Datei '%s' nicht löschen" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "Konnte Verzeichnis '%s' nicht löschen" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Prüfe mtime in '%s' " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen einer neuen Datei nicht " "geändert" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen eines neuen " "Verzeichnisses nicht geändert" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "" "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "Verzeichnisinformationen haben sich nach Hinzufügen einer Datei in ein " "Unterverzeichnis geändert" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "" "Verzeichnisinformationen haben sich nach dem Löschen einer Datei nicht " "geändert" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "" "Verzeichnisinformationen haben sich nach dem Löschen eines Verzeichnisses " "nicht geändert" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "\"index-only\" Einträge überspringen" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "Splitting des Index aktivieren oder deaktivieren" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "" "prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "" "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "Dateisystem-Monitor aktivieren oder deaktivieren" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "Dateien als \"fsmonitor valid\" markieren" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "\"fsmonitor valid\"-Bit löschen" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -22053,7 +20859,7 @@ msgstr "" "core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn sie wirklich das Splitting des Index aktivieren möchten." -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -22061,7 +20867,7 @@ msgstr "" "core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn Sie wirklich das Splitting des Index deaktivieren möchten." -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -22069,11 +20875,11 @@ msgstr "" "core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten." -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Cache für unversionierte Dateien deaktiviert" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -22082,23 +20888,23 @@ msgstr "" "dies,\n" "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten." -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache für unversionierte Dateien für '%s' aktiviert" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-" "Monitor\n" "wirklich aktivieren möchten." -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "Dateisystem-Monitor aktiviert" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" @@ -22106,7 +20912,7 @@ msgstr "" "Monitor\n" "wirklich deaktivieren möchten." -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "Dateisystem-Monitor deaktiviert" @@ -22201,55 +21007,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..." msgid "print tag contents" msgstr "Tag-Inhalte ausgeben" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<Optionen>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<Optionen>] <Pfad>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<Optionen>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "Fehler beim Löschen von '%s'" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -22258,35 +21064,35 @@ msgstr "" "Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> " "gelesen)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Lösche worktrees/%s: ungültige gitdir-Datei" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "entfernte Arbeitsverzeichnisse ausgeben" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht neu hinzufügen." -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -22296,7 +21102,7 @@ msgstr "" "Benutzen Sie 'add -f -f' zum Überschrieben, oder 'unlock' und 'prune'\n" "oder 'remove' zum Löschen." -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22306,129 +21112,129 @@ msgstr "" "Benutzen Sie 'add -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n" "Löschen." -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "<Branch> auschecken, auch wenn dieser bereits in einem anderen " "Arbeitsverzeichnis ausgecheckt ist" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "das neue Arbeitsverzeichnis gesperrt lassen" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "versuchen, eine Übereinstimmung des Branch-Namens mit einem\n" "Remote-Tracking-Branch herzustellen" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird." -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n" "entfernt werden." -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "" "Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder " "gesperrt ist" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' ist ein Hauptarbeitsverzeichnis" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "Konnte Zielname aus '%s' nicht bestimmen." -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "Ziel '%s' existiert bereits." -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22438,7 +21244,7 @@ msgstr "" "Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22447,40 +21253,38 @@ msgstr "" "Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "Fehler beim Verschieben von '%s' nach '%s'" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "Fehler beim Ausführen von 'git status' auf '%s'" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "" -"'%s' enthält geänderte oder nicht versionierte Dateien, benutzen Sie --force " -"zum Löschen" +msgid "'%s' is dirty, use --force to delete it" +msgstr "'%s' ist verändert, benutzen Sie --force zum Löschen" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "" "Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt " "ist" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22490,7 +21294,7 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22499,7 +21303,7 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s" @@ -22520,21 +21324,6 @@ msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben" msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "'mark' Befehl erwartet, '%s' bekommen" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "'to' Befehl erwartet, '%s' bekommen" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22650,25 +21439,25 @@ msgstr "" "Alias '%s' ändert Umgebungsvariablen.\n" "Sie können '!git' im Alias benutzen, um dies zu tun." -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "leerer Alias für %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "rekursiver Alias: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "Fehler beim Schließen der Standard-Ausgabe." @@ -22724,23 +21513,23 @@ msgstr "CURLSSLOPT_NO_REVOKE wird mit cURL < 7.44.0 nicht unterstützt." msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Protokollbeschränkungen werden mit cURL < 7.19.4 nicht unterstützt." -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Konnte SSL-Backend nicht zu '%s' setzen: cURL wurde ohne SSL-Backends gebaut." -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22751,160 +21540,150 @@ msgstr "" " gefragt nach: %s\n" " umgeleitet: %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "Ungültige Antwort des Servers. Service erwartet, Flush-Paket bekommen" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "Ungültige Serverantwort; '%s' bekommen" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "Repository '%s' nicht gefunden." -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "Authentifizierung fehlgeschlagen für '%s'" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "konnte nicht auf '%s' zugreifen: %s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "Leite nach %s um" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "Konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu " "erhöhen" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "RPC fehlgeschlagen; %s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "Kann solche großen Übertragungen nicht verarbeiten." -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "\"fetch\" fehlgeschlagen." -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "HTTP-Transport unterstützt nicht %s" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "\"git-http-push\" fehlgeschlagen" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: Unbekannter Befehl '%s' von Git" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "Argumente" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "Filtern nach Objekten" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "Verfallsdatum" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "Pfadspezifikation aus einer Datei lesen" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" -"Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt" - #: ref-filter.h:101 msgid "key" msgstr "Schüssel" @@ -23439,175 +22218,167 @@ msgid "Common Git shell script setup code" msgstr "allgemeiner Git Shell-Skript Konfigurationscode" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Initialisiere und verändere den partiellen Checkout" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Dateiinhalte der Staging-Area hinzufügen" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "den Zustand des Arbeitsverzeichnisses anzeigen" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "nicht erforderlichen Whitespace entfernen" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Submodule initialisieren, aktualisieren oder inspizieren" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" "Bidirektionale Operationen zwischen einem Subversion Repository und Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Branches wechseln" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "symbolische Referenzen lesen, ändern und löschen" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder " "verifizieren." -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Objekte von einem gepackten Archiv entpacken" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "" "den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Archiv zurück zu git-archive senden" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Objekte gepackt zurück an git-fetch-pack senden" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "eine logische Variable von Git anzeigen" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "die GPG-Signatur von Commits prüfen" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "gepackte Git-Archivdateien validieren" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "die GPG-Signatur von Tags prüfen" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git Web Interface (Web-Frontend für Git-Repositories)" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "mehrere Arbeitsverzeichnisse verwalten" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Tree-Objekt vom aktuellen Index erstellen" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Definition von Attributen pro Pfad" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Git Kommandozeilenschnittstelle und Konventionen" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "eine Git Anleitung für Entwickler" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git für CVS Benutzer" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Diff-Ausgabe optimieren" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "" "ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "ein Git-Glossar" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "von Git verwendete Hooks" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Definition von Submodul-Eigenschaften" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Git Namensbereiche" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Git Repository Aufbau" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Spezifikation von Commits und Bereichen für Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Einbinden eines Repositories in ein anderes" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "eine einführende Anleitung zu Git: Teil zwei" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "eine einführende Anleitung zu Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git" @@ -23735,133 +22506,144 @@ msgstr "Versuche einfachen Merge mit $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Kann temporären Index nicht löschen (kann nicht passieren)" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren." -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "Fehler: unbekannte Option für 'stash push': $option" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "unbekannte Option: $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Zu viele Commits angegeben: $REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ist keine gültige Referenz" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ist kein \"stash\"-artiger Commit" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ist keine \"stash\"-Referenz" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "Konnte den Index nicht aktualisieren." -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "" "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen." -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht aus dem Index entfernen" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) gelöscht" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses " "benutzt werden." -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' hat keinen Commit ausgecheckt" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Der folgende Pfad wird durch eine Ihrer \".gitignore\" Dateien ignoriert:\n" +"$sm_path\n" +"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten." + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu." -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-" "Repositories:" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23879,37 +22661,37 @@ msgstr "" "nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n" "wählen Sie einen anderen Namen mit der Option '--name'." -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'." -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kann Submodul '$sm_path' nicht auschecken" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23918,7 +22700,7 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23927,7 +22709,7 @@ msgstr "" "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche " "$sha1 direkt anzufordern:" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23936,74 +22718,74 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' " "fehlgeschlagen" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files können nicht gemeinsam verwendet werden." -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -24334,10 +23116,6 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)" msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Leere Commits sind auskommentiert." - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Konnte neu geschriebene Commits nicht initialisieren." @@ -24420,67 +23198,140 @@ msgid "Unable to determine absolute path of git directory" msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen." #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%28s %25s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "zur Staging-Area hinzugefügt" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "aus Staging-Area entfernt" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "Binär" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "Nichts" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "unverändert" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "%d Pfad hinzugefügt\n" +msgstr[1] "%d Pfade hinzugefügt\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "%d Pfad aktualisiert\n" +msgstr[1] "%d Pfade aktualisiert\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "%d Pfad wiederhergestellt\n" +msgstr[1] "%d Pfade wiederhergestellt\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d Pfad angefasst\n" msgstr[1] "%d Pfade angefasst\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Aktualisieren" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Revert" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "Hinweis: %s ist nun unversioniert.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "unversionierte Dateien hinzufügen" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "Keine unversionierten Dateien.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Hinzufügen zur Staging-Area markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" +"direkt als zum Hinzufügen zur Staging-Area markiert." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Hinzufügen zum Stash markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" +"direkt als zum Hinzufügen zum Stash markiert." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Entfernen aus der Staging-Area markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" +"direkt als zum Entfernen aus der Staging-Area markiert." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Anwenden markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" +"direkt als zum Anwenden markiert." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Verwerfen markiert." +"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-" +"Block\n" +"direkt als zum Verwerfen markiert." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n" +"Kurzanleitung.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -24493,12 +23344,37 @@ msgstr "" "Um '%s' Zeilen zu entfernen, löschen Sie diese.\n" "Zeilen, die mit %s beginnen, werden entfernt.\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Wenn das nicht sauber angewendet werden kann, haben Sie die Möglichkeit\n" +"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt " +"werden,\n" +"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n" +"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?" + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24514,7 +23390,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit " "vormerken" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24528,7 +23404,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24542,7 +23418,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24559,7 +23435,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index " "anwenden" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24576,7 +23452,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " "Arbeitsverzeichnis verwerfen" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24591,7 +23467,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24605,7 +23481,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24619,7 +23495,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" "d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24643,87 +23519,234 @@ msgstr "" "e - aktuellen Patch-Block manuell editieren\n" "? - Hilfe anzeigen\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "" "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? " + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "Nichts angewendet.\n" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoriere nicht zusammengeführte Datei: %s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Nur Binärdateien geändert.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Keine Änderungen.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Patch Aktualisierung" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Löschung stashen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d" +"%s,?]? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d" +"%s,?]? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" "Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Keine anderen Patch-Blöcke verbleibend\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "zu welchem Patch-Block springen? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ungültige Nummer: '%s'\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n" msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "Suche nach regulärem Ausdruck? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Kein vorheriger Patch-Block\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Kein folgender Patch-Block\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "In %d Patch-Block aufgeteilt.\n" msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Diff überprüfen" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24742,19 +23765,19 @@ msgstr "" "diff - Unterschiede zwischen HEAD und Index anzeigen\n" "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "-- fehlt" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "Unbekannter --patch Modus: %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ungültiges Argument %s, erwarte --" @@ -25138,3 +24161,102 @@ msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " + +#~ msgid "" +#~ "Fetch normally indicates which branches had a forced update, but that " +#~ "check has been disabled." +#~ msgstr "" +#~ "'fetch' zeigt normalerweise, welche Branches eine erzwungene " +#~ "Aktualisierung hatten, aber diese Überprüfung wurde deaktiviert." + +#~ msgid "" +#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" +#~ msgstr "" +#~ "oder führen Sie 'git config fetch.showForcedUpdates false' aus, um diese " +#~ "Überprüfung zu umgehen.\n" + +#~ msgid "" +#~ "log.mailmap is not set; its implicit value will change in an\n" +#~ "upcoming release. To squelch this message and preserve current\n" +#~ "behaviour, set the log.mailmap configuration value to false.\n" +#~ "\n" +#~ "To squelch this message and adopt the new behaviour now, set the\n" +#~ "log.mailmap configuration value to true.\n" +#~ "\n" +#~ "See 'git help config' and search for 'log.mailmap' for further " +#~ "information." +#~ msgstr "" +#~ "'log.mailmap' ist nicht gesetzt; der implizite Wert wird sich in einem\n" +#~ "kommenden Release ändern. Um diese Meldung zu unterdrücken und das " +#~ "aktuelle\n" +#~ "Verhalten beizubehalten, setzen Sie den Konfigurationswert von'log." +#~ "mailmap' auf 'false'.\n" +#~ "\n" +#~ "Um diese Meldung zu unterdrücken und jetzt das neue Verhalten zu\n" +#~ "übernehmen, setzen Sie den Konfigurationswert von 'log.mailmap' auf " +#~ "'true'.\n" +#~ "\n" +#~ "Führen Sie 'git help config' aus und suchen Sie nach 'log.mailmap', um\n" +#~ "weitere Informationen zu erhalten." + +#~ msgid "Server supports multi_ack_detailed" +#~ msgstr "Server unterstützt multi_ack_detailed" + +#~ msgid "Server supports no-done" +#~ msgstr "Server unterstützt no-done" + +#~ msgid "Server supports multi_ack" +#~ msgstr "Server unterstützt multi_ack" + +#~ msgid "Server supports side-band-64k" +#~ msgstr "Server unterstützt side-band-64k" + +#~ msgid "Server supports side-band" +#~ msgstr "Server unterstützt side-band" + +#~ msgid "Server supports allow-tip-sha1-in-want" +#~ msgstr "Server unterstützt allow-tip-sha1-in-want" + +#~ msgid "Server supports allow-reachable-sha1-in-want" +#~ msgstr "Server unterstützt allow-reachable-sha1-in-want" + +#~ msgid "Server supports ofs-delta" +#~ msgstr "Server unterstützt ofs-delta" + +#~ msgid "(HEAD detached at %s)" +#~ msgstr "(HEAD losgelöst bei %s)" + +#~ msgid "(HEAD detached from %s)" +#~ msgstr "(HEAD losgelöst von %s)" + +#~ msgid "Checking out files" +#~ msgstr "Checke Dateien aus" + +#~ msgid "cannot be interactive without stdin connected to a terminal." +#~ msgstr "" +#~ "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " +#~ "Terminal verbunden ist." + +#~ msgid "failed to open '%s'" +#~ msgstr "Fehler beim Öffnen von '%s'" + +#~ msgid "failed to stat %s\n" +#~ msgstr "Konnte %s nicht lesen\n" + +#~ msgid "" +#~ "If you wish to skip this commit, use:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n" +#~ "the remaining commits.\n" +#~ msgstr "" +#~ "Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n" +#~ "\n" +#~ " git reset\n" +#~ "\n" +#~ "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n" +#~ "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" + +#~ msgid "unrecognized verb: %s" +#~ msgstr "Nicht erkanntes Verb: %s" diff --git a/third_party/git/po/es.po b/third_party/git/po/es.po index 4a94ee938f..87c77ff993 100644 --- a/third_party/git/po/es.po +++ b/third_party/git/po/es.po @@ -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: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-11 23:18-0500\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-10 12:55-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,729 +16,40 @@ 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 2.3\n" +"X-Generator: Poedit 2.2\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "¿Ahh (%s)?" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "no se pudo leer índice" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "binario" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "nada" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "sin cambios" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Actualizar" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "no se pudo poner en stage '%s'" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "no se pudo escribir índice" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "actualizada %d ruta\n" -msgstr[1] "actualizadas %d rutas\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "nota: %s no es rastreado ahora.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry falló para la ruta '%s'" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Revertir" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "no se pudo analizar HEAD^{tree}" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "revertida %d ruta\n" -msgstr[1] "revertidas %d rutas\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "No hay archivos sin rastrear.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "Agregar no rastreados" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "agregada %d ruta\n" -msgstr[1] "agregadas %d rutas\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "ignorando lo no fusionado: %s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Solo cambiaron archivos binarios.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Sin cambios.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Actualización del parche" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Revisión de diff" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "mostrar rutas con cambios" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "revertir conjunto de cambios en stage a la versión de HEAD" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "elegir hunks y actualizar de forma selectiva" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "ver diff entre HEAD e index" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "" -"agregar contenidos de archivos sin rastrear al conjunto de cambios de stage" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "Mostrar ayuda:" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "selecciona un único objeto" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "selecciona un rango de objetos" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "selecciona multiples rangos" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "seleccionar objeto basado en prefijo único" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "quitar objetos especificados" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "escoger todos los objetos" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(vacío) finalizar selección" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "selecciona un objeto numerado" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(vacío) selecciona nada" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Comandos ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Ahora que" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "rastreado" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "no rastreado" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "ruta" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "no se pudo refrescar el index" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Adiós.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " -"para el área de stage." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - aplicar stage a este hunk\n" -"n - no aplicar stage a este hunk\n" -"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" -"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" -"d - no aplicar stage a este hunk o a ninguno de los posteriores en este " -"archivo\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " -"para aplicar stash." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - aplicar stash a este hunk\n" -"n - no aplicar stash a este hunk\n" -"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n" -"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" -"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente " -"para sacar del área de stage." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - sacar desde hunk del área de stage\n" -"n - no sacar este hunk del area de stage\n" -"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n" -"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n" -"d - no sacar del area de stage este hunk o ninguno de los posteriores en el " -"archivo\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" -"Si el parche aplica de forma limpia, el hunk editado sera marcado " -"inmediatamente para aplicar." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - aplicar este hunk al índice\n" -"n - no aplicar este hunk al índice\n" -"q - quit; no aplicar este hunk o ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunko ninguno de los posteriores en el archivo\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Si el parche aplica de forma limpia, el hunk editado sera marcado " -"inmediatamente para descarte." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - descartar este hunk del árbol de trabajo\n" -"n - no descartar este hunk del árbol de trabajo\n" -"q - quit; no descartar este hunk o ninguno de los que restantes\n" -"a - descartar este hunk y todos los posteriores en este archivo\n" -"d - no descartar este hunk o ninguno de los posteriores en el archivo\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - descartar este hunk del índice y el árbol de trabajo\n" -"n - no descartar este hunk del índice ni el árbol de trabajo\n" -"q - quit; no descartar este hunk o ninguno de los que quedan\n" -"a - descartar este hunk y todos los posteriores en este archivo\n" -"d - no descartar este hunk o ninguno posterior en el archivo\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d" -"%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - aplicar este hunk al índice y al árbol de trabajo\n" -"n - no aplicar este hunk al índice y al árbol de trabajo\n" -"q - quit; no aplicar este hunk o ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - aplicar este hunk al índice y al árbol de trabajo\n" -"n - no aplicar este hunk al índice y al árbol de trabajo\n" -"q - quit; no aplicar este hunk o ninguno de los restantes\n" -"a - aplicar este hunk y todos los posteriores en el archivo\n" -"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "no se puede analizar hunk header '%.*s'" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "no se puede analizar hunk header '%.*s'" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "no se puede analizar diff" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "no se pudo analizar diff a colores" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "falló al ejecutar '%s'" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "output de interactive.diffFilter no concuerda" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Tu filtro tiene que mantener correspondencia de uno a uno\n" -"entre las líneas de entrada y salida." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"se esperaba línea de contexto #%d en\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"hunks no hacen overlap:\n" -"%.*s\n" -"\tno acaba con:\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"Para eliminar '%c' líneas, haga de ellas líneas ' ' (contexto).\n" -"Para eliminar '%c' líneas, bórrelas.\n" -"Lineas comenzando con %c serán eliminadas.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Si esto no aplica de manera limpia, se te da la oportunidad de \n" -"editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n" -"la edición es abortada y el hunk queda sin cambios.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "no se puede analizar hunk header" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "falló 'git apply --cached'" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/" -"n]? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "¡Los hunks seleccionados no aplican al índice!" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Nada fue aplicado.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - deja este hunk sin decidir, ver el siguiente hunk sin decisión\n" -"J - deja este hunk sin decidir, ver siguiente hunk\n" -"k - deja este hunk sin decidir, ver hunk previo sin decidir\n" -"K - deja este hunk sin decidir, ver hunk anterior\n" -"g - selecciona un hunk a dónde ir\n" -"/ - buscar un hunk que cumpla con el regex dado\n" -"s - separar el hunk actual en más pequeños\n" -"e - editar manualmente el hunk actual\n" -"? - imprimir ayuda\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "No el anterior hunk" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "No el siguiente hunk" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "No hay más pedazos para el ir" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "¿a que hunk ir (<enter> para ver más)? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "¿a que hunk ir? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Numero inválido: '%s'" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Lo siento, solo %d hunk disponible." -msgstr[1] "Lo siento, solo %d hunks disponibles." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "No hay más pedazos para buscar" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "¿buscar para regexp? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Regexp para la búsqueda mal formado %s: %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "No hay hunks que concuerden con el patrón entregado." - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Perdón, no se puede dividir este pedazo" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "Cortar en %d hunk." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Perdón, no se puede editar este pedazo" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "falló 'git apply'" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No es posible %s porque tienes archivos sin fusionar." -#: advice.c:186 +#: advice.c:180 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." @@ -746,23 +57,23 @@ msgstr "" "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" "como sea apropiado, para marcar la resolución y realizar un commit." -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -801,7 +112,7 @@ msgstr "" "\n" " git switch -\n" "\n" -"Desactiva este aviso poniendo la variable de config advice.detachedHead en " +"Apaga este aviso mediante la variable de config advice.detachedHead en " "false\n" "\n" @@ -895,7 +206,17 @@ msgstr "modo inválido en la línea %d: %s" msgid "inconsistent header lines %d and %d" msgstr "header inconsistente en las líneas %d y %d" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: línea inesperada: %.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragmento de parche sin header en la línea %d: %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -910,94 +231,83 @@ msgstr[1] "" "los headers de git diff carecen de información de los nombres de los " "archivos %d cuando los eliminan de la ruta principal componentes (línea %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -"la cabecera de git diff carece de información del nombre del archivo (línea " -"%d)" - -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: línea inesperada: %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragmento de parche sin header en la línea %d: %.*s" +"el header de git diff carece de información del nombre del archivo (línea %d)" -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "el nuevo archivo depende de contenidos viejos" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "el archivo eliminado todavía tiene contenido" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "parche corrupto en la línea %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "nuevo archivo %s depende en contenidos viejos" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "el archivo borrado %s todavía tiene contenido" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** peligro: el archivo %s está vacío pero no es borrado" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "parche binario corrupto en la línea %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "parche binario no reconocido en la línea %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "parche que solo contiene basura en la línea %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "no es posible leer el enlace simbólico %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "no es posible abrir o leer %s" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "comienzo inválido de línea: '%c'" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Hunk #%d tuvo éxito en %d (%d línea compensada)." msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)." -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexto reducido a (%ld/%ld) para aplicar el fragmento en %d" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1006,23 +316,23 @@ msgstr "" "mientras se busca:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "data perdida en parche binario para '%s'" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "no se puede aplicar el parche binario a '%s' sin un índice completo" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1030,284 +340,289 @@ msgstr "" "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos " "actuales." -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el parche aplica a un '%s' vacío, pero este no lo esta" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "la postimagen necesaria %s para '%s' no se puede leer" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el parche binario no aplica para '%s'" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se " "obtuvo %s)" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "el parche falló: %s:%ld" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "leyendo de '%s' tras un enlace simbólico" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "la ruta %s ha sido renombrada/suprimida" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existe en el índice" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el índice" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "el repositorio carece del blob necesario para regresar en un merge de tres-" "vías." -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retrocediendo en un merge de tres-vías...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no se pueden leer los contenidos actuales de '%s'" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Falló el merge en retroceso de tres-vías...\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Parche aplicado a '%s' con conflictos.\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Parche aplicado a '%s' limpiamente\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" -msgstr "parche de eliminación deja contenidos en el archivo" +msgstr "parche de remoción deja contenidos en el archivo" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: tipo incorrecto" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el índice" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' está tras un enlace simbólico" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta información del sha1 o es inútil para el submódulo %s" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry falló para la ruta '%s'" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo añadir %s al índice temporal" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del índice" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submódulo %s" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no es posible crear una copia de seguridad para el archivo recién creado %s" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir para '%s'" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "error interno" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicando parche %%s con %d rechazo..." msgstr[1] "Aplicando parche %%s con %d rechazos..." -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "no es posible leer el archivo índice" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco aplastado" msgstr[1] "%d errores de espacios en blanco aplastados" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línea agrega errores de espacios en blanco." msgstr[1] "%d líneas agregan errores de espacios en blanco." -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1316,137 +631,146 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "ruta" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "num" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vías si el parche no aplica" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información del índice incrustado" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" -msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden" +msgstr "asegure que por lo menos <n> líneas del contexto concuerden" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "acción" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detectar líneas nuevas o modificadas que contienen errores de espacios en " "blanco" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar nuevas líneas faltantes detectadas incorrectamente al final del " "archivo" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "raíz" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" @@ -1469,7 +793,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concordó con ninguna carpeta" @@ -1501,7 +825,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato del archivo" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "prefijo" @@ -1509,12 +833,11 @@ msgstr "prefijo" msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "carpeta" @@ -1547,7 +870,7 @@ msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "repo" @@ -1555,7 +878,7 @@ msgstr "repo" msgid "retrieve the archive from remote repository <repo>" msgstr "obtener la carpeta del repositorio remoto <repo>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "comando" @@ -1586,66 +909,66 @@ msgstr "Formato de carpeta desconocido '%s'" msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "no se puede transmitir el blob %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo de archivo no soportado: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "no se puede leer %s" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "no se puede comenzar filtro '%s'" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "incapaz de redirigir descriptor" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "filtro '%s' reportó un error" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "ruta no válida UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta muy larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no es un nombre de atributo válido" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no permitido: %s:%d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1663,12 +986,12 @@ msgstr "Revisa las comillas en el archivo '%s': %s" msgid "We cannot bisect more!\n" msgstr "¡No podemos biseccionar más!\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit válido %s" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1677,7 +1000,7 @@ msgstr "" "La base de fisión %s está mal.\n" "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1686,7 +1009,7 @@ msgstr "" "La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1695,7 +1018,7 @@ msgstr "" "La base de fisión %s es %s.\n" "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1704,9 +1027,9 @@ msgid "" msgstr "" "Algunas %s revisiones no son ancestros de la revisión %s.\n" "git bisect no puede trabajar bien en este caso.\n" -"¿Tal vez confundiste la revisión %s y %s?\n" +"Tal vez confundiste la revisión %s y %s?\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1717,36 +1040,36 @@ msgstr "" "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n" "Vamos a continuar de todas maneras." -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Biseccionando: una base de fisión debe ser probada\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "falló leer las refs de bisect" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1755,7 +1078,7 @@ msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1765,47 +1088,47 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n" msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents y --reverse no se mezclan bien." -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "no se puede usar --contents con el nombre de objeto commit final" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "falló la configuración del camino de revisión" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent juntos requieren un rango a lo largo de la cadena " "del primer padre" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "no hay una ruta %s en %s" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "no se puede leer el blob %s para la ruta %s" @@ -1969,8 +1292,8 @@ msgstr "'%s' no se ve como un archivo bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" @@ -2001,62 +1324,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "El bundle requiere esta referencia:" msgstr[1] "El bundle requiere estas %d referencias:" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "pack-objects murió" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list murió" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacío." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "index-pack murió" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" -msgstr "¡%s %s no es un commit!" +msgstr "%s %s no es un commit!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2076,27 +1399,27 @@ msgstr "" "Apapa este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "El Commit %s tiene una buena firma GPG por %s\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2107,177 +1430,167 @@ msgstr "" "variable de configuración i18n.commitencoding para la codificación que usa " "tu proyecto.\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "archivo commit-graph es muy pequeño" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "firma %X en commit-graph no concuerda con firma %X" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "versión de commit-graph %X no concuerda con versión %X" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "versión de hash de commit-graph %X no concuerda con versión %X" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "falta tabla de lookup del chunk en commit-graph; el archivo puede estar " "incompleto" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset del chunk de commit-graph inapropiado %08x%08x" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "commit-graph no tiene una chunk base de graphs" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "cadena commit-graph no concuerda" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "cadena de commit-graph inválida: línea '%s' no es un hash" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "no es posible encontrar los archivos commit-graph" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "posición de commit inválida. commit-graph está probablemente corrupto" -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "no es posible analizar el commit %s" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Cargando commits conocidos en commit graph" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Limpiando marcas de commits en commit graph" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Encontrando commits para commit graph en %d pack" msgstr[1] "Encontrando commits para commit graph en %d packs" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "error agregando pack %s" -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "error abriendo index para %s" -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Encontrando commits para commit graph de %d ref" msgstr[1] "Encontrando commits para commit graph de %d refs" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "id de objeto commit: %s inválido" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Contando commits distintos en commit graph" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Encontrando esquinas extra en commit graph" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "falló al escribir el número correcto de ids de base graph" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "no se puede crear '%s'" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Escribiendo commit graph en %d paso" msgstr[1] "Escribiendo commit graph en %d pasos" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "no se pudo abrir la cadena de archivos commit-graph" -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "no se pudo renombrar el archivo base commit-graph" -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "falló al renombrar el archivo temporal commit-graph" -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "Escaneando commits fusionados" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit duplicado inesperado %s" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "Fusionando commit-graph" @@ -2290,23 +1603,23 @@ msgstr "el formato de gráficos de commit no pudede escribir %d commits" msgid "too many commits to write graph" msgstr "demasiados commits para escribir el gráfico" -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el archivo de commit-graph tiene checksums incorrectos y probablemente está " "corrupto" -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "falló al analizar commit %s para commit-graph" @@ -2315,53 +1628,53 @@ msgstr "falló al analizar commit %s para commit-graph" msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "falló al analizar el commit %s de la base de datos de objetos para commit-" "graph" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "lista padre de commit-graph para commit %s es muy larga" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "lista padre de commit-graph para commit %s termina antes" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" "commit-graph ha generado número cero para %s, pero no-cero para los demás" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" "commit-graph tiene generación no-cero para %s, pero cero para los demás" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "generación commit-graph para commit %s es %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2410,7 +1723,7 @@ msgstr "llave no contiene una sección: %s" msgid "key does not contain variable name: %s" msgstr "llave no contiene el nombre de variable: %s" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "llave inválida: %s" @@ -2548,7 +1861,7 @@ msgstr "valor malformado para %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" @@ -2573,106 +1886,113 @@ msgstr "no se posible resolver configuración de blob '%s'" msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "Inválido %s: '%s'" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " +"defecto" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "sección de nombre inválida: %s" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2796,7 +2116,7 @@ msgstr "no es posible revisar %s (%s)" msgid "unknown port %s" msgstr "puerto desconocido %s" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "hostname extraño '%s' bloqueado" @@ -2811,59 +2131,59 @@ msgstr "puerto extraño '%s' bloqueado" msgid "cannot start proxy %s" msgstr "no se puede comenzar proxy %s" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "variante 'simple' de ssh no soporta -4" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "variante 'simple' de ssh no soporta -6" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "variante ssh 'simple' no soporta configurar puerto" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "ruta extraña '%s' bloqueada" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "falló escribir a rev-list" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d ilegal" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF será reemplazado por LF en %s" -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2872,12 +2192,12 @@ msgstr "" "CRLF será remplazado por LF en %s.\n" "El archivo tendrá sus finales de línea originales en tu directorio de trabajo" -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF será reemplazado por CRLF en %s" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2886,19 +2206,19 @@ msgstr "" "LF será reemplazado por CRLF en %s.\n" "El archivo tendrá sus finales de línea originales en tu directorio de trabajo" -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM está prohibido en '%s' si es codificado como %s" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" -"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%.*s " -"como working-tree-encoding." +"El archivo '%s' contiene una marca de byte (BOM). Por favor usa UTF-%s como " +"working-tree-encoding." #: convert.c:304 #, c-format @@ -2914,50 +2234,50 @@ msgstr "" "Al archivo '%s' le falta una marca de byte (BOM). Por favor usa UTF-%sBE o " "UTF-%sLE (dependiendo en el orden de byte) como working-tree-encoding." -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "falló al codificar '%s' de %s a %s" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "codificación '%s' de %s a %s y de vuelta no son iguales" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no se puede hacer fork para ejecutar filtros externos '%s'" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "no se pueden alimentar de input a los filtros externos '%s'" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' falló %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "lectura de filtro externo '%s' falló" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "filtro externo '%s' falló" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "tipo de filtro inesperado" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "nombre de ruta muy largo para filtro externo" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2966,67 +2286,67 @@ msgstr "" "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido " "filtradas" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false no son working-tree-encodings válidos" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: falló al limpiar filtro '%s'" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: filtro smudge %s falló" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "en el futuro" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "hace %<PRIuMAX> segundo" msgstr[1] "hace %<PRIuMAX> segundos" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "hace %<PRIuMAX> minuto" msgstr[1] "hace %<PRIuMAX> minutos" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "hace %<PRIuMAX> hora" msgstr[1] "hace %<PRIuMAX> horas" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "hace %<PRIuMAX> día" msgstr[1] "hace %<PRIuMAX> días" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "hace %<PRIuMAX> semana" msgstr[1] "hace %<PRIuMAX> semanas" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "hace %<PRIuMAX> mes" msgstr[1] "hace %<PRIuMAX> meses" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3034,14 +2354,14 @@ msgstr[0] "%<PRIuMAX> año" msgstr[1] "%<PRIuMAX> años" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, y %<PRIuMAX> mes atrás" msgstr[1] "%s, y %<PRIuMAX> meses atrás" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3077,7 +2397,7 @@ msgstr "%d islas marcadas, listo.\n" msgid "failed to read orderfile '%s'" msgstr "falló al leer orden de archivos '%s'" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Realizando una detección de cambios de nombre inexacta" @@ -3144,35 +2464,35 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat inválido: %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numérico" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3181,42 +2501,42 @@ msgstr "" "Falló al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo inválido '%s' en --color-moved-ws" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3224,154 +2544,154 @@ msgstr "" "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "argumento inválido para %s" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "falló al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "generar parche" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "genera diffs con <n> líneas de contexto" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "genera el diff en formato raw" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "--stat amigable para máquina" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "mostrar solo la última línea para --stat" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "muestra la distribución de cantidades de cambios relativa para cada " "subdirectorio" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "sinónimo para --dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo para --dirstat=archivos,param1,param2..." -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "advierte si cambios introducen conflictos de markers o errores de espacios " "en blanco" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<ancho>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "genera diffstat con un ancho dado" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "genera diffstat con un nombre de ancho dado" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "genera diffstat con un ancho de graph dado" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "genera diffstat con líneas limitadas" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "genera un resumen compacto de diffstat" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "muestra un diff binario que puede ser aplicado" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index" "\"" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3379,7 +2699,7 @@ msgstr "" "resaltar errores de espacios en blanco en las líneas 'context', 'old' o " "'new' del diff" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3387,89 +2707,89 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostrar el prefijo de destino en lugar de \"b/\"" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada línea mostrada" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "no mostrar ningún prefijo de fuente o destino" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "muestra el contexto entre hunks de diff hasta el número especificado de " "líneas" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<char>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "especifica el char para indicar una nueva línea en lugar de '+'" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "especifica el char para indicar una línea vieja en lugar de '-'" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "especifica el char para indicar un contexto en lugar de ' '" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "descomponer los cambios de reescritura en pares de borrar y crear" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "omite la preimage para borrados" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "usa archivos no modificados como fuente para encontrar copias" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "deshabilita detección de renombres" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "usa blobs vacíos como fuente de renombre" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "continua listando el historial de un archivo más allá de renombres" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3477,155 +2797,155 @@ msgstr "" "previene detección de renombre/copias si el número de objetivos para " "renombres/copias excede el límite dado" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "produce el diff más pequeño posible" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando líneas" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de líneas en blanco" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignora carrier-return al final de la línea" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignora cambios cuyas líneas son todas en blanco" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heurística para cambiar los límites de hunk para una fácil lectura" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "escoge un algoritmo para diff" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<texto>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera un diff usando algoritmo \"anchored diff\"" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<modo>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<regex>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "usa <regex> para decidir que palabra es" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "líneas movidas de código están coloreadas diferente" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra " "paths relativos" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "cambia dos inputs, invierte el diff" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "deshabilita todo el output del programa" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "permite la ejecución de un diff helper externo" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "ejecuta filtros de conversión de texto externos cuando comparando binarios" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<cuando>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a submódulos en la generación de diff" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<formato>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "especifica como son mostradas las diferencias en submódulos" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "ocultar entradas 'git add -N' del index" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "trata entradas 'git add -N' como reales en el index" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<string>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3633,7 +2953,7 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el string " "especificado" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3641,23 +2961,23 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el regex " "especificado" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "mostrar todos los cambios en el changeset con -S o -G" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tratar <string> en -S como una expresión regular extendida de POSIX" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "controlar el orden en el que los archivos aparecen en la salida" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "<id-objeto>" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3665,33 +2985,33 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el objeto " "especificado" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "selecciona archivos por tipo de diff" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<archivo>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Output a un archivo específico" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "detección de cambio de nombre inexacta fue saltada por haber muchos archivos." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber muchos archivos." -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3699,61 +3019,41 @@ msgstr "" "tal vez quieras configurar la variable %s para por lo menos %d y volver a " "intentar el comando." -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "patrón desconocido: '%s'" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "patrón negativo no reconocido: '%s'" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" -"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "deshabilitar coincidencia de patrónes cono" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusión" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "falló al conseguir la información y nombre del kernel" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache está desactivado en este sistema o ubicación" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo índice corrompido en repositorio %s" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -3772,12 +3072,12 @@ msgstr "Filtrando contenido" msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no se pudo configurar GIT_DIR a '%s'" @@ -3787,270 +3087,266 @@ msgstr "no se pudo configurar GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "demasiados argumentos para correr %s" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Remoto sin URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: lista poco profunda esperada" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack: se esperaba un flush packet luego de la lista superficial" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "no se puede escribir al remoto" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "línea poco profunda inválida: %s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "línea superficial inválida: %s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "se obtuvo %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "rindiéndose" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "listo" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "se obtuvo %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "error de protocolo: paquete de header erróneo" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s falló" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "El servidor soporta %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "El servidor no soporta clientes superficiales" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shalow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shalow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch falló." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "El servidor soporta filtro" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "error leyendo sección header '%s'" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibió '%s'" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "línea de confirmación inesperada: '%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "error procesando acks: %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "espere que el packfile sea mandado luego del 'listo'" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "espere que ninguna otra sección sea enviada luego del 'listo'" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "error procesando información superficial: %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "error procesando refs deseadas: %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg falló al firmar la data" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falló al escribir la firma separada para '%s'" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color inválido '%.*s' en log.graphColors" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es " -"soportado con -P bajo PCRE v2" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falló al marcar '%s'" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -4100,7 +3396,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Comandos de bajo nivel / Interrogadores" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "Comandos de bajo nivel / Sincronización de repositorios" #: help.c:38 @@ -4148,7 +3444,7 @@ msgid "" "able to execute it. Maybe git-%s is broken?" msgstr "" "'%s' parece ser un comando de git, pero no hemos\n" -"podido ejecutarlo. ¿Tal vez git-%s se ha roto?" +"podido ejecutarlo. Tal vez git-%s se ha roto?" #: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." @@ -4192,12 +3488,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git versión [<opciones>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4265,61 +3561,46 @@ msgstr "no se puede tener un nombre vacío (para <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inválido: %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "entrada '%s' en árbol %s tiene modo árbol, pero no es uno" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "entrada '%s' en árbol %s tiene modo blob, pero no es uno" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "no se puede cargar árbol raíz para commit %s" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "no es posible acceder al blob en '%s'" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "incapaz de analizar filtro de data en %s" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "se esperaba 'tree:<depth>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "soporte para filtros sparse:path ha sido discontinuado" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "filtro -spec inválido '%s'" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "se espera algo luego de combine:" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "no se puede cambiar un clon parcial remoto promisor" #: lockfile.c:151 #, c-format @@ -4350,111 +3631,115 @@ msgstr "No se pudo crear '%s.lock': %s" msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(commit erróneo)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo falló para la ruta '%s'; abortando fusión." -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo falló para refrescar la ruta '%s'; abortando fusión." -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "error construyendo árboles" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "falló al crear la ruta '%s'%s" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Removiendo %s para hacer espacio para un subdirectorio\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" -msgstr ": ¿tal vez un conflicto D/F?" +msgstr ": tal vez un conflicto D/F?" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "rehusando perder el archivo rastreado en '%s'" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "no se puede leer el objeto %s '%s'" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "se esperaba blob para %s '%s'" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "falló al abrir '%s': %s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "falló al crear el enlace simbólico '%s': %s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se que hacer con %06o %s '%s'" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Falló al fusionar el submódulo %s (no revisado)" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Falló al fusionar el submódulo %s (commits no presentes)" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Haciendo fast-forward a submódulo %s para el siguiente commit:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rápido en submódulo %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Falló al fusionar submódulo %s (los siguentes commits no fueron encontrados)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4471,33 +3756,33 @@ msgstr "" "\n" "el cual aceptará esta sugerencia.\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Falló al ejecutar la fusión interna" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "No es posible agregar %s a la base de datos" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Auto-fusionando %s" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Error: Rehusando perder el archivo no rastreado en %s; escribiéndolo a %s en " "cambio." -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4506,7 +3791,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s " "en el árbol." -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4515,7 +3800,7 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol." -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4524,7 +3809,7 @@ msgstr "" "CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s " "dejada en el árbol, en %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4533,44 +3818,44 @@ msgstr "" "CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s " "permanece en el árbol en %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "renombrar" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "renombrado" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Rehusando perder el archivo sucio en %s" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Rehusando perder el archivo no rastreado en %s, incluso aunque se está " "interponiendo." -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s es un directorio en %s agregando como %s más bien" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Rehusando perder el archivo no rastreado en %s; agregándolo como %s en cambio" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4579,18 +3864,18 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" " "renombrar \"%s\"->\"%s\" en \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (dejado sin resolver)" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar %s->%s en %s. Renombrar %s->%s en " "%s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4601,7 +3886,7 @@ msgstr "" "colocar %s porque el directorio %s fue renombrado a otros múltiples " "directorios, sin ningún que contenga la mayoría de archivos." -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4611,7 +3896,7 @@ msgstr "" "existente en %s se interpone con el cambio de nombres implícito, poniendo " "la(s) siguiente(s) ruta(s) aquí: %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4620,7 +3905,7 @@ msgstr "" "CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta " "para %s; cambio de nombre implícito intentó poner estas rutas: %s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4629,7 +3914,7 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4638,52 +3923,52 @@ msgstr "" "PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " "renombrado." -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "no se pudo leer el objeto %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "objeto %s no es un blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "modificar" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "modificado" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "contenido" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "agregar/agregar" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "submódulo" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTO (%s): Conflicto de fusión en %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4692,7 +3977,7 @@ msgstr "" "Path actualizado: %s agregado en %s dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4701,7 +3986,7 @@ msgstr "" "CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio " "que fue renombrado en %s, sugerimos que debería ser movido a %s." -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4710,7 +3995,7 @@ msgstr "" "Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue " "renombrado en %s; moviéndolo a %s." -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4720,246 +4005,230 @@ msgstr "" "directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " "movido a %s." -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Eliminando %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "archivo/directorio" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "directorio/archivo" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLICTO (%s): Hay un directorio con el nombre %s en %s. Agregando %s como " "%s" -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Agregando %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Los cambios locales de los siguientes archivos serán sobreescritos por " +"merge:\n" +" %s" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "¡Ya está actualizado!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "se encontró %u ancestro común:" msgstr[1] "se encontraron %u ancestros comunes:" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Los cambios locales de los siguientes archivos serán sobreescritos por " -"merge:\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "archivo multi-pack-index %s es muy pequeño" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versión %d de multi-pack-index no reconocida" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "versión de hash %u no concuerda" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "offset inválido del conjunto (muy grande)" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "terminando multi-pack-index porque el id del conjunto aparece antes de lo " "esperado" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index le falta el conjunto pack-name requerido" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mal pack-int-id: %u (%u paquetes totales)" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "error preparando packfile de multi-pack-index" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "falló al agregar packfile '%s'" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "falló al abrir pack-index '%s'" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "falló al ubicar objeto %d en packfile" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Agregando packfiles a multi-pack-index" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "no se vió pack-file %s caer" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "Escribiendo chunks a multi-pack-index" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falló al limpiar multi-pack-index en %s" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Buscando por packfiles referidos" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "Verificando orden de OID en multi-pack-index" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" +msgstr "Verificando orden de OID en MIDX" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "falló al cargar el pack-index para packfile %s" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Contando objetos no referenciados" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Encontrando y borrando packfiles sin referencias" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "no se pudo empezar los pack-objetcts" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "no se pudo finalizar pack-objetcts" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no es posible crear hilo lazy_dir: %s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "no es posible crear hilo lazy_name: %s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "no es posible unir hilo lazy_name: %s" @@ -5006,32 +4275,32 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor erróneo para %s: '%s'" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "tipo de objeto \"%s\" inválido" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "objeto %s es un %s, no un %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "el objeto %s tiene un id de tipo desconocido %d" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "incapaz de analizar objeto: %s" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" @@ -5039,18 +4308,13 @@ msgstr "offset antes del final del paquete (broken .idx?)" #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -"offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)" +"offset antes del comienzo del índice del paquete para %s (índice corrupto?)" #: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -"offset más allá del índice de fin de paquete para %s (¿índice truncado?)" - -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "no se pudo obtener el tamaño de %s" +"offset más allá del índice de fin de paquete para %s (índice truncado?)" #: parse-options.c:38 #, c-format @@ -5067,7 +4331,7 @@ msgstr "%s es incompatible con %s" msgid "%s : incompatible with something else" msgstr "%s : incompatible con otra cosa" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s no toma valores" @@ -5077,41 +4341,41 @@ msgstr "%s no toma valores" msgid "%s isn't available" msgstr "%s no está disponible" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s espera un valor entero no negativo con un sufijo opcional k/m/g" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" +msgid "did you mean `--%s` (with two dashes ?)" msgstr "¿quisiste decir `--%s` (con dos guiones)?" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "opción `%s' desconocida" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "switch desconocido `%c'" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opción desconocida en string no ascii: `%s'" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -5119,21 +4383,21 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "alias de --%s" @@ -5158,35 +4422,35 @@ msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\"" msgid "malformed object name '%s'" msgstr "nombre de objeto mal formado '%s'" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "No se pudo hacer que %s fuera escribible por el grupo" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Carácter de escape '\\' no permitido como último carácter en el valor attr" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Solo una especificación 'attr' es permitida." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "especificación attr no puede estar vacía" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "nombre de atributo %s inválido" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5194,55 +4458,50 @@ msgstr "" "la configuración global de 'literal' para patrones de ruta es incompatible " "con las demás configuraciones globales de patrones de ruta" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parámetro no válido para el prefijo 'magic pathspec'" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magic pathspec inválido '%.*s' en '%s'" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Falta ')' al final del magic pathspec en '%s'" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magic pathspec '%c' no implementado en '%s'" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' y 'glob' son incompatibles" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: '%s' está fuera del repositorio en '%s'" +msgid "%s: '%s' is outside repository" +msgstr "%s: '%s' está fuera del repositorio" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (nemotécnico: '%c')" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic pathspec no soportado por este comando: %s" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "el patrón de ruta '%s' está detrás de un enlace simbólico" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "la línea está mál citada: %s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "no es posible escribir flush packet" @@ -5303,42 +4562,33 @@ msgstr "Refrescando index" msgid "unable to create threaded lstat: %s" msgstr "no es posible crear lstat hilado: %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Remoto sin URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "nombre remoto promisor no puede comenzar con '/': %s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "no se puede analizar git header '%.*s'" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "falló al generar diff" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" @@ -5378,16 +4628,16 @@ msgstr "no es posible agregar '%s' al index" msgid "unable to stat '%s'" msgstr "incapaz de correr stat en '%s'" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' parece ser un directorio y un archivo a la vez" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5396,7 +4646,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5405,161 +4655,150 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "mala versión del índice %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index usa %.4s extensiones, cosa que no entendemos" -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensión %.4s" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de index desconocido 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nombre malformado en el index, cerca a ruta '%s'" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "múltiples entradas extrañas para archivo fusionado '%s'" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "archivo índice corrompido" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entires: %s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: falló al abrir el archivo index" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: no se puede hacer stat del index abierto" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index más pequeño de lo esperado" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: no se pudo mapear el archivo index" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "no se pudo refrescar el index compartido '%s'" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index roto, se esperaba %s en %s, se obtuvo %s" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: no se puede eliminar a stage #0" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git " -"rebase --continue'.\n" -"O se puede abortar el rebase con 'git rebase --abort'.\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando." -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5601,14 +4840,14 @@ msgstr "" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase %s en %s (%d comando)" msgstr[1] "Rebase %s en %s (%d comandos)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5616,15 +4855,15 @@ msgstr "" "\n" "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" "\n" -"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n" +"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5638,7 +4877,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5648,19 +4887,22 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Tenga en cuenta que los commits vacíos están comentados" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "no se pudo escribir '%s'." +msgid "could not copy '%s' to '%s'." +msgstr "no se pudo copiar '%s' a '%s'." -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5669,7 +4911,7 @@ msgstr "" "Peligro: algunos commits pueden haber sido botados de forma accidental.\n" "Commits botados (empezando con el más nuevo):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5687,24 +4929,17 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "no se puede leer '%s'." - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" -msgstr "¡%s no apunta a ningún objeto válido!" +msgstr "%s no apunta a ningún objeto válido!" #: refs.c:667 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorando referencia rota %s" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" @@ -5727,17 +4962,16 @@ msgstr "ref '%s' ya existe" #: refs.c:825 #, c-format msgid "unexpected object ID when writing '%s'" -msgstr "ID de objecto inesperado al escribir '%s'" +msgstr "ID de objecto inesperado cuando se escribía '%s'" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "no se pudo escribir en '%s'" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "no se pudo abrir '%s' para escritura" @@ -5745,7 +4979,7 @@ msgstr "no se pudo abrir '%s' para escritura" #: refs.c:867 #, c-format msgid "unexpected object ID when deleting '%s'" -msgstr "ID de objecto inesperado al borrar '%s'" +msgstr "ID de objecto inesperado cuando se borraba '%s'" #: refs.c:998 #, c-format @@ -5772,37 +5006,37 @@ msgstr "rehusando actualizar ref con mal nombre '%s'" msgid "update_ref failed for ref '%s': %s" msgstr "update_ref falló para ref '%s': %s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "múltiples actualizaciones para ref '%s' no permitidas" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe; no se puede crear '%s'" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no se puede procesar '%s' y '%s' al mismo tiempo" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "no se pudo eliminar la referencia %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" @@ -5812,7 +5046,7 @@ msgstr "no se pudo eliminar la referencia: %s" msgid "invalid refspec '%s'" msgstr "refspec inválido: '%s'" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "desaparecido" @@ -5831,281 +5065,281 @@ msgstr "detrás %d" msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningún argumento" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "%%(objectsize) no reconocido argumento: %s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) no toma argumentos" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no toma ningún argumento" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positivo esperado objectname:short=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argumento: %s no reconocido %%(objectname)" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: átomo %%(then) usado más de una vez" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: átomo %%(else) usado más de una vez" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "no hay rama, rebasando %s" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "(o hay rama, rebasando con HEAD desacoplado %s" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "no hay rama, comenzando biseccón en %s" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "sin rama" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "opción `%s' es incompatible con --merged" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "opción `%s' es incompatible con --no-merged" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "opción '%s' debe apuntar a un commit" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "config remote shorthand no puede comenzar con '/': %s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "más de un receivepack dado, usando el primero" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "más de un uploadpack dado, usando el primero" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "llave '%s' de patrón no tuvo '*'" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "valor '%s' del patrón no tiene '*'" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "src refsoec %s: no concuerda con ninguno" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "src refspec %s concuerda con más de uno" @@ -6114,7 +5348,7 @@ msgstr "src refspec %s concuerda con más de uno" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6138,7 +5372,7 @@ msgstr "" "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el " "full ref." -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6149,7 +5383,7 @@ msgstr "" "¿Quisiste crear un branch nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6160,7 +5394,7 @@ msgstr "" "Did you mean to create a new tag by pushing to\n" "'%s:refs/tags/%s'?" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6171,7 +5405,7 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6182,115 +5416,115 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s no puede ser resolver a un branch" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no es posible borrar '%s': ref remoto no existe" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "dst refspec %s concuerda con más de uno" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "dst ref %s recibe de más de un src" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino único" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "no se puedo encontrar ref remota %s" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorando ref graciosa '%s' localmente" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Tu rama y '%s' refieren a commits diferentes.\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" para detalles)\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n" msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6300,11 +5534,11 @@ msgstr[0] "" msgstr[1] "" "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6319,11 +5553,11 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no se puede leer el nombre de objeto '%s'" @@ -6338,7 +5572,7 @@ msgstr "mal nombre de ref de reemplazo: %s" msgid "duplicate replace ref: %s" msgstr "duplicar ref de reemplazo: %s" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "remplazar profundiad muy elevada para objeto %s" @@ -6401,8 +5635,8 @@ msgstr "no se puede desvincular stray '%s'" msgid "Recorded preimage for '%s'" msgstr "Resolución precargada para '%s'" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" @@ -6436,20 +5670,20 @@ msgstr "Se olvidó resolución para '%s'\n" msgid "unable to open rr-cache directory" msgstr "no es posible abrir directorio rr-cache" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "tu rama actual '%s' no tiene ningún commit todavía" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent es incompatible con --bisect" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L no soporta todavía formatos de diff fuera de -p y -s" @@ -6472,30 +5706,30 @@ msgstr "" "Puedes desactivar esta advertencias con `git config advice.ignoredHook " "false`." -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "flush packet inesperado mientras se leía estatus de desempaquetado remoto" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no es posible analizar el estado de desempaquetado remoto: %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "desempaquetado remoto falló: %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "falló al firmar el certificado de push" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta --signed push" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6503,47 +5737,47 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed )" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push atómicos (--atomic)" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit inválido, modo cleanup '%s'" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "no se pudo eliminar'%s'" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "revertir" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:329 -msgid "rebase" -msgstr "rebase" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "rebase -i" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "acción desconocida: %d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6551,7 +5785,7 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6561,110 +5795,115 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "no se pudo leer '%s'" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de la caché" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "formato de fecha inválido '%s' en '%s'" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6694,11 +5933,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "escribiendo commit raíz" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' falló" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6725,7 +5968,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6749,324 +5992,325 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (commit-raíz)" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" -msgstr "¡HEAD %s no es un commit!" +msgstr "HEAD %s no es un commit!" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "tu archivo índice no está fusionado." -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raíz" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "el commit %s es una fusión pero no se proporcionó la opción -m." -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "no se puede obtener el mensaje de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falló al leer el índice" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falló al refrescar el índice" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "no se puede analizar '%s'" +msgid "could not parse '%.*s'" +msgstr "no se puede analizar '%.*s'" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "no se puede leer '%s'." + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "cancelando cherry-pick en progreso" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "cancelando revert en progreso" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido para %s: %s" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "revert ya está en progreso" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "cherry-pick ya está en progreso" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!" +msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revisa tu HEAD!" -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "no hay revert en progreso" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "ningún cherry-pick en progreso" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "falló al escribir el commit" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "no hay nada que saltar" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7075,21 +6319,21 @@ msgstr "" "¿ya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7108,22 +6352,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "no se pudo leer índice" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7138,11 +6387,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7159,72 +6408,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "no se pudo escribir índice" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7236,26 +6489,31 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "no se puede hacer checkout a %s" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s no es OID válido" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7276,48 +6534,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7328,59 +6586,69 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git " +"rebase --continue'.\n" +"O se puede abortar el rebase con 'git rebase --abort'.\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s' está fuera del repositorio en '%s'" +msgid "'%s' is outside repository" +msgstr "'%s' está fuera del repositorio" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7390,7 +6658,7 @@ msgstr "" "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen " "localmente." -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7402,12 +6670,12 @@ msgstr "" "Use '--' para separar las rutas de las revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "opción '%s' debe venir antes de argumentos no opcionales" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7418,95 +6686,95 @@ msgstr "" "Use '--' para separar rutas de revisiones, de esta manera:\n" "'git <comando> [<revisión>...] -- [<archivo>...]'" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" "no es posible configurar el directorio de trabajo usando una configuración " "inválida" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "esta operación debe ser realizada en un árbol de trabajo" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "error abriendo '%s'" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "muy grande para ser un archivo .git: '%s'" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "error leyendo %s" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "formato gitfile inválido: %s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "no hay ruta en gitfile: %s" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "no es un repositorio git: %s" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' muy grande" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "no es un repositorio git: '%s'" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "no se puede aplicar chdir a '%s'" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "no se puede volver a cwd" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "falló al determinar '%*s%s%s'" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "no se puede cambiar a '%s'" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" "no es un repositorio git (ni ninguno de los directorios superiores): %s" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7516,7 +6784,7 @@ msgstr "" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7525,286 +6793,286 @@ msgstr "" "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" "El dueño de los archivos tiene que tener permisos de lectura y escritura." -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "falló al abrir /dev/null o dup" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "falló fork" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "falló setsid" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "incapaz de normalizar la ruta de objeto alterno: %s" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "incapaz de normalizar directorio de objeto: %s" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "no es posible hacer fdopen en lockfile alternos" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "no es posible leer archivos alternos" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "no es posible mover archivos alternos en el lugar" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "ruta '%s' no existe" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "repositorio de referencia '%s' como un checkout vinculado no es soportado " "todavía." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "repositorio de referencia '%s' no es un repositorio local." -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "repositorio de referencia '%s' es superficial (shallow)" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "repositorio de referencia '% s' está injertado" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "línea inválida mientras se analizaban refs alternas: %s" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "mmap falló" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "archivo de objeto %s está vacío" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "objeto perdido corrupto '%s'" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "basura al final del objeto perdido '%s'" -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "tipo de objeto inválido" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "no es posible desempacar header %s con --allow-unknown-type" -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "incapaz de desempaquetar header %s" -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "no es posible analizar header %s con --allow-unknown-type" -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "incapaz de analizar header %s" -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "falló al leer objeto %s" -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "reemplazo %s no encontrado para %s" -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "objeto perdido %s (guardado en %s) está corrompido" -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paquete de objeto %s (guardado en %s) está corrompido" -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "no es posible escribir archivo %s" -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "no se pudo poner permisos a '%s'" -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "falló de escritura" -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "error cerrando el archivo de objeto suelto" -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permisos insuficientes para agregar un objeto a la base de datos del " "repositorio %s" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "no es posible crear un archivo temporal" -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "no es posible escribir el archivo de objeto suelto" -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "no es posible desinflar el objeto nuevo %s (%d)" -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd en objeto %s falló (%d)" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "confundido por fuente de data de objetos inestable para %s" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "falló utime() en %s" -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "no se pudo leer el objeto para %s" -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "commit corrupto" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "tag corrupto" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "error leyendo al indexar %s" -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "lectura corta al indexar %s" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s: falló al insertar en la base de datos" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo de archivo no soportado" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s no es objeto válido" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s no es un objeto '%s' válido" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "no es posible abrir %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash no concuerda para %s (se esperaba %s)" -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "no es posible hacer mmap a %s" -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "incapaz de desempaquetar header de %s" -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "incapaz de analizar header de %s" -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "no es posible desempaquetar contenidos de %s" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "SHA1 %s corto es ambiguo" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Los candidatos son:" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7827,111 +7095,44 @@ msgstr "" "examina estas refs y tal vez bórralas. Silencia este mensaje \n" "ejecutando \"git config advice.objectNameWarning false\"" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "log para '%.*s' solo va hasta %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "log para '%.*s' solo tiene %d entradas" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "la ruta '%s' existe en disco, pero no en '%.*s'" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"ruta '%s' existe, pero no '%s'\n" -"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "ruta '%s' no existe en '%.*s'" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"ruta '%s' está en el index, pero no en stage %d\n" -"ayuda:¿Quisiste decir: '%d:%s'?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"ruta '%s' está en el index, pero no '%s'\n" -"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "ruta '%s' existe en el disco, pero no en el index" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "ruta '%s' no existe (ni en disco ni en el index)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "" -"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "nombre de objeto no válido: '%.*s'." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7939,18 +7140,13 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "no se pudo editar '%s'" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7980,127 +7176,51 @@ msgstr "en el submódulo no poblado '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "mal argumento --ignore-submodules: %s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado " -"igual. Saltandolo." - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"no se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " -"el submódulo %s" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "proceso para submódulo '%s' falló" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falló al resolver HEAD como un ref válido." -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "Empujando submódulo '%s'\n" - -#: submodule.c:1161 +#: submodule.c:1481 #, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "No es posible hacer push al submódulo '%s'\n" +msgid "Could not access submodule '%s'" +msgstr "no pudo acceder al submódulo '%s'" -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "Haciendo fetch al submódulo %s%s\n" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "No pudo acceder al submódulo '%s'\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Errores durante el fetch del submódulo:\n" -"%s" - -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "No se pudo ejecutar 'git status --procelain=2' en el submódulo %s" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "'git status --procelain=2' falló en el submódulo %s" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "no pudo recursar en el submódulo '%s'" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "no se pudo reiniciar el index del submódulo" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8108,17 +7228,12 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "rechazando mover '%s' dentro de un directorio git existente" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8129,37 +7244,42 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "no pudo recursar en el submódulo '%s'" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignorando submódulo sospechoso: %s" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "no se permiten valores negativos para submodule.fetchjobs" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "ignorando '%s' ya que puede ser interpretado como una opción de línea de " "comando: %s" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "valor inválido para %s" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No se pudo actualizar la entrada %s de .gitmodules" @@ -8175,7 +7295,7 @@ msgstr "ejecución del comando de remolque '%s' falló" msgid "unknown value '%s' for key '%s'" msgstr "valor '%s' desconocido para la clave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "más de un %s" @@ -8194,7 +7314,7 @@ msgstr "no se pudo leer el archivo de entrada '%s'" msgid "could not read from stdin" msgstr "no se pudo leer desde stdin" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "no se pudo definir %s" @@ -8223,47 +7343,47 @@ msgstr "no se pudo renombrar el archivo temporal a %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Configurará upstream de '%s' a '%s' de '%s'\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "no se pudo leer el conjunto '%s'" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opción inválida '%s'" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "ver protocol.version en 'git help config' para más información" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "opciones del servidor requieren protocolo versión 2 o posterior" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "no se pudo analizar valor de configuración transport.color.*" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "soporte para protocolo v2 no implementado todavía" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconocido para configuración '%s': %s" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "transporte '%s' no permitido" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync ya no es soportado" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8272,7 +7392,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8299,32 +7419,32 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "Abortando." -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "escritura total al helper remoto falló" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "no es posible encontrar helper remoto para '%s'" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "no se puede duplicar output de fd del helper" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8333,104 +7453,99 @@ msgstr "" "capacidad mandatoria desconocida %s; este helper remoto probablemente " "necesita una nueva versión de Git" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "este helper remoto debería implementar capacidad refspec" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s dijo inesperadamente: '%s'" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s también bloqueó %s" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "no se pudo ejecutar fast-import" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "respuesta para conectar desconocida: %s" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "configurando servicio de ruta remota no soportado por el protocolo" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "ruta de servicio remoto inválida" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper reportó estado inesperado de %s" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "helper %s no soporta --atomic" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8439,67 +7554,67 @@ msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" "Tal vez deberías especificar un branch como 'master'.\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "leer(%s) falló" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) falló" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "hilo %s falló" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s falló al unirse: %s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "no se puede iniciar el hilo para copiar data: %s" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "proceso %s falló al esperar" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "proceso %s falló" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "objeto de árbol muy corto" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "modo mal formado en la entrada de árbol" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nombre de archivo vacío en la entrada de árbol" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "archivo de árbol muy corto" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8510,7 +7625,7 @@ msgstr "" "%%sPor favor realiza un commit con los cambios o un stash antes de cambiar " "ramas." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8520,7 +7635,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8530,7 +7645,7 @@ msgstr "" "fusionar:\n" "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8540,7 +7655,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8549,7 +7664,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n" "%%sPor favor, confirma tus cambios o guárdalos antes de %s." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8558,7 +7673,7 @@ msgstr "" "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8568,7 +7683,7 @@ msgstr "" "seguimiento en ellos:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8578,7 +7693,7 @@ msgstr "" "eliminados al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8588,7 +7703,7 @@ msgstr "" "eliminadosal actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8598,7 +7713,7 @@ msgstr "" "eliminados al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8608,7 +7723,7 @@ msgstr "" "eliminadosal fusionar:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8618,7 +7733,7 @@ msgstr "" "eliminados al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8628,7 +7743,7 @@ msgstr "" "eliminados al ejecutar %s:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8639,7 +7754,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%sPor favor, muévelos o elimínalos antes de intercambiar ramas." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8650,7 +7765,7 @@ msgstr "" "sobrescritos al actualizar el árbol de trabajo:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8660,7 +7775,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%sPor favor, muévelos o elimínalos antes de fusionar." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8670,7 +7785,7 @@ msgstr "" "sobrescritos al fusionar:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8680,7 +7795,7 @@ msgstr "" "sobrescritos al %s:\n" "%%sPor favor, muévelos o elimínalos antes de %s." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8690,12 +7805,12 @@ msgstr "" "eliminadospor %s:\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8705,7 +7820,7 @@ msgstr "" "actualizadas:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8716,7 +7831,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8727,7 +7842,7 @@ msgstr "" "actualización sparse checkout:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8736,16 +7851,16 @@ msgstr "" "No se puede actualizar le submódulo:\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Abortando\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "Actualizando archivos" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8755,10 +7870,6 @@ msgstr "" "en un filesystem case-insensitive) y solo una del grupo\n" "colisionando está en el árbol de trabajo:\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "Actualizando flags del index" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nombre de URL inválido o sufijo '://' faltante" @@ -8788,54 +7899,50 @@ msgstr "numero de puerto inválido" msgid "invalid '..' path segment" msgstr "segmento de ruta '..' inválido" -#: walker.c:170 -msgid "Fetching objects" -msgstr "Haciendo fetch a objetos" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' en el árbol de trabajo principal no es el directorio del repositorio" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " "trabajo" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' no es un archivo .git, código de error %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "no es posible acceder '%s'" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" @@ -9180,89 +8287,81 @@ msgstr "" " (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (usa \"git cherry-pick --skip\" para saltar este parche)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Revierte el estado en progreso actual." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Estás revirtiendo el commit %s." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (ejecuta \"git revert --continue\" para continuar)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (usa \"git revert --skip\" para omitir este parche)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Estás aplicando un bisect, comenzando en la rama '%s'." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Estás aplicando un bisect." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" para volver a la rama original)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "En la rama " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "rebase interactivo en progreso; en " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "rebase en progreso; en " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Confirmación inicial" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "No hay commits todavía" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Archivos sin seguimiento" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Archivos ignorados" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9273,31 +8372,31 @@ msgstr "" "puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n" "nuevos archivos tú mismo (vea 'git help status')." -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Archivos no rastreados no son mostrados %s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Sin cambios" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9306,202 +8405,192 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " "presentes\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " "hacerles seguimiento)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada para hacer commit, el árbol de trabajo está limpio\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "diferente" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "detrás " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "falló al desvincular '%s'" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opción>] [--] <especificación-de-ruta>..." -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "falló la actualización de carpetas" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "No se pudo leer el índice" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "falló la edición del parche" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Parche vacío. Abortado." -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "dry run ( ejecución en seco)" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "grabar solo el hecho de que la ruta será agregada después" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "" -"ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)" +msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el índice" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "sobrescribir el bit ejecutable de los archivos listados" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "backend para `git stash -p`" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9532,201 +8621,177 @@ msgstr "" "\n" "Vea \"git help submodule\" para más información." -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Usa -f si realmente quieres agregarlos.\n" -"Desactiva este mensaje ejecutando\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Usa -f si realmente quieres agregarlos.\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "falló al agregar archivos" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file es incompatible con --interactive/--patch" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file es incompatible con --edit" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file es incompatible con argumentos de pathspec" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul requiere --pathspec-from-file" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"¿Tal vez quisiste decir 'git add.'?\n" -"Desactiva este mensage ejecutando\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Tal vez quiso decir 'git add .'?\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "no se pudo analizar el script del autor" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' fue borrado por el hook de applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Línea mal formada: '%s'." -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falló al copiar notas de '%s' a '%s'" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "fall de fseek" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "no se pudo analizar el parche '%s'" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Solo un parche StGIT puede ser aplicado de una vez" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "timestamp inválido" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "línea Date inválida" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "offset de zona horaria inválido" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Falló al dividir parches." -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "no es posible escribir en el archivo índice" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si prefieres saltar este parche, ejecuta \"%s --skip\"." -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort" "\"." -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Parche mandado con formato=flowed; espacios al final de las líneas tal vez " "desaparezcan." -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "El parche está vacío." -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "falta línea autor en commit %s" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "sangría no válida: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "no es posible analizar el commit %s" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Repositorio carece de los blobs necesarios para retroceder en una fusión de " "3-vías." -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "Usando la información del índice para reconstruir un árbol base..." -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -"¿Editaste el parche a mano?\n" +"Editaste el parche a mano?\n" "No aplica a blobs guardados en su índice." -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Retrocediendo para parchar base y fusión de 3-vías..." -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Falló al fusionar en los cambios." -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -9734,49 +8799,45 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " +msgstr "Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "no es posible escribir en el archivo índice" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "Use 'git am --show-current-patch' para ver el parche fallido" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "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 "" -"Sin cambios - ¿olvidaste usar 'git add'?\n" +"Sin cambios - olvidaste usar 'git add'?\n" "Si no hay nada en el área de stage, las posibilidad es que algo mas\n" "ya haya introducido el mismo cambio; tal vez quieras omitir este parche." -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9789,17 +8850,17 @@ msgstr "" "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " "en él." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9807,171 +8868,161 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Valor inválido para --show-current-patch: %s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "permitir retroceso en fusión de 3-vías si es necesario" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "restaurar la rama original y abortar la operación de parchado." -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "abortar la operación de parchado pero mantener HEAD donde está." -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "muestra el parche siendo aplicado" +#: builtin/am.c:2244 +msgid "show the patch being applied." +msgstr "muestra el parche siendo aplicado." -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "Commits con firma GPG" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" -"será eliminada. Por favor no la use más." +"será removida. Por favor no la use más." -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe en el mbox dado." -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -9980,11 +9031,11 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "modo interactivo requiere parches en la línea de comando" @@ -10107,7 +9158,7 @@ msgstr "No estamos bisecando.\n" msgid "'%s' is not a valid commit" msgstr "'%s' no es un commit válido" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10115,27 +9166,27 @@ msgstr "" "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mal argumento bisect_write: %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no se puede obtener el oid de la rev '%s'" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "no se pudo abrir el archivo '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10144,7 +9195,7 @@ msgstr "" "Tienes que dar al menos un %s y un %s revision.\n" "Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10155,7 +9206,7 @@ msgstr "" "Después tienes que entregar al menos un %s y una revision %s.\n" "Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -10164,15 +9215,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "no hay términos definidos" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10181,7 +9232,7 @@ msgstr "" "Tus términos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10190,263 +9241,267 @@ msgstr "" "argumento inválido %s para 'git bisect terms'.\n" "Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "opción desconocida: '%s'" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' no parece ser una revisión válida" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'." -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecará en un árbol con cg-seek" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbólico extraño" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "ref inválido: '%s'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "realiza 'git bisect next'" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "escribe los términos a .git/BISECT_TERMS" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "limpiar el estado de bisección" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "revisar por revs esperados" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "escribir el estado de bisect en BISECT_LOG" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "revisar y configurar los terms en el estado de bisect" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "revisar si existen términos malos o buenos" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "comenzar la sesión de bisect" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms requiere dos argumentos" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset requiere un commit o ningún argumento" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write requiere entre 4 o 5 argumentos" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--bisect-clean-state no requiere argumentos" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> están documentadas en git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "esperando un color: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "tiene que terminar con un color" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "color inválido '%s' en color.blame.repeatedLines" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "valor inválido para blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "no se pudo encontrar revision %s para ignorar" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "No tratar commits raíces como extremos (Default: off)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Forzar el reporte de progreso" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Mostrar la puntuación de salida de las entradas de blame" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Mostrar número de línea original (Default: off)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Mostrar en un formato diseñado para consumo de máquina" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar en formato porcelana con información de commit por línea" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar el mismo modo salida como git-annotate (Default: off)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Suprimir nombre del autor y timestamp (Default: off)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar en cambio el email del autor (Default: off)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignorar diferencias de espacios en blanco" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "rev" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" -msgstr "Ignorar <rev> durante el blame" +msgstr "ignorar <rev> durante el blame" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" -msgstr "Ignorar revisiones de <archivo>" +msgstr "ignorar revisiones de <archivo>" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "colorear metadata redundante de líneas previas de manera diferente" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "colorear líneas por edad" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Usar un heurístico experimental para mejorar los diffs" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Ocupo más ciclos para encontrar mejoras resultados" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Usar contenido de <archivo> como imagen final" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "puntaje" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Encontrar copias de líneas entre y a través de archivos" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Encontrar movimientos de líneas entre y a través de archivos" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "Procesar solo el rango de líneas n,m, contando desde 1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -10458,18 +9513,18 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "hace 4 años, 11 meses" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "archivo %s tiene solo %lu línea" msgstr[1] "archivo %s tiene solo %lu líneas" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Blaming a líneas" @@ -10660,7 +9715,7 @@ msgid "" msgstr "" "Por favor, edita la descripción para la rama\n" "%s\n" -"Las líneas que comiencen con '%c' serán eliminadas.\n" +"Las líneas que comiencen con '%c' serán removidas.\n" #: builtin/branch.c:618 msgid "Generic options" @@ -10682,7 +9737,7 @@ msgstr "configurando modo tracking (mirar git-pull(1))" msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "upstream" @@ -10691,8 +9746,8 @@ msgid "change the upstream info" msgstr "cambiar info de upstream" #: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "desconfigurando la info de upstream" +msgid "Unset the upstream info" +msgstr "Desconfigurando la info de upstream" #: builtin/branch.c:628 msgid "use colored output" @@ -10793,9 +9848,9 @@ msgstr "ordenamiento y filtrado son case-insensitive" msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" -msgstr "¡HEAD no encontrado abajo de refs/heads!" +msgstr "HEAD no encontrado abajo de refs/heads!" #: builtin/branch.c:708 msgid "--column and --verbose are incompatible" @@ -10884,65 +9939,20 @@ msgstr "" "la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--" "set-upstream-to' en cambio." -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<opciones>] <file> <git-rev-list args>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<opciones>] <archivo>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "no mostrar medidor de progreso" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "mostrar medidor de progreso" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "similar a --all-progress cuando medidor de progreso es mostrado" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "Se necesita un repositorio para agrupar." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "no mostrar detalles del bundle" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s está bien\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "Se necesita un repositorio para agrupar." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "ser verboso; tiene que ser agregado antes de un subcomando" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Sub-comando desconocido: %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10950,7 +9960,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10958,72 +9968,72 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "solo se puede especificar una opción batch" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> puede ser: blob, tree, commit, tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "mostrar el tipo del objeto" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "mostrar el tamaño del objeto" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "salir con cero cuando no haya error" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "realizar pretty-print del contenido del objeto" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, ejecuta filters en el contenido del objeto" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "use una ruta específica para --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permita -s y -t para trabajar con objetos rotos o corruptos" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "salida buffer --batch" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "mostrar info y content de los objetos alimentados por standard input" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "mostrar info de los objetos alimentados por standard input" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "seguir los enlaces simbólicos en el árbol (usado con --batch o --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "mostrar todos los objetos con --batch o --batch-check" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "no ordenar el output de --batch-all-objects" @@ -11051,8 +10061,8 @@ msgstr "leer nombres de archivos de stdin" msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -11064,27 +10074,27 @@ msgstr "mostrar rutas de entrada que no concuerdan" msgid "ignore index when checking" msgstr "ignorar el índice cuando se revise" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "no se puede especificar los nombres de rutas con --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z sólo tiene sentido con --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "ruta no especificada" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "--quiet solo es válido con un nombre de ruta único" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "no se puede tener ambos --quiet y --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching sólo es válida con --verbose" @@ -11144,9 +10154,9 @@ msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "string" @@ -11174,98 +10184,98 @@ msgstr "git switch [<opciones>] [<rama>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "ruta '%s' no tiene nuestra versión" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "ruta '%s' no tiene su versión" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Recreado %d conflicto de merge" msgstr[1] "Recreados %d conflictos de merge" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Actualizada %d ruta para %s" msgstr[1] "Actualizadas %d rutas para %s" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Actualizada %d ruta desde el index" msgstr[1] "Actualizadas %d rutas desde el index" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s' o '%s' están especificados" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' tiene que ser usado cuando '%s' no es especificado" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' no puede ser usado con %s" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11274,50 +10284,56 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "" +"cambios en el área de stage en el siguiente archivo pueden ser perdidos: %s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11340,7 +10356,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11367,19 +10383,28 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "error interno en camino de revisión" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "solo una referencia esperada" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "solo una referencia esperada, %d entregadas." + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11388,72 +10413,37 @@ msgstr "" "'%s' puede ser tanto un archivo local como una rama de rastreo.\n" "Por favor use -- (y opcionalmente --no-guess) para desambiguar" -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n" -"puedes hacerlo proporcionando el nombre completo con la opción --track:\n" -"\n" -" git checkout --track origin/<nombre>\n" -"\n" -"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una " -"rama\n" -"de nombre <nombre> remota, como 'origin', considera configurar\n" -"checkout.defaultRemote=origin en tu configuración." - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "solo una referencia esperada" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "solo una referencia esperada, %d entregadas." - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "se espera una rama, se obtuvo una rama remota '%s'" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "se esperaba branch, se obuto '%s'" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11461,7 +10451,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11469,7 +10459,7 @@ msgstr "" "no se puede cambiar de branch en medio de una sesión de am\n" "Considera \"git am --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11477,7 +10467,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11485,7 +10475,7 @@ msgstr "" "no se puede cambiar de branch durante un cherry-pick\n" "Considera \"git cherry-pick --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11493,142 +10483,137 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "estás cambiando ramas durante un bisect" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No se puede cambiar rama a un '%s' sin commits" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forzar el reporte de progreso" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "no revise si otro árbol de trabajo contiene la ref entregada" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "falta nombre de rama; prueba -b" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "debes especificar path(s) para restaurar" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file es incompatible con --detach" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file es incompatible con --patch" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11636,69 +10621,95 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "debes especificar path(s) para restaurar" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"'%s' acertó más de una rama remota rastreada.\n" +"Encontramos %d remotos con una referencia que concuerda. Así que volvemos\n" +"a intentar resolver el argumento como una ruta, pero eso también falló!\n" +"\n" +"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n" +"puedes hacerlo proporcionando el nombre completo con la opción --track:\n" +"\n" +" git checkout --track origin/<nombre>\n" +"\n" +"Si quisieras que siempre los checkouts de nombres ambiguos prefieran una " +"rama\n" +"de nombre <nombre> remota, como 'origin', considera configurar\n" +"checkout.defaultRemote=origin en tu configuración." -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "de qué árbol hacer el checkout" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "restaurar el index" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "restaurar el árbol de trabajo (default)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "usar modo overlay" @@ -11738,7 +10749,7 @@ msgstr "falló al borrar %s" msgid "could not lstat %s\n" msgstr "no se pudo lstat %s\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11751,7 +10762,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11772,33 +10783,38 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" -msgstr "¿Ahh (%s)?\n" +msgstr "Ahh (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Input ignora los patrones >> " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " -msgstr "¿Borrar %s [y/N]? " +msgstr "Borrar %s [y/N]? " + +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Adiós.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11816,56 +10832,64 @@ msgstr "" "help - esta ventana\n" "? - ayuda para selección de opciones" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** Comandos ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "Ahora que" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Se eliminará el siguiente objeto:" msgstr[1] "Se eliminarán los siguientes objetos:" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "No hay más archivos para limpiar, saliendo." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "no imprimir nombres de archivos borrados" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "forzar" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "limpieza interactiva" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "borrar directorios completos" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "agregar <patrón> para ignorar reglas" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "borrar archivos ignorados, también" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "borrar solo archivos ignorados" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x y -X no pueden ser usadas juntas" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11873,7 +10897,7 @@ msgstr "" "clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11881,7 +10905,7 @@ msgstr "" "clean.requireForce default en true y ninguno -i, -n, ni -f entregados; " "rehusando el clean" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" @@ -11929,18 +10953,18 @@ msgstr "directorio-template" msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "usa--reference solamente si estás clonado" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "nombre" @@ -11956,8 +10980,8 @@ msgstr "checkout <rama> en lugar de HEAD remota" msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "profundidad" @@ -11965,7 +10989,7 @@ msgstr "profundidad" msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "tiempo" @@ -11973,17 +10997,16 @@ msgstr "tiempo" msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" @@ -12011,23 +11034,23 @@ msgstr "llave=valor" msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opción para trasmitir" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" @@ -12035,12 +11058,7 @@ msgstr "solo usar direcciones IPv6" msgid "any cloned submodules will use their remote-tracking branch" msgstr "cualquier submódulo clonado usará su branch de rastreo remoto" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" -"inicializar archivo sparse-checkout para incluir solo archivos en la raíz" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12048,42 +11066,47 @@ msgstr "" "No se pudo adivinar ningún nombre de directorio.\n" "Por favor especifique un directorio en la línea de comando" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No se pudo agregar un alterno para '%s': %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "falló al iniciar el iterador sobre '%s'" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "falló al desvincular '%s'" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "falló al crear link '%s'" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "falló al copiar archivo a '%s'" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "falló al iterar sobre '%s'" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12093,100 +11116,96 @@ msgstr "" "Puedes inspeccionar a qué se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No se pudo encontrar la rama remota %s para clonar." -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "falló al inicializar sparse-checkout" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12194,36 +11213,36 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since es ignorado en el clon local; use file:// ." -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -12272,7 +11291,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "padre duplicado %s ignorado" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto válido %s" @@ -12300,13 +11319,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "mensaje del commit" @@ -12314,8 +11333,8 @@ msgstr "mensaje del commit" msgid "read commit log message from file" msgstr "leer mensaje de commit desde un archivo" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -12390,65 +11409,57 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "falló al desempaquetar objeto del árbol HEAD" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file con -a no tiene sentido" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "No hay rutas con --include/--only no tiene sentido." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "no es posible crear un índice temporal" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "adición interactiva fallida" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "no es posible actualizar el índice temporal" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Falló al actualizar el cache principal del árbol" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "no es posible escribir archivo new_index" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "no se puede realizar un commit parcial durante una fusión." -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "no se puede realizar un commit parcial durante un cherry-pick." -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "no se puede leer el índice" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "no es posible escribir el índice temporal" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "commit '%s' requiere cabecera de autor" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "el commit '%s' tiene una línea de autor mal formada" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "parámetro --author mal formado" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12456,38 +11467,38 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "no se pudo leer log desde standard input" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "no se pudo leer el log '%s'" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "no se pudo leer SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "no se pudo leer MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12498,11 +11509,11 @@ msgid "" msgstr "" "\n" "Parece que estás haciendo un commit con una fusión dentro.\n" -"Si esto no es correcto, por favor elimina el archivo\n" +"Si esto no es correcto, por favor remueve el archivo\n" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12517,165 +11528,169 @@ msgstr "" "\t%s\n" "y vuelve a intentar.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"Por favor ingresa el mensaje del commit para tus cambios. Las\n" -" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" -" vacío aborta el commit.\n" +"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que " +"comiencen\n" +"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"Por favor ingresa el mensaje del commit para tus cambios. Las\n" -" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n" -" usted mismo si lo desea.\n" +"Por favor ingresa el mensaje del commit para tus cambios. Las líneas que " +"comiencen\n" +"con '%c' serán guardadas; puede eliminarlas usted mismo si desea.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " "autor existente" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inválido '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Está en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "La opción -m no puede ser combinada con -c/-C/-F." -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "No hay rutas con --include/--only no tiene sentido." + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "version" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "modo" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " "(Predeterminado: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12683,11 +11698,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "cuando" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12695,173 +11710,173 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinación de argumentos de archivos ignorados y no rastreados no soportada" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "autor" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "fecha" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar el mensaje de formato autosquash para realizar squash al commit " "especificado" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "agregar Signed-off-by: (firmado por)" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacío" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abortando commit; no se ha editado el mensaje\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12871,74 +11886,75 @@ msgstr "" "new_index. Verifique que el disco no este lleno y la quota no ha\n" "sido superada, y luego \"git restore --sateged :/\" para recuperar." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <objdir>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <objdir>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" -"git commit-graph write [--object-dir <dir objeto>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de " -"split>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "no se pudo entoncrar el objeto directorio concordante con %s" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <split options>" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "El directorio de objetos para guardar el gráfico" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "si el commit-graph está cortado, solo verifica la punta del archivo" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "No se pudo abrir commit-graph '%s'" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "comenzar caminata en todas las refs" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de índices por stdin por commits" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "comenzar a caminar a los commits listados por stdin" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "inclye todos los commits que ya están en el archivo commit-graph" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "permitir escribir un archivo commit-graph incremental" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "máximo número de commits en un commit-graph sin base cortada" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "radio máximo entre dos niveles de corte de commit-graph" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" @@ -12946,212 +11962,206 @@ msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argumento --type no reconocido, %s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "solo un tipo a la vez" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "Ubicación del archivo configuración" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "usar un archivo de config por árbol de trabajo" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "Acción" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "obtener valor: nombre [valor-regex]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "obtener todos los valores: llave [valores-regex]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "obtener valor especifico para el URL: sección[.var] URL" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplazar todas las variables que concuerden: nombre valor [valor_regex]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "borrar una variable. nombre [valor-regex]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "borrar todas las concurrencias: nombre [valor-regex]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "renombrar sección: nombre-viejo nombre-nuevo" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "borrar una sección: nombre" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "listar todo" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "Tipo" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "al valor se ha dado este tipo" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "valor es una fecha de expiración" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "Otro" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "terminar valores con un byte NULL" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "respetar directivas include en la búsqueda" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"mostrar el scope de la configuración (worktree, local, global, system, " -"command)" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "valor" -#: builtin/config.c:160 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "con --get, usa el valor por defecto cuando falta una entrada" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "número de argumentos inválidos, deberían ser %d" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "número de argumentos inválidos, deberían ser de %d a %d" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "patrón de llave inválido: %s" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "falló al formatear el valor por defecto de configuración: %s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "no se analizar color '%s'" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "no es posible analizar el valor por defecto de color" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "no en un directorio git" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "escribir en stdin no está soportado" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "escribir blobs de configuración no está soportado" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13166,23 +12176,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "solo un archivo de configuración a la vez" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob solo puede ser usado dentro de un repositorio" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "$HOME no está configurado" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13194,52 +12204,52 @@ msgstr "" "\"\n" "en \"git help worktree\" para más detalles" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "--get-color y tipo de variable incoherente" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "solo una acción a la vez" -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only solo es aplicable para --list o --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:712 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default solo es aplicable para --get" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "no se puede leer el archivo de configuración '%s'" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "error al procesar archivo(s) de configuración" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "editar stdin no está soportado" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "editar blobs no está soportado" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuración %s" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13248,7 +12258,7 @@ msgstr "" "no se puede sobrescribir múltiples valores con un único valor\n" "\tUse una regexp, --add o --replace-all para cambiar %s." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "no existe la sección: %s" @@ -13261,57 +12271,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "mostrar tamaños en formato legible para humano" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opciones>] [<commit-ish>...]" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<opciones>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "head" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "ligero" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "anotado" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "tag anotado %s no disponible" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "tag anotado %s no tiene nombre embebido" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' es realmente '%s' aquí" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "no hay tag que concuerde exactamente con '%s'" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "búsqueda finalizada a las %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13320,7 +12330,7 @@ msgstr "" "No hay tags anotados que puedan describir '%s'.\n" "Sin embargo, hubieron tags no anotados: intente --tags." -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13329,12 +12339,12 @@ msgstr "" "Ningún tag puede describit '%s'.\n" "Intente --always, o cree algunos tags." -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits cruzados\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13343,90 +12353,90 @@ msgstr "" "se encontró más de %i tags; se mostró %i más reciente\n" "fin de la búsqueda en %s\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "describe %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "Nombre de objeto %s no válido" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no es un commit ni un blob" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "encontrar el tag que viene después del commit" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "hacer debug a la estrategia de búsqueda en stderr" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "use cualquier ref" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "use cualquier tag, incluso los no anotados" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "siempre usar formato largo" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "solo seguir el primer patrón" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "solo mostrar concordancias exactas" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "considerar <n> tags más recientes (default:10)" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "solo considerar tags que concuerden con <patrón>" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "no considerar tags que concuerden con <patrón>" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "mostrar el objeto commit abreviado como fallback" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "marca" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long es incompatible con --abbrev=0" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "No se encontraron nombres, no se puede describir nada." -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty es incompatible con commit-ismos" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" @@ -13463,27 +12473,27 @@ msgstr "objeto no manejado '%s' entregado." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "falló: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "no se pudo leer el symlink %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "no se pudo leer el archivo symlink %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "no se pudo leer el objeto %s para el symlink %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13491,54 +12501,54 @@ msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "archivo del árbol de trabajo ha sido dejado." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "tal vez desees limpiar o recuperar estos." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "herramienta" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13546,31 +12556,31 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "pasado a `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool requiere un árbol de trabajo o --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dirty-diff es incompatible con --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool y --extcmd son mutuamente exclusivas" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -13607,184 +12617,158 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" -"Error: No se puede exportar los tags anidados a menos que --mark-tags sea " -"especificado." - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "mostrar progreso después de <n> objetos" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "seleccionar el manejo de tags firmados" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "seleccionar el manejo de tags que son tags de objetos filtrados" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Volcar marcas a este archivo" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Importar marcas de este archivo" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "Importar marcas de este archivo si existe" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Falsificar un tagger cuando les falta uno" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Mostrar todo el árbol para cada commit" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Use el feature done para terminar el stream" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Saltar el output de data blob" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Aplicar refspec para los refs exportados" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Padres de la referencia que no estan en fast-export stream por id de objeto" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Mostrar ids de objetos originales para blobs/commits" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "Marcar tags con ids de mark" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opciones>] <grupo>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel no puede ser negativo" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "configurar upstream para git pulll/fetch" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "forzar sobrescritura de referencia local" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "limpiar tags locales que no se encuentran en el remoto y eliminar tags " "cambiados" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submódulo" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13792,94 +12776,90 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "reporta que solo tenemos objetos alcanzables de este objeto" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "ejecutar 'gc --auto' tras el fetch" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "verificar updates forzados en todos los branch actualizados" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "escribir commit-graph luego del fetch" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuración fetch.output contiene el valor inválido %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "podría golpear tag existente" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13890,7 +12870,7 @@ msgstr "" "show-forced-updates'\n" "o ejecute 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13903,22 +12883,22 @@ msgstr "" "false'\n" "para evitar esta validación.\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13927,79 +12907,58 @@ msgstr "" "algunos refs locales no pudieron ser actualizados; intente ejecutar\n" " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "múltiples ramas detectadas, incompatible con --set-upstream" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "no configurar upstream para una rama de rastreo remoto" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "no configurar upstream para un tag remoto" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "tipo de branch desconocido" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"no se encontró rama fuente.\n" -"tienes que especificar exactamente una rama con la opción --set-upstream." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" +"--filter solo puede ser usado con el remoto configurado en extensions." +"partialClone" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14007,44 +12966,44 @@ msgstr "" "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" "nombre remoto del cual las nuevas revisiones deben ser extraídas." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14058,23 +13017,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "poblar el log con máximo <n> entradas del shorlog" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "alias para --log (deprecado)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "texto" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "use <text> como comienzo de mensaje" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "archivo del cual leer" @@ -14138,32 +13097,32 @@ msgstr "mostrar solo refs que contienen el commit" msgid "print only refs which don't contain the commit" msgstr "mostrar solo refs que no contienen el commit" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "desconocido" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "error en %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "peligro en %s %s: %s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "link roto de %7s %s" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "tipo de objeto equivocado en link" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -14172,216 +13131,216 @@ msgstr "" "link roto de %7s %s\n" " a %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "faltan %s %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "inalcanzable %s %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "actualizando %s %s" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "no se pudo crear lost-found" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "no se pudo finalizar '%s'" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Revisando %s" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Verificando conectividad (%d objetos)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Revisando %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "links rotos" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "raíz %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "tag %s %s (%s) en %s" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecto corrupto o faltante" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: referencia inválida %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Revisando reflog %s->%s" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntero sha1 inválido %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: no es un commit" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "aviso: No hay referencias por defecto" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objeto corrupto o no encontrado: %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no se puede analizar objeto: %s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "mal sha1 de archivo: %s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Revisando directorio de objetos" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s inválido" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a algo extraño (%s)" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD desacoplado apunta a nada" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "aviso: %s apunta a un branch no nacido (%s)" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Revisando el cache tree" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntero inválido sha1 en cache-tree" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "mostrar objetos ilegibles" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "mostrar objetos colgados" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "reportar nodos raíz" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "hacer objetos índices cabezas de nodos" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "también considerar paquetes y objetos alternos" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "habilitar revisión más estricta" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgados en .git/lost-found" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s: objeto faltante" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<opciones>]" @@ -14395,17 +13354,17 @@ msgstr "Falló el fstat %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "falló al analizar '%s' valor '%s'" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "no se pudo definir '%s'" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14415,59 +13374,59 @@ msgid "" "%s" msgstr "" "El último gc reportó lo siguiente. Por favor corrige la causa\n" -"y elimine %s.\n" +"y remueva %s.\n" "Limpieza automática no se realizará hasta que el archivo sea eliminado.\n" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "limpiar objetos no referenciados" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "ser más exhaustivo (aumentar runtime)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "habilitar modo auto-gc" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "falló al analizar valor %s de gc.logexpirity" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "falló al analizar valor %s de prune expiry" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Auto empaquetado del repositorio en segundo plano para un performance " "óptimo.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Auto empaquetado del repositorio para performance óptimo.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vea \"git help gc\" para limpieza manual.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14475,14 +13434,14 @@ msgstr "" "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " "es así)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para " "eliminarlos." -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" @@ -14500,262 +13459,262 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "mostrar el número de columna de la primer coincidencia" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "mostrar solo partes que concuerdan de una línea" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "mostrar árbol analizado para la expresión grep" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "paginador" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "no se ha entregado patrón" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "--untracked no es soportada con --recurse-submodules" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "opción no soportada con --recurse-submodules" + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "--cached y árboles han sido entregados" @@ -14941,11 +13900,11 @@ msgstr "leer error en input" msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "paquete muy grande para la definición actual de off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" @@ -15001,191 +13960,191 @@ msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" +msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusión más allá de la locura en parse_pack_objects()" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completado con %d objeto local" msgstr[1] "completado con %d objetos locales" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)" +msgstr "Tail checksum para %s inesperada (corrupción de disco?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paquete tiene %d delta sin resolver" msgstr[1] "paquete tiene %d deltas sin resolver" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "error mientras se cierra el archivo paquete" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No se puede abrir el índice del archivo paquete para '%s'" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" @@ -15369,126 +14328,121 @@ msgstr "--trailer con --only-input no tiene sentido" msgid "no input file given for in-place editing" msgstr "no se entregó archivo de entrada para edición en lugar" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Usar archivo de mapa de mail" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrón>" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patrón>" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "no se pudo leer objeto %s" -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "tipo desconocido: %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s: modo cover from description inválido" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "nombre del directorio de salida es muy largo" -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "necesita exactamente un rango" -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "no es un rango" -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "letras de portada necesita formato email" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "falló al crear los archivos cover-letter" -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1255 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" -msgstr "¿dos directorios de salida?" +msgstr "dos directorios de salida?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "commit desconocido %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "falló al resolver '%s' como ref válida" -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "no se pudo encontrar una base de fusión exacta" -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15500,281 +14454,271 @@ msgstr "" "O puedes especificar un commit base mediante --base=<id-commit-base> " "manualmente" -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "falló al encontrar una base de fusión exacta" -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisión" -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisión" -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "falló al inferir rangos range-diff" -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "" "usar una secuencia simple de números para salida de nombres de archivos" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Use [RFC PATCH] en lugar de [PATCH]" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "modo-cover-from-description" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "" -"genera partes de una carta de presentación basado en la descripción de la " -"rama" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "cabezal" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "email" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "ident" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "configurar dirección From a <ident> ( o identidad de committer si está " "ausente)" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "límite" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "firma" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "muestra cambios contra <rev> en cover letter o en un solo parche" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creación es pesada" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" -msgstr "¿salida standard, o directorio, cual?" +msgstr "salida standard, o directorio, cual?" -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche único" -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche único" -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "falló al crear los archivos de salida" -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15904,7 +14848,7 @@ msgstr "" msgid "do not print remote URL" msgstr "no mostrar el URL remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "ejecutar" @@ -15990,150 +14934,150 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "opción `%s' requiere un valor" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "no mostrar un diffstat al final de la fusión" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " "fusión" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "crear un commit único en lugar de hacer una fusión" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tiene una firma GPG válida" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "--abort pero deja el índice y el árbol de trabajo solos" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" +msgstr "verificar el hook commit-msg" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" @@ -16189,74 +15133,74 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" " el commit.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remoto para %s de %s" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "--quit no espera argumentos" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16264,7 +15208,7 @@ msgstr "" "No has concluido la fusión (existe MERGE_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16272,97 +15216,97 @@ msgstr "" "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "No se puede combinar --squash con --commit." -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usando el %s para preparar resolución a mano.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16402,7 +15346,7 @@ msgstr "listar revs no alcanzables desde otros" #: builtin/merge-base.c:159 msgid "is the first one ancestor of the other?" -msgstr "¿es el primer ancestro del otro?" +msgstr "es el primer ancestro del otro?" #: builtin/merge-base.c:161 msgid "find where <commit> forked from reflog of <ref>" @@ -16448,33 +15392,33 @@ msgstr "no advertir sobre conflictos" msgid "set labels for file1/orig-file/file2" msgstr "configurar labels para archivo1/orig-archivo/archivo2" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "opción %s desconocida" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "no se pudo analizar el objeto '%s'" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "no se puede manejar más de %d base. Ignorando %s." msgstr[1] "no se puede manejar más de %d bases. Ignorando %s." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "no manejando nada distinto a fusiones de dos heads." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "no se pudo resolver ref '%s'" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Fusionando %s con %s\n" @@ -16497,17 +15441,17 @@ msgstr "permitir la creación de más de un árbol" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<tamaño>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<tamaño>)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objeto directorio conteniendo conjuntos de pares packfile y pack-index" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -16515,15 +15459,15 @@ msgstr "" "durante el repack, recolectar los pack-files de tamaño menor en un batch que " "es más grande que este tamaño" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "muchos argumentos" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "opción --batch-size es solo para el subcomando 'repack'" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "subcomando desconocido: %s" @@ -16535,7 +15479,7 @@ msgstr "git mv [<opciones>] <fuente>... <destino>" #: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" -msgstr "¿Directorio %s está en el índice y no hay submódulo?" +msgstr "Directorio %s está en el índice y no hay submódulo?" #: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" @@ -16617,52 +15561,52 @@ msgstr "%s, fuente=%s, destino=%s" msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' falló" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opciones>] <commit>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opciones>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "imprimir sólo nombres (sin SHA-1)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "sólo usar tags para nombrar commits" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "solo usar refs que concuerden con <patrón>" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignorar refs que concuerden con <patrón>" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "listar todos los commits alcanzables desde todas las referencias" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "leer desde stdin" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "permitir imprimir nombres `undefined` (predeterminado)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "desreferenciar tags en la entrada (uso interno)" @@ -17062,7 +16006,7 @@ msgstr "intentar eliminar una nota no existente no es un error" msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "no eliminar, solo mostrar" @@ -17078,7 +16022,7 @@ msgstr "referencia-de-notas" msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" @@ -17097,106 +16041,129 @@ msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "mal paquete de objeto CRC para %s" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "delta recursivo encontrado para objeto %s" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "packfile es inválido: %s" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "no es posible abrir packfile para reusar: %s" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "no es posible buscar en los packfile reusados" + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "no es posible leer de packfile reusado" + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow de offset en la base de delta en paquete para %s" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "outbound de offset en la base de delta para %s" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "no se pudo obtener el tamaño de %s" + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no es posible empaquetar objetos alcanzables desde tag %s" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17205,7 +16172,7 @@ msgstr "" "se espseraba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17214,237 +16181,249 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto perdido en %s no pudo ser examinado" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "incapaz de forzar un objeto perdido" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "no mostrar medidor de progreso" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "mostrar medidor de progreso" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "similar a --all-progress cuando medidor de progreso es mostrado" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "escribir un índice de bitmap si es posible" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es muy grande, forzando %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size no puede ser usado para construir un paquete para " "transferencia" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin no puede ser usado para construir un paquete indexable" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "no se puede usar--filter sin --stdout" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" -msgstr "" -"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-" -"reusado %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17486,66 +16465,66 @@ msgstr "limitar el recorrido a objetos fuera de los paquetes del promisor" msgid "cannot prune in a precious-objects repo" msgstr "no se puede recortar en un repositorio de objetos-preciosos" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor inválido para %s: %s" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "control de fetch recursivo en submódulos" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Opciones relacionadas a fusión" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Opciones relacionadas a fetch" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "forzar sobrescritura de la rama local" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "número de submódulos que realizan pull en paralelo" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido para pull.ff: %s" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hay candidatos para fusionar entre las refs que has bajado con fetch." -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17554,7 +16533,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17565,44 +16544,44 @@ msgstr "" "una rama. Porque este no es el remoto configurado por default\n" "para tu rama actual, tienes que especificar una rama en la línea de comando." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si deseas configurar el rastreo de información para esta rama, puedes " "hacerlo con:" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17611,32 +16590,32 @@ msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" "de tu remoto, pero no se pudo hacer fetch a esa ref." -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "no es posible acceder al commit %s" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "La opción --[no-]autostash sólo es válida con --rebase." -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nata con cambios agregados al índice." -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17647,7 +16626,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17664,15 +16643,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -17682,15 +16661,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "taquigrafía de tag sin <tag>" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17699,7 +16678,7 @@ msgstr "" "Para elegir si la opción es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17724,7 +16703,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17739,7 +16718,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17753,12 +16732,12 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17769,13 +16748,13 @@ msgstr "" "la rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17787,7 +16766,7 @@ msgstr "" "'git pull ...') antes de hacer push de nuevo.\n" "Mira 'Note about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17800,7 +16779,7 @@ msgstr "" "(ejem. 'git pull ...') antes de volver a hacer push.\n" "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17814,12 +16793,12 @@ msgstr "" "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -17829,141 +16808,141 @@ msgstr "" "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" "sin usar la opción '--force'.\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "falló el push de algunas referencias a '%s'" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "mal repositorio '%s'" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"No se ha configurado un destino para el push.\n" +"Puedes o especificar una URL desde la línea de comandos o configurar un " +"repositorio remoto usando\n" +"\n" +" git remote add <nombre> <url>\n" +"\n" +"y luego haciendo push al nombre del remoto\n" +"\n" +" git push <nombre>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "repositorio" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" -msgstr "recortando refs eliminadas localmente" +msgstr "recortando refs removidas localmente" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "mal repositorio '%s'" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"No se ha configurado un destino para el push.\n" -"Puedes o especificar una URL desde la línea de comandos o configurar un " -"repositorio remoto usando\n" -"\n" -" git remote add <nombre> <url>\n" -"\n" -"y luego haciendo push al nombre del remoto\n" -"\n" -" git push <nombre>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de línea nueva" @@ -17981,32 +16960,24 @@ msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "Porcentaje por el cual la creación es pesada" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "usar colores simples de diff" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "notas" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "pasado a 'git log'" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "no .. en rango: '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "argumento único de formato debe ser un rango simétrico" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "se necesitan dos rangos de commits" @@ -18089,17 +17060,13 @@ msgstr "debug de árboles-desempacados" msgid "suppress feedback messages" msgstr "suprimir mensajes de feedback" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Necesitas resolver tu índice actual primero" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" #: builtin/rebase.c:34 msgid "" @@ -18111,207 +17078,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilizable: '%s'" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "no se pudo escribir '%s'." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "¿Sin HEAD?" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "no se pudo crear archivo temporal %s" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "no se pudo marcar como interactivo" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "no se pudo generar lista de pendientes" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit base tiene que ser provisto con --upstream o --onto" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opciones>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(DEPRECADO) mantener commits vacíos" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "mantener commits vacíos" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits con mensajes vacíos" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "rebasando commits de fusión" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "mantener puntos originales de la rama de sus primos" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "mover commits que comienzan con squash!/fixup!" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "firmar commits" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "saltar commit" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "editar la lista de pendientes" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "mostrar el parche actual" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "ids de commits cortos en la lista de pendientes" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "expandir ids de commits en la lista de pendientes" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "reorganizar líneas fixup/squash" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "insertar comando exec en la lista de pendientes" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "hacia" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "restringir revision" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "squash hacia" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "el commit de upstream" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "nombre de head" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "estrategia de rebase" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "opciones de estrategia" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "cambiar a" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "la rama o commit para hacer checkout" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "hacia-nombre" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "hacia nombre" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "el comando para ejecutar" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "reprogramar automaticamente cualquier `exec` que falle" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiere un rebase interactivo" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head inválido: '%s'" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando inválido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "No se pudo leer '%s'" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "No se puede guardar %s" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisión HEAD" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18326,7 +17302,7 @@ msgstr "" "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18345,16 +17321,7 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y " -"\"ask\"." - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18371,7 +17338,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18384,174 +17351,158 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "comando exec vacío" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "usar la base de fusión de upstream y la rama como base actual" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "pasado a 'git am'" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde está" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "usar estrategias de apply para el rebase" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusión para el rebase" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "permitir al usuario editar la lista de commits para rebasar" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "como manejar commits que se vuelven vacíos" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "preservar commits vacíos durante el rebase" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "ejecutar automáticamente stash/stash pop antes y después" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "agregar líneas exec tras cada acommit de la lista editable" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vacíos" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "opción" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusión" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -"el soporte para rebase.useBuiltin ha sido eliminado!\n" +"el soporte para rebase.useBuiltin ha sido removido!\n" "Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Parece que 'git am' está en progreso. No se puede rebasar." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar." -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "no se puede combinar '--keep-base' con '--onto'" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "no se puede combinar '--keep-base' con '--root'" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" -msgstr "¿No hay rebase en progreso?" +msgstr "No hay rebase en progreso?" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "La acción --edit-todo sólo puede ser usada al rebasar interactivamente." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18559,16 +17510,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del árbol de trabajo" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18589,167 +17540,176 @@ msgstr "" "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahí.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numérico" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "no se pueden combinar opciones de apply con opciones de merge" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "Backend de rebase desconocido: %s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "" +"no se pueden combinar opciones de am con opciones interactivas o de merge" + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-" "exec'" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'" + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "no se puede combinar '--rebase-merges' con '--strategy'" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inválido '%s'" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "No se pudo crear commit raíz nuevo" -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "'%s': necesita exactamente una base de fusión con rama" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusión" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit válido '%s'" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisión" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD está ahora en %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "no se puede analizar '%s'" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD está actualizado." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s está actualizada.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Rama actual %s está actualizada, rebase forzado.\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " "de ésta...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rápido de %s a %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18775,14 +17735,14 @@ msgstr "" "Puedes configurar la variable de configuración 'receive.denyCurrentBranch'\n" "\"ignore\" o \"warn\" en el repositorio remoto para permitir\n" "su rama actual; Sin embargo, esto no se recomienda a menos que tú\n" -"te hayas organizado para actualizar su árbol de trabajo para que coincida " -"con lo que\n" +"te hayas organizado para actualizar su árbol de trabajo para que coincida con " +"lo que\n" "enviarás con el push de otra manera.\n" "\n" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18833,49 +17793,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog existe <ref>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "Marcando objectos alcanzables..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" -msgstr "¡%s apunta a ningún lado!" +msgstr "%s apunta a ningún lado!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "no reflog especificado para borrar" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "no es una reflog: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "no reflog para '%s'" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "formato inválido: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18883,82 +17843,82 @@ msgstr "" "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nombre> <url>" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <viejo> <nuevo>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <nombre>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nombre>" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nombre>" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nombre> <rama>..." -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nombre>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nombre> <nuevo-url>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nombre> <url>" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opciones>] <nombre> <url>" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nombre> <rama>..." -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nombre> <rama>..." -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opciones>] <nombre>" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opciones>] <nombre>" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..." -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Actualizando %s" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18966,100 +17926,84 @@ msgstr "" "Usar --mirror es peligroso y está desaprobado;\n" "\t usa más bien --mirror=fetch o --mirror=push" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "argumento mirror desconocido: %s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "realizar fetch a las ramas remotas" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "importar todos los tags y objetos asociados cuando realiza el fetch" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o no realziar fetch a ningún tag (--no-tags)" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "rama(s) para rastrear" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "rama master" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "configurar remote como mirror para realizar push o desde el cual realizar " "fetch" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una rama master no tiene sentido con --mirror" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "remoto %s ya existe." -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' no es un nombre remoto válido" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "No se pudo configurar master '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "No se pudo realizar el fetch al mapa para refspec %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(concordando)" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "no se pudo configurar '%s'" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"La configuración %s remote.pushDefault en:\n" -"\t%s:%d\n" -"ahora nombra al remoto inexistente '%s'" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19070,17 +18014,17 @@ msgstr "" "\t%s\n" "\tPor favor actualice la configuración manualmente si es necesario." -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "borrando '%s' falló" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "creando '%s' falló" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19088,125 +18032,125 @@ msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "" -"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue eliminada;\n" +"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue removida;\n" "para borrarla, use:" msgstr[1] "" "Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron " -"eliminadas;\n" +"removidas;\n" "para borrarlas, use:" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la sección de configuración '%s'" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " viejo ( use 'git remote prune' para eliminar)" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "crear" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "puede realizar fast-forward" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(sin URL)" @@ -19214,185 +18158,194 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Rama local configurada para 'git pull':" msgstr[1] " Ramas locales configuradas para 'git pull':" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales serán reflejadas por 'git push'" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referencia local configurada para 'git push'%s:" msgstr[1] " Referencias locales configuradas para 'git push'%s:" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref válido: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" -msgstr " ¡%s será colgado!" +msgstr " %s será colgado!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" -msgstr " ¡%s ha sido colgado!" +msgstr " %s ha sido colgado!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [ejecutará prune] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrón de URL viejo inválido: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "No se encontró URL: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "No borrará todos los URLs de no-push" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "ser verboso; tiene que ser agregado antes de un subcomando" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sub-comando desconocido: %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<opciones>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19400,115 +18353,115 @@ msgstr "" "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n" "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects." -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no se puede finalizar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "empaquetar todo en un único paquete" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y pierde objetos inaccesibles" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "escribir un índice de bitmap" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos más antiguos que este" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "tamaño de la ventana usado para la compresión delta" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar " "entradas" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "limita la profundidad máxima del delta" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "limita el número máximo de hilos" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "tamaño máximo de cada paquete" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19527,7 +18480,7 @@ msgstr "" "WARNING: también falló.\n" "WARNING: Por favor renombralos en %s manualmente:\n" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "falló al eliminar'%s'" @@ -19635,8 +18588,8 @@ msgstr "incapaz de correr fstat %s" msgid "unable to write object to database" msgstr "incapaz de escribir el objeto en la base de datos" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "nombre de objeto no válido: '%s'" @@ -19655,22 +18608,22 @@ msgstr "edición de archivo de objeto falló" msgid "new object is the same as the old one: '%s'" msgstr "nuevo objeto es igual al antiguo: '%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "no se pudo analizar %s como un commit" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mal mergetag en commit '%s'" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "mergetag mal formado en commit '%s'" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19679,31 +18632,31 @@ msgstr "" "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit " "en lugar de --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "el commit original '%s' tiene una firma gpg" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" -msgstr "la firma será eliminada en el commit de reemplazo!" +msgstr "la firma será removida en el commit de reemplazo!" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no se pudo escribir el commit de reemplazo: '%s'" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft para '%s' innecesario" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "nuevo commit es le mismo que el antiguo: '%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19712,71 +18665,71 @@ msgstr "" "no se pudo convertir el siguiente graft(s):\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "listar replace refs" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "borrar replace refs" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "editar objeto existente" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "cambiar un padre de commit" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "convertir archivo graft existente" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "reemplazar el ref si este existe" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "no se puede imprimir contenidos para --edit" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "usar este formato" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format no puede ser usado cuando no se hace listing" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f solo tiene sentido cuando se escribe un reemplazo" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw solo tiene sentido con --edit" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d necesita al menos un argumento" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "mal número de argumentos" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e necesita exactamente un argumento" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g necesita al menos un argumento" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file no toma argumentos" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "solo se puede dar un patrón con -l" @@ -19804,126 +18757,115 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<árbol-ismo>] [--] <pathspec>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..." #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<árbol-ismo>]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]" -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "git reset --patch [<árbol-ismo>] [--] [<pathspec>...]" - -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "mezclado" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "suave" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "duro" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "fusionar" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "mantener" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "No hay un HEAD válido." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Falló al encontrar el HEAD del árbol." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Falló al encontrar árbol de %s." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD está ahora en %s" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "No se puede realziar un reset %s en medio de una fusión." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "reiniciar HEAD e index" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "reiniciar solo HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "reiniciar HEAD, índice y árbol de trabajo" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "reiniciar HEAD pero mantener cambios locales" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "" -"grabar solo el hecho de que las rutas eliminadas serán agregadas después" +"grabar solo el hecho de que las rutas removidas serán agregadas después" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Falló al resolver '%s' como una revisión válida." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Falló al resolver '%s' como un árbol válido." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch es incompatible con --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "No se puede hacer un reset %s con rutas." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset no está permitido en un repositorio vacío" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N sólo puede ser usada con --mixed" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Cambios fuera del área de stage tras el reset:" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -19937,30 +18879,35 @@ msgstr "" "usar '--quiet' para evitar esto. Configura la opción reset.quiet a true\n" "para volverlo en el default.\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "No se puede reiniciar el índice a la revisión '%s'." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valor disperso inválido: '%s'" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "conteo de marcas es incompatible con --objects" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -20125,42 +19072,38 @@ msgid_plural "the following files have local modifications:" msgstr[0] "el siguiente archivo tiene modificaciones locales:" msgstr[1] "los siguientes archivos tienen modificaciones locales:" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "no listar archivos eliminado" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "solo eliminar del índice" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "sobrescribir el check de actualizado" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "permitir eliminar de forma recursiva" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "salir con estado cero incluso si nada coincide" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "Se entregó un nuevo pathspec. ¿Qué archivos debería eliminar?" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "por favor agrega el stage de tus cambios a .gitmodules o realiza un stash " "para proceder" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "no eliminando '%s' de manera recursiva sin -r" +msgstr "no removiendo '%s' de manera recursiva sin -r" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no es posible eliminar %s" @@ -20408,84 +19351,15 @@ msgstr "no mostrar resultados en stdout (útil con --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "mostrar refs de stdin que no están en el repositorio local" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <opciones>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no " -"existe)" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "falló al crear directorio para el archivo sparse-checkout" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "falló al configurar opción extensions.worktreeConfig" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "inicializa el sparse-checkout en modo cono" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "inicializar sparse-checkout" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "falló al abrir '%s'" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "no se pudo normalizar la ruta %s" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "no es posible dequote para la cadena de estilo C '%s'" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "no se pudo cargar patrones de sparse-checkout existentes" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "leer patrones de standard in" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "configurar patrones de sparse-checkout" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "deshabilitar sparse-checkout" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "error al refrescar directorio de trabajo" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<opciones>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<opciones>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -20493,27 +19367,25 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nombre-rama> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" -" [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20521,196 +19393,186 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<mensaje>]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n" -" [--] [<pathspec>...]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' no es un commit estilo stash" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "Se especificaron demasiadas revisiones: %s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "No se encontraron entradas de stash." -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "%s no es una referencia válida" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parámetros no está implementado" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "no se puede aplicar un stash en medio de un merge" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "no se pudo generar diff %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "conflictos en índice. Intente sin --index." -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "no se puede guardar el índice del árbol" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "Fusionando %s con %s" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "intento de recrear el index" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "Botado %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: No se pudo borrar entrada stash" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' no es una referencia stash" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "No se especificó el nombre de la rama" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" -msgstr "¿Olvidaste 'git add'?" +msgstr "Olvidaste 'git add'?" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Directorio de trabajo guardado y estado de índice %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del árbol de trabajo" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "no se pudo ejecutar %s" @@ -20732,40 +19594,40 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "subomdule--helper print-default-remote no toma argumentos" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "Entrando '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -20774,7 +19636,7 @@ msgstr "" "run_command devolvió estado no-cero para %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20785,19 +19647,19 @@ msgstr "" "anidados de %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Suprime la salida al inicializar cada comando de submódulo" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Recursar en submódulos anidados" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -20806,57 +19668,57 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Error al registrar el modo de actualización para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Suprimir output del estado del submódulo" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20864,47 +19726,47 @@ msgstr "" "Usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "recursar en submódulos anidados" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "error al actualizar el remoto para el submódulo '%s'" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Suprime la salida del url del submódulo que se sincroniza" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20913,7 +19775,7 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" "rf' si realmente quieres eliminarlo incluyendo todo en su historia)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20922,206 +19784,177 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "no se pudo crear directorio vacío de submódulo %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Remover árboles de trabajo de submódulos incluso si contienen cambios locales" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Quitar todos los submódulos" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"Una alternativa calculada a partir de la alternativa de un superproyecto no " -"es válida.\n" -"Para permitir que Git clone sin una alternativa en ese caso, establezca\n" -"submodule.alternateErrorStrategy a 'info' o, de manera equivalente, clonar " -"con\n" -"'--reference-if-able' en lugar de '--reference'." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "no permitir clonar en directorios no vacíos" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference " -"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" -"url <url> --path <ruta>" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo" +"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path " +"<ruta>" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clon de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "directorio no está vacío: '%s'" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no se pudo obtener el directorio de submódulo para '%s'" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" -msgstr "¿Tal vez quieres usar 'update --init'?" +msgstr "Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncado al número especificado de revisión" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación superficial" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21130,51 +19963,51 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " "el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no se pudo conseguir un handle para el submódulo '%s'" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "revisar is es seguro escribir el archivo .gitmodules" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "desconfigura la opción en elarchivo .gitmodules" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper válido" @@ -21428,211 +20261,207 @@ msgstr "el tag '%s' ya existe" msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Desempaquetando objetos" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "falló al crear directorio %s" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "falló al crear el archivo %s" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "falló al eliminar el archivo %s" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "falló al eliminar directorio %s" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Probando mtime en '%s' " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "info de estado del directorio no cambia tras agregar un nuevo archivo" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" "info de estado del directorio no cambia tras agregar un nuevo directorio" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "info de estado del directorio cambia tras actualizar un archivo" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "info de estado del directorio cambia tras agregar un archivo dentro del " "subdirectorio" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "info de estado del directorio no cambia tras borrar un archivo" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "info de estado del directorio no cambia tras borrar un directorio" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opciones>] [--] [<archivo>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" "continuar refresh (Actualización) incluso cuando el índice necesita " "actualización" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "refresh: ignora submódulos" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "no ignorar archivos nuevos" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "permitir que archivos remplacen directorios y vice-versa" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "avisar de archivos faltando en el árbol de trabajo" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "refresh información de estado" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "como --refresh, pero ignora configuración assume-unchanged" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<modo>,<objeto>,<ruta>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "agregar la entrada especificada al índice" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "marcar archivos como \"not changing\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "limpiar bit assumed-unchanged" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "marcar archivos como \"index-only\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "limpiar bit skip-worktree" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "no tocar entradas index-only" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" "agregar solo al índice; no agregar contenido a la base de datos de objetos" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" "eliminar rutas nombradas incluso si están presentes en el árbol de trabajo" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "con --stdin: las líneas de entrada son terminadas con bytes nulos" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "leer la lista de rutas para ser actualizada desde standard input" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "agregar entradas de standard input al índice" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repoblar stages #2 y #3 para las rutas listadas" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "solo actualizar entradas que difieren de HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "ignorar archivos faltantes en el árbol de trabajo" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "reportar acciones por standard output" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(para porcelanas) olvidar conflictos sin resolver guardados" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "escribir índice en este formato" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "activar o desactivar índice dividido" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "habilitar o deshabilitar caché no rastreado" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "probar si el filesystem soporta caché no rastreado" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "habilitar caché no rastreado sin probar el filesystem" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "escribir el índice incluso si no está marcado como cambiado" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "activar o desactivar monitor de sistema de archivos" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "marcar archivos como válidos para fsmonitor" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "limpia el bit de validación fsmonitor" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21640,7 +20469,7 @@ msgstr "" "core.splitIndex está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el índice partido" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21648,7 +20477,7 @@ msgstr "" "core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente " "quieres deshabilitar el índice partido" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21656,11 +20485,11 @@ msgstr "" "core.untrackedCache está configurado en true; remuévelo o cámbialo, si " "realmente quieres deshabilitar el chaché no rastreado" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Caché no rastreado deshabilitado" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -21668,29 +20497,29 @@ msgstr "" "core.untrackedCache está configurado en false; remuévelo o cámbialo, si " "realmente quieres habilitar el caché no rastreado" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Caché no rastreado habilitado para '%s'" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor no está configurado; actívalo si realmente quieres habilitar " "fsmonitor" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor activado" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar " "el fsmonitor" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor desactivado" @@ -21784,55 +20613,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir contenido del tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<opciones>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <worktree> <nueva-ruta>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opciones>] <worktree>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "falló al borrar '%s'" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Removiendo el worktrees/%s: no es un directorio válido" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Removiendo worktrees/%s: archivo gitdir no existe" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -21841,36 +20670,36 @@ msgstr "" "Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> " "bytes, %<PRIuMAX> leídos)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Removiendo worktrees/%s: archivo gitdir inválido" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "reporta árboles de trabajo recortados" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "expirar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "no es posible volver a agregar el árbol '%s'" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21880,7 +20709,7 @@ msgstr "" "usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21889,124 +20718,124 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " "trabajo" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no se pudo descubrir el nombre de destino de '%s'" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "el objetivo '%s' ya existe" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22015,7 +20844,7 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22023,37 +20852,36 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "falló validación, no se puede mover el árbol de trabajo: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "" -"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo" +msgid "'%s' is dirty, use --force to delete it" +msgstr "'%s' está sucio, use --force para borrarlo" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no se pudo ejecutar 'git status' en '%s', código %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22062,7 +20890,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22070,7 +20898,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" @@ -22091,21 +20919,6 @@ msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "sólo útil para depurar" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Se esperaba comando 'mark', se obtuvo %s" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "Se esperaba comando 'to', se obtuvo %s" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "característica '%s' prohibida en input sin --allow-unsafe-features" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22218,25 +21031,25 @@ msgstr "" "alias '%s' cambia las variables de entorno.\n" "Puedes usar '!git' en el alias para hacer esto" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "alias vacío para %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "alias recursivo: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "error de escritura en standard output" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "error desconocido de escritura en standard output" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "cierre falló en standard output" @@ -22292,24 +21105,24 @@ msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Restricción de protocolo no soportada con cURL < 7.19.4" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "No se pudo configurar backend SSL a '%s': cURL fue construido sin backends " "SSL" -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "No se pudo configurar backend SSL para '%s': ya configurado" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22320,161 +21133,150 @@ msgstr "" " preguntaba por: %s\n" " redireccionamiento: %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "quoting inválido en valor de push-option: '%s'" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "" "respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush " "packet" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "respuesta de servidor inválida; se obtuvo '%s'" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "repositorio '%s' no encontrado" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticación falló para '%s'" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "no es posible acceder '%s':%s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "no debería tener EOF cuando no es gentil en EOF" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "no es posible rebobinar rpc post data - intenta incrementando http.postBuffer" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "RPC falló; %s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "no se puede manejar pushes tan grandes" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "no se puede desinflar el request; zlib deflate error %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "no se puede desinflar el request; zlib end error %d" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "dump http transport no soporta capacidades superficiales" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "fetch falló." -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "no se puede hacer fetch por sha1 sobre smart http" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "http transport no soporta %s" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "git-http-push falló" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: error leyendo command stream de git" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fetch intentado sin un repositorio local" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "args" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "filtrado de objeto" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "fecha de expiración" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "no-op (compatibilidad con versiones anteriores)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "ser más verboso" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "ser más discreto" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> dígitos para mostrar SHA-1s" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "cómo quitar espacios y #comentarios de mensajes" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "leer pathspec de archivo" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" -"con --pathspec-from-file, elementos de pathspec son separados con caracter " -"NUL" - #: ref-filter.h:101 msgid "key" msgstr "clave" @@ -22993,175 +21795,167 @@ msgid "Common Git shell script setup code" msgstr "Código de configuración de script de shell común de Git" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Inicializa y modifica el sparse-checkout" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "" "Poner en un stash los cambios en un directorio de trabajo sucio de todas " "maneras" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Agrega contenidos de un archivo al área de staging" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Muestra el estado del árbol de trabajo" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Eliminar el espacio en blanco innecesario" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Inicializa, actualiza o inspecciona submódulos" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operación bidireccional entre un repositorio Subversion y Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Cambiar branches" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Lee, modifica y borra referencias simbólicas" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un archivo temporal con contenidos de un blob" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objetos de un archivo empaquetado" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Registra contenidos de archivos en el árbol de trabajo al índice" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "" "Actualiza el nombre del objeto almacenado en una referencia de forma segura" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Actualiza el archivo de información auxiliar para ayudar a los servidores " "dumb" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Enviar archivo a git-archive" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Enviar objetos empaquetados a git-fetch-pack" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Mostrar una variable lógica de Git" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Verificar firma GPG de commits" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Valida archivos Git empaquetados" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG de etiquetas" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaz web Git (interfaz web para repositorios Git)" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Muestra logs con las diferencias que cada commit introduce" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Gestiona múltiples árboles de trabajo" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Crea un objeto árbol del índice actual" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Definiendo atributos por ruta" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Interfaz y convenciones de línea de comandos de Git" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Un tutorial básico de Git para desarrolladores" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git para usuarios CVS" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Afinar la salida de diff" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunto mínimo útil de comandos diarios de Git" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Un Glosario de Git" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Hooks utilizados por Git" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Definiendo las propiedades del submódulo" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Namespaces de Git" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Disposición del repositorio Git" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Especificando revisiones y rangos para Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Montando un repositorio dentro de otro" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial de introducción a Git: parte dos" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Un tutorial de introducción para Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Una visión general de flujos de trabajo recomendados con Git" @@ -23288,132 +22082,143 @@ msgstr "Intentando fusión simple con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Fusión simple no funcionó, intentando fusión automática." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "No se puede eliminar el índice temporal (no puede suceder)" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "No se puede actualizar $ref_stash con $w_commit" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "error: opción desconocida para 'stash pus': $option" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Directorio de trabajo guardado y estado de índice $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "opción desconocida: $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Se especificaron demasiadas revisiones: $REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no es una referencia válida" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no es un commit estilo stash" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no es una referencia stash" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "incapaz de refrescar el índice" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "No se puede aplicar un stash en medio de una fusión" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Conflictos en índice. Intente sin --index." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "No se puede guardar el índice del árbol" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "No se pueden restaurar archivos no rastreados de la entrada stash" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "No se puede sacar de stage archivos modificados" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Botado ${REV} ($s)" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No se pudo borrar entrada stash" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Para restaurarlos, escribe \"git stash apply\")" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "La ruta relativa sólo se puede usar desde el nivel superior del árbol de " "trabajo" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ya existe en el índice" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ya existe en el índice y no es un submódulo" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' no tiene un commit checked out" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" +"$sm_path\n" +"Usa -f si en verdad quieres agregarlo." + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Agregando el repositorio existente en '$sm_path' al índice" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ya existe y no es un repositorio git válido" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Se encontró localmente un directorio git para '$sm_name' con el(los) " "remoto(s):" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23430,39 +22235,39 @@ msgstr "" "o no estás seguro de lo que esto significa, escoge otro nombre con la opción " "'--name'." -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reactivar directorio git local para el submódulo '$sm_name'." -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No es posible hacer checkout al submódulo '$sm_path'" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falló al agregar el submódulo '$sm_path'" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falló al registrar el submódulo '$sm_path'" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No se pudo encontrar la revisión actual en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23471,7 +22276,7 @@ msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " "de submódulo '$sm_path'" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23480,7 +22285,7 @@ msgstr "" "No es posible realizar fetch en la ruta de submódulo '$displaypath'; " "intentando hacer un fetch directo $sha1:" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23489,75 +22294,75 @@ msgstr "" "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " "Fetch directo del commit falló." -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falló la ejecución de '$command $sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "La opción --cached no puede ser usada con la opción --files" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modo $mod_dst inesperado" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Advertencia: $display_name no contiene el commit $sha1_src" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -23879,10 +22684,6 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Tenga en cuenta que los commits vacíos están comentados" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" @@ -23957,19 +22758,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Incapaz de determinar la ruta absoluta del directorio git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "rastreado" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "no rastreado" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "binario" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "nada" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "sin cambios" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "agregada %d ruta\n" +msgstr[1] "agregadas %d rutas\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "actualizada %d ruta\n" +msgstr[1] "actualizadas %d rutas\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "revertida %d ruta\n" +msgstr[1] "revertidas %d rutas\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "touch hecho a %d ruta\n" msgstr[1] "touch hecho a %d rutas\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Actualizar" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Revertir" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s no es rastreado ahora.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Agregar no rastreados" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "No hay archivos sin rastrear.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23977,7 +22840,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el área de stage." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23985,7 +22848,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23993,8 +22856,8 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del área de stage." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24002,8 +22865,8 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24011,12 +22874,16 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "falló al abrir el archivo de adición del hunk para escritura: %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -24027,14 +22894,37 @@ msgstr "" "---\n" "Para eliminar '%s' líneas, haga de ellas líneas ' ' (contexto).\n" "Para eliminar '%s' líneas, bórrelas.\n" -"Lineas comenzando con %s serán eliminadas.\n" +"Lineas comenzando con %s serán removidas.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si esto no aplica de manera limpia, se te da la oportunidad de \n" +"editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n" +"la edición es abortada y el hunk queda sin cambios.\n" -#: git-add--interactive.perl:1140 +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "falló al abrir el archivo de edición del hunk para lectura: %s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24049,7 +22939,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24063,7 +22953,7 @@ msgstr "" "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24078,7 +22968,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24092,7 +22982,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunko ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24106,7 +22996,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24120,7 +23010,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24134,7 +23024,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24148,7 +23038,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24170,85 +23060,228 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" -msgstr "¡Los hunks seleccionados no aplican al índice!\n" +msgstr "Los hunks seleccionados no aplican al índice!\n" + +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "Aplicarlos al árbol de trabajo de todas maneras? " + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "Nada fue aplicado.\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Solo cambiaron archivos binarios.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Sin cambios.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Actualización del parche" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Cambio de modo de stage [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Aplicar stage al borrado [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Aplicar stage a este hunk [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Aplicar stash al borrado [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Aplicar stash a este hunk [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Sacar borrado del stage [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Sacar este hunk del stage [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar borrado al índice [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Aplicar este hunk al índice [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? " +msgstr "Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? " +msgstr "Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "¿Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? " +msgstr "Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "No hay más pedazos para el ir\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "a que hunk ir (<enter> para ver más)? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "a que hunk ir? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero inválido: '%s'\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lo siento, solo %d hunk disponible.\n" msgstr[1] "Lo siento, solo %d hunks disponibles.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "No hay más pedazos para buscar\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "buscar para regexp? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp para la búsqueda mal formado %s: %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patrón entregado.\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Perdón, no se puede dividir este pedazo\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Cortar en %d hunk.\n" msgstr[1] "Cortar en %d hunks.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Perdón, no se puede editar este pedazo\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Revisión de diff" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24268,19 +23301,19 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, se esperaba --" @@ -24397,7 +23430,7 @@ msgstr "" #: git-send-email.perl:718 #, perl-format msgid "No subject line in %s?" -msgstr "¿No hay línea de subject en %s?" +msgstr "No hay línea de subject en %s?" #: git-send-email.perl:728 #, perl-format @@ -24412,7 +23445,7 @@ msgid "" "\n" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -"Lineas que comienzan en \"GIT:\" serán eliminadas.\n" +"Lineas que comienzan en \"GIT:\" serán removidas.\n" "Considere incluir un diffstat global o una tabla de contenidos\n" "para el parche que estás escribiendo.\n" "\n" @@ -24436,7 +23469,7 @@ msgstr "Archivo de resumen está vacío, saltando al siguiente\n" #: git-send-email.perl:858 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " -msgstr "¿Estás seguro de que deseas usar <%s> [y/N]? " +msgstr "Estás seguro de que deseas usar <%s> [y/N]? " #: git-send-email.perl:913 msgid "" @@ -24448,7 +23481,7 @@ msgstr "" #: git-send-email.perl:918 msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "¿Que codificación de 8bit debería declarar [UTF-8]? " +msgstr "Que codificación de 8bit debería declarar [UTF-8]? " #: git-send-email.perl:926 #, perl-format @@ -24465,7 +23498,7 @@ msgstr "" #: git-send-email.perl:945 msgid "To whom should the emails be sent (if anyone)?" -msgstr "¿A quien se deben mandar los correos (si existe)?" +msgstr "A quien se deben mandar los correos (si existe)?" #: git-send-email.perl:963 #, perl-format @@ -24475,7 +23508,7 @@ msgstr "fatal: alias '%s' se expande a si mismo\n" #: git-send-email.perl:975 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -"¿Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " +"Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " "existe alguno)? " #: git-send-email.perl:1033 git-send-email.perl:1041 @@ -24488,7 +23521,7 @@ msgstr "error: no es posible extraer una dirección válida de %s\n" #. at this point. #: git-send-email.perl:1045 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "¿Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " +msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " #: git-send-email.perl:1362 #, perl-format @@ -24525,7 +23558,7 @@ msgstr "" #. at this point. #: git-send-email.perl:1460 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -msgstr "¿Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): " +msgstr "Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): " #: git-send-email.perl:1463 msgid "Send this email reply required" @@ -24538,12 +23571,12 @@ msgstr "El servidor SMTP no esta definido adecuadamente." #: git-send-email.perl:1538 #, perl-format msgid "Server does not support STARTTLS! %s" -msgstr "¡El servidor no soporta STARTTLS! %s" +msgstr "El servidor no soporta STARTTLS! %s" #: git-send-email.perl:1543 git-send-email.perl:1547 #, perl-format msgid "STARTTLS failed! %s" -msgstr "¡Falló STARTTLS! %s" +msgstr "Falló STARTTLS! %s" #: git-send-email.perl:1556 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." @@ -24649,166 +23682,7 @@ msgstr "Saltando %s con el sufijo de backup '%s'.\n" #: git-send-email.perl:1978 #, perl-format msgid "Do you really want to send %s? [y|N]: " -msgstr "¿Realmente deseas mandar %s?[y|N]: " - -#, c-format -#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " -#~ msgstr "¿Cambio de modo de stage [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " -#~ msgstr "¿Aplicar stage al borrado [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " -#~ msgstr "¿Aplicar stage a este hunk [y,n,a,q,d%s,?]? " - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for staging.\n" -#~ msgstr "" -#~ "Si el parche aplica limpiamente, el hunk editado sera marcado\n" -#~ "inmediatamente para el área de stage.\n" - -#~ msgid "" -#~ "y - stage this hunk\n" -#~ "n - do not stage this hunk\n" -#~ "q - quit; do not stage this hunk or any of the remaining ones\n" -#~ "a - stage this and all the remaining hunks\n" -#~ "d - do not stage this hunk nor any of the remaining hunks\n" -#~ msgstr "" -#~ "y - aplicar stage a este hunk\n" -#~ "n - no aplicar stage a este hunk\n" -#~ "q - quit; no aplicar stage a este hunk o ninguno de los restantes\n" -#~ "a - aplicar stage a este hunk y a todos los posteriores en el archivo \n" -#~ "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " -#~ "archivo\n" - -#, c-format -#~ msgid "could not copy '%s' to '%s'." -#~ msgstr "no se pudo copiar '%s' a '%s'." - -#~ msgid "malformed ident line" -#~ msgstr "línea de entrada mal formada" - -#~ msgid "corrupted author without date information" -#~ msgstr "autor corrupto sin información de fecha" - -#, c-format -#~ msgid "could not parse '%.*s'" -#~ msgstr "no se puede analizar '%.*s'" - -#, c-format -#~ msgid "could not checkout %s" -#~ msgstr "no se puede hacer checkout a %s" - -#, c-format -#~ msgid "filename in tree entry contains backslash: '%s'" -#~ msgstr "nombre de archivo en el árbol contiene un backslash: '%s'" - -#, c-format -#~ msgid "Use -f if you really want to add them.\n" -#~ msgstr "Usa -f si realmente quieres agregarlos.\n" - -#, c-format -#~ msgid "Maybe you wanted to say 'git add .'?\n" -#~ msgstr "¿Tal vez quiso decir 'git add .'?\n" - -#, c-format -#~ msgid "packfile is invalid: %s" -#~ msgstr "packfile es inválido: %s" - -#, c-format -#~ msgid "unable to open packfile for reuse: %s" -#~ msgstr "no es posible abrir packfile para reusar: %s" - -#~ msgid "unable to seek in reused packfile" -#~ msgstr "no es posible buscar en los packfile reusados" - -#~ msgid "unable to read from reused packfile" -#~ msgstr "no es posible leer de packfile reusado" - -#~ msgid "no HEAD?" -#~ msgstr "¿Sin HEAD?" - -#~ msgid "make committer date match author date" -#~ msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" - -#~ msgid "ignore author date and use current date" -#~ msgstr "ignorar la fecha del autor y usar la fecha actual" - -#~ msgid "synonym of --reset-author-date" -#~ msgstr "sinónimo para --reset-author-date" - -#~ msgid "ignore changes in whitespace" -#~ msgstr "ignorar cambios en espacios en blanco" - -#~ msgid "preserve empty commits during rebase" -#~ msgstr "preservar commits vacíos durante el rebase" - -#~ msgid "cannot combine --use-bitmap-index with object filtering" -#~ msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado" - -#, sh-format -#~ msgid "" -#~ "The following path is ignored by one of your .gitignore files:\n" -#~ "$sm_path\n" -#~ "Use -f if you really want to add it." -#~ msgstr "" -#~ "La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n" -#~ "$sm_path\n" -#~ "Usa -f si en verdad quieres agregarlo." - -#, c-format -#~ msgid "unable to get tree for %s" -#~ msgstr "no se pudo obtener árbol para %s" - -#~ msgid "Use an experimental heuristic to improve diffs" -#~ msgstr "Usar un heurístico experimental para mejorar los diffs" - -#~ msgid "git commit-graph [--object-dir <objdir>]" -#~ msgstr "git commit-graph [--object-dir <objdir>]" - -#~ msgid "git commit-graph read [--object-dir <objdir>]" -#~ msgstr "git commit-graph read [--object-dir <objdir>]" - -#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -#~ msgstr "" -#~ "valor core.untrackedCache '%s' desconocido; usando 'keep' como valor por " -#~ "defecto" - -#~ msgid "cannot change partial clone promisor remote" -#~ msgstr "no se puede cambiar un clon parcial remoto promisor" - -#~ msgid "error building trees" -#~ msgstr "error construyendo árboles" - -#~ msgid "invalid date format '%s' in '%s'" -#~ msgstr "formato de fecha inválido '%s' en '%s'" - -#~ msgid "writing root commit" -#~ msgstr "escribiendo commit raíz" - -#~ msgid "staged changes in the following files may be lost: %s" -#~ msgstr "" -#~ "cambios en el área de stage en el siguiente archivo pueden ser perdidos: " -#~ "%s" - -#~ msgid "" -#~ "--filter can only be used with the remote configured in extensions." -#~ "partialClone" -#~ msgstr "" -#~ "--filter solo puede ser usado con el remoto configurado en extensions." -#~ "partialClone" - -#~ msgid "verify commit-msg hook" -#~ msgstr "verificar el hook commit-msg" - -#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" -#~ msgstr "no se puede combinar '--rebase-merges' con '--strategy-option'" - -#~ msgid "invalid sparse value '%s'" -#~ msgstr "valor disperso inválido: '%s'" +msgstr "Realmente deseas mandar %s?[y|N]: " #~ msgid "Server supports multi_ack_detailed" #~ msgstr "El servidor soporta ulti_ack_detailed" @@ -24846,6 +23720,9 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ msgid "cannot be interactive without stdin connected to a terminal." #~ msgstr "no se puede ser interactivo sin stdin conectado a un terminal." +#~ msgid "failed to open '%s'" +#~ msgstr "falló al abrir '%s'" + #~ msgid "failed to stat %s\n" #~ msgstr "falló al analizar %s\n" diff --git a/third_party/git/po/fr.po b/third_party/git/po/fr.po index 314ff3747e..55c7db6aa6 100644 --- a/third_party/git/po/fr.po +++ b/third_party/git/po/fr.po @@ -75,8 +75,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-11 21:03+0100\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-10 18:17+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" @@ -86,730 +86,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n" "X-Generator: Poedit 2.2.3\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "Hein (%s) ?" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "impossible de lire l'index" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "binaire" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "rien" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "inchangé" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Mise à jour" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "impossible d'indexer '%s'" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "impossible d'écrire l'index" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "%d chemin mis à jour\n" -msgstr[1] "%d chemins mis à jour\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "note : %s n'est plus suivi à présent.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "échec de make_cache_entry pour le chemin '%s'" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Inverser" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "impossible d'analyser HEAD^{tree}" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "%d chemin inversé\n" -msgstr[1] "%d chemins inversés\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "Aucun Fichier non suivi.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "Ajouter un fichier non-suivi" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "%d chemin ajouté\n" -msgstr[1] "%d chemins ajoutés\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "fichier non-fusionné ignoré : %s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Seuls des fichiers binaires ont changé.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Aucune modification.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Mise à jour par patch" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Réviser la différence" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "afficher les chemins comprenant des modifications" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "" -"ajouter l'état de l'arbre de travail à l'ensemble des modifications indexées" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "retourner l'ensemble de modifications indexées à la version HEAD" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "sélection et mise à jour individuelle des sections" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "visualiser les diffs entre HEAD et l'index" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "" -"ajouter le contenu des fichiers non-suivis à l'ensemble des modifications " -"indexées" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "Aide :" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "sélectionner un seul élément" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "sélectionner une plage d'éléments" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "sélectionner plusieurs plages" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "sélectionner un élément basé sur une préfixe unique" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "désélectionner les éléments spécifiés" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "choisir tous les éléments" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(vide) arrêter de sélectionner" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "sélectionner un élément par son numéro" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(vide) ne rien sélectionner" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Commandes ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Et maintenant ?" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "indexé" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "non-indexé" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "chemin" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "impossible de rafraîchir l'index" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Au revoir.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera immédiatement " -"marquée comme indexée." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - indexer cette section\n" -"n - ne pas indexer cette section\n" -"q - quitter ; ne pas indexer cette section ni les autres restantes\n" -"a - indexer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas indexer cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera immédiatement " -"marquée comme remisée." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - remiser cette section\n" -"n - ne pas remiser cette section\n" -"q - quitter ; ne pas remiser cette section ni les autres restantes\n" -"a - remiser cette section et toutes les suivantes de ce fichier\n" -"d - ne pas remiser cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera immédiatement " -"marquée comme desindexée." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - désindexer cette section\n" -"n - ne pas désindexer cette section\n" -"q - quitter ; ne pas désindexer cette section ni les autres restantes\n" -"a - désindexer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas désindexer cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera immédiatement " -"marquée comme appliquée." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - appliquer cette section\n" -"n - ne pas appliquer cette section\n" -"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" -"a - appliquer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas appliquer cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera immédiatement " -"marquée comme éliminée." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - supprimer cette section\n" -"n - ne pas supprimer cette section\n" -"q - quitter ; ne pas supprimer cette section ni les autres restantes\n" -"a - supprimer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas supprimer cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - éliminer cette section de l'index et de l'arbre de travail\n" -"n - ne pas éliminer cette section\n" -"q - quitter ; ne pas éliminer cette section ni les autres restantes\n" -"a - éliminer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas éliminer cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d" -"%s,?] ? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d" -"%s,?] ? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - appliquer cette section à l'index et à l'arbre de travail\n" -"n - ne pas appliquer cette section\n" -"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" -"a - appliquer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas appliquer cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - appliquer cette section à l'arbre de travail\n" -"n - ne pas appliquer cette section\n" -"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" -"a - appliquer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas appliquer cette section ni les suivantes de ce fichier\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "impossible d'analyser l'entête de section '%.*s'" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "impossible d'analyser l'entête coloré de section '%.*s'" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "impossible d'analyser la diff" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "impossible d'analyser la diff colorée" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "échec pour lancer '%s'" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "sortie sans correspondance depuis interactive.diffFilter" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Votre filtre doit maintenir une correspondance un-pour-un\n" -"entre les lignes en entrée et en sortie." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"ligne de contexte attendue #%d dans\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"les sections ne se recouvrent pas :\n" -"%.*s\n" -"\tne se termine pas par :\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" -"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"Pour éliminer les lignes '%c', rendez-les ' ' (contexte).\n" -"Pour éliminer les lignes '%c', effacez-les.\n" -"Les lignes commençant par %c seront éliminées.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Si ça ne s'applique pas proprement, vous aurez la possibilité de\n" -"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" -"alors l'édition sera abandonnée et la section conservée.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "impossible d'analyser l'entête de section" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "'git apply --cached' a échoué" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " -"l'élimine !) [y|n] ? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "Les sections sélectionnées ne s'applique pas à l'index !" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Les appliquer quand même à l'arbre de travail ? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Rien n'a été appliqué.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - laisser cette section non décidée et aller à la suivante non-décidée\n" -"J - laisser cette section non décidée et aller à la suivante\n" -"k - laisser cette section non décidée et aller à la précédente non-décidée\n" -"K - laisser cette section non décidée et aller à la précédente\n" -"g - sélectionner une section et s'y rendre\n" -"/ - rechercher une section correspondant à une regex donnée\n" -"s - découper la section en sections plus petites\n" -"e - éditer manuellement la section actuelle\n" -"? - afficher l'aide\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "Pas de section précédente" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "Pas de section suivante" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "Aucune autre section à atteindre" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "aller à quelle section (<ret> pour voir plus) ? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "aller à quelle section ? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Numéro invalide : '%s'" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Désolé, %d seule section disponible." -msgstr[1] "Désolé, Seulement %d sections disponibles." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "aucune autre section à rechercher" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "rechercher la regex ? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Regex de recherche malformée %s : %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "Aucune section ne correspond au motif donné" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Désolé, impossible de découper cette section" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "Découpée en %d sections." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Désolé, impossible d'éditer cette section" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "'git apply' a échoué" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sastuce: %.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Impossible de picorer car vous avez des fichiers non fusionnés." -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "Impossible de valider car vous avez des fichiers non fusionnés." -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés." -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." -#: advice.c:186 +#: advice.c:180 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." @@ -817,23 +124,23 @@ msgstr "" "Corrigez-les puis lancez 'git add/rm <fichier>'\n" "si nécessaire pour marquer la résolution et valider." -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Abandon à cause de conflit non résolu." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)." -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Veuillez valider vos changements avant de fusionner." -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Abandon à cause d'une fusion non terminée." -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -968,7 +275,17 @@ msgstr "mode invalide dans la ligne %d : %s" msgid "inconsistent header lines %d and %d" msgstr "lignes d'entête inconsistantes %d et %d" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recomptage : ligne inattendue : %.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -983,93 +300,83 @@ msgstr[1] "" "information de nom de fichier manquante dans l'en-tête de git diff lors de " "la suppression de %d composants de préfixe de chemin (ligne %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "information de nom de fichier manquante dans l'en-tête de git diff (ligne %d)" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recomptage : ligne inattendue : %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragment de patch sans en-tête à la ligne %d : %.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "le nouveau fichier dépend de contenus anciens" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "le fichier supprimé a encore du contenu" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrompu à la ligne %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "le nouveau fichier %s dépend de contenus anciens" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "le fichier supprimé %s a encore du contenu" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaire corrompu à la ligne %d : %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaire non reconnu à la ligne %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch totalement incompréhensible à la ligne %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "ouverture ou lecture de %s impossible" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "début de ligne invalide : '%c'" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "La section n°%d a réussi à la ligne %d (offset %d ligne)." msgstr[1] "La section n°%d a réussi à la ligne %d (offset %d lignes)." -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contexte réduit à (%ld/%ld) pour appliquer le fragment à la ligne %d" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1078,449 +385,463 @@ msgstr "" "pendant la recherche de :\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "données de patch binaire manquantes pour '%s'" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section " "inverse" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel." -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "le patch s'applique à un '%s' vide mais ce n'est pas vide" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "l'image postérieure nécessaire %s pour '%s' ne peut pas être lue" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "le patch binaire ne s'applique par correctement à '%s'" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s " "trouvé)" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "le patch a échoué : %s:%ld" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "extraction de %s impossible" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "échec de la lecture de %s" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lecture depuis '%s' au-delà d'un lien symbolique" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "le chemin %s a été renommé/supprimé" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s : n'existe pas dans l'index" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s : ne correspond pas à l'index" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Retour à une fusion à 3 points…\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossible de lire le contenu actuel de '%s'" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Échec du retour à une fusion à 3 points…\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch %s appliqué avec des conflits.\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch %s appliqué proprement.\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "le patch de suppression laisse un contenu dans le fichier" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s : type erroné" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s est de type %o, mais %o attendu" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "chemin invalide '%s'" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s : existe déjà dans l'index" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s : existe déjà dans la copie de travail" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s : le patch ne s'applique pas" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Vérification du patch %s..." -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" "l'information sha1 est manquante ou inutilisable pour le sous-module %s" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "l'information de sha1 est manquante ou inutilisable (%s)." -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "échec de make_cache_entry pour le chemin '%s'" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "impossible d'ajouter %s à l'index temporaire" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "impossible d'écrire l'index temporaire dans %s" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "suppression de %s dans l'index impossible" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrompu pour le sous-module %s" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "stat du fichier nouvellement créé '%s' impossible" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "création du magasin de stockage pour le fichier nouvellement créé %s " "impossible" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "ajout de l'élément de cache %s impossible" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "échec de l'écriture dans '%s'" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "fermeture du fichier '%s'" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "écriture du fichier '%s' mode %o impossible" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s appliqué proprement." -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "erreur interne" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Application du patch %%s avec %d rejet..." msgstr[1] "Application du patch %%s avec %d rejets..." -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "troncature du nom de fichier .rej en %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "impossible d'ouvrir %s" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Section n°%d appliquée proprement." -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Section n°%d rejetée." -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Chemin '%s' non traité." -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "entrée non reconnue" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "lecture du fichier d'index impossible" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "ouverture impossible du patch '%s' :%s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erreur d'espace ignorée" msgstr[1] "%d erreurs d'espace ignorées" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d ligne a ajouté des erreurs d'espace." msgstr[1] "%d lignes ont ajouté des erreurs d'espace." -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace." msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossible d'écrire le nouveau fichier d'index" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "chemin" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "ne pas appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "appliquer les modifications qui correspondent au chemin donné" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "num" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "supprimer <num> barres obliques des chemins traditionnels de diff" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignorer les additions réalisées par le patch" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "" "afficher le nombre de lignes ajoutées et supprimées en notation décimale" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "au lieu d'appliquer le patch, voir si le patch est applicable" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "s'assurer que le patch est applicable sur l'index actuel" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "marquer les nouveaux fichiers `git add --intent-to-add`" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "appliquer les patch sans toucher à la copie de travail" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "accepter un patch qui touche hors de la copie de travail" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" "construire un index temporaire fondé sur l'information de l'index embarqué" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "les chemins sont séparés par un caractère NUL" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "action" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "" "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs " "d'espace" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "ignorer des modifications d'espace lors de la recherche de contexte" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "appliquer le patch en sens inverse" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "ne pas s'attendre à au moins une ligne de contexte" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "accepter les recouvrements de sections" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "mode verbeux" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolérer des erreurs de détection de retours chariot manquants en fin de " "fichier" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "ne pas se fier au compte de lignes dans les en-têtes de section" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "racine" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "préfixer tous les noms de fichier avec <root>" @@ -1543,7 +864,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dépôt> [--exec <commande>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "le chemin '%s' ne correspond à aucun fichier" @@ -1575,7 +896,7 @@ msgstr "fmt" msgid "archive format" msgstr "format d'archive" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "préfixe" @@ -1583,12 +904,11 @@ msgstr "préfixe" msgid "prepend prefix to each pathname in the archive" msgstr "préfixer chaque chemin de fichier dans l'archive" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "fichier" @@ -1621,7 +941,7 @@ msgid "list supported archive formats" msgstr "afficher les formats d'archive supportés" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "dépôt" @@ -1629,7 +949,7 @@ msgstr "dépôt" msgid "retrieve the archive from remote repository <repo>" msgstr "récupérer l'archive depuis le dépôt distant <dépôt>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "commande" @@ -1660,66 +980,66 @@ msgstr "Format d'archive inconnu '%s'" msgid "Argument not supported for format '%s': -%d" msgstr "Argument non supporté pour le format '%s' : -%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "impossible de transmettre le blob %s en flux" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "mode de fichier non supporté :0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "impossible de lire %s" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "impossible de démarrer le filtre '%s'" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "impossible de rediriger un descripteur" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "le filtre '%s' a retourné une erreur" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "le chemin n'est pas codé en UTF-8 valide : %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "erreur de compression (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non permis : %s : %d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1737,12 +1057,12 @@ msgstr "Contenu mal cité dans le fichier '%s' : %s" msgid "We cannot bisect more!\n" msgstr "Impossible de pousser la bissection plus loin !\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "%s n'est pas un nom de commit valide" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1751,7 +1071,7 @@ msgstr "" "La base de fusion %s est mauvaise.\n" "Cela signifie que le bogue été corrigé entre %s et [%s].\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1760,7 +1080,7 @@ msgstr "" "La base de fusion %s est nouvelle.\n" "La propriété a changé entre %s et [%s].\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1769,7 +1089,7 @@ msgstr "" "La base de fusion %s est %s.\n" "Ceci signifie que le premier commit '%s' est entre %s et [%s].\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1780,7 +1100,7 @@ msgstr "" "git bisect ne peut pas fonctionner correctement dans ce cas.\n" "Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1792,36 +1112,36 @@ msgstr "" "et %s.\n" "On continue tout de même." -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bissection : une base de fusion doit être testée\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "une révision %s est nécessaire" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "impossible de créer le fichier '%s'" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "impossible de lire le fichier '%s'" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "impossible de lire les références de bissection" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s était à la fois %s et %s\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1830,7 +1150,7 @@ msgstr "" "Aucun commit testable n'a été trouvé\n" "Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1840,48 +1160,48 @@ msgstr[1] "(à peu près %d étapes)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bissection : %d révision à tester après ceci %s\n" msgstr[1] "Bissection : %d révisions à tester après ceci %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents et --reverse ne font pas bon ménage." -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse et --first-parent ensemble nécessitent la spécification d'un " "dernier commit" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "échec de la préparation du parcours des révisions" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent ensemble nécessitent une portée avec la chaîne de " "premier parent" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "pas de chemin %s dans %s" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossible de lire le blob %s pour le chemin %s" @@ -2044,8 +1364,8 @@ msgstr "'%s' ne semble pas être un fichier bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "en-tête non reconnu : %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "impossible d'ouvrir '%s'" @@ -2076,62 +1396,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces %d références :" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "impossible de dupliquer le descripteur de liasse" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Impossible de créer des objets groupés" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "les objets groupés ont disparu" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list a disparu" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "la référence '%s' est exclue par les options de rev-list" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argument non reconnu : %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Refus de créer un colis vide." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "impossible de créer '%s'" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "l'index de groupe a disparu" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "Valeur invalide de couleur : %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "impossible d'analyser %s" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2151,27 +1471,27 @@ msgstr "" "Supprimez ce message en lançant\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La validation %s a une signature GPG non fiable, prétendument par %s." -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La validation %s a une mauvaise signature GPG prétendument par %s." -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La validation %s n'a pas de signature GPG." -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La validation %s a une signature GPG correcte par %s\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2183,184 +1503,174 @@ msgstr "" "variable de configuration i18n.commitencoding à l'encodage utilisé par votre " "projet.\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "le graphe de commit est trop petit" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" "la signature du graphe de commit %X ne correspond pas à la signature %X" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la version %X du graphe de commit ne correspond pas à la version %X" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" "l'empreinte de la version %X du graphe de commit ne correspond pas à la " "version %X" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "entrée de table de consultation de morceaux de graphe de commite manquante ; " "le fichier est peut être incomplet" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "le graphe de commit n'a pas de section de graphes de base" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "la chaîne de graphe de commit ne correspond pas" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "impossible de trouver tous les fichiers du graphe de commit" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "position de commit invalide. Le graphe de commit est vraisemblablement " "corrompu" -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "impossible de trouver le commit %s" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "impossible d'analyser le commit %s" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "impossible d'obtenir le type de l'objet %s" -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Lecture des commits connus dans un graphe de commit" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Expansion des commits joignables dans un graphe de commit" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Suppression les marques de commit dans le graphe de commits" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Calcul des chiffres de génération du graphe de commits" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet" msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "erreur à l'ajout du packet %s" -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "erreur à l'ouverture de l'index pour %s" -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf" msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "identifiant d'objet commit invalide : %s" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "" "Recherche de commits pour un graphe de commits parmi les objets empaquetés" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Comptage des commits distincts dans un graphe de commit" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "échec à l'écriture le nombre correct d'id de base de fusion" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "impossible de créer les répertoires de premier niveau de %s" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "impossible de créer '%s'" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Écriture le graphe de commits en %d passe" msgstr[1] "Écriture le graphe de commits en %d passes" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "impossible d'ouvrir le fichier de graphe de commit" -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "échec du renommage du fichier de graphe de commits" -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "id de commit %s dupliqué inattendu" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "fusion du graphe de commits" @@ -2373,25 +1683,25 @@ msgstr "le graphe de commits ne peut pas écrire %d commits" msgid "too many commits to write graph" msgstr "trop de commits pour écrire un graphe" -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "le graphe de commit a une somme de contrôle incorrecte et est " "vraisemblablement corrompu" -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = " "%u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" @@ -2400,38 +1710,38 @@ msgstr "échec de l'analyse le commit %s depuis le graphe de commits" msgid "Verifying commits in commit graph" msgstr "Verification des commits dans le graphe de commits" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "échec de l'analyse du commit %s depuis la base de données d'objets pour le " "graphe de commit" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != " "%s" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "la liste des parents du graphe de commit pour le commit %s est trop longue" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "le parent du graphe de commit pour %s est %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "la liste de parents du graphe de commit pour le commit %s se termine trop tôt" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2439,7 +1749,7 @@ msgstr "" "le graphe de commit a un numéro de génération nul pour le commit %s, mais " "non-nul ailleurs" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2447,12 +1757,12 @@ msgstr "" "le graphe de commit a un numéro de génération non-nul pour le commit %s, " "mais nul ailleurs" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "la génération du graphe de commit pour le commit %s est %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2503,7 +1813,7 @@ msgstr "la clé ne contient pas de section: %s" msgid "key does not contain variable name: %s" msgstr "la clé ne contient pas de nom de variable : %s" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "clé invalide : %s" @@ -2650,7 +1960,7 @@ msgstr "valeur mal formée pour %s : %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "doit être parmi nothing, matching, simple, upstream ou current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "niveau de compression du paquet %d" @@ -2675,109 +1985,116 @@ msgstr "impossible de résoudre le blob de config '%s'" msgid "failed to parse %s" msgstr "échec de l'analyse de %s" -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "lecture de la configuration de ligne de commande impossible" -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "erreur inconnue pendant la lecture des fichiers de configuration" -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "%s invalide : '%s'" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par " +"défaut" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et " "100" -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "impossible d'analyser '%s' depuis le configuration en ligne de commande" -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "nom de section invalide '%s'" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s a des valeurs multiples" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "impossible de verrouiller le fichier de configuration %s" -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "ouverture de %s" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "motif invalide : %s" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "fichier de configuration invalide %s" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "échec de fstat sur %s" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "impossible de réaliser un map de '%s'" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "échec de chmod sur %s" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "impossible d'écrire le fichier de configuration %s" -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossible de régler '%s' à '%s'" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossible de désinitialiser '%s'" -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "nom de section invalide : %s" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "valeur manquante pour '%s'" @@ -2901,7 +2218,7 @@ msgstr "impossible de rechercher %s (%s)" msgid "unknown port %s" msgstr "port inconnu %s" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "nom d'hôte étrange '%s' bloqué" @@ -2916,60 +2233,60 @@ msgstr "port étrange '%s' bloqué" msgid "cannot start proxy %s" msgstr "impossible de démarrer un proxy %s" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe " "d'URL valide" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "la variante ssh 'simple' ne supporte pas -4" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "la variante ssh 'simple' ne supporte pas -6" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "chemin étrange '%s' bloqué" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "fork impossible" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Vérification de la connectivité" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Impossible de lancer 'git rev-list'" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "impossible d'écrire dans la rev-list" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "impossible de fermer l'entrée standard du rev-list" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action illégal %d" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "Les CRLF seraient remplacés par des LF dans %s" -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2978,12 +2295,12 @@ msgstr "" "Les CRLF seront remplacés par des LF dans %s.\n" "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail" -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "Les LF seraient remplacés par des CRLF dans %s" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2992,19 +2309,19 @@ msgstr "" "Les LF seront remplacés par des CRLF dans %s.\n" "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail" -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" "Le fichier '%s' contient un marqueur d'ordre d'octets (BOM). Veuillez " -"utiliser UTF-%.*s comme encodage d'arbre de travail." +"utiliser UTF-%s comme encodage d'arbre de travail." #: convert.c:304 #, c-format @@ -3021,52 +2338,52 @@ msgstr "" "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre " "de travail." -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "échec de l'encodage de '%s' de %s vers %s" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "encoder '%s' depuis %s vers %s puis inversement ne produit pas le même " "contenu" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "impossible de forker pour lancer le filtre externe '%s'" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "impossible de fournir l'entrée au filtre externe '%s'" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "le filtre externe '%s' a échoué %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "la lecture depuis le filtre externe '%s' a échoué" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "le filtre externe '%s' a échoué" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "type de filtre inattendu" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "nom de chemin trop long pour un filtre externe" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3075,67 +2392,67 @@ msgstr "" "le filtre externe '%s' n'est plus disponible bien que tous les chemins " "n'aient pas été filtrés" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ne sont pas des encodages d'arbre de travail valides" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s : le filtre clean '%s' a échoué" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s : le filtre smudge '%s' a échoué" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "dans le futur" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "il y a %<PRIuMAX> seconde" msgstr[1] "il y a %<PRIuMAX> secondes" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "il y a %<PRIuMAX> minute" msgstr[1] "il y a %<PRIuMAX> minutes" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "il y a %<PRIuMAX> heure" msgstr[1] "il y a %<PRIuMAX> heures" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "il y a %<PRIuMAX> jour" msgstr[1] "il y a %<PRIuMAX> jours" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "il y a %<PRIuMAX> semaine" msgstr[1] "il y a %<PRIuMAX> semaines" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "il y a %<PRIuMAX> mois" msgstr[1] "il y a %<PRIuMAX> mois" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3143,14 +2460,14 @@ msgstr[0] "%<PRIuMAX> an" msgstr[1] "%<PRIuMAX> ans" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "il y a %s et %<PRIuMAX> mois" msgstr[1] "il y a %s et %<PRIuMAX> mois" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3188,7 +2505,7 @@ msgstr "Marquage de %d îlots, fait.\n" msgid "failed to read orderfile '%s'" msgstr "impossible de lire le fichier de commande '%s'" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Détection de renommage inexact en cours" @@ -3256,35 +2573,35 @@ msgstr "" "Erreurs dans la variable de configuration 'diff.dirstat' :\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S et --find-object sont mutuellement exclusifs" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow a besoin d'une spécification de chemin unique" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s attend une valeur numérique" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3293,42 +2610,42 @@ msgstr "" "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valeur inconnue après ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "impossible de résoudre '%s'" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "forme <n>/<m> attendue par %s" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "caractère attendu par %s, '%s' trouvé" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "mauvais argument --color-moved : %s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "mode invalide '%s' dans --color-moved-ws" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3336,155 +2653,155 @@ msgstr "" "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et " "\"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "argument invalide pour %s" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "mauvais argument pour --word-diff : %s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Options de format de sortie de diff" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "générer la rustine" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "supprimer la sortie des différences" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "générer les diffs avec <n> lignes de contexte" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "générer le diff en format brut" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "synonyme de '-p --raw'" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "synonyme de '-p --stat'" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "--stat pour traitement automatique" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "afficher seulement la dernière ligne de --stat" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "afficher la distribution des quantités de modifications relatives pour " "chaque sous-répertoire" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "synonyme pour --dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonyme pour --dirstat=files,param1,param2..." -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avertir si les modifications introduisent des marqueurs de conflit ou des " "erreurs d'espace" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "résumé succinct tel que les créations, les renommages et les modifications " "de mode" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "n'afficher que les noms de fichiers modifiés" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "n'afficher que les noms et les status des fichiers modifiés" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "générer un diffstat" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<largeur>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "générer un diffstat avec la largeur indiquée" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "génerer un diffstat avec la largeur de nom indiquée" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "génerer un diffstat avec la largeur de graphe indiquée" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<compte>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "générer un diffstat avec des lignes limitées" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "générer une résumé compact dans le diffstat" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "produire un diff binaire qui peut être appliqué" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "afficher les noms complets des objets pre- et post-image sur les lignes " "\"index\"" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "afficher un diff coloré" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "<sorte>" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3492,7 +2809,7 @@ msgstr "" "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', " "'nouveau' dans le diff" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3500,93 +2817,93 @@ msgstr "" "ne pas compresser les chemins et utiliser des NULs comme terminateurs de " "champs dans --raw ou --numstat" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<préfixe>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "n'afficher aucun préfixe, ni de source, ni de destination" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "afficher le contexte entre les sections à concurrence du nombre de ligne " "indiqué" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<caractère>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "" "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Options de renommage de diff" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "casser les modifications d'une réécrire complète en paires de suppression et " "création" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "détecter les renommages" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "supprimer la pré-image pour les suppressions" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "détecter les copies" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "" "utiliser les fichiers non-modifiés comme sources pour trouver des copies" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "désactiver la détection de renommage" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "utiliser des blobs vides comme source de renommage" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "continuer à afficher l'historique d'un fichier au delà des renommages" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3594,161 +2911,161 @@ msgstr "" "empêcher la détection de renommage/copie si le nombre de cibles de renommage/" "copie excède la limite indiquée" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Options de l'algorithme de diff" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "produire le diff le plus petit possible" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignorer les espaces lors de la comparaison de ligne" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignorer des modifications du nombre d'espaces" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignorer des modifications d'espace en fin de ligne" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignore le retour chariot en fin de ligne" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignorer les modifications dont les lignes sont vides" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "heuristique qui déplace les limites de sections de diff pour faciliter la " "lecture" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"patience\"" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" "générer un diff en utilisant l'algorithme de différence \"histogramme\"" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algorithme>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "choisir un algorithme de différence" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<texte>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\"" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<mode>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "afficher des différences par mot, en utilisant <mode> pour délimiter les " "mots modifiés" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<regex>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "utiliser <regex> pour décider ce qu'est un mot" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "les lignes déplacées sont colorées différemment" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "comment les espaces sont ignorés dans --color-moved" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "Autres options diff" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "lancé depuis un sous-répertoire, exclure les modifications en dehors et " "afficher les chemins relatifs" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "traiter les fichiers comme texte" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "échanger les entrées, inverser le diff" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "désactiver tous les affichages du programme" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "autoriser l'exécution d'un assistant externe de diff" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "lancer les filtres externes de conversion en texte lors de la comparaison de " "fichiers binaires" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<quand>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorer les modifications dans les sous-modules lors de la génération de diff" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<format>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "spécifier comment les différences dans les sous-modules sont affichées" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "masquer les entrées 'git add -N' de l'index" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "traiter les entrées 'git add -N' comme réelles dans l'index" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<chaîne>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3756,7 +3073,7 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la " "chaîne spécifiée" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3764,26 +3081,26 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de la regex " "spécifiée" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "" "afficher toutes les modifications dans l'ensemble de modifications avec -S " "ou -G" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "<id-objet>" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3791,35 +3108,35 @@ msgstr "" "rechercher les différences qui modifient le nombre d'occurrences de l'objet " "indiqué" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "sélectionner les fichiers par types de diff" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<fichier>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Sortie vers un fichier spécifié" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "détection de renommage inexact annulée à cause d'un trop grand nombre de " "fichiers." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "recherche uniquement des copies par modification de chemin à cause d'un trop " "grand nombre de fichiers." -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3827,62 +3144,41 @@ msgstr "" "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le " "commande." -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "le spécificateur de chemin '%s' ne correspond à aucun fichier connu de git" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "motif non reconnu : '%s'" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "motif négatif non reconnu : '%s'" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" -"votre fichier d'extraction partielle pourrait présenter des problèmes : le " -"motif '%s' est répété" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "désactivation de la correspondance de motif de cone" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossible d'utiliser %s comme fichier d'exclusion" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "impossible d'ouvrir le répertoire '%s'" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "echec de l'obtention d'information de kernel" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "Le cache non suivi est désactivé sur ce système ou sur cet endroit" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "fichier d'index corrompu dans le dépôt %s" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "impossible de créer les répertoires pour %s" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossible de migrer le répertoire git de '%s' vers '%s'" @@ -3903,12 +3199,12 @@ msgstr "Filtrage du contenu" msgid "could not stat file '%s'" msgstr "impossible de stat le fichier '%s'" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "Espaces de nom de Git \"%s\"" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossible de régler GIT_DIR à '%s'" @@ -3918,270 +3214,266 @@ msgstr "impossible de régler GIT_DIR à '%s'" msgid "too many args to run %s" msgstr "trop d'arguments pour lancer %s" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Dépôt distant sans URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack : liste superficielle attendue" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack : paquet de vidage attendu après une liste superficielle" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "impossible d'écrire sur un distant" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc nécessite multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "ligne de superficiel invalide : %s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "ligne de fin de superficiel invalide : %s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "objet non trouvé : %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "Erreur dans l'objet : %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "Pas de superficiel trouvé : %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "superficiel/non superficiel attendu, %s trouvé" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "réponse %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "commit invalide %s" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "abandon" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "fait" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "%s trouvé (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Marquage de %s comme terminé" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "%s déjà possédé (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "erreur de protocole : mauvais entête de paquet" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack : impossible de dupliquer %s" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "échec de %s" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "erreur dans le démultiplexer latéral" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "La version du serveur est %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "Le serveur supporte %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "Le serveur ne supporte les clients superficiels" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Le receveur ne gère pas --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Le receveur ne gère pas --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Le receveur ne gère pas --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "pas de commit commun" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack : échec de le récupération." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Le serveur ne supporte les requêtes superficielles" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "Le serveur supporte filter" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "impossible d'écrire la requête sur le distant" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "erreur à la lecture de l'entête de section '%s'" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' attendu, '%s' reçu" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "ligne d'acquittement inattendue : '%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "erreur lors du traitement des acquittements : %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "fichier paquet attendu à envoyer après 'ready'" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "aucune autre section attendue à envoyer après absence de 'ready'" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "erreur lors du traitement de l'information de superficialité : %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref attendu, '%s' trouvé" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inattendu : '%s'" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "erreur lors du traitement des références voulues : %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "pas de HEAD distante correspondante" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "référence distante inconnue %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg n'a pas pu signer les données" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "impossible de créer un fichier temporaire" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "impossible d'écrire la signature détachée dans '%s'" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "couleur invalide '%.*s' ignorée dans log.graphColors" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est " -"supporté qu'avec -P avec PCRE v2" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "'%s' : lecture de %s impossible" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "échec du stat de '%s'" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "'%s' : lecture tronquée" @@ -4232,7 +3524,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Commandes bas niveau / Interrogateurs" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "Commandes bas niveau / Synchronisation de dépôts" #: help.c:38 @@ -4328,12 +3620,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4401,64 +3693,48 @@ msgstr "nom d'identifiant vide (pour <%s>) non permis" msgid "name consists only of disallowed characters: %s" msgstr "le nom n'est constitué que de caractères interdits : %s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "format de date invalide : %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" "l'entrée '%s' dans l'arbre %s a un mode d'arbre, mais n'est pas un arbre" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" "l'entrée '%s' dans l'arbre %s a un mode de blob, mais n'est pas un blob" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "impossible de charger l'arbre racine pour le commit %s" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "impossible d'accéder au blob clairsemé dans '%s'" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "impossible de combiner des spécificateurs multiples de filtre" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "attendu : 'tree:<profondeur>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "sparse : le support des filtres de chemin a été abandonné" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "spécificateur de filtre invalide '%s'" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "" -"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "quelque chose attendu après combine :" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "impossible de combiner des spécificateurs multiples de filtre" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "impossible de modifier le prometteur distant de clone partiel" #: lockfile.c:151 #, c-format @@ -4488,113 +3764,117 @@ msgstr "Impossible de créer '%s.lock' : %s" msgid "failed to read the cache" msgstr "impossible de lire le cache" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "impossible d'écrire le nouveau fichier d'index" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(mauvais commit)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "échec de addinfo_cache pour le chemin '%s' ; abandon de la fusion." -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "erreur de construction des arbres" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "impossible de créer le chemin '%s' %s" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Suppression de %s pour faire de la place pour le sous-répertoire\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": peut-être un conflit D/F ?" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "refus de perdre le fichier non suivi '%s'" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "impossible de lire l'objet %s '%s'" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "blob attendu pour %s '%s'" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "échec à l'ouverture de '%s' : %s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "échec à la création du lien symbolique '%s' : %s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ne sait pas traiter %06o %s '%s'" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Échec de la fusion du sous-module %s (non extrait)" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Échec de fusion du sous-module %s (commits non présents)" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Échec de la fusion du sous-module %s (les commits ne descendent pas de la " "base de fusion)" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Avance rapide du sous-module %s au commit suivant :" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Avance rapide du sous-module %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Échec de fusion du sous-module %s (fusion suivant les commits non trouvée)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Échec de fusion du sous-module %s (pas en avance rapide)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Résolution possible de fusion trouvée pour le sous-module :\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4611,33 +3891,33 @@ msgstr "" "\n" "qui acceptera cette suggestion.\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Échec de fusion du sous-module %s (plusieurs fusions trouvées)" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Échec à l'exécution de la fusion interne" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "Impossible d'ajouter %s à la base de données" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Fusion automatique de %s" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Erreur : refus de perdre le fichier non suivi %s ; écriture dans %s à la " "place." -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4646,7 +3926,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre." -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4655,7 +3935,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre." -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4664,7 +3944,7 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de " "%s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4673,41 +3953,41 @@ msgstr "" "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version " "%s de %s laissée dans l'arbre dans le fichier %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "renommage" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "renommé" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Refus de perdre le fichier modifié %s" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Refus de perdre le fichier non suivi %s, même s'il gêne." -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s est un répertoire dans %s ajouté plutôt comme %s" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Refus de perdre le fichier non suivi %s ; ajout comme %s à la place" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4716,18 +3996,18 @@ msgstr "" "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche " "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (laissé non résolu)" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-" ">'%s' dans %s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4738,7 +4018,7 @@ msgstr "" "parce que le répertoire %s a été renommé en plusieurs autres répertoires, " "sans aucune destination récupérant la majorité des fichiers." -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4747,7 +4027,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne " "des renommages implicites de répertoire déplaçant les chemins suivants : %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4756,7 +4036,7 @@ msgstr "" "CONFLIT (renommage implicite de répertoire) : impossible de transformer " "plusieurs chemins sur %s ; les chemins concernés sont : %s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4765,7 +4045,7 @@ msgstr "" "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. " "Renommage de répertoire %s->%s dans %s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4774,52 +4054,52 @@ msgstr "" "AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été " "renommé." -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "impossible de lire l'objet %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "l'objet %s n'est pas un blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "modification" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "modifié" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "contenu" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "ajout/ajout" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s sauté (fusion identique à l'existant)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "sous-module" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLIT (%s) : Conflit de fusion dans %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Ajout plutôt comme %s" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4828,7 +4108,7 @@ msgstr "" "Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé " "en %s ; déplacé dans %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4838,7 +4118,7 @@ msgstr "" "a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé " "vers %s." -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4847,7 +4127,7 @@ msgstr "" "Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été " "renommé en %s ; déplacé dans %s." -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4857,184 +4137,176 @@ msgstr "" "répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être " "être déplacé vers %s." -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Suppression de %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "fichier/répertoire" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "répertoire/fichier" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s" -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Ajout de %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Vos modifications locales aux fichiers suivants seraient écrasées par la " +"fusion :\n" +" %s" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "Déjà à jour !" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "échec de fusion des arbres %s et %s" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Fusion :" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u ancêtre commun trouvé :" msgstr[1] "%u ancêtres communs trouvés :" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "la fusion n'a pas retourné de commit" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Vos modifications locales aux fichiers suivants seraient écrasées par la " -"fusion :\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Impossible d'écrire l'index." -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "le fichier d'index multi-paquet %s est trop petit" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature " "0x%08x" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "la version d'index multi-paquet %d n'est pas reconnue" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "la version %u du condensé ne correspond pas" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "décalage de section invalide (trop grand)" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" "identifiant de terminaison de tronçon d'index multi-paquet terminant " "apparaît plus tôt qu'attendu" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "index multi-paquet manque de tronçon de nom de paquet" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "index multi-paquet manque de tronçon de d'étalement OID requis" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "index multi-paquet manque de tronçon de recherche OID" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "index multi-paquet manque de tronçon de décalage d'objet" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mauvais pack-int-id : %u (%u paquets au total)" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "échec de l'ajout du fichier paquet '%s'" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "échec à l'ouverture du fichier paquet '%s'" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "échec de localisation de l'objet %d dans le fichier paquet" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Ajout de fichiers paquet à un index multi-paquet" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "fichier paquet à éliminer %s non trouvé" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "Écriture des sections dans l'index multi-paquet" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "échec du nettoyage de l'index de multi-paquet à %s" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Recherche de fichiers paquets référencés" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -5042,65 +4314,57 @@ msgstr "" "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = " "étalement[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "Vérification de l'ordre des OID dans l'index multi-paquet" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" +msgstr "Vérification de l'ordre des OID dans MIDX" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Classement des objets par fichier paquet" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Vérification des décalages des objets" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "impossible de lire le fichier paquet %s" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Comptage des objets référencés" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Recherche et effacement des fichiers paquets non-référencés" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "Impossible de démarrer le groupement d'objets" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "Impossible de finir le groupement d'objets" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossible de créer le fil lazy_dir : %s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossible de créer le fil lazy_name : %s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossible de joindre le fil lazy_name : %s" @@ -5144,32 +4408,32 @@ msgstr "Refus de réécrire des notes dans %s (hors de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Mauvaise valeur de %s : '%s'" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "type d'objet invalide \"%s\"" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'objet %s est de type %s, pas de type %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "l'objet %s a un id de type inconnu %d" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "impossible d'analyser l'objet : %s" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "incohérence de hachage %s" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "offset avant la fin du fichier paquet (.idx cassé ?)" @@ -5184,11 +4448,6 @@ msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "impossible de récupérer la taille de %s" - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -5204,7 +4463,7 @@ msgstr "%s est incompatible avec %s" msgid "%s : incompatible with something else" msgstr "%s est incompatible avec toute autre option" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s n'accepte aucune valeur" @@ -5214,41 +4473,41 @@ msgstr "%s n'accepte aucune valeur" msgid "%s isn't available" msgstr "%s n'est pas disponible" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s attend une valeur entière non négative avec une suffixe k/m/g" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "option ambigüe : %s (devrait être --%s%s ou --%s%s)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" +msgid "did you mean `--%s` (with two dashes ?)" msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "option inconnue « %s »" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "bascule inconnue « %c »" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "option non-ascii inconnue dans la chaîne : '%s'" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "usage : %s" @@ -5256,21 +4515,21 @@ msgstr "usage : %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " ou : %s" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "alias pour --%s" @@ -5295,37 +4554,37 @@ msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\"" msgid "malformed object name '%s'" msgstr "nom d'objet malformé '%s'" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Impossible de rendre %s inscriptible pour le groupe" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Le caractère d'échappement '\\\\' interdit comme dernier caractère dans une " "valeur d'attribut" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Une seule spécification 'attr:' est autorisée." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "un spécificateur d'attribut ne peut pas être vide" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "nom d'attribut invalide %s" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "les réglages de spécificateurs de chemin généraux 'glob' et 'noglob' sont " "incompatibles" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5333,57 +4592,52 @@ msgstr "" "le réglage global de spécificateur de chemin 'literal' est incompatible avec " "tous les autres réglages globaux de spécificateur de chemin" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' manquante à la fin du spécificateur magique de chemin dans '%s'" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Spécificateur magique '%c' non implémenté dans '%s'" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s : 'literal' et 'glob' sont incompatibles" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s : '%s' est hors du dépôt à '%s'" +msgid "%s: '%s' is outside repository" +msgstr "%s : '%s' est hors du dépôt" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (mnémonique : '%c')" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s : le spécificateur magique de chemin n'est pas supporté par cette " "commande : %s" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "le chemin '%s' est au-delà d'un lien symbolique" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "la ligne est mal citée : %s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "impossible d'écrire le paquet de vidage" @@ -5446,42 +4700,33 @@ msgstr "Rafraîchissement de l'index" msgid "unable to create threaded lstat: %s" msgstr "impossible de créer le lstat en fil : %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "impossible d'analyser le format --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Dépôt distant sans URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "un nom de prometteur distant ne peut pas commencer par '/' : %s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "impossible de démarrer `log`" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "impossible de lire la sortie de `log`" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "impossible d'analyser le commit '%s'" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossible d'analyser l'entête git '%.*s'" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "échec de la génération de diff" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" @@ -5522,16 +4767,16 @@ msgstr "impossible d'ajouter '%s' à l'index" msgid "unable to stat '%s'" msgstr "fstat de '%s' impossible" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' existe à la fois comme un fichier et un répertoire" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Rafraîchir l'index" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5540,7 +4785,7 @@ msgstr "" "version d'index renseignée, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5549,161 +4794,150 @@ msgstr "" "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n" "Utilisation de la version %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "signature incorrecte 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "mauvaise version d'index %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "mauvaise signature sha1 d'index" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'index utilise l'extension %.4s qui n'est pas comprise" -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "extension %.4s ignorée" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "format d'entrée d'index inconnu 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "champ de nom malformé dans l'index, près du chemin '%s'" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "entrées de préparation non ordonnées dans l'index" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "entrées multiples de préparation pour le fichier fusionné '%s'" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "entrées de préparation non ordonnées pour '%s'" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "fichier d'index corrompu" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossible de créer le fil load_cache_entries : %s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossible de joindre le fil load_cach_entries : %s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s : l'ouverture du fichier d'index a échoué" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s : impossible de faire un stat sur l'index ouvert" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s : fichier d'index plus petit qu'attendu" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s : impossible de mapper le fichier d'index" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossible de créer le fil load_index_extensions : %s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossible de joindre le fil load_index_extensions : %s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossible de rafraîchir l'index partagé '%s'" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index cassé, %s attendu dans %s, %s obtenu" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "impossible de fermer '%s'" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "stat impossible de '%s'" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "impossible d'ouvrir le répertoire git : %s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "échec lors de l'unlink : %s" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossible de régler les bits de droit de '%s'" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir à l'étape 0" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git " -"rebase --continue'.\n" -"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré." -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5745,14 +4979,14 @@ msgstr "" "\n" "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebasage de %s sur %s (%d commande)" msgstr[1] "Rebasage de %s sur %s (%d commandes)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5761,7 +4995,7 @@ msgstr "" "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un " "commit.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5769,7 +5003,7 @@ msgstr "" "\n" "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5784,7 +5018,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5794,19 +5028,22 @@ msgstr "" "Cependant, si vous effacez tout, le rebasage sera annulé.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Veuillez noter que les commits vides sont en commentaire" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "impossible d'écrire '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "impossible d'écrire '%s'." +msgid "could not copy '%s' to '%s'." +msgstr "impossible de copier '%s' vers '%s'." -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5815,7 +5052,7 @@ msgstr "" "Attention : certains commits ont pu être accidentellement supprimés.\n" "Commits supprimés (du plus jeune au plus vieux) :\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5833,13 +5070,6 @@ msgstr "" "Les comportements disponibles sont : ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "impossible de lire '%s'." - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5850,7 +5080,7 @@ msgstr "%s ne pointe pas sur un objet valide!" msgid "ignoring dangling symref %s" msgstr "symref pendant %s ignoré" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "réf cassé %s ignoré" @@ -5875,15 +5105,14 @@ msgstr "la référence '%s' existe déjà" msgid "unexpected object ID when writing '%s'" msgstr "id d'objet inattendu pendant l'écriture de '%s'" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "impossible d'écrire dans '%s'" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "impossible d'ouvrir '%s' en écriture" @@ -5918,37 +5147,37 @@ msgstr "refus de mettre à jour une réf avec un nom cassé '%s'" msgid "update_ref failed for ref '%s': %s" msgstr "échec de update_ref pour la réf '%s' : %s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mises à jour multiples pour la réf '%s' non permises" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "mises à jour des références interdites en environnement de quarantaine" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe ; impossible de créer '%s'" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossible de traiter '%s' et '%s' en même temps" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "impossible de supprimer la référence %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "Impossible de supprimer la référence %s : %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "impossible de supprimer les références : %s" @@ -5959,7 +5188,7 @@ msgid "invalid refspec '%s'" msgstr "spécificateur de réference invalide : '%s'" # à priori on parle d'une branche ici -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "disparue" @@ -5978,283 +5207,283 @@ msgstr "en retard de %d" msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "couleur non reconnue : %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valeur entière attendue refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argument %%(%s) non reconnu : %s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) n'accepte pas d'argument" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argument %%(objectsize) non reconnu : %s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) n'accepte pas d'argument" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) n'accepte pas d'argument" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) n'accepte pas d'argument" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argument %%(trailers) inconnu : %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argument %%(contents) non reconnu : %s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valeur positive attendue objectname:short=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argument %%(objectname) non reconnu : %s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "position non reconnue : %s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argument %%(align) non reconnu : %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "valeur positive attendue avec l'atome %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argument %%(if) non reconnu : %s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "nom de champ malformé %.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "nom de champ inconnu : %.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format : atome %%(if) utilisé sans un atome %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format : atome %%(then) utilisé sans un atome %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format : atome %%(then) utilisé plus d'une fois" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atome %%(then) utilisé après %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format : atome %%(else) utilisé sans un atome %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format : atome %%(else) utilisé plus d'une fois" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format : atome %%(end) utilisé sans atome correspondant" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "Chaîne de formatage mal formée %s" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "aucune branche, rebasage de %s" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "aucune branche, rebasage de la HEAD détachée %s" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "aucune branche, bisect a démarré sur %s" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "aucune branche" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "objet manquant %s pour %s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "échec de parse_object_buffer sur %s pour %s" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "objet malformé à '%s'" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "réf avec un nom cassé %s ignoré" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atome %%(end) manquant" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'option « %s » est incompatible avec --merged" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'option « %s » est incompatible avec --no-merged" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "nom d'objet malformé %s" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "l'option '%s' doit pointer sur un commit" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "un raccourci de configuration de distant ne peut pas commencer par '/' : %s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "plus d'un receivepack fournis, utilisation du premier" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "plus d'un uploadpack fournis, utilisation du premier" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossible de récupérer à la fois %s et %s pour %s" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s suit habituellement %s, pas %s" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s suit à la fois %s et %s" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la clé '%s' du modèle n'a pas de '*'" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "la valeur '%s' du modèle n'a pas de '*'" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "" "le spécificateur de référence source %s ne correspond à aucune référence" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -6264,7 +5493,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6288,7 +5517,7 @@ msgstr "" "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence " "totalement qualifiée." -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6299,7 +5528,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle branche en poussant sur\n" "'%s:refs/heads/%s' ?" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6310,7 +5539,7 @@ msgstr "" "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6321,7 +5550,7 @@ msgstr "" "Souhaitiez-vous créer un nouvel arbre en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6332,119 +5561,119 @@ msgstr "" "Souhaitiez-vous créer un nouveau blob en poussant sur\n" "'%s:refs/tags/%s' ?" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "'%s' ne peut pas être résolue comme une branche" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "suppression d '%s' impossible : la référence distante n'existe pas" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "le spécificateur de référence dst %s correspond à plus d'un spécificateur de " "références" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD ne pointe pas sur une branche" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "pas de branche '%s'" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "aucune branche amont configurée pour la branche '%s'" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de " "branche locale de suivi" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branche '%s' n'a aucune branche distante de poussée" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les références de spec pour '%s' n'incluent pas '%s'" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "impossible de résoudre une poussée 'simple' pour une destination unique" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "impossible de trouver la référence distante %s" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Référence bizarre '%s' ignorée localement" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Votre branche est à jour avec '%s'.\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Votre branche et '%s' font référence à des commits différents.\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (utilisez \"%s\" pour plus de détails)\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n" msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6456,11 +5685,11 @@ msgstr[1] "" "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour " "en avance rapide.\n" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6475,12 +5704,12 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossible d'analyser le nom attendu d'objet '%s'" @@ -6495,7 +5724,7 @@ msgstr "mauvaise références de remplacement : %s" msgid "duplicate replace ref: %s" msgstr "référence de remplacement dupliquée : %s" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "profondeur de remplacement trop grande pour l'objet %s" @@ -6558,8 +5787,8 @@ msgstr "impossible de délier '%s' qui est errant" msgid "Recorded preimage for '%s'" msgstr "Pré-image enregistrée pour '%s'" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "impossible de créer le répertoire '%s'" @@ -6593,20 +5822,20 @@ msgstr "Résolution pour '%s' oubliée\n" msgid "unable to open rr-cache directory" msgstr "impossible d'ouvrir le répertoire rr-cache" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "votre branche actuelle '%s' ne contient encore aucun commit" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent est incompatible avec --bisect" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L ne supporte pas encore les formats de diff autres que -p et -s" @@ -6629,31 +5858,31 @@ msgstr "" "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook " "false`." -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage " "distant" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossible d'analyser l'état de dépaquetage distant : %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "le dépaquetage a échoué : %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "impossible de signer le certificat de poussée" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "Le receveur ne gère pas les poussées avec --signed" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6661,47 +5890,47 @@ msgstr "" "pas d'envoi de certificat de poussée car le receveur ne gère pas les " "poussées avec --signed" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "Le receveur ne gère pas les poussées avec --atomic" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "Le receveur ne gère pas les options de poussées" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de nettoyage invalide de message de validation '%s'" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "Impossible de supprimer '%s'" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "impossible de supprimer '%s'" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "revert" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:329 -msgid "rebase" -msgstr "rebase" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "rebase -i" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "action inconnue : %d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6709,7 +5938,7 @@ msgstr "" "après résolution des conflits, marquez les chemins corrigés\n" "avec 'git add <chemins>' ou 'git rm <chemins>'" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6719,110 +5948,115 @@ msgstr "" "avec 'git add <chemins>' ou 'git rm <chemins>'\n" "puis validez le résultat avec 'git commit'" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "impossible de verrouiller '%s'" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "impossible d'écrire la fin de ligne dans '%s'" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "échec lors de la finalisation de '%s'" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "impossible de lire '%s'" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "vos modifications locales seraient écrasées par %s." -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "validez vos modifications ou les remiser pour continuer." -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s : avance rapide" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de nettoyage invalide %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Impossible d'écrire le nouveau fichier index" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "impossible de mettre à jour l'arbre de cache" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "impossible de résoudre le commit HEAD" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "aucune clé présente dans '%.*s'" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "Impossible de décoter la valeur de '%s'" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "impossible d'ouvrir '%s' en lecture" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' déjà fourni" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' déjà fourni" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' déjà fourni" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "variable inconnue '%s'" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' manquant" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' manquant" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' manquant" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "format de date invalide '%s' dans '%s'" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6851,11 +6085,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "écriture du commit racine" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "échec du crochet 'prepare-commit-msg'" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6884,7 +6122,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6910,325 +6148,326 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "impossible de retrouver le commit nouvellement créé" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "impossible d'analyser le commit nouvellement créé" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "impossible de résoudre HEAD après création du commit" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "HEAD détachée" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (commit racine)" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s n'est pas un commit !" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "impossible d'analyser le commit HEAD" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "impossible d'analyser l'auteur du commit" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree a échoué à écrire un arbre" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "échec de l'écriture de l'objet commit" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "impossible d'analyser le commit %s" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "impossible d'analyser le commit parent %s" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "commande inconnue : %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Ceci est la combinaison de %d commits." -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "une HEAD est nécessaire à la correction" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "Impossible de lire HEAD" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "impossible de lire le message de validation de HEAD" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "impossible d'écrire '%s'" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Ceci est le premier message de validation :" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "impossible de lire le message de validation de %s" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Ceci est le message de validation numéro %d :" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Le message de validation %d sera ignoré :" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "votre fichier d'index n'est pas fusionné." -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "impossible de réparer le commit racine" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée." -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "le commit %s n'a pas de parent %d" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "impossible d'obtenir un message de validation pour %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s : impossible d'analyser le commit parent %s" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossible de renommer '%s' en '%s'" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "impossible d'annuler %s... %s" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "impossible d'appliquer %s... %s" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s : échec à la lecture de l'index" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "argument manquant pour %s" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "impossible d'analyser '%s'" +msgid "could not parse '%.*s'" +msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "ligne %d invalide : %.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "'%s' impossible avec le commit précédent" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "impossible de lire '%s'." + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "annulation d'un picorage en cours" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "annulation d'un retour en cours" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'." -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "feuille d'instruction inutilisable : '%s'" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "aucun commit analysé." -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "impossible de picorer pendant l'annulation d'un commit." -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "impossible d'annuler un commit pendant un picorage." -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "valeur invalide pour %s : %s" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "\"écrase-sur\" inutilisable" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "feuille d'options malformée : %s" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "l'ensemble de commits spécifié est vide" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "un retour est déjà en cours" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "essayez \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "un picorage est déjà en cours" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossible de créer le répertoire de séquenceur '%s'" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "impossible de verrouiller HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "aucun picorage ou retour en cours" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "impossible de résoudre HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "impossible d'abandonner depuis une branche non encore créée" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "impossible d'ouvrir '%s'" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "impossible de lire '%s' : %s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "fin de fichier inattendue" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !" -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "Pas de retour en cours ?" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "aucun picorage en cours" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "échec du saut de commit" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "il n'y a rien à sauter" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7237,21 +6476,21 @@ msgstr "" "Avez-vous déjà validé ?\n" "essayez \"git %s -continue\"" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "impossible de mettre à jour %s" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "impossible de lire HEAD" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7270,22 +6509,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "impossible d'appliquer %s... %.*s" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Impossible de fusionner %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossible de copier '%s' vers '%s'" -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "impossible de lire l'index" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7300,11 +6544,11 @@ msgstr "" "git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "et a mis à jour l'index ou l'arbre de travail\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7321,73 +6565,77 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "nom de label illégal '%.*s'" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "écriture d'un commit racine bidon" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "écriture de 'écraser-sur'" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "impossible de trouver l'arbre de %s" -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "impossible d'écrire l'index" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "impossible de résoudre '%s'" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "impossible de fusionner avec une révision courante" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "impossible d'analyser '%.*s'" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "rien à fusionner : '%.*s'" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "impossible de lire le message de validation de '%s'" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "impossible de seulement essayer de fusionner '%.*s'" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "fusion : Impossible d'écrire le nouveau fichier index" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Autoremisage appliqué.\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "impossible de stocker %s" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7398,26 +6646,31 @@ msgstr "" "Vos modifications sont à l'abri dans la remise.\n" "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "extraction de %s impossible" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s n'est pas un OID valide" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "arrêt à HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Arrêté à %s\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7438,48 +6691,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "arrêt à %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "commande inconnue %d" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "impossible de lire orig-head" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "impossible de lire 'onto'" -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "impossible de mettre à jour HEAD sur %s" -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "impossible de rebaser : vous avez des modifications non indexées." -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "impossible de corriger un commit non-existant" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "fichier invalide : '%s'" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "contenu invalide : '%s'" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7489,59 +6742,69 @@ msgstr "" "Vous avez des modifications non validées dans votre copie de travail.\n" "Veuillez les valider d'abord, puis relancer 'git rebase --continue'." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "impossible d'écrire le fichier : '%s'" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossible de supprimer CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "impossible de valider les modifications indexées." -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s : impossible de picorer un %s" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s : mauvaise révision" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "impossible d'annuler en tant que commit initial" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script : options non gérées" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script : erreur lors de la préparation des révisions" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git " +"rebase --continue'.\n" +"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "rien à faire" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "impossible d'éviter les commandes de picorage non nécessaires" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "le script a déjà été réarrangé." -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s' est hors du dépôt à '%s'" +msgid "'%s' is outside repository" +msgstr "'%s' est hors du dépôt" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7551,7 +6814,7 @@ msgstr "" "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui " "n'existent pas localement." -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7562,14 +6825,14 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'option '%s' doit être présente avant les arguments qui ne sont pas des " "options" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7580,94 +6843,94 @@ msgstr "" "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n" "'git <commande> [<révision>...] -- [<chemin>...]'" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" "impossible de mettre en place le répertoire de travail en utilisant une " "configuration invalide" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "Cette opération doit être effectuée dans un arbre de travail" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Version attendue du dépôt git <= %d, %d trouvée" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "extensions de dépôt inconnues trouvées :" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "erreur à l'ouverture de '%s'" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "trop gros pour être une fichier .git : '%s'" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "erreur à la lecture de %s" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "format de fichier git invalide : %s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "aucun chemin dans le fichier git : %s" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "ce n'est pas un dépôt git : %s" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' trop gros" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "ce n'est pas un dépôt git : '%s'" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "impossible de revenir au répertoire de travail courant" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "échec du stat de '%*s%s%s'" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Impossible d'accéder au répertoire de travail courant" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "impossible de modifier en '%s'" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "ni ceci ni aucun de ses répertoires parents n'est un dépôt git : %s" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7678,7 +6941,7 @@ msgstr "" "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "n'est pas défini)." -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7688,286 +6951,286 @@ msgstr "" "Le propriétaire des fichiers doit toujours avoir les droits en lecture et " "écriture." -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "échec de l'ouverture ou au dup de /dev/null" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "échec de la bifurcation" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "échec du setsid" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossible de normaliser le chemin d'objet alternatif : %s" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossible de normaliser le répertoire d'objet : %s" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "lecture du fichier d'alternatives impossible" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "impossible de déplacer le nouveau fichier d'alternative" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "le chemin '%s' n'existe pas" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "extraire le dépôt de référence '%s' comme une extraction liée n'est pas " "encore supporté." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "le dépôt de référence '%s' n'est pas un dépôt local." -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "le dépôt de référence '%s' est superficiel" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "le dépôt de référence '%s' est greffé" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "ligne invalide pendant l'analyse des refs alternatives : %s" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "échec de mmap" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "le fichier objet %s est vide" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "objet libre corrompu '%s'" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "type d'objet invalide" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "impossible de dépaqueter l'entête %s" -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type" -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "impossible de lire l'objet %s" -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'objet libre %s (stocké dans %s) est corrompu" -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "impossible d'écrire le fichier %s" -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "erreur d'écriture d'un fichier" -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "droits insuffisants pour ajouter un objet à la base de données %s du dépôt" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "impossible de créer un fichier temporaire" -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "impossible d'écrire le fichier d'objet esseulé" -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossible de compresser le nouvel objet %s (%d)" -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "échec de deflateEnd sur l'objet %s (%d)" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "données de source d'objet instable pour %s" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "échec de utime() sur %s" -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "commit corrompu" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "étiquette corrompue" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "erreur de lecture à l'indexation de %s" -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "lecture tronquée pendant l'indexation de %s" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s : échec de l'insertion dans la base de données" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s : type de fichier non supporté" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s n'est pas un objet valide" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s n'est pas un objet '%s' valide" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossible d'ouvrir %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "incohérence de hachage pour %s (%s attendu)" -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "impossible de mmap %s" -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "impossible de dépaqueter l'entête de %s" -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "impossible d'analyser l'entête de %s" -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "impossible de dépaqueter le contenu de %s" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "le SHA1 court %s est ambigu" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Les candidats sont :" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7991,112 +7254,44 @@ msgstr "" "message\n" "en lançant \"git config advice.objectNameWarning false\"" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "le journal de '%.*s' ne remonte qu'à %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "le journal de '%.*s' n'a que %d entrées" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"le chemin '%s' existe, mais pas '%s'\n" -"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s'" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "le chemin '%s' n'existe pas dnas '%.*s'" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"le chemin '%s' est dans l'index, mais pas à l'étape %d\n" -"conseil : vous vouliez peut-être dire ':%d:%s' ?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"le chemin '%s' est dans l'index, mais pas '%s'\n" -"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s'" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "" -"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de " -"travail" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "nom d'objet invalide : '%.*s'." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u Gio" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u Gio/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u Mio" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u Mio/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u Kio" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u Kio/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8104,18 +7299,13 @@ msgstr[0] "%u octet" msgstr[1] "%u octets" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u octet/s" msgstr[1] "%u octets/s" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "impossible d'éditer '%s'" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -8147,129 +7337,51 @@ msgstr "dans le sous-module '%s' non populé" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Le chemin '%s' est dans le sous-module '%.*s'" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "mauvais argument --ignore-submodules : %s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un " -"sous-module du même nom. Ignoré." - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n " -"1' dans le sous-module %s" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "le processus pour le sous-module '%s' a échoué" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Échec de résolution de HEAD comme référence valide." -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "Poussée du sous-module '%s'\n" - -#: submodule.c:1161 -#, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "Impossible de pousser le sous-module '%s'\n" - -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "Récupération du sous-module %s%s\n" - -#: submodule.c:1483 +#: submodule.c:1481 #, c-format -msgid "Could not access submodule '%s'\n" -msgstr "Impossible d'accéder au sous-module '%s'\n" +msgid "Could not access submodule '%s'" +msgstr "Impossible d'accéder au sous-module '%s'" -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Erreurs pendant la récupération du sous-module :\n" -"%s" - -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' n'est pas reconnu comme dépôt git" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "'git status --porcelain=2' a échoué dans le sous-module %s" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossible de démarrer 'git status' dans le sous-module '%s'" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossible de lancer 'git status' dans le sous-module '%s'" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "récursion impossible dans le sous-module '%s'" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "impossible de réinitialiser l'index du sous-module" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "le sous-module '%s' a un index sale" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "le sous-module '%s' n'a pas pu être mis à jour." -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "" -"le répertoire git du sous-module '%s' est à l'intérieur du répertoire git " -"'%.*s'" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8277,17 +7389,12 @@ msgstr "" "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail " "n'est pas supporté" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossible de trouve le nom pour le sous-module '%s'" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "refus de déplacer '%s' dans une répertoire git existant" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8298,37 +7405,42 @@ msgstr "" "'%s' sur\n" "'%s'\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "récursion impossible dans le sous-module '%s'" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "impossible de démarrer ls-files dans .." -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree a renvoyé un code de retour inattendu %d" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "nom de sous-module suspicieux %s ignoré" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "'%s' ignoré et qui peut être interprété comme une option de ligne de " "commande : %s" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "Valeur invalide pour %s" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossible de mettre à jour l'élément %s de .gitmodules" @@ -8344,7 +7456,7 @@ msgstr "échec de la commande trailer '%s'" msgid "unknown value '%s' for key '%s'" msgstr "valeur inconnue '%s' pour la clé '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "plus d'un %s" @@ -8363,7 +7475,7 @@ msgstr "impossible de lire le fichier d'entrée '%s'" msgid "could not read from stdin" msgstr "Impossible de lire depuis l'entrée standard" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "stat impossible de %s" @@ -8392,47 +7504,47 @@ msgstr "impossible de renommer un fichier temporaire en %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "impossible de lire la liasse '%s'" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport : option de profondeur invalide '%s'" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "voir protocol.version dans 'git help config' pour plus d'information" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "les options de serveur exigent une version 2 ou supérieure" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "impossible d'analyser la configuration transport.color.*" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "le support du protocole v2 n'est pas encore implanté" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "valeur inconnue pour la config '%s' : %s" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "transport '%s' non permis" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync n'est plus supporté" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8441,7 +7553,7 @@ msgstr "" "Les chemins suivants de sous-module contiennent des modifications\n" "qui ne peuvent être trouvées sur aucun distant :\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8468,33 +7580,33 @@ msgstr "" "pour les pousser vers un serveur distant.\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "Abandon." -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "option non supportée par le protocole" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "échec de l'écriture totale sur l'assistant distant" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Impossible de trouver un assistant distant pour '%s'" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "" "impossible de dupliquer le descripteur de flux de sortie de l'assistant" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8503,108 +7615,103 @@ msgstr "" "capacité obligatoire inconnue %s ; cet assistant distant requiert " "probablement une une nouvelle version de Git" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "cet assistant distant devrait supporter la capacité refspec" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s a dit de manière inattendue : '%s'" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s a aussi verrouillé %s" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "impossible de lancer fast-import" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "erreur au lancement de fast-import" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "impossible de lire la réf %s" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "réponse inconnue à connect : %s" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "" "la spécification du chemin de service distant n'est pas supportée par le " "protocole" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "chemin de service distant invalide" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "impossible de se connecter au sous-service %s" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "ok/error attendu, l'assistant a dit '%s'" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'assistant a renvoyé un statut de retour inattendu %s" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "l'assistant %s ne gère pas dry-run" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "l'assistant %s ne gère pas --signed" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'assistant %s ne gère pas --signed=if-asked" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "l'assistant %s ne gère pas --atomic" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'assistant %s ne gère pas 'push-option'" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'assistant %s ne gère pas push ; un spécificateur de référence est " "nécessaire" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "l'assistant %s ne gère pas 'force'" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "impossible de lancer fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "erreur au lancement de fast-export" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8613,67 +7720,67 @@ msgstr "" "Aucune référence en commun et aucune spécfiée ; rien à faire.\n" "Vous devriez peut-être spécifier une branche telle que 'master'.\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "réponse malformée dans le liste de réfs : %s" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "échec de read(%s)" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "échec de write(%s)" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "échec du fil d'exécution %s" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "échec de jonction du fil d'exécution %s : %s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "échec du processus %s pour l'attente" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "échec du processus %s" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "impossible de démarrer le fil d'exécution pour copier les données" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "objet arbre trop court" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "mode invalide dans l'entrée d'arbre" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nom de fichier vide dans une entrée de l'arbre" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "fichier arbre trop court" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8684,7 +7791,7 @@ msgstr "" "%%sVeuillez valider ou remiser vos modifications avant de basculer de " "branche." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8694,7 +7801,7 @@ msgstr "" "l'extraction :\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8704,7 +7811,7 @@ msgstr "" "fusion :\n" "%%sVeuillez valider ou remiser vos modifications avant la fusion." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8714,7 +7821,7 @@ msgstr "" "fusion :\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8723,7 +7830,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%sVeuillez valider ou remiser vos modifications avant %s." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8732,7 +7839,7 @@ msgstr "" "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8742,7 +7849,7 @@ msgstr "" "contenus :\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8752,7 +7859,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8761,7 +7868,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par l'extraction :\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8771,7 +7878,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8780,7 +7887,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par la fusion :\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8790,7 +7897,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8799,7 +7906,7 @@ msgstr "" "Les fichiers suivants non suivis seraient effacés par %s :\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8810,7 +7917,7 @@ msgstr "" "l'extraction :\n" "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8820,7 +7927,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8830,7 +7937,7 @@ msgstr "" "la fusion :\n" "%%sVeuillez renommer ou effacer ces fichiers avant la fusion." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8839,7 +7946,7 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par la fusion :\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8849,7 +7956,7 @@ msgstr "" "%s :\n" "%%sVeuillez renommer ou effacer ces fichiers avant %s." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8858,12 +7965,12 @@ msgstr "" "Les fichiers suivants non suivis seraient écrasés par %s :\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8873,7 +7980,7 @@ msgstr "" "pas à jour :\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8884,7 +7991,7 @@ msgstr "" "jour par l'extraction creuse :\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8895,7 +8002,7 @@ msgstr "" "à jour par extraction creuse :\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8904,16 +8011,16 @@ msgstr "" "Mise à jour impossible pour le sous-module :\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Abandon\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "Mise à jour des fichiers" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8923,10 +8030,6 @@ msgstr "" "sensibles à la casse dans une système de fichier insensible) et un\n" "seul du groupe en collision est dans l'arbre de travail :\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "Mise à jour des drapeaux de l'index" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant" @@ -8956,54 +8059,50 @@ msgstr "numéro de port invalide" msgid "invalid '..' path segment" msgstr "segment de chemin '..' invalide" -#: walker.c:170 -msgid "Fetching objects" -msgstr "Récupération des objets" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "échec de la lecture de '%s'" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre " "de travail" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' n'existe pas" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' n'est pas un fichier .git, code d'erreur %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' ne pointe pas en retour sur '%s'" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossible d'ouvrir '%s' en lecture/écriture" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "impossible d'accéder à '%s'" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "impossible d'accéder au répertoire de travail courant" @@ -9348,88 +8447,80 @@ msgstr "" " (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Rétablissement en cours." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Vous êtes actuellement en train de rétablir le commit %s." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (réglez les conflits puis lancez \"git revert --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (lancez \"git revert --continue\" pour continuer)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Vous êtes en cours de bissection, depuis la branche '%s'." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Vous êtes en cours de bissection." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "Sur la branche " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "rebasage interactif en cours ; sur " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "rebasage en cours ; sur " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Actuellement sur aucun branche." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Validation initiale" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Aucun commit" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Fichiers non suivis" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Fichiers ignorés" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9441,32 +8532,32 @@ msgstr "" "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " "status')." -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Fichiers non suivis non affichés%s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (utilisez -u pour afficher les fichiers non suivis)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Aucune modification" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou " "\"git commit -a\")\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "aucune modification ajoutée à la validation\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9475,204 +8566,195 @@ msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents (utilisez \"git add\" pour les suivre)\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "aucune modification ajoutée à la validation mais des fichiers non suivis " "sont présents\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les " "suivre)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "rien à valider\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "rien à valider, la copie de travail est propre\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Encore aucun commit sur " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (aucune branche)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "différent" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "derrière " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "devant " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "Impossible de %s : vous avez des modifications non indexées." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "de plus, votre index contient des modifications non validées." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "%s impossible : votre index contient des modifications non validées." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "échec pour délier '%s'" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<options>] [--] <chemin>..." -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "état de diff inattendu %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "échec de la mise à jour des fichiers" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "suppression de '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "Impossible de lire l'index" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossible d'ouvrir '%s' en écriture." -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "Impossible d'écrire le patch" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "échec de l'édition du patch" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "Stat de '%s' impossible" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Patch vide. Abandon." -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "Impossible d'appliquer '%s'" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "simuler l'action" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "sélection interactive" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "sélection interactive des sections" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "édition du diff actuel et application" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "permettre l'ajout de fichiers ignorés" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "mettre à jour les fichiers suivis" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "ajouter les modifications de tous les fichiers suivis et non suivis" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorer les chemins effacés dans la copie de travail (identique à --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "ne pas ajouter, juste rafraîchir l'index" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "" "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait " "d'erreurs" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "outrepasser le bit exécutable pour les fichiers listés" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "avertir lors de l'ajout d'un dépôt embarqué" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "backend pour `git stash -p`" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9703,178 +8785,154 @@ msgstr "" "\n" "Référez-vous à \"git help submodule\" pour plus d'information." -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "dépôt git embarqué ajouté : %s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Utilisez -f si vous voulez vraiment les ajouter.\n" -"Éliminez ce message en lançant\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Utilisez -f si vous voulez réellement les ajouter.\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "échec de l'ajout de fichiers" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file est incompatible avec --interactive/--patch" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file est incompatible avec --edit" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A et -u sont mutuellement incompatibles" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file est incompatible avec pathspec arguments" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul nécessite --pathspec-from-file" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Rien de spécifié, rien n'a été ajouté.\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"Peut-être avez-vous voulu dire 'git add .' ?\n" -"Éliminez ce message en lançant\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Vous vouliez sûrement dire 'git add .' ?\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "impossible d'analyser l'auteur du script" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' a été effacé par le crochet applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Ligne en entrée malformée : '%s'." -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Impossible de copier les notes de '%s' vers '%s'" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "échec de fseek" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "impossible d'analyser le patch '%s'" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Seulement une série de patchs StGIT peut être appliquée à la fois" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "horodatage invalide" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "ligne de Date invalide" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "décalage horaire invalide" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Échec de détection du format du patch." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "échec de la création du répertoire '%s'" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Échec de découpage des patchs." -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "impossible d'écrire le fichier d'index" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quand vous avez résolu ce problème, lancez \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Si vous préférez plutôt sauter ce patch, lancez \"%s --skip\"." -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --" "abort\"." -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Rustine envoyée avec format=flowed ; les espaces en fin de ligne peuvent " "être perdus." -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Le patch actuel est vide." -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "ligne d'auteur manquante dans le commit %s" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "ligne d'identification invalide : %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossible d'analyser le commit %s" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 " "points." -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilisation de l'information de l'index pour reconstruire un arbre de base..." -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9882,24 +8940,24 @@ msgstr "" "Avez-vous édité le patch à la main ?\n" "Il ne s'applique pas aux blobs enregistrés dans son index." -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Retour à un patch de la base et fusion à 3 points..." -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Échec d'intégration des modifications." -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "application à un historique vide" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossible de continuer : %s n'existe pas." -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Le corps de la validation est :" @@ -9907,39 +8965,36 @@ msgstr "Le corps de la validation est :" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : " -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "impossible d'écrire le fichier d'index" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Application de %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Pas de changement -- Patch déjà appliqué." -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "le patch a échoué à %s %.*s" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "" +"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9950,7 +9005,7 @@ msgstr "" "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce " "patch." -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9963,17 +9018,17 @@ msgstr "" "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour " "accepter son état." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Impossible d'analyser l'objet '%s'." -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "échec du nettoyage de l'index" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9981,155 +9036,145 @@ msgstr "" "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n" "Pas de retour à ORIG_HEAD" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valeur invalide pour --patch-format : %s" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Valeur invalide pour --show-current-patch : %s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<options>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<options>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "exécution interactive" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "option historique -- no-op" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "permettre de revenir à une fusion à 3 points si nécessaire" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "être silencieux" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "ajouter une ligne Signed-off-by au message de validation" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "recoder en utf-8 (par défaut)" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "passer l'option -k à git-mailinfo" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "passer l'option -b à git-mailinfo" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "passer l'option -m à git-mailinfo" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "le passer jusqu'à git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "format de présentation des patchs" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "surcharger le message d'erreur lors d'un échec d'application de patch" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "continuer à appliquer les patchs après résolution d'un conflit" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "synonymes de --continue" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "sauter le patch courant" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "" "restaurer la branche originale et abandonner les applications de patch." -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "abandonne l'opération de patch mais garde HEAD où il est." -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "afficher le patch en cours d'application" +#: builtin/am.c:2244 +msgid "show the patch being applied." +msgstr "afficher le patch en cours d'application." -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "mentir sur la date de validation" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "utiliser l'horodatage actuel pour la date d'auteur" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "id-clé" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "signer les commits avec GPG" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(utilisation interne pour git-rebase)" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10137,17 +9182,17 @@ msgstr "" "L'option -b/--binary ne fait plus rien depuis longtemps,\n" "et elle sera supprimée. Veuillez ne plus l'utiliser." -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "échec à la lecture de l'index" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "le répertoire précédent de rebasage %s existe toujours mais mbox donnée." -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -10156,13 +9201,13 @@ msgstr "" "Répertoire abandonné %s trouvé.\n" "Utilisez \"git am --abort\" pour le supprimer." -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Pas de résolution de l'opération en cours, nous ne sommes pas dans une " "reprise." -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "le mode interactif requiert des rustines sur la ligne de commande" @@ -10287,7 +9332,7 @@ msgstr "Pas de bissection en cours.\n" msgid "'%s' is not a valid commit" msgstr "'%s' n'est pas un commit valide" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10295,27 +9340,27 @@ msgstr "" "Échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mauvais argument pour bisect_write : %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossible d'obtenir l'oid de la révision '%s'" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "impossible d'ouvrir le fichier '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10324,7 +9369,7 @@ msgstr "" "Vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10335,7 +9380,7 @@ msgstr "" "Puis vous devez me donner au moins une révision %s et une révision %s.\n" "Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela." -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "Attention : bissection avec seulement une validation %s" @@ -10344,15 +9389,15 @@ msgstr "Attention : bissection avec seulement une validation %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "Confirmez-vous [Y/n] ? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "aucun terme défini" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10361,7 +9406,7 @@ msgstr "" "Vos termes actuels sont %s pour l'état ancien\n" "et %s pour le nouvel état.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10371,270 +9416,274 @@ msgstr "" "Les options supportées sont : --term-good|--term-old et --term-bad|--term-" "new." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "option non reconnue : %s" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' ne semble être une révision valide" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "mauvaise HEAD - j'ai besoin d'une HEAD" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "L'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'." -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "refus de bissecter sur un arbre 'cg-seeked'" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "réference invalide : '%s'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "effectuer 'git bisect next'" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "écrire les termes dans .git/BISECT_TERMS" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "vérifier l'état de la bissection" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "vérifier si des révisions sont attendues" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "réinitialiser l'état de la bissection" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "écrire l'état de la bissection dans BISECT_LOG" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "vérifier et régler les termes dans un état de la bissection" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "vérifier si les termes bons ou mauvais existent" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "afficher les termes de bissection" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "démarrer une session de bissection" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "pas de journal pour BISECT_WRITE" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms exige deux arguments" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state ne supporte aucun argument" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset supporte soit aucun argument, soit un commit" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms exige 3 arguments" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check exige 2 ou 3 arguments" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms exige 0 ou 1 argument" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<options-de-révision> sont documentés dans git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "couleur attendue : %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "doit finir avec une couleur" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "couleur invalide '%s' dans color.blame.repeatedlines" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "valeur invalide pour blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "référence à ignorer %s introuvable" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "" "Montrer les éléments de blâme au fur et à mesure de leur découverte, de " "manière incrémentale" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Ne pas traiter les commits racine comme des limites (Défaut : désactivé)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Montrer les statistiques de coût d'activité" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Forcer l'affichage de l'état d'avancement" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Montrer le score de sortie pour les éléments de blâme" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Montrer les noms de fichier originaux (Défaut : auto)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Afficher dans un format propice à la consommation par machine" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Afficher en format porcelaine avec l'information de commit par ligne" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Utiliser le même mode de sortie que git-annotate (Défaut : désactivé)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Afficher les horodatages bruts (Défaut : désactivé)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Supprimer le nom de l'auteur et l'horodatage (Défaut : désactivé)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignorer les différences d'espace" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "rév" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" msgstr "ignore <rev> pendant le blâme" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "ignorer les révisions listées dans <fichier>" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "" "colorer différemment les métadonnées redondantes avec la ligne précédente" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "colorier les lignes par âge" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "" "Dépenser des cycles supplémentaires pour trouver une meilleure correspondance" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Utiliser le contenu de <fichier> comme image finale" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "score" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Trouver les copies de ligne dans et entre les fichiers" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Trouver les mouvements de ligne dans et entre les fichiers" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "" "Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress ne peut pas être utilisé avec --incremental ou les formats " @@ -10648,18 +9697,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "il y a 10 ans et 11 mois" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "le fichier %s n'a qu'%lu ligne" msgstr[1] "le fichier %s n'a que %lu lignes" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Assignation de blâme aux lignes" @@ -10874,7 +9923,7 @@ msgstr "régler le mode de suivi (voir git-pull(1))" msgid "do not use" msgstr "ne pas utiliser" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "amont" @@ -10883,8 +9932,8 @@ msgid "change the upstream info" msgstr "modifier l'information amont" #: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "désactiver l'information amont" +msgid "Unset the upstream info" +msgstr "Désactiver l'information amont" #: builtin/branch.c:628 msgid "use colored output" @@ -10985,7 +10034,7 @@ msgstr "le tri et le filtrage sont non-sensibles à la casse" msgid "format to use for the output" msgstr "format à utiliser pour la sortie" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trouvée sous refs/heads !" @@ -11077,65 +10126,20 @@ msgstr "" "l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-" "upstream-to' à la place." -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<options>] <fichier> <args git-rev-list>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<options>] <fichier>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "ne pas afficher la barre de progression" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "afficher la barre de progression" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "afficher la barre de progression durant la phase d'écrite des objets" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "similaire à --all-progress quand la barre de progression est affichée" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "La création d'un colis requiert un dépôt." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "ne pas afficher les détails du colis" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s est correct\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "La création d'un colis requiert un dépôt." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Le dépaquetage d'un colis requiert un dépôt." -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "être verbeux : doit être placé avant une sous-commande" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Sous-commande inconnue : %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11143,7 +10147,7 @@ msgstr "" "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p " "| <type> | --textconv | --filters) [--path=<chemin>] <objet>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -11151,74 +10155,74 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<type> peut être : blob, tree, commit ou tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "afficher le type de l'objet" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "afficher la taille de l'objet" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "sortir avec un code d'erreur nul quand il n'y a aucune erreur" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "afficher avec mise en forme le contenu de l'objet" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "pour les objets blob, lancer textconv sur le contenu de l'objet" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "pour les objets blob, lancer les filtres sur le contenu de l'objet" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "utiliser un chemin spécifique pour --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "autoriser -s et -t à travailler sur des objets cassés/corrompus" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "bufferiser la sortie de --batch" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" "afficher l'information et le contenu des objets passés en entrée standard" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "afficher l'information des objets passés en entrée standard" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "suivre les liens symbolique internes à la copie de travail (utilisé avec --" "batch ou --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "montrer tous les objets avec --batch ou --batch-check" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "ne pas ordonner la sortie de --batch-all-objects" @@ -11247,8 +10251,8 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -11260,27 +10264,27 @@ msgstr "afficher les chemins en entrée qui ne correspondent pas" msgid "ignore index when checking" msgstr "ignorer l'index pendant la vérification" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "impossible de spécifier les chemins avec --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z n'a de sens qu'avec l'option --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "aucun chemin spécifié" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "--quiet n'est valide qu'avec un seul chemin" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "impossible d'avoir --quiet et --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching n'est valide qu'avec --verbose" @@ -11340,9 +10344,9 @@ msgid "write the content to temporary files" msgstr "écrire le contenu dans des fichiers temporaires" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "chaîne" @@ -11370,100 +10374,100 @@ msgstr "git switch [<options>] <branche>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<options>] [--source=<branche>] <fichier>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "le chemin '%s' n'a pas notre version" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "le chemin '%s' n'a pas leur version" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "le chemin '%s' n'a aucune des versions nécessaires" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "le chemin '%s' n'a pas les versions nécessaires" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "chemin '%s' : impossible de fusionner" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossible d'ajouter le résultat de fusion pour '%s'" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d conflit du fusion recréé" msgstr[1] "%d conflits du fusion recréés" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d chemin mis à jour depuis %s" msgstr[1] "%d chemins mis à jour depuis %s" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d chemin mis à jour depuis l'index" msgstr[1] "%d chemins mis à jour depuis l'index" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ne peut pas être utilisé avec des mises à jour de chemins" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en " "même temps." -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s', ni '%s' spécifié" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' ne peut pas être utilisé quand '%s' n'est pas spécifié" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' ou '%s' ne peut pas être utilisé avec %s" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "le chemin '%s' n'est pas fusionné" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "vous devez d'abord résoudre votre index courant" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11473,50 +10477,56 @@ msgstr "" "suivants :\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "" +"les modifications indexées dans les fichiers suivants seraient perdues : %s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossible de faire un reflog pour '%s' : %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD est maintenant sur" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "impossible de mettre à jour HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Déjà sur '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Basculement et remise à zéro de la branche '%s'\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Basculement sur la nouvelle branche '%s'\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Basculement sur la branche '%s'\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... et %d en plus.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11539,7 +10549,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11568,19 +10578,28 @@ msgstr[1] "" "git branch <nouvelle-branche> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "erreur interne lors du parcours des révisions" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "La position précédente de HEAD était sur" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Vous êtes sur une branche qui doit encore naître" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "une seule référence attendue" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "une seule référence attendue, %d fournies." + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11589,71 +10608,37 @@ msgstr "" "'%s' pourrait être un fichier local ou un branche de suivi.\n" "Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer" -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n" -"par exemple, qualifiez-la complètement avec l'option --track :\n" -"\n" -" git checkout --track origin/<nom>\n" -"\n" -"Si vous souhaitez privilégier un distant particulier lorsque <nom> est\n" -"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" -"votre config." - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "une seule référence attendue" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "une seule référence attendue, %d fournies." - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "référence invalide : %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "la référence n'est pas un arbre : %s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "branche attendue, mais étiquette '%s' reçue" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "une branche est attendue, mais une branche distante '%s' a été reçue" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "une branche est attendue, mais '%s' a été reçue" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "une branche est attendue, mais un commit '%s' a été reçu" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11661,7 +10646,7 @@ msgstr "" "impossible de basculer de branche pendant une fusion\n" "Envisagez \"git merge --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11669,7 +10654,7 @@ msgstr "" "impossible de basculer de branche pendant une session am\n" "Envisagez \"git am --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11677,7 +10662,7 @@ msgstr "" "impossible de basculer de branche pendant un rebasage\n" "Envisagez \"git rebase --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11685,7 +10670,7 @@ msgstr "" "impossible de basculer de branche pendant un picorage\n" "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11693,144 +10678,139 @@ msgstr "" "impossible de basculer de branche pendant un retour\n" "Envisagez \"git revert --quit\" ou \"git worktree add\"." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "Vous basculez de branche en cours de bissection" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "impossible d'utiliser des chemins avec un basculement de branches" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ne peut pas être utilisé avec un basculement de branches" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ne peut pas être utilisé avec '%s'" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' n'accepte pas <point-de-départ>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "argument de branche ou de commit manquant" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forcer l'affichage de l'état d'avancement" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "effectuer une fusion à 3 points avec la nouvelle branche" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "style" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "style de conflit (merge (fusion) ou diff3)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "détacher la HEAD au commit nommé" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "forcer l'extraction (laisser tomber les modifications locales)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "nouvelle branche" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "nouvelle branche sans parent" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "mettre à jour les fichiers ignorés (par défaut)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "" "ne pas vérifier si une autre copie de travail contient le référence fournie" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "extraire notre version pour les fichiers non fusionnés" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "extraire leur version pour les fichiers non fusionnés" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B et --orphan sont mutuellement exclusifs" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p et --overlay sont mutuellement exclusifs" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track requiert un nom de branche" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "nom de branche manquant ; essayez -b" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "impossible de résoudre %s" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "Vous devez spécifier un ou des chemins à restaurer" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "spécification de chemin invalide" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file est incompatible avec --detach" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file est incompatible avec --patch" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11838,70 +10818,95 @@ msgstr "" "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n" "de l'extraction de l'index." -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "Vous devez spécifier un ou des chemins à restaurer" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"'%s' correspond à plusieurs branches de suivi distant. Nous avons\n" +"trouvé %d distants avec une référence correspondante. Nous avons essayé\n" +"de résoudre l'argument comme un chemin, sans plus de résultat !\n" +"\n" +"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n" +"par exemple, qualifiez-la complètement avec l'option --track :\n" +"\n" +" git checkout --track origin/<nom>\n" +"\n" +"Si vous souhaitez privilégier un distant particulier lorsque <nom> est\n" +"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n" +"votre config." -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "branche" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "créer et extraire une nouvelle branche" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "créer/réinitialiser et extraire une branche" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "créer un reflog pour une nouvelle branche" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "utiliser le mode de superposition (défaut)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "créer et basculer sur une nouvelle branche" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "créer/réinitialiser et basculer sur une branche" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "interpréter 'git switch <branche-inexistante>'" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "laisser tomber les modifications locales" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "de quel <arbre-esque> faire l'extraction" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "restaurer l'index" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "restaurer l'arbre de travail (par défaut)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "ignorer les entrées non-fusionnées" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "utiliser le mode de superposition" @@ -11941,7 +10946,7 @@ msgstr "échec de la suppression de %s" msgid "could not lstat %s\n" msgstr "lstat de %s impossible\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11954,7 +10959,7 @@ msgstr "" "foo - sélectionner un élément par un préfixe unique\n" " - (vide) ne rien sélectionner\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11975,33 +10980,38 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Entrez les motifs à ignorer>> " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Supprimer %s [y/N] ? " -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Au revoir.\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12019,56 +11029,64 @@ msgstr "" "help - cet écran\n" "? - aide pour la sélection en ligne" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** Commandes ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "Et maintenant ?" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Supprimerait l'élément suivant :" msgstr[1] "Supprimerait les éléments suivants :" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Plus de fichier à nettoyer, sortie." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "ne pas afficher les noms des fichiers supprimés" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "forcer" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "nettoyage interactif" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "supprimer les répertoires entiers" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "motif" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "ajouter <motif> aux règles ignore" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "supprimer les fichiers ignorés, aussi" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "supprimer seulement les fichiers ignorés" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x et -X ne peuvent pas être utilisés ensemble" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12076,7 +11094,7 @@ msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12084,7 +11102,7 @@ msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " "nettoyer" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]" @@ -12132,18 +11150,18 @@ msgstr "répertoire-modèle" msgid "directory from which templates will be used" msgstr "répertoire depuis lequel les modèles vont être utilisés" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "dépôt de référence" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "utiliser seulement --reference pour cloner" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "nom" @@ -12159,8 +11177,8 @@ msgstr "extraire <branche> au lieu de la HEAD du répertoire distant" msgid "path to git-upload-pack on the remote" msgstr "chemin vers git-upload-pack sur le serveur distant" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "profondeur" @@ -12168,7 +11186,7 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "heure" @@ -12176,18 +11194,17 @@ msgstr "heure" msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "révision" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "" "approfondir l'historique d'un clone superficiel en excluant une révision" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "cloner seulement une branche, HEAD ou --branch" @@ -12217,23 +11234,23 @@ msgstr "clé=valeur" msgid "set config inside the new repository" msgstr "régler la configuration dans le nouveau dépôt" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "spécifique au serveur" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "option à transmettre" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "n'utiliser que des adresses IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "n'utiliser que des adresses IPv6" @@ -12242,13 +11259,7 @@ msgid "any cloned submodules will use their remote-tracking branch" msgstr "" "tous les sous-modules clonés utiliseront leur branche de suivi à distance" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" -"initialiser le fichier d'extraction partielle pour n'inclure que les " -"fichiers à la racine" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12256,42 +11267,47 @@ msgstr "" "Aucun nom de répertoire n'a pu être deviné\n" "Veuillez spécifier un répertoire dans la ligne de commande" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe et n'est pas un répertoire" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "échec du démarrage un itérateur sur '%s'" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "échec pour délier '%s'" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "échec de la création du lien '%s'" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "échec de la copie vers '%s'" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "échec de l'itération sur '%s'" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "fait.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12301,102 +11317,98 @@ msgstr "" "Vous pouvez inspecter ce qui a été extrait avec 'git status'\n" "et réessayer avec 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossible de trouver la branche distante '%s' à cloner." -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "impossible de mettre à jour %s" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "échec lors de l'initialisation l'extraction partielle" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD distante réfère à une référence non existante, impossible de " "l'extraire.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "impossible d'extraire la copie de travail" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "impossible d'écrire les paramètres dans le fichier de configuration" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "impossible de remballer pour nettoyer" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "impossible de délier le fichier temporaire alternates" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Trop d'arguments." -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Vous devez spécifier un dépôt à cloner." -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les options --bare et --origin %s sont incompatibles." -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare et --separate-git-dir sont incompatibles." -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "le dépôt '%s' n'existe pas" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "la profondeur %s n'est pas un entier positif" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide." -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "la copie de travail '%s' existe déjà." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossible de créer les répertoires de premier niveau dans '%s'" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossible de créer le répertoire de la copie de travail '%s'" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonage dans le dépôt nu '%s'\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonage dans '%s'...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12404,41 +11416,41 @@ msgstr "" "clone --recursive n'est pas compatible avec à la fois --reference et --" "reference-if-able" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"." -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://" "\"." -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt " "\"file://\"." -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ." -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "le dépôt source est superficiel, option --local ignorée" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local est ignoré" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Vous semblez avoir cloné un dépôt vide." @@ -12487,7 +11499,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "le parent dupliqué %s est ignoré" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "nom d'objet invalide %s" @@ -12515,13 +11527,13 @@ msgstr "parent" msgid "id of a parent commit object" msgstr "id d'un objet commit parent" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "message" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "message de validation" @@ -12529,8 +11541,8 @@ msgstr "message de validation" msgid "read commit log message from file" msgstr "lire le message de validation depuis un fichier" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "signer la validation avec GPG" @@ -12606,65 +11618,57 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file avec l'option -a n'a pas de sens" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "impossible de créer l'index temporaire" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "échec de l'ajout interactif" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "impossible de mettre à jour l'index temporaire" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Impossible de mettre à jour l'arbre de cache principal" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "impossible d'écrire le fichier new_index" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "impossible de faire une validation partielle pendant une fusion." -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossible de faire une validation partielle pendant un picorage." -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "impossible de lire l'index" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "impossible d'écrire le fichier d'index temporaire" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "entête d'auteur manquant dans le commit '%s'" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "le commit '%s' a une ligne d'auteur malformée" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "paramètre --author mal formé" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12672,38 +11676,38 @@ msgstr "" "impossible de sélectionner un caractère de commentaire\n" "qui n'est pas utilisé dans le message de validation actuel" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "impossible de rechercher le commit %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lecture du message de journal depuis l'entrée standard)\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "impossible de lire le journal depuis l'entrée standard" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "impossible de lire le fichier de journal '%s'" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "impossible de lire SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "impossible de lire MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "impossible d'écrire le modèle de commit" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12718,7 +11722,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12733,7 +11737,7 @@ msgstr "" "\t%s\n" "et essayez à nouveau.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12743,7 +11747,7 @@ msgstr "" "commençant par '%c' seront ignorées, et un message vide abandonne la " "validation.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12754,144 +11758,148 @@ msgstr "" "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n" "si vous le souhaitez. Un message vide abandonne la validation.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAuteur : %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sDate : %s" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sValidateur : %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Impossible de lire l'index" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Erreur lors de la construction des arbres" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Veuillez fournir le message en utilisant l'option -m ou -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun " "auteur existant" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Mode de fichier ignoré invalide '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fichier non suivi invalide '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long et -z sont incompatibles" -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "L'utilisation simultanée de --reset-author et --author n'a pas de sens" -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Il n'y a rien à corriger." -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)." -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)." -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Les options --squash et --fixup ne peuvent pas être utilisées ensemble" -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Une seule option parmi -c/-C/-F/--fixup peut être utilisée." -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F." -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author ne peut être utilisé qu'avec -C, -c ou --amend." -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Une seule option parmi --include/--only/--all/--interactive/--patch peut " "être utilisée." -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "Aucun chemin avec les options --include/--only n'a pas de sens." + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "des chemins '%s ...' avec l'option -a n'a pas de sens" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "afficher l'état avec concision" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "afficher l'information de branche" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "afficher l'information de remisage" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "calcule les valeurs complètes en avance/en retard" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "version" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "sortie pour traitement automatique" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "afficher l'état en format long (par défaut)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "terminer les éléments par NUL" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "mode" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, " "no. (Défaut : all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12899,11 +11907,11 @@ msgstr "" "afficher les fichiers ignorés, \"mode\" facultatif : traditional " "(traditionnel), matching (correspondant), no. (Défaut : traditional)" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "quand" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12911,175 +11919,175 @@ msgstr "" "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all " "(tous), dirty (sale), untracked (non suivi). (Défaut : all)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "afficher les fichiers non suivis en colonnes" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "ne pas détecter les renommages" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "" "détecter les renommages, en spécifiant optionnellement le facteur de " "similarité" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "supprimer le résumé après une validation réussie" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "afficher les diff dans le modèle de message de validation" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Options du message de validation" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "lire le message depuis un fichier" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "auteur" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "remplacer l'auteur pour la validation" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "date" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "remplacer la date pour la validation" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "réutiliser et éditer le message du commit spécifié" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "réutiliser le message du commit spécifié" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "utiliser un message au format autosquash pour corriger le commit spécifié" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "utiliser un message au format autosquash pour compresser le commit spécifié" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "ajouter une entrée Signed-off-by :" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "utiliser le fichier de modèle spécifié" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "forcer l'édition du commit" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "inclure l'état dans le modèle de message de validation" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Valider les options des contenus" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "valider tous les fichiers modifiés" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "ajouter les fichiers spécifiés à l'index pour la validation" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "ajouter des fichiers en mode interactif" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "ajouter les modifications en mode interactif" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "valider seulement les fichiers spécifiés" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "éviter d'utiliser les crochets pre-commit et commit-msg" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "afficher ce qui serait validé" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "corriger la validation précédente" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "éviter d'utiliser le crochet post-rewrite" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "accepter d'enregistrer une modification vide" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "accepter d'enregistrer une modification avec un message vide" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fichier MERGE_HEAD corrompu (%s)" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "impossible de lire MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "impossible de lire le message de validation : %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abandon de la validation dû à un message de validation vide.\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abandon de la validation ; vous n'avez pas édité le message\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13089,77 +12097,78 @@ msgstr "" "new_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." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <objdir>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <objdir>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <objdir>] [--shallow]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" -"git commit-graph write [--object-dir <répertoire-d'objet>] [--append|--" -"split] [--reachable|--stdin-packs|--stdin-commits] [--|no-]progress] " -"<options de division>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "impossible de trouver le répertoire objet correspondant à %s" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <options de division>" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "répertoire" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "Le répertoire d'objet où stocker le graphe" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "si le graphe de commit est divisé, vérifier seulement le fichier sommet" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "impossible d'ouvrir le graphe de commit '%s'" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "commencer le parcours à toutes les réfs" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "scanner les index compactés listés sur stdin à la recherche de commits" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "commencer le parcours aux commits listés sur stdin" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "" "inclure tous les commits déjà présents dans le fichier de graphe de commits" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "permettre d'écrire un fichier incrémental de graphe de commit" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "le nombre maximum de commits dans un graphe de commit divisé pas de base" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" @@ -13167,214 +12176,208 @@ msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs" msgid "git config [<options>]" msgstr "git config [<options>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argument --type non reconnu, %s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "qu'un seul type à la fois" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "Emplacement du fichier de configuration" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "utiliser les fichier de configuration global" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "utiliser le fichier de configuration du système" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "utiliser le fichier de configuration du dépôt" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "utiliser un fichier de configuration par arbre de travail" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "utiliser le fichier de configuration spécifié" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "lire la configuration depuis l'objet blob fourni" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "Action" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "obtenir la valeur : nom [regex-de-valeur]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "" "remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "ajouter une nouvelle variable : nom valeur" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "supprimer une variable : nom [regex-de-valeur]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "supprimer toutes les correspondances nom [regex-de-valeur]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "renommer une section : ancien-nom nouveau-nom" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "supprimer une section : nom" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "afficher tout" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "ouvrir un éditeur" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "trouver la couleur configurée : slot [par défaut]" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "Type" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "ce type est assigné à la valeur" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "la valeur est un nombre décimal" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "la valeur est --bool ou --int" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "la valeur est un chemin (vers un fichier ou un répertoire)" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "la valeur est une date d'expiration" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "Autre" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "terminer les valeurs avec un caractère NUL" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "n'afficher que les noms de variable" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "respecter les directives d'inclusion lors de la recherche" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "afficher l'origine de la configuration (fichier, entrée standard, blob, " "ligne de commande)" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"afficher la portée de configuration (arbre de travail, local, global, " -"système, commande)" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "valeur" -#: builtin/config.c:160 +#: builtin/config.c:158 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" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "mauvais nombre d'arguments, devrait être %d" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "mauvais nombre d'arguments, devrait être entre %d et %d" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "motif de clé invalide : %s" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "échec du formatage de la valeur de config par défaut : %s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "impossible d'analyser la couleur '%s'" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "impossible de lire la valeur de couleur par défaut" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "pas dans un répertoire git" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "l'écriture sur stdin n'est pas supportée" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "l'écriture de blob de configuration n'est pas supportée<" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13389,23 +12392,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "un seul fichier de configuration à la fois" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "$HOME n'est pas défini" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13416,19 +12419,19 @@ msgstr "" "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de " "détails" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "--get-color et le type de la variable sont incohérents" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "une seule action à la fois" -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:712 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -13436,33 +12439,33 @@ msgstr "" "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --" "list" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default n'est applicable qu'avec --get" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "lecture du fichier de configuration '%s' impossible" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "erreur lors du traitement de fichier(s) de configuration" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "l'édition de stdin n'est pas supportée" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "l'édition de blobs n'est pas supportée" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "création impossible du fichier de configuration '%s'" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13471,7 +12474,7 @@ msgstr "" "impossible de surcharger des valeurs multiples avec une seule valeur\n" " Utilisez une regexp, --add ou --replace-all pour modifier %s." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "section inexistante : %s" @@ -13484,59 +12487,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "affiche les tailles dans un format humainement lisible" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<options>] <commit ou apparenté>*" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<options>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "tête" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "léger" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "annoté" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "l'étiquette annotée %s n'est pas disponible" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'étiquette annotée %s n'a pas de nom embarqué" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'étiquette '%s' est en fait '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "aucune étiquette ne correspond parfaitement à '%s'" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par " "describe\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "recherche terminée à %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13545,7 +12548,7 @@ msgstr "" "Aucune étiquette annotée ne peut décrire '%s'.\n" "Cependant, il existe des étiquettes non-annotées : essayez avec --tags." -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13554,12 +12557,12 @@ msgstr "" "Aucune étiquette ne peut décrire '%s'.\n" "Essayez --always, ou créez des étiquettes." -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "%lu commits parcourus\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13569,92 +12572,92 @@ msgstr "" "affichées\n" "abandon de la recherche à %s\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "décrire %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "%s n'est pas un nom d'objet valide" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s n'est ni un commit ni un blob" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "rechercher l'étiquette qui suit le commit" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "déboguer la stratégie de recherche sur stderr" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "utiliser n'importe quelle référence" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "utiliser n'importe quelle étiquette, même non-annotée" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "toujours utiliser le format long" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "ne suivre que le premier parent" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "n'afficher que les correspondances exactes" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "" "considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "ne considérer que les étiquettes correspondant à <motif>" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "ne pas considérer les étiquettes correspondant à <motif>" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "afficher les objets commits abrégés en dernier recours" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "marque" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long et --abbrev=0 sont incompatibles" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit." -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty est incompatible avec la spécification de commits ou assimilés" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken est incompatible avec les commits ou assimilés" @@ -13691,27 +12694,27 @@ msgstr "objet non géré '%s' spécifié." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "échec : %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "lecture du lien symbolique %s impossible" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "impossible de lire le fichier symlink %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "Impossible de lire l'objet %s pour le symlink %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13719,53 +12722,53 @@ msgstr "" "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n" "dans le mode de diff de répertoire ('-d' et '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "les deux fichiers sont modifiés : '%s' et '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "le fichier dans l'arbre de travail a été laissé." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "des fichiers temporaires existent dans '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "vous pourriez souhaiter les nettoyer ou les récupérer." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utiliser `diff.guitool` au lieu de `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "réalise un diff de répertoire complet" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "ne pas confirmer avant de lancer l'outil de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "utiliser les liens symboliques en mode de diff de répertoire" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "outil" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "utiliser l'outil de diff spécifié" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "afficher une liste des outils de diff utilisables avec `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13773,31 +12776,31 @@ msgstr "" "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code " "non-nul" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "spécifier une commande personnalisée pour visualiser les différences" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "passé à `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool exige un arbre de travail ou --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff est incompatible avec --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "pas d'<outil> spécifié pour --tool=<outil>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" @@ -13838,191 +12841,164 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [options-de-liste-de-révisions]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" -"Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-" -"tags ne soit spécifié." - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "afficher la progression après <n> objets" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "sélectionner la gestion des étiquettes signées" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "" "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "" "sélectionner la gestion des messages de validation dans un encodage " "alternatif" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Enregistrer les marques dans ce fichier" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "importer les marques depuis ce fichier" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "importer les marques depuis ce fichier s'il existe" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Afficher l'arbre complet pour chaque commit" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Utiliser la fonction \"done\" pour terminer le flux" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Sauter l'affichage de données de blob" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "spécificateur de référence" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Appliquer le spécificateur de référence aux références exportées" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "anonymise la sortie" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "les parents références qui ne sont pas dans le flux d'export rapide par id " "d'objet" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Afficher les ids d'objet originaux des blobs/commits" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "Marquer les étiquettes avec des ids de marque" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "" -"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<options>] <groupe>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<options>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel ne peut pas être négatif" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "récupérer depuis tous les dépôts distants" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "définir la branche amont pour git pull/fetch" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "chemin vers lequel télécharger le paquet sur le poste distant" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "forcer l'écrasement de la branche locale" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "récupérer depuis plusieurs dépôts distants" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "récupérer toutes les étiquettes et leurs objets associés" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "ne pas récupérer toutes les étiquettes (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "nombre de sous-modules récupérés en parallèle" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "" "éliminer les branches de suivi distant si la branche n'existe plus dans le " "dépôt distant" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui " "encombrent les étiquettes modifiées" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "à la demande" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "conserver le paquet téléchargé" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "permettre la mise à jour de la référence HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "approfondir l'historique d'un clone superficiel" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "approfondir l'historique d'un clone superficiel en fonction d'une date" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "convertir en un dépôt complet" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "préfixer ceci à la sortie du chemin du sous-module" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14030,95 +13006,91 @@ msgstr "" "par défaut pour la récupération récursive de sous-modules (priorité plus " "basse que les fichiers de config)" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "accepter les références qui mettent à jour .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "correspondance de référence" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "spécifier une correspondance de référence pour la récupération" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "rapporte que nous n'avons que des objets joignables depuis cet objet" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "lancer 'gc --auto' après la récupération" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "vérifier les mises à jour forcées sur toutes les branches mises à jour" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "écrire le graphe de commits après le rapatriement" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "impossible de trouver la référence HEAD distante" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" "le paramètre de configuration fetch.output contient une valeur invalide %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "objet %s non trouvé" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[à jour]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[rejeté]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "impossible de récupérer dans la branche actuelle" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[mise à jour de l'étiquette]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "impossible de mettre à jour la référence locale" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "écraserait l'étiquette existante" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[nouvelle étiquette]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[nouvelle branche]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[nouvelle référence]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "mise à jour forcée" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "pas en avance rapide" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14128,7 +13100,7 @@ msgstr "" "mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n" "'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14140,23 +13112,23 @@ msgstr "" "Vous pouvez utiliser '--no-show-forced-update' ou lancer\n" "'git config fetch.showForcedUpdates false' pour éviter ceci.\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s n'a pas envoyé tous les objets nécessaires\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "%s rejeté parce que les racines superficielles ne sont pas mises à jour" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Depuis %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14165,79 +13137,58 @@ msgstr "" "des références locales n'ont pas pu être mises à jour ; essayez de lancer\n" " 'git remote prune %s' pour supprimer des branches anciennes en conflit" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s sera en suspens)" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s est devenu en suspens)" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[supprimé]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(aucun(e))" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'option \"%s\" est ignorée pour %s\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "branches multiples détectées, imcompatible avec --set-upstream" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "dépôt amont non défini pour la branche de suivi à distance" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "dépôt amont non défini pour l'étiquette distante" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "type de branche inconnu" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"Aucune branche source trouvée.\n" -"Vous devez spécifier exactement une branche avec l'option --set-upstream." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Récupération de %s\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Impossible de récupérer %s" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "impossible de récupérer '%s' (code de sortie : %d)\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" +"--filter ne peut être utilisé qu'avec le dépôt distant configuré dans " +"extensions.partialClone" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14245,46 +13196,46 @@ msgstr "" "Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n" "distant depuis lesquels les nouvelles révisions devraient être récupérées." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Vous devez spécifier un nom d'étiquette." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Une profondeur négative dans --deepen n'est pas supportée" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen et --depth sont mutuellement exclusifs" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all n'a pas de sens avec des spécifications de référence" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "distant ou groupe distant inexistant : %s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "La récupération d'un groupe et les spécifications de référence n'ont pas de " "sens" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14298,23 +13249,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "peupler le journal avec au plus <n> éléments depuis le journal court" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "alias pour --log (obsolète)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "texte" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "utiliser <texte> comme début de message" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "fichier d'où lire" @@ -14378,32 +13329,32 @@ msgstr "afficher seulement les références qui contiennent le commit" msgid "print only refs which don't contain the commit" msgstr "afficher seulement les références qui ne contiennent pas le commit" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "inconnu" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "erreur dans l'objet %s %s : %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "avertissement dans l'objet %s %s : %s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "lien cassé dans l'objet %7s %s" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "type d'objet inconnu dans le lien" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -14412,217 +13363,217 @@ msgstr "" "lien cassé depuis %7s %s\n" " vers %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "objet %s manquant %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "objet %s inatteignable %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "objet %s fantôme %s" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "impossible de créer le fichier lost-found" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "impossible de finir '%s'" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Vérification de l'objet %s" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Vérification de la connectivité (%d objets)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Vérification de l'objet %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "liens cassés" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "racine %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "étiquetage de l'objet %s %s (%s) dans %s" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s : objet corrompu ou manquant" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s : entrée %s de journal de références invalide" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Vérification du journal de réferences %s-> %s" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s : pointeur de sha1 invalide %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "l'objet %s n'est pas un commit" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "Note : pas de référence par défaut" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s : objet corrompu ou manquant : %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s : impossible d'analyser : %s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "mauvais fichier de sha1 : %s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Vérification du répertoire d'objet" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Vérification des répertoires d'objet" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Vérification du lien %s" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s invalide" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pointe sur quelque chose bizarre (%s)" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s : la HEAD détachée ne pointe sur rien" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "note : %s pointe sur une branche non-née (%s)" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Vérification de l'arbre cache" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s : pointer sha1 invalide dans l'arbre de cache" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "non-arbre dans l'arbre de cache" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<options>] [<objet>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "afficher les objets inaccessibles" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "afficher les objets en suspens" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "afficher les étiquettes" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "signaler les nœuds racines" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "considérer les objets de l'index comme nœuds tête" # translated from man page -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "considérer les reflogs comme nœuds tête (par défaut)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "inspecter aussi les objets pack et alternatifs" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "ne vérifier que la connectivité" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "activer une vérification plus strict" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "écrire les objets en suspens dans .git/lost-found" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "afficher la progression" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "afficher les noms étendus pour les objets inaccessibles" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Vérification des objets" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s : objet manquant" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<options>]" @@ -14636,17 +13587,17 @@ msgstr "Échec du stat de %s : %s" msgid "failed to parse '%s' value '%s'" msgstr "échec de l'analyse de '%s' valeur '%s'" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossible de faire un stat de '%s'" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "impossible de lire '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14662,56 +13613,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "éliminer les objets non référencés" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "être plus consciencieux (durée de traitement allongée)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "activer le mode auto-gc" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "" "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes " "tourne déjà" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "recompacter tous les autres paquets excepté le plus gros paquet" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "impossible d'analyser gc.logexpiry %s" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "impossible d'analyser la valeur d'expiration d'élagage %s" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Compression automatique du dépôt en tâche de fond pour optimiser les " "performances.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Compression du dépôt pour optimiser les performances.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14719,14 +13670,14 @@ msgstr "" "un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> " "(utilisez --force si ce n'est pas le cas)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les " "supprimer." -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]" @@ -14744,266 +13695,266 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "pas de support des fils, ignore %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "impossible de lire l'arbre (%s)" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "impossible de faire un grep sur un objet de type %s" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'option '%c' attend une valeur numérique" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "rechercher dans l'index plutôt que dans la copie de travail" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "rechercher dans les contenus non gérés par git" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "rechercher dans les fichiers suivis et non-suivis" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignorer les fichiers spécifiés via '.gitignore'" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "rechercher récursivement dans chaque sous-module" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "afficher les lignes qui ne correspondent pas" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "correspondance insensible à la casse" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "rechercher les motifs aux séparateurs de mots" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "traiter les fichiers binaires comme texte" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "ne pas chercher les motifs dans les fichiers binaires" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "traiter les fichiers binaires avec les filtres textconv" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "rechercher dans les sous-répertoires (défaut)" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "descendre au plus de <profondeur> dans l'arborescence" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "utiliser des expressions régulières étendues POSIX" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "utiliser des expressions régulières basiques POSIX (par défaut)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "interpréter les motifs comme de chaînes fixes" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "utiliser des expressions régulières compatibles avec Perl" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "afficher les numéros de ligne" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "afficher le numéro de colonne de la première correspondance" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "ne pas pas afficher les noms de fichier" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "afficher les noms de fichier" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "afficher les noms de fichiers relativement au répertoire de base" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "synonyme pour --files-with-matches" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "n'afficher que les noms des fichiers sans correspondance" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "imprimer une caractère NUL après le noms de fichier" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "n'afficher que les parties correspondantes d'une ligne" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "afficher le nombre de correspondances au lieu des lignes correspondant" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "mettre en évidence les correspondances" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "" "imprimer une ligne vide entre les correspondances de fichiers différents" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "afficher le nom de fichier une fois au dessus des correspondances du même " "fichier" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "afficher <n> lignes de contexte avant et après les correspondances" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "afficher <n> lignes de contexte avant les correspondances" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "afficher <n> lignes de contexte après les correspondances" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "utiliser <n> fils de travail" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "raccourci pour -C NUM" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "" "afficher une ligne avec le nom de la fonction avant les correspondances" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "afficher la fonction contenante" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "lire les motifs depuis fichier" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "rechercher <motif>" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "combiner les motifs spécifiés par -e" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "" "indiquer des correspondances avec le code de sortie mais sans rien afficher" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "n'afficher que les correspondances de fichiers qui correspondent à tous les " "motifs" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "afficher l'arbre d'analyse pour le motif grep" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "pagineur" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "afficher les fichiers correspondant dans le pagineur" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permettre l'appel de grep(1) (ignoré par ce build)" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "aucun motif fourni" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "impossible de résoudre la révision : %s" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "--untracked non supportée avec --recurse-submodules" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "option de combinaison invalide, ignore --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "pas de support des fils, ignore --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "nombre de fils spécifié invalide (%d)" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail" -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "option non supportée avec --recurse-submodules" + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "--cached et des arbres sont fournis en même temps" @@ -15189,11 +14140,11 @@ msgstr "erreur de lecture sur l'entrée" msgid "used more bytes than were available" msgstr "plus d'octets utilisés que disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "le paquet est trop grand pour la définition actuelle de off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "le paquet dépasse la taille maximale permise" @@ -15249,192 +14200,192 @@ msgstr[1] "fin prématurée du fichier paquet, %<PRIuMAX> octets lus" msgid "serious inflate inconsistency" msgstr "grave incohérence dans la décompression (inflate)" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "COLLISION SHA1 TROUVÉE AVEC %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "impossible de lire %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "impossible de lire l'information existante de l'objet %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "impossible de lire l'objet existant %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "objet blob invalide %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "erreur de fsck dans l'objet empaqueté" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Tous les objets enfants de %s ne sont pas accessibles" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "échec d'application du delta" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Réception d'objets" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indexation d'objets" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "le paquet est corrompu (SHA1 ne correspond pas)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "impossible d'obtenir le statut (fstat) du fichier paquet" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "le paquet est invalide à la fin" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusion extrême dans parse_pack_objects()" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Résolution des deltas" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "impossible de créer le fil : %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "confusion extrême" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "complété avec %d objet local" msgstr[1] "complété avec %d objets locaux" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "le paquet a %d delta non résolu" msgstr[1] "le paquet a %d deltas non résolus" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossible de compresser l'objet ajouté (%d)" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "l'objet local %s est corrompu" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "impossible d'écrire le fichier %s '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossible de fermer le fichier %s écrit '%s'" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "erreur en fermeture du fichier paquet" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "impossible de stocker le fichier paquet" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "impossible de stocker le fichier d'index" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mauvais pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossible d'ouvrir le fichier paquet existant '%s'" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "pas un delta : %d objet" msgstr[1] "pas un delta : %d objets" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longueur chaînée = %d : %lu objet" msgstr[1] "longueur chaînée = %d : %lu objets" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Impossible de revenir au répertoire de travail courant" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "mauvais %s" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ne peut pas être utilisé sans --stdin" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin requiert un dépôt git" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify sans nom de fichier paquet donné" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" @@ -15617,128 +14568,123 @@ msgstr "--trailer n'a aucune signification avec --only-input" msgid "no input file given for in-place editing" msgstr "aucun fichier en entrée pour l'éditon sur place" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<options>] <objet>..." -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "option --decorate invalide : %s" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "afficher la source" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Utiliser le fichier de correspondance de mail" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "décorer seulement les références correspondant à <motif>" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "ne pas décorer les références correspondant à <motif>" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "décorer les options" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "" "Traiter seulement l'intervalle de lignes n,m du fichier en commençant le " "compte à 1" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Sortie finale : %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s : fichier incorrect" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "impossible de lire l'objet %s" -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "type inconnu : %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s : couverture invalide pour le mode de description" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "format.headers sans valeur" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "le nom du répertoire de sortie est trop long" -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "impossible d'ouvrir le fichier correctif %s" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "exactement une plage nécessaire" -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "ceci n'est pas une plage" -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "la lettre de motivation doit être au format courriel" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "échec de création du fichier de lettre de motivation" -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to aberrant : %s" -#: builtin/log.c:1255 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "deux répertoires de sortie ?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "commit inconnu %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "échec à résoudre '%s' comme une référence valide" -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "impossible de trouver la base de fusion exacte" -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15751,285 +14697,275 @@ msgstr "" "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> " "manuellement" -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "échec à trouver la base de fusion exacte" -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "le commit de base devrait être l'ancêtre de la liste de révisions" -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "le commit de base ne devrait pas faire partie de la liste de révisions" -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "impossible d'obtenir l'id du patch" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "échec d'inférence d'intervalles de différence d'intervalles" -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "utiliser [PATCH n/m] même avec un patch unique" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "utiliser [PATCH] même avec des patchs multiples" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "afficher les patchs sur la sortie standard" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "générer une lettre de motivation" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "" "utiliser une séquence simple de nombres pour les nom des fichiers de sortie" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "utiliser <sfx> au lieu de '.patch'" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "démarrer la numérotation des patchs à <n> au lieu de 1" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "marquer la série comme une Nième réédition" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "utiliser [RFC PATCH] au lieu de [PATCH]" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "cover-from-description-mode" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "" -"générer des parties de la lettre d'introduction à partir de la description " -"de la branche" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "utiliser [<préfixe>] au lieu de [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "stocker les fichiers résultats dans <répertoire>" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "ne pas retirer/ajouter [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "ne pas imprimer les diffs binaires" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "écrire une empreinte à zéro dans l'entête From" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "ne pas inclure un patch correspondant à un commit amont" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "afficher le format du patch au lieu du défaut (patch + stat)" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "Communication" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "en-tête" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "ajouter l'en-tête de courriel" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "courriel" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "ajouter l'en-tête \"To:\"" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "ajouter l'en-tête \"Cc:\"" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "ident" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "id-message" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "répondre dans le premier message à <id-message>" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "limite" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "attacher le patch" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "patch à l'intérieur" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "" "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "signature" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "ajouter une signature" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "commit-de-base" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "Ajouter un arbre prérequis à la série de patchs" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "ajouter une signature depuis un fichier" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "ne pas afficher les noms de fichiers des patchs" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "" "afficher la barre de progression durant la phase de génération des patchs" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <rév> dans la première page ou une " "rustine" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "afficher les modifications par rapport à <refspec> dans la première page ou " "une rustine" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "pourcentage par lequel la création est pondérée" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "ligne d'identification invalide : %s" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n et -k sont mutuellement exclusifs" -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs" -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "--name-only n'a pas de sens" -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "--name-status n'a pas de sens" -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "--check n'a pas de sens" -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "sortie standard, ou répertoire, lequel ?" -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff :" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contre v%d :" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiert --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiert --cover-letter ou une rustine unique" -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Diff-intervalle :" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Diff-intervalle contre v%d :" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "lecture du fichier de signature '%s' impossible" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Génération des patchs" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "échec de création des fichiers en sortie" -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16158,7 +15094,7 @@ msgstr "" msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "exécutable" @@ -16247,151 +15183,151 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "le commutateur `m' a besoin d'une valeur" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "le commutateur '%s' a besoin d'une valeur" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Impossible de trouver la stratégie de fusion '%s'.\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Les stratégies disponibles sont :" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Les stratégies personnalisées sont :" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "ne pas afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "afficher un diffstat à la fin de la fusion" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(synonyme de --stat)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "ajouter (au plus <n>) éléments du journal court au message de validation de " "la fusion" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "créer une validation unique au lieu de faire une fusion" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "effectuer une validation si la fusion réussit (défaut)" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "éditer le message avant la validation" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "autoriser l'avance rapide (défaut)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "abandonner si l'avance rapide n'est pas possible" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "vérifier que le commit nommé a une signature GPG valide" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "stratégie" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "stratégie de fusion à utiliser" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "option=valeur" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "option pour la stratégie de fusion sélectionnée" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "message de validation de la fusion (pour une fusion sans avance rapide)" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "abandonner la fusion en cours" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "--abort mais laisser l'index et l'arbre de travail inchangés" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "continuer la fusion en cours" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "permettre la fusion d'historiques sans rapport" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" +msgstr "vérifier le crochet commit-msg" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "impossible de lancer le remisage." -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "échec du remisage" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "pas un objet valide : %s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree a échoué" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (rien à compresser)" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Validation compressée -- HEAD non mise à jour\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' ne pointe pas sur un commit" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s" @@ -16447,74 +15383,74 @@ msgstr "" "Les lignes commençant par '%c' seront ignorées, et un message vide\n" "abandonne la validation.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Message de validation vide." -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Merveilleux.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "La fusion automatique a échoué ; réglez les conflits et validez le " "résultat.\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Pas de branche courante." -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Pas de branche distante pour la branche courante." -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Pas de branche amont par défaut définie pour la branche courante." -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Pas de branche de suivi pour %s depuis %s" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Mauvaise valeur '%s' dans l'environnement '%s'" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "pas possible de fusionner ceci dans %s : %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "pas possible de fusionner ceci" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort n'accepte pas d'argument" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)." -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "--quit n'accepte pas d'argument" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue ne supporte aucun argument" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)." -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16522,7 +15458,7 @@ msgstr "" "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16530,98 +15466,98 @@ msgstr "" "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n" "Veuillez valider vos modifications avant de pouvoir fusionner." -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)." -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Vous ne pouvez pas combiner --squash avec --no-ff." -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "Vous ne pouvez pas combiner --squash avec --commit." -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini." -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "La validation compressée vers une tête vide n'est pas encore supportée" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - pas possible de fusionner ceci" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "" "Possible de fusionner exactement une seule validation dans une tête vide" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "refus de fusionner des historiques sans relation" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Déjà à jour." -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Mise à jour %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Essai de fusion vraiment triviale dans l'index...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Non.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Déjà à jour. Ouais !" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Pas possible d'avancer rapidement, abandon." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Retour de l'arbre à l'original...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Essai de la stratégie de fusion %s...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "La fusion avec la stratégie %s a échoué.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Utilisation de %s pour préparer la résolution à la main.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16707,33 +15643,33 @@ msgstr "ne pas avertir à propos des conflits" msgid "set labels for file1/orig-file/file2" msgstr "définir les labels pour fichier1/fichier-orig/fichier2" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "option inconnue %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "Impossible d'analyser l'objet '%s'" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "impossible de gérer plus de %d base. %s ignoré." msgstr[1] "impossible de gérer plus de %d bases. %s ignoré." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "impossible de gérer autre chose que la fusion de deux têtes." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "impossible de résoudre la référence '%s'" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Fusion de %s avec %s\n" @@ -16756,19 +15692,19 @@ msgstr "autoriser la création de plus d'un arbre" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<taille>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<taille>)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "répertoire objet contenant un ensemble de paires de fichiers paquet et " "d'index de paquet" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -16776,15 +15712,15 @@ msgstr "" "pendant le repaquetage, collecter les fichiers paquet de plus petite taille " "dans un lot plus grand que cette taille" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "trop d'arguments" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "sous-commande non reconnue : %s" @@ -16878,53 +15814,53 @@ msgstr "%s, source=%s, destination=%s" msgid "Renaming %s to %s\n" msgstr "Renommage de %s en %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "le renommage de '%s' a échoué" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<options>] <validation>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<options>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<options>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "afficher seulement les noms (pas de SHA-1)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "utiliser seulement les étiquettes pour nommer les validations" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "utiliser seulement les références correspondant à <motif>" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignorer les références correspondant à <motif>" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "" "afficher toutes les validations accessibles depuis toutes les références" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "lire depuis l'entrée standard" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "autoriser l'affichage des noms `non définis` (par défaut)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "déréférencer les étiquettes en entrée (usage interne)" @@ -17324,7 +16260,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "lire les noms d'objet depuis l'entrée standard" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "ne pas supprimer, afficher seulement" @@ -17340,7 +16276,7 @@ msgstr "références-notes" msgid "use notes from <notes-ref>" msgstr "utiliser les notes depuis <références-notes>" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "sous-commande inconnue : %s" @@ -17359,106 +16295,129 @@ msgstr "" "git pack-objects [options...] base-name [< <liste-références> | < <liste-" "objets>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "mauvais CRC d'objet empaqueté pour %s" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "objet empaqueté corrompu pour %s" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "delta récursif détecté pour l'objet %s" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objets commandés, %<PRIu32> attendus" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "le fichier packet est invalide : %s" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "ouverture du fichier paquet pour réutilisation impossible : %s" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé" + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "lecture du fichier de paquet réutilisé impossible" + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à " "cause de pack.packSizeLimit" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Écriture des objets" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "échec du stat de %s" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "désactivation de l'écriture en bitmap car certains objets ne sont pas " "compressés" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "dépassement de décalage de base de delta pour %s" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "décalage de base de delta est hors limite pour %s" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Décompte des objets" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "impossible de récupérer la taille de %s" + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "impossible d'analyser l'entête d'objet de %s" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "l'objet %s ne peut être lu" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "paquet sous-optimal - mémoire insuffisante" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Compression des objets" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "inconsistance dans le compte de delta" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17467,7 +16426,7 @@ msgstr "" "ID d'objet de bord attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17476,243 +16435,256 @@ msgstr "" "ID d'objet attendu, reçu des données illisibles :\n" "%s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "valeur invalide pour --missing" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "impossible d'ouvrir l'index de paquet" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "l'objet libre à %s n'a pas pu être examiné" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "impossible de forcer l'objet libre" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "'%s' n'est pas une révision" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "mauvaise révision '%s'" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "impossible d'ajouter les objets récents" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "version d'index non supportée %s" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "mauvaise version d'index '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "ne pas afficher la barre de progression" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "afficher la barre de progression" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "afficher la barre de progression durant la phase d'écrite des objets" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "similaire à --all-progress quand la barre de progression est affichée" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<version>[,<décalage>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "" "écrire le fichier d'index du paquet dans le format d'index de version " "spécifié" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "taille maximum de chaque fichier paquet en sortie" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "ignorer les objets empruntés à un autre magasin d'objets" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "ignorer les objets empaquetés" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "limiter la fenêtre d'empaquetage par objets" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "" "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "longueur maximum de la chaîne de delta autorisée dans le paquet résultant" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "réutiliser les deltas existants" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "réutiliser les objets existants" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "utiliser les objets OFS_DELTA" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "" "utiliser des fils lors de la recherche pour une meilleure correspondance des " "deltas" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "ne pas créer un paquet vide" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "lire les paramètres de révision depuis l'entrée standard" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "inclure les objets accessibles depuis toute référence" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "inclure les objets référencés par les éléments de reflog" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "inclure les objets référencés par l'index" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "afficher l'empaquetage sur la sortie standard" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "garder les objets inaccessibles" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "empaqueter les objets inaccessibles détachés" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "dépaqueter les objets inaccessibles plus récents que <heure>" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "utiliser l'algorithme de joignabilité creuse" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "créer des paquets légers" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "créer des paquets permettant des récupérations superficielles" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "ignorer les paquets qui ont un fichier .keep" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "ignorer ce paquet" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "niveau de compression du paquet" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "ne pas cacher les validations par greffes" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "utiliser un index en bitmap si disponible pour accélerer le décompte des " "objets" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "écrire un index en bitmap associé à l'index de paquet" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "écrire un index de bitmap si possible" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "gestion des objets manquants" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "respecter les îlots pendant la compression des deltas" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit est trop grand, forcé à %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size ne peut pas être utilisé pour construire un paquet à " "transférer" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "la taille limite minimale d'un paquet est 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "impossible d'utiliser --filter sans --stdout" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Énumération des objets" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" -"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), " -"réutilisés du pack %<PRIu32>" +"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>)" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17754,53 +16726,53 @@ msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs" msgid "cannot prune in a precious-objects repo" msgstr "impossible de nettoyer dans un dépôt d'objets précieux" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Valeur invalide pour %s : %s" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "contrôler la récupération récursive dans les sous-modules" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Options relatives à la fusion" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "autoriser l'avance rapide" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "remiser avant et réappliquer après le rebasage automatiquement" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Options relatives au rapatriement" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "forcer l'écrasement de la branche locale" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valeur invalide pour pull.ff : %s" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17808,14 +16780,14 @@ msgstr "" "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous " "venez de récupérer." -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Il n'y a pas de candidate avec laquelle fusionner parmi les références que " "vous venez de récupérer." -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17823,7 +16795,7 @@ msgstr "" "Généralement, cela signifie que vous avez indiqué un spécificateur\n" "de référence joker qui n'a pas eu de correspondance sur le serveur distant." -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17835,44 +16807,44 @@ msgstr "" "configuration\n" "pour la branche actuelle, vous devez spécifier la branche avec la commande." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Vous n'êtes actuellement sur aucune branche." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Veuillez spécifier une branche avec laquelle fusionner." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Référez-vous à git-pull(1) pour de plus amples détails." -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<distant>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branche>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Pas d'information de suivi distant pour la branche actuelle." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17882,34 +16854,34 @@ msgstr "" "'%s'\n" "du serveur distant, mais cette référence n'a pas été récupérée." -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "impossible d'accéder le commit %s" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "--verify-signatures est ignoré pour un rebasage" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase." -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Mise à jour d'une branche non encore créée avec les changements ajoutés dans " "l'index." -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "tirer avec un rebasage" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "veuillez les valider ou les remiser." -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17920,7 +16892,7 @@ msgstr "" "avance rapide de votre copie de travail\n" "depuis le commit %s." -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17937,15 +16909,15 @@ msgstr "" "$ git reset --hard\n" "pour régénérer." -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Impossible de fusionner de multiples branches sur une tête vide." -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Impossible de rebaser sur de multiples branches." -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossible de rebaser avec des modifications de sous-modules enregistrées " @@ -17955,15 +16927,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "raccourci d'étiquette sans <étiquette>" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete accepte seulement des noms entiers de références cibles" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17972,7 +16944,7 @@ msgstr "" "Pour choisir l'option de manière permanente, voir push.default dans 'git " "help config'." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17997,7 +16969,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -18012,7 +16984,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-la-branche-amont>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18026,13 +16998,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branche courante %s a de multiples branches amont, impossible de pousser." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18043,14 +17015,14 @@ msgstr "" "pas une branche amont de votre branche courante '%s', sans me dire\n" "quoi pousser pour mettre à jour quelle branche amont." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Vous n'avez pas spécifié de spécifications de référence à pousser, et push." "default est \"nothing\"." -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18065,7 +17037,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18080,7 +17052,7 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18098,13 +17070,13 @@ msgstr "" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Les mises à jour ont été rejetées car l'étiquette existe déjà dans la " "branche distante." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18116,142 +17088,142 @@ msgstr "" "pointer\n" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "Poussée vers %s\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "impossible de pousser des références vers '%s'" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "mauvais dépôt '%s'" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Pas de destination pour pousser.\n" +"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " +"en utilisant\n" +"\n" +" git remote add <nom> <url>\n" +"\n" +"et poussez alors en utilisant le dépôt distant\n" +"\n" +" git push <nom>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "dépôt" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "pousser toutes les références" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "refléter toutes les références" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "supprimer les références" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "forcer les mises à jour" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<nom-de-ref>:<attendu>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "contrôler la poussée récursive des sous-modules" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "utiliser un empaquetage léger" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "recevoir le programme d'empaquetage" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "définir la branche amont pour git pull/status" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "éliminer les références locales supprimées" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "éviter d'utiliser le crochet pre-push" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "pousser les étiquettes manquantes mais pertinentes" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signer la poussée avec GPG" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "demande une transaction atomique sur le serveur distant" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete est incompatible avec --all, --mirror et --tags" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete n'a pas de sens sans aucune référence" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "mauvais dépôt '%s'" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Pas de destination pour pousser.\n" -"Spécifiez une URL depuis la ligne de commande ou configurez un dépôt distant " -"en utilisant\n" -"\n" -" git remote add <nom> <url>\n" -"\n" -"et poussez alors en utilisant le dépôt distant\n" -"\n" -" git push <nom>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all et --tags sont incompatibles" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror et --tags sont incompatibles" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ne peut pas être combiné avec des spécifications de référence" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all et --mirror sont incompatibles" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "" "les options de poussée ne peuvent pas contenir de caractères de nouvelle " @@ -18271,32 +17243,24 @@ msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "Pourcentage par lequel la création est pondérée" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "utiliser des couleurs de diff simples" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "notes" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "passé à 'git log'" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "pas de .. dans la plage : '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "un format d'argument unique doit être une plage symétrique" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "plage entre deux commits requise" @@ -18379,17 +17343,13 @@ msgstr "déboguer unpack-trees" msgid "suppress feedback messages" msgstr "supprimer les messages d'information de suivi" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Vous devez d'abord résoudre votre index courant" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-" -"base] [<amont> [<branche>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base>] [<amont>] " +"[<branche>]" #: builtin/rebase.c:34 msgid "" @@ -18402,207 +17362,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "liste à faire inutilisable : '%s'" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "impossible d'écrire '%s'." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "pas de HEAD ?" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "impossible de créer un fichier temporaire %s" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "impossible de marquer comme interactif" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "impossible de générer la liste à-faire" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit de base doit être fourni avec --upstream ou --onto" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<options>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(OBSOLÈTE) garder les validations vides" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "garder les validations vides" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "autoriser les validations avec des messages vides" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "rebaser les commits de fusion" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "conserver les points de branchement de cousins originaux" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "déplacer les commits qui commencent par squash!/fixup!" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "signer les commits" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "continuer le rebasage" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "sauter le commit" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "éditer la liste à-faire" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "afficher le patch courant" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "raccourcir les identifiants de commits dans la liste à-faire" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "étendre les identifiants de commit dans la liste à-faire" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "vérifier la liste à-faire" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "réarranger les lignes fixup/squash" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "insérer les commandes exec dans la liste à-faire" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "sur" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "restreindre la révision" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "écraser-sur" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "écraser sur" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "le commit amont" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "nom du head" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "nom du head" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "stratégie de rebasage" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "options de stratégie" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "options de stratégie" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "la branche ou le commit à extraire" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "sur-le-nom" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "sur le nom" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "la commande à lancer" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "re-planifier automatiquement tout `exec` qui échoue" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s requiert un rebasage interactif" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossible d'accéder 'onto' : '%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head invalide : '%s'" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "allow_rerere_autoupdate invalide ignoré : '%s'" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Impossible de lire '%s'" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "Impossible de stocker %s" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "impossible de déterminer la révision HEAD" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18616,7 +17585,7 @@ msgstr "" "arrêter\n" "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18635,16 +17604,7 @@ msgstr "" "\n" "Résultat, git ne peut pas les rebaser." -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), " -"\"keep\" (garder) et \"ask\" (demander)." - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18661,7 +17621,7 @@ msgstr "" " git rebase '<branche>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18675,136 +17635,127 @@ msgstr "" " git branch --set-upstream-to=%s/<branche> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "les commandes exec ne peut pas contenir de retour à la ligne" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "commande exec vide" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "rebaser sur la branche %s au lieu de la branche amont" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "" -"utiliser la base de fusion de l'amont et la branche comme base actuelle" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "permettre le lancement du crochet pre-rebase" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "être silencieux. implique --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "ne pas afficher un diffstat de ce qui a changé en amont" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "ajouter une ligne Signed-off-by à chaque message de validation" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" -msgstr "passé jusqu'à 'git am'" +msgstr "passé à 'git am'" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "passé jusqu'à git-apply" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "picorer tous les commits, même sans modifiant" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "continuer" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "sauter le patch courant et continuer" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "abandonner et extraire la branche d'origine" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "abandonne mais garde HEAD où il est" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "éditer la liste à faire lors d'un rebasage interactif" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "afficher le patch en cours d'application ou de fusion" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "utiliser des stratégies d'application pour rebaser" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "utiliser des stratégies de fusion pour rebaser" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "laisser l'utilisateur éditer la liste des commits à rebaser" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "comment gérer les commits qui deviennent vides" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "préserver les validations vides pendant le rebasage" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "déplace les commits qui commencent par squash!/fixup! sous -i" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "remiser et réappliquer automatiquement avant et après" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "ajouter les lignes exec après chaque commit de la liste éditable" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "autoriser les commits de rebasage avec des messages vides" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "essayer de rebaser les fusions au lieu de les garder" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "utiliser la stratégie de fusion indiquée" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "option" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "passer les arguments jusqu'à la stratégie de fusion" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "rebaser tous les objets inatteignables depuis les racines" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18812,40 +17763,32 @@ msgstr "" "les support de rebase.useBuiltin a été supprimé !\n" "Voir son entrée dans 'git help config' pour plus de détails." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la " "place." -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "impossible de combiner '--keep-base' avec '--onto'" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "impossible de combiner '--keep-base' avec '--root'" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Pas de rebasage en cours ?" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'action --edit-todo peut seulement être utilisée lors d'un rebasage " "interactif." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Impossible de lire HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18853,16 +17796,16 @@ msgstr "" "Vous devez éditer tous les conflits de fusion et\n" "les marquer comme résolus avec git add" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "Impossible de supprimer les changements de l'arbre de travail" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "Impossible de revenir à %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18884,168 +17827,176 @@ msgstr "" "chose\n" "d'important ici.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "l'option `C' attend un valeur numérique" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "mode inconnu : %s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "" -"impossible de combiner les options d'application avec les options de fusion" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "backend de rebasage inconnu : %s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiert --exec ou --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "" +"impossible de combiner les options am avec l'options interactive ou merge" + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "erreur : impossible de combiner '--preserve-merges' avec '--reschedule-" "failed-exec'" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "impossible de combiner '--rebase-merges' avec '--strategy-option'" + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "impossible de combiner '--rebase-merges' avec '--strategy'" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "amont invalide '%s'" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "Impossible de créer un nouveau commit racine" -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "'%s': exactement une base de fusion nécessaire avec une branche" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': exactement une base de fusion nécessaire" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "ne pointe pas sur une validation valide : '%s'" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal : pas de branche ou commit '%s'" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Référence inexistante : %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Impossible de résoudre le commit HEAD vers un révision" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Autoremisage impossible" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "réponse de remisage inattendue : '%s'" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossible de créer le répertoire pour '%s'" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Autoremisage créé : %s\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "impossible de réinitialiser --hard" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD est maintenant à %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Veuillez les valider ou les remiser." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "impossible d'analyser '%s'" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "Impossible de basculer vers %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD est à jour." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La branche courante %s est à jour.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD est à jour, rebasage forcé." -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "La branche courante %s est à jour, rebasage forcé.\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "Le crochet pre-rebase a refusé de rebaser." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Changements vers %s :\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Changements de %s sur %s :\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Rembobinage préalable de head pour pouvoir rejouer votre travail par-" "dessus...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Impossible de détacher HEAD" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rapide de %s sur %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <répertoire-git>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19075,7 +18026,7 @@ msgstr "" "Pour éliminer ce message et conserver le comportement par défaut,\n" "réglez « receive.denyCurrentBranch » à 'refuse'." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19125,49 +18076,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <référence>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' n'est pas un horodatage valide" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "Marquage des objets inaccessibles..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "%s ne pointe nulle part !" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "pas de journal de références à supprimer spécifié" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "'%s' n'est pas un journal de références" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "pas de journal de références pour '%s'" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "format de référence invalide : %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -19175,83 +18126,83 @@ msgstr "" "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <ancienne> <nouvelle>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | " "<distante>)...]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branche>..." -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <nouvelle-URL>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <url>" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<options>] <nom> <URL>" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branche>..." -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branche>..." -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<options>] <nom>" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<options>] <nom>" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<options>] [<groupe> | <distante>]..." -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Mise à jour de %s" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -19259,104 +18210,88 @@ msgstr "" "--mirror est dangereux et obsolète ; merci\n" "\t d'utiliser --mirror=fetch ou --mirror=push à la place" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "argument miroir inconnu : %s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "" "importer toutes les étiquettes et les objets associés lors du rapatriement" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "ou ne rapatrier aucune étiquette (--no-tags)" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "branche(s) à suivre" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "branche maîtresse" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "paramétrer la distante comme miroir pour pousser ou pour rapatrier depuis" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "spécifier les branches à suivre n'a de sens qu'avec des miroirs de " "rapatriement" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "la distante %s existe déjà." -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' n'est pas un nom valide de distante" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "Impossible de paramétrer la maîtresse '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Impossible d'obtenir une correspondance distante pour la spécification de " "référence %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(correspond)" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(supprimer)" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "impossible d'assigner '%s'" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"La configuration %s remote.pushDefault dans :\n" -"\t%s%d\n" -"nomme à présent le distant inexistant '%s'" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "Pas de serveur remote : '%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Impossible de renommer la section de configuration '%s' en '%s'" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19367,17 +18302,17 @@ msgstr "" "\t%s\n" "\tVeuillez mettre à jour la configuration manuellement si nécessaire." -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "échec de suppression de '%s'" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "échec de création de '%s'" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19392,118 +18327,118 @@ msgstr[1] "" "supprimées ;\n" "pour les supprimer, utilisez :" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossible de supprimer la section de configuration '%s'" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " suivi" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " dépassé (utilisez 'git remote prune' pour supprimer)" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase de manière interactive sur la distante %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebase de manière interactive (avec fusions) sur la distante %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "rebase sur la distante %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " fusionne avec la distante %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "fusionne avec la distante %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s et avec la distante %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "créer" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "supprimer" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "à jour" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "peut être mis à jour en avance rapide" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "le local n'est pas à jour" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s force vers %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s pousse vers %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s force vers %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s pousse vers %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "ne pas interroger les distantes" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* distante %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " URL de rapatriement : %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(pas d'URL)" @@ -19511,25 +18446,25 @@ msgstr "(pas d'URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " URL push : %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " Branche HEAD : %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(non demandé)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(inconnu)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -19537,162 +18472,171 @@ msgstr "" " Branche HEAD (la HEAD distante est ambiguë, peut être l'une des " "suivantes) :\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branche distante :%s" msgstr[1] " Branches distantes :%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (état non demandé)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branche locale configurée pour 'git pull' :" msgstr[1] " Branches locales configurées pour 'git pull' :" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " Les références locales seront reflétées par 'git push'" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Référence locale configurée pour 'git push'%s :" msgstr[1] " Références locales configurées pour 'git push'%s :" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "définir refs/remotes/<nom>/HEAD selon la distante" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "supprimer refs/remotes/<nom>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Impossible de déterminer la HEAD distante" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Il y a de multiples branches HEAD distantes. Veuillez en choisir une " "explicitement avec :" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "Impossible de supprimer %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "Référence non valide : %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "Impossible de paramétrer %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s se retrouvera en suspens !" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s se retrouve en suspens !" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Élimination de %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL : %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [serait éliminé] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [éliminé] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "éliminer les distants après le rapatriement" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "Pas de serveur remote '%s'" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "ajouter une branche" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "pas de serveur distant spécifié" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "interroger les URLs de poussée plutôt que les URLs de récupération" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "retourner toutes les URLs" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "aucune URL configurée pour le dépôt distant '%s'" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "manipuler les URLs push" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "ajouter une URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "supprimer des URLs" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete n'a aucun sens" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Motif d'URL ancien invalide : %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "Pas d'URL trouvée : %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "Pas de suppression de toutes les URLs non-push" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "être verbeux : doit être placé avant une sous-commande" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sous-commande inconnue : %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<options>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19701,117 +18645,117 @@ msgstr "" "Utilisez\n" "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps." -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "" "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis " "les objects de paquet." -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossible de terminer pack-objects pour ré-empaqueter les objets de " "prometteur" -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "empaqueter tout dans un seul paquet" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "identique à -a et transformer les objets inaccessibles en suspens" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "supprimer les paquets redondants et lancer git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passer --no-reuse-delta à git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passer --no-reuse-object à git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "ne pas lancer git update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "passer --local à git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "écrire un index en bitmap" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "passer --delta-islands à git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "date approximative" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "avec -a, repaquétiser les objets inaccessibles" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "taille de la fenêtre utilisée pour la compression des deltas" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "octets" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "limite la profondeur maximale des deltas" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "limite le nombre maximal de fils" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "taille maximum de chaque fichier paquet" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "réempaqueter les objets dans des paquets marqués avec .keep" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "ne pas rempaqueter ce paquet" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable et -A sont incompatibles" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Rien de neuf à empaqueter." -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19830,7 +18774,7 @@ msgstr "" "ALERTE : aussi échoué.\n" "ALERTE : Veuillez les renommer manuellement dans %s :\n" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "échec de la suppression de '%s'" @@ -19938,8 +18882,8 @@ msgstr "fstat de %s impossible" msgid "unable to write object to database" msgstr "impossible d'écrire l'objet dans la base de données" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "nom d'objet invalide : '%s'" @@ -19958,22 +18902,22 @@ msgstr "échec de l'édition du fichier d'objet" msgid "new object is the same as the old one: '%s'" msgstr "le nouvel objet est identique à l'ancien : '%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "impossible d'analyser %s comme commit" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "mauvaise étiquette de fusion dans le commit '%s'" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "étiquette de fusion malformée dans le commit '%s'" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19982,31 +18926,31 @@ msgstr "" "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; " "utilisez --edit au lieu de --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "le commit original '%s' contient une signature GPG" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "la signature sera éliminée dans la validation de remplacement !" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Impossible d'écrire le commit de remplacement pour '%s'" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft pour '%s' non nécessaire" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "le nouveau commit est identique à l'ancien : '%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -20015,71 +18959,71 @@ msgstr "" "impossible de convertir la(les) greffe(s) suivante(s) :\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "afficher les références de remplacement" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "supprimer les références de remplacement" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "éditer l'objet existant" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "Modifier les parents d'un commit" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "convertir le fichier de greffe existant" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "remplacer la référence si elle existe" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "afficher sans mise en forme pour --edit" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "utiliser ce format" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format ne peut pas être utilisé sans lister" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f n'a de sens qu'en écrivant un remplacement" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw n'a de sens qu'avec l'option --edit" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d requiert au moins un argument" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "mauvais nombre d'arguments" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e requiert un seul argument" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g requiert au moins un argument" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file ne supporte aucun argument" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "-l n'accepte qu'un motifs" @@ -20108,129 +19052,117 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "" -"git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..." #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]" -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "git reset --patch [<arbre-esque>] [--] [<spéc.-de-chemin>...]" - -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "mixed" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "soft" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "hard" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "merge" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "keep" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "Vous n'avez pas une HEAD valide." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Impossible de trouver l'arbre pour HEAD." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Impossible de trouver l'arbre pour %s." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD est maintenant à %s" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossible de faire un \"reset %s\" au milieu d'une fusion." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "être silencieux, afficher seulement les erreurs" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "réinitialiser HEAD et l'index" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "réinitialiser seulement HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "réinitialiser HEAD, l'index et la copie de travail" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "réinitialiser HEAD mais garder les changements locaux" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "" "enregistrer seulement le fait que les chemins effacés seront ajoutés plus " "tard" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Échec de résolution de '%s' comme une révision valide." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Échec de résolution de '%s' comme un arbre valide." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch est incompatible avec --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la " "place." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossible de faire un \"%s reset\" avec des chemins." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "Le \"%s reset\" n'est pas permis dans un dépôt nu" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N ne peut être utilisé qu'avec --mixed" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Modifications non indexées après reset :" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -20245,30 +19177,35 @@ msgstr "" "de\n" "config reset.quiet à true pour avoir ce comportement en permanence.\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossible de réinitialiser le fichier d'index à la révision '%s'." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Impossible d'écrire le nouveau fichier d'index." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossible de combiner --exclude-promisor-objects et --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "le filtrage d'objet exige --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valeur invalide de 'sparse' '%s'" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list ne supporte l'affichage des notes" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "le comptage marqué est incompatible avec --objects" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -20433,42 +19370,38 @@ msgid_plural "the following files have local modifications:" msgstr[0] "le fichier suivant a des modifications locales :" msgstr[1] "les fichiers suivants ont des modifications locales :" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "ne pas afficher les fichiers supprimés" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "supprimer seulement de l'index" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "outrepasser la vérification des fichiers à jour" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "autoriser la suppression récursive" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "sortir avec un état zéro même si rien ne correspondait" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "veuillez indexer vos modifications de .gitmodules ou les remiser pour " "continuer" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "pas de suppression récursive de '%s' sans -r" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm : impossible de supprimer %s" @@ -20727,85 +19660,15 @@ msgstr "" "afficher les références de l'entrée standard qui ne sont pas dans le dépôt " "local" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <options>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"cet arbre de travail n'est pas partiel (le fichier sparse-checkout pourrait " -"ne pas exister)" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "" -"échec de la création du répertoire pour le fichier d'extraction partielle" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "échec de paramétrage extensions.worktreeConfig" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "initialiser l'extraction partielle en mode cone" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "initialiser l'extraction partielle" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "échec à l'ouverture de '%s'" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "impossible de normaliser le chemin '%s'" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "Impossible de décoter la chaîne en style C '%s'" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "impossible de charger les motifs de l'extraction partielle existants" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "lire les motifs depuis l'entrée standard" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "indiquer les motifs de l'extraction partielle" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "désactiver d'extraction partielle" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "erreur lors du rafraîchissement du répertoire de travail" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<options>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<options>] [<remise>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<remise>]" @@ -20813,27 +19676,25 @@ msgstr "git stash drop [-q|--quiet] [<remise>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nom-de-branche> [<remise>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n" " [--] [<spécificateur-de-chemin>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20841,198 +19702,188 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<remise>]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<remise>]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<spécificateur-de-chemin>...]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' n'est pas une validation de type remisage" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "Trop de révisions spécifiées : %s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "Aucune entrée de remisage trouvée." -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "%s n'est pas une référence valide" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear avec des paramètres n'est pas implémenté" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "impossible d'appliquer un remisage en cours de fusion" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "impossible de générer %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "conflits dans l'index. Essayez sans --index." -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "impossible de sauvegarder l'arbre d'index" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "Fusion de %s avec %s" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "L'index n'a pas été sorti de remise." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "tentative de recréer l'index" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "%s supprimé (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s : Impossible de supprimer l'élément de stash" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' n'est pas une référence de remisage" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" "L'entrée de remisage est conservée au cas où vous en auriez encore besoin." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Aucune branche spécifiée" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Impossible de mettre à jour %s avec %s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "message pour le remisage" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" exige un argument <commit>" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Aucun changement sélectionné" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Vous n'avez pas encore la validation initiale" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Impossible de sauver l'état courant de l'index" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Impossible de sauver les fichiers non-suivis" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Impossible de sauver l'état courant de la copie de travail" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Impossible d'enregistrer l'état de la copie de travail" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossible d'utiliser --patch et --include-untracked ou --all en même temps" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Vous avez sûrement oublié 'git add' ?" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Pas de modifications locales à sauver" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Impossible d'initialiser le remisage" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Impossible de sauver l'état courant" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbre de travail et état de l'index sauvegardés dans %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Impossible de supprimer les changements de la copie de travail" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "conserver l'index" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "remiser une mode rustine" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "mode silencieux" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "inclure les fichiers non suivis dans la remise" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "inclure les fichiers ignorés" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "impossible d'exécuter %s" @@ -21055,40 +19906,40 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Nom de référence complet attendu, %s obtenu" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote n'accepte aucun argument" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossible de supprimer un composant de l'URL '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "ancre alternative pour les chemins relatifs" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "Entrée dans '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21097,7 +19948,7 @@ msgstr "" "run_command a retourné un statut non-nul pour %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -21108,20 +19959,20 @@ msgstr "" "modules inclus de %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "" "Supprimer la sortie lors de l'entrée dans chaque commande de sous-module" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -21130,60 +19981,60 @@ msgstr "" "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme " "son propre amont d'autorité." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sous-module '%s' (%s) enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "attention : nous vous suggérons de spécifier une commande de mode de mise à " "jour pour le sous-module '%s'\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module " "'%s'" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<options>] [<chemin>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "Pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le " "chemin '%s'" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "impossible de résoudre HEAD dans le sous-module '%s'" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "récursion impossible dans le sous-module '%s'" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "supprimer la sortie d'état du sous-module" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -21191,48 +20042,48 @@ msgstr "" "Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD " "du sous-module" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper <nom> <chemin>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisation de l'URL sous-module pour '%s'\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "échec d'enregistrement de l'URL pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "échec de mise à jour du dépôt distant pour le sous-module '%s'" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "" "Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21242,7 +20093,7 @@ msgstr "" "'rm -rf' si vous voulez vraiment le supprimer en incluant tout son " "historique)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21251,208 +20102,179 @@ msgstr "" "L'arbre de travail du sous-module '%s' contient des modifications locales ; " "utilisez '-f' pour les annuler" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Répertoire '%s' nettoyé\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Impossible de supprimer l'arbre de travail du sous-module '%s'\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossible de créer le répertoire vide du sous-module %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Sous-module '%s' (%s) non enregistré pour le chemin '%s'\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Éliminer les arbres de travail des sous-modules même s'ils contiennent des " "modifications locales" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Désenregistrer tous les sous-modules" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"Une alternative calculée depuis l'alternative du super-projet est invalide.\n" -"Pour permettre à Git de cloner sans alternative dans un tel cas, réglez\n" -"submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n" -"clonez avec '--reference-if-able' au lieu de '--reference'." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "le sous-module '%s' ne peut pas ajouter d'alternative : %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "La valeur '%s' pour submodule.alternateLocation n'est pas reconnue" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "emplacement où le sous-module sera cloné" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "nom du nouveau sous-module" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "URL depuis laquelle cloner le sous-module" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "profondeur de l'historique des clones superficiels" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "forcer l'affichage de la progression du clonage" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "interdire de cloner dans un répertoire non-vide" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference " -"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> " -"--path <chemin>" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"refus de créer/utiliser '%s' dans un répertoire git d'un autre sous-module" +"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, 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é" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "le répertoire n'est pas vide : '%s'" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossible de créer le répertoire de sous-module pour '%s'" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Le chemin de sous-module '%s' n'est pas initialisé" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Vous voudriez sûrement utiliser 'update --init' ?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Sous-module non fusionné %s non traité" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Impossible de cloner '%s' pour la seconde fois, abandon" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "chemin dans la copie de travail" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "chemin dans la copie de travail, traversant les frontières de sous-modules" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "valeurs possibles : rebase, merge, checkout ou none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Créer un clone superficiel tronqué au nombre de révisions spécifié" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "jobs parallèles" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "spécifie si le clonage initial doit être aussi superficiel" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "ne pas afficher la progression du clonage" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "valeur invalide pour la mise à jour du paramètre" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21461,51 +20283,51 @@ msgstr "" "la branche du sous-module %s est configurée pour hériter de la branche du " "superprojet, mais le superprojet n'est sur aucune branche" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "impossible de trouver une poignée de dépôt pour le sous-module '%s'" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "parcourir récursivement les sous-modules" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper embed-git-dir [<options>] [<chemin>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "vérifier si écrire dans le fichier .gitmodules est sur" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "désactiver la configuration dans le fichier .gitmodules" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config name [<valeur>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nom>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ne gère pas --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" @@ -21763,218 +20585,214 @@ msgstr "l'étiquette '%s' existe déjà" msgid "Updated tag '%s' (was %s)\n" msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Dépaquetage des objets" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "échec de la création du répertoire %s" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "échec de la création du fichier %s" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "échec de la suppression du fichier %s" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "échec de la suppression du répertoire %s" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Test du mtime dans '%s' " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un fichier" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" "l'information de stat du répertoire ne change pas après ajout d'un répertoire" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "" "l'information de stat du répertoire change après mise à jour d'un fichier" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "l'information de stat du répertoire change après l'ajout d'un fichier dans " "un sous-répertoire" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "fichier<" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "" "l'information de stat du répertoire ne change pas après la suppression d'un " "répertoire" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<options>] [--] [<fichier>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "continuer de rafraîchir même si l'index a besoin d'une mise à jour" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "rafraîchir : ignorer les sous-modules" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "ne pas ignorer les nouveaux fichiers" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "laisser les fichiers remplacer des répertoires et vice-versa" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "aviser des fichiers manquants dans la copie de travail" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "rafraîchir même si l'index contient des éléments non fusionnés" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "rafraîchir l'information de stat" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "comme --refresh, mais en ignorant l'option assume-unchanged" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<mode>, <objet>, <chemin>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "ajouter l'élément spécifié dans l'index" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "marquer les fichiers comme \"non changeants\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "mettre à zéro le bit supposé-non-modifié" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "marquer les fichiers comme \"index seulement\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "mettre à zéro le bit sauter-la-copie-de travail" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "ne pas toucher aux entrées restreintes à l'index" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de " "données des objets" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" "supprimer les chemins nommés même s'ils sont présents dans la copie de " "travail" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "avec --stdin : les lignes en entrée sont terminées par des octets nuls" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "lire la liste des chemins à mettre à jour depuis l'entrée standard" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "ajouter les éléments depuis l'entrée standard à l'index" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "repeupler les étapes n°2 et n°3 pour les chemins listés" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "ignorer les fichiers manquants dans la copie de travail" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "afficher les actions sur la sortie standard" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "écrire l'index dans ce format" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "activer ou désactiver l'index divisé" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "activer ou désactiver le cache de non-suivis" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "tester si le système de fichier supporte le cache de non-suivis" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "activer le cache de non-suivis sans tester le système de fichier" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "écrire l'index même s'il n'est pas marqué comme modifié" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "" "activer ou désactiver la surveillance du système de fichier (fsmonitor)" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "marquer les fichiers comme valides pour fsmonitor" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "effacer le bit de validité fsmonitor" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21982,7 +20800,7 @@ msgstr "" "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer l'index coupé" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21990,7 +20808,7 @@ msgstr "" "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver l'index coupé" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21998,11 +20816,11 @@ msgstr "" "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver le cache des fichiers non-suivis" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Le cache non suivi est désactivé" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -22010,29 +20828,29 @@ msgstr "" "core.untrackedCache est réglé à false ; supprimez-le ou changez-le si vous " "souhaitez vraiment activer le cache des fichiers non-suivis" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Le cache non suivi est activé pour '%s'" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor est réglé à false ; changez-le si vous souhaitez vraiment " "activer la surveillance du système de fichiers" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor activé" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor est réglé à true ; supprimez-le ou changez-le si vous " "souhaitez vraiment désactiver la surveillance du système de fichiers" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor désactivé" @@ -22128,56 +20946,56 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..." msgid "print tag contents" msgstr "afficher le contenu de l'étiquette" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<options>] <chemin> [<commit>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<options>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<options>] <chemin>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<options>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<options>] <arbre-de-travail>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <chemin>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "échec de la suppression de '%s'" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Suppression de worktrees/%s : répertoire invalide" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" "Suppression de worktrees/%s : échec de la lecture du fichier gitdir (%s)" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -22186,37 +21004,37 @@ msgstr "" "Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets " "attendus, %<PRIuMAX> octets lus)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Suppression de worktrees/%s : fichier gitdir invalide" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" "Suppression de worktrees/%s : le fichier gitdir point sur un endroit " "inexistant" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "afficher les arbres de travail éliminés" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "faire expirer les arbres de travail plus vieux que <temps>" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "'%s' existe déjà" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "impossible de ré-ajouter l'arbre de travail '%s'" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -22226,7 +21044,7 @@ msgstr "" "utilisez 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' " "pour corriger" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22235,129 +21053,129 @@ msgstr "" "'%s' est un arbre de travail manquant mais déjà enregistré ;\n" "utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "impossible de créer le répertoire de '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; " "précédemment sur %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "extraire la <branche> même si elle est déjà extraite dans une autre copie de " "travail" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "créer une nouvelle branche" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "conserver le verrou sur le nouvel arbre de travail" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "régler le mode de suivi (voir git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "essayer de nommer la nouvelle branche comme la branche amont" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B et --detach sont mutuellement exclusifs" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "raison du verrouillage" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' n'est pas une copie de travail" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "" "La copie de travail principale ne peut pas être verrouillée ou déverrouillée" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' est déjà verrouillé, car '%s'" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "'%s' est déjà verrouillé" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "'%s' n'est pas verrouillé" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "les arbres de travail contenant des sous-modules ne peuvent pas être " "déplacés ou supprimés" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "" "forcer le déplacement même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' est un arbre de travail principal" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossible de trouver le nom de la destination à partir de '%s'" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "la cible '%s' existe déjà" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22367,7 +21185,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22375,39 +21193,37 @@ msgstr "" "impossible de déplacer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "échec au déplacement de '%s' vers '%s'" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "échec du lancement de 'git status' sur '%s'" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "" -"'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le " -"supprimer" +msgid "'%s' is dirty, use --force to delete it" +msgstr "'%s' est sale, utilisez --force pour le supprimer" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "impossible de lancer 'git status' sur '%s', code %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "" "forcer la suppression même si l'arbre de travail est sale ou verrouillé" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22417,7 +21233,7 @@ msgstr "" "verrouillage : %s\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22425,7 +21241,7 @@ msgstr "" "impossible de supprimer un arbre de travail verrouillé;\n" "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -22447,22 +21263,6 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>" msgid "only useful for debugging" msgstr "seulement utile pour le débogage" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "commande 'mark' attendue, %s trouvé" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "commande 'to' attendue, %s trouvé" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "" -"la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22575,25 +21375,25 @@ msgstr "" "l'alias '%s' modifie les variables d'environnement.\n" "Vous pouvez utiliser '!git' dans l'alias pour le faire" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "alias vide pour %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "alias recursif : %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "échec d'écriture sur la sortie standard" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "échec inconnu d'écriture sur la sortie standard" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "échec de fermeture de la sortie standard" @@ -22649,24 +21449,24 @@ msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Les restrictions de protocole ne sont pas supportés avec cuRL < 7.19.4" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Impossible de régler la dorsale SSL à '%s' : cURL a été construit sans " "dorsale SSL" -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossible de spécifier le dorsal SSL à '%s' : déjà spécifié" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22677,160 +21477,149 @@ msgstr "" " demandé : %s\n" " redirection : %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "citation invalide dans la valeur push-option : '%s'" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "réponse du serveur invalide ; '%s' reçu" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "dépôt '%s' non trouvé" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "Échec d'authentification pour '%s'" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "impossible d'accéder à '%s' : %s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "redirection vers %s" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "impossible de rembobiner le données post rpc - essayer d'augmenter http." "postBuffer" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "échec RPC ; %s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "impossible de gérer des poussées aussi grosses" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "impossible de compresser la requête ; erreur de compression zlib %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "impossible de compresser la requête ; erreur de fin zlib %d" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "le protocole http idiot ne supporte la capacité superficielle" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "échec du récupération." -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "impossible de récupérer par sha1 sur http intelligent" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "le transport http ne supporte pas %s" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "échec de git-http-push" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <distant> [<url>]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl : erreur de lecture du flux de commande depuis git" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl : récupération tentée sans dépôt local" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "args" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "filtrage d'objet" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "date-d'expiration" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "sans action (rétrocompatibilité)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "être plus verbeux" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "être plus silencieux" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "utiliser <n> chiffres pour afficher les SHA-1s" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "lire les spécificateurs de fichier depuis fichier" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" -"avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un " -"caractère NUL" - #: ref-filter.h:101 msgid "key" msgstr "clé" @@ -23359,174 +22148,166 @@ msgid "Common Git shell script setup code" msgstr "Le code d'initialisation commun aux scripts shell Git" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Initialiser et modifier l'extraction partielle" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Remiser les modifications d'un répertoire de travail sale" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Ajouter le contenu de fichiers à l'index" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Afficher l'état de la copie de travail" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Retirer les espaces inutiles" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Initialiser, mettre à jour et inspecter les sous-modules" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Basculer de branche" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Lire, modifier et supprimer les références symboliques" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Créer un fichier temporaire avec le contenu d'un blob" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Dépaqueter les objets depuis une archive empaquetée" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Enregistrer le contenu d'un fichier de l'arbre de travail dans l'index" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "" "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs " "idiots" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Renvoyer une archive dans git-archive" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Renvoyer des objets empaquetés dans git-fetch-pack" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Afficher un variable logique de Git" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Vérifier la signature GPG de commits" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Valider des fichiers d'archive Git empaquetés" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Vérifier la signature GPG d'étiquettes" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interface web de Git" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Afficher les journaux avec la différence que chaque commit introduit" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Gère de arbres de travail multiples" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Créer un objet arbre depuis l'index courant" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Définition des attributs par chemin" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "interface en ligne de commande et conventions de Git" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Tutoriel du cœur de Git pour les développeurs" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git pour les utilisateurs de CVS" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Bidouillage de la sortie diff" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un ensemble minimal utile des commandes de Git pour tous les jours" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Un glossaire Git" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Crochets utilisés par Git" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Définition des propriétés de sous-module" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Espaces de nom de Git" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Disposition d'un dépôt Git" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Spécification des révisions et portées pour Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Montage d'un dépôt dans un autre dépôt" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Une introduction pratique à Git : deuxième partie" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Une introduction pratique à Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Un aperçu des flux de travail recommandés avec Git" @@ -23653,133 +22434,144 @@ msgstr "Essai de fusion simple avec $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "La fusion simple a échoué, essai avec la fusion automatique." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Impossible de mettre à jour $ref_stash avec $w_commit" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "erreur : option inconnue pour 'stash push' : $option" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "option inconnue : $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Trop de révisions spécifiées : $REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference n'est pas une référence valide" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' n'est pas une validation de type remisage" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' n'est pas une référence de remisage" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "impossible de rafraîchir l'index" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossible d'appliquer un remisage en cours de fusion" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Conflits dans l'index. Essayez sans --index." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Impossible de sauvegarder l'arbre d'index" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "" "Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Impossible de désindexer les fichiers modifiés" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} supprimé ($s)" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Impossible de supprimer l'entrée de stash" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Pour les restaurer tapez \"git stash apply\")" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Un chemin relatif ne peut être utilisé que depuis la racine de la copie de " "travail" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existe déjà dans l'index" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' n'a pas de commit extrait" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Le chemin suivant est ignoré par un de vos fichiers .gitignore :\n" +"$sm_path\n" +"Utilisez -f si vous voulez vraiment l'ajouter." + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Ajout du dépôt existant à '$sm_path' dans l'index" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) " "distant(s) :" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23796,39 +22588,39 @@ msgstr "" "correct\n" "ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'." -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'." -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossible d'extraire le sous-module '$sm_path'" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Échec d'ajout du sous-module '$sm_path'" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Échec d'enregistrement du sous-module '$sm_path'" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossible de trouver la révision courante dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23837,7 +22629,7 @@ msgstr "" "Impossible de trouver la révision courante ${remote_name}/${branch} dans le " "chemin de sous-module '$sm_path'" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23846,7 +22638,7 @@ msgstr "" "Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai " "de rapatriement direct de $sha1 :" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23855,76 +22647,76 @@ msgstr "" "Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas " "$sha1. La récupération directe de ce commit a échoué." -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "L'exécution de '$command $sha1' a échoué dans le chemin de sous-module " "'$displaypath'" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "L'option --cached ne peut pas être utilisée avec l'option --files" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode $mod_dst inattendu" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attention : $display_name ne contient pas la validation $sha1_src" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attention : $display_name ne contient pas la validation $sha1_dst" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -24246,10 +23038,6 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebasage de $shortrevisions sur $shortonto ($todocount commande)" msgstr[1] "Rebasage de $shortrevisions sur $shortonto ($todocount commandes)" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Veuillez noter que les commits vides sont en commentaire" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Impossible d'initialiser les commits réécrits" @@ -24322,19 +23110,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Impossible de déterminer le chemin absolu du répertoire git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %s12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "indexé" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "non-indexé" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "binaire" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "rien" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "inchangé" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "%d chemin ajouté\n" +msgstr[1] "%d chemins ajoutés\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "%d chemin mis à jour\n" +msgstr[1] "%d chemins mis à jour\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "%d chemin inversé\n" +msgstr[1] "%d chemins inversés\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d chemin touché\n" msgstr[1] "%d chemins touchés\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Mise à jour" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Inverser" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "note : %s n'est plus suivi à présent.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Ajouter un fichier non-suivi" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "Aucun Fichier non suivi.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24342,7 +23192,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme indexée." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24350,7 +23200,7 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme remisée." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24358,8 +23208,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme desindexée." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24367,8 +23217,8 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme appliquée." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24376,12 +23226,17 @@ msgstr "" "Si le patch s'applique proprement, la section éditée sera\n" "immédiatement marquée comme éliminée." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -24394,12 +23249,36 @@ msgstr "" "Pour éliminer les lignes '%s', effacez-les.\n" "Les lignes commençant par %s seront éliminées.\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Si ça ne s'applique pas proprement, vous aurez la possibilité de\n" +"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n" +"alors l'édition sera abandonnée et la section conservée.\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " +"l'élimine !) [y|n] ? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24413,7 +23292,7 @@ msgstr "" "a - indexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas indexer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24427,7 +23306,7 @@ msgstr "" "a - remiser cette section et toutes les suivantes de ce fichier\n" "d - ne pas remiser cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24441,7 +23320,7 @@ msgstr "" "a - désindexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas désindexer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24455,7 +23334,7 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24469,7 +23348,7 @@ msgstr "" "a - supprimer cette section et toutes les suivantes de ce fichier\n" "d - ne pas supprimer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24483,7 +23362,7 @@ msgstr "" "a - éliminer cette section et toutes les suivantes de ce fichier\n" "d - ne pas éliminer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24497,7 +23376,7 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24511,7 +23390,7 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24533,86 +23412,234 @@ msgstr "" "e - éditer manuellement la section actuelle\n" "? - afficher l'aide\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "Les appliquer quand même à l'arbre de travail ? " + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "Rien n'a été appliqué.\n" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "fichier non-fusionné ignoré : %s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Seuls des fichiers binaires ont changé.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Aucune modification.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Mise à jour par patch" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d" +"%s,?] ? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Aucune autre section à atteindre\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "aller à quelle section (<ret> pour voir plus) ? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "aller à quelle section ? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Nombre invalide : '%s'\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Désolé, %d seule section disponible.\n" msgstr[1] "Désolé, Seulement %d sections disponibles.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "aucune autre section à rechercher\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "rechercher la regex ? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regex de recherche malformée %s : %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Aucune section ne correspond au motif donné\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Pas de section précédente\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Pas de section suivante\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Désolé, impossible de découper cette section\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Découpée en %d section.\n" msgstr[1] "Découpée en %d sections.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Désolé, impossible d'éditer cette section\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Réviser la différence" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24630,19 +23657,19 @@ msgstr "" "diff - visualiser les diff entre HEAD et l'index\n" "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "-- manquant" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "mode de --patch inconnu : %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument invalide %s, -- attendu" diff --git a/third_party/git/po/git.pot b/third_party/git/po/git.pot index 7dd2e2bcf3..d799696ad0 100644 --- a/third_party/git/po/git.pot +++ b/third_party/git/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,665 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 "" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 "" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "" - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "" - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "" - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "" -msgstr[1] "" - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "" - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "" - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:186 +#: advice.c:180 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 "" -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -782,7 +176,17 @@ msgstr "" msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -793,523 +197,527 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "" @@ -1330,7 +738,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -1362,7 +770,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "" @@ -1370,12 +778,11 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "" @@ -1408,7 +815,7 @@ msgid "list supported archive formats" msgstr "" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "" @@ -1416,7 +823,7 @@ msgstr "" msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "" @@ -1447,66 +854,66 @@ msgstr "" msgid "Argument not supported for format '%s': -%d" msgstr "" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1522,33 +929,33 @@ msgstr "" msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1556,7 +963,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1564,43 +971,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1610,44 +1017,44 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1786,8 +1193,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "" @@ -1818,62 +1225,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1885,202 +1292,192 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "" @@ -2093,21 +1490,21 @@ msgstr "" msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" @@ -2116,49 +1513,49 @@ msgstr "" msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2200,7 +1597,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "" @@ -2336,7 +1733,7 @@ msgstr "" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "" @@ -2361,105 +1758,110 @@ msgstr "" msgid "failed to parse %s" msgstr "" -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "" -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2575,7 +1977,7 @@ msgstr "" msgid "unknown port %s" msgstr "" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "" @@ -2590,86 +1992,86 @@ msgstr "" msgid "cannot start proxy %s" msgstr "" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" #: convert.c:304 @@ -2684,117 +2086,117 @@ msgid "" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "" msgstr[1] "" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "" msgstr[1] "" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "" msgstr[1] "" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "" msgstr[1] "" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "" msgstr[1] "" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2802,14 +2204,14 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2845,7 +2247,7 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "" @@ -2900,581 +2302,562 @@ msgid "" "%s" msgstr "" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "" -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -3493,12 +2876,12 @@ msgstr "" msgid "could not stat file '%s'" msgstr "" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -3508,267 +2891,265 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "" @@ -3818,7 +3199,7 @@ msgid "Low-level Commands / Interrogators" msgstr "" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "" #: help.c:38 @@ -3904,12 +3285,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -3962,60 +3343,45 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" msgstr "" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" msgstr "" #: lockfile.c:151 @@ -4039,110 +3405,114 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4153,108 +3523,108 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4262,339 +3632,323 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "" -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" msgstr "" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -4635,32 +3989,32 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "" @@ -4674,11 +4028,6 @@ msgstr "" msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "" - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4694,7 +4043,7 @@ msgstr "" msgid "%s : incompatible with something else" msgstr "" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "" @@ -4704,41 +4053,41 @@ msgstr "" msgid "%s isn't available" msgstr "" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" +msgid "did you mean `--%s` (with two dashes ?)" msgstr "" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "" -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "" @@ -4746,21 +4095,21 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr "" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "" @@ -4785,87 +4134,82 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" +msgid "%s: '%s' is outside repository" msgstr "" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "" @@ -4926,42 +4270,33 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "" @@ -5000,180 +4335,172 @@ msgstr "" msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5195,26 +4522,26 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5223,33 +4550,36 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." +msgid "could not copy '%s' to '%s'." msgstr "" -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5260,13 +4590,6 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "" - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5277,7 +4600,7 @@ msgstr "" msgid "ignoring dangling symref %s" msgstr "" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "" @@ -5302,15 +4625,14 @@ msgstr "" msgid "unexpected object ID when writing '%s'" msgstr "" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "" @@ -5345,37 +4667,37 @@ msgstr "" msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "" @@ -5385,7 +4707,7 @@ msgstr "" msgid "invalid refspec '%s'" msgstr "" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "" @@ -5404,280 +4726,280 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5686,7 +5008,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5700,7 +5022,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5708,7 +5030,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5716,7 +5038,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5724,7 +5046,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5732,114 +5054,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5847,11 +5169,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5862,11 +5184,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -5881,7 +5203,7 @@ msgstr "" msgid "duplicate replace ref: %s" msgstr "" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "" @@ -5944,8 +5266,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -5979,20 +5301,20 @@ msgstr "" msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" @@ -6012,191 +5334,196 @@ msgid "" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "" -#: sequencer.c:329 -msgid "rebase" +#: sequencer.c:325 +msgid "rebase -i" msgstr "" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6213,11 +5540,15 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6232,7 +5563,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6246,345 +5577,346 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr "" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" +msgid "could not parse '%.*s'" msgstr "" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "" + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "" -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6596,22 +5928,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -6621,11 +5958,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -6636,72 +5973,76 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "" -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6709,26 +6050,31 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -6741,114 +6087,121 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "" -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" +msgid "'%s' is outside repository" msgstr "" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6856,12 +6209,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6869,381 +6222,381 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "" -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7256,104 +6609,44 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "" - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7361,18 +6654,13 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7401,137 +6689,62 @@ msgstr "" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "" - -#: submodule.c:1161 -#, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "" - -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "" - -#: submodule.c:1637 +#: submodule.c:1481 #, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" +msgid "Could not access submodule '%s'" msgstr "" -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7539,35 +6752,40 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" @@ -7583,7 +6801,7 @@ msgstr "" msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "" @@ -7602,7 +6820,7 @@ msgstr "" msgid "could not read from stdin" msgstr "" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "" @@ -7631,54 +6849,54 @@ msgstr "" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -7694,294 +6912,289 @@ msgid "" "\n" msgstr "" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "" -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7989,7 +7202,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7997,47 +7210,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8045,7 +7258,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8053,33 +7266,29 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" @@ -8109,51 +7318,47 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: walker.c:170 -msgid "Fetching objects" -msgstr "" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "" @@ -8471,88 +7676,80 @@ msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr "" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr "" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "" -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8560,225 +7757,216 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "" -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "" -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8796,187 +7984,169 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1267 +#: builtin/am.c:1277 #, c-format -msgid "missing author line in commit %s" +msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1270 +#: builtin/am.c:1299 #, c-format -msgid "invalid ident line: %.*s" +msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1489 +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "" @@ -8984,46 +8154,42 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "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 "" -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9031,195 +8197,185 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2288 -msgid "show the patch being applied" +#: builtin/am.c:2244 +msgid "show the patch being applied." msgstr "" -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "" @@ -9334,40 +8490,40 @@ msgstr "" msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You 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 "" -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9375,7 +8531,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -9384,284 +8540,288 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" msgstr "" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -9673,18 +8833,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "" @@ -9884,7 +9044,7 @@ msgstr "" msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "" @@ -9893,7 +9053,7 @@ msgid "change the upstream info" msgstr "" #: builtin/branch.c:627 -msgid "unset the upstream info" +msgid "Unset the upstream info" msgstr "" #: builtin/branch.c:628 @@ -9995,7 +9155,7 @@ msgstr "" msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "" @@ -10078,141 +9238,96 @@ msgid "" "'--set-upstream-to' instead." msgstr "" -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "" - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:160 -msgid "Need a repository to unbundle." -msgstr "" - -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" +#: builtin/bundle.c:62 +msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "" @@ -10240,8 +9355,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "" @@ -10253,27 +9368,27 @@ msgstr "" msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -10331,9 +9446,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "" @@ -10361,148 +9476,153 @@ msgstr "" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10517,7 +9637,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10534,315 +9654,306 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1128 -#, c-format -msgid "" -"'%s' could be both a local file and a tracking branch.\n" -"Please use -- (and optionally --no-guess) to disambiguate" -msgstr "" - -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." +#: builtin/checkout.c:1176 +msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1193 #, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" +msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1228 +#: builtin/checkout.c:1230 #, c-format -msgid "only one reference expected, %d given." +msgid "" +"'%s' could be both a local file and a tracking branch.\n" +"Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "" @@ -10881,7 +9992,7 @@ msgstr "" msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10890,7 +10001,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10903,33 +10014,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10940,68 +10056,76 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" @@ -11049,18 +10173,18 @@ msgstr "" msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "" @@ -11076,8 +10200,8 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "" @@ -11085,7 +10209,7 @@ msgstr "" msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "" @@ -11093,17 +10217,16 @@ msgstr "" msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "" @@ -11131,23 +10254,23 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "" @@ -11155,186 +10278,183 @@ msgstr "" msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "" @@ -11381,7 +10501,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "" @@ -11409,13 +10529,13 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "" @@ -11423,8 +10543,8 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -11481,102 +10601,94 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "" - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -11586,7 +10698,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -11596,14 +10708,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11611,386 +10723,393 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" msgstr "" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" msgstr "" -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -11998,209 +11117,205 @@ msgstr "" msgid "git config [<options>]" msgstr "" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "" -#: builtin/config.c:160 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12210,81 +11325,81 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "" -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:738 +#: builtin/config.c:712 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "" @@ -12297,166 +11412,166 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -12493,109 +11608,109 @@ msgstr "" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -12631,279 +11746,251 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12912,142 +11999,121 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" msgstr "" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13058,23 +12124,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "" @@ -13138,248 +12204,248 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "" @@ -13393,17 +12459,17 @@ msgstr "" msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13413,63 +12479,63 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" @@ -13487,258 +12553,258 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "" + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "" @@ -13916,11 +12982,11 @@ msgstr "" msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "" @@ -13976,191 +13042,191 @@ msgstr[1] "" msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "" @@ -14337,401 +13403,388 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "" -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "" -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1255 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "" -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14852,7 +13905,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "" @@ -14937,148 +13990,148 @@ msgstr "" msgid "git merge --continue" msgstr "" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" msgstr "" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "" -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" @@ -15125,173 +14178,173 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "" -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15374,33 +14427,33 @@ msgstr "" msgid "set labels for file1/orig-file/file2" msgstr "" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "" msgstr[1] "" -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "" -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "" @@ -15423,29 +14476,29 @@ msgstr "" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -15537,52 +14590,52 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "" @@ -15961,7 +15014,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "" @@ -15977,7 +15030,7 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -15992,338 +15045,375 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "" + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "" + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "" + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" #: builtin/pack-refs.c:8 @@ -16366,70 +15456,70 @@ msgstr "" msgid "cannot prune in a precious-objects repo" msgstr "" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16437,74 +15527,74 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16512,7 +15602,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16523,15 +15613,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -16539,21 +15629,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16568,7 +15658,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16578,7 +15668,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16587,12 +15677,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16600,12 +15690,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16613,7 +15703,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -16621,7 +15711,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -16630,143 +15720,143 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" + +#: builtin/push.c:554 msgid "repository" msgstr "" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "" @@ -16782,32 +15872,24 @@ msgstr "" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "" @@ -16886,14 +15968,10 @@ msgstr "" msgid "suppress feedback messages" msgstr "" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" #: builtin/rebase.c:34 @@ -16905,207 +15983,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "" + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" +#: builtin/rebase.c:449 +msgid "keep empty commits" msgstr "" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17114,7 +16201,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -17126,14 +16213,7 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -17144,7 +16224,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17153,185 +16233,169 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" msgstr "" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17344,163 +16408,171 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" +#: builtin/rebase.c:1797 +msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1937 -msgid "--reschedule-failed-exec requires --exec or --interactive" +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" msgstr "" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1985 -#, c-format -msgid "invalid upstream '%s'" +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" msgstr "" -#: builtin/rebase.c:1991 -msgid "Could not create new root commit" +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" msgstr "" -#: builtin/rebase.c:2017 +#: builtin/rebase.c:1865 #, c-format -msgid "'%s': need exactly one merge base with branch" +msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1871 +msgid "Could not create new root commit" +msgstr "" + +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -17517,7 +16589,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -17554,223 +16626,210 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "" -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -17778,17 +16837,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -17798,118 +16857,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr "" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr "" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "" @@ -17917,294 +16976,303 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18216,7 +17284,7 @@ msgid "" "WARNING: Please rename them in %s manually:\n" msgstr "" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -18319,8 +17387,8 @@ msgstr "" msgid "unable to write object to database" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "" @@ -18339,124 +17407,124 @@ msgstr "" msgid "new object is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "" @@ -18483,123 +17551,113 @@ msgid "" msgstr "" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "" #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "" -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "" - -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -18608,29 +17666,34 @@ msgid "" "to make this the default.\n" msgstr "" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" msgstr "" #: builtin/rev-parse.c:408 @@ -18782,40 +17845,36 @@ msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "" @@ -19052,82 +18111,15 @@ msgstr "" msgid "show refs from stdin that aren't in local repository" msgstr "" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "" @@ -19135,215 +18127,207 @@ msgstr "" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "" -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "" -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "" -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "" @@ -19364,47 +18348,47 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19412,369 +18396,346 @@ msgid "" "." msgstr "" -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" -msgstr "" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -20010,250 +18971,246 @@ msgstr "" msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "" -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr "" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "" @@ -20345,272 +19302,272 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use 'add -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" +msgid "'%s' is dirty, use --force to delete it" msgstr "" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -20631,21 +19588,6 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -20741,25 +19683,25 @@ msgid "" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "" @@ -20811,22 +19753,22 @@ msgstr "" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -20834,156 +19776,147 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "" -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" - #: ref-filter.h:101 msgid "key" msgstr "" @@ -21489,170 +20422,162 @@ msgid "Common Git shell script setup code" msgstr "" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "" @@ -21773,128 +20698,136 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -21905,122 +20838,122 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -22284,10 +21217,6 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "" @@ -22350,56 +21279,122 @@ msgid "Unable to determine absolute path of git directory" msgstr "" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -22408,12 +21403,31 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22422,7 +21436,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22431,7 +21445,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22440,7 +21454,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22449,7 +21463,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22458,7 +21472,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22467,7 +21481,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22476,7 +21490,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -22485,7 +21499,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22498,85 +21512,226 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "" + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "" + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "" + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "" + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -22587,19 +21742,19 @@ msgid "" "changes\n" msgstr "" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" diff --git a/third_party/git/po/it.po b/third_party/git/po/it.po index e9f596b8fd..30ec99c744 100644 --- a/third_party/git/po/it.po +++ b/third_party/git/po/it.po @@ -6,13 +6,13 @@ # Thanks to the former translators, Marco Paolone <marcopaolone AT gmail.com> # and Stefano Lattarini <stefano.lattarini AT gmail.com>, for their # contributions. -# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019, 2020. +# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-12 07:52+0100\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-11 11:48+0200\n" "Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n" "Language-Team: Italian <>\n" "Language: it\n" @@ -20,758 +20,51 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.12.3\n" +"X-Generator: Lokalize 19.04.3\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "Eh (%s)?" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "impossibile leggere l'indice" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "binario" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "non fare nulla" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "non modificato" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Aggiorna" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "impossibile aggiungere '%s' all'area di staging" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "impossibile scrivere l'indice" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "aggiornato %d percorso\n" -msgstr[1] "aggiornati %d percorsi\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "nota: %s ora non è tracciato.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry non riuscito per il percorso '%s'" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Esegui il revert" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "Impossibile analizzare HEAD^{tree}" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "ripristinato %d percorso\n" -msgstr[1] "ripristinati %d percorsi\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "Nessun file non tracciato.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "Aggiungi file non tracciati" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "aggiunto %d percorso\n" -msgstr[1] "aggiunti %d percorsi\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "ignoro ciò che non è stato sottoposto a merge: %s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Sono stati modificati solo file binari.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Nessuna modifica.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Aggiornamento patch" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Rivedi diff" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "visualizza i percorsi modificati" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "" -"aggiungi lo stato dall'albero di lavoro all'insieme delle modifiche " -"nell'area di staging" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "" -"ripristina l'insieme delle modifiche nell'area di staging alla versione HEAD" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "" -"seleziona gli hunk in modalità interattiva ed esegui l'aggiornamento in modo " -"selettivo" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "visualizza il diff fra HEAD e l'indice" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "" -"aggiungi i contenuti dei file non tracciati all'insieme delle modifiche " -"nell'area di staging" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "Guida prompt:" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "seleziona un singolo elemento" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "seleziona un intervallo di elementi" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "seleziona più intervalli" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "seleziona un elemento basandoti su un prefisso univoco" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "deseleziona gli elementi specificati" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "seleziona tutti gli elementi" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(vuoto) termina la selezione" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "seleziona un elemento numerato" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(vuoto) non selezionare nulla" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Comandi ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Cosa faccio ora" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "nell'area di staging" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "rimosso dall'area di staging" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "percorso" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "impossibile aggiornare l'indice" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Ciao.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Modifica modo stage [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Eliminazione stage [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Se la patch viene applicata senza problemi, l'hunk modificato sarà " -"contrassegnato immediatamente per l'aggiunta all'area di staging." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - aggiungi quest'hunk all'area di staging\n" -"n - non aggiungere quest'hunk all'area di staging\n" -"q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di " -"staging\n" -"a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di " -"staging\n" -"d - non aggiungere né quest'hunk né quelli successivi nel file all'area di " -"staging\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Modifica modo stash [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Eliminazione stash [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Se la patch viene applicata senza problemi, l'hunk modificato sarà " -"contrassegnato immediatamente per lo stash." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - esegui lo stash di quest'hunk\n" -"n - non eseguire lo stash di quest'hunk\n" -"q - esci; non eseguire lo stash di quest'hunk né di quelli rimanenti\n" -"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n" -"d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Se la patch viene applicata senza problemi, l'hunk modificato sarà " -"contrassegnato immediatamente per la rimozione dall'area di staging." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - rimuovi quest'hunk dall'area di staging\n" -"n - non rimuovere quest'hunk dall'area di staging\n" -"q - esci; non rimuovere né quest'hunk né quelli rimanenti dall'area di " -"staging\n" -"a - rimuovi quest'hunk e tutti quelli successivi nel file dall'area di " -"staging\n" -"d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di " -"staging\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" -"Se la patch viene applicata senza problemi, l'hunk modificato sarà " -"contrassegnato immediatamente per l'applicazione." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - applica quest'hunk all'indice\n" -"n - non applicare quest'hunk all'indice\n" -"q - esci; non applicare né quest'hunk né quelli rimanenti\n" -"a - applica quest'hunk e tutti quelli successivi nel file\n" -"d - non applicare né quest'hunk né quelli successivi nel file\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Se la patch viene applicata senza problemi, l'hunk modificato sarà " -"contrassegnato immediatamente per la rimozione." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - rimuovi quest'hunk dall'albero di lavoro\n" -"n - non rimuovere quest'hunk dall'albero di lavoro\n" -"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n" -"a - rimuovi quest'hunk e tutti quelli successivi nel file\n" -"d - non rimuovere né quest'hunk né quelli successivi nel file\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d" -"%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - rimuovi quest'hunk dall'indice e dall'albero di lavoro\n" -"n - non rimuovere quest'hunk dall'indice e dall'albero di lavoro\n" -"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n" -"a - rimuovi quest'hunk e tutti quelli successivi nel file\n" -"d - non rimuovere né quest'hunk né quelli successivi nel file\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d" -"%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - applica quest'hunk all'indice e all'albero di lavoro\n" -"n - non applicare quest'hunk all'indice e all'albero di lavoro\n" -"q - esci; non applicare né quest'hunk né quelli rimanenti\n" -"a - applica quest'hunk e tutti quelli successivi nel file\n" -"d - non applicare né quest'hunk né quelli successivi nel file\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - applica quest'hunk all'albero di lavoro\n" -"n - non applicare quest'hunk all'albero di lavoro\n" -"q - esci; non applicare né quest'hunk né quelli rimanenti\n" -"a - applica quest'hunk e tutti quelli successivi nel file\n" -"d - non applicare né quest'hunk né quelli successivi nel file\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "impossibile analizzare l'header hunk '%.*s'" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "impossibile analizzare l'header hunk colorato '%.*s'" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "impossibile analizzare il diff" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "impossibile analizzare il diff colorato" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "esecuzione di '%s' non riuscita" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "output di interactive.diffFilter non corrispondente" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Il filtro deve mantenere una corrispondenza uno a uno\n" -"fra le righe di input e di output." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"attesa riga contesto %d in\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"gli hunk non si sovrappongono:\n" -"%.*s\n" -"\tnon termina con:\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" -"Modalità manuale modifica hunt - vedi la fine del file per una guida " -"veloce.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"Per rimuovere '%c' righe, rendile righe ' ' (contesto).\n" -"Per rimuovere '%c' righe, eliminale.\n" -"Le righe che iniziano con %c saranno rimosse.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Se non può essere applicata senza problemi, ti sarà data la possibilità\n" -"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n" -"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "impossibile analizzare l'header hunk" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "'git apply --cached' non riuscito" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"L'hunk modificato non può essere applicato senza problemi. Modificarlo di " -"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Vuoi comunque applicarli all'albero di lavoro? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Non è stato applicato nulla.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - non decidere in merito a quest'hunk, vai al successivo hunk per cui non " -"è stata presa una decisione\n" -"J - non decidere in merito a quest'hunk, vai all'hunk successivo\n" -"k - non decidere in merito a quest'hunk, vai al precedente hunk per cui non " -"è stata presa una decisione\n" -"K - non decidere in merito a quest'hunk, vai all'hunk precedente\n" -"g - seleziona un hunk a cui andare\n" -"/ - cerca un hunk corrispondente all'espressione regolare data\n" -"s - suddividi l'hunk corrente in hunk più piccoli\n" -"e - modifica manualmente l'hunk corrente\n" -"? - stampa una guida\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "Nessun hunk precedente" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "Nessun hunk successivo" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "Nessun altro hunk a cui andare" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "a quale hunk desideri andare? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Numero non valido: '%s'" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Mi dispiace, è disponibile solo %d hunk." -msgstr[1] "Mi dispiace, sono disponibili solo %d hunk." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "Nessun altro hunk in cui eseguire la ricerca" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "cercare un'espressione regolare? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Espressione regolare di ricerca %s malformata: %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "Nessun hunk corrisponde al pattern fornito" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Mi dispiace, non posso suddividere quest'hunk" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "Suddiviso in %d hunk." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Mi dispiace, non posso modificare quest'hunk" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "'git apply' non riuscito" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%ssuggerimento: %.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Il cherry picking non è possibile perché ci sono file di cui non è stato " "eseguito il merge." -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "" "Il commit non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "" "Il merge non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Il pull non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Il revert non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Impossibile eseguire il %s perché ci sono file di cui non è stato eseguito " "il merge." -#: advice.c:186 +#: advice.c:180 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." @@ -779,23 +72,23 @@ msgstr "" "Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come " "appropriato per risolverli ed esegui un commit." -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Esco a causa di un conflitto non risolto." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)." -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Esegui il commit delle modifiche prima di eseguire il merge." -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Esco a causa di un merge non terminato." -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -926,7 +219,17 @@ msgstr "modo non valido alla riga %d: %s" msgid "inconsistent header lines %d and %d" msgstr "righe di intestazione %d e %d inconsistenti" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: riga inattesa: %.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "frammento di patch senza intestazione alla riga %d: %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -941,92 +244,82 @@ msgstr[1] "" "l'intestazione git diff non riporta le informazioni sul file una volta " "rimossi %d componenti iniziali del percorso (riga %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "l'intestazione git diff non riporta le informazioni sul file (riga %d)" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: riga inattesa: %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "frammento di patch senza intestazione alla riga %d: %.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "il nuovo file dipende da vecchi contenuti" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "il file eliminato ha ancora dei contenuti" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrotta alla riga %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "il nuovo file %s dipende da vecchi contenuti" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "il file eliminato %s ha ancora dei contenuti" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaria corrotta alla riga %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaria non riconosciuta alla riga %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch con soli contenuti garbage alla riga %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "impossibile aprire o leggere %s" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "inizio della riga non valido: '%c'" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)." msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)." -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1035,26 +328,26 @@ msgstr "" "durante la ricerca di:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "dati della patch binaria mancanti per '%s'" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossibile applicare una patch binaria al contrario senza l'hunk contrario " "per '%s'" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossibile applicare una patch binaria a '%s' senza la riga d'indice " "completa" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1062,418 +355,432 @@ msgstr "" "la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti " "del file." -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "la patch si applica a un file vuoto '%s' ma il file non è vuoto" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "impossibile leggere la postimmagine %s necessaria per '%s'" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "la patch binaria non si applica correttamente a '%s'" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "patch non riuscita: %s:%ld" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "impossibile eseguire il checkout di '%s'" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "lettura di %s non riuscita" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lettura di '%s' oltre un collegamento simbolico" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "il percorso %s è stato rinominato/eliminato" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: non esiste nell'indice" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: non corrisponde all'indice" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "dal repository manca il blob necessario per ripiegare sul merge a tre vie." -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Ripiego sul merge a tre vie...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossibile leggere i contenuti correnti di '%s'" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Ripiego sul merge a tre vie non riuscito...\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch applicata a '%s' con conflitti.\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch '%s' applicata correttamente.\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "la rimozione della patch lascia contenuti del file" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errato" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ha il tipo %o, atteso %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "percorso '%s' non valido" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s: esiste già nell'indice" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s: esiste già nella directory di lavoro" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o)" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o) di %s" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "il file interessato '%s' si trova oltre un collegamento simbolico" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: la patch non si applica correttamente" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Controllo della patch %s in corso..." -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modifica modo per %s che non è nell'HEAD corrente" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "le informazioni SHA1 sono mancanti o inutili (%s)." -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry non riuscito per il percorso '%s'" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "impossibile aggiungere %s all'indice temporaneo" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "impossibile scrivere l'indice temporaneo in %s" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "impossibile rimuovere %s dall'indice" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrotta per il sottomodulo %s" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "impossibile eseguire lo stat del file appena creato '%s'" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "impossibile creare l'archivio di backup per il file appena creato %s" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "impossibile aggiungere la voce della cache per %s" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "scrittura in '%s' non riuscita" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "chiusura del file '%s' in corso" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "impossibile scrivere il file '%s' con modo %o" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s applicata correttamente." -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "errore interno" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Applicazione della patch %%s con %d frammento respinto..." msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..." -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "nome file .rej troncato a %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "impossibile aprire %s" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Frammento %d applicato correttamente." -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Frammento %d respinto." -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorata." -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "input non riconosciuto" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "impossibile leggere il file index" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "impossibile aprire la patch '%s': %s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d errore di spazi bianchi soppresso" msgstr[1] "%d errori di spazi bianchi soppressi" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d riga aggiunge errori di spazi bianchi." msgstr[1] "%d righe aggiungono errori di spazi bianchi." -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi." msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossibile scrivere il nuovo file index" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "percorso" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "non applicare le modifiche corrispondenti al percorso specificato" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "applica le modifiche corrispondenti al percorso specificato" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "num" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignora le aggiunte create dalla patch" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "invece di applicare la patch, visualizza l'output di diffstat per l'input" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "" "visualizza il numero di righe aggiunte ed eliminate in notazione decimale" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "invece di applicare la patch, visualizza un riassunto per l'input" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "invece di applicare la patch, verifica se può essere applicata" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "assicura che la patch sia applicabile all'indice corrente" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "contrassegna i nuovi file con `git add --intent-to-add`" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "applica una patch senza modificare l'albero di lavoro" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "" "accetta una patch che apporta modifiche al di fuori dell'area di lavoro" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "applica anche la patch (da usare con --stat/--summary/--check)" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "prova un merge a tre vie se la patch non si applica correttamente" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "compila un index temporaneo basato sulle informazioni indice incluse" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "i percorsi sono separati con un carattere NUL" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "assicura che almeno <n> righe di contesto corrispondano" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "azione" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "applica la patch in maniera inversa" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "non aspettare almeno una riga di contesto" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lascia i frammenti respinti nei file *.rej corrispondenti" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "consenti la sovrapposizione dei frammenti" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "visualizza ulteriori dettagli" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tollera carattere fine riga rilevato erroneamente come mancante alla fine " "del file" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "" "non fare affidamento sul numero di righe nelle intestazioni dei frammenti" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "radice" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "anteponi <radice> a tutti i nomi file" @@ -1496,7 +803,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repository> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file" @@ -1528,7 +835,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato archivio" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "prefisso" @@ -1536,12 +843,11 @@ msgstr "prefisso" msgid "prepend prefix to each pathname in the archive" msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "file" @@ -1574,7 +880,7 @@ msgid "list supported archive formats" msgstr "elenca i formati archivio supportati" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "repository" @@ -1582,7 +888,7 @@ msgstr "repository" msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'archivio dal repository remoto <repository>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "comando" @@ -1613,66 +919,66 @@ msgstr "Formato archivio '%s' sconosciuto" msgid "Argument not supported for format '%s': -%d" msgstr "Argomento non supportato per il formato '%s': -%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "impossibile eseguire lo streaming del blob %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo file non supportato: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "impossibile leggere %s" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "impossibile avviare il filtro '%s'" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "impossibile ridirezionare il descrittore" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "il filtro '%s' ha segnalato un errore" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "il percorso non è codificato validamente in UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "errore deflate (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s non è un nome attributo valido" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non consentito: %s:%d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1690,12 +996,12 @@ msgstr "Contenuto mal racchiuso fra virgolette nel file '%s': %s" msgid "We cannot bisect more!\n" msgstr "Impossibile eseguire un'ulteriore bisezione!\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "%s non è un nome commit valido" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1704,7 +1010,7 @@ msgstr "" "La base del merge %s non funziona.\n" "Ciò significa che il bug è stato corretto fra %s e [%s].\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1713,7 +1019,7 @@ msgstr "" "La base del merge %s è nuova.\n" "La proprietà è stata modificata fra %s e [%s].\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1722,7 +1028,7 @@ msgstr "" "La base del merge %s è %s.\n" "Ciò significa che il primo commit '%s' è fra %s e [%s].\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1733,7 +1039,7 @@ msgstr "" "git bisect non può funzionare correttamente in questo caso.\n" "Forse hai confuso le revisioni %s con quelle %s?\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1744,36 +1050,36 @@ msgstr "" "Non è possibile essere sicuri che il primo commit %s sia fra %s e %s.\n" "Continuo comunque." -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisezione: dev'essere testata una base del merge\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "è richiesta una revisione %s" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "impossibile creare il file '%s'" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "impossibile leggere il file '%s'" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "lettura riferimenti della bisezione non riuscita" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era sia %s sia %s\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1782,7 +1088,7 @@ msgstr "" "Nessun commit testabile trovato.\n" "Forse hai iniziato il procedimento specificando parametri percorso errati?\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1792,7 +1098,7 @@ msgstr[1] "(circa %d passi)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1801,41 +1107,41 @@ msgstr[0] "" msgstr[1] "" "Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse non sono compatibili." -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "impossibile usare --contents con il nome oggetto del commit finale" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato l'ultimo commit" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "impostazione percorso revisioni non riuscita" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato un intervallo nella catena del primo commit genitore" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "il percorso %s in %s non esiste" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossibile leggere il blob %s per il percorso %s" @@ -1997,8 +1303,8 @@ msgstr "'%s' non sembra essere un file bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "intestazione non riconosciuta: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "impossibile aprire '%s'" @@ -2029,62 +1335,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Il bundle richiede questo riferimento:" msgstr[1] "Il bundle richiede questi %d riferimenti:" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "impossibile duplicare il descrittore bundle" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Impossibile avviare pack-objects" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "comando pack-objects morto" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "comando rev-list morto" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "il riferimento '%s' è escluso dalle opzioni di rev-list" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argomento non riconosciuto: %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Mi rifiuto di creare un bundle vuoto." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "impossibile creare '%s'" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "comando index-pack morto" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "valore colore non valido: %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "impossibile analizzare %s" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s non è un commit!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2104,27 +1410,27 @@ msgstr "" "Per disabilitare questo messaggio, esegui\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s." -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s." -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Il commit %s non ha una firma GPG." -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Il commit %s ha una firma GPG valida di %s\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2135,113 +1441,108 @@ msgstr "" "la variabile di configurazione i18n.commitencoding alla codifica usata\n" "dal tuo progetto.\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "il file grafo dei commit %s è troppo piccolo" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" "la versione hash del grafo dei commit %X non corrisponde alla versione %X" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "voce blocco grafo dei commit mancante nella tabella di ricerca; il file " "potrebbe non essere completo" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset blocco grafo dei commit improprio %08x%08x" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "l'ID del blocco grafo dei commit %08x compare più volte" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "il grafo dei commit non ha un blocco grafi di base" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "la catena del grafo dei commit non corrisponde" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "catena grafo dei commit non valida: la riga '%s' non è un hash" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "impossibile trovare tutti i file grafo dei commit" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "posizione commit non valida. Il grafo dei commit è probabilmente corrotto" -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "impossibile trovare il commit %s" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "impossibile analizzare il commit %s" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "impossibile recuperare il tipo dell'oggetto %s" -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Caricamento commit noti nel grafo dei commit in corso" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Calcolo numeri generazione del grafo dei commit in corso" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso" msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "errore durante l'aggiunta del pack %s" -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "errore durante l'apertura dell'indice per %s" -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" @@ -2250,67 +1551,62 @@ msgstr[0] "" msgstr[1] "" "Ricerca dei commit per il grafo dei commit da %d riferimenti in corso" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "ID oggetto commit non valido: %s" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "" "Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Conteggio commit distinti nel grafo dei commit in corso" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "impossibile scrivere il numero esatto degli ID grafo di base" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "impossibile creare le prime directory di %s" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "impossibile creare '%s'" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso" msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "impossibile aprire il file catena grafo dei commit" -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "impossibile ridenominare il file di base grafo dei commit" -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "impossibile ridenominare il file temporaneo grafo dei commit" -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "Scansione dei commit sottoposti a merge in corso" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "ID commit duplicato inatteso: %s" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "Merge del grafo dei commit in corso" @@ -2324,24 +1620,24 @@ msgstr "" msgid "too many commits to write graph" msgstr "troppi commit da scrivere nel grafo" -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "il file del grafo dei commit ha un checksum non corretto e probabilmente è " "corrotto" -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "impossibile analizzare il commit %s nel grafo dei commit" @@ -2350,37 +1646,37 @@ msgstr "impossibile analizzare il commit %s nel grafo dei commit" msgid "Verifying commits in commit graph" msgstr "Verifica dei commit nel grafo dei commit in corso" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "impossibile analizzare il commit %s dal database oggetti per il grafo dei " "commit" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "il genitore nel grafo dei commit per %s è %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "l'elenco genitori nel grafo dei commit per il commit %s è finito prima del " "previsto" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2388,7 +1684,7 @@ msgstr "" "il grafo dei commit ha un numero generazione zero per il commit %s ma non " "pari a zero per gli altri" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2396,12 +1692,12 @@ msgstr "" "il grafo dei commit ha un numero generazione non pari a zero per il commit " "%s ma pari a zero per gli altri" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2450,7 +1746,7 @@ msgstr "la chiave non contiene una sezione: %s" msgid "key does not contain variable name: %s" msgstr "la chiave non contiene un nome variabile: %s" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "chiave non valida: %s" @@ -2591,7 +1887,7 @@ msgstr "valore malformato per %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "dev'essere nothing, matching, simple, upstream o current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "livello compressione pack %d non valido" @@ -2616,109 +1912,116 @@ msgstr "impossibile risolvere il blob configurazione '%s'" msgid "failed to parse %s" msgstr "analisi di %s non riuscita" -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "impossibile analizzare la configurazione a riga di comando" -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "" "si è verificato un errore imprevisto durante la lettura dei file di " "configurazione" -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "%s non valido: '%s'" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"valore core.untrackedCache '%s' non valido; utilizzerò il valore predefinito " +"'keep'" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e " "100" -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando" -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "nome sezione '%s' non valido" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s ha più valori" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "scrittura del nuovo file di configurazione %s non riuscita" -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "impossibile bloccare il file di configurazione %s" -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "apertura di %s in corso" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "pattern non valido: %s" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "file di configurazione %s non valido" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "fstat di %s non riuscita" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "impossibile eseguire mmap su '%s'" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "esecuzione chmod su %s non riuscita" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "impossibile scrivere il file di configurazione %s" -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossibile impostare '%s' a '%s'" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossibile eliminare l'impostazione di '%s'" -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "nome sezione non valido: %s" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "valore mancante per '%s'" @@ -2843,7 +2146,7 @@ msgstr "impossibile risolvere %s (%s)" msgid "unknown port %s" msgstr "porta %s sconosciuta" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "nome host strano '%s' bloccato" @@ -2858,60 +2161,60 @@ msgstr "porta strana '%s' bloccata" msgid "cannot start proxy %s" msgstr "impossibile avviare il proxy %s" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "nessun percorso specificato; vedere 'git help pull' per le sintassi URL " "valide" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "la variante SSH 'simple' non supporta -4" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "la variante SSH 'simple' non supporta -6" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante SSH 'simple' non supporta l'impostazione della porta" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "percorso strano '%s' bloccato" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "impossibile eseguire fork" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Controllo connessione in corso" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Impossibile eseguire 'git-rev-list'" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "scrittura nella rev-list non riuscita" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "chiusura standard input della rev-list non riuscita" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d illecita" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF sarebbe sostituito da LF in %s" -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2920,12 +2223,12 @@ msgstr "" "CRLF sarà sostituito da LF in %s.\n" "Il file avrà i suoi fine riga originari nella propria directory di lavoro" -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF sarebbe sostituito da CRLF in %s" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2934,19 +2237,19 @@ msgstr "" "LF sarà sostituito da CRLF in %s.\n" "Il file avrà i suoi fine riga originari nella propria directory di lavoro" -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "Il BOM è vietato in '%s' se il file è codificato come %s" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" -"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-" -"%.*s come codifica dell'albero di lavoro." +"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-%s " +"come codifica dell'albero di lavoro." #: convert.c:304 #, c-format @@ -2963,51 +2266,51 @@ msgstr "" "o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di " "lavoro." -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "conversione della codifica '%s' da %s a %s non riuscita" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "il risultato della codifica di '%s' da %s a %s e viceversa non è lo stesso" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "impossibile eseguire fork per eseguire il filtro esterno '%s'" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "impossibile fornire l'input al filtro esterno '%s'" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "esecuzione del filtro esterno '%s' non riuscita: %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "lettura dal filtro esterno '%s' non riuscita" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "esecuzione del filtro esterno '%s' non riuscita" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "tipo filtro inatteso" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "nome percorso troppo lungo per il filtro esterno" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3016,67 +2319,67 @@ msgstr "" "il filtro esterno '%s' non è più disponibile nonostante non tutti i percorsi " "siano stati filtrati" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false non sono codifiche dell'albero di lavoro valide" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: esecuzione del filtro clean '%s' non riuscita" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: esecuzione del filtro smudge '%s' non riuscita" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "in futuro" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> secondo fa" msgstr[1] "%<PRIuMAX> secondi fa" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minuto fa" msgstr[1] "%<PRIuMAX> minuti fa" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> ora fa" msgstr[1] "%<PRIuMAX> ore fa" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> giorno fa" msgstr[1] "%<PRIuMAX> giorni fa" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> settimana fa" msgstr[1] "%<PRIuMAX> settimane fa" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> mese fa" msgstr[1] "%<PRIuMAX> mesi fa" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3084,14 +2387,14 @@ msgstr[0] "%<PRIuMAX> anno" msgstr[1] "%<PRIuMAX> anni" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> mese fa" msgstr[1] "%s, %<PRIuMAX> mesi fa" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3130,7 +2433,7 @@ msgstr "Contrassegnate %d isole, fatto.\n" msgid "failed to read orderfile '%s'" msgstr "lettura dell'orderfile '%s' non riuscita" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Rilevamento ridenominazione non esatta in corso" @@ -3199,36 +2502,36 @@ msgstr "" "Trovati errori nella variabile di configurazione 'diff.dirstat':\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "processo esterno diff morto, mi fermo a %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow richiede esattamente uno specificatore percorso" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "valore non valido per --stat: %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s richiede un valore numerico" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3237,42 +2540,42 @@ msgstr "" "Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valore sconosciuto dopo ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "impossibile risolvere '%s'" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s richiede il formato <n>/<m>" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s richiede un carattere, ricevuto '%s'" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "argomento --color-moved errato: %s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo non valido '%s' in --color-moved-ws" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3280,151 +2583,151 @@ msgstr "" "l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience" "\" e \"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "argomento non valido per %s" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "argomento --word-diff errato: %s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Opzioni formato output diff" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "genera patch" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "non visualizzare l'output del diff" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "genera diff con <n> righe di contesto" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "genera il diff in formato grezzo" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "sinonimo di '-p --raw'" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "sinonimo di '-p --stat'" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "--stat leggibile da una macchina" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "emetti in output solo l'ultima riga di --stat" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<parametro1,parametro2>..." -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "emetti in output la distribuzione del numero di modifiche relativo a ogni " "sottodirectory" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "sinonimo di --dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo di --dirstat=files,parametro1,parametro2..." -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "visualizza solo i nomi dei file modificati" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "visualizza solo i nomi e lo stato dei file modificati" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<ampiezza>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "genera il diffstat con un'ampiezza specificata" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "genera il diffstat con un'ampiezza nomi specificata" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "genera il diffstat con un'ampiezza grafo specificata" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<numero>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "genera il diffstat con righe limitate" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "genera riassunto conciso nel diffstat" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "stampa in output un diff binario che può essere applicato" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\"" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "visualizza diff colorato" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3432,7 +2735,7 @@ msgstr "" "evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o " "'nuove' nel diff" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3440,91 +2743,91 @@ msgstr "" "non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo " "in --raw o --numstat" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<prefisso>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "visualizza il prefisso sorgente specificato invece di \"a/\"" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "visualizza il prefisso destinazione specificato invece di \"b/\"" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "non visualizzare alcun prefisso sorgente o destinazione" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "visualizza il contesto tra gli hunk del diff fino al numero di righe " "specificato" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<carattere>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "specifica il carattere che indica una nuova riga al posto di '+'" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "specifica il carattere che indica una vecchia riga al posto di '-'" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "specifica il carattere che indica un contesto al posto di ' '" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Opzioni rinominazione diff" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "spezza modifiche di riscrittura completa in coppie eliminazione/creazione" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "rileva le ridenominazioni" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "ometti la preimmagine per le eliminazioni" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "rileva le copie" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "usa file non modificati come sorgente per trovare copie" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "disabilita rilevamento ridenominazione" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "usa blob vuoti come sorgente ridenominazione" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "" "continua a elencare la cronologia di un file al di là delle ridenominazioni" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3532,159 +2835,159 @@ msgstr "" "impedisci il rilevamento ridenominazione/copia se il numero delle " "destinazioni ridenominazione/copia eccede il limite specificato" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Opzioni algoritmo diff" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "produci il diff più piccolo possibile" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignora gli spazi bianchi durante il confronto delle righe" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignora le modifiche al numero degli spazi bianchi" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignora modifiche agli spazi bianchi a fine riga" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignora carattere ritorno a capo a fine riga" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignora modifiche che riguardano solo righe vuote" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "euristica per spostare i limiti degli hunk nel diff per una lettura agevole" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"patience diff\"" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"histogram diff\"" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "seleziona un algoritmo diff" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<testo>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"anchored diff\"" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<modalità>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "visualizza il diff parola per parola usando <modalità> per delimitare le " "parole modificate" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<espressione regolare>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "usa <espressione regolare> per decidere cosa costituisce una parola" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" "equivalente di --word-diff=color --word-diff-regex=<espressione regolare>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "le righe di codice spostate sono colorate in modo diverso" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "Altre opzioni diff" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e " "visualizza i percorsi relativi" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "tratta tutti i file come se fossero di testo" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "scambia i due input, genera un diff al contrario" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "disabilita l'intero output del programma" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "consenti l'esecuzione di un helper diff esterno" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "esegui filtri di conversione in testo esterni quando si confrontano file " "binari" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<quando>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<formato>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "specifica come verranno visualizzate le differenze nei sottomoduli" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "nascondi le voci 'git add -N' nell'indice" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "tratta le voci 'git add -N' come reali nell'indice" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<stringa>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3692,7 +2995,7 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze della stringa " "specificata" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3700,24 +3003,24 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'espressione " "regolare specificata" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "visualizza tutte le modifiche nel changeset con -S o -G" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "controlla l'ordine con cui i file appariranno nell'output" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "<ID oggetto>" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3725,34 +3028,34 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'oggetto " "specificato" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "seleziona file in base al tipo diff" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<file>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Salva l'output in un file specifico" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "il rilevamento ridenominazione non esatta è stato omesso per la presenza di " "troppi file." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "trovate solo copie dai percorsi modificati per la presenza di troppi file." -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3760,62 +3063,41 @@ msgstr "" "potresti voler impostare la variabile %s ad almeno %d e riprovare ad " "eseguire il comando." -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "lo specificatore percorso '%s' non corrisponde ad alcun file noto a git" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "pattern non riconosciuto: '%s'" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "pattern negativo non riconosciuto: '%s'" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" -"il file sparse-checkout potrebbe avere dei problemi: il pattern '%s' è " -"ripetuto" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "disabilito il pattern matching di tipo cone" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossibile usare %s come file di esclusione" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "impossibile aprire la directory '%s'" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "impossibile ottenere il nome e le informazioni sul kernel" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "la cache non tracciata è disabilitata su questo sistema o percorso" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "file index corrotto nel repository %s" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "impossibile creare le directory per %s" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossibile migrare la directory git da '%s' a '%s'" @@ -3835,12 +3117,12 @@ msgstr "Filtraggio contenuto in corso" msgid "could not stat file '%s'" msgstr "impossibile eseguire stat sul file '%s'" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "percorso spazio dei nomi git \"%s\" non valido" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossibile impostare GIT_DIR a '%s'" @@ -3850,272 +3132,268 @@ msgstr "impossibile impostare GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "troppi argomenti per eseguire %s" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Remoto senza URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: attesa lista shallow" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "impossibile scrivere sul remoto" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc richiede multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "riga shallow non valida: '%s'" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "riga unshallow non valida: '%s'" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "oggetto non trovato: %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "errore nell'oggetto: %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "nessuno shallow trovato: %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "attesi shallow/unshallow, ricevuto %s" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "ricevuto %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "commit non valido: %s" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "smetto di provare" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "fatto" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "ricevuto %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Contrassegno %s come completo" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "ho già %s (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" "fetch-pack: impossibile eseguire il fork del demultiplexer della banda " "laterlae" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "errore protocollo: intestazione pack non valida" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: impossibile eseguire il fork di %s" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s non riuscito" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "errore nel demultiplexer della banda laterale" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "La versione del server è %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "Il server supporta %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "Il server non supporta client shallow" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Il server non supporta --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Il server non supporta --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Il server non supporta --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "nessun commit in comune" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: recupero non riuscito." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Il server non supporta le richieste shallow" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "Il server supporta filter" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "impossibile scrivere la richiesta sul remoto" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "errore durante la lettura dell'intestazione di sezione '%s'" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "atteso '%s', ricevuto '%s'" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "riga di conferma inattesa: '%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "errore durante l'elaborazione degli ack: %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "errore durante l'elaborazione delle informazioni shallow: %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "atteso wanted-ref, ricevuto '%s'" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inatteso: '%s'" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "nessun head remoto corrispondente" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "il remoto non ha inviato tutti gli oggetti necessari" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "riferimento remoto non esistente: %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg non è riuscito a firmare i dati" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "impossibile creare il file temporaneo" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "scrittura della firma separata in '%s' non riuscita" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignoro il colore non valido '%.*s' in log.graphColors" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"il pattern fornito (con -f <file>) contiene un byte NULL. Ciò è supportato " -"solo con -P usando PCRE v2" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': impossibile leggere %s" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "stat di '%s' non riuscito" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "'%s': lettura troppo breve" @@ -4165,7 +3443,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Comandi / operazioni di interrogazione di basso livello" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "Comandi di basso livello / Sincronizzazione repository" #: help.c:38 @@ -4258,12 +3536,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<opzioni>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4333,63 +3611,46 @@ msgstr "nome ident vuoto (per <%s>) non consentito" msgid "name consists only of disallowed characters: %s" msgstr "il nome è composto solo da caratteri non consentiti: %s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "formato data non valido: %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "impossibile caricare l'albero radice per il commit %s" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "impossibile accedere al blob sparse in '%s'" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "impossibile analizzare i dati filtro sparse in %s" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "non è possibile combinare più specificatori filtro" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "atteso 'tree:<profondità>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "il supporto per i filtri sparse:percorso è stato rimosso" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "specificatore filtro '%s' non valido" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "" -"è necessario eseguire l'escape del carattere nello specificatore del " -"sottofiltro: '%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "atteso qualcosa dopo la ricombinazione:" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "non è possibile combinare più specificatori filtro" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "impossibile modificare il remoto promettente del clone parziale" #: lockfile.c:151 #, c-format @@ -4420,115 +3681,119 @@ msgstr "Impossibile creare '%s.lock': %s" msgid "failed to read the cache" msgstr "lettura della cache non riuscita" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "impossibile scrivere il nuovo file index" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(commit non valido)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo non riuscito per il percorso '%s'; interrompo il merge." -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "aggiornamento add_cacheinfo non riuscito per il percorso '%s'; interrompo il " "merge." -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "errore durante la costruzione degli alberi" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "creazione del percorso '%s' non riuscita%s" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Rimuovo %s per fare spazio alla sottodirectory\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": forse si tratta di un conflitto D/F?" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "mi rifiuto di perdere un file non tracciato in '%s'" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "impossibile leggere l'oggetto %s '%s'" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "atteso blob per %s '%s'" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "apertura di '%s' non riuscita: %s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "creazione del collegamento simbolico '%s' non riuscita: %s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "non so che fare con %06o %s '%s'" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Merge del sottomodulo %s non riuscito (i commit non seguono la base del " "merge)" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Eseguo il fast forward del sottomodulo %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Merge del sottomodulo %s non riuscito (non fast forward)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4545,32 +3810,32 @@ msgstr "" "\n" "per accettare questo suggerimento.\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Merge del sottomodulo %s non riuscito (più merge trovati)" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Esecuzione del merge interno non riuscita" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "Impossibile aggiungere %s al database" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Merge automatico di %s in corso" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s." -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4579,7 +3844,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero." -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4588,7 +3853,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero." -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4597,7 +3862,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero in %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4606,43 +3871,43 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero in %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "ridenominazione" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "rinominato" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Mi rifiuto di perdere un file sporco in %s" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Mi rifiuto di perdere un file non tracciato in %s, benché sia d'ostacolo." -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s " "aggiunto in %s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s è una directory in %s; la aggiungo come %s" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4651,18 +3916,18 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s" "\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (lasciato irrisolto)" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. " "Ridenominato %s->%s in %s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4673,7 +3938,7 @@ msgstr "" "perché la directory %s è stata ridenominata in più directory diverse e " "nessuna directory di destinazione contiene la maggior parte dei file." -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4683,7 +3948,7 @@ msgstr "" "%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale " "posizione i seguenti percorsi: %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4693,7 +3958,7 @@ msgstr "" "un percorso in %s; delle ridenominazioni directory implicite hanno tentato " "di spostare in tale posizione i seguenti percorsi: %s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4702,7 +3967,7 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s " "in %s. Directory ridenominata %s->%s in %s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4711,52 +3976,52 @@ msgstr "" "ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s " "stesso è stato ridenominato." -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "impossibile leggere l'oggetto %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "l'oggetto %s non è un blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "modifica" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "modificato" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "contenuto" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "aggiunta/aggiunta" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "sottomodulo" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLITTO (%s): conflitto di merge in %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Lo aggiungo come %s" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4765,7 +4030,7 @@ msgstr "" "Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; " "lo sposto in %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4774,7 +4039,7 @@ msgstr "" "CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata " "in %s, il che suggerisce che forse dovrebbe essere spostato in %s." -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4783,7 +4048,7 @@ msgstr "" "Percorso aggiornato: %s ridenominato in %s in %s in una directory " "ridenominata in %s; lo sposto in %s." -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4793,244 +4058,228 @@ msgstr "" "ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in " "%s." -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "file/directory" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "directory/file" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s " "come %s" -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Aggiunta %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n" +" %s" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "Già aggiornato!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "merge degli alberi %s e %s non riuscito" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Merge in corso:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "trovato %u antenato comune:" msgstr[1] "trovati %u antenati comuni:" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "il merge non ha restituito alcun commit" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "Impossibile analizzare l'oggetto '%s'" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Impossibile scrivere l'indice." -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "il file multi-pack-index %s è troppo piccolo" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versione %d multi-pack-index non riconosciuta" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "la versione dell'hash %u non corrisponde" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "offset blocco non valido (troppo grande)" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "dal multi-pack-index manca il blocco richiesto pack-name" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "dal multi-pack-index manca il blocco richiesto fanout OID" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "dal multi-pack-index manca il blocco richiesto lookup OID" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id non valido: %u (%u pack totali)" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "nel multi-pack-index è salvato un offset a 64 bit, ma off_t è troppo piccolo" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "errore durante la preparazione del packfile dal multi-pack-index" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "aggiunta del packfile '%s' non riuscita" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "apertura del pack-index '%s' non riuscita" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "ricerca dell'oggetto %d nel packfile non riuscita" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Aggiunta dei file pack al multi-pack-index in corso" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "non ho visto il file pack %s da scartare" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "Scrittura dei chunk nel multi-pack-index in corso" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "pulizia del multi-pack-index %s non riuscita" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Ricerca di file pack referenziati in corso" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "Verifica ordine OID nel multi-pack-index in corso" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" +msgstr "Verifica ordine OID in MIDX in corso" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Ordinamento degli oggetti nel packfile in corso" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Verifica offset oggetti in corso" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "caricamento voce pack per oid[%d] = %s non riuscito" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "caricamento pack-index per il packfile %s non riuscito" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Conteggio degli oggetti referenziati in corso" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Ricerca ed eliminazione dei file pack non referenziati in corso" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "impossibile avviare pack-objects" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "impossibile finire pack-objects" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossibile creare il thread lazy_dir: %s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossibile creare il thread lazy_name: %s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossibile bloccare il thread lazy_name: %s" @@ -5077,32 +4326,32 @@ msgstr "Mi rifiuto di riscrivere le note in %s (al di fuori di refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valore di %s errato: '%s'" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "tipo oggetto \"%s\" non valido" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'oggetto %s è un %s, non un %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "l'oggetto %s ha l'ID tipo sconosciuto %d" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "impossibile analizzare l'oggetto: %s" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hash non corrispondente: %s" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "offset collocato prima della fine del packfile (.idx corrotto?)" @@ -5118,11 +4367,6 @@ msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset collocato dopo la fine dell'indice pack per %s (indice troncato?)" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "impossibile recuperare le dimensioni di %s" - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -5138,7 +4382,7 @@ msgstr "%s non è compatibile con %s" msgid "%s : incompatible with something else" msgstr "%s non è compatibile con qualcos'altro" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s non richiede un valore" @@ -5148,42 +4392,42 @@ msgstr "%s non richiede un valore" msgid "%s isn't available" msgstr "%s non è disponibile" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" "%s richiede un valore intero non negativo con un suffisso k/m/g facoltativo" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "opzione ambigua: %s (potrebbe essere --%s%s o --%s%s)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" +msgid "did you mean `--%s` (with two dashes ?)" msgstr "forse intendevi `--%s` (con due trattini)?" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "opzione sconosciuta `%s'" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "opzione `%c` sconosciuta" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -5191,21 +4435,21 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " oppure: %s" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "alias di --%s" @@ -5230,37 +4474,37 @@ msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\"" msgid "malformed object name '%s'" msgstr "nome oggetto '%s' malformato" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Impossibile rendere %s scrivibile dal gruppo" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Carattere di escape '\\' non consentito come ultimo carattere del valore " "attributo" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "È consentita solo una specifica 'attr:'." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "la specifica attr non deve essere vuota" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "nome attributo %s non valido" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "le impostazioni globali specificatore percorso 'glob' e 'noglob' non sono " "compatibili" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5268,56 +4512,51 @@ msgstr "" "l'impostazione globale specificatore percorso 'literal' è incompatibile con " "tutte le altre impostazioni globali specificatore percorso" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parametro per il magic specificatore percorso 'prefix' non valido" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magic specificatore percorso '%.*s' in '%s' non valido" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' mancante alla fine del magic specificatore percorso in '%s'" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magic specificatore percorso '%c' in '%s' non implementato" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' e 'glob' non sono compatibili" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: '%s' è al di fuori del repository in '%s'" +msgid "%s: '%s' is outside repository" +msgstr "%s: '%s' è al di fuori del repository" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (opzione mnemonica: '%c')" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic specificatore percorso non supportato da questo comando: %s" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" "lo specificatore percorso '%s' si trova oltre un collegamento simbolico" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "la riga non è ben racchiusa tra virgolette: %s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "impossibile scrivere il pacchetto flush" @@ -5380,42 +4619,33 @@ msgstr "Aggiornamento indice in corso" msgid "unable to create threaded lstat: %s" msgstr "impossibile creare lstat in versione threaded: %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "impossibile analizzare il formato --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Remoto senza URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "il nome del remoto promettente non può iniziare con '/': %s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "impossibile avviare `log`" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "impossibile leggere l'output di `log`" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "impossibile analizzare il commit '%s'" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossibile analizzare l'header Git '%.*s'" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "generazione del diff non riuscita" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "impossibile analizzare il registro di '%s'" @@ -5456,16 +4686,16 @@ msgstr "impossibile aggiungere '%s' all'indice" msgid "unable to stat '%s'" msgstr "impossibile eseguire stat su '%s'" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' compare sia come file sia come directory" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Aggiornamento indice" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5474,7 +4704,7 @@ msgstr "" "index.version impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5483,154 +4713,143 @@ msgstr "" "GIT_INDEX_VERSION impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "firma non valida: 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "versione indice non valida: %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "firma SHA1 file indice non valida" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'indice usa l'estensione %.4s che non comprendiamo" -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "estensione %.4s ignorata" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato voce indice sconosciuto: 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nome malformato nell'indice, vicino al percorso '%s'" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "voci stage non ordinate nell'indice" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "voci stage multiple per il file sottoposto a merge '%s'" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "voci stage non ordinate per '%s'" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "file indice corrotto" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossibile creare il thread load_cache_entries: %s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossibile bloccare il thread load_cache_entries: %s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: apertura del file indice non riuscita" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: impossibile eseguire stat sull'indice aperto" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: file indice più piccolo della dimensione attesa" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: impossibile mappare il file indice" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossibile creare il thread load_index_extensions: %s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossibile bloccare il thread load_index_extensions: %s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossibile aggiornare l'indice condiviso '%s'" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "indice corrotto, atteso %s in %s, presente %s" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "impossibile chiudere '%s'" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "impossibile aprire la directory git: %s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "impossibile eseguire unlink: %s" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossibile correggere i permessi di '%s'" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: impossibile ripiegare sullo stadio 0" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi " -"eseguire 'git rebase --continue'.\n" -"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -5638,7 +4857,7 @@ msgstr "" "impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. " "La ignoro." -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5683,14 +4902,14 @@ msgstr "" "Queste righe possono essere riordinate; saranno eseguite dalla prima " "all'ultima.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase di %s su %s (%d comando)" msgstr[1] "Rebase di %s su %s (%d comandi)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5699,7 +4918,7 @@ msgstr "" "Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un " "commit.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5707,7 +4926,7 @@ msgstr "" "\n" "Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRÀ PERDUTO.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5721,7 +4940,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5731,19 +4950,22 @@ msgstr "" "Ciò nonostante, se rimuovi tutto, il rebase sarà annullato.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Nota che i commit vuoti sono commentati" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "impossibile scrivere '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "impossibile scrivere '%s'." +msgid "could not copy '%s' to '%s'." +msgstr "impossibile copiare '%s' in '%s'." -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5753,7 +4975,7 @@ msgstr "" "accidentalmente.\n" "Commit scartati (dal più al meno recente):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5771,13 +4993,6 @@ msgstr "" "I comportamenti possibili sono ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "impossibile leggere '%s'." - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5788,7 +5003,7 @@ msgstr "%s non punta a un oggetto valido!" msgid "ignoring dangling symref %s" msgstr "ignoro il riferimento simbolico pendente %s" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "ignoro il riferimento rotto %s" @@ -5813,15 +5028,14 @@ msgstr "il riferimento '%s' esiste già" msgid "unexpected object ID when writing '%s'" msgstr "ID oggetto inatteso durante la scrittura di '%s'" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "impossibile scrivere su '%s'" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "impossibile aprire '%s' in scrittura" @@ -5856,37 +5070,37 @@ msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'" msgid "update_ref failed for ref '%s': %s" msgstr "update_ref per il riferimento '%s' non riuscita: %s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' esiste già; impossibile creare '%s'" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossibile gestire '%s' e '%s' contemporaneamente" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "impossibile rimuovere il riferimento %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "impossibile eliminare il riferimento %s: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "impossibile eliminare i riferimenti: %s" @@ -5896,7 +5110,7 @@ msgstr "impossibile eliminare i riferimenti: %s" msgid "invalid refspec '%s'" msgstr "specificatore riferimento '%s' non valido" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "sparito" @@ -5915,122 +5129,122 @@ msgstr "prima di %d" msgid "ahead %d, behind %d" msgstr "dopo %d, prima di %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato atteso: %%(color:<colore>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "colore non riconosciuto: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Atteso valore intero: refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Atteso valore intero: refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argomento %%(%s) non riconosciuto: %s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) non accetta argomenti" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argomento %%(objectsize) non riconosciuto: %s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) non accetta argomenti" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) non accetta argomenti" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) non accetta argomenti" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argomento %%(trailers) sconosciuto: %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "atteso valore positivo in contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argomento %%(contents) non riconosciuto: %s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "atteso valore positivo in objectname:short=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argomento %%(objectname) non riconosciuto: %s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "valore non riconosciuto: position:%s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "valore non riconosciuto: width:%s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argomento %%(align) non riconosciuto: %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "attesa ampiezza positiva con l'atom %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argomento %%(if) non riconosciuto: %s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "nome campo malformato: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "nome campo sconosciuto: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -6038,160 +5252,160 @@ msgstr "" "non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati " "oggetto" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: atomo %%(if) usato senza un atomo %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: atomo %%(then) usato senza un atomo %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: atomo %%(then) usato più di una volta" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: atomo %%(then) usato dopo %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: atomo %%(else) usato più di una volta" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "stringa di formato %s malformata" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "nessun branch, eseguo il rebase di %s" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "nessun branch, bisezione avviata su %s" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "nessun branch" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "oggetto %s mancante per %s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer non riuscito su %s per %s" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "oggetto malformato in '%s'" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignoro il riferimento con il nome malformato %s" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: atomo %%(end) mancante" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'opzione `%s' non è compatibile con --merged" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'opzione `%s' non è compatibile con --no-merged" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "nome dell'oggetto %s malformato" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opzione `%s' deve puntare ad un commit" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "la forma breve della configurazione del remoto non può iniziare con '/': %s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "è stata specificata più di una direttiva receivepack, uso la prima" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "è stata specificata più di una direttiva uploadpack, uso la prima" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossibile recuperare sia %s sia %s in %s" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s solitamente traccia %s, non %s" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s traccia sia %s sia %s" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la chiave '%s' del pattern non aveva un '*'" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "il valore '%s' del pattern non ha un '*'" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -6202,7 +5416,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6228,7 +5442,7 @@ msgstr "" "Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n" "Devi specificare un riferimento completamente qualificato." -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6239,7 +5453,7 @@ msgstr "" "è un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/heads/%s'?" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6250,7 +5464,7 @@ msgstr "" "è un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/tags/%s'?" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6262,7 +5476,7 @@ msgstr "" "tag a un nuovo albero eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6274,121 +5488,121 @@ msgstr "" "tag a un nuovo blob eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s non può essere risolto in un branch" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "impossibile eliminare '%s': il riferimento remoto non esiste" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "sono state trovate più corrispondenze per lo specificatore riferimento " "destinazione %s" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" "lo specificatore riferimento destinazione %s riceve dati da più di una " "sorgente" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD non punta ad un branch" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "branch '%s' non esistente" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "nessun upstream configurato per il branch '%s'" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "branch upstream '%s' non memorizzato come branch che ne traccia uno remoto" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destinazione del push '%s' sul remoto '%s' non ha un branch locale che la " "traccia" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "il branch '%s' non ha un remoto per il push" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "gli specificatori riferimento per '%s' non includono '%s'" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "il push non ha una destinazione (push.default è 'nothing')" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "impossibile risolvere il push 'simple' a una singola destinazione" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "impossibile trovare il riferimento remoto %s" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoro localmente il riferimento strano '%s'" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Il tuo branch è basato su '%s', ma l'upstream è scomparso.\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" per correggere la situazione)\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Il tuo branch è aggiornato rispetto a '%s'.\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Il tuo branch e '%s' fanno riferimento a commit differenti.\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" per visualizzare i dettagli)\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" per pubblicare i tuoi commit locali)\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6400,11 +5614,11 @@ msgstr[1] "" "Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire " "il fast forward.\n" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" per aggiornare il tuo branch locale)\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6419,11 +5633,11 @@ msgstr[1] "" "Il tuo branch e '%s' sono diventati divergenti\n" "e hanno rispettivamente %d e %d commit differenti.\n" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" per eseguire il merge del branch remoto nel tuo)\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossibile analizzare il nome oggetto atteso '%s'" @@ -6438,7 +5652,7 @@ msgstr "nome riferimento sostitutivo non valido: %s" msgid "duplicate replace ref: %s" msgstr "riferimento sostitutivo duplicato: %s" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "profondità sostituzione troppo elevata per l'oggetto %s" @@ -6501,8 +5715,8 @@ msgstr "impossibile eseguire l'unlink dell'oggetto smarrito '%s'" msgid "Recorded preimage for '%s'" msgstr "Salvata preimmagine di '%s'" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "impossibile creare la directory '%s'" @@ -6536,20 +5750,20 @@ msgstr "Risoluzione per '%s' dimenticata\n" msgid "unable to open rr-cache directory" msgstr "impossibile aprire la directory cache rr" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "sembra che il tuo branch corrente sia rotto" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "il tuo branch corrente '%s' non ha ancora commit" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent non è compatibile con --bisect" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L non supporta ancora formati diff oltre a -p e -s" @@ -6571,31 +5785,31 @@ msgstr "" "L'hook '%s' è stato ignorato perché non è impostato come eseguibile.\n" "Puoi disabilitare quest'avviso con `git config advice.ignoredHook false`." -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "pacchetto flush inatteso durante la lettura dello stato decompressione del " "remoto" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossibile analizzare lo stato decompressione del remoto: %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "decompressione sul remoto non riuscita: %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "firma del certificato per il push non riuscita" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "il ricevente non supporta i push --signed" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6603,47 +5817,47 @@ msgstr "" "non invio un certificato push perché il ricevente non supporta i push --" "signed" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "il ricevente non supporta i push --atomic" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "il ricevente non supporta le opzioni push" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "modalità pulizia messaggio commit non valida: '%s'" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "impossibile eliminare '%s'" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "impossibile rimuovere '%s'" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "revert" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:329 -msgid "rebase" -msgstr "rebase" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "rebase -i" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "azione sconosciuta: %d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6651,7 +5865,7 @@ msgstr "" "dopo aver risolto i conflitti, contrassegna i percorsi corretti\n" "con 'git add <path>' o 'git rm <path>'" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6661,110 +5875,115 @@ msgstr "" "con 'git add <path>' o 'git rm <path>' ed esegui\n" "il commit del risultato con 'git commit'" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "impossibile bloccare '%s'" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "impossibile scrivere il carattere di fine riga in '%s'" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "finalizzazione di '%s' non riuscita" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "impossibile leggere '%s'" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "le tue modifiche locali sarebbero sovrascritte da %s." -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "esegui il commit delle modifiche o lo stash per procedere." -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: fast forward" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modalità pulizia non valida: %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: impossibile scrivere il nuovo file indice" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "impossibile aggiornare l'albero cache" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "impossibile risolvere il commit HEAD" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "nessuna chiave presente in '%.*s'" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "impossibile rimuovere gli apici dal valore di '%s'" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "impossibile aprire '%s' in lettura" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' già specificato" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' già specificato" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' già specificato" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "variabile '%s' sconosciuta" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' mancante" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' mancante" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' mancante" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "formato data '%s' non valido in '%s'" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6794,11 +6013,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "scrittura commit radice in corso" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' non riuscito" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6825,7 +6048,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6851,328 +6074,329 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "impossibile trovare il commit appena creato" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "impossibile analizzare il commit appena creato" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "impossibile risolvere HEAD dopo la creazione del commit" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "HEAD scollegato" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (commit radice)" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "impossibile analizzare HEAD" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "L'HEAD %s non è un commit!" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "impossibile analizzare il commit HEAD" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "impossibile analizzare l'autore del commit" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree non è riuscito a scrivere un albero" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossibile leggere il messaggio di commit da '%s'" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "scrittura dell'oggetto del commit non riuscita" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "impossibile analizzare il commit %s" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "impossibile analizzare il commit genitore %s" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "comando sconosciuto: %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Questa è una combinazione di %d commit." -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "è necessaria un'HEAD per il fixup" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "impossibile leggere il messaggio di commit dell'HEAD" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "impossibile scrivere '%s'" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Questo è il primo messaggio di commit:" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "impossibile leggere il messaggio di commit di %s" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Questo è il messaggio di commit numero %d:" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Il messaggio di commit numero %d sarà saltato:" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "il file indice non è stato sottoposto a merge." -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "impossibile eseguire il fixup sul commit radice" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "il commit %s è un merge ma non è stata specificata l'opzione -m." -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "il commit %s non ha il genitore %d" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "impossibile ottenere il messaggio di commit per %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: impossibile analizzare il commit genitore %s" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossibile ridenominare '%s' in '%s'" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "non è stato possibile eseguire il revert di %s... %s" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "non è stato possibile applicare %s... %s" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "scarto %s %s - i contenuti della patch sono già upstream\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: lettura dell'indice non riuscita" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: aggiornamento dell'indice non riuscito" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s non accetta argomenti: '%s'" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "argomenti mancanti per %s" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "impossibile analizzare '%s'" +msgid "could not parse '%.*s'" +msgstr "impossibile analizzare '%.*s'" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "riga %d non valida: %.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "impossibile eseguire '%s' senza un commit precedente" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "impossibile leggere '%s'." + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "annullo un'operazione di cherry-pick in corso" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "annullo un'operazione di revert in corso" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "correggi la situazione usando 'git rebase --edit-todo'." -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "foglio istruzioni inutilizzabile: '%s'" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "nessun commit analizzato." -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "impossibile eseguire un cherry-pick durante un revert." -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "impossibile eseguire un revert durante un cherry-pick." -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "valore non valido per %s: %s" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "squash-onto inutilizzabile" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "foglio opzioni malformati: '%s'" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "è stato passato un insieme di commit vuoto" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "un'operazione di revert è già in corso" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "prova \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "un'operazione di cherry-pick è già in corso" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossibile creare la directory sequencer '%s'" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "impossibile bloccare HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "nessuna operazione di cherry-pick o revert in corso" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "impossibile risolvere HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "" "impossibile interrompere l'operazione da un branch che deve essere ancora " "creato" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "impossibile aprire '%s'" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "impossibile leggere '%s': %s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "fine del file inattesa" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "il file '%s' in cui è stato salvato l'HEAD prima del cherry pick è corrotto" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!" -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "nessun revert in corso" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "nessun cherry-pick in corso" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "salto del commit non riuscito" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "non c'è nulla da saltare" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7181,21 +6405,21 @@ msgstr "" "hai già eseguito il commit?\n" "prova \"git %s --continue\"" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "impossibile aggiornare %s" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7214,22 +6438,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "Impossibile applicare %s... %.*s" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Impossibile eseguire il merge di %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "impossibile leggere l'indice" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7244,11 +6473,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7265,72 +6494,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "nome etichetta illecito: '%.*s'" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "scrittura commit radice falso in corso" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "scrittura squash-onto in corso" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "impossibile trovare l'albero di %s" -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "impossibile scrivere l'indice" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "impossibile risolvere '%s'" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "impossibile eseguire il merge senza una revisione corrente" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "impossibile analizzare '%.*s'" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "non c'è nulla di cui eseguire il merge: '%.*s'" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "il merge octopus non può essere eseguito su un [nuovo commit radice]" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "impossibile ottenere il messaggio di commit per '%s'" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "non è stato nemmeno possibile tentare di eseguire il merge di '%.*s'" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "merge: impossibile scrivere il nuovo file indice" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Stash automatico applicato.\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "impossibile memorizzare %s" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7341,26 +6574,31 @@ msgstr "" "Le tue modifiche sono al sicuro nello stash.\n" "Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "impossibile eseguire il checkout di %s" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s: non è un OID valido" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "impossibile scollegare l'HEAD" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Fermato a HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Fermato a %s\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7382,49 +6620,49 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Fermato a %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "comando %d sconosciuto" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "impossibile leggere orig-head" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "impossibile leggere 'onto'" -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "impossibile aggiornare l'HEAD a %s" -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "" "impossibile eseguire il rebase: ci sono delle modifiche non in staging." -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "impossibile modificare un commit inesistente" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "file non valido: '%s'" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "contenuti non validi: '%s'" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7435,59 +6673,69 @@ msgstr "" "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n" "--continue'." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "impossibile scrivere il file: '%s'" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossibile rimuovere CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "impossibile eseguire il commit delle modifiche in staging." -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: impossibile eseguire il cherry pick di un %s" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: revisione non valida" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "impossibile eseguire il revert come commit iniziale" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: opzioni non gestite" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: errore durante la preparazione delle revisioni" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi " +"eseguire 'git rebase --continue'.\n" +"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "nulla da fare" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "impossibile saltare i comandi pick non necessari" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "lo script è già stato riordinato." -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s' è al di fuori del repository in '%s'" +msgid "'%s' is outside repository" +msgstr "'%s' è al di fuori del repository" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7497,7 +6745,7 @@ msgstr "" "Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti " "localmente." -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7509,14 +6757,14 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'opzione '%s' deve essere specificata prima degli argomenti che non " "costituiscono un'opzione" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7527,93 +6775,93 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" "impossibile preparare l'albero di lavoro usando una configurazione non valida" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "quest'operazione deve essere eseguita in un albero di lavoro" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Attesa versione repository Git <= %d, trovata %d" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "trovate estensioni repository sconosciute:" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "errore durante l'apertura di '%s'" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "'%s' troppo grande per essere un file .git" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "errore durante la lettura di %s" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "formato file Git non valido: %s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "nessun percorso presente nel file Git: %s" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "%s non è un repository Git" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' è troppo grande" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "'%s' non è un repository Git" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "impossibile modificare la directory corrente in '%s'" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "stat di '%*s%s%s' non riuscito" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Impossibile leggere la directory di lavoro corrente" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "impossibile entrare in '%s'" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "%s non è un repository Git (né lo è alcuna delle directory genitrici)" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7623,7 +6871,7 @@ msgstr "" "Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM " "non è impostata)." -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7633,289 +6881,289 @@ msgstr "" "(0%.3o).\n" "Il proprietario dei file deve avere sempre i permessi di lettura e scrittura." -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "apertura di /dev/null o dup non riuscita" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "fork non riuscita" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "setsid non riuscita" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "la directory oggetti %s non esiste; controlla .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossibile normalizzare il percorso alternativo oggetto: %s" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: ignoro gli archivi oggetto alternativi, la nidificazione è troppo " "profonda" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossibile normalizzare la directory oggetti: %s" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "impossibile eseguire fdopen sul file di lock alternates" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "impossibile leggere il file alternates" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "impossibile spostare il nuovo file alternates nella posizione corretta" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "il percorso '%s' non esiste" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "l'aggiunta del repository di riferimento '%s' come checkout collegato non è " "ancora supportata." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "il repository di riferimento '%s' non è un repository locale." -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "il repository di riferimento '%s' è shallow" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "il repository di riferimento '%s' è un graft" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "mmap non riuscita" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "l'oggetto %s è vuoto" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "oggetto sciolto '%s' corrotto" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'" -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "tipo oggetto non valido" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "impossibile decomprimere l'intestazione %s" -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "impossibile analizzare l'intestazione %s" -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "lettura dell'oggetto %s non riuscita" -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "%s sostitutivo non trovato per %s" -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'oggetto sciolto %s (salvato in %s) è corrotto" -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'oggetto archiviato %s (salvato in %s) è corrotto" -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "impossibile scrivere il file %s" -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "impossibile impostare i permessi a '%s'" -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "errore di scrittura del file" -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "errore durante la chiusura del file oggetto sciolto" -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permessi non sufficienti per l'aggiunta di un oggetto al database repository " "%s" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "impossibile creare il file temporaneo" -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "impossibile scrivere il file oggetto sciolto" -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)" -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd non riuscita sull'oggetto %s (%d)" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "sono confuso dall'origine dati oggetto non stabile per %s" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "utime() di %s non riuscita" -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "impossibile leggere l'oggetto per %s" -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "commit corrotto" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "tag corrotto" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "errore di lettura durante l'indicizzazione di %s" -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "lettura troppo breve durante l'indicizzazione di %s" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s: inserimento del record nel database non riuscito" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo di file non supportato" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s non è un oggetto valido" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s non è un oggetto '%s' valido" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossibile aprire %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mancata corrispondenza per %s (atteso %s)" -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "impossibile eseguire mmap su %s" -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "impossibile decomprimere l'intestazione di %s" -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "impossibile analizzare l'intestazione di %s" -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "impossibile decomprimere i contenuti di %s" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "lo SHA1 breve %s è ambiguo" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "I candidati sono:" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7939,112 +7187,44 @@ msgstr "" "riferimenti ed eliminali se necessario. Disabilita questo\n" "messaggio eseguendo \"git config advice.objectNameWarning false\"" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "il log per '%.*s' è disponibile solo fino al %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "il log per '%.*s' ha solo %d voci" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "il percorso '%s' esiste su disco, ma non in '%.*s'" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"il percorso '%s' esiste, ma non '%s'\n" -"suggerimento: forse intendevi '%.*s:%s' ossia '%.*s:./%s'?" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "il percorso '%s' non esiste in '%.*s'" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"il percorso '%s' è nell'indice, ma non nel passo %d\n" -"suggerimento: Forse intendevi ':%d:%s'?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"il percorso '%s' è nell'indice, ma non '%s'\n" -"suggerimento: Forse intendevi ':%d:%s' ossia ':%d:./%s'?" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "il percorso '%s' esiste su disco, ma non nell'indice" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "il percorso '%s' non esiste (né su disco né nell'indice)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "" -"la sintassi per i percorsi relativi non può essere usata al di fuori " -"dell'albero di lavoro" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "nome oggetto non valido: '%.*s'." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -8052,18 +7232,13 @@ msgstr[0] "%u byte" msgstr[1] "%u byte" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u byte/s" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "impossibile modificare '%s'" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -8094,132 +7269,53 @@ msgstr "nel sottomodulo non popolato '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Lo specificatore percorso '%s' è nel sottomodulo '%.*s'" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "argomento --ignore-submodules errato: %s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"Il sottomodulo nel commit %s e nel percorso '%s' collide con un sottomodulo " -"con lo stesso nome. Lo salto." - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "la voce sottomodulo '%s' (%s) è un %s, non un commit" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"Impossibile eseguire il comando 'git rev-list <commit> --not --remotes -n 1' " -"nel sottomodulo %s" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "il processo per il sottomodulo '%s' non è uscito con successo" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Impossibile risolvere HEAD come riferimento valido." -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "Push del sottomodulo '%s' in corso\n" - -#: submodule.c:1161 +#: submodule.c:1481 #, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "Impossibile eseguire il push del sottomodulo '%s'\n" +msgid "Could not access submodule '%s'" +msgstr "Impossibile accedere al sottomodulo '%s'" -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "Recupero del sottomodulo %s%s in corso\n" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "Impossibile accedere al sottomodulo '%s'\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Errore durante il recupero del sottomodulo:\n" -"%s" - -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' non riconosciuto come repository Git" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "Impossibile eseguire 'git status --porcelain=2' nel sottomodulo %s" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "" -"Esecuzione di 'git status --porcelain=2' non riuscita nel sottomodulo %s" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossibile avviare 'git status' nel sottomodulo '%s'" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" "Impossibile annullare l'impostazione dell'opzione core.worktree nel " "sottomodulo '%s'" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "impossibile ripristinare l'indice del sottomodulo" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "il sottomodulo '%s' ha l'indice sporco" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Impossibile aggiornare il sottomodulo '%s'." -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "" -"la directory Git del sottomodulo '%s' è all'interno della directory Git " -"'%.*s'" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8227,17 +7323,12 @@ msgstr "" "relocate_gitdir non è supportata per il sottomodulo '%s' con più di un " "albero di lavoro" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossibile ricercare il nome per il sottomodulo '%s'" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "mi rifiuto di spostare '%s' in una directory Git esistente" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8248,37 +7339,42 @@ msgstr "" "'%s' a\n" "'%s'\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "impossibile avviare ls-files in .." -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha restituito il valore di ritorno inatteso %d" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignoro un nome sottomodulo sospetto: %s" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "i valori negativi non sono consentiti per submodule.fetchjobs" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "ignoro '%s' che potrebbe essere interpretato come argomento della riga di " "comando: %s" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "valore non valido per %s" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossibile aggiornare la voce .gitmodules %s" @@ -8294,7 +7390,7 @@ msgstr "esecuzione del comando finale '%s' non riuscita" msgid "unknown value '%s' for key '%s'" msgstr "valore '%s' sconosciuto per la chiave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "più di un %s" @@ -8313,7 +7409,7 @@ msgstr "impossibile leggere il file di input '%s'" msgid "could not read from stdin" msgstr "impossibile leggere dallo standard input" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "impossibile eseguire lo stat di '%s'" @@ -8342,47 +7438,47 @@ msgstr "impossibile ridenominare il file temporaneo in %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "impossibile leggere il bundle '%s'" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "trasporto: opzione profondità '%s' non valida" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "vedi protocol.version in 'git help config' per maggiori dettagli" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "impossibile analizzare la configurazione transport.color.*" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "supporto alla versione 2 del protocollo non ancora implementato" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "valore sconosciuto per la configurazione '%s': %s" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "trasporto '%s' non consentito" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync non è più supportato" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8391,7 +7487,7 @@ msgstr "" "I seguenti percorsi sottomodulo contengono modifiche\n" "non trovate su nessun remoto:\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8418,32 +7514,32 @@ msgstr "" "per eseguirne il push a un remoto.\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "Interrompo l'operazione." -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "push di tutti i sottomoduli richiesti non riuscito" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "operazione non supportata dal protocollo" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "scrittura completa verso l'helper remoto non riuscita" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "impossibile trovare l'helper remoto per '%s'" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "impossibile duplicare il descrittore file dell'output helper" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8452,108 +7548,103 @@ msgstr "" "capability necessaria %s sconosciuta; quest'helper remoto probabilmente " "richiede una versione di Git più recente" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "questo helper remoto dovrebbe implementare la capability refspec" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s ha inviato un messaggio inatteso: '%s'" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s ha bloccato anche %s" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "impossibile eseguire fast-import" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "errore durante l'esecuzione di fast-import" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "impossibile leggere il riferimento %s" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "risposta inattesa a connect: %s" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "" "l'impostazione del percorso del servizio remoto non è supportata dal " "protocollo" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "percorso servizio remoto non valido" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "impossibile connettersi al sottoservizio %s" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "attesi ok/error, l'helper ha inviato '%s'" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'helper ha segnalato uno stato inatteso di %s" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "l'helper %s non supporta dry-run" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "l'helper %s non supporta --signed" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'helper %s non supporta --signed=if-asked" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "l'helper %s non supporta --atomic" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'helper %s non supporta 'push-option'" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'helper remoto non supporta il push; è necessario uno specificatore " "riferimento" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "l'helper %s non supporta 'force'" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "impossibile eseguire fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "errore durante l'esecuzione di fast-export" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8562,67 +7653,67 @@ msgstr "" "Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n" "Forse dovresti specificare un branch come 'master'.\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "risposta malformata nell'elenco riferimenti: %s" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "read(%s) non riuscita" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "write(%s) non riuscita" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "thread %s non riuscito" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "join non riuscita per il thread %s: %s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossibile avviare il thread per la copia dei dati: %s" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "wait non riuscita per il processo %s" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "processo %s non riuscito" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "impossibile avviare il thread per la copia dei dati" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "oggetto albero troppo corto" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "modo malformato nella voce dell'albero" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nome file vuoto nella voce dell'albero" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "file alber troppo corto" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8632,7 +7723,7 @@ msgstr "" "checkout:\n" "%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8642,7 +7733,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8652,7 +7743,7 @@ msgstr "" "merge:\n" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8662,7 +7753,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8673,7 +7764,7 @@ msgstr "" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire " "l'operazione di %s." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8683,7 +7774,7 @@ msgstr "" "l'operazione di %s:\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8693,7 +7784,7 @@ msgstr "" "tracciati in esse contenuti vengano persi:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8703,7 +7794,7 @@ msgstr "" "eliminati con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8713,7 +7804,7 @@ msgstr "" "eliminati con il checkout:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8723,7 +7814,7 @@ msgstr "" "eliminati dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8733,7 +7824,7 @@ msgstr "" "eliminati dal merge:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8743,7 +7834,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8753,7 +7844,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8764,7 +7855,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8775,7 +7866,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8785,7 +7876,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8795,7 +7886,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8805,7 +7896,7 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8815,13 +7906,13 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" "La voce '%s' si sovrappone a '%s'. Impossibile eseguire il collegamento." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8831,7 +7922,7 @@ msgstr "" "aggiornate:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8842,7 +7933,7 @@ msgstr "" "l'aggiornamento del checkout sparse:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8853,7 +7944,7 @@ msgstr "" "l'aggiornamento del checkout sparse:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8862,16 +7953,16 @@ msgstr "" "Impossibile aggiornare il sottomodulo:\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Interrompo l'operazione\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "Aggiornamento dei file in corso" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8882,10 +7973,6 @@ msgstr "" "su un filesystem non sensibile a tale differenza) e solo uno\n" "per gruppo in conflitto è nell'albero di lavoro:\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "Aggiornamento dei contrassegni indice in corso" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nome schema URL non valido o suffisso '://' mancante" @@ -8915,54 +8002,50 @@ msgstr "numero di porta non valido" msgid "invalid '..' path segment" msgstr "parte percorso '..' non valida" -#: walker.c:170 -msgid "Fetching objects" -msgstr "Recupero oggetti in corso" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "lettura di '%s' non riuscita" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' nell'albero di lavoro principale non è la directory del repository" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "il file '%s' non contiene il percorso assoluto alla posizione dell'albero di " "lavoro" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' non esiste" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' non è un file .git, codice d'errore %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' non punta a '%s'" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossibile aprire '%s' in lettura e scrittura" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "impossibile accedere a '%s'" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "impossibile ottenere la directory di lavoro corrente" @@ -9319,90 +8402,82 @@ msgstr "" "\")" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (usa \"git cherry-pick --skip\" per saltare questa patch)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Revert in corso." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Attualmente stai eseguendo il revert del commit %s." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (esegui \"git revert --continue\" per continuare)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (usa \"git revert --skip\" per saltare questa patch)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" per annullare l'operazione di revert)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Attualmente stai eseguendo una bisezione." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" per tornare al branch originario)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "Sul branch " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "rebase interattivo in corso su " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "rebase in corso su " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Attualmente non sei su alcun branch." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Commit iniziale" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Non ci sono ancora commit" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "File non tracciati" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "File ignorati" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9414,31 +8489,31 @@ msgstr "" "ma devi stare attento a non dimenticarti di aggiungere\n" "autonomamente i file nuovi (vedi 'git help status')." -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "File non tracciati non elencati%s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (usa l'opzione -u per visualizzare i file non tracciati)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Nessuna modifica" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "nessuna modifica aggiunta al commit\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9447,206 +8522,197 @@ msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati " "(usa \"git add\" per tracciarli)\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "non c'è nulla di cui eseguire il commit (crea/copia dei file e usa \"git add" "\" per tracciarli)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "non c'è nulla di cui eseguire il commit\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "non c'è nulla di cui eseguire il commit (usa -u per visualizzare i file non " "tracciati)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "non c'è nulla di cui eseguire il commit, l'albero di lavoro è pulito\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Non ci sono ancora commit su" -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (nessun branch)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "differente" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "indietro " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "avanti " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "" "inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "impossibile eseguire %s: l'indice contiene modifiche di cui non è stato " "eseguito il commit." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "unlink di '%s' non riuscito" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opzioni>] [--] <specificatore percorso>..." -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "stato diff inatteso %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "aggiornamento dei file non riuscito" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "elimina '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "Impossibile leggere l'indice" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossibile aprire '%s' in scrittura." -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "Impossibile scrivere la patch" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "modifica della patch non riuscita" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "Impossibile eseguire lo stat di '%s'" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Patch vuota. Operazione interrotta." -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "Impossibile applicare '%s'" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "I seguenti percorsi sono ignorati da uno dei file .gitignore:\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "test controllato" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "scelta interattiva" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "seleziona gli hunk in modalità interattiva" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "modifica il diff corrente e applicalo" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "consenti l'aggiunta di file altrimenti ignorati" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "aggiorna i file tracciati" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "rinormalizza i fine riga dei file tracciati (implica -u)" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "salva solo il fatto che il percorso sarà aggiunto successivamente" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "aggiungi le modifiche da tutti i file tracciati e non" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignora i percorsi eliminati nell'albero di lavoro (come --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "non eseguire l'aggiunta, aggiorna solo l'indice" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "" "salta semplicemente i file che non possono essere aggiunti a causa di errori" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "" "controlla se i file - anche quelli mancanti - sono ignorati durante il test " "controllato" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "esegui l'override del bit eseguibile dei file elencati" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "emetti un avviso quando si aggiunge un repository incorporato" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "backend per `git stash -p`" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9677,178 +8743,152 @@ msgstr "" "\n" "Vedi \"git help submodule\" per ulteriori informazioni." -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "aggiunta repository Git incorporato in corso: %s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Usa -f se vuoi veramente aggiungerli.\n" -"Per disabilitare questo messaggio, esegui\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Usa -f se vuoi davvero aggiungerli.\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "aggiunta dei file non riuscita" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file non è compatibile con --interactive/--patch" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file non è compatibile con --edit" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A e -u non sono compatibili fra loro" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Il parametro --chmod '%s' deve essere -x o +x" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "" -"--pathspec-from-file non è compatibile con gli argomenti specificatore " -"percorso" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul richiede --pathspec-from-file" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Non è stato specificato nulla, non è stato aggiunto nulla.\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"Forse volevi dire 'git add .'?\n" -"Per disabilitare questo messaggio, esegui\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Forse intendevi dire 'git add .'?\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "impossibile analizzare lo script author" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' è stato eliminato dall'hook applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Riga di input malformata: '%s'." -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Copia delle note da '%s' a '%s' non riuscita" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "fseek non riuscita" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "impossibile analizzare la patch '%s'" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Può essere applicata solo una serie di patch StGIT per volta" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "timestamp non valido" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "riga Date non valida" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "offset fuso orario non valido" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Rilevamento del formato della patch non riuscito." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "creazione della directory '%s' non riuscita" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Divisione delle patch non riuscita." -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "impossibile scrivere il file indice" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Una volta risolto questo problema, esegui \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferisci saltare questa patch, esegui invece \"%s --skip\"." -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Per ripristinare il branch originario e terminare il patching, esegui \"%s --" "abort\"." -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch inviata con format=flowed; gli spazi al termine delle righe potrebbero " "essere andati perduti." -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "La patch è vuota." -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "riga autore mancante nel commit %s" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "riga ident non valida: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossibile analizzare il commit %s" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dal repository mancano i blob necessari per ripiegare sul merge a tre vie." -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilizzo le informazioni dell'indice per ricostruire un albero di base..." -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9856,24 +8896,24 @@ msgstr "" "Hai modificato manualmente la patch?\n" "Non può essere applicata ai blob registrati nel suo indice." -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Ripiego sul patching della base e sul merge a tre vie..." -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Merge delle modifiche non riuscito." -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "applicazione a una cronologia vuota" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossibile riprendere l'attività: %s non esiste." -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Il corpo del commit è:" @@ -9881,41 +8921,37 @@ msgstr "Il corpo del commit è:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Applico? Sì [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:" -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "impossibile scrivere il file indice" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Applicazione in corso: %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Nessuna modifica -- patch già applicata." -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch non riuscita a %s %.*s" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -"Usa 'git am --show-current-patch=diff' per visualizzare la patch non riuscita" +"Usa 'git am --show-current-patch' per visualizzare la patch non riuscita" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9925,7 +8961,7 @@ msgstr "" "Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n" "ha già introdotto le stesse modifiche; potresti voler saltare questa patch." -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9938,17 +8974,17 @@ msgstr "" "Potresti eseguire `git rm` su un file per accettarne la risoluzione " "\"eliminato da loro\"." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Impossibile analizzare l'oggetto '%s'." -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "pulizia dell'indice non riuscita" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9957,158 +8993,148 @@ msgstr "" "'am'.\n" "Non ritorno indietro a ORIG_HEAD" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valore non valido per --patch-format: %s" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Valore non valido per --show-current-patch: %s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s non è compatibile con --show-current-patch=%s" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opzioni>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "esegui in modalità interattiva" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "opzione storica -- non esegue nulla" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "consenti il ripiego sul merge a tre vie se necessario" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "non visualizzare messaggi" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "aggiungi una riga Signed-off-by al messaggio di commit" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "converti codifica in UTF-8 (impostazione predefinita)" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "fornisci l'argomento -k a git-mailinfo" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "fornisci l'argomento -b a git-mailinfo" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "fornisci l'argomento -m a git-mailinfo" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal " "valore di am.keepcr" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\"" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "passa l'argomento a git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "il formato delle patch" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "" "esegui l'override del messaggio d'errore quando si verifica un errore legato " "alle patch" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "" "continua l'applicazione delle patch dopo la risoluzione di un conflitto" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "sinonimi di --continue" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "salta la patch corrente" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "ripristina il branch originario e interrompi l'operazione di patching." -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'è." -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "visualizza la patch in fase di applicazione" +#: builtin/am.c:2244 +msgid "show the patch being applied." +msgstr "visualizza la patch in fase di applicazione." -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "menti sulla data del commit" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "usa il timestamp corrente come data autore" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ID chiave" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "firma i commit con GPG" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(a uso interno per git-rebase)" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10116,18 +9142,18 @@ msgstr "" "L'opzione -b/--binary non esegue nulla da molto tempo e\n" "sarà rimossa. Non usarla più." -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "lettura dell'indice non riuscita" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "la directory di rebase precedente %s esiste ancora ma è stata specificata " "un'mbox." -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -10136,11 +9162,11 @@ msgstr "" "Trovata directory smarrita %s.\n" "Usa \"git am --abort\" per eliminarla." -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operazione di risoluzione non in corso, non riprendiamo." -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "" "la modalità interattiva richiede che le patch siano fornite sulla riga di " @@ -10270,7 +9296,7 @@ msgstr "Non stiamo eseguendo un bisect.\n" msgid "'%s' is not a valid commit" msgstr "'%s' non è un commit valido" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10278,27 +9304,27 @@ msgstr "" "impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git " "bisect reset <commit>'." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Argomento bisect_write errato: %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossibile recuperare l'OID della revisione '%s'" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "impossibile aprire il file '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Comando non valido: attualmente stai eseguendo una bisezione %s/%s" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10307,7 +9333,7 @@ msgstr "" "Devi specificare almeno una revisione %s ed una %s.\n" "Puoi usare \"git bisect %s\" e \"git bisect %s\" per questo scopo." -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10318,7 +9344,7 @@ msgstr "" "Quindi devi specificare almeno una revisione %s ed una %s.\n" "Puoi usare \"git bisect %s\" e \"git bisect %s\" a questo scopo." -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "eseguo la bisezione solo con un commit %s" @@ -10327,15 +9353,15 @@ msgstr "eseguo la bisezione solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "Sei sicuro? [Y/n] " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "nessun termine definito" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10344,7 +9370,7 @@ msgstr "" "I tuoi termini correnti sono %s per lo stato vecchio\n" "e %s per lo stato nuovo.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10353,282 +9379,286 @@ msgstr "" "argomento %s non valido per 'git bisect terms'.\n" "Le opzioni supportate sono: --term-good|--term-old e --term-bad|--term-new." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "opzione non riconosciuta: '%s'" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "sembra che '%s' non sia una revisione valida" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "HEAD non valida - ho bisogno di un'HEAD" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "checkout di '%s' non riuscito. Prova con 'git bisect start <branch valido>'." -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "non eseguirò la bisezione su un albero sottoposto a cg-seek" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "head non valida - riferimento simbolico strano" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "riferimento non valido: '%s'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "esegui 'git bisect next'" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "scrivi i termini in .git/BISECT_TERMS" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "pulisci lo stato bisezione" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "controlla se le revisioni attese sono presenti" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "reimposta lo stato della bisezione" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "scrivi lo stato della bisezione in BISECT_LOG" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "controlla e imposta i termini in uno stato bisezione" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "" "controlla se esistono termini per revisioni non funzionanti o funzionanti" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "stampa i termini della bisezione" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "inizia la sessione di bisezione" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "aggiorna BISECT_HEAD anziché eseguire il checkout del commit corrente" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "non registrare le operazioni eseguite per BISECT_WRITE" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms richiede due argomenti" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state non richiede argomenti" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset richiede o nessun argomento o un commit" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write richiede o quattro o cinque argomenti" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms richiede tre argomenti" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check richiede due o tre argomenti" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms richiede zero o un argomento" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "atteso colore: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "deve terminare con un colore" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "colore '%s' non valido in color.blame.repeatedLines" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "valore non valido per blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "impossibile trovare la revisione %s da ignorare" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "" "Visualizza le voci blame incrementalmente, a mano a mano che le troviamo" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Visualizza un hash SHA-1 vuoto per i commit limite (impostazione " "predefinita: off)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Non gestire i commit radice come commit limite (impostazione predefinita: " "off)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Visualizza le statistiche sul costo dell'operazione" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Forza l'indicazione d'avanzamento dell'operazione" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Visualizza il punteggio di output per le voci blame" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "" "Visualizza il nome file originario (impostazione predefinita: automatico)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "" "Visualizza il numero di riga originario (impostazione predefinita: off)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "" "Visualizza l'output in un formato progettato per l'utilizzo da parte di una " "macchina" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "" "Visualizza il formato porcelain con le informazioni sul commit per ogni riga" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa la stessa modalità di output di git-annotate (impostazione predefinita: " "off)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "" "Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: " "off)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Non visualizzare il nome autore e il timestamp (impostazione predefinita: " "off)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "" "Visualizza l'indirizzo e-mail dell'autore invece del nome (impostazione " "predefinita: off)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignora le differenze relative agli spazi bianchi" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "revisione" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" msgstr "Ignora <revisione> durante l'esecuzione del blame" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "Ignora le revisioni specificate in <file>" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "colora in modo differente i metadati ridondanti della riga precedente" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "colora le righe in base all'età" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Usa un'euristica sperimentale per migliorare i diff" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Usa cicli extra per trovare una corrispondenza migliore" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa le revisioni salvate in <file> anziché richiamare git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Usa i contenuti di <file> come immagine finale" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "punteggio" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Trova copie delle righe all'interno e fra file" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Trova righe spostate all'interno e fra file" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "Elabora solo l'intervallo righe n,m, contandole da 1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress non può essere usato con --incremental o con i formati porcelain" @@ -10641,18 +9671,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "4 anni, 11 giorni fa" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "il file %s ha solo %lu riga" msgstr[1] "il file %s ha solo %lu righe" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Eseguo il blame sulle righe" @@ -10870,7 +9900,7 @@ msgstr "imposta la modalità tracking (vedi git-pull(1))" msgid "do not use" msgstr "non usare" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "upstream" @@ -10879,8 +9909,8 @@ msgid "change the upstream info" msgstr "modifica le informazioni sull'upstream" #: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "rimuovi le informazioni sull'upstream" +msgid "Unset the upstream info" +msgstr "Rimuovi le informazioni sull'upstream" #: builtin/branch.c:628 msgid "use colored output" @@ -10982,7 +10012,7 @@ msgstr "" msgid "format to use for the output" msgstr "formato da usare per l'output" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trovato fra i riferimenti/head!" @@ -11078,67 +10108,20 @@ msgstr "" "l'opzione '--set-upstream' non è più supportata. Usa '--track' o '--set-" "upstream-to'." -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<opzioni>] <file> <argomenti git-rev-list>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<opzioni>] <file>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <file> [<nome riferimento>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <file> [<nome riferimento>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "non visualizzare la barra di avanzamento" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "visualizza la barra di avanzamento" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "" -"visualizza la barra di avanzamento durante la fase di scrittura oggetti" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "Per creare un bundle è necessario un repository." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "non visualizzare i dettagli sul bundle" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s è corretto\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "Per creare un bundle è necessario un repository." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Per decomprimere un bundle è necessario un repository." -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "" -"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Sottocomando sconosciuto: %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -11146,7 +10129,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -11154,75 +10137,75 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "può essere specificata solo un'opzione batch" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> può essere uno fra blob, tree, commit, tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "visualizza tipo oggetto" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "visualizza dimensioni oggetto" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "esci con codice d'uscita zero se non si sono verificati errori" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "stampa il contenuto dell'oggetto con un formato leggibile" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "usa un percorso specifico per --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "consenti a -s e -t di funzionare con oggetti malformati/corrotti" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "esegui il buffering dell'output di --batch" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" "visualizza le informazioni e il contenuto degli oggetti forniti nello " "standard input" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "visualizza le informazioni degli oggetti forniti nello standard input" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "segui i collegamenti simbolici entro l'albero (usato con --batch o --batch-" "check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "visualizza tutti gli oggetti con --batch o --batch-check" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "non ordinare l'output di --batch-all-objects" @@ -11250,8 +10233,8 @@ msgstr "leggi i nomi dei file dallo standard input" msgid "terminate input and output records by a NUL character" msgstr "termina i record di input e output con un carattere NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "non visualizzare l'avanzamento dell'operazione" @@ -11263,27 +10246,27 @@ msgstr "visualizza i percorsi di input non corrispondenti" msgid "ignore index when checking" msgstr "ignora l'indice durante il controllo" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "impossibile specificare i nomi percorso con --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z ha senso solo con --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "nessun percorso specificato" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "--quiet è valido solo con un nome percorso singolo" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "non è possibile usare sia --quiet sia --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching è valido solo con --verbose" @@ -11341,9 +10324,9 @@ msgid "write the content to temporary files" msgstr "scrivi il contenuto in file temporanei" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "stringa" @@ -11371,100 +10354,100 @@ msgstr "git switch [<opzioni>] <branch>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opzioni>] [--source=<branch>] <file>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "il percorso '%s' non ha la nostra versione" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "il percorso '%s' non ha la loro versione" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "il percorso '%s' non ha tutte le versioni necessarie" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "il percorso '%s' non ha le versioni necessarie" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "percorso '%s': impossibile eseguire il merge" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossibile aggiungere il risultato del merge per '%s'" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Ricreato %d conflitto di merge" msgstr[1] "Ricreati %d conflitti di merge" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Aggiornato %d percorso da %s" msgstr[1] "Aggiornati %d percorsi da %s" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Aggiornato %d percorso dall'indice" msgstr[1] "Aggiornati %d percorsi dall'indice" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' non può essere usato con i percorsi in fase di aggiornamento" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' non può essere usato con %s" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossibile aggiornare dei percorsi e passare al branch '%s' " "contemporaneamente." -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "né '%s' né '%s' sono stati specificati" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' dev'essere usato quando '%s' non è specificato" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' non possono essere usati con %s" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "il percorso '%s' non è stato sottoposto a merge" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "prima devi risolvere l'indice corrente" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11473,50 +10456,55 @@ msgstr "" "impossibile continuare con modifiche in stage nei file seguenti:\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "le modifiche in stage nei seguenti file potrebbero andare perdute: %s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD si trova ora a" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "impossibile aggiornare HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Ripristina il branch '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Si è già su '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Si è passati al branch '%s' e lo si è reimpostato\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Si è passati a un nuovo branch '%s'\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Si è passati al branch '%s'\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ...e altri %d.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11539,7 +10527,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11566,19 +10554,28 @@ msgstr[1] "" " git branch <nome del nuovo branch> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "errore interno durante la visita delle revisioni" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "La precedente posizione di HEAD era" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Sei su un branch che deve ancora essere creato" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "atteso solo un riferimento" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "atteso solo un riferimento, %d specificati." + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11587,72 +10584,37 @@ msgstr "" "'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n" "Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità" -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n" -"puoi farlo usando la versione completamente qualificata del nome\n" -"con l'opzione --track:\n" -"\n" -" git checkout --track origin/<nome>\n" -"\n" -"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n" -"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n" -"impostare checkout.defaultRemote=origin nel tuo file di configurazione." - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' corrisponde a più (%d) branch che ne tracciano uno remoto" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "atteso solo un riferimento" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "atteso solo un riferimento, %d specificati." - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "riferimento non valido: %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "il riferimento non è un albero: %s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "atteso branch, ricevuto tag '%s'" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "atteso branch, ricevuto branch remoto '%s'" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "atteso branch, ricevuto '%s'" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "atteso branch, ricevuto commit '%s'" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11660,7 +10622,7 @@ msgstr "" "impossibile cambiare branch durante un merge\n" "Considera l'uso di \"git merge --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11668,7 +10630,7 @@ msgstr "" "impossibile cambiare branch nel bel mezzo di una sessione am\n" "Considera l'uso di \"git am --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11676,7 +10638,7 @@ msgstr "" "impossibile cambiare branch durante un rebase\n" "Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11684,7 +10646,7 @@ msgstr "" "impossibile cambiare branch durante un cherry-pick\n" "Considera l'uso di \"git cherry-pick --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11692,147 +10654,142 @@ msgstr "" "impossibile cambiare branch durante un revert\n" "Considera l'uso di \"git revert --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "stai cambiando branch durante una bisezione" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "i percorsi non possono essere usati passando da un branch a un altro" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' non può essere usato passando da un branch a un altro" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' non può essere usato con '%s'" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' non accetta l'argomento <punto di partenza>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossibile cambiare branch per passare a '%s' che non è un commit" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "argomento branch o commit mancante" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forza l'indicazione d'avanzamento dell'operazione" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "esegui un merge a tre vie con il nuovo branch" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "stile" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "stile conflitti (merge o diff3)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "scollega l'HEAD al commit specificato" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "imposta le informazioni sull'upstream per il nuovo branch" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "esegui forzatamente il checkout (scarta le modifiche locali)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "nuovo branch" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "nuovo branch senza genitore" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "aggiorna i file ignorati (impostazione predefinita)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "" "non controllare se un altro albero di lavoro contiene il riferimento " "specificato" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "" "esegui il checkout della nostra versione per i file non sottoposti a merge" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "" "esegui il checkout della loro versione per i file non sottoposti a merge" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "non limitare gli specificatori percorso solo alle voci sparse" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "le opzioni -b, -B e --orphan sono mutuamente esclusive" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "le opzioni -p e --overlay sono mutualmente esclusive" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track richiede il nome di un branch" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "nome del branch mancante; prova con -b" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "impossibile risolvere %s" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "devi specificare il percorso/i percorsi da ripristinare" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "specificatore percorso non valido" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' non è un commit e non si può creare un branch '%s' che parta da esso" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach non accetta un percorso '%s' come argomento" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file non è compatibile con --detach" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file non è compatibile con --patch" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11840,69 +10797,96 @@ msgstr "" "git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n" "si esegue il checkout dell'indice." -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "devi specificare il percorso/i percorsi da ripristinare" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"'%s' corrisponde a più di un branch remoto.\n" +"Abbiamo trovato %d remoti con un riferimento corrispondente, per cui\n" +"abbiamo ripiegato tentando di risolvere l'argomento come percorso, ma\n" +"non siamo riusciti nemmeno a portare a termine tale operazione!\n" +"\n" +"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n" +"puoi farlo usando la versione completamente qualificata del nome\n" +"con l'opzione --track:\n" +"\n" +" git checkout --track origin/<nome>\n" +"\n" +"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n" +"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n" +"impostare checkout.defaultRemote=origin nel tuo file di configurazione." -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "branch" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "crea un nuovo branch ed eseguine il checkout" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "crea/reimposta un branch ed eseguine il checkout" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "crea il registro dei riferimenti per il nuovo branch" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "usa modalità overlay (impostazione predefinita)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "crea un nuovo branch e passa a quest'ultimo" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "crea/reimposta un branch e passa a quest'ultimo" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "prevedi 'git switch <branch inesistente>'" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "scarta le modifiche locali" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "albero da cui eseguire il checkout" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "ripristina l'indice" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "ripristina l'albero di lavoro (impostazione predefinita)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "ignora voci non sottoposte a merge" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "usa modalità overlay" @@ -11943,7 +10927,7 @@ msgstr "eliminazione di %s non riuscita" msgid "could not lstat %s\n" msgstr "impossibile eseguire l'lstat di %s\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11956,7 +10940,7 @@ msgstr "" "pippo - seleziona un elemento basandoti su un prefisso univoco\n" " - (vuoto) non selezionare niente\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11977,33 +10961,38 @@ msgstr "" "* - seleziona tutti gli elementi\n" " - (vuoto) termina il processo di selezione\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Eh (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Immetti i pattern da ignorare>> " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Seleziona gli elementi da eliminare" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Eliminare %s [y/N]? " -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Ciao.\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -12022,56 +11011,64 @@ msgstr "" "help - visualizza questa schermata\n" "? - guida al prompt di selezione" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** Comandi ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "Cosa faccio ora" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminerei il seguente elemento:" msgstr[1] "Eliminerei i seguenti elementi:" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Non ci sono più file da ripulire, esco." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "non stampare i nomi dei file eliminati" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "forza l'operazione" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "pulizia interattiva" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "rimuovi intere directory" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "pattern" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "aggiungi <pattern> alle regole usate per ignorare i file" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "elimina anche i file ignorati" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "elimina solo i file ignorati" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x e -X non possono essere usati insieme" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -12079,7 +11076,7 @@ msgstr "" "clean.requireForce è impostato a true e né -i, né -n, né -f sono stati " "specificati; mi rifiuto di eseguire la pulizia" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -12087,7 +11084,7 @@ msgstr "" "clean.requireForce è true per impostazione predefinita e né -i, né -n, né -f " "sono stati specificati; mi rifiuto di eseguire la pulizia" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opzioni>] [--] <repository> [<directory>]" @@ -12135,18 +11132,18 @@ msgstr "directory modelli" msgid "directory from which templates will be used" msgstr "directory da cui saranno recuperati i modelli" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "repository di riferimento" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "usa --reference solo durante la clonazione" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "nome" @@ -12162,8 +11159,8 @@ msgstr "esegui il checkout di <branch> anziché dell'HEAD del remoto" msgid "path to git-upload-pack on the remote" msgstr "percorso al comando remoto git-upload-pack" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "profondità" @@ -12171,7 +11168,7 @@ msgstr "profondità" msgid "create a shallow clone of that depth" msgstr "crea un clone shallow con questa profondità" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "tempo" @@ -12179,19 +11176,18 @@ msgstr "tempo" msgid "create a shallow clone since a specific time" msgstr "crea un clone shallow a partire dall'istante specificato" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "revisione" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "" "aumenta la profondità della cronologia del clone shallow fino alla revisione " "specificata esclusa" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "clona solo un branch, HEAD o quello specificato con --branch" @@ -12219,23 +11215,23 @@ msgstr "chiave=valore" msgid "set config inside the new repository" msgstr "imposta la configurazione nel nuovo repository" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "specifica del server" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opzione da trasmettere" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "usa solo indirizzi IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "usa solo indirizzi IPv6" @@ -12245,13 +11241,7 @@ msgstr "" "tutti i sottomoduli clonati useranno il loro rispettivo branch remoto " "tracciato" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" -"inizializza il file sparse-checkout per includere solo i file nel percorso " -"radice" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12259,42 +11249,47 @@ msgstr "" "Non è stato possibile indovinare alcun nome directory.\n" "Specifica una directory tramite la riga di comando" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "informazione: Impossibile aggiungere un alternato a '%s': %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s esiste e non è una directory" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "impossibile avviare l'iteratore su '%s'" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "unlink di '%s' non riuscito" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "creazione del collegamento '%s' non riuscita" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "copia del file in '%s' non riuscita" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "iterazione su '%s' non riuscita" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "fatto.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12305,102 +11300,98 @@ msgstr "" "con 'git status' e riprovare ad eseguire il checkout con\n" "'git restore --source=HEAD :/'\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossibile trovare il branch remoto %s da clonare." -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "impossibile aggiornare %s" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "inizializzazione del file sparse-checkout non riuscita" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile " "eseguire il checkout.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "impossibile eseguire il checkout dell'albero di lavoro" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "impossibile scrivere i parametri nel file di configurazione" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "impossibile eseguire il repack per pulire l'area di lavoro" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "impossibile eseguire l'unlink del file alternates temporaneo" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Troppi argomenti." -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Devi specificare un repository da clonare." -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "le opzioni --bare e --origin %s non sono compatibili." -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "le opzioni --bare e --separate-git-dir non sono compatibili." -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "il repository '%s' non esiste" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "la profondità %s non è un numero positivo" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "il percorso di destinazione '%s' esiste già e non è una directory vuota." -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "l'albero di lavoro '%s' esiste già." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossibile creare le prime directory di '%s'" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossibile creare la directory dell'albero di lavoro '%s'" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clone nel repository spoglio '%s' in corso...\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clone in '%s' in corso...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12408,36 +11399,36 @@ msgstr "" "il clone --recursive non è compatibile né con --reference né con --reference-" "if-able" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "L'opzione --depth è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-since è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-exclude è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "L'opzione --filter è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "il repository sorgente è shallow, ignoro l'opzione --local" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "l'opzione --local è ignorata" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Il branch remoto %s non è stato trovato nell'upstream %s" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Sembra che tu abbia clonato un repository vuoto." @@ -12486,7 +11477,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "genitore duplicato %s ignorato" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "%s non è un nome oggetto valido" @@ -12514,13 +11505,13 @@ msgstr "genitore" msgid "id of a parent commit object" msgstr "ID di un oggetto commit genitore" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "messaggio" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "messaggio di commit" @@ -12528,8 +11519,8 @@ msgstr "messaggio di commit" msgid "read commit log message from file" msgstr "leggi il messaggio di log del commit da un file" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "firma il commit con GPG" @@ -12605,66 +11596,57 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "l'opzione --pathspec-from-file non ha senso con -a" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "" -"Non specificare un percorso con le opzioni --include/--only non ha senso." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "impossibile creare l'indice temporaneo" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "aggiunta interattiva non riuscita" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "impossibile aggiornare l'indice temporaneo" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Impossibile aggiornare l'albero cache principale" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "impossibile scrivere il file new_index" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "impossibile eseguire un commit parziale durante un merge." -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossibile eseguire un commit parziale durante un cherry-pick." -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "impossibile leggere l'indice" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "impossibile scrivere il file indice temporaneo" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "dal commit '%s' manca l'intestazione autore" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "il commit '%s' ha una riga autore malformata" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "parametro --author malformato" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12672,38 +11654,38 @@ msgstr "" "impossibile selezionare un carattere commento non usato\n" "nel messaggio di commit corrente" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "impossibile trovare il commit %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lettura del messaggio di log dallo standard input)\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "impossibile leggere il log dallo standard input" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "impossibile leggere il file di log '%s'" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "impossibile leggere SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "impossibile leggere MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "impossibile scrivere il modello di commit" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12718,7 +11700,7 @@ msgstr "" "\t%s\n" "e riprova.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12733,7 +11715,7 @@ msgstr "" "\t%s\n" "e riprova.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12742,7 +11724,7 @@ msgstr "" "Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n" "con '%c' saranno ignorate e un messaggio vuoto interromperà il commit.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12753,144 +11735,149 @@ msgstr "" "con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n" "Un messaggio vuoto interromperà il commit.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutore: %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sEsecutore commit: %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Impossibile leggere l'indice" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Errore durante la costruzione degli alberi" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' non è nel formato 'Nome <e-mail>' e non corrisponde ad alcun " "autore esistente" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo non valido ignorato: '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo file non tracciati non valido: '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long e -z non sono compatibili" -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso" -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Non c'è nulla da modificare." -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend." -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend." -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Le opzioni --squash e --fixup non possono essere usate insieme" -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata." -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'opzione -m non può essere combinata con -c/-C/-F." -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend." -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Può essere usata solo una delle opzioni --include/--only/--all/--" "interactive/--patch." -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "" +"Non specificare un percorso con le opzioni --include/--only non ha senso." + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "i percorsi '%s ...' non hanno senso con -a" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "visualizza concisamente lo stato" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "visualizza le informazioni sul branch" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "visualizza le informazioni sullo stash" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "calcola tutti i valori dopo/prima di" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "versione" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "output leggibile da una macchina" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "visualizza lo stato in forma lunga (impostazione predefinita)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "termina le voci con NUL" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "modo" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "visualizza file non tracciati, modalità facoltative: all, normal, no. " "(Impostazione predefinita: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12898,11 +11885,11 @@ msgstr "" "visualizza file ignorati, modalità facoltative: traditional, matching, no. " "(Impostazione predefinita: traditional)" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "quando" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12910,175 +11897,175 @@ msgstr "" "ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, " "untracked. (Impostazione predefinita: all)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "elenca i file non tracciati in colonne" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "non rilevare le ridenominazioni" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "" "rileva le ridenominazioni, imposta facoltativamente l'indice di similarità" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinazione di argomenti sui file ignorati e non tracciati non supportata" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "" "ometti di visualizzare il riepilogo dopo un commit completato con successo" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "visualizza il diff nel modello del messaggio di commit" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Opzioni messaggio di commit" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "leggi il messaggio da un file" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "autore" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "sovrascrivi l'autore per il commit" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "data" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "sovrascrivi la data per il commit" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "riusa il messaggio del commit specificato per poi modificarlo" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "riusa il messaggio del commit specificato" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa il messaggio in formato autosquash per correggere il commit specificato" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa il messaggio in formato autosquash per eseguire lo squash del commit " "specificato" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "aggiungi Signed-off-by:" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "usa il file modello specificato" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "forza la modifica del commit" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "includi lo stato nel modello del messaggio di commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Opzioni contenuto commit" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "esegui il commit di tutti i file modificati" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "aggiungi i file specificati all'indice per il commit" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "aggiungi i file in modalità interattiva" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "aggiungi le modifiche in modalità interattiva" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "esegui il commit solo dei file specificati" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "ignora gli hook pre-commit e commit-msg" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "visualizza gli elementi di cui sarebbe eseguito il commit" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "modifica il commit precedente" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "ignora l'hook post-rewrite" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "accetta di registrare una modifica vuota" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "accetta di registrare una modifica con un messaggio vuoto" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "File MERGE_HEAD corrotto (%s)" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "impossibile leggere MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "impossibile leggere il messaggio di commit: %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Interrompo il commit a causa di un messaggio di commit vuoto.\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Interrompo il commit; non hai modificato il messaggio.\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13090,75 +12077,76 @@ msgstr "" "superata, quindi esegui \"git restore --staged :/\" per\n" "procedere al ripristino." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <directory oggetti>] [--shallow] [--" -"[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <directory oggetti>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <directory oggetti>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <directory oggetti>] [--shallow]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" "git commit-graph write [--object-dir <directory oggetti>] [--append|--split] " -"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opzioni split>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "impossibile trovare la directory oggetti corrispondente a %s" +"[--reachable|--stdin-packs|--stdin-commits] <opzioni split>" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "directory" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "La directory oggetti in cui memorizzare il grafo" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Impossibile aprire il grafo dei commit '%s'" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "inizia la visita da tutti i riferimenti" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "esamina i pack-index elencati sullo standard input alla ricerca di commit" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "inizia la visita ai commit elencati sullo standard input" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "includi tutti i commit già presenti nel file commit-graph" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "consenti la scrittura di un file grafo dei commit incrementale" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "numero massimo di commit in un grafo dei commit diviso non di base" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs" @@ -13166,218 +12154,212 @@ msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs" msgid "git config [<options>]" msgstr "git config [<opzioni>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argomento --type non riconosciuto: %s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "solo un tipo per volta" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "Percorso file di configurazione" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "usa il file di configurazione globale" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "usa il file di configurazione di sistema" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "usa il file di configurazione del repository" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "usa il file di configurazione per albero di lavoro" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "usa il file di configurazione specificato" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "ID blob" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "leggi la configurazione dall'oggetto blob specificato" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "Azione" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "ottieni valore: nome [espressione-regolare-valore]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "ottieni tutti i valori: chiave [espressione-regolare-valore]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "ottieni i valori in base a un'espressione regolare: espressione-regolare-" "nome [espressione-regolare-valore]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "ottieni il valore specifico per l'URL: sezione[.variabile] URL" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "" "sostituisci tutte le variabili corrispondenti: nome-valore [espressione-" "regolare-valore]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "aggiungi una nuova variabile: nome valore" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "rimuovi una variabile: nome [espressione-regolare-valore]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "rimuovi tutte le corrispondenze: nome [espressione-regolare-valore]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "rinomina sezione: vecchio-nome nuovo-nome" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "rimuovi una sezione: nome" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "elenca tutti" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "apri un editor" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "trova il colore configurato: slot [valore-predefinito]" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trova l'impostazione colore: slot [standard-output-è-una-tty]" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "Tipo" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "al valore è assegnato questo tipo" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "il valore è \"true\" o \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "il valore è un numero decimale" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "il valore è --bool o --int" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "il valore è un percorso (nome file o directory)" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "il valore è una data di scadenza" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "Altro" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "termina i valori con un byte NUL" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "visualizza solo i nomi delle variabili" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "" "rispetta le directory di inclusione durante il recupero delle variabili" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "visualizza l'origine del file di configurazione (file, standard input, blob, " "riga di comando)" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"visualizza l'ambito della configurazione (albero di lavoro, locale, globale, " -"sistema, comando)" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "valore" -#: builtin/config.c:160 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "con --get, usa il valore predefinito se la voce è mancante" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "numero di argomenti errato, dovrebbero essere %d" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "numero di argomenti errato, dovrebbero essere da %d a %d" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "pattern chiave non valido: %s" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "formattazione del valore configurazione predefinito non riuscita: %s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "impossibile analizzare il colore '%s'" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "impossibile analizzare il valore colore predefinito" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "non si è in una directory git" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "la scrittura su standard input non è supportata" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "la scrittura di blob di configurazione non è supportata" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13392,23 +12374,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "solo un file di configurazione per volta" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local può essere usato solo in un repository Git" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob può essere usato solo in un repository Git" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "$HOME non impostata" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13419,52 +12401,52 @@ msgstr "" "Leggi la sezione \"FILE DI CONFIGURAZIONE\" in \"git help worktree\" per\n" "i dettagli" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "--get-color e il tipo della variabile non sono coerenti" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "solo un'azione per volta" -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only è applicabile solo a --list o --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:712 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin è applicabile solo a --get, --get-all, --get-regexp e --list" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default è applicabile solo a --get" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "impossibile leggere il file di configurazione '%s'" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "errore durante l'elaborazione del/dei file di configurazione" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "la modifica dello standard input non è supportata" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "la modifica dei blob non è supportata" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "impossibile creare il file di configurazione %s" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13473,7 +12455,7 @@ msgstr "" "impossibile sovrascrivere valori multipli con un singolo valore\n" " Usa un'espressione regolare, --add o --replace-all per modificare %s." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "sezione %s non esistente" @@ -13486,59 +12468,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "stampa le dimensioni in un formato leggibile" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opzioni>] [<espressione commit>...]" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<opzioni>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "head" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "leggero" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "annotato" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "il tag annotato %s non è disponibile" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "il tag annotato %s non ha un nome incorporato" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "il tag '%s' in realtà qui è '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "nessun tag corrisponde esattamente a '%s'" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Nessuna corrispondenza esatta sui riferimenti o sui tag, sto eseguendo una " "ricerca per descrivere il commit\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "ricerca terminata in %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13547,7 +12529,7 @@ msgstr "" "Nessun tag annotato può descrivere '%s'.\n" "Ciò nonostante, c'erano dei tag non annotati: prova con --tags." -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13556,12 +12538,12 @@ msgstr "" "Nessun tag può descrivere '%s'.\n" "Prova con --always o crea dei tag." -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "ho attraversato %lu commit\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13570,94 +12552,94 @@ msgstr "" "trovati più di %i tag; ho elencato i %i più recenti\n" "ho terminato la ricerca in %s\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "descrivi %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "%s non è un nome oggetto valido" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s non è né un commit né un blob" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "trova il tag successivo al commit" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "esegui il debug della strategia di ricerca sullo standard error" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "usa qualunque riferimento" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "usa qualunque tag, anche quelli non annotati" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "usa sempre il formato lungo" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "segui solo il primo genitore" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "visualizza solo le corrispondenze esatte" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "considera gli <n> tag più recenti (impostazione predefinita: 10)" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "considera solo i tag corrispondenti al <pattern>" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "non considerare i tag corrispondenti al <pattern>" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "visualizza l'oggetto commit abbreviato come fallback" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "contrassegno" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro sporco (impostazione " "predefinita: \"-dirty\")" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro rotto (impostazione " "predefinita: \"-broken\")" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long non è compatibile con --abbrev=0" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "Nessun nome trovato, non è possibile descrivere nulla." -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty non è compatibile con le espressioni commit" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken non è compatibile con le espressioni commit" @@ -13694,27 +12676,27 @@ msgstr "specificato oggetto non gestito '%s'." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "non riuscito: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "impossibile leggere il file collegamento simbolico %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "impossibile leggere l'oggetto %s per il collegamento simbolico %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13722,54 +12704,54 @@ msgstr "" "i formati diff combinati ('-c' e '--cc') non sono supportati in\n" "modalità diff directory ('-d' e '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "entrambi i file risultano modificati: '%s' e '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "il file nell'albero di lavoro è stato mantenuto." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "esistono file temporanei in '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "potresti voler ripulirli o ripristinarli." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "usa `diff.guitool` anziché `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "esegui un diff directory completo" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "non chiedere conferma prima di lanciare un tool diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "usa collegamenti simbolici in modalità diff directory" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "strumento" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "usa lo strumento diff specificato" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "stampa un elenco di strumenti diff che possono essere usati con `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13777,31 +12759,31 @@ msgstr "" "fai sì che 'git-difftool' esca quando uno strumento diff invocato " "restituisce un codice d'uscita diverso da zero" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "specifica un comando personalizzato per visualizzare i diff" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "fornito a `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool richiede un albero di lavoro o --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff non è compatibile con --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "le opzioni --gui, --tool ed --extcmd sono mutualmente esclusive" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "nessuno <strumento> specificato per --tool=<strumento>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "nessun <comando> specificato per --extcmd=<comando>" @@ -13843,189 +12825,161 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opzioni-elenco-rev]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" -"Errore: Impossibile esportare i tag nidificati a meno che non sia " -"specificata l'opzione --mark-tags." - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "visualizza l'avanzamento dopo <n> oggetti" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "seleziona la gestione dei tag firmati" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "" "seleziona la gestione dei messaggi di commit in una codifica alternativa" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Esegui il dump dei contrassegni in questo file" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Importa i contrassegni da questo file" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "Importa i contrassegni da questo file se esiste" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Usa un tagger falso se i tag non ne hanno uno" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Visualizza in output l'albero completo per ogni commit" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Usa la funzionalità \"fatto\" per terminare il flusso" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Ometti l'output dei dati dei blob" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "specificatore riferimento" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Applica lo specificatore riferimento ai riferimenti esportati" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "rendi anonimo l'output" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Visualizza gli ID oggetto originari dei blob/commit" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "Etichetta i tag con ID contrassegno" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "" -"Impossibile fornire entrambe le opzioni --import-marks e --import-marks-if-" -"exists" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opzioni>] <gruppo>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opzioni>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel non può essere negativo" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "esegui il fetch da tutti i remoti" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "imposta l'upstream per git pull/fetch" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "aggiungi i dati a .git/FETCH_HEAD anziché sovrascriverli" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "percorso in cui caricare il pack sul remoto" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "forza la sovrascrittura del riferimento locale" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "esegui il fetch da più remoti" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "esegui il fetch di tutti i tag e degli oggetti associati" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "non eseguire il fetch di alcun tag (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "" "elimina i branch che ne tracciano uno remoto ma non più presenti sul remoto" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "elimina i tag locali non più presenti sul remoto e sovrascrivi i tag " "modificati" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "a richiesta" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "mantieni il pack scaricato" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "consenti l'aggiornamento del riferimento HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "aumenta la profondità della cronologia di un clone shallow" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "" "aumenta la profondità della cronologia di un clone shallow in base al tempo" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "converti in un repository completo" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "anteponi questo prefisso all'output del percorso del sottomodulo" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14033,94 +12987,90 @@ msgstr "" "impostazione predefinita per il recupero ricorsivo dei sottomoduli (a " "priorità minore rispetto ai file di configurazione)" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "accetta i riferimenti che aggiornano .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "mappa riferimenti" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "specifica la mappa dei riferimenti per il fetch" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "esegui 'gc --auto' dopo il fetch" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "scrivi il grafo dei commit dopo il fetch" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "Impossibile trovare l'HEAD del riferimento remoto" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "oggetto %s non trovato" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[aggiornato]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[rifiutato]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "impossibile eseguire il fetch nel branch corrente" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[tag aggiornato]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "impossibile aggiornare il riferimento locale" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "sovrascriverebbe il tag esistente" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[nuovo tag]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[nuovo branch]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[nuovo riferimento]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "aggiornamento forzato" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "non fast forward" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14131,7 +13081,7 @@ msgstr "" "riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n" "fetch.showForcedUpdates true'." -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14143,22 +13093,22 @@ msgstr "" "aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n" "'git config fetch.showForcedUpdates false' per omettere questo controllo.\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s non ha inviato tutti gli oggetti necessari\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s rifiutato perché non è consentito aggiornare radici shallow" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Da %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14168,81 +13118,60 @@ msgstr "" "eseguire\n" " 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s diventerà pendente)" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s è diventato pendente)" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[eliminato]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(nessuno)" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non " "bare" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opzione \"%s\" con il valore \"%s\" non è valida per %s" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'opzione \"%s\" è ignorata per %s\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "rilevati branch multipli, stato incompatibile con --set-upstream" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "non imposto l'upstream per un branch remoto che ne traccia uno remoto" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "non imposto l'upstream per un tag remoto" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "tipo branch sconosciuto" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"nessun branch sorgente trovato.\n" -"devi specificare esattamente un branch con l'opzione --set-upstream." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Recupero di %s in corso\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Impossibile recuperare %s" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "impossibile recuperare '%s' (codice di uscita: %d)\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" +"--filter può essere usato solo con il remoto configurato nelle estensioni." +"partialClone" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14250,45 +13179,45 @@ msgstr "" "Non è stato specificato alcun repository remoto. Specifica un URL o il\n" "nome di un remoto da cui dovranno essere recuperate le nuove revisioni." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Devi specificare il nome di un tag." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Le profondità negative in --deepen non sono supportate" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "le opzioni --deepen e --depth sono mutualmente esclusive" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "--depth e --unshallow non possono essere usati insieme." -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow su un repository completo non ha senso" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all non richiede un repository come argomento" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all non ha senso con degli specificatori riferimento" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "Remoto o gruppo remoti non esistente: %s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Recuperare un gruppo e specificare gli specificatori riferimento non ha senso" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14302,23 +13231,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <messaggio>] [--log[=<n>] | --no-log] [--file <file>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "popola il registro con al più <n> voci del registro breve" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "alias di --log (deprecato)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "testo" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "usa <testo> come stringa iniziale del messaggio" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "file da cui leggere" @@ -14385,32 +13314,32 @@ msgstr "stampa solo i riferimenti contenenti il commit" msgid "print only refs which don't contain the commit" msgstr "stampa solo i riferimenti che non contengono il commit" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "sconosciuto" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "errore in %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "avviso in %s %s: %s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "collegamento rotto da %7s %s" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "tipo oggetto errato nel collegamento" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -14419,216 +13348,216 @@ msgstr "" "collegamento rotto da %7s %s\n" " a %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "%s mancante %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "%s non raggiungibile %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "%s pendente %s" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "impossibile creare lost-found" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "impossibile terminare '%s'" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Controllo di %s in corso" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Controllo connessione in corso (%d oggetti)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Controllo di %s in corso %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "collegamenti rotti" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "radice %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "eseguito tag di %s %s (%s) in %s" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: oggetto corrotto o mancante" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: voce registro riferimenti non valida: %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Controllo registro riferimenti %s->%s" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntatore SHA1 non valido: %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: non è un commit" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "avviso: nessun riferimento predefinito" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: oggetto corrotto o mancante: %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: impossibile analizzare l'oggetto: %s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "file SHA1 non valido: %s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Controllo collegamento %s" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s non valido" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s punta a qualcosa di strano (%s)" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: l'HEAD scollegato non punta a niente" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "avviso: %s punta a un branch non nato (%s)" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Controllo cache albero in corso" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntatore SHA1 non valido nella cache alberi" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "oggetto non albero nella cache alberi" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opzioni>] [<oggetto>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "visualizza oggetti non raggiungibili" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "visualizza oggetti pendenti" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "segnala i tag" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "segnala i nodi radice" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "rendi gli oggetti indice nodi head" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "considera anche i pack e gli oggetti alternativi" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "controlla solo la connessione" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "abilita controlli più restrittivi" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "scrivi oggetti pendenti in .git/lost-found" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "visualizza l'avanzamento" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Controllo oggetti in corso" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s: oggetto mancante" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parametro non valido: atteso SHA1, presente '%s'" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<opzioni>]" @@ -14642,17 +13571,17 @@ msgstr "fstat di %s non riuscito: %s" msgid "failed to parse '%s' value '%s'" msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "impossibile leggere '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14668,56 +13597,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "elimina oggetti non referenziati" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "sii più accurato (tempi di esecuzione maggiori)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "abilita modalità garbage collector automatica" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "" "forza l'esecuzione del garbage collector anche nel caso in cui ve ne " "potrebbe essere un altro in esecuzione" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "" "esegui il repack di tutti gli altri pack ad eccezione di quello più grande" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "analisi del valore %s di gc.logexpiry non riuscita" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Comprimo il repository in background per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14725,14 +13654,14 @@ msgstr "" "gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se " "non lo è)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per " "eliminarli." -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" "git grep [<opzioni>] [-e] <pattern> [<revisione>...] [[--] <percorso>...]" @@ -14751,263 +13680,263 @@ msgstr "specificato numero non valido di thread (%d) per %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "non vi è supporto per i thread, ignoro %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "impossibile leggere il tree (%s)" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "impossibile eseguire grep su un oggetto di tipo %s" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch '%c' richiede un valore numerico" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "cerca nell'index anziché nell'albero di lavoro" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "la ricerca nei contenuti non è gestita da Git" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "cerca sia nei file tracciati sia in quelli non tracciati" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignora i file specificati in '.gitignore'" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "cerca ricorsivamente in ogni sottomodulo" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "visualizza le righe non corrispondenti" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "elabora i file binari come testuali" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "non cercare corrispondenze ai pattern nei file binari" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "elabora i file binari con filtri di conversione in testo" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "cerca nelle sottodirectory (impostazione predefinita)" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "scendi al più di <profondità> livelli" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "usa espressioni regolari POSIX estese" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "interpreta i pattern come stringhe fisse" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "usa espressioni regolari compatibili con Perl" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "visualizza numeri di riga" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "visualizza il numero di colonna della prima corrispondenza" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "non visualizzare i nomi file" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "visualizza i nomi file" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "visualizza i nomi file relativi alla directory di primo livello" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "visualizza solo i nomi file anziché le righe corrispondenti" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "sinonimo di --files-with-matches" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "visualizza solo i nomi dei file non corrispondenti" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "stampa NUL dopo i nomi file" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "visualizza solo le parti corrispondenti di una riga" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "visualizza il numero di corrispondenze anziché le righe corrispondenti" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "evidenzia corrispondenze" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "stampa una riga vuota fra le corrispondenze in file differenti" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "visualizza il nome file solo una volta prima delle corrispondenze nello " "stesso file" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "visualizza <n> righe di contesto prima delle corrispondenze" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "visualizza <n> righe di contesto dopo le corrispondenze" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "usa <n> thread di lavoro" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "scorciatoia per -C NUM" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "visualizza una riga con il nome funzione prima delle corrispondenze" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "visualizza la funzione circostante" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "leggi le corrispondenze da un file" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "cerca corrispondenze con <pattern>" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "combina i pattern specificati con -e" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "" "segnala una corrispondenza con il codice di uscita senza emettere output" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "" "visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per " "tutti i pattern" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "visualizza l'albero di analisi per l'espressione grep" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "pager" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "visualizza i file corrispondenti nel pager" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "consenti" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "nessun pattern specificato" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked non possono essere usate con le revisioni" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "impossibile risolvere la revisione %s" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "l'opzione --untracked non è supportata con --recurse-submodules" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "combinazione di opzioni non valida, ignoro --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "non vi è supporto per i thread, ignoro --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "specificato numero non valido di thread (%d)" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager funziona solo sull'albero di lavoro" -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "opzione non supportata con --recurse-submodules" + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked non possono essere usate con --no-index" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard non può essere usata per i contenuti tracciati" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "sono specificati sia --cached sia degli alberi" @@ -15193,11 +14122,11 @@ msgstr "errore di lettura in input" msgid "used more bytes than were available" msgstr "usati più byte di quelli disponibili" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "pack troppo largo per la definizione corrente di off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "il pack supera la dimensione massima consentita" @@ -15253,191 +14182,191 @@ msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti" msgid "serious inflate inconsistency" msgstr "inconsistenza grave di inflate" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "TROVATA COLLISIONE SHA1 CON %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "impossibile leggere %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "non è possibile leggere l'oggetto %s esistente" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "oggetto blob %s non valido" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "errore fsck nell'oggetto sottoposto a pack" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "applicazione del delta non riuscita" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Ricezione degli oggetti" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Indicizzazione degli oggetti" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "il pack è corrotto (SHA1 non corrisponde)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "impossibile eseguire fstat sul file pack" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "il pack ha dati inutili alla fine" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusione oltre ogni follia in parse_pack_objects()" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Risoluzione dei delta" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "impossibile creare il thread: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "confusione oltre ogni follia" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completato con %d oggetto locale" msgstr[1] "completato con %d oggetti locali" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Checksum in coda inatteso per %s (disco corrotto?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "pack ha %d delta irrisolto" msgstr[1] "pack ha %d delta irrisolti" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "l'oggetto locale %s è corrotto" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "il nome del file pack '%s' non termina con '.pack'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "impossibile scrivere il file %s '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossibile chiudere il file %s scritto '%s'" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "errore nella chiusura del file pack" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "impossibile archiviare il file pack" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "impossibile archiviare index file" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> non valida" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossibile aprire il file pack '%s' esistente" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossibile aprire il file pack idx esistente per '%s'" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "non delta: %d oggetto" msgstr[1] "non delta: %d oggetti" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "lunghezza della catena = %d: %lu oggetto" msgstr[1] "lunghezza della catena = %d: %lu oggetti" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "%s errato" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin non può essere usato senza --stdin" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin richiede un repository Git" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify senza un nome del file pack specificato" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "errore fsck negli oggetti sottoposti a pack" @@ -15620,126 +14549,121 @@ msgstr "--trailer con --only-input non ha senso" msgid "no input file given for in-place editing" msgstr "nessun file di input specificato per la modifica sul posto" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<opzioni>] <oggetto>..." -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "opzione --decorate non valida: %s" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "visualizza sorgente" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Usa il file mappatura e-mail" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "decora solo i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "non decorare i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "opzioni decorazione" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "Elabora l'intervallo righe n,m nel file, contandole da 1" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Output finale: %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: file non valido" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "impossibile leggere l'oggetto %s" -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "tipo sconosciuto: %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s: modo lettera da descrizione non valido" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "format.headers non ha alcun valore" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "il nome della directory di output è troppo lungo" -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "impossibile aprire il file patch %s" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "è necessario specificare esattamente un intervallo" -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "il valore non è un intervallo" -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "la lettera di accompagnamento dev'essere in formato e-mail" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "creazione del file lettera di accompagnamento non riuscita" -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "valore in-reply-to folle: %s" -#: builtin/log.c:1255 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "due directory di output?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "commit %s sconosciuto" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "impossibile risolvere '%s' come riferimento valido" -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15751,288 +14675,278 @@ msgstr "" "In alternativa puoi specificare manualmente il commit di base con\n" "--base=<ID commit di base>" -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni" -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "il commit di base non dovrebbe essere nell'elenco revisioni" -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "impossibile ottenere l'ID della patch" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "inferenza degli intervalli range-diff non riuscita" -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] anche con una singola patch" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] anche con più patch" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "stampa le patch sullo standard output" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "genera una lettera di accompagnamento" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "usa una sequenza numerica semplice per i nomi file di output" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "suff" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "usa <suff> anziché '.patch'" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "inizia a numerare le patch da <n> anziché da 1" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "contrassegna la serie come l'n-esima versione revisionata" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] anziché [PATCH]" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "modo-lettera-da-descrizione" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "" -"genera parti di una lettera d'accompagnamento basandosi sulla descrizione di " -"un branch" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefisso>] anziché [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "salva i file risultanti in <dir>" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "non eliminare/aggiungere [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "non mandare in output diff binari" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "manda in output un hash costituito da soli zeri nell'intestazione From" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "non includere una patch corrispondente a un commit upstream" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "" "visualizza il formato della patch anziché l'impostazione predefinita (patch " "+ stat)" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "Messaggistica" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "intestazione" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "aggiungi intestazione e-mail" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "e-mail" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "aggiungi intestazione A:" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "aggiungi intestazione Cc:" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "identità" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "imposta l'indirizzo Da a <identità> (o all'identità di chi ha creato il " "commit se assente)" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "ID messaggio" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "rendi la prima e-mail una risposta a <ID messaggio>" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "delimitatore" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "allega la patch" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "includi la patch nel messaggio" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "" "abilita il raggruppamento messaggi per conversazione, stili: superficiale, " "profondo" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "firma" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "aggiungi una firma" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "commit di base" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "" "aggiungi le informazioni prerequisito per l'albero alla serie delle patch" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "aggiungi una firma da file" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "non stampare i nomi file delle patch" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "visualizza l'avanzamento dell'operazione di generazione patch" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "visualizza le modifiche rispetto a <revisione> nella lettera di " "accompagnamento o in una patch singola" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "visualizza le modifiche rispetto a <specificatore revisione> nella lettera " "di accompagnamento o in una patch singola" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "percentuale in base a cui viene pesata la creazione" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "riga ident non valida: %s" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "le opzioni -n e -k sono mutuamente esclusive" -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive" -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "--name-only non ha senso" -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "--name-status non ha senso" -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "--check non ha senso" -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "standard output, o directory, quale dei due?" -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff richiede --cover-letter o una singola patch" -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff rispetto alla versione %d:" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor richiede --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff richiede --cover-letter o una singola patch" -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff rispetto alla versione %d:" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "impossibile leggere il file firma '%s'" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Generazione delle patch in corso" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "creazione dei file di output non riuscita" -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16164,7 +15078,7 @@ msgstr "" msgid "do not print remote URL" msgstr "non stampare l'URL del remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "eseguibile" @@ -16252,150 +15166,150 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "lo switch 'm' richiede un valore" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "l'opzione `%s' richiede un valore" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Le strategie disponibili sono:" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Le strategie personalizzate disponibili sono:" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "non visualizzare un diffstat al termine del merge" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "visualizza un diffstat al termine del merge" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(sinonimo di --stat)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "aggiungi (al più <n>) voci dal registro breve al messaggio di commit del " "merge" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "crea un singolo commit anziché eseguire un merge" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "esegui un commit se il merge ha successo (impostazione predefinita)" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "modifica il messaggio prima di eseguire il commit" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "consenti fast forward (impostazione predefinita)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "interrompi se il fast forward non è possibile" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica che il commit specificato abbia una firma GPG valida" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "strategia" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "strategia di merge da usare" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "opzione=valore" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "opzione per la strategia di merge selezionata" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "messaggio di commit del merge (per un merge non fast forward)" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "interrompi il merge attualmente in corso" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "continua il merge attualmente in corso" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "consenti di unire cronologie non correlate" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "ignora gli hook pre-merge-commit e commit-msg" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" +msgstr "verifica hook commit-msg" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "non è stato possibile eseguire stash." -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "esecuzione di stash non riuscita" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "non è un oggetto valido: %s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree non riuscito" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (nulla di cui eseguire lo squash)" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit di squash -- non aggiorno HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' non punta ad un commit" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Stringa branch.%s.mergeoptions errata: %s" @@ -16449,74 +15363,74 @@ msgstr "" "Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n" "interromperà il commit.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Messaggio di commit vuoto." -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Splendido.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Merge automatico fallito; risolvi i conflitti ed esegui il commit\n" "del risultato.\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Nessun branch corrente." -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Nessun remote per il branch corrente." -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Nessun upstream di default definito per il branch corrente." -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Nessun branch che tracci un remoto per %s da %s" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valore errato '%s' nell'ambiente '%s'" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "non è qualcosa di cui possiamo eseguire il merge" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort non richiede argomenti" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)." -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "--quit non richiede argomenti" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue non richiede argomenti" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)." -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16524,7 +15438,7 @@ msgstr "" "Non hai concluso il merge (MERGE_HEAD esiste).\n" "Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16532,96 +15446,96 @@ msgstr "" "Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n" "Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)." -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Non è possibile combinare --squash con --no-ff." -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "Non è possibile combinare --squash con --commit." -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato." -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Lo squash di un commit in un'head vuota non è ancora supportato" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Un commit non fast forward non ha senso in un'head vuota" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "mi rifiuto di eseguire il merge di cronologie non correlate" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Già aggiornato." -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Aggiornamento di %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Provo con un merge veramente banale dentro l'indice...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Già aggiornato. Oh sì!" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Fast forward non possibile, interrompo l'operazione." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ripristino l'albero in uno stato pulito...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Tentativo con la strategia di merge %s...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Nessuna strategia di merge ha gestito il merge.\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge con la strategia %s fallito.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Uso %s per preparare una risoluzione manuale.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16710,33 +15624,33 @@ msgstr "non emettere avvisi in caso di conflitti" msgid "set labels for file1/orig-file/file2" msgstr "imposta etichette per file1/file originale/file2" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "opzione sconosciuta %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "impossibile analizzare l'oggetto '%s'" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "impossibile gestire più di %d base. Ignoro %s." msgstr[1] "impossibile gestire più di %d basi. Ignoro %s." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "non gestisco nulla che non sia il merge di due head." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "impossibile risolvere il riferimento '%s'" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Merge di %s con %s in corso\n" @@ -16759,18 +15673,18 @@ msgstr "consenti la creazione di più di un albero" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [<opzioni>] (write|verify|expire|repack --batch-" -"size=<dimensione>)" +"git multi-pack-index [--object-dir=<directory>] (write|verify|expire|repack " +"--batch-size=<dimensione>)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "directory oggetti contenente un insieme di coppie packfile e pack-index" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -16778,15 +15692,15 @@ msgstr "" "durante il repack, raccogli i file pack di dimensioni più piccole in un " "gruppo più grande di queste dimensioni" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "troppi argomenti" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "l'opzione --batch-size è consentita solo per il sottocomando 'repack'" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "sottocomando sconosciuto: %s" @@ -16880,52 +15794,52 @@ msgstr "%s, sorgente=%s, destinazione=%s" msgid "Renaming %s to %s\n" msgstr "Rinominazione di %s in %s in corso\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "rinomina di '%s' non riuscita" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opzioni>] <commit>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opzioni>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opzioni>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "stampa solo i nomi (non lo SHA-1)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "usa solo tag per denominare i commit" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "usa solo i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignora i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "leggi dallo standard input" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "dereferenzia tag nell'input (uso interno)" @@ -17329,7 +16243,7 @@ msgstr "il tentativo di rimuovere una nota inesistente non è un errore" msgid "read object names from the standard input" msgstr "leggi i nomi degli oggetti dallo standard input" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "non rimuovere, limitati a visualizzare" @@ -17345,7 +16259,7 @@ msgstr "riferimento note" msgid "use notes from <notes-ref>" msgstr "usa le note in <riferimento note>" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "sottocomando sconosciuto: %s" @@ -17364,106 +16278,129 @@ msgstr "" "git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < " "<elenco oggetti>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "CRC oggetto sottoposto a pack %s errato" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "oggetto sottoposto a pack %s corrotto" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "rilevato delta ricorsivo per l'oggetto %s" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u oggetti ordinati, attesi %<PRIu32>" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "packfile non valido: %s" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "impossibile aprire il packfile per il suo riuso: %s" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "impossibile eseguire seek nel packfile riusato" + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "impossibile leggere dal packfile riusato" + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "disabilito la scrittura delle bitmap, i pack sono divisi a causa " "dell'impostazione pack.packSizeLimit" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Scrittura degli oggetti in corso" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "stat di %s non riuscito" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "disabilito la scrittura delle bitmap perché alcuni oggetti non saranno " "sottoposti a pack" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow dell'offset base del delta nel pack per %s" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "offset base del delta fuori dall'intervallo consentito per %s" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Conteggio degli oggetti in corso" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "impossibile recuperare le dimensioni di %s" + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "impossibile analizzare l'intestazione oggetto di %s" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "impossibile leggere l'oggetto %s" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "pack subottimo - memoria esaurita" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compressione delta in corso, uso fino a %d thread" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Compressione oggetti in corso" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "inconsistenza con il numero dei delta" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17472,7 +16409,7 @@ msgstr "" "atteso ID oggetto arco, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17481,241 +16418,256 @@ msgstr "" "atteso ID oggetto, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "valore non valido per --missing" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "impossibile aprire l'indice pack" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "impossibile esaminare l'oggetto sciolto %s" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "impossibile forzare l'oggetto sciolto" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "'%s' non è una revisione" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "revisione '%s' errata" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "impossibile aggiungere gli oggetti recenti" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "versione %s di index non supportata" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "versione '%s' di index errata" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "non visualizzare la barra di avanzamento" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "visualizza la barra di avanzamento" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "" +"visualizza la barra di avanzamento durante la fase di scrittura oggetti" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<versione>[,<offset>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "scrivi il file indice pack usando la versione formato idx specificata" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "dimensione massima di ogni file pack in output" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "ignora gli oggetti sottoposti a pack" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "limita la finestra di pack al numero di oggetti specificato" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra di pack alla memoria specificata in aggiunta al limite " "sugli oggetti" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "lunghezza massima della catena di delta consentita nel pack risultante" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "riusa i delta esistenti" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "riusa gli oggetti esistenti" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "usa oggetti OFS_DELTA" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "" "usa più thread durante la ricerca delle migliori corrispondenze per i delta" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "non creare un output pack vuoto" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "leggi gli argomenti revisione dallo standard input" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "limita gli oggetti a quelli non ancora sottoposti a pack" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "includi gli oggetti raggiungibili da qualunque riferimento" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "includi gli oggetti referenziati da voci del log riferimenti" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "includi gli oggetti referenziati dall'indice" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "invia il pack in output sullo standard output" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "" "includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a " "pack" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "mantieni gli oggetti non raggiungibili" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "esegui il pack degli oggetti non raggiungibili sciolti" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "decomprimi gli oggetti non raggiungibili più recenti di <tempo>" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "usa l'algoritmo di raggiungibilità sparse" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "crea pack thin" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "crea pack adatti per fetch shallow" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "ignora i pack che hanno un file .keep che li accompagna" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "ignora questo pack" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "livello compressione pack" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "non nascondere i commit innestati" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un indice bitmap se disponibile per velocizzare il conteggio degli " "oggetti" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "scrivi un indice bitmap insieme all'indice pack" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "scrivi un indice bitmap se possibile" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "azione da eseguire sugli oggetti mancanti" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "non eseguire il pack degli oggetti nei file pack promettenti" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "rispetta le isole durante la compressione delta" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondità della catena dei delta (%d) è troppo elevata, forzo %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "il valore pack.deltaCacheLimit è troppo elevato, forzo %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size non può essere usato per generare un pack da trasferire" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "il limite minimo delle dimensioni dei pack è 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin non può essere usato per generare un pack indicizzabile" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "impossibile usare --filter senza --stdout" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Enumerazione degli oggetti in corso" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" "%<PRIu32> oggetti totali (%<PRIu32> delta), %<PRIu32> riutilizzati " -"(%<PRIu32> delta), %<PRIu32> riutilizzati nel file pack" +"(%<PRIu32> delta)" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17758,53 +16710,53 @@ msgid "cannot prune in a precious-objects repo" msgstr "" "impossibile eseguire l'eliminazione in un repository 'oggetti preziosi'" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Valore non valido per %s: %s" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Opzioni relative al merge" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora le modifiche eseguendo un rebase anziché un merge" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "consenti fast forward" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Opzioni relative al fetch" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "forza la sovrascrittura del branch locale" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valore non valido per pull.ff: %s" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17812,14 +16764,14 @@ msgstr "" "Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti " "appena recuperati." -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti " "appena recuperati." -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17827,7 +16779,7 @@ msgstr "" "In generale, questo significa che hai fornito uno specificatore\n" "riferimento che non aveva corrispondenze nel remoto." -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17839,44 +16791,44 @@ msgstr "" "configurato come predefinito per il branch corrente, devi\n" "specificare un branch sulla riga di comando." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Attualmente non sei su un branch." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Specifica il branch in base a cui vuoi effettuare il rebase." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Specifica il branch in base a cui vuoi effettuare il merge." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Vedi git-pull(1) per ulteriori dettagli." -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branch>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Non ci sono informazioni di tracciamento per il branch corrente." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Se vuoi impostare le informazioni di tracciamento per questo branch puoi " "farlo con:" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17886,32 +16838,32 @@ msgstr "" "il merge con il riferimento '%s' del remoto, ma un tale\n" "riferimento non è stato recuperato." -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "impossibile accedere al commit %s" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "ignoro --verify-signature per il rebase" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'opzione --[no-]autostash option è valida solo con --rebase." -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice." -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "eseguine il commit o lo stash." -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17923,7 +16875,7 @@ msgstr "" "Eseguo il fast forward dell'albero\n" "di lavoro dal commit %s." -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17942,15 +16894,15 @@ msgstr "" "$ git reset --hard\n" "per eseguire il ripristino." -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Impossibile eseguire il merge di più branch in un head vuoto." -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Impossibile eseguire il rebase su più branch." -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossibile eseguire il rebase se ci sono delle modifiche registrate " @@ -17960,15 +16912,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "esegui il tag della forma breve senza <tag>" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17977,7 +16929,7 @@ msgstr "" "Per scegliere permanentemente una delle due opzioni, vedi push.default in " "'git help config'." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -18002,7 +16954,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -18017,7 +16969,7 @@ msgstr "" "\n" " git push %s HEAD:<nome del branch remoto>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18031,13 +16983,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Il branch corrente %s ha più branch upstream, mi rifiuto di eseguire il push." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18048,14 +17000,14 @@ msgstr "" "branch corrente '%s', senza dirmi di cosa devo eseguire il push\n" "per aggiornare quale branch remoto." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Non è stato specificato alcun refspec per il push, e push.default è \"nothing" "\"." -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18069,7 +17021,7 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18084,7 +17036,7 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18100,12 +17052,12 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Gli aggiornamenti sono stati rifiutati perché il tag esiste già nel remoto." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18116,142 +17068,142 @@ msgstr "" "puntare a un oggetto diverso da un commit senza usare l'opzione\n" "'--force'.\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "Push su %s in corso\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "push di alcuni riferimenti su '%s' non riuscito" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "repository '%s' errato" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Nessuna destinazione per il push configurata.\n" +"Specifica un URL dalla riga di comando oppure configurare un repository " +"remoto usando\n" +"\n" +" git remote add <nome> <url>\n" +"\n" +"e poi eseguire il push usando il nome del remote\n" +"\n" +" git push <nome>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "repository" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "esegui il push di tutti i riferimenti" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "esegui il mirror di tutti i riferimenti" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "elimina riferimenti" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "esegui il push dei tag (non può essere usato con --all o --mirror)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "forza gli aggiornamenti" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<nome riferimento>:<valore atteso>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" "richiedi che il vecchio valore del riferimento corrisponda a questo valore" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "controlla il push ricorsivo dei sottomoduli" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "usa un thin pack" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "programma ricezione pack" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "imposta l'upstream per git pull/status" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "elimina i riferimenti rimossi localmente" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "ignora l'hook pre-push" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "esegui il push dei tag mancanti ma rilevanti" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "firma il push con GPG" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "richiedi l'atomicità della transazione al remoto" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete non è compatibile con --all, --mirror e --tags" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete non ha senso senza alcun ref" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "repository '%s' errato" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Nessuna destinazione per il push configurata.\n" -"Specifica un URL dalla riga di comando oppure configurare un repository " -"remoto usando\n" -"\n" -" git remote add <nome> <url>\n" -"\n" -"e poi eseguire il push usando il nome del remote\n" -"\n" -" git push <nome>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all e --tags non sono compatibili" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all non può essere combinato con degli specificatori riferimento" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror e --tags non sono compatibili" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror non può essere combinato con degli specificatori riferimento" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all e --mirror non sono compatibili" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "le opzioni push non devono avere caratteri di fine riga" @@ -18272,32 +17224,24 @@ msgstr "" "git range-diff [<opzioni>] <base> <vecchio ultimo commit> <nuovo ultimo " "commit>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "Percentuale in base a cui viene pesata la creazione" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "usa colori semplici per il diff" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "note" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "passato a 'git log'" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "nessun .. nell'intervallo: '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "il formato dell'unico argomento dev'essere un intervallo simmetrico" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "devono essere specificati due intervalli commit" @@ -18380,17 +17324,13 @@ msgstr "esegui il debug di unpack-trees" msgid "suppress feedback messages" msgstr "non visualizzare i messaggi di feedback" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Prima devi risolvere l'indice corrente" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [opzioni] [--exec <comando>] [--onto <nuova base> | --keep-" -"base] [<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] " +"[<upstream>] [<branch>]" #: builtin/rebase.c:34 msgid "" @@ -18403,208 +17343,217 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "elenco todo inutilizzabile: '%s'" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "impossibile scrivere '%s'." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "nessun'HEAD?" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "impossibile creare un %s temporaneo" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "impossibile contrassegnare come interattivo" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "impossibile generare l'elenco todo" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "" "le opzioni --upstream o --onto richiedono che sia fornito un commit di base" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase --interactive [<opzioni>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(DEPRECATO) mantieni i commit vuoti" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "mantieni i commit vuoti" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "consenti commit con messaggi vuoti" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "esegui il rebase dei commit di merge" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "mantieni i punti di branch originali dei cugini" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "sposta i commit che iniziano con squash!/fixup!" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "firma i commit" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "visualizza un diffstat delle modifiche upstream" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "continua il rebase" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "salta il commit" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "modifica l'elenco todo" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "visualizza la patch corrente" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "abbrevia gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "espandi gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "controlla l'elenco todo" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "ridisponi le righe fixup/squash" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "inserisci i comandi exec nell'elenco todo" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "su" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "revisioni-limite" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "limita la revisione" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "squash-su" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "esegui lo squash su" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "il commit upstream" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "nome head" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "nome head" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "strategia di rebase" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "opzioni strategia" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "opzioni strategia" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "passa a" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "il branch o il commit di cui eseguire il checkout" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "nome" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "sul nome" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "comando" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "il comando da eseguire" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s richiede un rebase interattivo" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossibile ottenere 'onto': '%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head non valida: '%s'" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Impossibile leggere '%s'" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "Impossibile memorizzare %s" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "impossibile determinare la revisione HEAD" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18620,7 +17569,7 @@ msgstr "" "Per interrompere l'operazione e tornare allo stato precedente\n" "il \"git rebase\", esegui \"git rebase --abort\"." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18639,16 +17588,7 @@ msgstr "" "\n" "Di conseguenza, Git non può eseguirne il rebase." -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"tipo vuoto '%s' non riconosciuto; i valori validi sono \"drop\", \"keep\" e " -"\"ask\"." - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18665,7 +17605,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18679,139 +17619,131 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "i comandi exec non possono contenere caratteri di fine riga" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "comando exec vuoto" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "esegui il rebase sul branch specificato anziché su quello upstream" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "usa la base del merge dell'upstream e del branch come base corrente" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "consenti l'esecuzione dell'hook pre-rebase" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "sii silenzioso. implica --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "non visualizzare un diffstat delle modifiche upstream" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "aggiungi una riga Signed-off-by: a ogni commit" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "passato a 'git am'" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "passato a 'git apply'" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "salta la patch corrente e continua" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "interrompi ed esegui il checkout del branch originario" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "interrompi ma mantieni l'HEAD dov'è" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "modifica l'elenco todo durante un rebase interattivo" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "" "visualizza il file patch che sta per essere applicato o sottoposto a merge" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "usa le strategie di apply per eseguire il rebase" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "usa le strategie di merge per eseguire il rebase" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "" "consenti all'utente di modificare l'elenco dei commit di cui eseguire il " "rebase" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECATO) prova a ricreare i merge anziché ignorarli" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "come gestire i commit che diventano vuoti" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "mantieni i commit vuoti durante il rebase" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "sposta i commit che iniziano con squash!/fixup! in -i" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "esegui stash/stash pop automaticamente prima e dopo" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "aggiungi righe exec dopo ogni commit della lista modificabile" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "consenti il rebase di commit con messaggi vuoti" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "prova ad eseguire il rebase dei merge anziché saltarli" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "usa 'merge-base --fork-point' per ridefinire più precisamente l'upstream" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "usa la strategia di merge specificata" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "opzione" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "passa l'argomento alla strategia di merge" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18819,37 +17751,29 @@ msgstr "" "il supporto per rebase.useBuiltin è stato rimosso!\n" "Vedi la voce relativa in 'git help config' per i dettagli." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges è deprecato. Usa --rebase-merges." -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "impossibile combinare '--keep-base' con '--onto'" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "impossibile combinare '--keep-base' con '--root'" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Nessun rebase in corso?" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'azione --edit-todo può essere usata solo durante un rebase interattivo." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Impossibile leggere l'HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18858,16 +17782,16 @@ msgstr "" "quindi contrassegnarli come risolti usando\n" "git add" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "impossibile scartare le modifiche all'albero di lavoro" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "impossibile ritornare a %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18888,169 +17812,175 @@ msgstr "" "ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n" "salvato qualcosa di importante lì.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "l'opzione `C` richiede un valore numerico" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Modo sconosciuto: %s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy richiede --merge o --interactive" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "non è possibile combinare le opzioni apply con quelle merge" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "Backend di rebase sconosciuto: %s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec richiede --exec o --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "non è possibile combinare le opzioni am con quelle interactive o merge" + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-" "exec'" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'" + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "impossibile combinare '--rebase-merges' con '--strategy'" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "upstream non valido: '%s'" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "Impossibile creare il nuovo commit radice" -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "" -"'%s': è necessario specificare esattamente una base per il merge con il " -"branch" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': è necessario specificare esattamente una base per il merge" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' non punta a un commit valido" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "errore fatale: branch/commit '%s' inesistente" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Riferimento non esistente: %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Impossibile risolvere HEAD come revisione" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Impossibile eseguire lo stash automatico" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Risposta stash non attesa: '%s'" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossibile creare la directory '%s'" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Stash automatico creato: %s\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "impossibile eseguire reset --hard" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ora si trova a %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Eseguine il commit o lo stash." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "impossibile analizzare '%s'" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "impossibile passare a %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD è aggiornato." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Il branch corrente %s è aggiornato.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD è aggiornato, forzo il rebase." -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Il branch corrente %s è aggiornato, forzo il rebase.\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Modifiche a %s:\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Modifiche da %s a %s:\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di " "esso...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Impossibile scollegare l'HEAD" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Fast forward da %s a %s eseguito.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <directory Git>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19083,7 +18013,7 @@ msgstr "" "il comportamento predefinito, imposta la variabile di\n" "configurazione 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19136,49 +18066,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <riferimento>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' non è un timestamp valido" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "Contrassegno gli oggetti raggiungibili..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "%s non punta a niente!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "nessun registro riferimenti da eliminare specificato" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "non è un registro riferimenti: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "log riferimenti non esistente per '%s'" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "formato riferimento non valido: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -19186,82 +18116,82 @@ msgstr "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nome> <URL>" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <vecchio> <nuovo>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <nome>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <branch>)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nome>" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nome>" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<gruppo> | <remoto>)...]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nome> <branch>..." -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nome>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nome> <nuovo URL> [<vecchio URL>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nome> <nuovo URL>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nome> <URL>" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opzioni>] <nome> <URL>" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nome> <branch>..." -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nome> <branch>..." -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opzioni>] <nome>" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opzioni>] <nome>" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opzioni>] [<gruppo> | <remoto>]..." -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Aggiornamento di %s" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -19269,104 +18199,88 @@ msgstr "" "--mirror è pericoloso e deprecato; per favore\n" "\t usa invece --mirror-fetch o --mirror-push" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "argomento di mirror sconosciuto: %s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "recupera i branch remoti" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "importa tutti i tag e gli oggetti associati durante il recupero" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o non recuperare alcun tag (--no-tags)" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "branch da tracciare" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "branch master" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "imposta il remoto come mirror su cui eseguire push o da cui recuperare dati" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "specificare un branch master con --mirror non ha senso" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "specificare i branch da tracciare ha senso solo con i mirror da cui " "recuperare dati" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "il remoto %s esiste già." -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' non è un nome di remoto valido" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "Impossibile configurare il master '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Impossibile ottenere la mappa di recupero per lo specificatore riferimento %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(corrispondente)" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(elimina)" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "impossibile impostare '%s'" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"La configurazione remote.pushDefault %s in:\n" -"\t%s:%d\n" -"ora dà il nome al remoto inesistente '%s'" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "Remoto non esistente: '%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" "Non è stato possibile ridenominare la sezione di configurazione da '%s' in " "'%s'" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19377,17 +18291,17 @@ msgstr "" "\t%s\n" "\tAggiorna la configurazione manualmente se necessario." -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "eliminazione di '%s' non riuscita" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "creazione di '%s' non riuscita" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19403,120 +18317,120 @@ msgstr[1] "" "eliminati;\n" "per eliminarli, usa:" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossibile rimuovere la sezione di configurazione '%s'" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuovo (il prossimo fetch lo salverà in remotes/%s)" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " tracciato" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " vecchio (usa 'git remote prune' per rimuoverlo)" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "valore branch.%s.merge non valido; impossibile eseguire il rebase su più di " "un branch" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase interattivo sul remoto %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebase interattivo (con merge) sul remoto %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "rebase sul remoto %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " merge con il remote %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "merge con il remote %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s e con il remoto %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "crea" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "elimina" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "aggiornato" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "fast forward possibile" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "locale non aggiornato" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s esegue un aggiornamento forzato su %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s esegue il push su %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s esegue un aggiornamento forzato su %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s esegue il push su %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "non interrogare i remoti" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " URL recupero: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(nessun URL)" @@ -19524,185 +18438,195 @@ msgstr "(nessun URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " URL push: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " branch HEAD: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(non interrogato)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(sconosciuto)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " branch HEAD (l'HEAD remoto è ambiguo, potrebbe essere uno dei seguenti):\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branch remoto:%s" msgstr[1] " Branch remoti:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (stato non richiesto)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branch locale configurato per 'git pull':" msgstr[1] " Branch locali configurati per 'git pull':" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " I riferimenti locali saranno copiati da 'git push'" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Ref locale configurato per 'git push'%s:" msgstr[1] " Ref locali configurati per 'git push'%s:" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "imposta refs/remotes/<nome>/HEAD in base al remoto" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "elimina refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Impossibile determinare l'HEAD remoto" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Branch HEAD remoti multipli. Scegline uno esplicitamente con:" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "Non è stato possibile eliminare %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "Non è un ref valido: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "Non è stato possibile configurare %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s diventerà pendente!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s è diventato pendente!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Eliminazione di %s in corso" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [sarebbe eliminato] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [eliminato] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "elimina remoti dopo il fetch" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "Remote '%s' non esistente" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "aggiungi branch" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "nessun remote specificato" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "interroga gli URL per il push anziché gli URL per il fetch" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "restituisci tutti gli URL" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "nessun URL configurato per il remoto '%s'" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "manipola gli URL per il push" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "aggiungi URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "elimina URL" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete non ha senso" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Pattern URL vecchio non valido: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "Nessuna URL trovata: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "Non eliminerò tutti gli URL non push" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "" +"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sottocomando sconosciuto: %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<opzioni>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19711,118 +18635,118 @@ msgstr "" "Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n" "pack.writebitmaps." -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "" "impossibile avviare pack-objects per eseguire il repack degli oggetti " "promettenti" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Da pack-objects mi attendevo solo righe con gli ID completi " "esadecimali degli oggetti." -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossibile portare a termine pack-objects per eseguire il repack degli " "oggetti promettenti" -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "esegui il pack di tutto in un singolo pack" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "come -a e rendi sciolti gli oggetti non raggiungibili" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "non eseguire git-update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "fornisci l'opzione --local a git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "scrivi l'indice bitmap" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "fornisci l'opzione --delta-islands a git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "data approssimativa" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "con -a, esegui il repack degli oggetti non raggiungibili" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "dimensione della finestra usata per la compressione delta" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "byte" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "come sopra, ma limita le dimensioni della memoria invece del numero di voci" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "limita la profondità massima dei delta" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "limita il numero massimo di thread" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "dimensione massima di ogni file pack" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "non eseguire il repack di questo pack" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable e -A non sono compatibili" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Non ci sono oggetti nuovi di cui eseguire il pack." -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19842,7 +18766,7 @@ msgstr "" "AVVISO: non è riuscito. Ridenominali manualmente\n" "AVVISO: entro %s:\n" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "eliminazione di '%s' non riuscita" @@ -19950,8 +18874,8 @@ msgstr "impossibile eseguire fstat su %s" msgid "unable to write object to database" msgstr "impossibile scrivere l'oggetto nel database" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "nome oggetto non valido: '%s'" @@ -19970,22 +18894,22 @@ msgstr "modifica del file oggetto non riuscita" msgid "new object is the same as the old one: '%s'" msgstr "il nuovo oggetto è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "impossibile analizzare %s come commit" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "tag merge non valido nel commit '%s'" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "tag merge malformato nel commit '%s'" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19994,31 +18918,31 @@ msgstr "" "il commit originario '%s' contiene il tag merge '%s' che è stato scartato; " "usa --edit anziché --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "il commit originario '%s' ha una firma GPG" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "la firma sarà rimossa nel commit sostitutivo!" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "impossibile scrivere il commit sostitutivo per '%s'" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft per '%s' non necessario" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "il nuovo commit è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -20027,71 +18951,71 @@ msgstr "" "impossibile convertire i seguenti graft:\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "elenca i riferimenti sostitutivi" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "elimina i riferimenti sostitutivi" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "modifica l'oggetto esistente" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "cambia i genitori di un commit" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "converti un file graft esistente" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "sostituisci il riferimento se esiste" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "non stampare i contenuti in un formato leggibile (per --edit)" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "usa questo formato" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format non può essere usato quando non si elencano voci" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw ha senso solo con --edit" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d richiede almeno un argomento" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "numero di argomenti errato" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e richiede esattamente un argomento" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g richiede almeno un argomento" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file non richiede argomenti" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "con -l può essere specificato solo un pattern" @@ -20120,127 +19044,114 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<espressione albero>] [--] <specificatore percorso>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..." #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<espressione " -"albero>]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "" -"git reset --patch [<espressione albero>] [--] [<specificatore percorso>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "misto" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "soft" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "hard" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "merge" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "keep" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "Non hai un HEAD valido." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Impossibile trovare l'albero di HEAD." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Impossibile trovare l'albero di %s." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD ora si trova a %s" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossibile eseguire un %s reset nel corso di un merge." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "non visualizzare messaggi, segnala solo gli errori" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "reimposta l'HEAD e l'indice" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "reimposta solo l'HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "reimposta l'HEAD, l'indice e l'albero di lavoro" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "reimposta l'HEAD ma mantieni le modifiche locali" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "" "salva solo il fatto che i percorsi rimossi saranno aggiunti successivamente" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Risoluzione di '%s' come revisione valida non riuscita." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Risoluzione di '%s' come albero valido non riuscita." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch non è compatibile con --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed con i path è deprecata; usa invece 'git reset -- <path>'." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossibile eseguire un %s reset con dei percorsi." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset non è consentito in un repository spoglio" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N può essere usato solo con --mixed" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Modifiche non nell'area di staging dopo il reset:" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -20254,30 +19165,35 @@ msgstr "" "messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n" "rendere tale comportamento quello predefinito.\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossibile ripristinare il file indice alla revisione '%s'." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Impossibile scrivere il nuovo file indice." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossibile combinare --exclude-promisor-objects e --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "il filtraggio oggetti richiede --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "valore sparse non valido: '%s'" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list non supporta la visualizzazione delle note" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "il conteggio contrassegnato non è compatibile con --objects" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -20444,45 +19360,40 @@ msgid_plural "the following files have local modifications:" msgstr[0] "il seguente file ha delle modifiche locali:" msgstr[1] "i seguenti file hanno delle modifiche locali:" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "non elencare i file rimossi" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "rimuovi solo dall'indice" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "ignora il controllo sullo stato di aggiornamento" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "consenti rimozioni ricorsive" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "" "esci con codice d'uscita zero anche nel caso in cui non vi siano " "corrispondenze" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "" -"Non è stato fornito uno specificatore percorso. Quali file devo rimuovere?" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per " "procedere" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "non rimuovo '%s' ricorsivamente senza -r" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: non è possibile eliminare %s" @@ -20737,84 +19648,15 @@ msgstr "" "visualizza i riferimenti dati sullo standard input che non sono nel " "repository locale" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <opzioni>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"questo albero di lavoro non è sparse (il file sparse-checkout potrebbe non " -"esistere)" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "creazione della directory per il file sparse-checkout non riuscita" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "impostazione dell'opzione extensions.worktreeConfig non riuscita" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "inizializza il checkout sparse in modalità cone" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "inizializza sparse-checkout" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "apertura di '%s' non riuscita" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "impossibile normalizzare il percorso '%s'" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <pattern>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "impossibile rimuovere le virgolette dalla stringa in stile C '%s'" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "impossibile caricare i pattern sparse-checkout esistenti" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "leggi i pattern dallo standard input" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "imposta i pattern sparse-checkout" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "disabilita sparse-checkout" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "errore durante l'aggiornamento della directory di lavoro" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<opzioni>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<opzioni>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -20822,27 +19664,25 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nome branch> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<specificatore percorso>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20850,198 +19690,188 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<messaggio>]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <messaggio>] [-q|--quiet] <commit>" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n" -" [--] [<specificatore percorso>...]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' non è un commit simile a uno stash" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "Troppe revisioni specificate:%s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "Nessuna voce di stash trovata." -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "%s non è un riferimento valido" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parametri non è implementato" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "impossibile applicare uno stash nel mezzo di un merge" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "impossibile generare il diff %s^!" -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "ci sono conflitti nell'indice. Prova senza --index." -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "impossibile salvare l'albero indice" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "non è stato possibile ripristinare i file non tracciati dallo stash" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "Merge di %s con %s in corso" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "L'indice non è stato rimosso dallo stash." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "tenta di ricreare l'indice" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "Ho scartato %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Impossibile scartare la voce di stash" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' non è un riferimento stash" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "" "La voce di stash è mantenuta nel caso in cui tu ne abbia nuovamente bisogno." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Nome del branch non specificato" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Impossibile aggiornare %s con %s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "messaggio di stash" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" richiede un argomento <commit>" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Nessuna modifica selezionata" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Non hai ancora un commit iniziale" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Impossibile salvare lo stato corrente di index" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Impossibile salvare i file non tracciati" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Impossibile registrare lo stato dell'albero di lavoro" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossibile usare --patch e --include-untracked o --all allo stesso tempo" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Ti sei scordato di eseguire 'git add'?" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Nessuna modifica locale da salvare" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Impossibile inizializzare stash" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Impossibile salvare lo stato attuale" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Directory di lavoro e stato indice salvati: %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Impossibile rimuovere le modifiche all'albero di lavoro" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "mantieni l'indice" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "esegui lo stash in modalità patch" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "modalità silenziosa" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "includi i file non tracciati nello stash" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "includi i file ignorati" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "impossibile eseguire %s" @@ -21062,40 +19892,40 @@ msgstr "salta e rimuovi tutte le righe che iniziano con un carattere commento" msgid "prepend comment character and space to each line" msgstr "anteponi il carattere commento e uno spazio a ogni riga" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Atteso nome riferimento completo, ricevuto %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote non richiede argomenti" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossibile rimuovere un componente dall'URL '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "ancoraggio alternativo per i percorsi relativi" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Nessun URL trovato in .gitmodules per il percorso del sottomodulo '%s'" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "Entro in '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -21104,7 +19934,7 @@ msgstr "" "run_command ha restituito un codice diverso da zero per %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -21115,19 +19945,19 @@ msgstr "" "nei sottomoduli innestati di %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Esegui ricorsivamente sui sottomoduli innestati" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -21136,56 +19966,56 @@ msgstr "" "impossibile trovare la configurazione '%s'. Assumo che questo repository sia " "il proprio repository autoritativo upstream." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Registrazione dell'URL per il percorso sottomodulo '%s' non riuscita" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sottomodulo '%s' (%s) registrato per il percorso '%s'\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "avviso: suggerita modalità comando aggiornamento per il sottomodulo '%s'\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Registrazione della modalità aggiornamento per il percorso sottomodulo '%s'" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opzioni>] [<percorso>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "mapping sottomodulo per il percorso '%s' non trovato in .gitmodules" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "impossibile risolvere il riferimento HEAD nel sottomodulo '%s'" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "ricorsione nel sottomodulo '%s' non riuscita" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Non visualizzare l'output dello stato del sottomodulo" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -21193,49 +20023,49 @@ msgstr "" "Usa il commit salvato nell'indice anziché quello salvato nell'HEAD del " "sottomodulo" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "esegui ricorsivamente sui sottomoduli innestati" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [<percorso>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <percorso>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizzazione URL sottomodulo per '%s' in corso\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "registrazione dell'URL per il percorso sottomodulo '%s' non riuscita" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "recupero del remoto predefinito per il sottomodulo '%s' non riuscito" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "" "Non visualizzare l'output della sincronizzazione dell'URL del sottomodulo" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<percorso>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21244,7 +20074,7 @@ msgstr "" "L'albero di lavoro del sottomodulo ('%s') contiene una directory .git (usa " "'rm -rf' se vuoi veramente rimuoverla, inclusa l'intera sua cronologia)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21253,213 +20083,182 @@ msgstr "" "L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-" "f' per scartarle" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directory '%s' ripulita\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Impossibile rimuovere l'albero di lavoro del sottomodulo '%s'\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossibile creare la directory vuota del sottomodulo %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Rimossa registrazione sottomodulo '%s' (%s) per il percorso '%s'\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Rimuovi gli alberi di lavoro dei sottomoduli anche se contengono modifiche " "locali" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Annulla la registrazione di tutti i sottomoduli" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<percorso>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' se vuoi veramente deinizializzare tutti i sottomoduli" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"Un alternato calcolato a partire dall'alternato di un progetto di livello\n" -"superiore non è valido.\n" -"Per consentire a Git di eseguire il clone senza alternati in tal caso, " -"imposta\n" -"submodule.alternateErrorStrategy a 'info' o, equivalentemente, esegui il " -"clone\n" -"con l'opzione '--reference-if-able' anziché '--reference'." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "non è possibile aggiungere un alternato per il sottomodulo '%s': %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valore '%s' per submodule.alternateErrorStrategy non riconosciuto" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valore '%s' per submodule.alternateLocation non riconosciuto" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "percorso in cui sarà clonato il nuovo sottomodulo" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "nome del nuovo sottomodulo" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "URL da cui clonare il sottomodulo" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "profondità per i cloni shallow" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "forza l'indicazione d'avanzamento della clonazione" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "disabilita il clone in una directory non vuota" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<percorso>] [--quiet] [--reference " -"<repository>] [--name <nome>] [--depth <profondità>] [--single-branch] --url " -"<URL> --path <percorso>" +"<repository>] [--name <nome>] [--depth <profondità>] --url <URL> --path " +"<percorso>" -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"mi rifiuto di creare/usare '%s' nella directory Git di un altro sottomodulo" - -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clone di '%s' nel percorso del sottomodulo ('%s') non riuscito" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "directory non vuota: '%s'" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossibile recuperare la directory del sottomodulo per '%s'" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" "Modalità aggiornamento '%s' non valida per il percorso del sottomodulo ('%s')" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "È stata configurata una modalità aggiornamento '%s' non valida per il " "percorso del sottomodulo ('%s')" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Percorso del sottomodulo ('%s') non inizializzato" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Potresti voler usare 'update --init'." -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Ignoro il sottomodulo %s non sottoposto a merge" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Ignoro il sottomodulo '%s'" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Clone di '%s' non riuscito. Nuovo tentativo programmato" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "Clone di '%s' non riuscito per la seconda volta, interrompo l'operazione" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "percorso nell'albero di lavoro" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "percorso nell'albero di lavoro attraverso i confini dei sottomoduli innestati" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clone shallow limitato al numero di revisioni specificato" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "processi da eseguire in parallelo" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "determina se il clone iniziale sarà shallow come raccomandato" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "non stampare l'indicazione di avanzamento della clonazione" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -"git submodule--helper update-clone [--prefix=<percorso>] [<percorso>...]" +"git submodule--helper update_clone [--prefix=<percorso>] [<percorso>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "valore parametro aggiornamento errato" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21468,50 +20267,50 @@ msgstr "" "Il branch del sottomodulo (%s) è configurato in modo da ereditare il branch " "dal progetto al livello superiore, ma questo non è su alcun branch" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "impossibile recuperare un handle repository per il sottomodulo '%s'" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "esegui ricorsivamente sui sottomoduli" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "controlla se è sicuro scrivere sul file .gitmodules" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "rimuovi la configurazione nel file .gitmodules" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nome> [<valore>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nome>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "assicurati che il file .gitmodules sia nell'albero di lavoro" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s non supporta --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' non è un sottocomando submodule--helper valido" @@ -21769,222 +20568,218 @@ msgstr "il tag '%s' esiste già" msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aggiornato (era %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Decompressione degli oggetti in corso" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "creazione della directory %s non riuscita" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "creazione del file %s non riuscita" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "eliminazione del file %s non riuscita" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "eliminazione della directory %s non riuscita" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Test di mtime in '%s' in corso " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "" "le informazioni stat della directory non cambiano dopo l'aggiunta di un " "nuovo file" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" "le informazioni stat della directory non cambiano dopo l'aggiunta di una " "nuova directory" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "" "le informazioni stat della directory cambiano dopo l'aggiornamento di un file" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "le informazioni stat della directory cambiano dopo l'aggiunta di un file in " "una sottodirectory" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "" "le informazioni stat della directory non cambiano dopo l'eliminazione di un " "file" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "" "le informazioni stat della directory non cambiano dopo l'eliminazione di una " "directory" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opzioni>] [--] [<file>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" "continua l'aggiornamento anche nel caso in cui l'indice richieda di essere " "aggiornato" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "aggiornamento: ignora i sottomoduli" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "non ignorare i nuovi file" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "consenti che dei file sostituiscano delle directory e viceversa" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "nota se dei file mancano dall'albero di lavoro" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "" "esegui l'aggiornamento anche se l'indice contiene delle voci non sottoposte " "a merge" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "aggiorna le informazioni stat" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "come --refresh, ma ignora l'impostazione assume-unchanged" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<modo>,<oggetto>,<percorso>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "aggiunge la voce specificata all'indice" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "contrassegna i file come \"non saranno modificati\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "reimposta a zero il bit \"non saranno modificati\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "contrassegna i file come \"solamente da indicizzare\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "reimposta a zero il bit \"solamente da indicizzare\"" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "non eseguire il touch di voci presenti solo nell'indice" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" "aggiungi solo all'indice; non aggiungere il contenuto al database oggetti" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "rimuovi i percorsi specificati anche se presenti nell'albero di lavoro" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "con --stdin: le righe di input sono terminate da byte NULL" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "leggi l'elenco dei percorsi da aggiornare dallo standard input" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "aggiungi le voci specificate sullo standard input all'indice" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "ripopola le fasi 2 e 3 per i percorsi elencati" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "aggiorna solo le voci differenti rispetto all'HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "ignora i file mancanti nell'albero di lavoro" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "stampa le azioni sullo standard output" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "(per i comandi ad alto livello) dimentica i conflitti non risolti salvati" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "scrivi l'indice in questo formato" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "abilita o disabilita l'indice suddiviso" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "abilita/disabilita la cache non tracciata" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "verifica se il filesystem supporta la cache non tracciata" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "abilita la cache non tracciata senza testare il filesystem" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "scrivi l'indice anche se non è stato contrassegnato come modificato" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "abilita o disabilita il monitor del filesystem" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "contrassegna i file come validi rispetto al monitor del filesystem" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "" "reimposta a zero il bit \"file validi rispetto al monitor del filesystem\"" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21992,7 +20787,7 @@ msgstr "" "core.splitIndex è impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare l'indice suddiviso" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -22000,7 +20795,7 @@ msgstr "" "core.splitIndex è impostato a true; rimuovilo o modificalo se vuoi veramente " "disabilitare l'indice suddiviso" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -22008,11 +20803,11 @@ msgstr "" "core.untrackedCache è impostato a true; rimuovilo o modificalo se vuoi " "veramente disabilitare la cache non tracciata" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Cache non tracciata disabilitata" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -22020,29 +20815,29 @@ msgstr "" "core.untrackedCache è impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare la cache non tracciata" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache non tracciata abilitata per '%s'" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor non è impostato; impostalo se vuoi veramente abilitare il " "monitor del filesystem" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "monitor filesystem abilitato" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor è impostato; rimuovi tale impostazione se vuoi veramente " "disabilitare il monitor del filesystem" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "monitor filesystem disabilitato" @@ -22138,55 +20933,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "stampa i contenuti del tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opzioni>] <percorso> [<espressione commit>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<opzioni>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opzioni>] <percorso>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <albero di lavoro> <nuovo percorso>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opzioni>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opzioni>] <albero di lavoro>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <percorso>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "eliminazione di '%s' non riuscita" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Rimuovo worktrees/%s: non è una directory valida" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Rimuovo worktrees/%s: il file gitdir non esiste" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -22195,35 +20990,35 @@ msgstr "" "Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, " "%<PRIuMAX> letti)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Rimuovo worktrees/%s: file gitdir non valido" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Rimuovo worktrees/%s: il file gitdir punta a un percorso non esistente" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "segnala gli alberi di lavoro eliminati" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "fai scadere gli alberi di lavoro più vecchi di <tempo>" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "'%s' esiste già" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -22233,7 +21028,7 @@ msgstr "" "usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per " "rimuoverlo" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22242,129 +21037,129 @@ msgstr "" "'%s' è un albero di lavoro mancante ma già registrato;\n" "usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "impossibile creare la directory di '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Preparazione dell'albero di lavoro in corso (reimposto il branch '%s'; era a " "%s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "esegui il checkout di <branch> anche se tale operazione è stata eseguita in " "un altro albero di lavoro" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "crea un nuovo branch" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "crea o reimposta un branch" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "popola il nuovo albero di lavoro" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "mantieni bloccato il nuovo albero di lavoro" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "imposta la modalità tracking (vedi git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "tenta di cercare una corrispondenza fra il nome del nuovo branch e un branch " "remoto da tracciare" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "l'opzione --[no-]track può essere usata solo se viene creato un nuovo branch" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "motivo di blocco" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' non è un albero di lavoro" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "Non è possibile bloccare o sbloccare l'albero di lavoro principale" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' è già bloccato per questo motivo: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "'%s' è già bloccato" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "'%s' non è bloccato" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "gli alberi di lavoro contenenti sottomoduli non possono essere spostati o " "rimossi" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "forza lo spostamento anche se l'albero di lavoro è sporco o bloccato" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' è un albero di lavoro principale" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossibile determinare il nome destinazione da '%s'" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "la destinazione '%s' esiste già" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22374,7 +21169,7 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22383,37 +21178,36 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "spostamento di '%s' in '%s' non riuscito" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "esecuzione di 'git status' su '%s' non riuscita" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "" -"'%s' contiene file modificati o non tracciati, usa --force per eliminarlo" +msgid "'%s' is dirty, use --force to delete it" +msgstr "'%s' è sporco, usa --force per eliminarlo" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "esecuzione di 'git status' su '%s' non riuscita, codice %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "forza la rimozione anche se l'albero di lavoro è sporco o bloccato" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22423,7 +21217,7 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22432,7 +21226,7 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s" @@ -22453,21 +21247,6 @@ msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>" msgid "only useful for debugging" msgstr "utile solo per il debug" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Atteso comando 'mark', ricevuto %s" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "Atteso comando 'to', ricevuto %s" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "funzionalità '%s' vietata nell'input senza --allow-unsafe-features" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22583,25 +21362,25 @@ msgstr "" "l'alias '%s' modifica le variabili d'ambiente.\n" "Puoi usare '!git' nell'alias per farlo" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "alias vuoto per %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "alias ricorsivo: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "errore di scrittura sullo standard output" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "errore di scrittura sconosciuto sullo standard output" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "chiusura dello standard output non riuscita" @@ -22655,24 +21434,24 @@ msgstr "CURLSSLOPT_NO_REVOKE non è supportato con cURL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Impossibile impostare il backend SSL a '%s': cURL è stato compilato senza " "backend SSL" -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossibile impostare il backend SSL a '%s': già impostato" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22683,166 +21462,155 @@ msgstr "" " richiesta: %s\n" " redirect: %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "virgolette non valide nel valore push-option: '%s'" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs non valido: è un repository Git?" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "" "risposta del server non valida; atteso servizio, ricevuto pacchetto flush" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "risposta del server non valida; ricevuto '%s'" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "repository '%s' non trovato" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticazione non riuscita per '%s'" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "impossibile accedere a '%s': %s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "redirezione a %s in corso" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" "non dovrebbe esserci un pacchetto fine file se non si è accomodanti con " "questi ultimi" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "impossibile ritornare a un punto precedente dei dati POST RPC - prova ad " "aumentare il valore di http.postBuffer" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "RPC non riuscita; %s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "impossibile gestire push così grandi" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" "impossibile eseguire il deflate della richiesta; errore deflate zlib %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "impossibile eseguire il deflate della richiesta; errore fine zlib %d" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "il trasporto http stupido non supporta le funzionalità shallow" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "recupero non riuscito." -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "" "impossibile recuperare i dati in base allo SHA1 con il trasporto HTTP " "intelligente" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "il trasporto HTTP non supporta %s" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "git-http-push non riuscito" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: errore durante la lettura del flusso dei comandi da Git" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: tentato un fetch senza un repository locale" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "argomenti" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "filtraggio oggetti" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "data-scadenza" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "no-op (retrocompatibilità)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "visualizza più dettagli" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "visualizza meno dettagli" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> cifre per mostrare gli hash SHA-1" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "come rimuovere gli spazi e i #commenti dal messaggio" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "leggi gli specificatori percorso da un file" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" -"con --pathspec-from-file gli elementi specificatori percorso sono separati " -"da un carattere NUL" - #: ref-filter.h:101 msgid "key" msgstr "chiave" @@ -23372,171 +22140,163 @@ msgid "Common Git shell script setup code" msgstr "Codice comune di inizializzazione di Git per gli script shell" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Inizializza e modifica sparse-checkout" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Mette da parte le modifiche in una directory di lavoro sporca" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Aggiunge i contenuti dei file all'area di staging" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Visualizza lo stato dell'albero di lavoro" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Rimuove spazi bianchi non necessari" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Inizializza, aggiorna o esamina sottomoduli" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operatività bidirezionale tra un repository Subversion e Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Passa da un branch a un altro" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Legge, modifica ed elimina riferimenti simbolici" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un file temporaneo con i contenuti di un blob" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Decomprime gli oggetti da un archivio sottoposto a pack" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Registra i contenuti dei file dell'albero di lavoro nell'indice" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Reinvia l'archivio a git-archive" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Visualizza una variabile logica di Git" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Verifica la firma GPG dei commit" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Convalida i file archivio sottoposti a pack di Git" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG dei tag" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaccia Web per Git (frontend Web ai repository Git)" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "" "Visualizza i registri insieme alle differenze introdotte da ciascun commit" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Gestisce alberi di lavoro multipli" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Crea un oggetto albero dall'indice corrente" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Definizione di attributi per percorso" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Interfaccia a riga di comando di Git e convenzioni" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Un tutorial Git di base per gli sviluppatori" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git per utenti CVS" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Messa a punto dell'output di diff" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un insieme di comandi utile e minimale per l'uso quotidiano di Git" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Un glossario di Git" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Hook usati da Git" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Specifica i file intenzionalmente non tracciati da ignorare" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Definizione proprietà sottomodulo" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Spazi dei nomi Git" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Struttura repository Git" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Come specificare revisioni e intervalli in Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Monto un repository dentro un altro" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial introduttivo per Git: seconda parte" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Un tutorial introduttivo per Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Una panoramica dei flussi di lavoro raccomandati in Git" @@ -23663,133 +22423,144 @@ msgstr "Provo un merge semplice con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Il merge semplice non ha funzionato, provo il merge automatico." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Impossibile rimuovere l'indice temporaneo (non può succedere)" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Impossibile aggiornare $ref_stash con $w_commit" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "errore: opzione sconosciuta per 'stash push': $option" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Directory di lavoro e stato indice salvati: $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "opzione sconosciuta: $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Troppe revisioni specificate: $REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference non è un riferimento valido" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' non è un commit di tipo stash" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' non è un riferimento a uno stash" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "impossibile aggiornare l'indice" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossibile applicare uno stash nel mezzo di un merge" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Ci sono conflitti in index. Prova senza --index." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Non è stato possibile salvare l'albero indice" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "" "Non è stato possibile ripristinare i file non tracciati dalla voce stash" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Non è stato possibile rimuovere i file modificati dall'area di staging" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} eliminata ($s)" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: non è stato possibile rimuovere la voce di stash" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Per ripristinarli digita \"git stash apply\")" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Il percorso relativo può essere usato solo dal primo livello dell'albero di " "lavoro" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL repository:: '$repo' deve essere assoluto o iniziare con ./|../" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' esiste già nell'indice" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' esiste già nell'indice e non è un sottomodulo" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' non ha un commit di cui è stato eseguito il checkout" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n" +"$sm_path\n" +"Usa -f se vuoi davvero aggiungerlo." + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Aggiunta del repository esistente in '$sm_path' all'indice" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' esiste già e non è un repository Git valido" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "È stata trovata localmente una directory Git per '$sm_name' con i seguenti " "remoti:" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23806,39 +22577,39 @@ msgstr "" "altro\n" "nome con l'opzione '--name'." -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Riattivo la directory Git locale per il sottomodulo '$sm_name'." -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossibile eseguire il checkout del sottomodulo '$sm_path'" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registrazione del sottomodulo '$sm_path' non riuscita" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossibile trovare la revisione corrente nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossibile eseguire il fetch nel percorso del sottomodulo '$sm_path'" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23847,7 +22618,7 @@ msgstr "" "Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel " "percorso del sottomodulo '$sm_path'" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23856,7 +22627,7 @@ msgstr "" "Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; " "provo a recuperare direttamente $sha1:" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23865,79 +22636,79 @@ msgstr "" "Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva " "$sha1. Fetch diretto di tale commit non riuscito." -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossibile eseguire il checkout di '$sha1' nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito checkout di '$sha1'" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossibile eseguire il rebase di '$sha1' nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito rebase su '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossibile eseguire il merge di '$sha1' nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito merge in '$sha1'" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Esecuzione di '$command $sha1' non riuscita nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "L'opzione --cached non può essere usata con l'opzione --files" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modalità $mod_dst inattesa" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attenzione: $display_name non contiene il commit $sha1_src" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attenzione: $display_name non contiene il commit $sha1_dst" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -24263,10 +23034,6 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase di $shortrevisions su $shortonto ($todocount comando)" msgstr[1] "Rebase di $shortrevisions su $shortonto ($todocount comandi)" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Nota che i commit vuoti sono commentati" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Impossibile inizializzare i commit riscritti" @@ -24343,19 +23110,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Impossibile determinare il percorso assoluto della directory Git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%20s %32s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "nell'area di staging" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "rimosso dall'area di staging" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "binario" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "non fare nulla" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "non modificato" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "aggiunto %d percorso\n" +msgstr[1] "aggiunti %d percorsi\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "aggiornato %d percorso\n" +msgstr[1] "aggiornati %d percorsi\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "ripristinato %d percorso\n" +msgstr[1] "ripristinati %d percorsi\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "eseguito touch su %d percorso\n" msgstr[1] "eseguito touch su %d percorsi\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Aggiorna" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Esegui il revert" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s ora non è tracciato.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Aggiungi file non tracciati" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "Nessun file non tracciato.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24363,7 +23192,7 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per l'aggiunta all'area di staging." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24371,7 +23200,7 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per lo stash." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24379,8 +23208,8 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per la rimozione dall'area di staging." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24388,8 +23217,8 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per l'applicazione." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24397,12 +23226,18 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per la rimozione." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "apertura del file di modifica hunk in scrittura non riuscita: %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Modalità manuale modifica hunt - vedi la fine del file per una guida " +"veloce.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -24415,12 +23250,36 @@ msgstr "" "Per rimuovere '%s' righe, eliminale.\n" "Le righe che iniziano con %s saranno rimosse.\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Se non può essere applicata senza problemi, ti sarà data la possibilità\n" +"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n" +"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "apertura del file di modifica hunk in lettura non riuscita: %s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"L'hunk modificato non può essere applicato senza problemi. Modificarlo di " +"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24437,7 +23296,7 @@ msgstr "" "d - non aggiungere né quest'hunk né quelli successivi nel file all'area di " "staging" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24451,7 +23310,7 @@ msgstr "" "a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n" "d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24468,7 +23327,7 @@ msgstr "" "d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di " "staging" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24482,7 +23341,7 @@ msgstr "" "a - applica quest'hunk e tutti quelli successivi nel file\n" "d - non applicare né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24496,7 +23355,7 @@ msgstr "" "a - rimuovi quest'hunk e tutti quelli successivi nel file\n" "d - non rimuovere né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24510,7 +23369,7 @@ msgstr "" "a - rimuovi quest'hunk e tutti quelli successivi nel file\n" "d - non rimuovere né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24524,7 +23383,7 @@ msgstr "" "a - applica quest'hunk e tutti quelli successivi nel file\n" "d - non applicare né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24538,7 +23397,7 @@ msgstr "" "a - applica quest'hunk e tutti quelli successivi nel file\n" "d - non applicare né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24562,85 +23421,234 @@ msgstr "" "e - modifica manualmente l'hunk corrente\n" "? - stampa una guida\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "Vuoi comunque applicarli all'albero di lavoro? " + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "Non è stato applicato nulla.\n" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoro ciò che non è stato sottoposto a merge: %s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Sono stati modificati solo file binari.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Nessuna modifica.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Aggiornamento patch" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Modifica modo stage [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Eliminazione stage [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Modifica modo stash [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Eliminazione stash [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d" +"%s,?]? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d" +"%s,?]? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Applicare la modifica modo all'albero di lavoro [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Applicare l'eliminazione all'albero di lavoro [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Applicare quest'hunk all'albero di lavoro [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Nessun altro hunk a cui andare\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "a quale hunk desideri andare? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero non valido: '%s'\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Mi dispiace, è disponibile solo %d hunk.\n" msgstr[1] "Mi dispiace, sono disponibili solo %d hunk.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "Nessun altro hunk in cui ricercare\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "cercare un'espressione regolare? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Espressione regolare di ricerca %s malformata: %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Nessun hunk corrisponde al pattern fornito\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Nessun hunk precedente\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Nessun hunk successivo\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Mi dispiace, non posso suddividere quest'hunk\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Suddiviso in %d hunk.\n" msgstr[1] "Suddiviso in %d hunk.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Mi dispiace, non posso modificare quest'hunk\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Rivedi diff" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24660,19 +23668,19 @@ msgstr "" "add untracked - aggiunge i contenuti dei file non tracciati all'insieme di\n" " modifiche nell'area di staging\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "-- mancante" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "modalità --patch sconosciuta: %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argomento %s non valido, atteso --" @@ -25052,175 +24060,6 @@ msgstr "Salto %s con il suffisso di backup '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Inviare %s? [y|N]: " -#~ msgid "{drop,keep,ask}" -#~ msgstr "{drop,keep,ask}" - -#, c-format -#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " -#~ msgstr "Modifica modo stage [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " -#~ msgstr "Eliminazione stage [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " -#~ msgstr "Eseguire lo stage di quest'hunk [y,n,a,q,d%s,?]? " - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for staging.\n" -#~ msgstr "" -#~ "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" -#~ "contrassegnato immediatamente per l'aggiunta all'area di staging.\n" - -#~ msgid "" -#~ "y - stage this hunk\n" -#~ "n - do not stage this hunk\n" -#~ "q - quit; do not stage this hunk or any of the remaining ones\n" -#~ "a - stage this and all the remaining hunks\n" -#~ "d - do not stage this hunk nor any of the remaining hunks\n" -#~ msgstr "" -#~ "y - aggiungi quest'hunk all'area di staging\n" -#~ "n - non aggiungere quest'hunk all'area di staging\n" -#~ "q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di " -#~ "staging\n" -#~ "a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di " -#~ "staging\n" -#~ "d - non aggiungere né quest'hunk né quelli successivi nel file all'area " -#~ "di staging\n" - -#, c-format -#~ msgid "could not copy '%s' to '%s'." -#~ msgstr "impossibile copiare '%s' in '%s'." - -#~ msgid "malformed ident line" -#~ msgstr "riga ident malformata" - -#~ msgid "corrupted author without date information" -#~ msgstr "informazioni sull'autore corrotte (senza data)" - -#, c-format -#~ msgid "could not parse '%.*s'" -#~ msgstr "impossibile analizzare '%.*s'" - -#, c-format -#~ msgid "could not checkout %s" -#~ msgstr "impossibile eseguire il checkout di %s" - -#, c-format -#~ msgid "filename in tree entry contains backslash: '%s'" -#~ msgstr "il nome file nella voce albero contiene una barra rovesciata: '%s'" - -#, c-format -#~ msgid "Use -f if you really want to add them.\n" -#~ msgstr "Usa -f se vuoi davvero aggiungerli.\n" - -#, c-format -#~ msgid "Maybe you wanted to say 'git add .'?\n" -#~ msgstr "Forse intendevi dire 'git add .'?\n" - -#, c-format -#~ msgid "packfile is invalid: %s" -#~ msgstr "packfile non valido: %s" - -#, c-format -#~ msgid "unable to open packfile for reuse: %s" -#~ msgstr "impossibile aprire il packfile per il suo riuso: %s" - -#~ msgid "unable to seek in reused packfile" -#~ msgstr "impossibile eseguire seek nel packfile riusato" - -#~ msgid "unable to read from reused packfile" -#~ msgstr "impossibile leggere dal packfile riusato" - -#~ msgid "no HEAD?" -#~ msgstr "nessun'HEAD?" - -#~ msgid "make committer date match author date" -#~ msgstr "" -#~ "fai corrispondere la data della persona che ha eseguito il commit alla " -#~ "data autore" - -#~ msgid "ignore author date and use current date" -#~ msgstr "ignora la data autore e usa la data corrente" - -#~ msgid "synonym of --reset-author-date" -#~ msgstr "sinonimo di --reset-author-date" - -#~ msgid "ignore changes in whitespace" -#~ msgstr "ignora modifiche agli spazi bianchi" - -#~ msgid "preserve empty commits during rebase" -#~ msgstr "mantieni i commit vuoti durante il rebase" - -#~ msgid "cannot combine --use-bitmap-index with object filtering" -#~ msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti" - -#, sh-format -#~ msgid "" -#~ "The following path is ignored by one of your .gitignore files:\n" -#~ "$sm_path\n" -#~ "Use -f if you really want to add it." -#~ msgstr "" -#~ "Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n" -#~ "$sm_path\n" -#~ "Usa -f se vuoi davvero aggiungerlo." - -#, c-format -#~ msgid "unable to get tree for %s" -#~ msgstr "impossibile recuperare l'albero per %s" - -#~ msgid "Use an experimental heuristic to improve diffs" -#~ msgstr "Usa un'euristica sperimentale per migliorare i diff" - -#~ msgid "git commit-graph [--object-dir <objdir>]" -#~ msgstr "git commit-graph [--object-dir <directory oggetti>]" - -#~ msgid "git commit-graph read [--object-dir <objdir>]" -#~ msgstr "git commit-graph read [--object-dir <directory oggetti>]" - -#, c-format -#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -#~ msgstr "" -#~ "valore core.untrackedCache '%s' non valido; utilizzerò il valore " -#~ "predefinito 'keep'" - -#~ msgid "cannot change partial clone promisor remote" -#~ msgstr "impossibile modificare il remoto promettente del clone parziale" - -#~ msgid "error building trees" -#~ msgstr "errore durante la costruzione degli alberi" - -#, c-format -#~ msgid "invalid date format '%s' in '%s'" -#~ msgstr "formato data '%s' non valido in '%s'" - -#~ msgid "writing root commit" -#~ msgstr "scrittura commit radice in corso" - -#, c-format -#~ msgid "staged changes in the following files may be lost: %s" -#~ msgstr "" -#~ "le modifiche in stage nei seguenti file potrebbero andare perdute: %s" - -#~ msgid "" -#~ "--filter can only be used with the remote configured in extensions." -#~ "partialClone" -#~ msgstr "" -#~ "--filter può essere usato solo con il remoto configurato nelle estensioni." -#~ "partialClone" - -#~ msgid "verify commit-msg hook" -#~ msgstr "verifica hook commit-msg" - -#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" -#~ msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'" - -#, c-format -#~ msgid "invalid sparse value '%s'" -#~ msgstr "valore sparse non valido: '%s'" - #~ msgid "" #~ "Fetch normally indicates which branches had a forced update, but that " #~ "check has been disabled." @@ -25294,6 +24133,9 @@ msgstr "Inviare %s? [y|N]: " #~ "impossibile eseguire l'attività in modalità interattiva con lo standard " #~ "input non collegato a un terminale." +#~ msgid "failed to open '%s'" +#~ msgstr "apertura di '%s' non riuscita" + #~ msgid "failed to stat %s\n" #~ msgstr "stat di %s non riuscito\n" diff --git a/third_party/git/po/sv.po b/third_party/git/po/sv.po index 06a586a215..4ad206df70 100644 --- a/third_party/git/po/sv.po +++ b/third_party/git/po/sv.po @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2020 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2019 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: git 2.26.0\n" +"Project-Id-Version: git 2.23.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-17 18:30+0100\n" +"POT-Creation-Date: 2019-07-30 09:59+0800\n" +"PO-Revision-Date: 2019-07-31 12:40+0200\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -16,731 +16,49 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.7\n" +"X-Generator: Poedit 2.0.2\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "Vadå (%s)?" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "kunde inte läsa indexet" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "binär" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "ingenting" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "oändrad" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Uppdatera" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "kunde inte köa \"%s\"" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "kunde inte skriva indexet" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "uppdaterade %d sökväg\n" -msgstr[1] "uppdaterade %d sökvägar\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "observera: %s spåras inte längre.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Återställ" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "kunde inte tolka HEAD^{tree}" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "återställde %d sökväg\n" -msgstr[1] "återställde %d sökvägar\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "Inga ospårade filer.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "Lägg till ospårad" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "lade till %d sökväg\n" -msgstr[1] "lade till %d sökvägar\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "ignorerar ej sammanslagen: %s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Endast binära filer ändrade.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Inga ändringar.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Uppdatera patch" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Granska diff" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "visa sökvägar med ändringar" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "lägg arbetskatalogens tillstånd till köade ändringar" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "återställ köade ändringar tillbaka till HEAD-versionen" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "välj stycken och uppdatera selektivt" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "visa skillnad mellan HEAD och index" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "lägg innehåll i ospårade filer till köade ändringar" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "Kommandoradshjälp:" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "markera en post" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "markera intervall av poster" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "markera flera intervall" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "markera post baserad på unikt prefix" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "avmarkera angivna poster" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "välj alla poster" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(tomt) avsluta markering" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "markera en numrerad post" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(tomt) markera ingenting" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Kommandon ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Vad nu" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "köad" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "ej köad" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "sökväg" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "kunde inte uppdatera indexet" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Hej då.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Köa borttagning [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Köa stycket [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att köas " -"omedelbart." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - köa stycket\n" -"n - köa inte stycket\n" -"q - avsluta; köa inte stycket eller något av de följande\n" -"a - köa stycket och alla följande i filen\n" -"d - köa inte stycket eller något av de följande i filen\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Stash:a stycket [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att läggas till " -"i \"stash\" omedelbart." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - \"stash\":a stycket\n" -"n - \"stash\":a inte stycket\n" -"q - avsluta; \"stash\":a inte stycket eller något av de följande\n" -"a - \"stash\":a stycket och alla följande i filen\n" -"d - \"stash\":a inte stycket eller något av de följande i filen\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att tas bort " -"från kön omedelbart." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - ta bort stycket från kön\n" -"n - ta inte bort stycket från kön\n" -"q - avsluta; ta inte bort stycket eller något av de följande från kön\n" -"a - ta bort stycket och alla följande i filen från kön\n" -"d - ta inte bort stycket eller något av de följande i filen från kön\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att markeras " -"för applicering omedelbart." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - applicera stycket på indexet\n" -"n - applicera inte stycket på indexet\n" -"q - avsluta; applicera inte stycket eller något av de följande\n" -"a - applicera stycket och alla följande i filen\n" -"d - applicera inte stycket eller något av de följande i filen\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att markeras " -"för kasta omedelbart." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - förkasta stycket från arbetskatalogen\n" -"n - förkasta inte stycket från arbetskatalogen\n" -"q - avsluta; förkasta inte stycket eller något av de följande\n" -"a - förkasta stycket och alla följande i filen\n" -"d - förkasta inte stycket eller något av de följande i filen\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - förkasta stycket från indexet och arbetskatalogen\n" -"n - förkasta inte stycket från indexet och arbetskatalogen\n" -"q - avsluta; förkasta inte stycket eller något av de följande\n" -"a - förkasta stycket och alla följande i filen\n" -"d - förkasta inte stycket eller något av de följande i filen\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - applicera stycket på indexet och arbetskatalogen\n" -"n - applicera inte stycket på indexet och arbetskatalogen\n" -"q - avsluta; applicera inte stycket eller något av de följande\n" -"a - applicera stycket och alla följande i filen\n" -"d - applicera inte stycket eller något av de följande i filen\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - applicera stycket på arbetskatalogen\n" -"n - applicera inte stycket på arbetskatalogen\n" -"q - avsluta; applicera inte stycket eller något av de följande\n" -"a - applicera stycket och alla följande i filen\n" -"d - applicera inte stycket eller något av de följande i filen\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "kunde inte tolka styckehuvudet \"%.*s\"" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "kunde inte tolka färgat styckehuvud \"%.*s\"" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "kunde inte tolka diff" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "kunde inte tolka färgad diff" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "misslyckades att köra \"%s\"" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "omaka utdata från interactive.diffFilter" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Alla rader i indata måste ha en motsvarande rad i utdata från\n" -"ditt filter." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"förväntade sammanhangsrad %d i\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"stycken överlappar inte:\n" -"%.*s\n" -"\tavslutas inte med:\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"Ta bort \"%c\" rader genom att göra dem \" \"-rader (sammanhang).\n" -"Ta bort \"%c\" rader genom att radera dem.\n" -"Rader som börjar med %c kommer att tas bort.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n" -"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" -"redigeringen och stycket lämnas oförändrat.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "kunde inte tolka styckehuvud" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "\"git apply --cached\" misslyckades" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " -"[y/n]? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "Markerade stycken kan inte appliceras på indexet!" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Applicera dem på arbetskatalogen trots det? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Ingenting applicerades.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - lämna stycket obestämt, se nästa obestämda stycke\n" -"J - lämna stycket obestämt, se nästa stycke\n" -"k - lämna stycket obestämt, se föregående obestämda stycke\n" -"K - lämna stycket obestämt, se föregående stycke\n" -"g - välj ett stycke att gå till\n" -"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" -"s - dela aktuellt stycke i mindre styckens\n" -"e - redigera aktuellt stycke manuellt\n" -"? - visa hjälp\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "Inget föregående stycke" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "Inget följande stycke" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "Inga andra stycken att gå till" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "gå till vilket stycke (<ret> för att se fler)? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "gå till vilket stycke? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Ogiltigt siffervärde: \"%s\"" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Beklagar, det finns bara %d stycke." -msgstr[1] "Beklagar, det finns bara %d stycken." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "Inga andra stycken att söka efter" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "sök efter reguljärt uttryck? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Felaktigt format på reguljärt sökuttryck %s: %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "Inga stycken motsvarar givet mönster" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Beklagar, kan inte dela stycket" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "Dela i %d stycken." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Beklagar, kan inte redigera stycket" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "\"git apply\" misslyckades" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%stips: %.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits " "samman." -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en incheckning eftersom du har filer som inte slagits " "samman." -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits " "samman." -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman." -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits " "samman." -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman." -#: advice.c:186 +#: advice.c:180 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." @@ -748,23 +66,23 @@ msgstr "" "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n" "som lämpligt för att ange lösning och checka in." -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Checka in dina ändringar innan du utför sammanslagningen." -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Avslutar på grund av ofullbordad sammanslagning." -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -890,7 +208,17 @@ msgstr "ogiltigt läge på rad %d: %s" msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: förväntade rad: %.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "patch-fragment utan huvud på rad %d: %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -906,92 +234,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: förväntade rad: %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "patch-fragment utan huvud på rad %d: %.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1000,25 +318,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -1026,412 +344,426 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "internt fel" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "sökväg" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "antal" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 msgid "action" msgstr "åtgärd" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "rot" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -1454,7 +786,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -1486,7 +818,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1597 msgid "prefix" msgstr "prefix" @@ -1494,12 +826,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "fil" @@ -1532,7 +863,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "arkiv" @@ -1540,7 +871,7 @@ msgstr "arkiv" msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "kommando" @@ -1571,66 +902,66 @@ msgstr "Okänt arkivformat \"%s\"" msgid "Argument not supported for format '%s': -%d" msgstr "Argumentet stöd inte för formatet \"%s\": -%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "kan inte strömma blob:en %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "kan inte läsa %s" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "kunde inte starta filtret \"%s\"" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "kan inte omdirigera handtag" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "sökvägen är inte giltig UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1648,12 +979,12 @@ msgstr "Felaktigt citerat innehåll i filen \"%s\": %s" msgid "We cannot bisect more!\n" msgstr "Det finns inte mer att göra \"bisect\" på!\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "Namnet på incheckningen är inte giltigt: %s" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1662,7 +993,7 @@ msgstr "" "Sammanslagningsbasen %s är trasig.\n" "Det betyder att felet har rättats mellan %s och [%s].\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1671,7 +1002,7 @@ msgstr "" "Sammanslagningsbasen %s är ny.\n" "Egenskapen har ändrats mellan %s och [%s].\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1680,7 +1011,7 @@ msgstr "" "Sammanslagningsbasen %s är %s.\n" "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1691,7 +1022,7 @@ msgstr "" "git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1703,36 +1034,36 @@ msgstr "" "%s.\n" "Vi fortsätter ändå." -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisect: en sammanslagningsbas måste testas\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "misslyckades läsa bisect-referenser" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s var både %s och %s\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1741,7 +1072,7 @@ msgstr "" "Ingen testbar incheckning hittades.\n" "Kanske du startade med felaktiga sökvägsparametrar?\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1751,48 +1082,48 @@ msgstr[1] "(ungefär %d steg)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980 +#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" @@ -1911,7 +1242,7 @@ msgstr "" "som redan finns på fjärren kan du behöva köra \"git fetch\"\n" "för att hämta den.\n" "\n" -"Om du har tänkt sända in en ny lokal gren som ska\n" +"Om du har tänkt sända in en ny lokal gren som skall\n" "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n" "för att ställa in uppströmskonfigurationen när du sänder in." @@ -1950,8 +1281,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1982,62 +1313,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Paketet (bundlen) kräver denna referens:" msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "kan inte duplicera pakethandtag" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Kunde inte starta pack-objects" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "index-pack dog" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s är inte en incheckning!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2057,29 +1388,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2089,242 +1420,232 @@ msgstr "" "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n" "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara " "ofullständig" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:553 commit-graph.c:613 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:579 +#: commit-graph.c:574 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "kunde inte tolka incheckningen %s" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1001 builtin/pack-objects.c:2651 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1043 +#: commit-graph.c:1033 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1060 +#: commit-graph.c:1050 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1079 +#: commit-graph.c:1069 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1098 +#: commit-graph.c:1088 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1173 +#: commit-graph.c:1162 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:1186 +#: commit-graph.c:1175 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1190 +#: commit-graph.c:1179 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1214 +#: commit-graph.c:1203 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "ogiltigt inchecknings-objekt-id %s" - -#: commit-graph.c:1249 +#: commit-graph.c:1237 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1264 +#: commit-graph.c:1252 msgid "Counting distinct commits in commit graph" msgstr "Räknar olika incheckningar i incheckningsgraf" -#: commit-graph.c:1294 +#: commit-graph.c:1283 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1340 +#: commit-graph.c:1331 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1364 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: commit-graph.c:1445 +#: commit-graph.c:1436 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1486 +#: commit-graph.c:1477 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1498 +#: commit-graph.c:1489 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1518 +#: commit-graph.c:1509 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:1631 +#: commit-graph.c:1620 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:1642 +#: commit-graph.c:1631 #, c-format msgid "unexpected duplicate commit id %s" msgstr "oväntat duplicerat inchecknings-id %s" -#: commit-graph.c:1665 +#: commit-graph.c:1656 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:1844 +#: commit-graph.c:1842 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" -#: commit-graph.c:1855 +#: commit-graph.c:1853 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:1944 +#: commit-graph.c:1943 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:1954 +#: commit-graph.c:1953 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1963 commit-graph.c:1978 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:1970 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:1989 +#: commit-graph.c:1987 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2003 +#: commit-graph.c:2000 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" -#: commit-graph.c:2010 +#: commit-graph.c:2007 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" -#: commit-graph.c:2020 +#: commit-graph.c:2017 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" -#: commit-graph.c:2029 +#: commit-graph.c:2026 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "incheckningsgrafens förälder för %s är %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2039 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" -#: commit-graph.c:2047 +#: commit-graph.c:2044 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2332,7 +1653,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2051 +#: commit-graph.c:2048 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2340,12 +1661,12 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2066 +#: commit-graph.c:2063 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2069 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2384,283 +1705,289 @@ msgstr "relativa konfigureringsinkluderingar måste komma från filer" msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:376 +#: config.c:375 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehåller inte ett stycke: %s" -#: config.c:382 +#: config.c:381 #, c-format msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:406 sequencer.c:2444 +#: config.c:405 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:412 +#: config.c:411 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:448 config.c:460 +#: config.c:447 config.c:459 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:495 +#: config.c:494 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:821 +#: config.c:820 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:825 +#: config.c:824 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:829 +#: config.c:828 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:833 +#: config.c:832 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:837 +#: config.c:836 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:841 +#: config.c:840 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:978 +#: config.c:977 msgid "out of range" msgstr "utanför intervallet" -#: config.c:978 +#: config.c:977 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:979 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:998 +#: config.c:997 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:1001 +#: config.c:1000 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:1004 +#: config.c:1003 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:1007 +#: config.c:1006 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:1010 +#: config.c:1009 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:1013 +#: config.c:1012 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:1108 +#: config.c:1107 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1117 +#: config.c:1116 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1208 +#: config.c:1207 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1222 config.c:1233 +#: config.c:1221 config.c:1232 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1325 +#: config.c:1324 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1358 +#: config.c:1357 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1430 +#: config.c:1429 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1456 +#: config.c:1455 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1457 +#: config.c:1456 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "måste vara en av nothing, matching, simple, upstream eller current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1517 builtin/pack-objects.c:3399 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1639 +#: config.c:1638 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1642 +#: config.c:1641 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1659 +#: config.c:1658 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1689 +#: config.c:1688 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1743 +#: config.c:1744 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2097 +#: config.c:2093 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2267 +#: config.c:2263 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2312 +#: config.c:2306 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" + +#: config.c:2332 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2358 +#: config.c:2378 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2360 +#: config.c:2380 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2441 +#: config.c:2461 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2473 +#: config.c:2493 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2502 +#: config.c:2522 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2754 config.c:3078 +#: config.c:2774 config.c:3098 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2765 +#: config.c:2785 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2800 builtin/config.c:344 +#: config.c:2820 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2825 +#: config.c:2845 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2838 config.c:3091 +#: config.c:2858 config.c:3111 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2849 +#: config.c:2869 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2858 config.c:3096 +#: config.c:2878 config.c:3116 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2943 config.c:3193 +#: config.c:2963 config.c:3213 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2977 +#: config.c:2997 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:2999 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3069 +#: config.c:3089 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3236 +#: config.c:3256 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2784,7 +2111,7 @@ msgstr "kunde inte slå upp %s (%s)" msgid "unknown port %s" msgstr "okänd port %s" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "konstigt värdnamn \"%s\" blockerat" @@ -2799,60 +2126,60 @@ msgstr "konstig port \"%s\" blockerad" msgid "cannot start proxy %s" msgstr "kan inte starta mellanserver (proxy) %s" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "ssh-varianten \"simple\" stöder inte -4" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "ssh-varianten \"simple\" stöder inte -6" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh-varianten \"simple\" stöder inte val av port" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "konstigt sökvägsnamn \"%s\" blockerat" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "felaktig crlf_action %d" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF skulle ersättas av LF i %s" -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2861,12 +2188,12 @@ msgstr "" "CRLF kommer att ersättas av LF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF skulle ersättas av CRLF i %s" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2875,18 +2202,18 @@ msgstr "" "LF kommer att ersättas av CRLF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM är förbjudet i \"%s\" om kodat som %s" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" -"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som " +"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som " "teckenkodning i arbetskatalogen." #: convert.c:304 @@ -2903,51 +2230,51 @@ msgstr "" "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE " "(beroende på byteordning) som teckenkodning i arbetskatalogen." -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "misslyckades omkoda \"%s\" från %s till %s" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "kan inte grena (fork) för att köra externt filter \"%s\"" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "kunde inte skicka indata till externt filter \"%s\"" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "externt filter \"%s\" misslyckades %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "läsning från externt filter \"%s\" misslyckades" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "externt filter \"%s\" misslyckades" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "oväntad filtertyp" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2956,67 +2283,67 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "i framtiden" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> sekund sedan" msgstr[1] "%<PRIuMAX> sekunder sedan" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minut sedan" msgstr[1] "%<PRIuMAX> minuter sedan" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> timme sedan" msgstr[1] "%<PRIuMAX> timmar sedan" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> dag sedan" msgstr[1] "%<PRIuMAX> dagar sedan" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> vecka sedan" msgstr[1] "%<PRIuMAX> veckor sedan" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> månad sedan" msgstr[1] "%<PRIuMAX> månader sedan" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3024,14 +2351,14 @@ msgstr[0] "%<PRIuMAX> år" msgstr[1] "%<PRIuMAX> år" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> månad sedan" msgstr[1] "%s, %<PRIuMAX> månader sedan" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3067,7 +2394,7 @@ msgstr "Markerade %d öar, klar.\n" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -3133,35 +2460,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3170,42 +2497,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3213,149 +2540,149 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:182 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "skriv ut distributionen av relativa mängder ändringar för varje underkatalog" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<bredd>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<antal>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "<typ>" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3363,7 +2690,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3371,87 +2698,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<tecken>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "ange tecken för att ange ny rad istället för \"+\"" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "ange tecken för att ange gammal rad istället för \"-\"" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "använd oförändrade som källa för att hitta kopior" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3459,159 +2786,159 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristik för att flytta diff-gränser för lättare läsning" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<text>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<läge>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "använd <reguttr> för att bestämma vad som är ett ord" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "vid start från underkatalog, uteslut ändringar utanför och visa relativa " "sökvägar" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<när>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<format>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<sträng>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3619,115 +2946,94 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<fil>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt." -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "okänt mönster: %s" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "okänt negativt mönster: %s" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "" -"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera " -"gånger" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "inaktiverar konmönstermatchning" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3735,7 +3041,7 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" #: editor.c:73 #, c-format msgid "hint: Waiting for your editor to close the file...%c" -msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c" +msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c" #: entry.c:178 msgid "Filtering content" @@ -3746,12 +3052,12 @@ msgstr "Filtrerar innehåll" msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssökväg \"%s\"" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "kunde inte ställa in GIT_DIR till \"%s\"" @@ -3761,270 +3067,266 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\"" msgid "too many args to run %s" msgstr "för många flaggor för att köra %s" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Fjärr utan URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "klart" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "förväntade bekräftelserad: \"%s\"" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" -"P under PCRE v2" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -4074,7 +3376,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Lågnivåkommandon / frågare" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "Lågnivåkommandon / synka arkiv" #: help.c:38 @@ -4167,12 +3469,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4240,61 +3542,46 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet" msgid "name consists only of disallowed characters: %s" msgstr "namnet består enbart av ej tillåtna tecken: %s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "kunde inte läsa in rot-trädet för incheckningen %s" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "kunde inte nå gles blob på \"%s\"" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "kunde inte tolka gles filterdata i %s" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "flera filterspecifikationer kan inte kombineras" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "sparse:sökväg-filter stöds inte längre" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "felaktig filterspecifikation: \"%s\"" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "måste använda specialsekvens i delfilter-spec: \"%c\"" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "förväntade någonting efter combine:" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "flera filterspecifikationer kan inte kombineras" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "kan inte ändra kontraktsfjärr för delvis kloning" #: lockfile.c:151 #, c-format @@ -4325,117 +3612,121 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "fel vid byggande av träd" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" -msgstr "vet inte hur %06o %s \"%s\" ska hanteras" +msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Misslyckades slå ihop undermodulen %s (incheckningar följer inte " "sammanslagningsbasen)" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar " "hittades inte)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4452,32 +3743,32 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, 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." -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4486,7 +3777,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4495,7 +3786,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4504,7 +3795,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4513,40 +3804,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4555,28 +3846,28 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " "directory %s was renamed to multiple other directories, with no destination " "getting a majority of the files." msgstr "" -"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då " +"KONFLIKT (namnändrad delad katalog): Osäker på var %s skall placeras då " "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4585,7 +3876,7 @@ msgstr "" "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4594,7 +3885,7 @@ msgstr "" "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4603,7 +3894,7 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4612,52 +3903,52 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-recursive.c:2961 +#: merge-recursive.c:2937 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:2940 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3004 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3028 +#: merge-recursive.c:3004 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3040 +#: merge-recursive.c:3016 msgid "content" msgstr "innehåll" -#: merge-recursive.c:3044 +#: merge-recursive.c:3020 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:3067 +#: merge-recursive.c:3043 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3065 git-submodule.sh:937 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3090 +#: merge-recursive.c:3066 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3096 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3203 +#: merge-recursive.c:3178 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4666,7 +3957,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3181 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4675,7 +3966,7 @@ msgstr "" "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " "%s, föreslår att den bör flyttas till%s." -#: merge-recursive.c:3210 +#: merge-recursive.c:3185 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4684,7 +3975,7 @@ msgstr "" "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " "namn i %s; flyttar den till %s." -#: merge-recursive.c:3213 +#: merge-recursive.c:3188 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4693,243 +3984,227 @@ msgstr "" "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " "bytte namn i %s; flyttar den till %s." -#: merge-recursive.c:3327 +#: merge-recursive.c:3302 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3325 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3355 +#: merge-recursive.c:3330 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3362 +#: merge-recursive.c:3337 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:3371 +#: merge-recursive.c:3346 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3355 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3393 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +" %s" + +#: merge-recursive.c:3404 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3413 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3537 +#: merge-recursive.c:3512 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3525 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3600 +#: merge-recursive.c:3564 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Dina lokala ändringar av följande filer skulle skrivas över av " -"sammanslagning:\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3630 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "hash-versionen %u stämmer inte" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "felaktigt offset för stycke (för stort)" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat" +msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "fel när paketfiler från multi-pack-index skulle förberedas" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Lägger till paketfiler till multi-pack-index" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "såg inte paketfilen %s som skulle kastas" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "Skriver stycken till multi-pack-index" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "Bekräftar OID-ordning i multi-pack-index" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" +msgstr "Bekräftar OID-ordning i MIDX" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Räknar refererade objekt" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Ser efter och tar bort orefererade packfiler" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "misslyckades skapa lazy_dir-tråd: %s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "misslyckades skapa lazy_name-tråd: %s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utföra join på lazy_name-tråd: %s" @@ -4974,32 +4249,32 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "ogiltig objekttyp \"%s\"" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "objektet %s är en %s, inte en %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "objektet %s har okänd typ-id %d" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" @@ -5013,11 +4288,6 @@ msgstr "offset före slutet av packindex för %s (trasigt index?)" msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "kan inte hämta storlek på %s" - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -5033,7 +4303,7 @@ msgstr "%s är inkompatibel med %s" msgid "%s : incompatible with something else" msgstr "%s: inkompatibelt med något annat" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s tar inget värde" @@ -5043,41 +4313,41 @@ msgstr "%s tar inget värde" msgid "%s isn't available" msgstr "%s är inte tillgängligt" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "menade du \"--%s\" (med två bindestreck)?" +msgid "did you mean `--%s` (with two dashes ?)" +msgstr "menade du \"--%s\" (med två bindestreck?)" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -5085,21 +4355,21 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-TAL" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "alias för --%s" @@ -5125,34 +4395,34 @@ msgstr "" msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Endast en \"attr:\"-angivelse tillåten." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "attr-angivelse kan inte vara tom" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "ogiltigt attributnamn %s" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5160,55 +4430,50 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\"" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: \"%s\" är utanför arkivet på \"%s\"" +msgid "%s: '%s' is outside repository" +msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "linjen er felaktigt citerad: %s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "kan inte skriva flush-paket" @@ -5269,42 +4534,33 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Fjärr utan URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "kontraktsfjärr kan inte börja med \"/\": %s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" @@ -5344,16 +4600,16 @@ msgstr "kan inte lägga till \"%s\" till indexet" msgid "unable to stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "\"%s\" finns både som en fil och en katalog" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5362,7 +4618,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5371,161 +4627,150 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index använder filtillägget %.4s, vilket vi inte förstår" -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "felformat namnfält i indexet, nära sökvägen \"%s\"" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte läsa in cache_entries-tråden: %s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte utföra join på cache_entries-tråden: %s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "kunde inte utföra join på load_index_extensions-tråden: %s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" -"continue\".\n" -"Avbryt ombaseringen med \"git rebase --abort\".\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar." -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5569,14 +4814,14 @@ msgstr "" "\n" "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Ombasera %s på %s (%d kommando)" msgstr[1] "Ombasera %s på %s (%d kommandon)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5585,7 +4830,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5593,7 +4838,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5607,7 +4852,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5617,19 +4862,22 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Observera att tomma incheckningar är utkommenterade" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "kunde inte skriva \"%s\"." +msgid "could not copy '%s' to '%s'." +msgstr "kunde inte kopiera \"%s\" till \"%s\"." -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5638,7 +4886,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5658,13 +4906,6 @@ msgstr "" "\" (fel).\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "kunde inte läsa \"%s\"." - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5675,7 +4916,7 @@ msgstr "\"%s\" pekar inte på ett giltigt objekt!" msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" @@ -5700,15 +4941,14 @@ msgstr "referensen \"%s\" finns redan" msgid "unexpected object ID when writing '%s'" msgstr "oväntat objekt-id vid skrivning \"%s\"" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" @@ -5743,37 +4983,37 @@ msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" @@ -5783,7 +5023,7 @@ msgstr "kunde inte ta bort referenser: %s" msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: \"%s\"" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "försvunnen" @@ -5802,281 +5042,281 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) tar inte argument" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "okänt %%(objectsize)-argument: %s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) tar inte argument" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "ingen gren, ombaserar %s" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "ingen gren, ombaserar frånkopplat HEAD %s" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "ingen gren, \"bisect\" startad på %s" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "ingen gren" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "flaggan \"%s\" är inkompatibel med --merged" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "flaggan \"%s\" är inkompatibel med --no-merged" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "mer än en receivepack angavs, använder den första" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "mer än en uploadpack angavs, använder den första" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "käll-referensspecifikationen %s motsvarar mer än en" @@ -6085,7 +5325,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6108,7 +5348,7 @@ msgstr "" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6119,7 +5359,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sända\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6130,7 +5370,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6141,7 +5381,7 @@ msgstr "" "Var det meningen att tagga ett nytt träd genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6152,114 +5392,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slås upp till en gren" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6269,11 +5509,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6288,11 +5528,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -6307,7 +5547,7 @@ msgstr "felaktig ersättningsreferensnamn: %s" msgid "duplicate replace ref: %s" msgstr "duplicerat ersättningsreferensnamn: %s" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "ersättningsdjupet för högt för objektet %s" @@ -6370,8 +5610,8 @@ msgstr "kan inte ta bort lös länk \"%s\"" msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" @@ -6405,20 +5645,20 @@ msgstr "Glömde lösning för \"%s\"\n" msgid "unable to open rr-cache directory" msgstr "kan inte uppdatera katalogen rr-cache" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L stöder ännu inte andra diff-format än -p och -s" @@ -6440,29 +5680,29 @@ msgstr "" "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6470,47 +5710,47 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "revert" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:329 -msgid "rebase" -msgstr "rebase" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "rebase -i" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "okänd funktion: %d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6518,7 +5758,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6528,110 +5768,115 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "ogiltigt datumformat \"%s\" i \"%s\"" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6648,11 +5893,11 @@ msgid "" " git rebase --continue\n" msgstr "" "du har köade ändringar i din arbetskatalog.\n" -"Om ändringarna ska läggas in i föregående incheckning, kör:\n" +"Om ändringarna skall läggas in i föregående incheckning, kör:\n" "\n" " git commit --amend %s\n" "\n" -"Om de ska checkas in i en egen incheckning, kör:\n" +"Om de skall checkas in i en egen incheckning, kör:\n" "\n" " git commit %s\n" "\n" @@ -6660,11 +5905,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "skriver rotincheckning" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6691,7 +5940,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6716,326 +5965,327 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "kan inte hämta incheckningsmeddelande för %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "kunde inte tolka \"%s\"" +msgid "could not parse '%.*s'" +msgstr "kunde inte tolka \"%.*s\"" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "kunde inte läsa \"%s\"." + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Du verkar ha flyttat HEAD.\n" "Spolar inte tillbaka, kontrollera HEAD!" -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7044,21 +6294,21 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7077,22 +6327,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "kunde inte läsa indexet" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7107,11 +6362,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7128,72 +6383,76 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "kunde inte skriva indexet" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7204,26 +6463,31 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "kunde inte checka ut %s" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s: inte ett giltigt OID" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7244,48 +6508,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7295,59 +6559,69 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" +"continue\".\n" +"Avbryt ombaseringen med \"git rebase --abort\".\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "\"%s\" är utanför arkivet på \"%s\"" +msgid "'%s' is outside repository" +msgstr "\"%s\" är utanför arkivet" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7357,7 +6631,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7369,12 +6643,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7385,92 +6659,92 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "för stor för att vara en .git-fil: \"%s\"" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7480,7 +6754,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7489,283 +6763,283 @@ msgstr "" "problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" -msgstr "kunde inte normalisera supplerande objektsökväg: %s" +msgstr "kunde inte normalisera alternativ objektsökväg: %s" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignorerar supplerande objektlager, för djup nästling" +msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" -msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" +msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\"" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" -msgstr "felaktig rad vid tolkning av supplerande referenser: %s" +msgstr "felaktig rad vid tolkning av alternativa referenser: %s" #: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:968 msgid "mmap failed" msgstr "mmap misslyckades" -#: sha1-file.c:1128 +#: sha1-file.c:1132 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1256 sha1-file.c:2395 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1258 sha1-file.c:2399 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: sha1-file.c:1307 +#: sha1-file.c:1300 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1391 +#: sha1-file.c:1384 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" -#: sha1-file.c:1394 +#: sha1-file.c:1387 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1400 +#: sha1-file.c:1393 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "kan inte tolka %s-huvud med --allow-unknown-type" -#: sha1-file.c:1403 +#: sha1-file.c:1396 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1629 +#: sha1-file.c:1587 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1633 +#: sha1-file.c:1591 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: sha1-file.c:1637 +#: sha1-file.c:1595 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1641 +#: sha1-file.c:1599 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1746 +#: sha1-file.c:1702 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1753 +#: sha1-file.c:1709 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: sha1-file.c:1760 +#: sha1-file.c:1716 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1780 +#: sha1-file.c:1735 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: sha1-file.c:1845 +#: sha1-file.c:1800 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" -#: sha1-file.c:1847 +#: sha1-file.c:1802 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1871 +#: sha1-file.c:1826 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1877 +#: sha1-file.c:1832 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: sha1-file.c:1881 +#: sha1-file.c:1836 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1885 +#: sha1-file.c:1840 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1850 builtin/pack-objects.c:920 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1972 +#: sha1-file.c:1925 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:2011 +#: sha1-file.c:1965 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:2019 +#: sha1-file.c:1973 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:2119 +#: sha1-file.c:2072 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:2122 +#: sha1-file.c:2075 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2148 sha1-file.c:2157 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: sha1-file.c:2211 +#: sha1-file.c:2163 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2235 +#: sha1-file.c:2187 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2237 +#: sha1-file.c:2189 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2216 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2406 sha1-file.c:2458 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: sha1-file.c:2478 +#: sha1-file.c:2430 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2483 +#: sha1-file.c:2435 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: sha1-file.c:2489 +#: sha1-file.c:2441 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2500 +#: sha1-file.c:2452 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7787,110 +7061,44 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "loggen för \"%.*s\" har bara %d poster" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\"" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"sökvägen \"%s\" finns, men inte i \"%s\"\n" -"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "sökvägen \"%s\" finns inte i \"%.*s\"" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"sökvägen \"%s\" finns i indexet men inte i etapp %d\n" -"tips: Menade du \":%d:%s\"?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n" -"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "sökvägen \"%s\" finns på disk, men inte i indexet" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "relativ sökväg kan inte användas utanför arbetskatalogen" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "felaktigt objektnamn \"%.*s\"." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u,%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u,%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u,%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u,%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u,%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u,%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7898,18 +7106,13 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "kunde inte redigera \"%s\"" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7940,127 +7143,51 @@ msgstr "i ej utcheckad undermodul \"%s\"" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "felaktigt argument till --ignore-submodules: %s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " -"med samma namn. Hoppar över den." - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i " -"undermodulen \"%s\"" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "process för undermodulen \"%s\" misslyckades" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "Sänder undermodulen \"%s\"\n" - -#: submodule.c:1161 +#: submodule.c:1481 #, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "Kunde inte sända undermodulen \"%s\"\n" +msgid "Could not access submodule '%s'" +msgstr "kunde inte komma åt undermodulen \"%s\"" -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "Hämtar undermodulen %s%s\n" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "Kunde inte komma åt undermodulen \"%s\"\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Fel vid hämtning av undermodul:\n" -"%s" - -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\"" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\"" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "kunde inte rekursera in i undermodulen \"%s\"" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "kunde inte återställa indexet i undermodul" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8068,17 +7195,12 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8089,35 +7211,40 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "kunde inte rekursera in i undermodulen \"%s\"" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignorerar misstänkt undermodulnamn: %s" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" @@ -8133,7 +7260,7 @@ msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "mer än en %s" @@ -8152,7 +7279,7 @@ msgstr "kunde inte läsa indatafilen \"%s\"" msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" @@ -8181,47 +7308,47 @@ msgstr "kunde inte byta namn på temporär fil till %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "kunde inte läsa paketet (bundlen) \"%s\"" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: \"%s\"" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "se protocol.version i \"git help config\" för mer information" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8230,7 +7357,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8257,32 +7384,32 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "komplett skrivning till fjärrhjälpare misslyckades" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "kan inte hitta fjärrhjälpare för \"%s\"" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "kunde inte duplicera utdata-filhandtag" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8291,106 +7418,101 @@ msgstr "" "okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en " "nyare version av Git" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "" "fjärrhjälparen behöver implementera förmåga för referensspecifikationer " "(refspec)" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s sade oväntat: \"%s\"" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s låste också %s" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "kunde inte köra fast-import" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "okänt svar på ansluntning: %s" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "hjälparen %s stöder inte --atomic" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8399,67 +7521,67 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren såsom \"master\".\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "kan inte starta tråd för kopiering av data: %s" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "trädobjekt för kort" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "felformat läge i trädpost" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8468,7 +7590,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8477,7 +7599,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8487,7 +7609,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8497,7 +7619,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8506,7 +7628,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8515,7 +7637,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8525,7 +7647,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8534,7 +7656,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8543,7 +7665,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8553,7 +7675,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8563,7 +7685,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8572,7 +7694,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8581,7 +7703,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8592,7 +7714,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8603,7 +7725,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8613,7 +7735,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8623,7 +7745,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8632,7 +7754,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8641,12 +7763,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8655,7 +7777,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8666,7 +7788,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8677,7 +7799,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8686,16 +7808,16 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "Uppdaterar filer" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8705,10 +7827,6 @@ msgstr "" "sökvägar på ett okänsligt filsystem) och endast en från samma\n" "kollisionsgrupp finns i arbetskatalogen:\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "Uppdaterar indexflaggor" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix" @@ -8738,51 +7856,47 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: walker.c:170 -msgid "Fetching objects" -msgstr "Hämtar objekt" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" @@ -8828,12 +7942,12 @@ msgstr "Ändringar ej i incheckningskön:" #: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -" (använd \"git add <fil>...\" för att uppdatera vad som ska checkas in)" +" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)" #: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -" (använd \"git add/rm <fil>...\" för att uppdatera vad som ska checkas in)" +" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)" #: wt-status.c:241 msgid "" @@ -8851,7 +7965,7 @@ msgstr "" #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -" (använd \"git %s <fil>...\" för att ta med i det som ska checkas in)" +" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)" #: wt-status.c:268 msgid "both deleted:" @@ -9118,91 +8232,83 @@ msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9214,32 +8320,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9248,195 +8354,186 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "olika" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "efter " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "misslyckades ta bort länken \"%s\"" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "bakända för \"git stash -p\"" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9467,174 +8564,150 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Använd -f om du verkligen vill lägga till dem.\n" -"Slå av detta meddelande med\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file är inkompatibelt med --edit" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul kräver --pathspec-from-file" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"Tänkte du kanske säga \"git add .\"?\n" -"Slå av detta meddelande genom att köra\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "kan inte skriva indexfil" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats." -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "saknad \"author\"-rad i incheckningen %s" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "kunde inte tolka incheckningen %s" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9642,25 +8715,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -9668,41 +8741,36 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "kan inte skriva indexfil" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -"Använd \"git am --show-current-patch=diff\" för att se patchen som " -"misslyckades" +"Använd \"git am --show-current-patch\" för att se patchen som misslyckades" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9712,7 +8780,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9724,17 +8792,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9742,153 +8810,143 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Felaktigt värde för --show-current-patch: %s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:307 builtin/stash.c:806 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39 msgid "format" msgstr "format" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "avbryt patchningen men behåll HEAD där det är." -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "visa patchen som tillämpas" +#: builtin/am.c:2244 +msgid "show the patch being applied." +msgstr "visa patchen som tillämpas." -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9896,16 +8954,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -9914,11 +8972,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -10042,7 +9100,7 @@ msgstr "Vi utför ingen bisect för tillfället.\n" msgid "'%s' is not a valid commit" msgstr "\"%s\" är inte en giltig incheckning" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10050,27 +9108,27 @@ msgstr "" "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset " "<incheckning>\"." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Felaktigt argument till bisect_write: %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "kan inte läsa oid för referensen \"%s\"" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "kunde inte öppna filen \"%s\"" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s." -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10079,7 +9137,7 @@ msgstr "" "Du måste ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10090,7 +9148,7 @@ msgstr "" "Du måste sedan ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "utför bisect med endast en %s incheckning" @@ -10099,15 +9157,15 @@ msgstr "utför bisect med endast en %s incheckning" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10116,7 +9174,7 @@ msgstr "" "Aktuella termer är %s för det gamla tillståndet\n" "och %s för det nya tillståndet.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10125,264 +9183,267 @@ msgstr "" "ogiltigt argument %s för \"git bisect terms\".\n" "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "okänd flagga: %s" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "\"%s\" verkar inte vara en giltig revision" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behöver ett HEAD" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "" -"misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." +msgstr "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." # cogito-relaterat -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "utför 'git bisect next'" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "skriv termerna i .git/BISECT_TERMS" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "städar upp bisect-tillstånd" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "kontrollera för förväntade versioner" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "återställ bisect-tillstånd" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "skriver bisect-tillståndet i BISECT_LOG" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "visa och ange termer för bisect-tillstånd" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms kräver två argument" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state tar inga argument" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write kräver antingen 4 eller 5 argument" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms kräver tre argument" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "förväntade en färg: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1646 msgid "rev" msgstr "rev" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" msgstr "ignorera <rev> vid klandren" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "ignorera revisioner från <fil>" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Använd en experimentell algoritm för att förbättra diffar" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "poäng" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -10394,18 +9455,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "filen %s har bara %lu rad" msgstr[1] "filen %s har bara %lu rader" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Klandra rader" @@ -10615,7 +9676,7 @@ msgstr "ställ in spårningsläge (se git-pull(1))" msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "uppströms" @@ -10624,8 +9685,8 @@ msgid "change the upstream info" msgstr "ändra uppströmsinformationen" #: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "ta bort uppströmsinformationen" +msgid "Unset the upstream info" +msgstr "Ta bort uppströmsinformationen" #: builtin/branch.c:628 msgid "use colored output" @@ -10722,11 +9783,11 @@ msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 -#: builtin/verify-tag.c:38 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" @@ -10815,65 +9876,20 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to istället." -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<flaggor>] <fil>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <fil> [<refnamn>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <fil> [<refnamn>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "visa inte förloppsindikator" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "visa förloppsindikator" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "visa förloppsindikator under objektskrivningsfasen" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "som --all-progress när förloppsindikatorn visas" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "visa inte paketdetaljer" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s är okej\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "var pratsam; måste skrivas före ett underkommando" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Okänt underkommando: %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10881,7 +9897,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10889,72 +9905,72 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "endast en buntflagga kan anges" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "ordna inte --batch-all-objects output" @@ -10982,8 +9998,8 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -10995,27 +10011,27 @@ msgstr "visa indatasökvägar som inte träffas" msgid "ignore index when checking" msgstr "ignorera index vid kontroll" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "kan inte ange sökvägsnamn med --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z kan endast användas tillsammans med --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "ingen sökväg angavs" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "kan inte använda både --quiet och --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching är endast giltig med --verbose" @@ -11073,9 +10089,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "sträng" @@ -11103,98 +10119,98 @@ msgstr "git switch [<flaggor>] [<gren>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11203,50 +10219,55 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "köade ändringar i följande filer kan gå förlorade: %s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11269,7 +10290,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11296,19 +10317,28 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "endast en referens förväntades" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "endast en referens förväntades, %d gavs." + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11317,71 +10347,37 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n" -"göra det genom att ange hela namnet med flaggan --track:\n" -"\n" -" git checkout --track origin/<namn>\n" -"\n" -"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n" -"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" -"checkout.defaultRemote=origin i din konfiguration." - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "endast en referens förväntades" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "endast en referens förväntades, %d gavs." - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11389,7 +10385,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11397,7 +10393,7 @@ msgstr "" "kan inte växla gren mitt i en \"am\"-körning\n" "Överväg \"git am --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11405,7 +10401,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11413,7 +10409,7 @@ msgstr "" "kan inte växla gren i en \"cherry-pick\"\n" "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11421,144 +10417,138 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318 msgid "style" msgstr "stil" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "grennamn saknas; försök med -b" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "du måste ange katalog(er) att återställa" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "" -"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" +msgstr "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file är inkompatibelt med --detach" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file är inkompatibelt med --patch" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11566,69 +10556,94 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "du måste ange katalog(er) att återställa" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"\"%s\" motsvarar mer än en spårad fjärrgren.\n" +"Vi hittade %d fjärrar med en motsvarande referens. Så vi förösökte\n" +"istället tolka argumentet som en sökväg, men misslyckades också där!\n" +"\n" +"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n" +"göra det genom att ange hela namnet med flaggan --track:\n" +"\n" +" git checkout --track origin/<namn>\n" +"\n" +"Om du alltid vill att utcheckningar med tvetydiga <namn> skall\n" +"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" +"checkout.defaultRemote=origin i din konfiguration." -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1813 -msgid "which tree-ish to checkout from" -msgstr "vilken träd-igt att checka ut från" +#: builtin/checkout.c:1772 +msgid "where the checkout from" +msgstr "källa till utcheckning" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -11669,7 +10684,7 @@ msgstr "misslyckades ta bort %s" msgid "could not lstat %s\n" msgstr "kunde inte ta status (\"lstat\") på %s\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11682,7 +10697,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11703,33 +10718,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Hej då.\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11747,56 +10767,64 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** Kommandon ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "Vad nu" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "tvinga" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11804,7 +10832,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11812,7 +10840,7 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" @@ -11860,18 +10888,18 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3308 builtin/repack.c:330 msgid "name" msgstr "namn" @@ -11887,8 +10915,8 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "djup" @@ -11896,7 +10924,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297 msgid "time" msgstr "tid" @@ -11904,17 +10932,16 @@ msgstr "tid" msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" @@ -11942,25 +10969,25 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -11968,11 +10995,7 @@ msgstr "använd endast IPv6-adresser" msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11980,42 +11003,47 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n" +msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12025,137 +11053,133 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka med \"git restore -source=HEAD :/\"\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "misslyckades initiera sparse-checkout" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1653 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -12204,7 +11228,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -12232,13 +11256,13 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "meddelande" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "incheckningsmeddelande" @@ -12246,8 +11270,8 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -12321,65 +11345,57 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file med -a ger ingen mening" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "Du måste ange sökvägar tillsammans med --include/--only." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "kunde inte skapa temporär indexfil" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "kan inte uppdatera temporärt index" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Misslyckades uppdatera huvud-cacheträdet" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "kan inte utföra en delvis incheckning under en sammanslagning." -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "kan inte utföra en delvis incheckning under en cherry-pick." -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "incheckningen \"%s\" saknar författarhuvud" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "incheckningen \"%s\" har felformaterat författarhuvud" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12387,38 +11403,38 @@ msgstr "" "kunde inte välja ett kommentarstecken som inte använts\n" "i det befintliga incheckningsmeddelandet" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12433,7 +11449,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12448,7 +11464,7 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12458,7 +11474,7 @@ msgstr "" "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " "incheckningen.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12469,140 +11485,144 @@ msgstr "" "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sFörfattare: %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sIncheckare: %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ogiltigt ignorerat läge \"%s\"" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "Kan inte använda både --reset-author och --author" -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Endast en av -c/-C/-F/--fixup kan användas." -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author kan endast användas med -C, -c eller --amend." -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Endast en av --include/--only/--all/--interactive/--patch kan användas." -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "Du måste ange sökvägar tillsammans med --include/--only." + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "sökvägarna \"%s ...\" med -a ger ingen mening" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "visa information om stash" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "beräkna fullständiga före-/efter-värden" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "version" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "läge" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12610,11 +11630,11 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "när" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12622,172 +11642,172 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "detektera inte namnändringar" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "detektera namnändringar, möjligen sätt likhetsindex" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "författare" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "datum" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12798,74 +11818,76 @@ msgstr "" "att kvoten inte har överskridits, och kör sedan\n" "\"git restore --staged :/\" för att återställa." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <objkat>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <objkat>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <objkat>] [--shallow]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" "git commit-graph write [--object-dir <objkat>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <delnings-flaggor>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "kunde inte hitta objektkatalog för %s" +"reachable|--stdin-packs|--stdin-commits] <delnings-flaggor>" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1601 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" -msgstr "Objektkatalogen där grafen ska lagras" +msgstr "Objektkatalogen där grafen skall lagras" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "tillåt skriva en inkrementell incheckningsgraffil" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "maximalt antal incheckningar i en delad incheckingsgraf som inte är bad" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" @@ -12873,211 +11895,205 @@ msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" msgid "git config [<options>]" msgstr "git config [<flaggor>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "okänt argument för --type, %s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "endast en typ åt gången" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "Konfigurationsfilens plats" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "använd global konfigurationsfil" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "använd systemets konfigurationsfil" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "använd arkivets konfigurationsfil" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "använd arbetskatalogens konfigurationsfil" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "använd angiven konfigurationsfil" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "läs konfiguration från givet blob-objekt" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "Åtgärd" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "hämta värde: namn [värde-reguttr]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "hämta alla värden: nyckel [värde-reguttr]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "hämta värde specifikt URL:en: sektion[.var] URL" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "lägg till en ny variabel: namn värde" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "ta bort en variabel: namn [värde-reguttr]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "ta bort alla träffar: namn [värde-reguttr]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "byt namn på sektion: gammalt-namn nytt-namn" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "ta bort en sektion: namn" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "visa alla" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "öppna textredigeringsprogram" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "hitta den inställda färgen: slot [default]" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "hitta färginställningen: slot [stdout-is-tty]" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "Typ" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "värdet har givits denna typ" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "värdet är \"true\" eller \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "värdet är ett decimalt tal" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "värdet är --bool eller --int" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "värdet är en sökväg (fil- eller katalognamn)" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "värdet är ett utgångsdatum" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "Andra" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "terminera värden med NUL-byte" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "visa endast variabelnamn" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "respektera inkluderingsdirektiv vid uppslag" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"visa omfång för konfiguration (arbetskatalog, lokalt, globalt, system, " -"kommando)" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "värde" -#: builtin/config.c:160 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "med --get, använd standardvärde vid saknad post" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "fel antal argument, skulle vara %d" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "fel antal argument, skulle vara från %d till %d" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "felaktigt nyckelmönster: %s" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "misslyckades formatera standardkonfigurationsvärde: %s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "kan inte tolka färgen \"%s\"" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "kan inte tolka standardfärgvärde" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "inte i en git-katalog" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "skriva till standard in stöds inte" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "skriva konfigurations-blobbar stöds inte" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13092,23 +12108,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "endast en konfigurationsfil åt gången" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local kan bara användas inuti ett git-arkiv" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob kan bara användas inuti ett git-arkiv" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "$HOME inte satt" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13118,52 +12134,52 @@ msgstr "" "konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n" "\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "--get-color och variabeltyp stämmer inte överens" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "endast en åtgärd åt gången" -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only gäller bara för --list eller --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:712 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" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default gäller bara för --get" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "kan inte konfigurationsfil \"%s\"" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "fel vid hantering av konfigurationsfil(er)" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "redigering av standard in stöds ej" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "redigering av blobbar stöds ej" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "kan inte skapa konfigurationsfilen \"%s\"" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13172,7 +12188,7 @@ msgstr "" "kan inte skriva över flera värden med ett ensamt värde\n" " Använd en regexp, --add eller --replace-all för att ändra %s." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "ingen sådan sektion: %s" @@ -13185,58 +12201,58 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "huvud" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "lättviktig" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13245,7 +12261,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13254,12 +12270,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13268,90 +12284,90 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "beskriva %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s är varken incheckning eller blob" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "märke" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -13389,27 +12405,27 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13417,53 +12433,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\"" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13471,31 +12487,31 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "sändes till \"diff\"" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff är inkompatibelt med --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -13535,180 +12551,156 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges." - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Dumpa märken till filen" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "Importera märken från filen, om den finns" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1649 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" -msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar" +msgstr "Visa ursprungliga objekt-ID för blobbar/incheckningar" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "Märk taggar med märke-id" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "Kan inte ange både --import-marks och --import-marks-if-exists" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel kan inte vara negativt" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "ställ in uppström för git pull/fetch" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13716,133 +12708,105 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "rapportera att vi bara har objekt nåbara från detta objektet" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "kör \"gc --auto\" efter hämtning" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "skriv incheckingsgrafen efter hämtning" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:877 -msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." -msgstr "" -"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har " -"slagits\n" -"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" -"\"git config fetch.showForcedUpdates true\"." - -#: builtin/fetch.c:881 -#, c-format -msgid "" -"It took %.2f seconds to check forced updates. You can use\n" -"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " -"false'\n" -" to avoid this check.\n" -msgstr "" -"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n" -"\"--no-show-forced-updates\" eller köra \"git config fetch." -"showForcedUpdates\n" -"false\" för att undvika testet.\n" - -#: builtin/fetch.c:920 +#: builtin/fetch.c:879 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:900 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:991 builtin/fetch.c:1124 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1002 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13851,124 +12815,134 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1008 +msgid "" +"Fetch normally indicates which branches had a forced update, but that check " +"has been disabled." +msgstr "" +"Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men " +"det testet har slagits av." + +#: builtin/fetch.c:1009 +msgid "" +"To re-enable, use '--show-forced-updates' flag or run 'git config fetch." +"showForcedUpdates true'." +msgstr "" +"För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör " +"\"git config fetch.showForcedUpdates true\"." + +#: builtin/fetch.c:1011 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use '--no-show-forced-" +"updates'\n" +msgstr "" +"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan använda " +"\"--no-show-forced-updates\"\n" + +#: builtin/fetch.c:1013 +msgid "" +"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" +msgstr "" +"eller kör \"git config fetch.showForcedUpdates false\" för undvika testet.\n" + +#: builtin/fetch.c:1094 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1095 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1127 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1128 builtin/remote.c:1036 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1151 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1170 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1173 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "ställer inte in uppström för en fjärrtag" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "okänd grentyp" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"hittade ingen källgren.\n" -"du måste ange exakt en gren med flaggan --set-upstream." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1477 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1479 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" +#: builtin/fetch.c:1525 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" +"--filter kan endast användas med fjärren konfigurerad i extensions." +"partialClone" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1549 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" -"fjärrarkiv som nya incheckningar ska hämtas från." +"fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1586 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1637 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1639 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1644 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1646 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1662 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1664 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1673 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1680 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1696 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13982,23 +12956,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "fil att läsa från" @@ -14063,32 +13037,32 @@ msgstr "visa endast referenser som innehåller incheckningen" msgid "print only refs which don't contain the commit" msgstr "visa endast referenser som inte innehåller incheckningen" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "okänd" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "fel i %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "varning i %s %s: %s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "trasig länk från %7s %s" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "fel objekttyp i länk" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -14097,220 +13071,220 @@ msgstr "" "trasig länk från %7s %s\n" " till %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "onåbart %s %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "hängande %s %s" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Kontrollerar %s" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "trasiga länkar" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar på något konstigt (%s)" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frånkopplat HEAD pekar på ingenting" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar på en ofödd gren (%s)" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Kontrollerar cacheträd" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cacheträd" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" -msgstr "ta även hänsyn till paket och supplerande objekt" +msgstr "ta även hänsyn till paket och alternativa objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" @@ -14324,17 +13298,17 @@ msgstr "Misslyckades ta status (fstat) på %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14349,52 +13323,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "kunde inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14402,14 +13376,14 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" @@ -14427,258 +13401,258 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2722 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "--untracked stöds inte med --recurse-submodules" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3405 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "flaggan stöds inte med --recurse-submodules" + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -14863,11 +13837,11 @@ msgstr "indataläsfel" msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" @@ -14923,191 +13897,191 @@ msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas" msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:153 +#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "kan inte läsa information om befintligt objekt %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "fsck-fel i packat objekt" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "kan inte ta skriva %s-fil \"%s\"" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -15200,7 +14174,7 @@ msgstr "behörigheter" #: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" -msgstr "ange att git-arkivet ska delas bland flera användare" +msgstr "ange att git-arkivet skall delas bland flera användare" #: builtin/init-db.c:529 builtin/init-db.c:534 #, c-format @@ -15244,7 +14218,7 @@ msgstr "ta bort tomma släprader" #: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" -msgstr "var nya släprader ska placeras" +msgstr "var nya släprader skall placeras" #: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" @@ -15290,126 +14264,141 @@ msgstr "--trailer med --only-input ger ingen mening" msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:174 +#: builtin/log.c:160 +msgid "" +"log.mailmap is not set; its implicit value will change in an\n" +"upcoming release. To squelch this message and preserve current\n" +"behaviour, set the log.mailmap configuration value to false.\n" +"\n" +"To squelch this message and adopt the new behaviour now, set the\n" +"log.mailmap configuration value to true.\n" +"\n" +"See 'git help config' and search for 'log.mailmap' for further information." +msgstr "" +"log.mailmap har inte satts: förvalet kommer ändras i en kommande\n" +"version. För att dölja det här meddelandet och behålla nuvarande\n" +"beteende, sätt konfigurationsvariabeln log.mailmap till false.\n" +"\n" +"För att dölja det här meddelandet och använda det nya beteendet,\n" +"sätt konfigurationsvariabeln log.mailmap till true.\n" +"\n" +"Se \"git help config\" och sök efter \"log.mailmap\" för mer information." + +#: builtin/log.c:183 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:175 +#: builtin/log.c:184 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:177 +#: builtin/log.c:186 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:179 +#: builtin/log.c:188 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:180 +#: builtin/log.c:189 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:183 +#: builtin/log.c:192 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:281 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:551 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:566 builtin/log.c:660 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:670 +#: builtin/log.c:685 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s: ogiltigt omslag från beskrivningsläge" - -#: builtin/log.c:821 +#: builtin/log.c:808 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:936 +#: builtin/log.c:925 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:952 +#: builtin/log.c:941 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:969 +#: builtin/log.c:958 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:979 +#: builtin/log.c:968 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1143 +#: builtin/log.c:1091 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1149 +#: builtin/log.c:1097 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1228 +#: builtin/log.c:1176 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1255 +#: builtin/log.c:1203 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1313 +#: builtin/log.c:1261 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1439 +#: builtin/log.c:1387 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1443 +#: builtin/log.c:1391 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15419,275 +14408,267 @@ msgstr "" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1463 +#: builtin/log.c:1411 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1474 +#: builtin/log.c:1422 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1478 +#: builtin/log.c:1426 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1531 +#: builtin/log.c:1479 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1583 +#: builtin/log.c:1531 msgid "failed to infer range-diff ranges" msgstr "misslyckades räkna ut intervall range-diff" -#: builtin/log.c:1629 +#: builtin/log.c:1576 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1632 +#: builtin/log.c:1579 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1636 +#: builtin/log.c:1583 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1638 +#: builtin/log.c:1585 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1640 +#: builtin/log.c:1587 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1641 +#: builtin/log.c:1588 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1642 +#: builtin/log.c:1589 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1644 +#: builtin/log.c:1591 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1646 +#: builtin/log.c:1593 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1648 +#: builtin/log.c:1595 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "cover-from-description-läge" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" - -#: builtin/log.c:1654 +#: builtin/log.c:1598 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1601 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1660 +#: builtin/log.c:1604 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1607 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1665 +#: builtin/log.c:1609 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1667 +#: builtin/log.c:1611 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1669 +#: builtin/log.c:1613 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1671 +#: builtin/log.c:1615 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1672 +#: builtin/log.c:1616 msgid "header" msgstr "huvud" -#: builtin/log.c:1673 +#: builtin/log.c:1617 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1618 builtin/log.c:1620 msgid "email" msgstr "epost" -#: builtin/log.c:1674 +#: builtin/log.c:1618 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1676 +#: builtin/log.c:1620 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1678 +#: builtin/log.c:1622 msgid "ident" msgstr "ident" -#: builtin/log.c:1679 +#: builtin/log.c:1623 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1681 +#: builtin/log.c:1625 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1682 +#: builtin/log.c:1626 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1627 builtin/log.c:1630 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1684 +#: builtin/log.c:1628 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1687 +#: builtin/log.c:1631 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1691 +#: builtin/log.c:1635 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1693 +#: builtin/log.c:1637 msgid "signature" msgstr "signatur" -#: builtin/log.c:1694 +#: builtin/log.c:1638 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1695 +#: builtin/log.c:1639 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1696 +#: builtin/log.c:1640 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1698 +#: builtin/log.c:1642 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1699 +#: builtin/log.c:1643 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1701 +#: builtin/log.c:1645 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1703 +#: builtin/log.c:1647 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1706 +#: builtin/log.c:1650 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1708 +#: builtin/log.c:1652 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1792 +#: builtin/log.c:1727 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1807 +#: builtin/log.c:1742 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1809 +#: builtin/log.c:1744 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1817 +#: builtin/log.c:1752 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1819 +#: builtin/log.c:1754 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1821 +#: builtin/log.c:1756 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1854 +#: builtin/log.c:1788 msgid "standard output, or directory, which one?" -msgstr "standard ut, eller katalog, vilken ska det vara?" +msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1958 +#: builtin/log.c:1877 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1962 +#: builtin/log.c:1881 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1963 +#: builtin/log.c:1882 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:1969 +#: builtin/log.c:1888 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1892 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:1981 +#: builtin/log.c:1900 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:1982 +#: builtin/log.c:1901 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:1993 +#: builtin/log.c:1912 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2029 +#: builtin/log.c:1948 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2073 +#: builtin/log.c:1992 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2132 +#: builtin/log.c:2051 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2105 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15811,7 +14792,7 @@ msgstr "" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "exec" @@ -15896,149 +14877,149 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "--abort men lämna index och arbetskatalog ensamma" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "förbigå pre-merge-commit- och commit-msg-krokar" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" +msgstr "bekräfta commit-msg-krok" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" @@ -16093,73 +15074,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16167,7 +15148,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16175,96 +15156,96 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16350,33 +15331,33 @@ msgstr "varna inte om konflikter" msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "okänd flagga %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "kunde inte tolka objektet \"%s\"" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "kan inte hantera mer än %d bas. Ignorerar %s." msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "kunde inte bestämma referensen \"%s\"" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" @@ -16399,17 +15380,17 @@ msgstr "tillåt skapa mer än ett träd" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [<flaggor>] (write|verify|expire|repack --batch-" -"size=<storlek>)" +"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --" +"batch-size=<storlek>)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -16417,15 +15398,15 @@ msgstr "" "vid ompackning, samla mindre paketfiler i en bunt som är större än denna " "storlekt" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "för många argument" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "flaggan --batch-size används bara i underkommandot \"repack\"" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "okänt underkommando: %s" @@ -16518,52 +15499,52 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -16962,7 +15943,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -16978,7 +15959,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -16995,102 +15976,125 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:424 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:435 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:566 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:777 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:790 +#, c-format +msgid "packfile is invalid: %s" +msgstr "packfil är ogiltig: %s" + +#: builtin/pack-objects.c:794 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "kan inte öppna packfil för återanvändning: %s" + +#: builtin/pack-objects.c:798 +msgid "unable to seek in reused packfile" +msgstr "kan inte söka i återanvänd packfil" + +#: builtin/pack-objects.c:809 +msgid "unable to read from reused packfile" +msgstr "kan inte läsa från återanvänd packfil" + +#: builtin/pack-objects.c:837 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:850 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:912 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:965 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1161 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1591 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1600 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1869 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:1999 +#, c-format +msgid "unable to get size of %s" +msgstr "kan inte hämta storlek på %s" + +#: builtin/pack-objects.c:2014 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 +#: builtin/pack-objects.c:2110 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2124 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2450 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2582 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2669 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2675 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2756 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17099,7 +16103,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17108,234 +16112,243 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2860 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2950 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3035 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3127 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3130 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3155 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3208 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3212 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3242 +msgid "do not show progress meter" +msgstr "visa inte förloppsindikator" + +#: builtin/pack-objects.c:3244 +msgid "show progress meter" +msgstr "visa förloppsindikator" + +#: builtin/pack-objects.c:3246 +msgid "show progress meter during object writing phase" +msgstr "visa förloppsindikator under objektskrivningsfasen" + +#: builtin/pack-objects.c:3249 +msgid "similar to --all-progress when progress meter is shown" +msgstr "som --all-progress när förloppsindikatorn visas" + +#: builtin/pack-objects.c:3250 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3251 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3254 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3256 msgid "ignore borrowed objects from alternate object store" -msgstr "ignorera lånade objekt från supplerande objektlager" +msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3258 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3260 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3262 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3264 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3266 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3268 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3270 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3272 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3274 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3276 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3278 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3281 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3284 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3287 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3290 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3292 msgid "include tag objects that refer to objects to be packed" -msgstr "inkludera taggobjekt som refererar objekt som ska packas" +msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3294 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3296 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3298 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3301 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3303 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3305 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3307 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3309 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3311 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3313 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3315 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3317 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3454 -msgid "write a bitmap index if possible" -msgstr "skriv bitkartindex om möjligt" - -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3320 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3323 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3325 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3350 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3355 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3409 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -"--max-pack-size kan inte användas för att bygga ett paket som ska överföras" +"--max-pack-size kan inte användas för att bygga ett paket som skall överföras" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3411 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3416 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3419 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3425 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3486 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3516 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" -"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>), " -"paket-återanvända %<PRIu32>" +"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>)" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17377,53 +16390,53 @@ msgstr "begränsa vandring av objekt utanför kontraktspackfiler." msgid "cannot prune in a precious-objects repo" msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17431,14 +16444,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17446,7 +16459,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17457,42 +16470,42 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17501,32 +16514,32 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17537,7 +16550,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17554,15 +16567,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -17570,15 +16583,15 @@ msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17587,7 +16600,7 @@ msgstr "" "För att välja ett av alternativen permanent, se push.default i \"git help " "config\"." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17612,7 +16625,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17627,7 +16640,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17640,12 +16653,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17654,16 +16667,16 @@ msgid "" msgstr "" "Du sänder till fjärren \"%s\", som inte är uppströms för den\n" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" -"ska sändas för att uppdatera fjärrgrenen." +"skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17675,7 +16688,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17687,7 +16700,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17701,11 +16714,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -17716,140 +16729,140 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "felaktigt arkiv \"%s\"" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Ingen destination har angivits.\n" +"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n" +"\n" +" git remote add <namn> <url>\n" +"\n" +"och sänd sedan med hjälp av fjärrnamnet\n" +"\n" +" git push <namn>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "arkiv" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "felaktigt arkiv \"%s\"" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Ingen destination har angivits.\n" -"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n" -"\n" -" git remote add <namn> <url>\n" -"\n" -"och sänd sedan med hjälp av fjärrnamnet\n" -"\n" -" git push <namn>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -17866,32 +16879,24 @@ msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "Procent som skapelse vägs med" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "använd enkla diff-färger" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "anteckningar" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "sänds till \"git log\"" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr ".. saknas i intervall: \"%s\"" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "ensamt argument måste vara symmetriskt intervall" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "behöver två incheckningsintervall" @@ -17973,17 +16978,13 @@ msgstr "felsök unpack-trees" msgid "suppress feedback messages" msgstr "undertryck återkopplingsmeddelanden" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Du måste lösa ditt befintliga index först" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] " -"[<uppström> [<gren>]]" +"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] [<uppström>] " +"[<gren>]" #: builtin/rebase.c:34 msgid "" @@ -17995,207 +16996,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "kunde inte skriva \"%s\"." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "inget HEAD?" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(FÖRÅLDRAD) behåll tomma incheckningar" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "behåll tomma incheckningar" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s kräver en interaktiv ombasering" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Kunde inte läsa \"%s\"" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "Kan inte spara %s" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18209,7 +17219,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18228,15 +17238,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18253,7 +17255,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18266,136 +17268,128 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "sänds till \"git am\"" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "använd appliceringstrategier för ombasering" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" -msgstr "använd sammanslagningsstrategier för ombasering" +msgstr "använd sammanslagningsstrategier för sammanslagning" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "låt användaren redigera listan över incheckningar att ombasera" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "hur incheckningar som blir tomma ska hanteras" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "behåll tomma incheckningar under ombasering" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "försök ombasera sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "använd \"merge-base --fork-point\" för att förfina uppström" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18403,37 +17397,29 @@ msgstr "" "stödet för rebase.useBuiltin har tagits bort!\n" "Se posten för det i \"git help config\" för detaljer." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges avråds från. Använd --rebase-merges istället." -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18441,16 +17427,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18471,166 +17457,176 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "kan inte kombinera apply-flaggor med merge-flaggor" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "Okänd rebase-bakända: %s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "" +"kan inte kombinera am-flaggor med varken interaktiv- eller " +"sammanslagningsflaggor" + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\"" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD är nu på %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "kunde inte tolka \"%s\"" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18660,7 +17656,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18711,49 +17707,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <referens>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "Markerar nåbara objekt..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "%s pekar ingenstans!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "ingen referenslogg att ta bort angavs" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "inte en referenslogg: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "ingen referenslogg för \"%s\"" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "felaktigt referensformat: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18761,82 +17757,82 @@ msgstr "" "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <namn> <url>" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <gammal> <ny>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <namn>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <namn>" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <namn>" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <namn> <gren>..." -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <namn>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <namn> <nyurl>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <namn> <url>" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<flaggor>] <namn> <url>" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <namn> <gren>..." -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <namn> <gren>..." -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<flaggor>] <namn>" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<flaggor>] <namn>" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..." -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Uppdaterar %s" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18844,98 +17840,82 @@ msgstr "" "--mirror är farlig och föråldrad; använd\n" "\t --mirror=fetch eller --mirror=push istället" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "okänt argument till mirror: %s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "hämta fjärrgrenarna" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "importera alla taggar och associerade objekt vid hämtning" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "eller hämta inte några taggar alls (--no-tags)" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "gren(ar) att spåra" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "huvudgren" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "ställ in arkiv som spegel att sända eller ta emot från" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "att ange en master-gren ger ingen mening med --mirror" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "fjärrarkivet %s finns redan." -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "Kunde inte skapa master \"%s\"" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Kunde inte hämta mappning för referensspecifikation %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(matchande)" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(ta bort)" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "kunde inte ställa in \"%s\"" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"Konfigurationen för %s för remote.pushDefault i:\n" -"\t%s:%d\n" -"anger nu den icke-existerande fjärren \"%s\"" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "Ingen sådan fjärr: \"%s\"" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\"" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18946,17 +17926,17 @@ msgstr "" "\t%s\n" "\tUppdatera konfigurationen manuellt om nödvändigt." -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "misslyckades ta bort \"%s\"" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "misslyckades skapa \"%s\"" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18970,118 +17950,118 @@ msgstr[1] "" "Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n" "för att ta bort dem, använd:" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "Kunde inte ta bort konfigurationssektionen \"%s\"" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " ny (nästa hämtning sparar i remotes/%s)" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " spårad" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " förlegad (använd \"git remote prune\" för att ta bort)" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "ombaseras interaktivt på fjärren %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "ombaseras på fjärren %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " sammanslås med fjärren %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "sammanslås med fjärren %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s och med fjärren %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "skapa" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "ta bort" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "àjour" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "kan snabbspolas" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "lokal föråldrad" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s tvingar till %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s sänder till %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s tvingar till %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s sänder till %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "fråga inte fjärrar" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* fjärr %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " Hämt-URL: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(ingen URL)" @@ -19089,184 +18069,193 @@ msgstr "(ingen URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " Sänd-URL: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " HEAD-gren: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(inte förfrågad)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(okänd)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Fjärrgren:%s" msgstr[1] " Fjärrgrenar:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (status inte förfrågad)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokal gren konfigurerad för \"git pull\":" msgstr[1] " Lokala grenar konfigurerade för \"git pull\":" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokala referenser speglas av \"git push\"" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:" msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "ta bort refs/remotes/<namn>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Kan inte bestämma HEAD på fjärren" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "Kunde inte ta bort %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "Inte en giltig referens: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "Kunde inte ställa in %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s kommer bli dinglande!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s har blivit dinglande!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Rensar %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [skulle rensa] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [rensad] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "rensa fjärrar efter hämtning" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "Ingen sådan fjärr \"%s\"" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "lägg till gren" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "ingen fjärr angavs" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "fråga sänd-URL:er istället för hämta-URL:er" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "returnera alla URL:er" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "ingen URL:er angivna för fjärren \"%s\"" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "manipulera URL:ar för sändning" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "lägg till URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "ta bort URL:ar" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete ger ingen mening" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Felaktig gammalt URL-mönster: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "Ingen sådan URL hittades: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "var pratsam; måste skrivas före ett underkommando" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okänt underkommando: %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19275,112 +18264,112 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:191 +#: builtin/repack.c:201 msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:240 builtin/repack.c:418 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -"repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects." +"repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects." -#: builtin/repack.c:254 +#: builtin/repack.c:257 msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:292 +#: builtin/repack.c:295 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:294 +#: builtin/repack.c:297 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:297 +#: builtin/repack.c:300 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:302 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:304 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:306 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:309 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:311 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:310 +#: builtin/repack.c:313 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:314 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:312 +#: builtin/repack.c:315 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:314 +#: builtin/repack.c:317 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:316 +#: builtin/repack.c:319 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:320 builtin/repack.c:326 msgid "bytes" msgstr "byte" -#: builtin/repack.c:318 +#: builtin/repack.c:321 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:320 +#: builtin/repack.c:323 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:322 +#: builtin/repack.c:325 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:324 +#: builtin/repack.c:327 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:326 +#: builtin/repack.c:329 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:328 +#: builtin/repack.c:331 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:338 +#: builtin/repack.c:341 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:342 +#: builtin/repack.c:345 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:425 +#: builtin/repack.c:427 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:486 +#: builtin/repack.c:488 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19399,7 +18388,7 @@ msgstr "" "VARNING: namnet misslyckades också.\n" "VARNING: Byt namn på dem i %s manuellt:\n" -#: builtin/repack.c:534 +#: builtin/repack.c:536 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -19507,8 +18496,8 @@ msgstr "kan inte utföra \"fstat\" på %s" msgid "unable to write object to database" msgstr "kan inte skriva objektet till databasen" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "objektnamnet är inte giltigt: \"%s\"" @@ -19527,22 +18516,22 @@ msgstr "misslyckades redigera objektfilen" msgid "new object is the same as the old one: '%s'" msgstr "nytt objekt är samma som det gamla: \"%s\"" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "kunde inte tolka %s som incheckning" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19551,31 +18540,31 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "ympning för \"%s\" behövs inte" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "ny incheckning är samma som den gamla: \"%s\"" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19584,71 +18573,71 @@ msgstr "" "kunde inte konvertera följande ympning(ar):\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "konvertera befintlig ympningsfil" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "använd detta format" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format kan inte användas utanför listning" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f kan endast användas vid skrivning av ersättning" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw kan bara användas med --edit" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d behöver minst ett argument" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "fel antal argument" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e tar exakt ett argument" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g tar minst ett argument" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file tar inga argument" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "endast ett mönster kan anges med -l" @@ -19676,125 +18665,114 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..." #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "blandad" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "mjuk" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "hård" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "sammanslagning" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "behåll" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta trädet för HEAD." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta trädet för %s." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD är nu på %s" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "registrera endast att borttagna sökvägar kommer läggas till senare" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Kunde inte slå upp \"%s\" som en giltig revision." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N kan endast användas med --mixed" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -19808,30 +18786,35 @@ msgstr "" "konfigurationsvariabeln\n" "reset.quiet till true för att göra detta till förval.\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "ogiltigt värde för sparse: \"%s\"" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "markerad räkning är inkompatibelt med --objects" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -19994,41 +18977,37 @@ msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" @@ -20277,83 +19256,15 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)" msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <flaggor>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "misslyckades ändra inställningen extensions.worktreeConfig" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "initiera sparse-checkout i konläge" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "initiera sparse-checkout" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "misslyckades öppna \"%s\"" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "kunde inte normalisera sökvägen \"%s\"" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "kan inte ta bort citering av C-sträng \"%s\"" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "kunde inte läsa in existerande mönster för gles utcheckning" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "läs mönster från standard in" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "ställ in filter för gles utcheckning" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "inaktivera gles utcheckning" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "fel vid uppdatering av arbetskatalog" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<flaggor>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<flaggor>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -20361,27 +19272,25 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <grennamn> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" -" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n" " [--] [<sökväg>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20389,196 +19298,186 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<meddelande>]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n" -" [--] [<sökväg>...]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "\"%s\" är inte en \"stash\"-liknande incheckning" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "För många revisioner angivna:%s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "Inga \"stash\"-poster hittades." -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "%s är inte en giltigt referens" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "kunde inte skapa diff %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "konflikter i indexet. Testa utan --index." -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "kunde inte spara indexträd" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "kunde inte återställa ospårade filer från stash-post" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "Slår ihop %s med %s" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "kunde inte köra %s" @@ -20599,40 +19498,40 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote tar inga argument" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "Går in i \"%s\"\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -20641,7 +19540,7 @@ msgstr "" "run_command returnerade icke-nollstatus för %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20652,19 +19551,19 @@ msgstr "" "undermoduler för %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -20673,54 +19572,54 @@ msgstr "" "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget " "officiella uppström." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<flaggor>] [<sökväg>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\"" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Hindra statusutskrift för undermodul" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20728,47 +19627,47 @@ msgstr "" "Visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "rekursera in i nästlade undermoduler" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synkroniserar undermodul-url för \"%s\"\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Dölj utdata från synkroniering av undermodul-url" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20777,7 +19676,7 @@ msgstr "" "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf" "\" om du verkligen vill ta bort den och all dess historik)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20786,203 +19685,175 @@ msgstr "" "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort " "dem" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Rensade katalogen \"%s\"\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "kunde inte skapa tom undermodulskatalog %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Avregistrera alla undermoduler" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"En suppleant beräknad från överprojektets suppleant är ogiltig.\n" -"För att i så fall låta Git klona utan ett suppleant, sätt\n" -"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n" -"med \"--reference-if-able\" istället för \"--reference\"." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" -msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s" +msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" -msgstr "var den nya undermodulen ska klonas till" +msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "förhindra kloning till icke-tom katalog" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " -"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --" -"path <sökväg>" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog" +"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "katalogen inte tom: \"%s\"" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" -msgstr "om den första klonen ska följa rekommendation för grund kloning" +msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20991,50 +19862,50 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\"" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "rekursera ner i undermoduler" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "se om det är säkert att skriva till .gitmodules-filen" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "ta bort konfigurationen från .gitmodules-filen" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <namn> [<värde>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <namn>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -21289,207 +20160,203 @@ msgstr "taggen \"%s\" finns redan" msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Packar upp objekt" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "misslyckades skapa katalogen %s" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "misslyckades skapa filen %s" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "misslyckades ta bort filen %s" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "misslyckades ta bort katalogen %s" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Testar mtime i \"%s\" " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "" "stat-informationen för en katalog ändras inte när nya kataloger läggs till" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "stat-informationen för en katalog ändras när filer uppdateras" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "stat-informationen för en katalog ändras när filer läggs till i en " "underkatalog" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "stat-informationen för en katalog ändras inte när en fil tas bort" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "rör inte \"endast index\"-poster" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "skriv ut indexet även om det inte angivits som ändrat" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21497,7 +20364,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21505,7 +20372,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21513,11 +20380,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -21525,26 +20392,26 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -21604,15 +20471,15 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -#: builtin/verify-commit.c:19 +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:68 +#: builtin/verify-commit.c:69 msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 +#: builtin/verify-commit.c:70 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -21628,63 +20495,63 @@ msgstr "pratsam" msgid "show statistics only" msgstr "visa endast statistik" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sökväg>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sökväg>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<flaggor>] <arbetskatalog>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -21693,35 +20560,35 @@ msgstr "" "Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " "%<PRIuMAX>)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21731,7 +20598,7 @@ msgstr "" "använd \"add -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller " "\"remove\" för att rensa" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21741,121 +20608,121 @@ msgstr "" "använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för " "att rensa" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök matcha namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track kan endast användas när ny gran skapas" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "målet \"%s\" finns redan" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21864,7 +20731,7 @@ msgstr "" "kan inte flytta en låst arbetskatalog, orsak till lås: %s\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21872,38 +20739,36 @@ msgstr "" "kan inte flytta en låst arbetskatalog;\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "" -"\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta " -"bort det" +msgid "'%s' is dirty, use --force to delete it" +msgstr "\"%s\" är smutsigt, använd --force för att ta bort det" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "misslyckades köra \"git status\" på \"%s\", kod %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21912,7 +20777,7 @@ msgstr "" "kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21920,7 +20785,7 @@ msgstr "" "kan inte ta bort en låst arbetskatalog;\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" @@ -21941,21 +20806,6 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Förväntade \"mark\"-kommando, fick %s" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "Förväntade \"to\"-kommando, fick %s" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22068,39 +20918,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:793 +#: git.c:796 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:843 +#: git.c:846 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:856 +#: git.c:859 #, c-format msgid "" "usage: %s\n" @@ -22109,13 +20959,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:876 +#: git.c:879 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n" -#: git.c:888 +#: git.c:891 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -22141,22 +20991,22 @@ msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor" -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22167,155 +21017,146 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "felaktig citering på värde för push-option: \"%s\"" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "ogiltigt svar från servern; fick \"%s\"" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "arkivet \"%s\" hittades inte" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "Autentisering misslyckades \"%s\"" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "borde inte ha EOF när inte försiktig på EOF" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "kan inte hantera så stora sändningar" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "kan inte packa upp anrop; zlib-slutfel %d" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "dum http-transport stöder inte grunda arkiv" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "mottagning misslyckades." -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "kan inte hämta med sha1 över smart http" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "http-transporten stöder inte %s" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "git-http-push misslyckades" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: fel vid läsning av kommandoström från git" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: försökte ta emot utan lokalt arkiv" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando \"%s\" från git" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" -msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande" - -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "läs sökvägsangivelse från fil" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" +msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" #: ref-filter.h:101 msgid "key" @@ -22329,11 +21170,11 @@ msgstr "fältnamn att sortera på" msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" -#: wt-status.h:67 +#: wt-status.h:68 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.h:68 +#: wt-status.h:69 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " @@ -22544,7 +21385,7 @@ msgstr "Städa onödiga filer och optimera det lokala arkivet" #: command-list.h:101 msgid "Extract commit ID from an archive created using git-archive" -msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive" +msgstr "Hämta inchecknings-ID från ett arkiv skapat med git-archive" #: command-list.h:102 msgid "Print lines matching a pattern" @@ -22556,7 +21397,7 @@ msgstr "Ett portabelt grafiskt gränssnitt för Git" #: command-list.h:104 msgid "Compute object ID and optionally creates a blob from a file" -msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil" +msgstr "Beräkna objekt-ID och möjligen skapa en blob från en fil" #: command-list.h:105 msgid "Display help information about Git" @@ -22825,170 +21666,162 @@ msgid "Common Git shell script setup code" msgstr "Gemensam skriptstartkod för Git" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Initiera och modifiera sparse-checkout" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Spara undan ändringar i en lortig arbetskatalog" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Lägg filinnehållet till indexet" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Visa status för arbetskatalogen" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Ta bort onödiga blanksteg" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Initiera, uppdatera eller inspektera undermoduler" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Byt gren" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Läs, modifiera eller ta bort symbolisk referens" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Skapar temporära filer med innehållet från en blob" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Packa upp objekt från ett pakat arkiv" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Registrera filinnehållet från arbetskatalogen i indexet" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Sänd arkivet tillbaka till git-archive" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Sänd packade objekt tillbaka till git-fetch-pack" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Visa en logisk Git-variabel" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Kontrollera GPG-signaturer för incheckningar" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Bekräfta packade Git-arkivfiler" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Kontrollera GPG-signaturer i taggar" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Visa loggar med differenser varje incheckning introducerar" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Hantera ytterligare arbetskataloger" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Skapa ett trädobjekt från aktuellt index" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Definierar attribut per sökväg" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Gits kommandoradsgränssnitt och -konventioner" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Grundläggande Git-handledning för utvecklare" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git för CVS-användare" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Justrea diff-utdata" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "En Git-ordlista" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Krokar som används av Git" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Monterar ett arkiv inuti ett annat" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" @@ -23115,128 +21948,139 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kan inte uppdatera $ref_stash med $w_commit" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "fel: okänd flagga för \"stash push\": $option" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Sparade arbetskatalogen och indexstatus $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "okänd flagga: $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "För många revisioner angivna: $REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference är inte en giltig referens" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "\"$args\" är inte en \"stash\"-referens" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "kan inte uppdatera indexet" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Konflikter i indexet. Testa utan --index." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Kunde inte spara indexträd" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "Kunde inte återställa ospårade filer från stash-post" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Kan inte ta bort ändrade filer ur kön" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Kastade ${REV} ($s)" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "\"$sm_path\" har inte någon utcheckad incheckning" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" +"$sm_path\n" +"Använd -f om du verkligen vill lägga till den." + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23254,37 +22098,37 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23293,7 +22137,7 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23302,7 +22146,7 @@ msgstr "" "Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 " "direkt:" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23311,72 +22155,72 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -23639,11 +22483,11 @@ msgid "" msgstr "" "Du har köade ändringar i din arbetskatalog.\n" "Om det är meningen att ändringarna\n" -"ska läggas in i föregående incheckning, kör:\n" +"skall läggas in i föregående incheckning, kör:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" -"Om de ska checkas in i en egen incheckning, kör:\n" +"Om de skall checkas in i en egen incheckning, kör:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" @@ -23696,10 +22540,6 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Observera att tomma incheckningar är utkommenterade" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" @@ -23765,19 +22605,81 @@ msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "köad" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "ej köad" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "binär" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "ingenting" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "oändrad" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "lade till %d sökväg\n" +msgstr[1] "lade till %d sökvägar\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "uppdaterade %d sökväg\n" +msgstr[1] "uppdaterade %d sökvägar\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "återställde %d sökväg\n" +msgstr[1] "återställde %d sökvägar\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "rörde %d sökväg\n" msgstr[1] "rörde %d sökvägar\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Uppdatera" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Återställ" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "observera: %s spåras inte längre.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Lägg till ospårad" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "Inga ospårade filer.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23785,7 +22687,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "köas omedelbart." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23793,7 +22695,7 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "läggas till i \"stash\" omedelbart." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23801,8 +22703,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "tas bort från kön omedelbart." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23810,8 +22712,8 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för applicering omedelbart." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23819,12 +22721,16 @@ msgstr "" "Om patchen kan appliceras rent kommer det redigerade stycket att\n" "markeras för kasta omedelbart." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -23837,12 +22743,36 @@ msgstr "" "Ta bort \"%s\" rader genom att radera dem.\n" "Rader som börjar med %s kommer att tas bort.\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n" +"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" +"redigeringen och stycket lämnas oförändrat.\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " +"[y/n]? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23856,7 +22786,7 @@ msgstr "" "a - köa stycket och alla följande i filen\n" "d - köa inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23870,7 +22800,7 @@ msgstr "" "a - \"stash\":a stycket och alla följande i filen\n" "d - \"stash\":a inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23884,7 +22814,7 @@ msgstr "" "a - ta bort stycket och alla följande i filen från kön\n" "d - ta inte bort stycket eller något av de följande i filen från kön" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23898,7 +22828,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23912,7 +22842,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23926,7 +22856,7 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23940,7 +22870,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23954,7 +22884,7 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller något av de följande i filen" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23976,85 +22906,226 @@ msgstr "" "e - redigera aktuellt stycke manuellt\n" "? - visa hjälp\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Markerade stycken kan inte appliceras på indexet!\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "Applicera dem på arbetskatalogen trots det? " + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "Ingenting applicerades.\n" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorerar ej sammanslagen: %s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Endast binära filer ändrade.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Inga ändringar.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Uppdatera patch" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Köa borttagning [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Köa stycket [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Stash:a stycket [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Inga andra stycken att gå till\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "gå till vilket stycke (<ret> för att se fler)? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "gå till vilket stycke? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ogiltigt siffervärde: \"%s\"\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Beklagar, det finns bara %d stycke.\n" msgstr[1] "Beklagar, det finns bara %d stycken.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "Inga andra stycken att söka efter\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "sök efter reguljärt uttryck? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Inga stycken motsvarar givet mönster\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Inget föregående stycke\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Inget följande stycke\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Beklagar, kan inte dela stycket\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Dela i %d stycke.\n" msgstr[1] "Dela i %d stycken.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Beklagar, kan inte redigera stycket\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Granska diff" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24071,19 +23142,19 @@ msgstr "" "diff - visa diff mellan HEAD och index\n" "add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "saknad --" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "okänt läge för --patch: %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "felaktigt argument %s, förväntar --" @@ -24250,7 +23321,7 @@ msgstr "" #: git-send-email.perl:918 msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? " +msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? " #: git-send-email.perl:926 #, perl-format @@ -24267,7 +23338,7 @@ msgstr "" #: git-send-email.perl:945 msgid "To whom should the emails be sent (if anyone)?" -msgstr "Till vem ska breven sändas (om någon)?" +msgstr "Till vem skall breven sändas (om någon)?" #: git-send-email.perl:963 #, perl-format @@ -24453,185 +23524,6 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " -#~ msgid "{drop,keep,ask}" -#~ msgstr "{drop,keep,ask}" - -#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " -#~ msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? " - -#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " -#~ msgstr "Köa borttagning [y,n,a,q,d%s,?]? " - -#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " -#~ msgstr "Köa stycket [y,n,a,q,d%s,?]? " - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for staging.\n" -#~ msgstr "" -#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n" -#~ "köas omedelbart.\n" - -#~ msgid "" -#~ "y - stage this hunk\n" -#~ "n - do not stage this hunk\n" -#~ "q - quit; do not stage this hunk or any of the remaining ones\n" -#~ "a - stage this and all the remaining hunks\n" -#~ "d - do not stage this hunk nor any of the remaining hunks\n" -#~ msgstr "" -#~ "y - köa stycket\n" -#~ "n - köa inte stycket\n" -#~ "q - avsluta; köa inte stycket eller något av de följande\n" -#~ "a - köa detta och alla följande stycken\n" -#~ "d - köa inte stycket eller något av de stycken som följer\n" - -#~ msgid "could not copy '%s' to '%s'." -#~ msgstr "kunde inte kopiera \"%s\" till \"%s\"." - -#~ msgid "malformed ident line" -#~ msgstr "felaktig ident-rad" - -#~ msgid "corrupted author without date information" -#~ msgstr "trasig författare utan datuminformation" - -#~ msgid "could not parse '%.*s'" -#~ msgstr "kunde inte tolka \"%.*s\"" - -#~ msgid "could not checkout %s" -#~ msgstr "kunde inte checka ut %s" - -#~ msgid "filename in tree entry contains backslash: '%s'" -#~ msgstr "filnamnet i trädet innehåller omvänt snedstreck: \"%s\"" - -#~ msgid "Use -f if you really want to add them.\n" -#~ msgstr "Använd -f om du verkligen vill lägga till dem.\n" - -#~ msgid "Maybe you wanted to say 'git add .'?\n" -#~ msgstr "Kanske menade du att skriva \"git add .\"?\n" - -#~ msgid "packfile is invalid: %s" -#~ msgstr "packfil är ogiltig: %s" - -#~ msgid "unable to open packfile for reuse: %s" -#~ msgstr "kan inte öppna packfil för återanvändning: %s" - -#~ msgid "unable to seek in reused packfile" -#~ msgstr "kan inte söka i återanvänd packfil" - -#~ msgid "unable to read from reused packfile" -#~ msgstr "kan inte läsa från återanvänd packfil" - -#~ msgid "no HEAD?" -#~ msgstr "inget HEAD?" - -#~ msgid "make committer date match author date" -#~ msgstr "sätt incheckningsdatum till författardatum" - -#~ msgid "ignore author date and use current date" -#~ msgstr "ignorera författardatum och använd nuvarande" - -#~ msgid "synonym of --reset-author-date" -#~ msgstr "synonym för --reset-author-date" - -#~ msgid "ignore changes in whitespace" -#~ msgstr "ignorera ändringar i blanksteg" - -#~ msgid "preserve empty commits during rebase" -#~ msgstr "behåll tomma incheckningar under ombasering" - -#~ msgid "cannot combine --use-bitmap-index with object filtering" -#~ msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" - -#~ msgid "" -#~ "The following path is ignored by one of your .gitignore files:\n" -#~ "$sm_path\n" -#~ "Use -f if you really want to add it." -#~ msgstr "" -#~ "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#~ "$sm_path\n" -#~ "Använd -f om du verkligen vill lägga till den." - -#~ msgid "unable to get tree for %s" -#~ msgstr "kunde inte hämta trädet på %s" - -#~ msgid "Use an experimental heuristic to improve diffs" -#~ msgstr "Använd en experimentell algoritm för att förbättra diffar" - -#~ msgid "git commit-graph [--object-dir <objdir>]" -#~ msgstr "git commit-graph [--object-dir <objkat>]" - -#~ msgid "git commit-graph read [--object-dir <objdir>]" -#~ msgstr "git commit-graph read [--object-dir <objkat>]" - -#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -#~ msgstr "" -#~ "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep" -#~ "\"" - -#~ msgid "cannot change partial clone promisor remote" -#~ msgstr "kan inte ändra kontraktsfjärr för delvis kloning" - -#~ msgid "error building trees" -#~ msgstr "fel vid byggande av träd" - -#~ msgid "invalid date format '%s' in '%s'" -#~ msgstr "ogiltigt datumformat \"%s\" i \"%s\"" - -#~ msgid "writing root commit" -#~ msgstr "skriver rotincheckning" - -#~ msgid "staged changes in the following files may be lost: %s" -#~ msgstr "köade ändringar i följande filer kan gå förlorade: %s" - -#~ msgid "" -#~ "--filter can only be used with the remote configured in extensions." -#~ "partialClone" -#~ msgstr "" -#~ "--filter kan endast användas med fjärren konfigurerad i extensions." -#~ "partialClone" - -#~ msgid "verify commit-msg hook" -#~ msgstr "bekräfta commit-msg-krok" - -#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" -#~ msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" - -#~ msgid "invalid sparse value '%s'" -#~ msgstr "ogiltigt värde för sparse: \"%s\"" - -#~ msgid "" -#~ "Fetch normally indicates which branches had a forced update, but that " -#~ "check has been disabled." -#~ msgstr "" -#~ "Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, " -#~ "men det testet har slagits av." - -#~ msgid "" -#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" -#~ msgstr "" -#~ "eller kör \"git config fetch.showForcedUpdates false\" för undvika " -#~ "testet.\n" - -#~ msgid "" -#~ "log.mailmap is not set; its implicit value will change in an\n" -#~ "upcoming release. To squelch this message and preserve current\n" -#~ "behaviour, set the log.mailmap configuration value to false.\n" -#~ "\n" -#~ "To squelch this message and adopt the new behaviour now, set the\n" -#~ "log.mailmap configuration value to true.\n" -#~ "\n" -#~ "See 'git help config' and search for 'log.mailmap' for further " -#~ "information." -#~ msgstr "" -#~ "log.mailmap har inte satts: förvalet kommer ändras i en kommande\n" -#~ "version. För att dölja det här meddelandet och behålla nuvarande\n" -#~ "beteende, sätt konfigurationsvariabeln log.mailmap till false.\n" -#~ "\n" -#~ "För att dölja det här meddelandet och använda det nya beteendet,\n" -#~ "sätt konfigurationsvariabeln log.mailmap till true.\n" -#~ "\n" -#~ "Se \"git help config\" och sök efter \"log.mailmap\" för mer information." - #~ msgid "Server supports multi_ack_detailed" #~ msgstr "Servern stöder \"multi_ack_detailed\"" @@ -24669,6 +23561,9 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgstr "" #~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal." +#~ msgid "failed to open '%s'" +#~ msgstr "misslyckades öppna \"%s\"" + #~ msgid "failed to stat %s\n" #~ msgstr "misslyckades ta status på %s\n" @@ -25185,6 +24080,9 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Cannot cherry-pick during another cherry-pick." #~ msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"." +#~ msgid "Could not parse line %d." +#~ msgstr "Kan inte tolka rad %d." + #~ msgid "Could not open %s" #~ msgstr "Kunde inte öppna %s" @@ -25507,6 +24405,9 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Could not append '%s'" #~ msgstr "Kunde inte lägga till på \"%s\"" +#~ msgid "Missing author: %s" +#~ msgstr "Författare saknas: %s" + #~ msgid "Testing " #~ msgstr "Testar" @@ -25564,6 +24465,9 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "option %s does not accept negative form" #~ msgstr "flaggan %s godtar inte negativ form" +#~ msgid "unable to parse value '%s' for option %s" +#~ msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" + #~ msgid "-b and -B are mutually exclusive" #~ msgstr "-b och -B kan inte användas samtidigt" diff --git a/third_party/git/po/tr.po b/third_party/git/po/tr.po deleted file mode 100644 index 1748297afb..0000000000 --- a/third_party/git/po/tr.po +++ /dev/null @@ -1,24563 +0,0 @@ -# Turkish translations for Git -# Git Türkçe çevirileri -# Copyright (C) 2020 Emir SARI <bitigchi@me.com> -# This file is distributed under the same license as the Git package. -# Emir SARI <bitigchi@me.com>, 2020 -# -# ######################################################### # -# Git Türkçe kavramlar dizini / Git Turkish Glossary # -# # -# İngilizce | Türkçe # -# ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––# -# 3-way merge | 3 yönlü birleştirme # -# bare repository | çıplak depo # -# blob object | ikili nesne # -# branch | dal # -# bundle | demet # -# checkout | çıkış yapım/yapmak # -# chunk | iri parça # -# clone | klon(lamak) # -# commit (ad) | gönderi # -# commit (eyl.) | göndermek # -# commitish | gönderimsi # -# conflict | çakışma # -# dangling object | sallanan nesne # -# detached HEAD | ayrık HEAD # -# dirty | kirli # -# evil merge | uğursuz birleştirme # -# fast-forward | ileri sarım/sarmak # -# fetch | getirme(k) # -# fixup | düzeltmek # -# graft | aşı # -# hash | sağlama # -# head | dal ucu # -# hunk | parça # -# inflate | söndürmek # -# init | ilklendirmek # -# mark | im(lemek) # -# merge | birleştirme(k) # -# octopus | ahtapot # -# overlay | yerpaylaşım # -# pack | paket # -# parent | üst öge # -# patch | yama # -# pathspec | yol belirteci # -# pattern | dizgi # -# porcelain | okunabilir # -# prune | budamak # -# pseudoref | yalancıktan başvuru # -# pull | çekme(k) # -# push | itme(k) # -# rebase | yeniden temellendirme(k) # -# record | kayıt yaz(mak) # -# ref | başvuru # -# reflog | başvuru günlüğü # -# refspec | başvuru belirteci # -# register | kayıt yap(mak) # -# remote | uzak konum # -# remote repository | uzak depo # -# remote-tracking branch | uzak izleme dalı # -# repository | depo # -# resolve | çözüm/çözmek # -# revert | geri al(mak) # -# rewind | geri sar(mak) # -# save | kaydet(mek) # -# shallow clone | sığ klon # -# shallow repository | sığ depo # -# sparse-checkout | aralıklı çıkış # -# squash | tıkıştır(mak) # -# stage | hazırla(mak) # -# staging area | (gönderi) hazırlama alanı # -# stash | zula(lamak) # -# string | dizi # -# subdirectory | altdizin # -# submodule | altmodül # -# symlink | sembolik bağ # -# symref | sembolik başvuru # -# tag | etiket # -# template | şablon # -# topic branch | kişisel dal # -# trailer | artbilgi # -# tree | ağaç # -# treeish | ağacımsı # -# unstage | hazırlıktan çıkar(mak) # -# upstream | üstkaynak # -# worktree/working tree | çalışma ağacı # -# ######################################################### # -# -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: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-10 23:00+0300\n" -"Last-Translator: Emir SARI <bitigchi@me.com>\n" -"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" -"Language: tr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "Pardon (%s)?" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "indeks okunamadı" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "ikili" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "hiçbir şey" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "değiştirilmemiş" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Güncelle" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "'%s' hazırlanamadı" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "indeks yazılamadı" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "%d yol güncellendi\n" -msgstr[1] "%d yol güncellendi\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "not: %s artık izlenmiyor.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "'%s' yolu için make_cache_entry başarısız oldu" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Geri al" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "HEAD^{tree} ayrıştırılamadı" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "%d yol geri alındı\n" -msgstr[1] "%d yol geri alındı\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "İzlenmeyen dosya yok.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "İzlenmeyenleri ekle" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "%d yol eklendi\n" -msgstr[1] "%d yol eklendi\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "birleştirilmeyenler yok sayılıyor: %s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Yalnızca ikili dosyalar değiştirildi.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Değişiklik yok.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Yama güncellemesi" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "diff'i gözden geçir" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "değiştirilmiş yolları göster" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "hazırlanan değişikliklere çalışma ağacı durumunu ekle" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "hazırlanan değişiklikleri HEAD sürümüne geri al" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "parçaları seç ve seçerek güncelle" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "HEAD ve indeks arasındaki diff'i gör" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "izlenmeyen dosyaların içeriğini hazırlanan değişikliklere ekle" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "İstem yardımı:" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "tek bir öge seç" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "bir öge erimi seç" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "birden çok erim seç" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "benzersiz öneke dayanarak öge seç" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "belirtilen ögelerin seçimini kaldır" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "tüm ögeleri seç" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(boş) seçimi bitir" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "numaralandırılmış bir öge seç" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(boş) hiçbir şey seçme" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Komutlar ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Şimdi ne" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "hazırlanmış" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "hazırlanmamış" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "yol" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "indeks yenilenemedi" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Hoşça kal.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Kip değişimi hazırlansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Bu parça hazırlansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama için " -"imlenecektir." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - bu parçayı hazırla\n" -"n - bu parçayı hazırlama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlama\n" -"a - bu parçayı ve sonraki tüm parçaları hazırla\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Kip değişimi zulalansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Bu parça zulalansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama için " -"imlenecektir." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - bu parçayı zulala\n" -"n - bu parçayı zulalama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini zulalama\n" -"a - bu parçayı ve sonraki tüm parçaları zulala\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Kip değişimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Bu parça hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan " -"çıkarım için imlenecektir." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - bu parçayı hazırlıktan çıkar\n" -"n - bu parçayı hazırlıktan çıkarma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlıktan çıkarma\n" -"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Kip değişimi indekse uygulansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Bu parça indekse uygulansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama için " -"imlenecektir." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - bu parçayı indekse uygula\n" -"n - bu parçayı indekse uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Kip değişimi çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Silme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Bu parça çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya çıkarım " -"için imlenecektir." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - bu parçayı çalışma ağacından at\n" -"n - bu parçayı çalışma ağacından atma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n" -"a - bu parçayı ve sonraki tüm parçaları at\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini atma\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Kip değişimi indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Silme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Bu parça indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - bu parçayı çalışma ağacından ve indeksten at\n" -"n - bu parçayı çalışma ağacından ve indeksten atma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n" -"a - bu parçayı ve sonraki tüm parçaları at\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini atma\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Kip değişimi indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Silme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Bu parça indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - bu parçayı indekse ve çalışma ağacına uygula\n" -"n - bu parçayı indekse ve çalışma ağacına uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - bu parçayı çalışma ağacına uygula\n" -"n - bu parçayı çalışma ağacına uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "parça üstbilgisi '%.*s' ayrıştırılamadı" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "renklendirilmiş parça üstbilgisi '%.*s' ayrıştırılamadı" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "diff ayrıştırılamadı" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "renklendirilmiş diff ayrıştırılamadı" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "'%s' çalıştırılamadı" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Süzgeciniz kendisinin girdi ve çıktı satırları arasında\n" -"birebir karşılık sağlamalıdır." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"şurada bağlam satırı #%d bekleniyordu:\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"parçalar üst üste binmiyor:\n" -"%.*s\n" -"\tşununla bitmiyor:\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "El ile parça düzenleme kipi -- hızlıca öğrenmek için aşağıya bakın.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"'%c' satır kaldırmak için onları ' ' satır yapın (bağlam).\n" -"'%c' satır kaldırmak için onları silin.\n" -"%c kaldırılacak.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Eğer sorunsuzca uygulanamazsa yeniden düzenlemeniz için bir olanak\n" -"sunulacaktır. Parçanın tüm satırları kaldırılırsa düzenleme durdurulur\n" -"ve parça değiştirilmeden bırakılır.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "parça üstbilgisi ayrıştırılamadı" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "'git apply --cached' başarısız oldu" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\"n (hayır)\" " -"demek iptal eder!) [y/n]? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "Seçili parçalar indekse uygulanamıyor!" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Çalışma ağacına yine de uygulansın mı? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Hiçbir şey uygulanmadı.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - bu parça için sonra karar ver, bir sonraki karar verilmemiş parçayı gör\n" -"J - bu parça için sonra karar ver, bir sonraki parçayı gör\n" -"k - bu parça için sonra karar ver, bir önceki karar verilmemiş parçayı gör\n" -"K - bu parça için sonra karar ver, bir önceki parçayı gör\n" -"g - gidilecek bir parça seç\n" -"/ - verilen düzenli ifade ile eşleşen bir parça ara\n" -"s - geçerli parçayı daha ufak parçalara böl\n" -"e - geçerli parçayı el ile düzenle\n" -"? - yardımı yazdır\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "Öncesinde parça yok" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "Sonrasında parça yok" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "Gidilecek başka bir parça yok" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "hangi parçaya gidilsin? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Geçersiz sayı: '%s'" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir." -msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "Aranacak başka parça yok" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "düzenli ifade aransın mı? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Hatalı oluşturulmuş düzenli ifade %s: %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "Verilen dizgi ile eşleşen bir parça yok" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Üzgünüm, bu parça bölünemiyor" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "%d parçaya bölündü." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Üzgünüm, bu parça düzenlenemiyor" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "'git apply' başarısız oldu" - -#: advice.c:115 -#, c-format -msgid "%shint: %.*s%s\n" -msgstr "%sipucu: %.*s%s\n" - -#: advice.c:168 -msgid "Cherry-picking is not possible because you have unmerged files." -msgstr "Seç-al yapılamıyor çünkü birleştirilmemiş dosyalarınız var." - -#: advice.c:170 -msgid "Committing is not possible because you have unmerged files." -msgstr "Gönderi yapılamıyor çünkü birleştirilmemiş dosyalarınız var." - -#: advice.c:172 -msgid "Merging is not possible because you have unmerged files." -msgstr "Birleştirme yapılamıyor çünkü birleştirilmemiş dosyalarınız var." - -#: advice.c:174 -msgid "Pulling is not possible because you have unmerged files." -msgstr "Çekme yapılamıyor çünkü birleştirilmemiş dosyalarınız var." - -#: advice.c:176 -msgid "Reverting is not possible because you have unmerged files." -msgstr "Geriye alma yapılamıyor çünkü birleştirilmemiş dosyalarınız var." - -#: advice.c:178 -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "%s yapılamıyor çünkü birleştirilmemiş dosyalarınız var." - -#: advice.c:186 -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 "" -"Onları çalışma ağacında onarın, ardından hazırlığı bitirmek için uygun\n" -"görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra bir gönderi yapın." - -#: advice.c:194 -msgid "Exiting because of an unresolved conflict." -msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor." - -#: advice.c:199 builtin/merge.c:1335 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)." - -#: advice.c:201 -msgid "Please, commit your changes before merging." -msgstr "Birleştirme öncesinde değişikliklerinizi gönderin." - -#: advice.c:202 -msgid "Exiting because of unfinished merge." -msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor." - -#: advice.c:208 -#, c-format -msgid "" -"Note: switching to '%s'.\n" -"\n" -"You are in 'detached HEAD' state. You can look around, make experimental\n" -"changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by switching back to a branch.\n" -"\n" -"If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -c with the switch command. Example:\n" -"\n" -" git switch -c <new-branch-name>\n" -"\n" -"Or undo this operation with:\n" -"\n" -" git switch -\n" -"\n" -"Turn off this advice by setting config variable advice.detachedHead to " -"false\n" -"\n" -msgstr "" -"Not: Şuraya geçiliyor: '%s'.\n" -"\n" -"Şu anda 'ayrık HEAD' durumundasınız. Oraya buraya bakabilir, deneysel\n" -"değişiklikler yapıp gönderebilir veya başka bir dala geçerek yaptığınız\n" -"tüm gönderileri başka hiçbir dala etki etmeden geri alabilirsiniz.\n" -"\n" -"Yaptığınız gönderileri tutmak için yeni bir dal oluşturmak isterseniz bunu\n" -"şimdi veya daha sonra switch komutuna -c ekleyerek yapabilirsiniz. Örnek:\n" -"\n" -"\tgit switch -c <yeni-dal-adı>\n" -"\n" -"Bu işlemi şununla geri alabilirsiniz:\n" -"\n" -"\tgit switch -\n" -"\n" -"Bu öğüdü advice.detachedHead yapılandırma değişkenini false yaparak\n" -"kapatabilirsiniz.\n" -"\n" - -#: alias.c:50 -msgid "cmdline ends with \\" -msgstr "komut satırı \\ ile bitiyor" - -#: alias.c:51 -msgid "unclosed quote" -msgstr "kapatılmamış tırnak" - -#: apply.c:69 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "tanımlanamayan boşluk seçeneği '%s'" - -#: apply.c:85 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "tanımlanamayan boşluk yok sayma seçeneği '%s'" - -#: apply.c:135 -msgid "--reject and --3way cannot be used together." -msgstr "--reject ve --3way birlikte kullanılamaz." - -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached ve --3way birlikte kullanılamaz." - -#: apply.c:140 -msgid "--3way outside a repository" -msgstr "-3way bir depo dışında" - -#: apply.c:151 -msgid "--index outside a repository" -msgstr "--index bir depo dışında" - -#: apply.c:154 -msgid "--cached outside a repository" -msgstr "--cached bir depo dışında" - -#: apply.c:801 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "Zaman damgası düzenli ifadesi %s hazırlanamıyor" - -#: apply.c:810 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "düzenli ifade girdi için %d döndürdü: %s" - -#: apply.c:884 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "yamanın %d. satırında dosya adı bulunamıyor " - -#: apply.c:922 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" -"git apply: hatalı git-diff - /dev/null bekleniyordu, %s alındı, satır %d" - -#: apply.c:928 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: hatalı git-diff - %d. satırda tutarsız yeni dosya adı" - -#: apply.c:929 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: hatalı git-diff - %d. satırda tutarsız eski dosya adı" - -#: apply.c:934 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: hatalı git-diff - %d. satırda /dev/null bekleniyordu" - -#: apply.c:963 -#, c-format -msgid "invalid mode on line %d: %s" -msgstr "%d. satırda geçersiz kip: %s" - -#: apply.c:1282 -#, c-format -msgid "inconsistent header lines %d and %d" -msgstr "tutarsız üstbilgi satırları %d ve %d" - -#: apply.c:1372 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -"%d öncü yol adı bileşeni kaldırılırken git diff üstbilgisi dosya adı " -"bilgisine iye değil (%d. satır)" -msgstr[1] "" -"%d öncü yol adı bileşeni kaldırılırken git diff üstbilgisi dosya adı " -"bilgisine iye değil (%d. satır)" - -#: apply.c:1385 -#, c-format -msgid "git diff header lacks filename information (line %d)" -msgstr "git diff üstbilgisi dosya adı bilgisine iye değil (%d. satır)" - -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: beklenmedik satır: %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "%d. satırda üstbilgisi olmayan yama parçacığı: %.*s" - -#: apply.c:1753 -msgid "new file depends on old contents" -msgstr "yeni dosya eski içeriğe gereksinim duyuyor" - -#: apply.c:1755 -msgid "deleted file still has contents" -msgstr "silinen dosya içinde hâlâ bir şeyler var" - -#: apply.c:1789 -#, c-format -msgid "corrupt patch at line %d" -msgstr "hasarlı yama, %d. satır" - -#: apply.c:1826 -#, c-format -msgid "new file %s depends on old contents" -msgstr "%s yeni dosyası eski içeriğe gereksinim duyuyor" - -#: apply.c:1828 -#, c-format -msgid "deleted file %s still has contents" -msgstr "%s silinen dosyasının içinde hâlâ bir şeyler var" - -#: apply.c:1831 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** uyarı: %s dosyası boş duruma gelir ancak silinmez" - -#: apply.c:1978 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "hasarlı ikili yama, %d. satır: %.*s" - -#: apply.c:2015 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "tanımlanamayan ikili yama, %d. satır" - -#: apply.c:2177 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "yalnızca anlamsız veri içeren yama, %d. satır" - -#: apply.c:2263 -#, c-format -msgid "unable to read symlink %s" -msgstr "%s sembolik bağı okunamıyor" - -#: apply.c:2267 -#, c-format -msgid "unable to open or read %s" -msgstr "%s açılamıyor veya okunamıyor" - -#: apply.c:2936 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "geçersiz satır başlangıcı: '%c'" - -#: apply.c:3057 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "Parça #%d başarılı oldu, %d (%d satır ofset)." -msgstr[1] "Parça #%d başarılı oldu, %d (%d satır ofset)." - -#: apply.c:3069 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "" -"Bağlam şuna indirildi: (%ld/%ld) (%d konumundaki parçacığı uygulamak için)" - -#: apply.c:3075 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"şunu ararken:\n" -"%.*s" - -#: apply.c:3097 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "'%s' için ikili yama verisi eksik" - -#: apply.c:3105 -#, c-format -msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "'%s' parçası geri alınmadan bir ikili yama reverse-apply yapılamıyor" - -#: apply.c:3152 -#, c-format -msgid "cannot apply binary patch to '%s' without full index line" -msgstr "tam indeks satırı olmadan '%s' üzerine bir ikili yama uygulanamıyor" - -#: apply.c:3163 -#, c-format -msgid "" -"the patch applies to '%s' (%s), which does not match the current contents." -msgstr "Bu yama geçerli içerik ile eşleşmeyen '%s' üzerine uygulanır (%s)." - -#: apply.c:3171 -#, c-format -msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "yama boş bir '%s' üzerine uygulanır, ancak o boş değil" - -#: apply.c:3189 -#, c-format -msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "gereken songörüntü %s ('%s' için) okunamıyor" - -#: apply.c:3202 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "ikili yama '%s' üzerine uygulanamıyor" - -#: apply.c:3209 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"'%s' üzerine ikili yama yanlış sonuç doğuruyor (%s bekleniyordu, %s alındı)" - -#: apply.c:3230 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "yama başarısız oldu: %s:%ld" - -#: apply.c:3353 -#, c-format -msgid "cannot checkout %s" -msgstr "%s çıkışı yapılamıyor" - -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 -#, c-format -msgid "failed to read %s" -msgstr "%s okunamadı" - -#: apply.c:3413 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "'%s' bir sembolik bağın ötesinden okunuyor" - -#: apply.c:3442 apply.c:3685 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "%s yolu yeniden adlandırıldı/silindi" - -#: apply.c:3528 apply.c:3700 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: indekste bulunmuyor" - -#: apply.c:3537 apply.c:3708 -#, c-format -msgid "%s: does not match index" -msgstr "%s: indeks ile eşleşmiyor" - -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "" -"Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesneye iye " -"değil." - -#: apply.c:3575 -#, c-format -msgid "Falling back to three-way merge...\n" -msgstr "3 yönlü birleştirmeye geri çekiliniyor...\n" - -#: apply.c:3591 apply.c:3595 -#, c-format -msgid "cannot read the current contents of '%s'" -msgstr "'%s' ögesinin geçerli içeriği okunamıyor" - -#: apply.c:3607 -#, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "3 yönlü birleştirmeye geri çekinilemedi...\n" - -#: apply.c:3621 -#, c-format -msgid "Applied patch to '%s' with conflicts.\n" -msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n" - -#: apply.c:3626 -#, c-format -msgid "Applied patch to '%s' cleanly.\n" -msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n" - -#: apply.c:3652 -msgid "removal patch leaves file contents" -msgstr "kaldırma yaması dosya içeriğini bırakır" - -#: apply.c:3725 -#, c-format -msgid "%s: wrong type" -msgstr "%s: yanlış tür" - -#: apply.c:3727 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s, %o türüne iye, %o bekleniyordu" - -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 -#, c-format -msgid "invalid path '%s'" -msgstr "geçersiz yol '%s'" - -#: apply.c:3936 -#, c-format -msgid "%s: already exists in index" -msgstr "%s: indekste halihazırda var" - -#: apply.c:3939 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: çalışma dizininde halihazırda var" - -#: apply.c:3959 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor " - -#: apply.c:3964 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "şunun yeni kipi (%o): %s, şunun eski kipi (%o): %s, ile eşleşmiyor" - -#: apply.c:3984 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde" - -#: apply.c:3988 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: yama uygulanamıyor" - -#: apply.c:4003 -#, c-format -msgid "Checking patch %s..." -msgstr "%s yaması denetleniyor..." - -#: apply.c:4095 -#, c-format -msgid "sha1 information is lacking or useless for submodule %s" -msgstr "%s altmodülü için sha1 bilgisi eksik veya yararsız" - -#: apply.c:4102 -#, c-format -msgid "mode change for %s, which is not in current HEAD" -msgstr "geçerli HEAD'de olmayan %s için kip değişimi" - -#: apply.c:4105 -#, c-format -msgid "sha1 information is lacking or useless (%s)." -msgstr "sha1 bilgisi eksik veya yararsız (%s)." - -#: apply.c:4114 -#, c-format -msgid "could not add %s to temporary index" -msgstr "%s geçici indekse eklenemedi" - -#: apply.c:4124 -#, c-format -msgid "could not write temporary index to %s" -msgstr "geçici indeks şuraya yazılamadı: %s" - -#: apply.c:4262 -#, c-format -msgid "unable to remove %s from index" -msgstr "%s indeksten kaldırılamıyor" - -#: apply.c:4296 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "%s altmodülü için hasarlı yama" - -#: apply.c:4302 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor" - -#: apply.c:4310 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor" - -#: apply.c:4316 apply.c:4461 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "%s için önbellek girdisi eklenemiyor" - -#: apply.c:4359 -#, c-format -msgid "failed to write to '%s'" -msgstr "şuraya yazılamadı: '%s'" - -#: apply.c:4363 -#, c-format -msgid "closing file '%s'" -msgstr "'%s' dosyası kapatılıyor" - -#: apply.c:4433 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "'%s' dosyası yazılamıyor, %o kipi" - -#: apply.c:4531 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "%s yaması sorunsuzca uygulandı." - -#: apply.c:4539 -msgid "internal error" -msgstr "iç hata" - -#: apply.c:4542 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "%%s yaması %d geri çevirme ile uygulanıyor..." -msgstr[1] "%%s yaması %d geri çevirme ile uygulanıyor..." - -#: apply.c:4553 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor" - -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 -#, c-format -msgid "cannot open %s" -msgstr "%s açılamıyor" - -#: apply.c:4575 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "Parça #%d sorunsuzca uygulandı." - -#: apply.c:4579 -#, c-format -msgid "Rejected hunk #%d." -msgstr "Parça %d geri çevrildi." - -#: apply.c:4698 -#, c-format -msgid "Skipped patch '%s'." -msgstr "'%s' yaması atlandı." - -#: apply.c:4706 -msgid "unrecognized input" -msgstr "tanımlanamayan girdi" - -#: apply.c:4726 -msgid "unable to read index file" -msgstr "indeks dosyası okunamıyor" - -#: apply.c:4883 -#, c-format -msgid "can't open patch '%s': %s" -msgstr "'%s' yaması açılamıyor: %s" - -#: apply.c:4910 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "%d boşluk hatası susturuldu" -msgstr[1] "%d boşluk hatası susturuldu" - -#: apply.c:4916 apply.c:4931 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d satır boşluk hatası ekliyor." -msgstr[1] "%d satır boşluk hatası ekliyor." - -#: apply.c:4924 -#, c-format -msgid "%d line applied after fixing whitespace errors." -msgid_plural "%d lines applied after fixing whitespace errors." -msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı." -msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı." - -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 -msgid "Unable to write new index file" -msgstr "Yeni indeks dosyası yazılamıyor" - -#: apply.c:4968 -msgid "don't apply changes matching the given path" -msgstr "verilen yol ile eşleşen değişiklikleri uygulama" - -#: apply.c:4971 -msgid "apply changes matching the given path" -msgstr "verilen yol ile eşleşen değişiklikleri uygula" - -#: apply.c:4973 builtin/am.c:2260 -msgid "num" -msgstr "sayı" - -#: apply.c:4974 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır" - -#: apply.c:4977 -msgid "ignore additions made by the patch" -msgstr "yamanın yaptığı eklemeleri yok say" - -#: apply.c:4979 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "yamayı uygulama yerine girdi için diffstat'ı çıktı ver" - -#: apply.c:4983 -msgid "show number of added and deleted lines in decimal notation" -msgstr "eklenen ve silinen satırların sayısını onluk birimde göster" - -#: apply.c:4985 -msgid "instead of applying the patch, output a summary for the input" -msgstr "yamayı uygulama yerine girdi için bir özet çıktısı ver" - -#: apply.c:4987 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "yamayı uygulama yerine yamanın uygulanabilir olup olmadığına bak" - -#: apply.c:4989 -msgid "make sure the patch is applicable to the current index" -msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol" - -#: apply.c:4991 -msgid "mark new files with `git add --intent-to-add`" -msgstr "yeni dosyaları `git add --intent-to-add` ile imle" - -#: apply.c:4993 -msgid "apply a patch without touching the working tree" -msgstr "çalışma ağacına dokunmadan bir yama uygula" - -#: apply.c:4995 -msgid "accept a patch that touches outside the working area" -msgstr "çalışma ağacının dışına dokunan bir yamayı kabul et" - -#: apply.c:4998 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)" - -#: apply.c:5000 -msgid "attempt three-way merge if a patch does not apply" -msgstr "bir yama uygulanamıyorsa 3 yönlü birleştirme dene" - -#: apply.c:5002 -msgid "build a temporary index based on embedded index information" -msgstr "gömülü indeks bilgisini temel alan geçici bir indeks oluştur" - -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 -msgid "paths are separated with NUL character" -msgstr "yollar NUL karakteri ile ayrılır" - -#: apply.c:5007 -msgid "ensure at least <n> lines of context match" -msgstr "en az <n> bağlam satırının eşleştiğinden emin ol" - -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 -msgid "action" -msgstr "eylem" - -#: apply.c:5009 -msgid "detect new or modified lines that have whitespace errors" -msgstr "boşluk hatası içeren yeni veya değiştirilmiş satırları algıla" - -#: apply.c:5012 apply.c:5015 -msgid "ignore changes in whitespace when finding context" -msgstr "bağlam bulurken boşluk değişikliklerini yok say" - -#: apply.c:5018 -msgid "apply the patch in reverse" -msgstr "yamayı tersten uygula" - -#: apply.c:5020 -msgid "don't expect at least one line of context" -msgstr "en az bir satır bağlam bekleme" - -#: apply.c:5022 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak" - -#: apply.c:5024 -msgid "allow overlapping hunks" -msgstr "üst üste binen parçalara izin ver" - -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 -msgid "be verbose" -msgstr "ayrıntı ver" - -#: apply.c:5027 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör" - -#: apply.c:5030 -msgid "do not trust the line counts in the hunk headers" -msgstr "parça üstbilgisindeki satır sayımına güvenme" - -#: apply.c:5032 builtin/am.c:2248 -msgid "root" -msgstr "kök" - -#: apply.c:5033 -msgid "prepend <root> to all filenames" -msgstr "tüm dosya adlarının başına <kök> ekle" - -#: archive.c:14 -msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<seçenekler>] <ağacımsı> [<yol>...]" - -#: archive.c:15 -msgid "git archive --list" -msgstr "git archive --list" - -#: archive.c:16 -msgid "" -"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -msgstr "" -"git archive --remote <depo> [--exec <komut>] [<sçnklr>] <ağacımsı> [<yol>...]" - -#: archive.c:17 -msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "git archive --remote <depo> [--exec <komut>] --list" - -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi" - -#: archive.c:396 -#, c-format -msgid "no such ref: %.*s" -msgstr "böyle bir başvuru yok: %.*s" - -#: archive.c:401 -#, c-format -msgid "not a valid object name: %s" -msgstr "geçerli bir nesne adı değil: %s" - -#: archive.c:414 -#, c-format -msgid "not a tree object: %s" -msgstr "bir ağaç nesnesi değil: %s" - -#: archive.c:426 -msgid "current working directory is untracked" -msgstr "geçerli çalışma dizini izlenmiyor" - -#: archive.c:457 -msgid "fmt" -msgstr "biçim" - -#: archive.c:457 -msgid "archive format" -msgstr "arşiv biçimi" - -#: archive.c:458 builtin/log.c:1653 -msgid "prefix" -msgstr "önek" - -#: archive.c:459 -msgid "prepend prefix to each pathname in the archive" -msgstr "öneki arşivdeki tüm yol adlarının başına ekle" - -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 -msgid "file" -msgstr "dosya" - -#: archive.c:461 builtin/archive.c:90 -msgid "write the archive to this file" -msgstr "arşivi bu dosyaya yaz" - -#: archive.c:463 -msgid "read .gitattributes in working directory" -msgstr "çalışma dizinindeki .gitattributes'u oku" - -#: archive.c:464 -msgid "report archived files on stderr" -msgstr "arşivlenmiş dosyaları stderr'de raporla" - -#: archive.c:465 -msgid "store only" -msgstr "yalnızca depola" - -#: archive.c:466 -msgid "compress faster" -msgstr "daha hızlı sıkıştır" - -#: archive.c:474 -msgid "compress better" -msgstr "daha iyi sıkıştır" - -#: archive.c:477 -msgid "list supported archive formats" -msgstr "desteklenen arşiv biçimlerini listele" - -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 -msgid "repo" -msgstr "depo" - -#: archive.c:480 builtin/archive.c:92 -msgid "retrieve the archive from remote repository <repo>" -msgstr "arşivi uzak konum deposu <depo>'dan al" - -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 -#: builtin/notes.c:498 -msgid "command" -msgstr "komut" - -#: archive.c:482 builtin/archive.c:94 -msgid "path to the remote git-upload-archive command" -msgstr "uzak konum komutu git-upload-archive'e olan yol" - -#: archive.c:489 -msgid "Unexpected option --remote" -msgstr "Beklenmedik seçenek --remote" - -#: archive.c:491 -msgid "Option --exec can only be used together with --remote" -msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir" - -#: archive.c:493 -msgid "Unexpected option --output" -msgstr "Beklenmedik seçenek --output" - -#: archive.c:515 -#, c-format -msgid "Unknown archive format '%s'" -msgstr "Bilinmeyen arşiv biçimi '%s'" - -#: archive.c:522 -#, c-format -msgid "Argument not supported for format '%s': -%d" -msgstr "'%s' biçimi için desteklenmeyen değişken: -%d" - -#: archive-tar.c:125 archive-zip.c:351 -#, c-format -msgid "cannot stream blob %s" -msgstr "%s ikili nesnesi akıtılamıyor" - -#: archive-tar.c:266 archive-zip.c:369 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)" - -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "%s okunamıyor" - -#: archive-tar.c:465 -#, c-format -msgid "unable to start '%s' filter" -msgstr "'%s' süzgeci başlatılamıyor" - -#: archive-tar.c:468 -msgid "unable to redirect descriptor" -msgstr "açıklayıcı yeniden yönlendirilemiyor" - -#: archive-tar.c:475 -#, c-format -msgid "'%s' filter reported error" -msgstr "'%s' süzgeci hata bildirdi" - -#: archive-zip.c:319 -#, c-format -msgid "path is not valid UTF-8: %s" -msgstr "yol geçerli UTF-8 değil: %s" - -#: archive-zip.c:323 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "yol çok uzun (%d karakter, SHA1: %s): %s" - -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 -#, c-format -msgid "deflate error (%d)" -msgstr "söndürme hatası (%d)" - -#: archive-zip.c:615 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "zaman damgası bu sistem için çok büyük: %<PRIuMAX>" - -#: attr.c:212 -#, c-format -msgid "%.*s is not a valid attribute name" -msgstr "%.*s geçerli bir öznitelik adı değil" - -#: attr.c:369 -#, c-format -msgid "%s not allowed: %s:%d" -msgstr "%s izin verilmiyor: %s:%d" - -#: attr.c:409 -msgid "" -"Negative patterns are ignored in git attributes\n" -"Use '\\!' for literal leading exclamation." -msgstr "" -"Negatif dizgiler git özniteliklerinde yok sayılır.\n" -"Gerçek öncü ünlem için '\\!' kullanın." - -#: bisect.c:468 -#, c-format -msgid "Badly quoted content in file '%s': %s" -msgstr "'%s' dosyasında hatalı tırnağa alınmış içerik: %s" - -#: bisect.c:678 -#, c-format -msgid "We cannot bisect more!\n" -msgstr "Daha fazla ikili arama yapamıyoruz!\n" - -#: bisect.c:745 -#, c-format -msgid "Not a valid commit name %s" -msgstr "Geçerli bir gönderi adı değil: %s" - -#: bisect.c:770 -#, c-format -msgid "" -"The merge base %s is bad.\n" -"This means the bug has been fixed between %s and [%s].\n" -msgstr "" -"Birleştirme temeli %s hatalı.\n" -"Bu demek oluyor ki hata %s ve [%s] arasında düzeltilmiş.\n" - -#: bisect.c:775 -#, c-format -msgid "" -"The merge base %s is new.\n" -"The property has changed between %s and [%s].\n" -msgstr "" -"Birleştirme temeli %s yeni.\n" -"Özellik %s ve [%s] arasında değişmiş.\n" - -#: bisect.c:780 -#, c-format -msgid "" -"The merge base %s is %s.\n" -"This means the first '%s' commit is between %s and [%s].\n" -msgstr "" -"Birleştirme temeli %s %s.\n" -"Bu demek oluyor ki ilk '%s' gönderisi %s ve [%s] arasında.\n" - -#: bisect.c:788 -#, c-format -msgid "" -"Some %s revs are not ancestors of the %s rev.\n" -"git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" -msgstr "" -"Bazı %s revizyonları %s revizyonunun atası değil.\n" -"git bisect bu durumda düzgünce çalışamaz.\n" -"%s ve %s revizyonlarını birbirine mi karıştırdınız?\n" - -#: bisect.c:801 -#, c-format -msgid "" -"the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" -"We continue anyway." -msgstr "" -"%s ve [%s] arasındaki birleştirme temeli atlanmalı.\n" -"%s gönderisinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n" -"Yine de sürdüreceğiz." - -#: bisect.c:840 -#, c-format -msgid "Bisecting: a merge base must be tested\n" -msgstr "İkili arama: Bir birleştirme temeli sınanmalı\n" - -#: bisect.c:890 -#, c-format -msgid "a %s revision is needed" -msgstr "bir %s revizyonu gerekiyor" - -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 -#, c-format -msgid "could not create file '%s'" -msgstr "'%s' dosyası oluşturulamadı" - -#: bisect.c:966 builtin/merge.c:149 -#, c-format -msgid "could not read file '%s'" -msgstr "'%s' dosyası okunamadı" - -#: bisect.c:997 -msgid "reading bisect refs failed" -msgstr "ikili arama başvurularını okuma başarısız oldu" - -#: bisect.c:1019 -#, c-format -msgid "%s was both %s and %s\n" -msgstr "%s hem %s hem %s idi\n" - -#: bisect.c:1028 -#, c-format -msgid "" -"No testable commit found.\n" -"Maybe you started with bad path parameters?\n" -msgstr "" -"Sınanabilir bir gönderi bulunamadı.\n" -"Hatalı yol parametreleri ile mi başladınız?\n" - -#: bisect.c:1057 -#, c-format -msgid "(roughly %d step)" -msgid_plural "(roughly %d steps)" -msgstr[0] "(aşağı yukarı %d adım)" -msgstr[1] "(aşağı yukarı %d adım)" - -#. TRANSLATORS: the last %s will be replaced with "(roughly %d -#. steps)" translation. -#. -#: bisect.c:1063 -#, c-format -msgid "Bisecting: %d revision left to test after this %s\n" -msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n" -msgstr[1] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n" - -#: blame.c:2700 -msgid "--contents and --reverse do not blend well." -msgstr "--contents ve --reverse birlikte pek iyi gitmiyor." - -#: blame.c:2714 -msgid "cannot use --contents with final commit object name" -msgstr "--contents son gönderi nesnesi adı ile kullanılamıyor" - -#: blame.c:2735 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "" -"--reverse ve --first-parent birlikte en son gönderinin belirtilmesi gerek" - -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 -#: builtin/shortlog.c:192 -msgid "revision walk setup failed" -msgstr "revizyonda gezinme ayarlaması başarısız oldu" - -#: blame.c:2762 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "" -"--reverse --first-parent birlikte ilk üst öge zincirinin yanında erim " -"gerektiriyor" - -#: blame.c:2773 -#, c-format -msgid "no such path %s in %s" -msgstr "şurada %s yolu bulunamadı: %s" - -#: blame.c:2784 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "%s ikili nesnesi %s yolunda okunamıyor" - -#: branch.c:53 -#, c-format -msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." -msgstr "" -"\n" -"Hata nedenini ortadan kaldırdıktan sonra uzak konum izleme\n" -"bilgisini onarmayı şunu çalıştırarak deneyebilirsiniz:\n" -"\"git branch --set-upstream-to=%s%s%s\"." - -#: branch.c:67 -#, c-format -msgid "Not setting branch %s as its own upstream." -msgstr "%s dalı kendi üst kaynağı olarak ayarlanamaz." - -#: branch.c:93 -#, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "" -"'%s' dalı '%s' uzak dalını yeniden temellendirme ile %s konumundan izlemek " -"üzere ayarlandı." - -#: branch.c:94 -#, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "'%s' dalı '%s' uzak dalını %s konumundan izlemek üzere ayarlandı." - -#: branch.c:98 -#, c-format -msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "" -"'%s' dalı '%s' yerel dalını yeniden temellendirme ile izlemek üzere ayarlandı" - -#: branch.c:99 -#, c-format -msgid "Branch '%s' set up to track local branch '%s'." -msgstr "'%s' dalı '%s' yerel dalını izlemek üzere ayarlandı." - -#: branch.c:104 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s' by rebasing." -msgstr "" -"'%s' dalı '%s' uzak başvurusunu yeniden temellendirme ile izlemek üzere " -"ayarlandı." - -#: branch.c:105 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s'." -msgstr "'%s' dalı '%s' uzak başvurusunu izlemek üzere ayarlandı." - -#: branch.c:109 -#, c-format -msgid "Branch '%s' set up to track local ref '%s' by rebasing." -msgstr "" -"'%s' dalı '%s' yerel başvurusunu yeniden temellendirme ile izlemek üzere " -"ayarlandı." - -#: branch.c:110 -#, c-format -msgid "Branch '%s' set up to track local ref '%s'." -msgstr "'%s' dalı '%s' yerel başvurusunu izlemek üzere ayarlandı." - -#: branch.c:119 -msgid "Unable to write upstream branch configuration" -msgstr "Üstkaynak dal yapılandırması yazılamıyor" - -#: branch.c:156 -#, c-format -msgid "Not tracking: ambiguous information for ref %s" -msgstr "İzlenmiyor: %s başvurusu için belirsiz bilgi" - -#: branch.c:189 -#, c-format -msgid "'%s' is not a valid branch name." -msgstr "'%s' geçerli bir dal adı değil." - -#: branch.c:208 -#, c-format -msgid "A branch named '%s' already exists." -msgstr "'%s' adında bir dal halihazırda var." - -#: branch.c:213 -msgid "Cannot force update the current branch." -msgstr "Geçerli dal zorla güncellenemiyor." - -#: branch.c:233 -#, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "İzleme bilgisi ayarlanamıyor; başlangıç noktası '%s' bir dal değil." - -#: branch.c:235 -#, c-format -msgid "the requested upstream branch '%s' does not exist" -msgstr "istenen üstkaynak dalı '%s' mevcut değil" - -#: branch.c:237 -msgid "" -"\n" -"If you are planning on basing your work on an upstream\n" -"branch that already exists at the remote, you may need to\n" -"run \"git fetch\" to retrieve it.\n" -"\n" -"If you are planning to push out a new local branch that\n" -"will track its remote counterpart, you may want to use\n" -"\"git push -u\" to set the upstream config as you push." -msgstr "" -"\n" -"Eğer çalışmanızı uzak konumda halihazırda var olan bir dal\n" -"üzerine temellendirmeyi tasarlıyorsanız önce \"git fetch\"\n" -"çalıştırarak onu getirmeniz gerekebilir.\n" -"\n" -"Eğer uzak konumdaki eşini izleyecek yerel bir dal itmeyi\n" -"tasarlıyorsanız itme sırasında üstkaynak yapılandırmasını\n" -"da ayarlamak için \"git push -u\" kullanmak isteyebilirsiniz." - -#: branch.c:281 -#, c-format -msgid "Not a valid object name: '%s'." -msgstr "Geçerli bir nesne adı değil: '%s'." - -#: branch.c:301 -#, c-format -msgid "Ambiguous object name: '%s'." -msgstr "Belirsiz nesne adı: '%s'." - -#: branch.c:306 -#, c-format -msgid "Not a valid branch point: '%s'." -msgstr "Geçerli bir dal noktası değil: '%s'." - -#: branch.c:364 -#, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış" - -#: branch.c:387 -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "%s çalışma ağacının HEAD'i güncellenmemiş" - -#: bundle.c:36 -#, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' bir v2 demet dosyası gibi görünmüyor" - -#: bundle.c:64 -#, c-format -msgid "unrecognized header: %s%s (%d)" -msgstr "tanımlanamayan üstbilgi: %s%s (%d)" - -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 -#, c-format -msgid "could not open '%s'" -msgstr "'%s' açılamadı" - -#: bundle.c:143 -msgid "Repository lacks these prerequisite commits:" -msgstr "Depo aşağıdaki önceden gereken gönderilere iye değil:" - -#: bundle.c:146 -msgid "need a repository to verify a bundle" -msgstr "bir demeti doğrulamak için bir depo gerekiyor" - -#: bundle.c:197 -#, c-format -msgid "The bundle contains this ref:" -msgid_plural "The bundle contains these %d refs:" -msgstr[0] "Demet şu başvuruyu içeriyor:" -msgstr[1] "Demet şu %d başvuruyu içeriyor:" - -#: bundle.c:204 -msgid "The bundle records a complete history." -msgstr "Demet tam bir geçmiş kaydını yazar." - -#: bundle.c:206 -#, c-format -msgid "The bundle requires this ref:" -msgid_plural "The bundle requires these %d refs:" -msgstr[0] "Demet şu gönderiyi gerektiriyor:" -msgstr[1] "Demet şu %d gönderiyi gerektiriyor:" - -#: bundle.c:273 -msgid "unable to dup bundle descriptor" -msgstr "demet açıklayıcısı çoğaltılamıyor" - -#: bundle.c:280 -msgid "Could not spawn pack-objects" -msgstr "pack-objects ortaya çıkarılamadı" - -#: bundle.c:291 -msgid "pack-objects died" -msgstr "pack-objects sonlandı" - -#: bundle.c:333 -msgid "rev-list died" -msgstr "rev-list sonlandı" - -#: bundle.c:382 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" -msgstr "'%s' başvurusu revizyon listesi seçenekleri tarafından dışlandı" - -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 -#, c-format -msgid "unrecognized argument: %s" -msgstr "tanımlanamayan değişken: %s" - -#: bundle.c:469 -msgid "Refusing to create empty bundle." -msgstr "Boş demet oluşturma reddediliyor." - -#: bundle.c:479 -#, c-format -msgid "cannot create '%s'" -msgstr "'%s' oluşturulamıyor" - -#: bundle.c:504 -msgid "index-pack died" -msgstr "index-pack sonlandı" - -#: color.c:329 -#, c-format -msgid "invalid color value: %.*s" -msgstr "geçersiz renk değeri: %.*s" - -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 -#, c-format -msgid "could not parse %s" -msgstr "%s ayrıştırılamadı" - -#: commit.c:53 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s bir gönderi değil!" - -#: commit.c:193 -msgid "" -"Support for <GIT_DIR>/info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" -"<GIT_DIR>/info/grafts desteği artık kullanım dışı\n" -"ve ileriki bir Git sürümünde kaldırılacak.\n" -"\n" -"Aşıları değiştirme başvurularına dönüştürmek için\n" -"lütfen \"git replace --convert-graft-file\" kullanın.\n" -"\n" -"\"git config advice.graftFileDeprecated false\"\n" -"kullanarak bu iletiyi kapatabilirsiniz." - -#: commit.c:1153 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "" -"%s gönderisinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından." - -#: commit.c:1157 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "%s gönderisinin hatalı bir GPG imzası var, iddiaya göre %s tarafından." - -#: commit.c:1160 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "%s gönderisinin bir GPG imzası yok." - -#: commit.c:1163 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "%s gönderisinin %s tarafından sağlanan düzgün bir GPG imzası var\n" - -#: commit.c:1417 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" -"Uyarı: Gönderi iletisi UTF-8'e uymadı.\n" -"İletiyi düzelttikten sonra bunu değiştirmek isteyebilir veya\n" -"i18n.commitencoding yapılandırma değişkenini projenizin kullandığı\n" -"kodlama ile değiştirmek isteyebilirsiniz.\n" - -#: commit-graph.c:122 -msgid "commit-graph file is too small" -msgstr "commit-graph dosyası pek küçük" - -#: commit-graph.c:189 -#, c-format -msgid "commit-graph signature %X does not match signature %X" -msgstr "commit-graph imzası %X, %X ile eşleşmiyor" - -#: commit-graph.c:196 -#, c-format -msgid "commit-graph version %X does not match version %X" -msgstr "commit-graph sürümü %x, %X ile eşleşmiyor" - -#: commit-graph.c:203 -#, c-format -msgid "commit-graph hash version %X does not match version %X" -msgstr "commit-graph sağlama sürümü %X, %X ile eşleşmiyor" - -#: commit-graph.c:226 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "" -"commit-graph iri parça arama tablosu girdisi eksik; dosya tam olmayabilir" - -#: commit-graph.c:237 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "commit-graph biçimsiz iri parça ofseti %08x%08x" - -#: commit-graph.c:280 -#, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "commit-graph iri parça numarası %08x birden çok görünüyor" - -#: commit-graph.c:343 -msgid "commit-graph has no base graphs chunk" -msgstr "commit-graph temel grafiği iri parçasına iye değil" - -#: commit-graph.c:353 -msgid "commit-graph chain does not match" -msgstr "commit-graph zinciri eşleşmiyor" - -#: commit-graph.c:401 -#, c-format -msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil" - -#: commit-graph.c:425 -msgid "unable to find all commit-graph files" -msgstr "tüm commit-graph dosyaları bulunamıyor" - -#: commit-graph.c:558 commit-graph.c:618 -msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "geçersiz gönderi konumu. commit-graph büyük olasılıkla hasar görmüş" - -#: commit-graph.c:579 -#, c-format -msgid "could not find commit %s" -msgstr "%s gönderisi bulunamadı" - -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "%s gönderisi ayrıştırılamıyor" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 -#, c-format -msgid "unable to get type of object %s" -msgstr "%s nesnesinin türü alınamıyor" - -#: commit-graph.c:1043 -msgid "Loading known commits in commit graph" -msgstr "Gönderi grafiğindeki bilinen gönderiler yükleniyor" - -#: commit-graph.c:1060 -msgid "Expanding reachable commits in commit graph" -msgstr "Gönderi grafiğindeki ulaşılabilir gönderiler genişletiliyor" - -#: commit-graph.c:1079 -msgid "Clearing commit marks in commit graph" -msgstr "Gönderi grafiğindeki gönderi imleri temizleniyor" - -#: commit-graph.c:1098 -msgid "Computing commit graph generation numbers" -msgstr "Gönderi grafiği kuşak sayıları hesaplanıyor" - -#: commit-graph.c:1173 -#, c-format -msgid "Finding commits for commit graph in %d pack" -msgid_plural "Finding commits for commit graph in %d packs" -msgstr[0] "Gönderi grafiği için gönderiler %d pakette bulunuyor" -msgstr[1] "Gönderi grafiği için gönderiler %d pakette bulunuyor" - -#: commit-graph.c:1186 -#, c-format -msgid "error adding pack %s" -msgstr "%s paketi eklenirken hata" - -#: commit-graph.c:1190 -#, c-format -msgid "error opening index for %s" -msgstr "%s için indeks açılırken hata" - -#: commit-graph.c:1214 -#, c-format -msgid "Finding commits for commit graph from %d ref" -msgid_plural "Finding commits for commit graph from %d refs" -msgstr[0] "Gönderi grafiği için gönderiler %d başvurudan bulunuyor" -msgstr[1] "Gönderi grafiği için gönderiler %d başvurudan bulunuyor" - -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "geçersiz gönderi nesne numarası: %s" - -#: commit-graph.c:1249 -msgid "Finding commits for commit graph among packed objects" -msgstr "" -"Gönderi grafiği için gönderiler paketlenmiş nesneler arasından bulunuyor" - -#: commit-graph.c:1264 -msgid "Counting distinct commits in commit graph" -msgstr "Gönderi grafiğindeki belirgin gönderiler sayılıyor" - -#: commit-graph.c:1294 -msgid "Finding extra edges in commit graph" -msgstr "Gönderi grafiğindeki ek sınırlar bulunuyor" - -#: commit-graph.c:1340 -msgid "failed to write correct number of base graph ids" -msgstr "temel grafiği numaralarının doğru sayısı yazılamadı" - -#: commit-graph.c:1373 midx.c:814 -#, c-format -msgid "unable to create leading directories of %s" -msgstr "%s öncü dizinleri oluşturulamıyor" - -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 -#, c-format -msgid "unable to create '%s'" -msgstr "'%s' oluşturulamıyor" - -#: commit-graph.c:1445 -#, c-format -msgid "Writing out commit graph in %d pass" -msgid_plural "Writing out commit graph in %d passes" -msgstr[0] "Gönderi grafiği %d geçişte yazılıyor" -msgstr[1] "Gönderi grafiği %d geçişte yazılıyor" - -#: commit-graph.c:1486 -msgid "unable to open commit-graph chain file" -msgstr "commit-graph zincir dosyası açılamıyor" - -#: commit-graph.c:1498 -msgid "failed to rename base commit-graph file" -msgstr "temel commit-graph dosyası yeniden adlandırılamadı" - -#: commit-graph.c:1518 -msgid "failed to rename temporary commit-graph file" -msgstr "geçici commit-graph dosyası yeniden adlandırılamadı" - -#: commit-graph.c:1631 -msgid "Scanning merged commits" -msgstr "Birleştirilen gönderiler taranıyor" - -#: commit-graph.c:1642 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "beklenmedik yinelenmiş gönderi numarası %s" - -#: commit-graph.c:1665 -msgid "Merging commit-graph" -msgstr "commit-graph birleştiriliyor" - -#: commit-graph.c:1844 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "gönderi grafiği biçimi %d gönderiyi yazamıyor" - -#: commit-graph.c:1855 -msgid "too many commits to write graph" -msgstr "grafik yazabilmek için çok fazla gönderi" - -#: commit-graph.c:1944 -msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "" -"commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar " -"görmüş" - -#: commit-graph.c:1954 -#, c-format -msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "commit-graph hatalı nesne tanımlayıcı sırasına iye: %s, sonra %s" - -#: commit-graph.c:1964 commit-graph.c:1979 -#, c-format -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u" - -#: commit-graph.c:1971 -#, c-format -msgid "failed to parse commit %s from commit-graph" -msgstr "%s gönderisi commit-graph'tan ayrıştırılamadı" - -#: commit-graph.c:1989 -msgid "Verifying commits in commit graph" -msgstr "Gönderi grafiğindeki gönderiler doğrulanıyor" - -#: commit-graph.c:2003 -#, c-format -msgid "failed to parse commit %s from object database for commit-graph" -msgstr "" -"%s gönderisi commit-graph için olan nesne veritabanından ayrıştırılamadı" - -#: commit-graph.c:2010 -#, c-format -msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "" -"commit-graph'teki %s gönderisi için olan kök ağaç nesne tanımlayıcısı %s != " -"%s" - -#: commit-graph.c:2020 -#, c-format -msgid "commit-graph parent list for commit %s is too long" -msgstr "%s gönderisi için olan commit-graph üst öge listesi çok uzun" - -#: commit-graph.c:2029 -#, c-format -msgid "commit-graph parent for %s is %s != %s" -msgstr "%s için olan commit-graph üst ögesi %s != %s" - -#: commit-graph.c:2042 -#, c-format -msgid "commit-graph parent list for commit %s terminates early" -msgstr "" -"%s gönderisi için olan commit-graph üst öge listesi erkenden sonlanıyor" - -#: commit-graph.c:2047 -#, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "" -"%s gönderisi için commit-graph kuşak sayısı sıfır ancak başka yerlerde " -"sıfırdan farklı" - -#: commit-graph.c:2051 -#, c-format -msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "" -"%s gönderisi için commit-graph kuşak sayısı sıfırdan farklı, ancak başka " -"yerlerde sıfır" - -#: commit-graph.c:2066 -#, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "%s gönderisi için commit-graph kuşağı %u != %u" - -#: commit-graph.c:2072 -#, c-format -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "" -"%s gönderisi için commit-graph içindeki gönderi tarihi %<PRIuMAX> != " -"%<PRIuMAX>" - -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "bellek tükendi" - -#: config.c:124 -#, c-format -msgid "" -"exceeded maximum include depth (%d) while including\n" -"\t%s\n" -"from\n" -"\t%s\n" -"This might be due to circular includes." -msgstr "" -"şu içerilirken olabilecek en çok içerme derinliği (%d) aşıldı\n" -"\t%s\n" -"şuradan:\n" -"\t%s\n" -"Bu dairesel içermelerden dolayı olabilir." - -#: config.c:140 -#, c-format -msgid "could not expand include path '%s'" -msgstr "içerme yolu '%s' genişletilemedi" - -#: config.c:151 -msgid "relative config includes must come from files" -msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli" - -#: config.c:197 -msgid "relative config include conditionals must come from files" -msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli" - -#: config.c:376 -#, c-format -msgid "key does not contain a section: %s" -msgstr "anahtar bir bölüm içermiyor: %s" - -#: config.c:382 -#, c-format -msgid "key does not contain variable name: %s" -msgstr "anahtar bir değişken adı içermiyor: %s" - -#: config.c:406 sequencer.c:2444 -#, c-format -msgid "invalid key: %s" -msgstr "geçersiz anahtar: %s" - -#: config.c:412 -#, c-format -msgid "invalid key (newline): %s" -msgstr "geçersiz anahtar (yenisatır): %s" - -#: config.c:448 config.c:460 -#, c-format -msgid "bogus config parameter: %s" -msgstr "düzmece yapılandırma parametresi: %s" - -#: config.c:495 -#, c-format -msgid "bogus format in %s" -msgstr "%s içinde düzmece biçim" - -#: config.c:821 -#, c-format -msgid "bad config line %d in blob %s" -msgstr "hatalı yapılandırma satırı %d, %s ikili nesnesi içinde" - -#: config.c:825 -#, c-format -msgid "bad config line %d in file %s" -msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde" - -#: config.c:829 -#, c-format -msgid "bad config line %d in standard input" -msgstr "standart girdi içinde hatalı yapılandırma satırı %d" - -#: config.c:833 -#, c-format -msgid "bad config line %d in submodule-blob %s" -msgstr "hatalı yapılandırma satırı %d, %s altmodül ikili nesnesi içinde" - -#: config.c:837 -#, c-format -msgid "bad config line %d in command line %s" -msgstr "hatalı yapılandırma satırı %d, %s komut satırı içinde" - -#: config.c:841 -#, c-format -msgid "bad config line %d in %s" -msgstr "hatalı yapılandırma satırı %d, %s içinde" - -#: config.c:978 -msgid "out of range" -msgstr "erim dışı" - -#: config.c:978 -msgid "invalid unit" -msgstr "geçersiz birim" - -#: config.c:979 -#, c-format -msgid "bad numeric config value '%s' for '%s': %s" -msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için: %s" - -#: config.c:998 -#, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "" -"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s ikili nesnesi içinde: " -"%s" - -#: config.c:1001 -#, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "" -"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s dosyası içinde: %s" - -#: config.c:1004 -#, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "" -"hatalı sayısal yapılandırma değeri '%s', '%s' için, standart girdi içinde: %s" - -#: config.c:1007 -#, c-format -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "" -"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s altmodül ikili " -"nesnesi içinde: %s" - -#: config.c:1010 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "" -"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s komut satırı içinde: " -"%s" - -#: config.c:1013 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s içinde: %s" - -#: config.c:1108 -#, c-format -msgid "failed to expand user dir in: '%s'" -msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'" - -#: config.c:1117 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "%s', '%s' için geçerli bir zaman damgası değil" - -#: config.c:1208 -#, c-format -msgid "abbrev length out of range: %d" -msgstr "kısaltma uzunluğu erim dışında: %d" - -#: config.c:1222 config.c:1233 -#, c-format -msgid "bad zlib compression level %d" -msgstr "hatalı zlib sıkıştırma düzeyi %d" - -#: config.c:1325 -msgid "core.commentChar should only be one character" -msgstr "core.commentChar yalnızca bir karakter olmalı" - -#: config.c:1358 -#, c-format -msgid "invalid mode for object creation: %s" -msgstr "nesne oluşturma için geçersiz kip: %s" - -#: config.c:1430 -#, c-format -msgid "malformed value for %s" -msgstr "%s için hatalı oluşturulmuş değer" - -#: config.c:1456 -#, c-format -msgid "malformed value for %s: %s" -msgstr "%s için hatalı oluşturulmuş değer: %s" - -#: config.c:1457 -msgid "must be one of nothing, matching, simple, upstream or current" -msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı" - -#: config.c:1518 builtin/pack-objects.c:3541 -#, c-format -msgid "bad pack compression level %d" -msgstr "hatalı paket sıkıştırma düzeyi %d" - -#: config.c:1639 -#, c-format -msgid "unable to load config blob object '%s'" -msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor" - -#: config.c:1642 -#, c-format -msgid "reference '%s' does not point to a blob" -msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor" - -#: config.c:1659 -#, c-format -msgid "unable to resolve config blob '%s'" -msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor" - -#: config.c:1689 -#, c-format -msgid "failed to parse %s" -msgstr "%s ayrıştırılamadı" - -#: config.c:1743 -msgid "unable to parse command-line config" -msgstr "komut satırı yapılandırması ayrıştırılamıyor" - -#: config.c:2097 -msgid "unknown error occurred while reading the configuration files" -msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu" - -#: config.c:2267 -#, c-format -msgid "Invalid %s: '%s'" -msgstr "Geçersiz %s: '%s'" - -#: config.c:2312 -#, c-format -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "splitIndex.maxPercentChange değeri '%d' 0 ve 100 arasında olmalı" - -#: config.c:2358 -#, c-format -msgid "unable to parse '%s' from command-line config" -msgstr "'%s' komut satırı yapılandırmasından ayrıştırılamıyor" - -#: config.c:2360 -#, c-format -msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "hatalı yapılandırma değişkeni '%s', '%s' dosyası %d. satırda" - -#: config.c:2441 -#, c-format -msgid "invalid section name '%s'" -msgstr "geçersiz bölüm adı '%s'" - -#: config.c:2473 -#, c-format -msgid "%s has multiple values" -msgstr "%s birden çok değere iye" - -#: config.c:2502 -#, c-format -msgid "failed to write new configuration file %s" -msgstr "yeni yapılandırma dosyası %s yazılamadı" - -#: config.c:2754 config.c:3078 -#, c-format -msgid "could not lock config file %s" -msgstr "%s yapılandırma dosyası kilitlenemedi" - -#: config.c:2765 -#, c-format -msgid "opening %s" -msgstr "%s açılıyor" - -#: config.c:2800 builtin/config.c:344 -#, c-format -msgid "invalid pattern: %s" -msgstr "geçersiz dizgi: %s" - -#: config.c:2825 -#, c-format -msgid "invalid config file %s" -msgstr "geçersiz yapılandırma dosyası %s" - -#: config.c:2838 config.c:3091 -#, c-format -msgid "fstat on %s failed" -msgstr "%s üzerinde fstat başarısız oldu" - -#: config.c:2849 -#, c-format -msgid "unable to mmap '%s'" -msgstr "'%s' mmap yapılamıyor" - -#: config.c:2858 config.c:3096 -#, c-format -msgid "chmod on %s failed" -msgstr "%s üzerinde chmod başarısız oldu" - -#: config.c:2943 config.c:3193 -#, c-format -msgid "could not write config file %s" -msgstr "%s yapılandırma dosyası yazılamadı" - -#: config.c:2977 -#, c-format -msgid "could not set '%s' to '%s'" -msgstr "'%s', '%s' olarak ayarlanamadı" - -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 -#, c-format -msgid "could not unset '%s'" -msgstr "'%s' ayarı geri alınamadı" - -#: config.c:3069 -#, c-format -msgid "invalid section name: %s" -msgstr "geçersiz bölüm adı: %s" - -#: config.c:3236 -#, c-format -msgid "missing value for '%s'" -msgstr "'%s' için değer eksik" - -#: connect.c:61 -msgid "the remote end hung up upon initial contact" -msgstr "uzak uç ilk iletişimle birlikte hattı kapattı" - -#: connect.c:63 -msgid "" -"Could not read from remote repository.\n" -"\n" -"Please make sure you have the correct access rights\n" -"and the repository exists." -msgstr "" -"Uzak konum deposu okunamadı.\n" -"\n" -"Lütfen doğru erişim haklarına iye olduğunuzdan ve\n" -"deponun var olduğundan emin olun." - -#: connect.c:81 -#, c-format -msgid "server doesn't support '%s'" -msgstr "sunucu '%s' desteklemiyor" - -#: connect.c:103 -#, c-format -msgid "server doesn't support feature '%s'" -msgstr "sunucu '%s' özelliğini desteklemiyor" - -#: connect.c:114 -msgid "expected flush after capabilities" -msgstr "yeteneklerden sonra floş bekleniyordu" - -#: connect.c:233 -#, c-format -msgid "ignoring capabilities after first line '%s'" -msgstr "'%s' ilk satırından sonra yetenekler yok sayılıyor" - -#: connect.c:252 -msgid "protocol error: unexpected capabilities^{}" -msgstr "protokol hatası: beklenmedik yetenekler^{}" - -#: connect.c:273 -#, c-format -msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "protokol hatası: sığ sha-1 bekleniyordu, '%s' alındı" - -#: connect.c:275 -msgid "repository on the other end cannot be shallow" -msgstr "diğer uçtaki depo sığ olamaz" - -#: connect.c:313 -msgid "invalid packet" -msgstr "geçersiz paket" - -#: connect.c:333 -#, c-format -msgid "protocol error: unexpected '%s'" -msgstr "protokol hatası: beklenmedik '%s'" - -#: connect.c:441 -#, c-format -msgid "invalid ls-refs response: %s" -msgstr "geçersiz ls-refs yanıtı: %s" - -#: connect.c:445 -msgid "expected flush after ref listing" -msgstr "başvuru listelemesinden sonra floş bekleniyordu" - -#: connect.c:544 -#, c-format -msgid "protocol '%s' is not supported" -msgstr "'%s' protokolü desteklenmiyor" - -#: connect.c:595 -msgid "unable to set SO_KEEPALIVE on socket" -msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor" - -#: connect.c:635 connect.c:698 -#, c-format -msgid "Looking up %s ... " -msgstr "%s aranıyor..." - -#: connect.c:639 -#, c-format -msgid "unable to look up %s (port %s) (%s)" -msgstr "%s aranamıyor (kapı %s) (%s)" - -#. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 -#, c-format -msgid "" -"done.\n" -"Connecting to %s (port %s) ... " -msgstr "" -"bitti.\n" -"Şuraya bağlanıyor: %s (kapı %s)..." - -#: connect.c:665 connect.c:742 -#, c-format -msgid "" -"unable to connect to %s:\n" -"%s" -msgstr "" -"şuraya bağlanamıyor: %s:\n" -"%s" - -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 -msgid "done." -msgstr "bitti." - -#: connect.c:702 -#, c-format -msgid "unable to look up %s (%s)" -msgstr "%s aranamıyor (%s)" - -#: connect.c:708 -#, c-format -msgid "unknown port %s" -msgstr "bilinmeyen kapı %s" - -#: connect.c:845 connect.c:1175 -#, c-format -msgid "strange hostname '%s' blocked" -msgstr "garip makine adı '%s' engellendi" - -#: connect.c:847 -#, c-format -msgid "strange port '%s' blocked" -msgstr "garip kapı '%s' engellendi" - -#: connect.c:857 -#, c-format -msgid "cannot start proxy %s" -msgstr "vekil %s başlatılamıyor" - -#: connect.c:928 -msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "yol belirtilmedi; geçerli url sözdizimi için 'git help pull' yazın" - -#: connect.c:1123 -msgid "ssh variant 'simple' does not support -4" -msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor" - -#: connect.c:1135 -msgid "ssh variant 'simple' does not support -6" -msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor" - -#: connect.c:1152 -msgid "ssh variant 'simple' does not support setting port" -msgstr "ssh değişik biçimi 'simple' kapı ayarlamayı desteklemiyor" - -#: connect.c:1264 -#, c-format -msgid "strange pathname '%s' blocked" -msgstr "garip yol adı '%s' engellendi" - -#: connect.c:1311 -msgid "unable to fork" -msgstr "çatallanamıyor" - -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 -msgid "Checking connectivity" -msgstr "Bağlantı denetleniyor" - -#: connected.c:110 -msgid "Could not run 'git rev-list'" -msgstr "'git rev-list' çalıştırılamadı" - -#: connected.c:130 -msgid "failed write to rev-list" -msgstr "rev-list yazılamadı" - -#: connected.c:137 -msgid "failed to close rev-list's stdin" -msgstr "rev-list'in stdin'i kapatılamadı" - -#: convert.c:194 -#, c-format -msgid "illegal crlf_action %d" -msgstr "izin verilmeyen crlf_action %d" - -#: convert.c:207 -#, c-format -msgid "CRLF would be replaced by LF in %s" -msgstr "CRLF %s içinde LF ile değiştirilecek" - -#: convert.c:209 -#, c-format -msgid "" -"CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"CRLF %s içinde LF ile değiştirilecek.\n" -"Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak." - -#: convert.c:217 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "LF %s içinde CRLF ile değiştirilecek" - -#: convert.c:219 -#, c-format -msgid "" -"LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"LF %s içinde CRLF ile değiştirilecek.\n" -"Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak." - -#: convert.c:284 -#, c-format -msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "BOM '%s' içinde yasaklı, eğer %s olarak kodlanmışsa" - -#: convert.c:291 -#, c-format -msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." -msgstr "" -"'%s' dosyası bir bayt sıra imi (BOM) içeriyor. Lütfen çalışma ağacı " -"kodlaması için UTF-%.*s kullanın." - -#: convert.c:304 -#, c-format -msgid "BOM is required in '%s' if encoded as %s" -msgstr "BOM '%s' içinde gerekli, eğer %s olarak kodlanmışsa" - -#: convert.c:306 -#, c-format -msgid "" -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" -"%sLE (depending on the byte order) as working-tree-encoding." -msgstr "" -"'%s' dosyasında bir bayt sıra imi (BOM) eksik. Lütfen çalışma ağacı " -"kodlaması için UTF-%sBE veya UTF-%sLE (bayt sırasına göre) kullanın." - -#: convert.c:419 convert.c:490 -#, c-format -msgid "failed to encode '%s' from %s to %s" -msgstr "'%s', %s değerinden %s değerine kodlanamadı" - -#: convert.c:462 -#, c-format -msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "" -"'%s' kodlamasını %s -> %s biçiminde yapıp tersine döndürmek aynı şey değil" - -#: convert.c:668 -#, c-format -msgid "cannot fork to run external filter '%s'" -msgstr "'%s' dış süzgecini çalıştırmak için çatallama yapılamıyor" - -#: convert.c:688 -#, c-format -msgid "cannot feed the input to external filter '%s'" -msgstr "girdi '%s' dış süzgecine beslenemiyor" - -#: convert.c:695 -#, c-format -msgid "external filter '%s' failed %d" -msgstr "'%s' dış süzgeci %d için başarısız oldu" - -#: convert.c:730 convert.c:733 -#, c-format -msgid "read from external filter '%s' failed" -msgstr "'%s' dış süzgecinden okuma başarısız oldu" - -#: convert.c:736 convert.c:791 -#, c-format -msgid "external filter '%s' failed" -msgstr "'%s' dış süzgeci başarısız oldu" - -#: convert.c:839 -msgid "unexpected filter type" -msgstr "beklenmedik süzgeç türü" - -#: convert.c:850 -msgid "path name too long for external filter" -msgstr "dış süzgeç için yol adı pek uzun" - -#: convert.c:924 -#, c-format -msgid "" -"external filter '%s' is not available anymore although not all paths have " -"been filtered" -msgstr "" -"'%s' dış süzgeci artık kullanılamıyor, ancak tüm yolların süzümü bitmedi" - -#: convert.c:1223 -msgid "true/false are no valid working-tree-encodings" -msgstr "doğru/yanlış geçerli bir çalışma ağacı kodlaması değil" - -#: convert.c:1411 convert.c:1445 -#, c-format -msgid "%s: clean filter '%s' failed" -msgstr "%s: temiz süzgeç '%s' başarısız oldu" - -#: convert.c:1489 -#, c-format -msgid "%s: smudge filter %s failed" -msgstr "%s: kir süzgeci %s başarısız oldu" - -#: date.c:138 -msgid "in the future" -msgstr "gelecekte" - -#: date.c:144 -#, c-format -msgid "%<PRIuMAX> second ago" -msgid_plural "%<PRIuMAX> seconds ago" -msgstr[0] "%<PRIuMAX> saniye önce" -msgstr[1] "%<PRIuMAX> saniye önce" - -#: date.c:151 -#, c-format -msgid "%<PRIuMAX> minute ago" -msgid_plural "%<PRIuMAX> minutes ago" -msgstr[0] "%<PRIuMAX> dakika önce" -msgstr[1] "%<PRIuMAX> dakika önce" - -#: date.c:158 -#, c-format -msgid "%<PRIuMAX> hour ago" -msgid_plural "%<PRIuMAX> hours ago" -msgstr[0] "%<PRIuMAX> saat önce" -msgstr[1] "%<PRIuMAX> saat önce" - -#: date.c:165 -#, c-format -msgid "%<PRIuMAX> day ago" -msgid_plural "%<PRIuMAX> days ago" -msgstr[0] "%<PRIuMAX> gün önce" -msgstr[1] "%<PRIuMAX> gün önce" - -#: date.c:171 -#, c-format -msgid "%<PRIuMAX> week ago" -msgid_plural "%<PRIuMAX> weeks ago" -msgstr[0] "%<PRIuMAX> hafta önce" -msgstr[1] "%<PRIuMAX> hafta önce" - -#: date.c:178 -#, c-format -msgid "%<PRIuMAX> month ago" -msgid_plural "%<PRIuMAX> months ago" -msgstr[0] "%<PRIuMAX> ay önce" -msgstr[1] "%<PRIuMAX> ay önce" - -#: date.c:189 -#, c-format -msgid "%<PRIuMAX> year" -msgid_plural "%<PRIuMAX> years" -msgstr[0] "%<PRIuMAX> yıl" -msgstr[1] "%<PRIuMAX> yıl" - -#. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 -#, c-format -msgid "%s, %<PRIuMAX> month ago" -msgid_plural "%s, %<PRIuMAX> months ago" -msgstr[0] "%s, %<PRIuMAX> ay önce" -msgstr[1] "%s, %<PRIuMAX> ay önce" - -#: date.c:197 date.c:202 -#, c-format -msgid "%<PRIuMAX> year ago" -msgid_plural "%<PRIuMAX> years ago" -msgstr[0] "%<PRIuMAX> yıl önce" -msgstr[1] "%<PRIuMAX> yıl önce" - -#: delta-islands.c:272 -msgid "Propagating island marks" -msgstr "Delta adası imleri yayılıyor" - -#: delta-islands.c:290 -#, c-format -msgid "bad tree object %s" -msgstr "hatalı ağaç nesnesi %s" - -#: delta-islands.c:334 -#, c-format -msgid "failed to load island regex for '%s': %s" -msgstr "'%s' için delta adası düzenli ifadesi yüklenemedi: %s" - -#: delta-islands.c:390 -#, c-format -msgid "island regex from config has too many capture groups (max=%d)" -msgstr "" -"yapılandırmanın delta adası düzenli ifadesinde çok fazla yakalama grubu var " -"(en çok %d)" - -#: delta-islands.c:467 -#, c-format -msgid "Marked %d islands, done.\n" -msgstr "%d delta adası imlendi, bitti.\n" - -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "orderfile '%s' okunamadı" - -#: diffcore-rename.c:543 -msgid "Performing inexact rename detection" -msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor" - -#: diff-no-index.c:238 -msgid "git diff --no-index [<options>] <path> <path>" -msgstr "git diff --no-index [<seçenekler>] <yol> <yol>" - -#: diff-no-index.c:263 -msgid "" -"Not a git repository. Use --no-index to compare two paths outside a working " -"tree" -msgstr "" -"Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak " -"için --no-index kullanın." - -#: diff.c:155 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " dirstat kesim yüzdesi '%s' ayrıştırılamadı\n" - -#: diff.c:160 -#, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr " Bilinmeyen dirstat parametresi '%s'\n" - -#: diff.c:296 -msgid "" -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " -"'dimmed-zebra', 'plain'" -msgstr "" -"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', " -"'plain' seçeneklerinden biri olmalıdır" - -#: diff.c:324 -#, c-format -msgid "" -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" -msgstr "" -"bilinmeyen color-moved-ws kipi '%s', olabilecek değerler: 'ignore-space-" -"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'" - -#: diff.c:332 -msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other " -"whitespace modes" -msgstr "" -"color-moved-ws: allow-indentation-change diğer boşluk kipleri ile birlikte " -"kullanılamaz" - -#: diff.c:405 -#, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "'diff.submodule' yapılandırma değişkeni için bilinmeyen değer: '%s'" - -#: diff.c:465 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" -"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n" -"%s" - -#: diff.c:4202 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "dış diff sonlandı, %s konumunda durdu" - -#: diff.c:4547 -msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz" - -#: diff.c:4550 -msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-G, -S ve --find-object birlikte kullanılmaz" - -#: diff.c:4628 -msgid "--follow requires exactly one pathspec" -msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor" - -#: diff.c:4676 -#, c-format -msgid "invalid --stat value: %s" -msgstr "geçersiz --stat değeri: %s" - -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 -#, c-format -msgid "%s expects a numerical value" -msgstr "%s bir sayısal değer bekliyor" - -#: diff.c:4713 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" -"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n" -"%s" - -#: diff.c:4798 -#, c-format -msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "şurada bilinmeyen değişiklik sınıfı '%c': -diff-filter=%s" - -#: diff.c:4822 -#, c-format -msgid "unknown value after ws-error-highlight=%.*s" -msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s" - -#: diff.c:4836 -#, c-format -msgid "unable to resolve '%s'" -msgstr "'%s' çözülemiyor" - -#: diff.c:4886 diff.c:4892 -#, c-format -msgid "%s expects <n>/<m> form" -msgstr "%s <n>/<m> biçimi bekliyor" - -#: diff.c:4904 -#, c-format -msgid "%s expects a character, got '%s'" -msgstr "%s bir karakter bekliyor, '%s' aldı" - -#: diff.c:4925 -#, c-format -msgid "bad --color-moved argument: %s" -msgstr "hatalı --color-moved değişkeni: %s" - -#: diff.c:4944 -#, c-format -msgid "invalid mode '%s' in --color-moved-ws" -msgstr "--color-moved-ws içinde geçersiz kip '%s'" - -#: diff.c:4984 -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", " -"\"patience\" ve \"histogram\"" - -#: diff.c:5020 diff.c:5040 -#, c-format -msgid "invalid argument to %s" -msgstr "%s için geçersiz değişken" - -#: diff.c:5178 -#, c-format -msgid "failed to parse --submodule option parameter: '%s'" -msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'" - -#: diff.c:5234 -#, c-format -msgid "bad --word-diff argument: %s" -msgstr "hatalı --word-diff değişkeni: %s" - -#: diff.c:5257 -msgid "Diff output format options" -msgstr "Diff çıktısı biçimlendirme seçenekleri" - -#: diff.c:5259 diff.c:5265 -msgid "generate patch" -msgstr "yama oluştur" - -#: diff.c:5262 builtin/log.c:173 -msgid "suppress diff output" -msgstr "diff çıktısını gizle" - -#: diff.c:5267 diff.c:5381 diff.c:5388 -msgid "<n>" -msgstr "<n>" - -#: diff.c:5268 diff.c:5271 -msgid "generate diffs with <n> lines context" -msgstr "diff'leri <n> satır bağlamlı oluştur" - -#: diff.c:5273 -msgid "generate the diff in raw format" -msgstr "diff'i ham biçimde oluştur" - -#: diff.c:5276 -msgid "synonym for '-p --raw'" -msgstr "'-p --raw eşanlamlısı" - -#: diff.c:5280 -msgid "synonym for '-p --stat'" -msgstr "'-p --stat eşanlamlısı" - -#: diff.c:5284 -msgid "machine friendly --stat" -msgstr "makinede okunabilen --stat" - -#: diff.c:5287 -msgid "output only the last line of --stat" -msgstr "--stat'ın yalnızca son satırını çıktı ver" - -#: diff.c:5289 diff.c:5297 -msgid "<param1,param2>..." -msgstr "<param1,param2>..." - -#: diff.c:5290 -msgid "" -"output the distribution of relative amount of changes for each sub-directory" -msgstr "" -"her alt dizin için göreceli bir miktar değişikliğin dağıtımını çıktı ver" - -#: diff.c:5294 -msgid "synonym for --dirstat=cumulative" -msgstr "--dirstat-cumulative eşanlamlısı" - -#: diff.c:5298 -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "--dirstat=files,param1,param2... eşanlamlısı" - -#: diff.c:5302 -msgid "warn if changes introduce conflict markers or whitespace errors" -msgstr "" -"değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar" - -#: diff.c:5305 -msgid "condensed summary such as creations, renames and mode changes" -msgstr "" -"sıkışık özet; örn. oluşumlar, yeniden adlandırmalar ve kip değişiklikleri" - -#: diff.c:5308 -msgid "show only names of changed files" -msgstr "yalnızca değiştirilen dosyaların adlarını göster" - -#: diff.c:5311 -msgid "show only names and status of changed files" -msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster" - -#: diff.c:5313 -msgid "<width>[,<name-width>[,<count>]]" -msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]" - -#: diff.c:5314 -msgid "generate diffstat" -msgstr "diffstat oluştur" - -#: diff.c:5316 diff.c:5319 diff.c:5322 -msgid "<width>" -msgstr "<genişlik>" - -#: diff.c:5317 -msgid "generate diffstat with a given width" -msgstr "diffstat'ı verilmiş bir genişlik ile oluştur" - -#: diff.c:5320 -msgid "generate diffstat with a given name width" -msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur" - -#: diff.c:5323 -msgid "generate diffstat with a given graph width" -msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur" - -#: diff.c:5325 -msgid "<count>" -msgstr "<sayım>" - -#: diff.c:5326 -msgid "generate diffstat with limited lines" -msgstr "diffstat'ı kısıtlı satırlarla oluştur" - -#: diff.c:5329 -msgid "generate compact summary in diffstat" -msgstr "diffstat içinde ufak özet oluştur" - -#: diff.c:5332 -msgid "output a binary diff that can be applied" -msgstr "uygulanabilir bir ikili diff çıktısı ver" - -#: diff.c:5335 -msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "\"index\" satırlarında tam ön ve songörüntü nesne adlarını göster" - -#: diff.c:5337 -msgid "show colored diff" -msgstr "renkli diff göster" - -#: diff.c:5338 -msgid "<kind>" -msgstr "<tür>" - -#: diff.c:5339 -msgid "" -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " -"diff" -msgstr "" -"diff'teki boşluk hatalarını 'context', 'old' veya 'new' satırlarında vurgula" - -#: diff.c:5342 -msgid "" -"do not munge pathnames and use NULs as output field terminators in --raw or " -"--numstat" -msgstr "" -"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı " -"sonlandırıcıları olarak NUL'ları kullan" - -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 -msgid "<prefix>" -msgstr "<önek>" - -#: diff.c:5346 -msgid "show the given source prefix instead of \"a/\"" -msgstr "\"a/\" yerine verilmiş kaynak önekini göster" - -#: diff.c:5349 -msgid "show the given destination prefix instead of \"b/\"" -msgstr "\"b/\"yerine verilmiş kaynak önekini göster" - -#: diff.c:5352 -msgid "prepend an additional prefix to every line of output" -msgstr "çıktının her satırının başına ek bir önek ekle" - -#: diff.c:5355 -msgid "do not show any source or destination prefix" -msgstr "hiçbir kaynak ve hedef önekini gösterme" - -#: diff.c:5358 -msgid "show context between diff hunks up to the specified number of lines" -msgstr "diff parçaları arasındaki bağlamı belirtilen satır sayısı kadar göster" - -#: diff.c:5362 diff.c:5367 diff.c:5372 -msgid "<char>" -msgstr "<karakter>" - -#: diff.c:5363 -msgid "specify the character to indicate a new line instead of '+'" -msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle" - -#: diff.c:5368 -msgid "specify the character to indicate an old line instead of '-'" -msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle" - -#: diff.c:5373 -msgid "specify the character to indicate a context instead of ' '" -msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle" - -#: diff.c:5376 -msgid "Diff rename options" -msgstr "Diff yeniden adlandırma seçenekleri" - -#: diff.c:5377 -msgid "<n>[/<m>]" -msgstr "<n>[/<m>]" - -#: diff.c:5378 -msgid "break complete rewrite changes into pairs of delete and create" -msgstr "tam yeniden yazım değişikliklerini silme ve oluşturma olarak ayır" - -#: diff.c:5382 -msgid "detect renames" -msgstr "yeniden adlandırmaları algıla" - -#: diff.c:5386 -msgid "omit the preimage for deletes" -msgstr "silmeler için öngörüntüyü atla" - -#: diff.c:5389 -msgid "detect copies" -msgstr "kopyaları algıla" - -#: diff.c:5393 -msgid "use unmodified files as source to find copies" -msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan" - -#: diff.c:5395 -msgid "disable rename detection" -msgstr "yeniden adlandırma algılamasını devre dışı bırak" - -#: diff.c:5398 -msgid "use empty blobs as rename source" -msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan" - -#: diff.c:5400 -msgid "continue listing the history of a file beyond renames" -msgstr "" -"bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür" - -#: diff.c:5403 -msgid "" -"prevent rename/copy detection if the number of rename/copy targets exceeds " -"given limit" -msgstr "" -"eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa " -"yeniden adlandırma/kopyalama algılamasını önle" - -#: diff.c:5405 -msgid "Diff algorithm options" -msgstr "Diff algoritma seçenekleri" - -#: diff.c:5407 -msgid "produce the smallest possible diff" -msgstr "olabilecek en küçük diff'i üret" - -#: diff.c:5410 -msgid "ignore whitespace when comparing lines" -msgstr "satırları karşılaştırırken boşlukları yok say" - -#: diff.c:5413 -msgid "ignore changes in amount of whitespace" -msgstr "boşluk sayısındaki değişiklikleri yok say" - -#: diff.c:5416 -msgid "ignore changes in whitespace at EOL" -msgstr "satır sonundaki boşluk değişikliklerini yok say" - -#: diff.c:5419 -msgid "ignore carrier-return at the end of line" -msgstr "satır sonundaki satırbaşı karakterini yok say" - -#: diff.c:5422 -msgid "ignore changes whose lines are all blank" -msgstr "satırlarının tümü boş olan değişiklikleri yok say" - -#: diff.c:5425 -msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "diff parça sınırlarını kolay okuma için bulgusal olarak kaydır" - -#: diff.c:5428 -msgid "generate diff using the \"patience diff\" algorithm" -msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur" - -#: diff.c:5432 -msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur" - -#: diff.c:5434 -msgid "<algorithm>" -msgstr "<algoritma>" - -#: diff.c:5435 -msgid "choose a diff algorithm" -msgstr "bir diff algoritması seç" - -#: diff.c:5437 -msgid "<text>" -msgstr "<metin>" - -#: diff.c:5438 -msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur" - -#: diff.c:5440 diff.c:5449 diff.c:5452 -msgid "<mode>" -msgstr "<kip>" - -#: diff.c:5441 -msgid "show word diff, using <mode> to delimit changed words" -msgstr "" -"sözcük diff'ini değiştirilen sözcükleri sınırlandırmak için <kip> kullanarak " -"göster" - -#: diff.c:5443 diff.c:5446 diff.c:5491 -msgid "<regex>" -msgstr "<ifade>" - -#: diff.c:5444 -msgid "use <regex> to decide what a word is" -msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan" - -#: diff.c:5447 -msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" -msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>" - -#: diff.c:5450 -msgid "moved lines of code are colored differently" -msgstr "taşınan kod satırları farklı renklendirilir" - -#: diff.c:5453 -msgid "how white spaces are ignored in --color-moved" -msgstr "boşluklar --color-moved içinde nasıl yok sayılır" - -#: diff.c:5456 -msgid "Other diff options" -msgstr "Diğer diff seçenekleri" - -#: diff.c:5458 -msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "" -"altdizinden çalıştırıldığında dışarıdaki değişiklikleri hariç tut ve " -"göreceli yolları göster" - -#: diff.c:5462 -msgid "treat all files as text" -msgstr "tüm dosyaları metin olarak varsay" - -#: diff.c:5464 -msgid "swap two inputs, reverse the diff" -msgstr "iki girdiyi değiştir, diff'i tersine döndür" - -#: diff.c:5466 -msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık" - -#: diff.c:5468 -msgid "disable all output of the program" -msgstr "tüm program çıktısını devre dışı bırak" - -#: diff.c:5470 -msgid "allow an external diff helper to be executed" -msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver" - -#: diff.c:5472 -msgid "run external text conversion filters when comparing binary files" -msgstr "" -"ikili dosyaları karşılaştırırken dış metin dönüştürme süzgeçlerini çalıştır" - -#: diff.c:5474 -msgid "<when>" -msgstr "<ne-zaman>" - -#: diff.c:5475 -msgid "ignore changes to submodules in the diff generation" -msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say" - -#: diff.c:5478 -msgid "<format>" -msgstr "<biçim>" - -#: diff.c:5479 -msgid "specify how differences in submodules are shown" -msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt" - -#: diff.c:5483 -msgid "hide 'git add -N' entries from the index" -msgstr "indeksten 'git add -N' girdilerini gizle" - -#: diff.c:5486 -msgid "treat 'git add -N' entries as real in the index" -msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran" - -#: diff.c:5488 -msgid "<string>" -msgstr "<dizi>" - -#: diff.c:5489 -msgid "" -"look for differences that change the number of occurrences of the specified " -"string" -msgstr "belirtilen dizinin görülme sayısını değiştiren ayrımlara bak" - -#: diff.c:5492 -msgid "" -"look for differences that change the number of occurrences of the specified " -"regex" -msgstr "belirtilen düzenli ifadenin görülme sayısını değiştiren ayrımlara bak" - -#: diff.c:5495 -msgid "show all changes in the changeset with -S or -G" -msgstr "değişiklik setinde -S veya -G içeren tüm değişiklikleri göster" - -#: diff.c:5498 -msgid "treat <string> in -S as extended POSIX regular expression" -msgstr "-S içindeki <dizi>'yi genişletilmiş POSIX düzenli ifadesi olarak işle" - -#: diff.c:5501 -msgid "control the order in which files appear in the output" -msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle" - -#: diff.c:5502 -msgid "<object-id>" -msgstr "<nesne-no>" - -#: diff.c:5503 -msgid "" -"look for differences that change the number of occurrences of the specified " -"object" -msgstr "belirtilen nesnenin görülme sayısını değiştiren ayrımlara bak" - -#: diff.c:5505 -msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" -msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" - -#: diff.c:5506 -msgid "select files by diff type" -msgstr "dosyaları diff türüne göre seç" - -#: diff.c:5508 -msgid "<file>" -msgstr "<dosya>" - -#: diff.c:5509 -msgid "Output to a specific file" -msgstr "belirli bir dosyaya çıktı ver" - -#: diff.c:6164 -msgid "inexact rename detection was skipped due to too many files." -msgstr "" -"Kesin olmayan yeniden adlandırma algılaması çok fazla dosya olmasından " -"dolayı atlandı." - -#: diff.c:6167 -msgid "only found copies from modified paths due to too many files." -msgstr "" -"Çok fazla dosya olmasından dolayı yalnızca değiştirilen yollardan kopyalar " -"bulundu." - -#: diff.c:6170 -#, c-format -msgid "" -"you may want to set your %s variable to at least %d and retry the command." -msgstr "" -"%s değişkeninizi en azından %d olarak ayarlamak ve komutu yeniden denemek " -"isteyebilirsiniz." - -#: dir.c:555 -#, c-format -msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "yol belirteci '%s' git'in tanıdığı herhangi bir dosya ile eşleşmedi" - -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "tanımlanamayan dizgi: '%s'" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "tanımlanamayan negatif dizgi: '%s'" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "sparse-checkout dosyanızın sorunları olabilir: '%s' dizgisi yinelenmiş" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor" - -#: dir.c:1173 -#, c-format -msgid "cannot use %s as an exclude file" -msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor" - -#: dir.c:2144 -#, c-format -msgid "could not open directory '%s'" -msgstr "'%s' dizini açılamadı" - -#: dir.c:2479 -msgid "failed to get kernel name and information" -msgstr "çekirdek adı ve bilgisi alınamadı" - -#: dir.c:2603 -msgid "untracked cache is disabled on this system or location" -msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış" - -#: dir.c:3407 -#, c-format -msgid "index file corrupt in repo %s" -msgstr "%s deposundaki indeks dosyası hasarlı" - -#: dir.c:3452 dir.c:3457 -#, c-format -msgid "could not create directories for %s" -msgstr "%s için dizinler oluşturulamadı" - -#: dir.c:3486 -#, c-format -msgid "could not migrate git directory from '%s' to '%s'" -msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi" - -#: editor.c:73 -#, c-format -msgid "hint: Waiting for your editor to close the file...%c" -msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c" - -#: entry.c:178 -msgid "Filtering content" -msgstr "İçerik süzülüyor" - -#: entry.c:476 -#, c-format -msgid "could not stat file '%s'" -msgstr "'%s' dosyasının bilgileri alınamadı" - -#: environment.c:149 -#, c-format -msgid "bad git namespace path \"%s\"" -msgstr "hatalı git ad alanı yolu \"%s\"" - -#: environment.c:331 -#, c-format -msgid "could not set GIT_DIR to '%s'" -msgstr "GIT_DIR şuna ayarlanamadı: '%s'" - -#: exec-cmd.c:363 -#, c-format -msgid "too many args to run %s" -msgstr "%s çalıştırmak için çok fazla değişken" - -#: fetch-pack.c:150 -msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack: sığ bir liste bekleniyordu" - -#: fetch-pack.c:153 -msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu" - -#: fetch-pack.c:164 -msgid "git fetch-pack: expected ACK/NAK, got a flush packet" -msgstr "git fetch-pack: ACK/NAK bekleniyordu, floş paket alındı" - -#: fetch-pack.c:184 -#, c-format -msgid "git fetch-pack: expected ACK/NAK, got '%s'" -msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı" - -#: fetch-pack.c:195 -msgid "unable to write to remote" -msgstr "uzak konuma yazılamıyor" - -#: fetch-pack.c:257 -msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc multi_ack_detailed gerektiriyor" - -#: fetch-pack.c:356 fetch-pack.c:1340 -#, c-format -msgid "invalid shallow line: %s" -msgstr "geçersiz sığ satır: %s" - -#: fetch-pack.c:362 fetch-pack.c:1346 -#, c-format -msgid "invalid unshallow line: %s" -msgstr "geçersiz sığ olmayan satır: %s" - -#: fetch-pack.c:364 fetch-pack.c:1348 -#, c-format -msgid "object not found: %s" -msgstr "nesne bulunamadı: %s" - -#: fetch-pack.c:367 fetch-pack.c:1351 -#, c-format -msgid "error in object: %s" -msgstr "nesne içinde hata: %s" - -#: fetch-pack.c:369 fetch-pack.c:1353 -#, c-format -msgid "no shallow found: %s" -msgstr "sığ bulunamadı: %s" - -#: fetch-pack.c:372 fetch-pack.c:1357 -#, c-format -msgid "expected shallow/unshallow, got %s" -msgstr "sığ/sığ olmayan bekleniyordu, %s alındı" - -#: fetch-pack.c:414 -#, c-format -msgid "got %s %d %s" -msgstr "%s %d %s alındı" - -#: fetch-pack.c:431 -#, c-format -msgid "invalid commit %s" -msgstr "geçersiz gönderi %s" - -#: fetch-pack.c:462 -msgid "giving up" -msgstr "vazgeçiliyor" - -#: fetch-pack.c:475 progress.c:323 -msgid "done" -msgstr "bitti" - -#: fetch-pack.c:487 -#, c-format -msgid "got %s (%d) %s" -msgstr "%s (%d) %s alındı" - -#: fetch-pack.c:533 -#, c-format -msgid "Marking %s as complete" -msgstr "%s tamam olarak imleniyor" - -#: fetch-pack.c:754 -#, c-format -msgid "already have %s (%s)" -msgstr "%s halihazırda var (%s)" - -#: fetch-pack.c:818 -msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor" - -#: fetch-pack.c:826 -msgid "protocol error: bad pack header" -msgstr "protokol hatası: hatalı paket üstbilgisi" - -#: fetch-pack.c:900 -#, c-format -msgid "fetch-pack: unable to fork off %s" -msgstr "fetch-pack: %s ayrı çatallanamıyor" - -#: fetch-pack.c:916 -#, c-format -msgid "%s failed" -msgstr "%s başarısız oldu" - -#: fetch-pack.c:918 -msgid "error in sideband demultiplexer" -msgstr "yanbant çoğullama çözücüsünde hata" - -#: fetch-pack.c:965 -#, c-format -msgid "Server version is %.*s" -msgstr "Sunucu sürümü %.*s" - -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 -#, c-format -msgid "Server supports %s" -msgstr "Sunucu %s destekliyor" - -#: fetch-pack.c:972 -msgid "Server does not support shallow clients" -msgstr "Sunucu sığ istemcileri desteklemiyor" - -#: fetch-pack.c:1032 -msgid "Server does not support --shallow-since" -msgstr "Sunucu --shallow-since desteklemiyor" - -#: fetch-pack.c:1037 -msgid "Server does not support --shallow-exclude" -msgstr "Sunucu --shallow-exclude desteklemiyor" - -#: fetch-pack.c:1041 -msgid "Server does not support --deepen" -msgstr "Sunucu --deepen desteklemiyor" - -#: fetch-pack.c:1058 -msgid "no common commits" -msgstr "ortak gönderi yok" - -#: fetch-pack.c:1070 fetch-pack.c:1536 -msgid "git fetch-pack: fetch failed." -msgstr "git fetch-pack: getirme başarısız" - -#: fetch-pack.c:1209 -msgid "Server does not support shallow requests" -msgstr "Sunucu sığ istekleri desteklemiyor" - -#: fetch-pack.c:1216 -msgid "Server supports filter" -msgstr "Sunucu süzgeç destekliyor" - -#: fetch-pack.c:1239 -msgid "unable to write request to remote" -msgstr "uzak konuma istek yazılamıyor" - -#: fetch-pack.c:1257 -#, c-format -msgid "error reading section header '%s'" -msgstr "bölüm üstbilgisi '%s' okunurken hata" - -#: fetch-pack.c:1263 -#, c-format -msgid "expected '%s', received '%s'" -msgstr "'%s' bekleniyordu, '%s' alındı" - -#: fetch-pack.c:1303 -#, c-format -msgid "unexpected acknowledgment line: '%s'" -msgstr "beklenmedik alındı satırı: '%s'" - -#: fetch-pack.c:1308 -#, c-format -msgid "error processing acks: %d" -msgstr "alındılar işlenirken hata: %d" - -#: fetch-pack.c:1318 -msgid "expected packfile to be sent after 'ready'" -msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu" - -#: fetch-pack.c:1320 -msgid "expected no other sections to be sent after no 'ready'" -msgstr "'ready' \"yok\" iken başka hiçbir bölümün gönderilmemesi gerekiyordu" - -#: fetch-pack.c:1362 -#, c-format -msgid "error processing shallow info: %d" -msgstr "sığ bilgi işlenirken hata: %d" - -#: fetch-pack.c:1409 -#, c-format -msgid "expected wanted-ref, got '%s'" -msgstr "wanted-ref bekleniyordu, '%s' alındı" - -#: fetch-pack.c:1414 -#, c-format -msgid "unexpected wanted-ref: '%s'" -msgstr "beklenmedik wanted-ref: '%s'" - -#: fetch-pack.c:1419 -#, c-format -msgid "error processing wanted refs: %d" -msgstr "aranan başvurular işlenirken hata: %d" - -#: fetch-pack.c:1762 -msgid "no matching remote head" -msgstr "eşleşen uzak dal ucu yok" - -#: fetch-pack.c:1785 builtin/clone.c:689 -msgid "remote did not send all necessary objects" -msgstr "uzak konum gereken tüm nesneleri göndermedi" - -#: fetch-pack.c:1812 -#, c-format -msgid "no such remote ref %s" -msgstr "böyle bir uzak başvuru yok: %s" - -#: fetch-pack.c:1815 -#, c-format -msgid "Server does not allow request for unadvertised object %s" -msgstr "Sunucu %s tanıtılmamış nesnesi için isteğe izin vermiyor" - -#: gpg-interface.c:408 -msgid "gpg failed to sign the data" -msgstr "gpg veriyi imzalayamadı" - -#: gpg-interface.c:434 -msgid "could not create temporary file" -msgstr "geçici dosya oluşturulamadı" - -#: gpg-interface.c:437 -#, c-format -msgid "failed writing detached signature to '%s'" -msgstr "şuna ayrık imza yazılamadı: '%s'" - -#: graph.c:98 -#, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "log.graphColors içindeki '%.*s' geçersiz rengini yok say" - -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"verilen dizgi NULL baytı içeriyor (-f <dosya> ile). Bu yalnızca PCRE v2 " -"altında -P ile desteklenir" - -#: grep.c:2128 -#, c-format -msgid "'%s': unable to read %s" -msgstr "'%s': %s okunamıyor" - -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 -#: builtin/rm.c:135 -#, c-format -msgid "failed to stat '%s'" -msgstr "'%s' dosyasının bilgileri alınamadı" - -#: grep.c:2156 -#, c-format -msgid "'%s': short read" -msgstr "'%s': kısa okuma" - -#: help.c:23 -msgid "start a working area (see also: git help tutorial)" -msgstr "bir çalışma alanı başlatın (ayrıca bkz: git help tutorial)" - -#: help.c:24 -msgid "work on the current change (see also: git help everyday)" -msgstr "güncel değişiklikler üzerinde çalışın (ayrıca bkz: git help everyday)" - -#: help.c:25 -msgid "examine the history and state (see also: git help revisions)" -msgstr "geçmişi ve durumu gözden geçirin (ayrıca bkz: git help revisions)" - -#: help.c:26 -msgid "grow, mark and tweak your common history" -msgstr "ortak geçmişinizi büyütün, imleyin ve geliştirin" - -#: help.c:27 -msgid "collaborate (see also: git help workflows)" -msgstr "birlikte çalışın (ayrıca bkz: git help workflows)" - -#: help.c:31 -msgid "Main Porcelain Commands" -msgstr "Ana Komutlar" - -#: help.c:32 -msgid "Ancillary Commands / Manipulators" -msgstr "Yan Komutlar / Yönlendiriciler" - -#: help.c:33 -msgid "Ancillary Commands / Interrogators" -msgstr "Yan Komutlar / Sorgucular" - -#: help.c:34 -msgid "Interacting with Others" -msgstr "Başkaları ile Etkileşim" - -#: help.c:35 -msgid "Low-level Commands / Manipulators" -msgstr "Düşük Düzeyli Komutlar / Yönlendiriciler" - -#: help.c:36 -msgid "Low-level Commands / Interrogators" -msgstr "Düşük Düzeyli Komutlar / Sorgucular" - -#: help.c:37 -msgid "Low-level Commands / Syncing Repositories" -msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme" - -#: help.c:38 -msgid "Low-level Commands / Internal Helpers" -msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar" - -#: help.c:298 -#, c-format -msgid "available git commands in '%s'" -msgstr "'%s' içindeki kullanılabilir git komutları" - -#: help.c:305 -msgid "git commands available from elsewhere on your $PATH" -msgstr "$PATH içindeki başka yerlerden kullanılabilen git komutları" - -#: help.c:314 -msgid "These are common Git commands used in various situations:" -msgstr "Çeşitli durumlarda kullanılan temel Git komutları aşağıdadır:" - -#: help.c:363 git.c:98 -#, c-format -msgid "unsupported command listing type '%s'" -msgstr "desteklenmeyen komut listeleme türü '%s'" - -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Yaygın Git kılavuzları:" - -#: help.c:512 -msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "Belirli bir altkomut üzerine okumak için 'git help <komut>' kullanın" - -#: help.c:517 -msgid "External commands" -msgstr "Dış komutlar" - -#: help.c:532 -msgid "Command aliases" -msgstr "Komut armaları" - -#: help.c:596 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" -"'%s' bir git komutu gibi görünüyor, ancak biz onu\n" -"çalıştıramadık. git-%s bozuk olabilir mi?" - -#: help.c:655 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Tüh. Sisteminiz hiçbir Git komutunu bildirmiyor." - -#: help.c:677 -#, c-format -msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "" -"UYARI: '%s' adında bir Git komutunu çağırdınız, ancak böyle bir komut yok." - -#: help.c:682 -#, c-format -msgid "Continuing under the assumption that you meant '%s'." -msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor." - -#: help.c:687 -#, c-format -msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "%0.1f saniye içinde sürdürülüyor, '%s' demek istediğiniz varsayılacak." - -#: help.c:695 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: '%s' bir git komutu değil. Yardım için: 'git --help'." - -#: help.c:699 -msgid "" -"\n" -"The most similar command is" -msgid_plural "" -"\n" -"The most similar commands are" -msgstr[0] "" -"\n" -"Buna en yakın komut:" -msgstr[1] "" -"\n" -"Buna en yakın komutlar:" - -#: help.c:714 -msgid "git version [<options>]" -msgstr "git version [<seçenekler>]" - -#: help.c:783 -#, c-format -msgid "%s: %s - %s" -msgstr "%s: %s - %s" - -#: help.c:787 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -"\n" -"Şunu mu demek istediniz?" -msgstr[1] "" -"\n" -"Şunlardan birini mi demek istediniz?" - -#: ident.c:349 -msgid "" -"\n" -"*** Please tell me who you are.\n" -"\n" -"Run\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"to set your account's default identity.\n" -"Omit --global to set the identity only in this repository.\n" -"\n" -msgstr "" -"\n" -"*** Lütfen bana kim olduğunuzu söyleyin.\n" -"\n" -"Hesabınızın öntanımlı kimliğini ayarlamak için\n" -"\n" -"\tgit config --global user.name \"Adınız\"\n" -"\tgit config --global user.email \"siz@e-posta.com\"\n" -"\n" -"komutlarını çalıştırın.\n" -"Kimliğinizi yalnızca bu depo için geçerli kılmak isterseniz --global\n" -"değişkenini kullanmayın.\n" -"\n" - -#: ident.c:379 -msgid "no email was given and auto-detection is disabled" -msgstr "bir e-posta verilmedi ve kendiliğinden algılama devre dışı" - -#: ident.c:384 -#, c-format -msgid "unable to auto-detect email address (got '%s')" -msgstr "e-posta adresi kendiliğinden algılanamıyor ('%s' alındı)" - -#: ident.c:401 -msgid "no name was given and auto-detection is disabled" -msgstr "bir ad verilmedi ve kendiliğinden algılama devre dışı" - -#: ident.c:407 -#, c-format -msgid "unable to auto-detect name (got '%s')" -msgstr "ad kendiliğinden algılanamıyor ('%s' alındı)" - -#: ident.c:415 -#, c-format -msgid "empty ident name (for <%s>) not allowed" -msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor" - -#: ident.c:421 -#, c-format -msgid "name consists only of disallowed characters: %s" -msgstr "ad yalnızca izin verilmeyen karakterlerden oluşuyor: %s" - -#: ident.c:436 builtin/commit.c:635 -#, c-format -msgid "invalid date format: %s" -msgstr "geçersiz tarih biçimi: %s" - -#: list-objects.c:127 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "'%s' girdisi (%s ağacında) ağaç kipine iye, ancak bir ağaç değil" - -#: list-objects.c:140 -#, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "" -"'%s' girdisi (%s ağacında) ikili nesne kipine iye, ancak bir ikili geniş " -"nesne değil" - -#: list-objects.c:375 -#, c-format -msgid "unable to load root tree for commit %s" -msgstr "%s gönderisi için kök ağacı yüklenemiyor" - -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor" - -#: list-objects-filter-options.c:58 -msgid "expected 'tree:<depth>'" -msgstr "'tree:<derinlik>' bekleniyordu" - -#: list-objects-filter-options.c:73 -msgid "sparse:path filters support has been dropped" -msgstr "sparse:path süzgeçleri desteği artık yok" - -#: list-objects-filter-options.c:86 -#, c-format -msgid "invalid filter-spec '%s'" -msgstr "geçersiz filter-spec '%s'" - -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "sub-filter-spec içinde kaçış karakteri olmalı: '%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "birlikte kullanımdan sonra bir şeyler bekleniyordu:" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "çoklu filter-specs birlikte kullanılamaz" - -#: lockfile.c:151 -#, c-format -msgid "" -"Unable to create '%s.lock': %s.\n" -"\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." -msgstr "" -"'%s.lock' oluşturulamıyor: %s.\n" -"\n" -"Bu depoda başka bir git işlemi çalışıyor gibi görünüyor, örneğin\n" -"'git commit' kullanılarak açılmış bir düzenleyici. Lütfen tüm işlemlerin\n" -"sonlandırıldığından emin olun ve yeniden deneyin. Eğer hâlâ başarısız\n" -"oluyorsa bir git işlemi bu depo içinde daha önceden çakılmış olabilir:\n" -"Sürdürmek için dosyayı el ile kaldırın." - -#: lockfile.c:159 -#, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "'%s.lock' oluşturulamıyor: %s" - -#: merge.c:41 -msgid "failed to read the cache" -msgstr "önbellek okunamadı" - -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 -msgid "unable to write new index file" -msgstr "yeni indeks dosyası yazılamıyor" - -#: merge-recursive.c:356 -msgid "(bad commit)\n" -msgstr "(hatalı gönderi)\n" - -#: merge-recursive.c:379 -#, c-format -msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "" -"add_cacheinfo '%s' yolu için başarısız oldu; birleştirme iptal ediliyor." - -#: merge-recursive.c:388 -#, c-format -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "add_cacheinfo '%s' yolu için yenilenemedi; birleştirme iptal ediliyor." - -#: merge-recursive.c:874 -#, c-format -msgid "failed to create path '%s'%s" -msgstr "'%s'%s yolu oluşturulamadı" - -#: merge-recursive.c:885 -#, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "Altdizine yer açmak için %s kaldırılıyor\n" - -#: merge-recursive.c:899 merge-recursive.c:918 -msgid ": perhaps a D/F conflict?" -msgstr ": bir D/F çakışması olabilir mi?" - -#: merge-recursive.c:908 -#, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor" - -#: merge-recursive.c:949 builtin/cat-file.c:41 -#, c-format -msgid "cannot read object %s '%s'" -msgstr "%s '%s' nesnesi okunamıyor" - -#: merge-recursive.c:954 -#, c-format -msgid "blob expected for %s '%s'" -msgstr "%s '%s' için ikili nesne bekleniyordu" - -#: merge-recursive.c:979 -#, c-format -msgid "failed to open '%s': %s" -msgstr "'%s' açılamadı: %s" - -#: merge-recursive.c:990 -#, c-format -msgid "failed to symlink '%s': %s" -msgstr "'%s' için sembolik bağ oluşturulamadı: %s" - -#: merge-recursive.c:995 -#, c-format -msgid "do not know what to do with %06o %s '%s'" -msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'" - -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)" - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "%s altmodülü birleştirilemedi (gönderiler mevcut değil)" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "%s altmodülü birleştirilemedi (gönderiler merge-base'i takip etmiyor)" - -#: merge-recursive.c:1213 merge-recursive.c:1225 -#, c-format -msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "%s altmodülü şu gönderiye ileri sarılıyor:" - -#: merge-recursive.c:1216 merge-recursive.c:1228 -#, c-format -msgid "Fast-forwarding submodule %s" -msgstr "%s altmodülü ileri sarılıyor" - -#: merge-recursive.c:1251 -#, c-format -msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "" -"%s altmodülü birleştirilemedi (gönderileri takip eden birleştirme bulunamadı)" - -#: merge-recursive.c:1255 -#, c-format -msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "%s altmodülü birleştirilemedi (ileri sarım değil)" - -#: merge-recursive.c:1256 -msgid "Found a possible merge resolution for the submodule:\n" -msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n" - -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Eğer bu doğruysa yalnızca indekse ekleyin, örneğinbu öneriyi kabul edecek:\n" -"\n" -"\tgit update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"komutunu kullanmanız yeterlidir.\n" - -#: merge-recursive.c:1268 -#, c-format -msgid "Failed to merge submodule %s (multiple merges found)" -msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)" - -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "İç birleştirme çalıştırılamadı" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "%s veritabanına eklenemedi" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "%s kendiliğinden birleştiriliyor" - -#: merge-recursive.c:1402 -#, c-format -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "" -"Hata: %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine " -"%s konumuna yazılacak." - -#: merge-recursive.c:1474 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree." -msgstr "" -"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " -"ağaçta bırakıldı." - -#: merge-recursive.c:1479 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree." -msgstr "" -"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " -"(%s) sürümü ağaçta bırakıldı." - -#: merge-recursive.c:1486 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." -msgstr "" -"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s (%s içinde). %s (%s) sürümü " -"ağaçta %s konumunda bırakıldı." - -#: merge-recursive.c:1491 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree at %s." -msgstr "" -"ÇAKIŞMA (%s/silme): %s silindi (%s içinde) ve %s şuraya: %s (%s içinde). %s " -"(%s) sürümü ağaçta %s konumunda bırakıldı." - -#: merge-recursive.c:1526 -msgid "rename" -msgstr "yeniden adlandır" - -#: merge-recursive.c:1526 -msgid "renamed" -msgstr "yeniden adlandırıldı" - -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 -#, c-format -msgid "Refusing to lose dirty file at %s" -msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor" - -#: merge-recursive.c:1587 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "" -"Engel olduğu halde %s konumundaki izlenmeyen dosyayı kaybetme reddediliyor." - -#: merge-recursive.c:1645 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" -msgstr "" -"ÇAKIŞMA (yeniden adlandır/ekle): %s->%s olarak adlandırıldı (%s içinde). %s " -"eklendi (%s içinde)." - -#: merge-recursive.c:1676 -#, c-format -msgid "%s is a directory in %s adding as %s instead" -msgstr "%s bir dizin (%s içinde), bunun yerine %s olarak ekleniyor" - -#: merge-recursive.c:1681 -#, c-format -msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "" -"%s konumundaki izlenmeyen dosyayı kaybetme reddediliyor, bunun yerine %s " -"olarak ekleniyor" - -#: merge-recursive.c:1708 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" -msgstr "" -"ÇAKIŞMA (y. adlandır/y. adlandır): \"%s\"->\"%s\" olarak adlandır (\"%s\" " -"dalında), \"%s\"->\"%s\" olarak adlandır (\"%s\"%s içinde)" - -#: merge-recursive.c:1713 -msgid " (left unresolved)" -msgstr " (çözülmeden bırakıldı)" - -#: merge-recursive.c:1793 -#, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "" -"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandır (%s içinde). %s->" -"%s olarak adlandır (%s içinde)" - -#: merge-recursive.c:2056 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to place %s because " -"directory %s was renamed to multiple other directories, with no destination " -"getting a majority of the files." -msgstr "" -"ÇAKIŞMA: (dizin yeniden adlandırma ayrılması): %s ögesinin nereye " -"yerleştirileceği belirsiz çünkü %s dizini birden çok başka dizine yeniden " -"adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı." - -#: merge-recursive.c:2088 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s konumundaki mevcut dosya/dizin " -"örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: " -"%s." - -#: merge-recursive.c:2098 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s için birden çok yol " -"eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya " -"koymayı denedi: %s." - -#: merge-recursive.c:2190 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" -">%s in %s" -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)." - -#: merge-recursive.c:2435 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" -"UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, " -"çünkü %s ögesinin kendisi yeniden adlandırıldı." - -#: merge-recursive.c:2961 -#, c-format -msgid "cannot read object %s" -msgstr "%s nesnesi okunamıyor" - -#: merge-recursive.c:2964 -#, c-format -msgid "object %s is not a blob" -msgstr "%s nesnesi ikili bir nesne değil" - -#: merge-recursive.c:3028 -msgid "modify" -msgstr "değiştir" - -#: merge-recursive.c:3028 -msgid "modified" -msgstr "değiştirilmiş" - -#: merge-recursive.c:3040 -msgid "content" -msgstr "içerik" - -#: merge-recursive.c:3044 -msgid "add/add" -msgstr "ekle/ekle" - -#: merge-recursive.c:3067 -#, c-format -msgid "Skipped %s (merged same as existing)" -msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)" - -#: merge-recursive.c:3089 git-submodule.sh:1003 -msgid "submodule" -msgstr "altmodül" - -#: merge-recursive.c:3090 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması" - -#: merge-recursive.c:3120 -#, c-format -msgid "Adding as %s instead" -msgstr "Bunun yerine %s olarak ekleniyor" - -#: merge-recursive.c:3203 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir " -"dizinde; onu %s konumuna taşıdı." - -#: merge-recursive.c:3206 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden " -"adlandırılan bir dizinde, belki de %s konumuna taşınmalı." - -#: merge-recursive.c:3210 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde " -"yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı." - -#: merge-recursive.c:3213 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s " -"içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı." - -#: merge-recursive.c:3327 -#, c-format -msgid "Removing %s" -msgstr "%s kaldırılıyor" - -#: merge-recursive.c:3350 -msgid "file/directory" -msgstr "dosya/dizin" - -#: merge-recursive.c:3355 -msgid "directory/file" -msgstr "dizin/dosya" - -#: merge-recursive.c:3362 -#, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "" -"ÇAKIŞMA (%s): %s adıyla bir dizin var (%s içinde). %s, %s olarak ekleniyor." - -#: merge-recursive.c:3371 -#, c-format -msgid "Adding %s" -msgstr "%s ekleniyor" - -#: merge-recursive.c:3380 -#, c-format -msgid "CONFLICT (add/add): Merge conflict in %s" -msgstr "ÇAKIŞMA (ekle/ekle): %s içinde birleştirme çakışması" - -#: merge-recursive.c:3424 -msgid "Already up to date!" -msgstr "Her şey güncel!" - -#: merge-recursive.c:3433 -#, c-format -msgid "merging of trees %s and %s failed" -msgstr "%s ve %s ağaçlarının birleştirilmesi başarısız" - -#: merge-recursive.c:3537 -msgid "Merging:" -msgstr "Birleştiriliyor:" - -#: merge-recursive.c:3550 -#, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "%u ortak ata bulundu:" -msgstr[1] "%u ortak ata bulundu:" - -#: merge-recursive.c:3600 -msgid "merge returned no commit" -msgstr "birleştirme herhangi bir gönderi döndürmedi" - -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine " -"yazılacak:\n" -"\t%s" - -#: merge-recursive.c:3756 -#, c-format -msgid "Could not parse object '%s'" -msgstr "'%s' nesnesi ayrıştırılamadı" - -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 -msgid "Unable to write index." -msgstr "İndeks yazılamadı." - -#: midx.c:68 -#, c-format -msgid "multi-pack-index file %s is too small" -msgstr "multi-pack-index dosyası %s pek küçük" - -#: midx.c:84 -#, c-format -msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "multi-pack-index imzası 0x%08x, 0x%08x imzası ile eşleşmiyor" - -#: midx.c:89 -#, c-format -msgid "multi-pack-index version %d not recognized" -msgstr "multi-pack-index sürümü %d tanımlanamıyor" - -#: midx.c:94 -#, c-format -msgid "hash version %u does not match" -msgstr "sağlama sürümü %u eşleşmiyor" - -#: midx.c:108 -msgid "invalid chunk offset (too large)" -msgstr "geçersiz iri parça ofseti (çok geniş)" - -#: midx.c:132 -msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "" -"multi-pack-index iri parçası sonlandırılıyor, numarası beklenenden önce " -"görünüyor" - -#: midx.c:145 -msgid "multi-pack-index missing required pack-name chunk" -msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik" - -#: midx.c:147 -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik" - -#: midx.c:149 -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik" - -#: midx.c:151 -msgid "multi-pack-index missing required object offsets chunk" -msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik" - -#: midx.c:165 -#, c-format -msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'" - -#: midx.c:210 -#, c-format -msgid "bad pack-int-id: %u (%u total packs)" -msgstr "hatalı pack-int-id: %u (%u toplam paket)" - -#: midx.c:260 -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "multi-pack-index bir 64 bit ofset depoluyor, ancak off_t pek küçük" - -#: midx.c:288 -msgid "error preparing packfile from multi-pack-index" -msgstr "paket dosyası multi-pack-index'ten hazırlanırken hata" - -#: midx.c:472 -#, c-format -msgid "failed to add packfile '%s'" -msgstr "paket dosyası '%s' eklenemedi" - -#: midx.c:478 -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "pack-index '%s' açılamadı" - -#: midx.c:538 -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "%d nesnesi paket dosyasında bulunamadı" - -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Paket dosyaları multi-pack-index'e ekleniyor" - -#: midx.c:875 -#, c-format -msgid "did not see pack-file %s to drop" -msgstr "bırakılacak pack-file %s görülmedi" - -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "İri parçalar multi-pack-index'e yazılıyor" - -#: midx.c:1052 -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "multi-pack-index %s konumunda temizlenemedi" - -#: midx.c:1108 -msgid "Looking for referenced packfiles" -msgstr "Başvurulmuş paket dosyaları aranıyor" - -#: midx.c:1123 -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "oid fanout sırasız: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" - -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "multi-pack-index içindeki OID sırası doğrulanıyor" - -#: midx.c:1137 -#, c-format -msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "oid araması sırasız: oid[%d] = %s >= %s = oid[%d]" - -#: midx.c:1157 -msgid "Sorting objects by packfile" -msgstr "Nesneler paket dosyasına göre sıralanıyor" - -#: midx.c:1164 -msgid "Verifying object offsets" -msgstr "Nesne ofsetleri doğrulanıyor" - -#: midx.c:1180 -#, c-format -msgid "failed to load pack entry for oid[%d] = %s" -msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s" - -#: midx.c:1186 -#, c-format -msgid "failed to load pack-index for packfile %s" -msgstr "paket dosyası %s için pack-index yüklenemedi" - -#: midx.c:1195 -#, c-format -msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" -msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>" - -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Başvurulmuş nesneler sayılıyor" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor" - -#: midx.c:1388 -msgid "could not start pack-objects" -msgstr "pack-objects başlatılamadı" - -#: midx.c:1407 -msgid "could not finish pack-objects" -msgstr "pack-objects bitirilemedi" - -#: name-hash.c:537 -#, c-format -msgid "unable to create lazy_dir thread: %s" -msgstr "lazy_dir iş parçacığı oluşturulamıyor: %s" - -#: name-hash.c:559 -#, c-format -msgid "unable to create lazy_name thread: %s" -msgstr "lazy_name oluşturulamıyor: %s" - -#: name-hash.c:565 -#, c-format -msgid "unable to join lazy_name thread: %s" -msgstr "lazy_name iş parçacığı ucu birleştirilemiyor: %s" - -#: notes-merge.c:277 -#, c-format -msgid "" -"You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " -"commit/abort the previous merge before you start a new notes merge." -msgstr "" -"Bir önceki not birleştirmenizi sonuçlandırmadınız (%s var).\n" -"Lütfen başka bir not birleştirmesine başlamadan önce 'git notes merge --" -"commit' veya 'git notes merge --abort' kullanarak bir önceki birleştirmeyi " -"gönderin/durdurun." - -#: notes-merge.c:284 -#, c-format -msgid "You have not concluded your notes merge (%s exists)." -msgstr "Notlar birleştirmenizi sonuçlandırmadınız (%s var)." - -#: notes-utils.c:46 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "İlklendirilmemiş/Başvurulmamış not ağacı gönderilemiyor" - -#: notes-utils.c:105 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "Hatalı notes.rewriteMode değeri: '%s'" - -#: notes-utils.c:115 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "%s içindeki notları yeniden yazma reddediliyor (refs/notes/ dışında)" - -#. TRANSLATORS: The first %s is the name of -#. the environment variable, the second %s is -#. its value. -#. -#: notes-utils.c:145 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "Hatalı %s değeri: '%s'" - -#: object.c:53 -#, c-format -msgid "invalid object type \"%s\"" -msgstr "geçersiz nesne türü \"%s\"" - -#: object.c:173 -#, c-format -msgid "object %s is a %s, not a %s" -msgstr "%s nesnesi bir %s, %s değil" - -#: object.c:233 -#, c-format -msgid "object %s has unknown type id %d" -msgstr "%s nesnesi %d bilinmeyen tür numarasına iye" - -#: object.c:246 -#, c-format -msgid "unable to parse object: %s" -msgstr "nesne ayrıştırılamıyor: %s" - -#: object.c:266 object.c:278 -#, c-format -msgid "hash mismatch %s" -msgstr "sağlama uyuşmazlığı %s" - -#: packfile.c:629 -msgid "offset before end of packfile (broken .idx?)" -msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)" - -#: packfile.c:1899 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)" - -#: packfile.c:1903 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)" - -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "%s boyutu alınamıyor" - -#: parse-options.c:38 -#, c-format -msgid "%s requires a value" -msgstr "%s bir değer gerektiriyor" - -#: parse-options.c:73 -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s, %s ile uyumsuz" - -#: parse-options.c:78 -#, c-format -msgid "%s : incompatible with something else" -msgstr "%s: başka bir şeyle uyumsuz" - -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 -#, c-format -msgid "%s takes no value" -msgstr "%s bir değer almıyor" - -#: parse-options.c:94 -#, c-format -msgid "%s isn't available" -msgstr "%s kullanılabilir değil" - -#: parse-options.c:217 -#, c-format -msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "%s negatif olmayan bir tamsayı bekliyor, isteğe bağlı k/m/g eki ile" - -#: parse-options.c:386 -#, c-format -msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "belirsiz seçenek: %s (--%s%s veya --%s%s olabilir)" - -#: parse-options.c:420 parse-options.c:428 -#, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?" - -#: parse-options.c:857 -#, c-format -msgid "unknown option `%s'" -msgstr "bilinmeyen seçenek '%s'" - -#: parse-options.c:859 -#, c-format -msgid "unknown switch `%c'" -msgstr "bilinmeyen anahtar '%c'" - -#: parse-options.c:861 -#, c-format -msgid "unknown non-ascii option in string: `%s'" -msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'" - -#: parse-options.c:885 -msgid "..." -msgstr "..." - -#: parse-options.c:904 -#, c-format -msgid "usage: %s" -msgstr "kullanım: %s" - -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation. -#. -#: parse-options.c:910 -#, c-format -msgid " or: %s" -msgstr " veya: %s" - -#: parse-options.c:913 -#, c-format -msgid " %s" -msgstr " %s" - -#: parse-options.c:952 -msgid "-NUM" -msgstr "-SAYI" - -#: parse-options.c:966 -#, c-format -msgid "alias of --%s" -msgstr "şunun arması: --%s" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "'%s' seçeneği sayısal bir değer bekliyor" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "'%s' seçeneği \"always\", \"auto\" veya \"never\" bekliyor" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "hatalı oluşturulmuş nesne adı '%s'" - -#: path.c:915 -#, c-format -msgid "Could not make %s writable by group" -msgstr "%s grup ile yazılabilir yapılamadı" - -#: pathspec.c:130 -msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "Kaçış karakteri '\\' attr değerindeki son karakter olarak kullanılamaz" - -#: pathspec.c:148 -msgid "Only one 'attr:' specification is allowed." -msgstr "Yalnızca bir 'attr:' belirtimine izin verilir." - -#: pathspec.c:151 -msgid "attr spec must not be empty" -msgstr "attr belirteci boş olmamalı" - -#: pathspec.c:194 -#, c-format -msgid "invalid attribute name %s" -msgstr "geçersiz öznitelik adı %s" - -#: pathspec.c:259 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz" - -#: pathspec.c:266 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "" -"global 'literal' yol belirteci ayarı diğer tüm global yol belirteci " -"ayarlarıyla uyumsuz" - -#: pathspec.c:306 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "yol belirteci sihri 'prefix' için geçersiz parametre" - -#: pathspec.c:327 -#, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)" - -#: pathspec.c:332 -#, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "'%s' içindeki yol belirteci sihrinin sonunda eksik ')'" - -#: pathspec.c:370 -#, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)" - -#: pathspec.c:429 -#, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz" - -#: pathspec.c:442 -#, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: '%s', '%s' konumunda depo dışında" - -#: pathspec.c:517 -#, c-format -msgid "'%s' (mnemonic: '%c')" -msgstr "'%s' (belleten: '%c')" - -#: pathspec.c:527 -#, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s: yol belirteci sihri bu komut tarafından desteklenmiyor: %s" - -#: pathspec.c:594 -#, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "yol belirteci '%s' bir sembolik bağın ötesinde" - -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "satırda hatalı tırnaklar: %s" - -#: pkt-line.c:92 -msgid "unable to write flush packet" -msgstr "floş paketi yazılamıyor" - -#: pkt-line.c:99 -msgid "unable to write delim packet" -msgstr "sınırlandıran paket yazılamıyor" - -#: pkt-line.c:106 -msgid "flush packet write failed" -msgstr "floş paketi yazımı başarısız" - -#: pkt-line.c:146 pkt-line.c:232 -msgid "protocol error: impossibly long line" -msgstr "protokol hatası: olanaksız uzun satır" - -#: pkt-line.c:162 pkt-line.c:164 -msgid "packet write with format failed" -msgstr "biçimlendirilmiş paket yazımı başarısız" - -#: pkt-line.c:196 -msgid "packet write failed - data exceeds max packet size" -msgstr "paket yazımı başarısız - veri olabilecek en çok paket boyutunu aşıyor" - -#: pkt-line.c:203 pkt-line.c:210 -msgid "packet write failed" -msgstr "paket yazımı başarısız" - -#: pkt-line.c:295 -msgid "read error" -msgstr "okuma hatası" - -#: pkt-line.c:303 -msgid "the remote end hung up unexpectedly" -msgstr "uzak konum beklenmedik biçimde hattı kapattı" - -#: pkt-line.c:331 -#, c-format -msgid "protocol error: bad line length character: %.4s" -msgstr "protokol hatası: hatalı satır uzunluğu karakteri: %.4s" - -#: pkt-line.c:341 pkt-line.c:346 -#, c-format -msgid "protocol error: bad line length %d" -msgstr "protokol hatası: hatalı satır uzunluğu %d" - -#: pkt-line.c:362 -#, c-format -msgid "remote error: %s" -msgstr "uzak konum hatası: %s" - -#: preload-index.c:119 -msgid "Refreshing index" -msgstr "İndeks yenileniyor" - -#: preload-index.c:138 -#, c-format -msgid "unable to create threaded lstat: %s" -msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s" - -#: pretty.c:981 -msgid "unable to parse --pretty format" -msgstr "--pretty biçimi ayrıştırılamıyor" - -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "URL'si olmayan uzak konum" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s" - -#: range-diff.c:75 -msgid "could not start `log`" -msgstr "'log' başlatılamadı" - -#: range-diff.c:77 -msgid "could not read `log` output" -msgstr "'log' çıktısı okunamadı" - -#: range-diff.c:96 sequencer.c:5020 -#, c-format -msgid "could not parse commit '%s'" -msgstr "'%s' gönderisi ayrıştırılamadı" - -#: range-diff.c:122 -#, c-format -msgid "could not parse git header '%.*s'" -msgstr "git üstbilgisi '%.*s' ayrıştırılamadı" - -#: range-diff.c:285 -msgid "failed to generate diff" -msgstr "diff oluşturulamadı" - -#: range-diff.c:518 range-diff.c:520 -#, c-format -msgid "could not parse log for '%s'" -msgstr "'%s' günlüğü ayrıştırılamadı" - -#: read-cache.c:680 -#, c-format -msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)" - -#: read-cache.c:696 -msgid "cannot create an empty blob in the object database" -msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor" - -#: read-cache.c:718 -#, c-format -msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "" -"%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir" - -#: read-cache.c:723 -#, c-format -msgid "'%s' does not have a commit checked out" -msgstr "'%s' çıkışı yapılmış bir gönderiye iye değil" - -#: read-cache.c:775 -#, c-format -msgid "unable to index file '%s'" -msgstr "'%s' dosyası indekslenemiyor" - -#: read-cache.c:794 -#, c-format -msgid "unable to add '%s' to index" -msgstr "'%s' indekse eklenemiyor" - -#: read-cache.c:805 -#, c-format -msgid "unable to stat '%s'" -msgstr "'%s' dosyasının bilgileri alınamıyor" - -#: read-cache.c:1330 -#, c-format -msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' hem bir dosya hem de bir dizin olarak görünüyor" - -#: read-cache.c:1536 -msgid "Refresh index" -msgstr "İndeksi yenile" - -#: read-cache.c:1651 -#, c-format -msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"index.version ayarlanmış, ancak değer geçersiz.\n" -"%i sürümü kullanılıyor" - -#: read-cache.c:1661 -#, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"GIT_INDEX_VERSION ayarlanmış, ancak değer geçersiz.\n" -"%i sürümü kullanılıyor" - -#: read-cache.c:1717 -#, c-format -msgid "bad signature 0x%08x" -msgstr "hatalı imza 0x%08x" - -#: read-cache.c:1720 -#, c-format -msgid "bad index version %d" -msgstr "hatalı indeks sürümü %d" - -#: read-cache.c:1729 -msgid "bad index file sha1 signature" -msgstr "hatalı indeks dosyası sha1 imzası" - -#: read-cache.c:1759 -#, c-format -msgid "index uses %.4s extension, which we do not understand" -msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor" - -#: read-cache.c:1761 -#, c-format -msgid "ignoring %.4s extension" -msgstr "%.4s uzantısı yok sayılıyor" - -#: read-cache.c:1798 -#, c-format -msgid "unknown index entry format 0x%08x" -msgstr "bilinmeyen indeks girdisi biçimi 0x%08x" - -#: read-cache.c:1814 -#, c-format -msgid "malformed name field in the index, near path '%s'" -msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında" - -#: read-cache.c:1871 -msgid "unordered stage entries in index" -msgstr "indekste sırasız hazırlama alanı girdileri" - -#: read-cache.c:1874 -#, c-format -msgid "multiple stage entries for merged file '%s'" -msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri" - -#: read-cache.c:1877 -#, c-format -msgid "unordered stage entries for '%s'" -msgstr "'%s' için sırasız hazırlama alanı girdileri" - -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 -msgid "index file corrupt" -msgstr "indeks dosyası hasar görmüş" - -#: read-cache.c:2124 -#, c-format -msgid "unable to create load_cache_entries thread: %s" -msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s" - -#: read-cache.c:2137 -#, c-format -msgid "unable to join load_cache_entries thread: %s" -msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s" - -#: read-cache.c:2170 -#, c-format -msgid "%s: index file open failed" -msgstr "%s: indeks dosyası açılamadı" - -#: read-cache.c:2174 -#, c-format -msgid "%s: cannot stat the open index" -msgstr "%s: açık indeksin bilgileri alınamıyor" - -#: read-cache.c:2178 -#, c-format -msgid "%s: index file smaller than expected" -msgstr "%s: indeks dosyası beklenenden daha küçük" - -#: read-cache.c:2182 -#, c-format -msgid "%s: unable to map index file" -msgstr "%s: indeks dosyası eşlemlenemiyor" - -#: read-cache.c:2224 -#, c-format -msgid "unable to create load_index_extensions thread: %s" -msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s" - -#: read-cache.c:2251 -#, c-format -msgid "unable to join load_index_extensions thread: %s" -msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s" - -#: read-cache.c:2283 -#, c-format -msgid "could not freshen shared index '%s'" -msgstr "paylaşılan indeks '%s' tazelenemedi" - -#: read-cache.c:2330 -#, c-format -msgid "broken index, expect %s in %s, got %s" -msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı" - -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 -#, c-format -msgid "could not close '%s'" -msgstr "'%s' kapatılamadı" - -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 -#, c-format -msgid "could not stat '%s'" -msgstr "'%s' bilgileri alınamadı" - -#: read-cache.c:3142 -#, c-format -msgid "unable to open git dir: %s" -msgstr "git dizini açılamıyor: %s" - -#: read-cache.c:3154 -#, c-format -msgid "unable to unlink: %s" -msgstr "bağlantı kesilemiyor: %s" - -#: read-cache.c:3179 -#, c-format -msgid "cannot fix permission bits on '%s'" -msgstr "'%s' üzerindeki izin bitleri onarılamıyor" - -#: read-cache.c:3328 -#, c-format -msgid "%s: cannot drop to stage #0" -msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor" - -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Bunu 'git rebase --edit-todo' ile düzeltebilir ve ardından 'git rebase --" -"continue' yapabilirsiniz.\n" -"Yeniden temellendirmeyi durdurmak isterseniz 'git rebase --abort' yapın.\n" - -#: rebase-interactive.c:33 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "" -"rebase.missingCommitsCheck seçeneği için tanımlanamayan %s ayarı. Yok " -"sayılıyor." - -#: rebase-interactive.c:42 -msgid "" -"\n" -"Commands:\n" -"p, pick <commit> = use commit\n" -"r, reword <commit> = use commit, but edit the commit message\n" -"e, edit <commit> = use commit, but stop for amending\n" -"s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <command> = run command (the rest of the line) using shell\n" -"b, break = stop here (continue rebase later with 'git rebase --continue')\n" -"d, drop <commit> = remove commit\n" -"l, label <label> = label current HEAD with a name\n" -"t, reset <label> = reset HEAD to a label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" -"\n" -"These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "" -"\n" -"Komutlar:\n" -"p, pick <gönderi> = gönderiyi kullan\n" -"r, reword <gönderi> = gönderiyi kullan, ancak gönderi iletisini düzenle\n" -"e, edit <gönderi> = gönderiyi kullan, ancak değiştirmek için dur\n" -"s, squash <gönderi> = gönderiyi kullan, ancak önceki gönderi içine karıştır\n" -"f, fixup <gönderi> = \"squash\" gibi, ancak bu gönderinin günlük iletisini " -"at\n" -"x, exec <komut> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n" -"b, break = burada dur (daha sonra sürdürmek için 'git rebase --continue')\n" -"d, drop <gönderi> = gönderiyi kaldır\n" -"l, label <etiket> = geçerli HEAD'i bir ad ile etiketle\n" -"t, reset <etiket> = HEAD'i bir etikete sıfırla\n" -"m, merge [-C <gönderi> | -c <gönderi>] <etiket> [# <teksatır>]\n" -". orijinal birleştirme gönderisi iletisini kullanarak bir\n" -". birleştirme gönderisi oluştur (veya teksatır, eğer bir orijinal\n" -". birleştirme gönderisi belirtilmemişse). Gönderi iletisini yeniden\n" -". yazmak için -c <gönderi> kullanın.\n" -"\n" -"Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n" - -#: rebase-interactive.c:63 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)" -msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)" - -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 -msgid "" -"\n" -"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "" -"\n" -"Hiçbir satırı kaldırmayın. Bir gönderiyi kaldırmak için 'drop'u açıkça " -"kullanın.\n" - -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 -msgid "" -"\n" -"If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "" -"\n" -"Buradaki bir satırı kaldırırsanız O GÖNDERİ TÜMÜYLE KAYBOLACAK.\n" - -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" -"\n" -"Sürmekte olan bir etkileşimli yeniden temellendirmenin yapılacaklar " -"dosyasını düzenlemektesiniz.\n" -"Düzenlemenin ardından yeniden temellendirmeyi sürdürmek için şunu kullanın:\n" -"\tgit rebase --continue\n" -"\n" - -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 -msgid "" -"\n" -"However, if you remove everything, the rebase will be aborted.\n" -"\n" -msgstr "" -"\n" -"Eğer ki, her şeyi kaldırırsanız yeniden temellendirme iptal edilecektir.\n" -"\n" - -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 -#, c-format -msgid "could not write '%s'" -msgstr "'%s' yazılamadı" - -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 -#, c-format -msgid "could not write '%s'." -msgstr "'%s' yazılamadı." - -#: rebase-interactive.c:193 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"Uyarı: Bazı gönderiler yanlışlıkla bırakılmış olabilir.\n" -"Bırakılan gönderiler: (yeniden eskiye):\n" - -#: rebase-interactive.c:200 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"Bu iletiden kaçınmak için, bir gönderiyi kaldırırken açıkça \"drop\" " -"kullanın.\n" -"Uyarıların düzeyini değiştirmek için 'git config rebase.missingCommitsCheck' " -"kullanın.\n" -"Kullanılabilir davranışlar: ignore, warn, error.\n" -"\n" - -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "'%s' okunamadı." - -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "%s geçerli bir nesneye işaret etmiyor!" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "sarkan sembolik başvuru %s yok sayılıyor" - -#: refs.c:669 ref-filter.c:2098 -#, c-format -msgid "ignoring broken ref %s" -msgstr "bozuk başvuru %s yok sayılıyor" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "'%s' yazma için açılamadı: %s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "'%s' başvurusu okunamadı" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "'%s' başvurusu halihazırda var" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "'%s' yazılırken beklenmedik nesne numarası" - -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 -#, c-format -msgid "could not write to '%s'" -msgstr "şuraya yazılamadı: '%s'" - -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 -#, c-format -msgid "could not open '%s' for writing" -msgstr "'%s' yazma için açılamadı" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "'%s' silinirken beklenmedik nesne numarası" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "%s başvurusu için olan günlükte %s sonrasında boşluk var" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "" -"%s başvurusu için olan günlük %s konumunda beklenmedik bir biçimde sonlandı" - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "%s için olan günlük boş" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "'%s' başvurusu için update_ref başarısız oldu: %s" - -#: refs.c:2023 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor" - -#: refs.c:2055 -msgid "ref updates forbidden inside quarantine environment" -msgstr "başvuru güncellemeleri karantina ortamı içinde yasak" - -#: refs.c:2151 refs.c:2181 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' mevcut; '%s' oluşturulamıyor" - -#: refs.c:2157 refs.c:2192 -#, c-format -msgid "cannot process '%s' and '%s' at the same time" -msgstr "'%s' ve '%s' aynı anda işlenemiyor" - -#: refs/files-backend.c:1233 -#, c-format -msgid "could not remove reference %s" -msgstr "%s başvurusu kaldırılamadı" - -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "%s başvurusu silinemedi: %s" - -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 -#, c-format -msgid "could not delete references: %s" -msgstr "başvurular silinemedi: %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "geçersiz başvuru belirteci '%s'" - -#: ref-filter.c:42 wt-status.c:1938 -msgid "gone" -msgstr "gitti" - -#: ref-filter.c:43 -#, c-format -msgid "ahead %d" -msgstr "%d önünde" - -#: ref-filter.c:44 -#, c-format -msgid "behind %d" -msgstr "%d arkasında" - -#: ref-filter.c:45 -#, c-format -msgid "ahead %d, behind %d" -msgstr "%d önünde, %d arkasında" - -#: ref-filter.c:165 -#, c-format -msgid "expected format: %%(color:<color>)" -msgstr "beklenen biçim: %%(color:<renk>)" - -#: ref-filter.c:167 -#, c-format -msgid "unrecognized color: %%(color:%s)" -msgstr "tanımlanamayan renk: %%(color:%s)" - -#: ref-filter.c:189 -#, c-format -msgid "Integer value expected refname:lstrip=%s" -msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s" - -#: ref-filter.c:193 -#, c-format -msgid "Integer value expected refname:rstrip=%s" -msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s" - -#: ref-filter.c:195 -#, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "tanımlanamayan %%(%s) değişkeni: %s" - -#: ref-filter.c:250 -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) değişken almıyor" - -#: ref-filter.c:272 -#, c-format -msgid "unrecognized %%(objectsize) argument: %s" -msgstr "tanımlanamayan %%(objectsize) değişkeni: %s" - -#: ref-filter.c:280 -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) değişken almıyor" - -#: ref-filter.c:292 -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) değişken almıyor" - -#: ref-filter.c:301 -#, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) değişken almıyor" - -#: ref-filter.c:323 -#, c-format -msgid "unknown %%(trailers) argument: %s" -msgstr "bilinmeyen %%(trailers) değişkeni: %s" - -#: ref-filter.c:352 -#, c-format -msgid "positive value expected contents:lines=%s" -msgstr "pozitif değer şunu bekliyordu: contents:lines=%s" - -#: ref-filter.c:354 -#, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "tanımlanamayan %%(contents) değişkeni: %s" - -#: ref-filter.c:369 -#, c-format -msgid "positive value expected objectname:short=%s" -msgstr "pozitif değer şunu bekliyordu: objectname:short=%s" - -#: ref-filter.c:373 -#, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "tanımlanamayan %%(objectname) değişkeni: %s" - -#: ref-filter.c:403 -#, c-format -msgid "expected format: %%(align:<width>,<position>)" -msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)" - -#: ref-filter.c:415 -#, c-format -msgid "unrecognized position:%s" -msgstr "tanımlanamayan konum:%s" - -#: ref-filter.c:422 -#, c-format -msgid "unrecognized width:%s" -msgstr "tanımlanamayan genişlik:%s" - -#: ref-filter.c:431 -#, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "tanımlanamayan %%(align) değişkeni: %s" - -#: ref-filter.c:439 -#, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu" - -#: ref-filter.c:457 -#, c-format -msgid "unrecognized %%(if) argument: %s" -msgstr "tanımlanamayan %%(if) değişkeni: %s" - -#: ref-filter.c:559 -#, c-format -msgid "malformed field name: %.*s" -msgstr "hatalı oluşturulmuş alan adı: %.*s" - -#: ref-filter.c:586 -#, c-format -msgid "unknown field name: %.*s" -msgstr "bilinmeyen alan adı: %.*s" - -#: ref-filter.c:590 -#, c-format -msgid "" -"not a git repository, but the field '%.*s' requires access to object data" -msgstr "" -"bir git deposu değil, ancak '%.*s' alanı nesne verisine erişim gerektiriyor" - -#: ref-filter.c:714 -#, c-format -msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı" - -#: ref-filter.c:777 -#, c-format -msgid "format: %%(then) atom used without an %%(if) atom" -msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı" - -#: ref-filter.c:779 -#, c-format -msgid "format: %%(then) atom used more than once" -msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı" - -#: ref-filter.c:781 -#, c-format -msgid "format: %%(then) atom used after %%(else)" -msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı" - -#: ref-filter.c:809 -#, c-format -msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı" - -#: ref-filter.c:811 -#, c-format -msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı" - -#: ref-filter.c:813 -#, c-format -msgid "format: %%(else) atom used more than once" -msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı" - -#: ref-filter.c:828 -#, c-format -msgid "format: %%(end) atom used without corresponding atom" -msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı" - -#: ref-filter.c:885 -#, c-format -msgid "malformed format string %s" -msgstr "hatalı oluşturulmuş biçim dizisi %s" - -#: ref-filter.c:1488 -#, c-format -msgid "no branch, rebasing %s" -msgstr "dal yok, %s yeniden temellendiriliyor" - -#: ref-filter.c:1491 -#, c-format -msgid "no branch, rebasing detached HEAD %s" -msgstr "dal yok, ayrık HEAD %s yeniden temellendiriliyor" - -#: ref-filter.c:1494 -#, c-format -msgid "no branch, bisect started on %s" -msgstr "dal yok, ikili arama %s üzerinde başladı" - -#: ref-filter.c:1504 -msgid "no branch" -msgstr "dal yok" - -#: ref-filter.c:1540 ref-filter.c:1749 -#, c-format -msgid "missing object %s for %s" -msgstr "eksik nesne %s (%s için)" - -#: ref-filter.c:1550 -#, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)" - -#: ref-filter.c:2004 -#, c-format -msgid "malformed object at '%s'" -msgstr "'%s' konumunda hatalı oluşturulmuş nesne" - -#: ref-filter.c:2093 -#, c-format -msgid "ignoring ref with broken name %s" -msgstr "bozuk ada iye %s başvurusu yok sayılıyor" - -#: ref-filter.c:2389 -#, c-format -msgid "format: %%(end) atom missing" -msgstr "biçim: %%(end) ögeciği eksik" - -#: ref-filter.c:2489 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "'%s' seçeneği --merged ile uyumsuz" - -#: ref-filter.c:2492 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "'%s' seçeneği --no-merged ile uyumsuz" - -#: ref-filter.c:2502 -#, c-format -msgid "malformed object name %s" -msgstr "hatalı oluşturulmuş nesne adı %s" - -#: ref-filter.c:2507 -#, c-format -msgid "option `%s' must point to a commit" -msgstr "'%s' bir gönderiye işaret etmeli" - -#: remote.c:366 -#, c-format -msgid "config remote shorthand cannot begin with '/': %s" -msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s" - -#: remote.c:414 -msgid "more than one receivepack given, using the first" -msgstr "birden fazla receivepack verildi, birincisi kullanılıyor" - -#: remote.c:422 -msgid "more than one uploadpack given, using the first" -msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor" - -#: remote.c:612 -#, c-format -msgid "Cannot fetch both %s and %s to %s" -msgstr "Hem %s hem %s şuraya getirilemiyor: %s" - -#: remote.c:616 -#, c-format -msgid "%s usually tracks %s, not %s" -msgstr "%s genelde %s ögesini izler, %s değil" - -#: remote.c:620 -#, c-format -msgid "%s tracks both %s and %s" -msgstr "%s hem %s hem %s ögelerini izler" - -#: remote.c:688 -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "dizginin '%s' anahtarında'*' yoktu" - -#: remote.c:698 -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "dizginin '%s' değerinde '*' yok" - -#: remote.c:1004 -#, c-format -msgid "src refspec %s does not match any" -msgstr "kaynak başvuru belirteci %s başka hiçbir şeyle eşleşmiyor" - -#: remote.c:1009 -#, c-format -msgid "src refspec %s matches more than one" -msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor" - -#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push -#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is -#. the <src>. -#. -#: remote.c:1024 -#, c-format -msgid "" -"The destination you provided is not a full refname (i.e.,\n" -"starting with \"refs/\"). We tried to guess what you meant by:\n" -"\n" -"- Looking for a ref that matches '%s' on the remote side.\n" -"- Checking if the <src> being pushed ('%s')\n" -" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" -" refs/{heads,tags}/ prefix on the remote side.\n" -"\n" -"Neither worked, so we gave up. You must fully qualify the ref." -msgstr "" -"Sağladığınız kaynak tam bir başvuru belirteci değil (örneğin \"refs/\"\n" -"ile başlamıyor. Bununla ne demek istediğinizi bulabilmek için:\n" -"\n" -"- Uzak konumda '%s' ile eşleşen bir başvuru aradık.\n" -"- İtilen <kaynak>'ın ('%s') \"refs/{heads,tags}/\" içinde bir\n" -" başvuru olup olmadığına baktık. Eğer öyleyse uzak konum tarafında\n" -" eşleşen bir refs/{heads,tags}/ öneki ekledik.\n" -"\n" -"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak " -"nitelendirmelisiniz." - -#: remote.c:1044 -#, c-format -msgid "" -"The <src> part of the refspec is a commit object.\n" -"Did you mean to create a new branch by pushing to\n" -"'%s:refs/heads/%s'?" -msgstr "" -"Başvuru belirtecinin <kaynak> kısmı bir gönderi nesnesi.\n" -"'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n" -"oluşturmak istediniz?" - -#: remote.c:1049 -#, c-format -msgid "" -"The <src> part of the refspec is a tag object.\n" -"Did you mean to create a new tag by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"Başvuru belirtecinin <kaynak> kısmı bir etiket nesnesi.\n" -"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n" -"oluşturmak istediniz?" - -#: remote.c:1054 -#, c-format -msgid "" -"The <src> part of the refspec is a tree object.\n" -"Did you mean to tag a new tree by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"Başvuru belirtecinin <kaynak> kısmı bir ağaç nesnesi.\n" -"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n" -"etiketlemek istediniz?" - -#: remote.c:1059 -#, c-format -msgid "" -"The <src> part of the refspec is a blob object.\n" -"Did you mean to tag a new blob by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"Başvuru belirtecinin <kaynak> kısmı ikili bir nesne.\n" -"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n" -"etiketlemek istediniz?" - -#: remote.c:1095 -#, c-format -msgid "%s cannot be resolved to branch" -msgstr "%s dala çözülemiyor" - -#: remote.c:1106 -#, c-format -msgid "unable to delete '%s': remote ref does not exist" -msgstr "'%s' silinemiyor: uzak başvuru yok" - -#: remote.c:1118 -#, c-format -msgid "dst refspec %s matches more than one" -msgstr "hedef başvuru belirteci %s birden fazlası ile eşleşiyor" - -#: remote.c:1125 -#, c-format -msgid "dst ref %s receives from more than one src" -msgstr "hedef başvurusu %s birden çok kaynaktan alıyor" - -#: remote.c:1628 remote.c:1729 -msgid "HEAD does not point to a branch" -msgstr "HEAD bir dala işaret etmiyor" - -#: remote.c:1637 -#, c-format -msgid "no such branch: '%s'" -msgstr "böyle bir dal yok: '%s'" - -#: remote.c:1640 -#, c-format -msgid "no upstream configured for branch '%s'" -msgstr "'%s' dalı için üstkaynak yapılandırması yok" - -#: remote.c:1646 -#, c-format -msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "üstkaynak dalı '%s' bir uzak izleme dalı olarak depolanmıyor" - -#: remote.c:1661 -#, c-format -msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "itme hedefi '%s' ('%s' uzak konumunda) yerel izleme dalına iye değil" - -#: remote.c:1673 -#, c-format -msgid "branch '%s' has no remote for pushing" -msgstr "'%s' dalının itme için uzak konumu yok" - -#: remote.c:1683 -#, c-format -msgid "push refspecs for '%s' do not include '%s'" -msgstr "'%s' için olan başvuru belirteçleri '%s' içermiyor" - -#: remote.c:1696 -msgid "push has no destination (push.default is 'nothing')" -msgstr "itilecek bir hedef yok (push.default: 'nothing')" - -#: remote.c:1718 -msgid "cannot resolve 'simple' push to a single destination" -msgstr "tek bir konuma 'simple' itme çözülemiyor" - -#: remote.c:1844 -#, c-format -msgid "couldn't find remote ref %s" -msgstr "uzak başvuru %s bulunamadı" - -#: remote.c:1857 -#, c-format -msgid "* Ignoring funny ref '%s' locally" -msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor" - -#: remote.c:2020 -#, c-format -msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "Dalınız '%s' temelli, ancak üstkaynak gitmiş.\n" - -#: remote.c:2024 -msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (düzeltmek için \"git branch --unset-upstream\" kullan)\n" - -#: remote.c:2027 -#, c-format -msgid "Your branch is up to date with '%s'.\n" -msgstr "Dalınız '%s' ile güncel.\n" - -#: remote.c:2031 -#, c-format -msgid "Your branch and '%s' refer to different commits.\n" -msgstr "Sizin dalınız ve '%s' başka gönderilere başvuruyor.\n" - -#: remote.c:2034 -#, c-format -msgid " (use \"%s\" for details)\n" -msgstr " (ayrıntılar için \"%s\" kullanın)\n" - -#: remote.c:2038 -#, c-format -msgid "Your branch is ahead of '%s' by %d commit.\n" -msgid_plural "Your branch is ahead of '%s' by %d commits.\n" -msgstr[0] "Dalınız '%s' dalından %d gönderi ileride.\n" -msgstr[1] "Dalınız '%s' dalından %d gönderi ileride.\n" - -#: remote.c:2044 -msgid " (use \"git push\" to publish your local commits)\n" -msgstr " (yerel gönderilerinizi yayımlamak için \"git push\" kullanın)\n" - -#: remote.c:2047 -#, c-format -msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "" -"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "Dalınız '%s' dalından %d gönderi geride ve ileri sarılabilir.\n" -msgstr[1] "Dalınız '%s' dalından %d gönderi geride ve ileri sarılabilir.\n" - -#: remote.c:2055 -msgid " (use \"git pull\" to update your local branch)\n" -msgstr " (yerel dalınızı güncellemek için \"git pull\" kullanın)\n" - -#: remote.c:2058 -#, c-format -msgid "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commit each, respectively.\n" -msgid_plural "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commits each, respectively.\n" -msgstr[0] "" -"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n" -"her birinde %d ve %d gönderi var.\n" -msgstr[1] "" -"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n" -"her birinde %d ve %d gönderi var.\n" - -#: remote.c:2068 -msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (uzak dalı kendi dalınıza birleştirmek için \"git pull\" kullanın)\n" - -#: remote.c:2251 -#, c-format -msgid "cannot parse expected object name '%s'" -msgstr "beklenen nesne adı '%s' ayrıştırılamıyor" - -#: replace-object.c:21 -#, c-format -msgid "bad replace ref name: %s" -msgstr "hatalı değiştirme başvurusu adı: %s" - -#: replace-object.c:30 -#, c-format -msgid "duplicate replace ref: %s" -msgstr "yinelenmiş değiştirme başvurusu: %s" - -#: replace-object.c:82 -#, c-format -msgid "replace depth too high for object %s" -msgstr "%s nesnesi için değiştirme derinliği pek yüksek" - -#: rerere.c:217 rerere.c:226 rerere.c:229 -msgid "corrupt MERGE_RR" -msgstr "hasar görmüş MERGE_RR" - -#: rerere.c:264 rerere.c:269 -msgid "unable to write rerere record" -msgstr "rerere kaydı yazılamıyor" - -#: rerere.c:495 -#, c-format -msgid "there were errors while writing '%s' (%s)" -msgstr "'%s' yazılırken hatalar vardı (%s)" - -#: rerere.c:498 -#, c-format -msgid "failed to flush '%s'" -msgstr "'%s' floş yapılamadı" - -#: rerere.c:503 rerere.c:1039 -#, c-format -msgid "could not parse conflict hunks in '%s'" -msgstr "'%s' içindeki çakışan parçalar ayrıştırılamadı" - -#: rerere.c:684 -#, c-format -msgid "failed utime() on '%s'" -msgstr "'%s' üzerinde utime() başarısız" - -#: rerere.c:694 -#, c-format -msgid "writing '%s' failed" -msgstr "'%s' yazılamadı" - -#: rerere.c:714 -#, c-format -msgid "Staged '%s' using previous resolution." -msgstr "'%s' bir önceki çözüm kullanılarak hazırlama alanına alındı" - -#: rerere.c:753 -#, c-format -msgid "Recorded resolution for '%s'." -msgstr "'%s' için çözüm kaydedildi." - -#: rerere.c:788 -#, c-format -msgid "Resolved '%s' using previous resolution." -msgstr "'%s' bir önceki çözüm kullanılarak çözüldü." - -#: rerere.c:803 -#, c-format -msgid "cannot unlink stray '%s'" -msgstr "'%s' başıboşunun bağlantısı kesilemiyor" - -#: rerere.c:807 -#, c-format -msgid "Recorded preimage for '%s'" -msgstr "'%s' için öngörüntü kaydedildi" - -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 -#, c-format -msgid "could not create directory '%s'" -msgstr "'%s' dizini oluşturulamadı" - -#: rerere.c:1057 -#, c-format -msgid "failed to update conflicted state in '%s'" -msgstr "'%s' içindeki çakışan durum güncellenemedi" - -#: rerere.c:1068 rerere.c:1075 -#, c-format -msgid "no remembered resolution for '%s'" -msgstr "'%s' için hatırlanan çözüm yok" - -#: rerere.c:1077 -#, c-format -msgid "cannot unlink '%s'" -msgstr "'%s' bağlantısı kesilemiyor" - -#: rerere.c:1087 -#, c-format -msgid "Updated preimage for '%s'" -msgstr "'%s' için öngörüntü güncellendi" - -#: rerere.c:1096 -#, c-format -msgid "Forgot resolution for '%s'\n" -msgstr "'%s' için çözüm unutuldu\n" - -#: rerere.c:1199 -msgid "unable to open rr-cache directory" -msgstr "rr-cache dizini açılamıyor" - -#: revision.c:2497 -msgid "your current branch appears to be broken" -msgstr "geçerli dalınız bozuk gibi görünüyor" - -#: revision.c:2500 -#, c-format -msgid "your current branch '%s' does not have any commits yet" -msgstr "geçerli dalınız '%s' içinde henüz bir gönderi yok" - -#: revision.c:2708 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent, --bisect ile uyumsuz" - -#: revision.c:2712 -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L, -p ve -s dışında başka diff biçimlerini henüz desteklemiyor" - -#: run-command.c:763 -msgid "open /dev/null failed" -msgstr "/dev/null açılamadı" - -#: run-command.c:1269 -#, c-format -msgid "cannot create async thread: %s" -msgstr "async iş parçacığı oluşturulamadı: %s" - -#: run-command.c:1333 -#, c-format -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 "" -"'%s' kancası yok sayıldı çünkü bir çalıştırılabilir olarak ayarlanmamış.\n" -"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz." - -#: send-pack.c:144 -msgid "unexpected flush packet while reading remote unpack status" -msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi" - -#: send-pack.c:146 -#, c-format -msgid "unable to parse remote unpack status: %s" -msgstr "uzak konum açım durumu ayrıştırılamadı: %s" - -#: send-pack.c:148 -#, c-format -msgid "remote unpack failed: %s" -msgstr "uzak konum açımı başarısız: %s" - -#: send-pack.c:309 -msgid "failed to sign the push certificate" -msgstr "itme sertifikası imzalanamadı" - -#: send-pack.c:423 -msgid "the receiving end does not support --signed push" -msgstr "alıcı uç --signed itmeyi desteklemiyor" - -#: send-pack.c:425 -msgid "" -"not sending a push certificate since the receiving end does not support --" -"signed push" -msgstr "" -"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası " -"gönderilmiyor" - -#: send-pack.c:437 -msgid "the receiving end does not support --atomic push" -msgstr "alıcı uç --atomic itmeyi desteklemiyor" - -#: send-pack.c:442 -msgid "the receiving end does not support push options" -msgstr "alıcı uç itme seçeneklerini desteklemiyor" - -#: sequencer.c:191 -#, c-format -msgid "invalid commit message cleanup mode '%s'" -msgstr "geçersiz gönderi iletisi temizleme kipi '%s'" - -#: sequencer.c:296 -#, c-format -msgid "could not delete '%s'" -msgstr "'%s' silinemedi" - -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 -#, c-format -msgid "could not remove '%s'" -msgstr "'%s' kaldırılamadı" - -#: sequencer.c:325 -msgid "revert" -msgstr "geri al" - -#: sequencer.c:327 -msgid "cherry-pick" -msgstr "seç-al" - -#: sequencer.c:329 -msgid "rebase" -msgstr "yeniden temellendir" - -#: sequencer.c:331 -#, c-format -msgid "unknown action: %d" -msgstr "bilinmeyen eylem: %d" - -#: sequencer.c:389 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'" -msgstr "" -"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n" -"veya 'git rm <yollar>' ile imleyin" - -#: sequencer.c:392 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'\n" -"and commit the result with 'git commit'" -msgstr "" -"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n" -"veya 'git rm <yollar>' ile imleyin ve çıkan sonucu\n" -"'git commit' ile gönderin" - -#: sequencer.c:405 sequencer.c:2901 -#, c-format -msgid "could not lock '%s'" -msgstr "'%s' kilitlenemedi" - -#: sequencer.c:412 -#, c-format -msgid "could not write eol to '%s'" -msgstr "satır sonu şuraya yazılamadı: '%s'" - -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 -#, c-format -msgid "failed to finalize '%s'" -msgstr "'%s' tamamlanamadı" - -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 -#, c-format -msgid "could not read '%s'" -msgstr "'%s' okunamadı" - -#: sequencer.c:466 -#, c-format -msgid "your local changes would be overwritten by %s." -msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır." - -#: sequencer.c:470 -msgid "commit your changes or stash them to proceed." -msgstr "İlerlemek için değişikliklerinizi gönderin veya zulalayın." - -#: sequencer.c:502 -#, c-format -msgid "%s: fast-forward" -msgstr "%s: ileri sar" - -#: sequencer.c:541 builtin/tag.c:565 -#, c-format -msgid "Invalid cleanup mode %s" -msgstr "Geçersiz temizlik kipi %s" - -#. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". -#. -#: sequencer.c:635 -#, c-format -msgid "%s: Unable to write new index file" -msgstr "%s: Yeni indeks dosyası yazılamıyor" - -#: sequencer.c:652 -msgid "unable to update cache tree" -msgstr "önbellek ağacı güncellenemiyor" - -#: sequencer.c:666 -msgid "could not resolve HEAD commit" -msgstr "HEAD gönderisi çözülemedi" - -#: sequencer.c:746 -#, c-format -msgid "no key present in '%.*s'" -msgstr "'%.*s' içinde bir anahtar yok" - -#: sequencer.c:757 -#, c-format -msgid "unable to dequote value of '%s'" -msgstr "'%s' ögesinin tırnakları kaldırılamıyor" - -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 -#, c-format -msgid "could not open '%s' for reading" -msgstr "'%s' okuma için açılamadı" - -#: sequencer.c:804 -msgid "'GIT_AUTHOR_NAME' already given" -msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş" - -#: sequencer.c:809 -msgid "'GIT_AUTHOR_EMAIL' already given" -msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş" - -#: sequencer.c:814 -msgid "'GIT_AUTHOR_DATE' already given" -msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş" - -#: sequencer.c:818 -#, c-format -msgid "unknown variable '%s'" -msgstr "bilinmeyen değişken '%s'" - -#: sequencer.c:823 -msgid "missing 'GIT_AUTHOR_NAME'" -msgstr "'GIT_AUTHOR_NAME' eksik" - -#: sequencer.c:825 -msgid "missing 'GIT_AUTHOR_EMAIL'" -msgstr "'GIT_AUTHOR_EMAIL' eksik" - -#: sequencer.c:827 -msgid "missing 'GIT_AUTHOR_DATE'" -msgstr "'GIT_AUTHOR_DATE' eksik" - -#: sequencer.c:876 -#, c-format -msgid "" -"you have staged changes in your working tree\n" -"If these changes are meant to be squashed into the previous commit, run:\n" -"\n" -" git commit --amend %s\n" -"\n" -"If they are meant to go into a new commit, run:\n" -"\n" -" git commit %s\n" -"\n" -"In both cases, once you're done, continue with:\n" -"\n" -" git rebase --continue\n" -msgstr "" -"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n" -"Bu değişikliklerin bir önceki gönderiyle gitmiş olması gerekiyorsa:\n" -"\n" -"\tgit commit --amend %s komutunu çalıştırın.\n" -"\n" -"Bunlar için yeni bir gönderi hazırlamak istiyorsanız:\n" -"\n" -"\tgit commit %s komutunu çalıştırın.\n" -"\n" -"Her iki durumda da işiniz bittikten sonra:\n" -"\n" -"\tgit rebase --continue komutu ile sürdürün.\n" - -#: sequencer.c:1148 -msgid "'prepare-commit-msg' hook failed" -msgstr "'prepare-commit-msg' başarısız oldu" - -#: sequencer.c:1154 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n" -"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n" -"Bu iletiyi onları el ile belirterek gizleyebilirsiniz. Aşağıdaki komutu\n" -"çalıştırın ve yapılandırma dosyanızı düzenlemek için düzenleyicinizdeki\n" -"yönergeleri izleyin:\n" -"\n" -"\tgit config --global --edit\n" -"\n" -"Bundan sonra bu gönderi için kullanılan kimliği düzeltmek isteyebilirsiniz:\n" -"\n" -"\tgit commit --amend --reset-author\n" - -#: sequencer.c:1167 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n" -"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n" -"Bu iletiyi onları el ile belirterek gizleyebilirsiniz:\n" -"\n" -"\tgit config --global user.name \"Adınız\"\n" -"\tgit config --global user.email \"siz@e-posta.com\"\n" -"\n" -"Bundan sonra bu gönderi için kullanılan kimliği düzeltmek isteyebilirsiniz:\n" -"\n" -"\tgit commit --amend --reset-author\n" - -#: sequencer.c:1209 -msgid "couldn't look up newly created commit" -msgstr "yeni oluşturulan gönderi aranamadı" - -#: sequencer.c:1211 -msgid "could not parse newly created commit" -msgstr "yeni oluşturulan gönderi ayrıştırılamadı" - -#: sequencer.c:1257 -msgid "unable to resolve HEAD after creating commit" -msgstr "HEAD, gönderi oluşturduktan sonra çözülemiyor" - -#: sequencer.c:1259 -msgid "detached HEAD" -msgstr "ayrık HEAD" - -#: sequencer.c:1263 -msgid " (root-commit)" -msgstr " (kök gönderi)" - -#: sequencer.c:1284 -msgid "could not parse HEAD" -msgstr "HEAD ayrıştırılamadı" - -#: sequencer.c:1286 -#, c-format -msgid "HEAD %s is not a commit!" -msgstr "HEAD %s bir gönderi değil" - -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 -msgid "could not parse HEAD commit" -msgstr "HEAD gönderisi ayrıştırılamadı" - -#: sequencer.c:1342 sequencer.c:1968 -msgid "unable to parse commit author" -msgstr "gönderi yazarı ayrıştırılamıyor" - -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree bir ağaca yazamadı" - -#: sequencer.c:1386 sequencer.c:1447 -#, c-format -msgid "unable to read commit message from '%s'" -msgstr "'%s' konumundan gönderi iletisi okunamıyor" - -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 -msgid "failed to write commit object" -msgstr "gönderi nesnesi yazılamadı" - -#: sequencer.c:1474 -#, c-format -msgid "could not parse commit %s" -msgstr "%s gönderisi ayrıştırılamadı" - -#: sequencer.c:1479 -#, c-format -msgid "could not parse parent commit %s" -msgstr "üst gönderi %s ayrıştırılamadı" - -#: sequencer.c:1562 sequencer.c:1673 -#, c-format -msgid "unknown command: %d" -msgstr "bilinmeyen komut: %d" - -#: sequencer.c:1620 sequencer.c:1645 -#, c-format -msgid "This is a combination of %d commits." -msgstr "Bu %d gönderinin bir birleşimi." - -#: sequencer.c:1630 -msgid "need a HEAD to fixup" -msgstr "düzeltmek için bir HEAD gerekiyor" - -#: sequencer.c:1632 sequencer.c:3212 -msgid "could not read HEAD" -msgstr "HEAD okunamadı" - -#: sequencer.c:1634 -msgid "could not read HEAD's commit message" -msgstr "HEAD'in gönderi iletisi okunamadı" - -#: sequencer.c:1640 -#, c-format -msgid "cannot write '%s'" -msgstr "'%s' yazılamıyor" - -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 -msgid "This is the 1st commit message:" -msgstr "Birinci gönderi iletisi bu:" - -#: sequencer.c:1655 -#, c-format -msgid "could not read commit message of %s" -msgstr "%s gönderi iletisi okunamadı" - -#: sequencer.c:1662 -#, c-format -msgid "This is the commit message #%d:" -msgstr "Gönderi iletisi #%d bu:" - -#: sequencer.c:1668 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "Gönderi iletisi #%d atlanacak:" - -#: sequencer.c:1756 -msgid "your index file is unmerged." -msgstr "indeks dosyanız birleştirilmemiş" - -#: sequencer.c:1763 -msgid "cannot fixup root commit" -msgstr "kök gönderi düzeltilemiyor" - -#: sequencer.c:1782 -#, c-format -msgid "commit %s is a merge but no -m option was given." -msgstr "%s gönderisi bir birleştirme, ancak bir -m seçeneği verilmedi." - -#: sequencer.c:1790 sequencer.c:1798 -#, c-format -msgid "commit %s does not have parent %d" -msgstr "%s gönderisinin %d diye bir üst ögesi yok" - -#: sequencer.c:1804 -#, c-format -msgid "cannot get commit message for %s" -msgstr "%s gönderi iletisi alınamıyor" - -#. TRANSLATORS: The first %s will be a "todo" command like -#. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 -#, c-format -msgid "%s: cannot parse parent commit %s" -msgstr "%s: üst gönderi %s ayrıştırılamıyor" - -#: sequencer.c:1888 -#, c-format -msgid "could not rename '%s' to '%s'" -msgstr "'%s', '%s' olarak yeniden adlandırılamadı" - -#: sequencer.c:1943 -#, c-format -msgid "could not revert %s... %s" -msgstr "%s geri alınamadı... %s" - -#: sequencer.c:1944 -#, c-format -msgid "could not apply %s... %s" -msgstr "%s uygulanamadı... %s" - -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "%s %s bırakılıyor -- yama içeriği halihazırda üstkaynakta\n" - -#: sequencer.c:2018 -#, c-format -msgid "git %s: failed to read the index" -msgstr "git %s: indeks okunamadı" - -#: sequencer.c:2025 -#, c-format -msgid "git %s: failed to refresh the index" -msgstr "git %s: indeks yenilenemedi" - -#: sequencer.c:2102 -#, c-format -msgid "%s does not accept arguments: '%s'" -msgstr "%s değişken kabul etmiyor: '%s'" - -#: sequencer.c:2111 -#, c-format -msgid "missing arguments for %s" -msgstr "%s için eksik değişken" - -#: sequencer.c:2142 -#, c-format -msgid "could not parse '%s'" -msgstr "'%s' ayrıştırılamadı" - -#: sequencer.c:2203 -#, c-format -msgid "invalid line %d: %.*s" -msgstr "geçersiz satır %d: %.*s" - -#: sequencer.c:2214 -#, c-format -msgid "cannot '%s' without a previous commit" -msgstr "öncesinde bir gönderi olmadan '%s' yapılamıyor" - -#: sequencer.c:2298 -msgid "cancelling a cherry picking in progress" -msgstr "sürmekte olan bir seç-al iptal ediliyor" - -#: sequencer.c:2305 -msgid "cancelling a revert in progress" -msgstr "sürmekte olan bir geri al iptal ediliyor" - -#: sequencer.c:2349 -msgid "please fix this using 'git rebase --edit-todo'." -msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın." - -#: sequencer.c:2351 -#, c-format -msgid "unusable instruction sheet: '%s'" -msgstr "kullanılabilir olmayan yönerge tablosu: '%s'" - -#: sequencer.c:2356 -msgid "no commits parsed." -msgstr "Hiçbir gönderi ayrıştırılmadı." - -#: sequencer.c:2367 -msgid "cannot cherry-pick during a revert." -msgstr "bir geri al sırasında seç-al yapılamıyor" - -#: sequencer.c:2369 -msgid "cannot revert during a cherry-pick." -msgstr "bir seç-al sırasında geri al yapılamıyor" - -#: sequencer.c:2447 -#, c-format -msgid "invalid value for %s: %s" -msgstr "%s için geçersiz değer: %s" - -#: sequencer.c:2540 -msgid "unusable squash-onto" -msgstr "kullanılabilir olmayan squash-onto" - -#: sequencer.c:2556 -#, c-format -msgid "malformed options sheet: '%s'" -msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'" - -#: sequencer.c:2644 sequencer.c:4361 -msgid "empty commit set passed" -msgstr "boş gönderi seti aktarıldı" - -#: sequencer.c:2660 -msgid "revert is already in progress" -msgstr "geri al halihazırda sürüyor" - -#: sequencer.c:2662 -#, c-format -msgid "try \"git revert (--continue | %s--abort | --quit)\"" -msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin" - -#: sequencer.c:2665 -msgid "cherry-pick is already in progress" -msgstr "seç-al halihazırda sürüyor" - -#: sequencer.c:2667 -#, c-format -msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" -msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin" - -#: sequencer.c:2681 -#, c-format -msgid "could not create sequencer directory '%s'" -msgstr "ardıştırıcı dizini '%s' oluşturulamadı" - -#: sequencer.c:2696 -msgid "could not lock HEAD" -msgstr "HEAD kilitlenemedi" - -#: sequencer.c:2756 sequencer.c:4099 -msgid "no cherry-pick or revert in progress" -msgstr "süren bir seç-al veya geri al yok" - -#: sequencer.c:2758 sequencer.c:2769 -msgid "cannot resolve HEAD" -msgstr "HEAD çözülemiyor" - -#: sequencer.c:2760 sequencer.c:2804 -msgid "cannot abort from a branch yet to be born" -msgstr "daha doğmamış bir daldan iptal edilemiyor" - -#: sequencer.c:2790 builtin/grep.c:724 -#, c-format -msgid "cannot open '%s'" -msgstr "'%s' açılamıyor" - -#: sequencer.c:2792 -#, c-format -msgid "cannot read '%s': %s" -msgstr "'%s' okunamıyor: %s" - -#: sequencer.c:2793 -msgid "unexpected end of file" -msgstr "beklenmedik dosya sonu" - -#: sequencer.c:2799 -#, c-format -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "depolanmış seç-al öncesi HEAD dosyası '%s' hasar görmüş" - -#: sequencer.c:2810 -msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "HEAD'i taşımış görünüyorsunuz. Geri sarılmıyor, HEAD'inizi denetleyin!" - -#: sequencer.c:2851 -msgid "no revert in progress" -msgstr "süren bir geri al yok" - -#: sequencer.c:2859 -msgid "no cherry-pick in progress" -msgstr "süren bir seç-al yok" - -#: sequencer.c:2869 -msgid "failed to skip the commit" -msgstr "gönderi atlanamadı" - -#: sequencer.c:2876 -msgid "there is nothing to skip" -msgstr "atlanacak bir şey yok" - -#: sequencer.c:2879 -#, c-format -msgid "" -"have you committed already?\n" -"try \"git %s --continue\"" -msgstr "" -"Gönderiyi yaptınız mı?\n" -"\"git %s --continue\" deneyin.\"" - -#: sequencer.c:3003 sequencer.c:4011 -#, c-format -msgid "could not update %s" -msgstr "%s güncellenemedi" - -#: sequencer.c:3042 sequencer.c:3991 -msgid "cannot read HEAD" -msgstr "HEAD okunamıyor" - -#: sequencer.c:3059 -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "'%s', '%s' konumuna kopyalanamıyor" - -#: sequencer.c:3067 -#, c-format -msgid "" -"You can amend the commit now, with\n" -"\n" -" git commit --amend %s\n" -"\n" -"Once you are satisfied with your changes, run\n" -"\n" -" git rebase --continue\n" -msgstr "" -"Gönderiyi şimdi şu komutla değiştirebilirsiniz:\n" -"\n" -"\tgit commit --amend %s\n" -"\n" -"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n" -"\n" -"\tgit rebase --continue\n" - -#: sequencer.c:3077 -#, c-format -msgid "Could not apply %s... %.*s" -msgstr "%s uygulanamıyor... %.*s" - -#: sequencer.c:3084 -#, c-format -msgid "Could not merge %.*s" -msgstr "%.*s birleştirilemedi" - -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 -#, c-format -msgid "could not copy '%s' to '%s'" -msgstr "'%s', '%s' konumuna kopyalanamadı" - -#: sequencer.c:3129 -#, c-format -msgid "" -"execution failed: %s\n" -"%sYou can fix the problem, and then run\n" -"\n" -" git rebase --continue\n" -"\n" -msgstr "" -"Çalıştırma başarısız: %s\n" -"%sSorunu çözüp sürdürmek için şunu çalıştırın:\n" -"\n" -"\tgit rebase --continue\n" -"\n" - -#: sequencer.c:3135 -msgid "and made changes to the index and/or the working tree\n" -msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yapıldı\n" - -#: sequencer.c:3141 -#, c-format -msgid "" -"execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" -"Commit or stash your changes, and then run\n" -"\n" -" git rebase --continue\n" -"\n" -msgstr "" -"Çalıştırma başarılı oldu: %s,\n" -"ancak indeksinize ve/veya çalışma ağacınıza değişiklikler bıraktı\n" -"Değişikliklerinizi gönderin veya zulalayın, ardından şunu çalıştırın:\n" -"\n" -"\tgit rebase --continue\n" -"\n" - -#: sequencer.c:3202 -#, c-format -msgid "illegal label name: '%.*s'" -msgstr "izin verilmeyen etiket adı: '%.*s'" - -#: sequencer.c:3256 -msgid "writing fake root commit" -msgstr "sahte kök gönderi yazılıyor" - -#: sequencer.c:3261 -msgid "writing squash-onto" -msgstr "squash-onto yazılıyor" - -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 -#, c-format -msgid "failed to find tree of %s" -msgstr "şunun ağacı bulunamadı: %s" - -#: sequencer.c:3344 -#, c-format -msgid "could not resolve '%s'" -msgstr "'%s' çözülemedi" - -#: sequencer.c:3375 -msgid "cannot merge without a current revision" -msgstr "güncel bir revizyon olmadan birleştirilemiyor" - -#: sequencer.c:3397 -#, c-format -msgid "unable to parse '%.*s'" -msgstr "'%.*s' ayrıştırılamıyor" - -#: sequencer.c:3406 -#, c-format -msgid "nothing to merge: '%.*s'" -msgstr "birleştirilecek bir şey yok: '%.*s'" - -#: sequencer.c:3418 -msgid "octopus merge cannot be executed on top of a [new root]" -msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz" - -#: sequencer.c:3434 -#, c-format -msgid "could not get commit message of '%s'" -msgstr "'%s' gönderisinin gönderi iletisi alınamadı" - -#: sequencer.c:3594 -#, c-format -msgid "could not even attempt to merge '%.*s'" -msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'" - -#: sequencer.c:3610 -msgid "merge: Unable to write new index file" -msgstr "merge: Yeni indeks dosyası yazılamıyor" - -#: sequencer.c:3679 builtin/rebase.c:737 -#, c-format -msgid "Applied autostash.\n" -msgstr "Kendiliğinden zulalama uygulandı.\n" - -#: sequencer.c:3691 -#, c-format -msgid "cannot store %s" -msgstr "%s depolanamıyor" - -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 -#, c-format -msgid "" -"Applying autostash resulted in conflicts.\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "" -"Kendiliğinden zulalama uygulaması çakışmalara neden oldu.\n" -"Değişiklikleriniz zula içerisinde güvende.\n" -"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n" - -#: sequencer.c:3755 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s: geçerli bir OID değil" - -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 -msgid "could not detach HEAD" -msgstr "HEAD ayrılamadı" - -#: sequencer.c:3775 -#, c-format -msgid "Stopped at HEAD\n" -msgstr "HEAD'de duruldu\n" - -#: sequencer.c:3777 -#, c-format -msgid "Stopped at %s\n" -msgstr "%s konumunda duruldu\n" - -#: sequencer.c:3785 -#, c-format -msgid "" -"Could not execute the todo command\n" -"\n" -" %.*s\n" -"It has been rescheduled; To edit the command before continuing, please\n" -"edit the todo list first:\n" -"\n" -" git rebase --edit-todo\n" -" git rebase --continue\n" -msgstr "" -"todo komutu çalıştırılamadı.\n" -"\n" -"\t%.*s\n" -"Yeniden zamanlandı; sürdürmeden önce komutu düzenlemek için lütfen\n" -"önce yapılacaklar listesini düzenleyin:\n" -"\n" -"\tgit rebase --edit-todo\n" -"\tgit rebase --continue\n" - -#: sequencer.c:3869 -#, c-format -msgid "Stopped at %s... %.*s\n" -msgstr "%s konumunda duruldu... %.*s\n" - -#: sequencer.c:3940 -#, c-format -msgid "unknown command %d" -msgstr "bilinmeyen komut %d" - -#: sequencer.c:3999 -msgid "could not read orig-head" -msgstr "orig-head okunamadı" - -#: sequencer.c:4004 -msgid "could not read 'onto'" -msgstr "'onto' okunamadı" - -#: sequencer.c:4018 -#, c-format -msgid "could not update HEAD to %s" -msgstr "HEAD şuraya güncellenemedi: %s" - -#: sequencer.c:4111 -msgid "cannot rebase: You have unstaged changes." -msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var." - -#: sequencer.c:4120 -msgid "cannot amend non-existing commit" -msgstr "var olmayan gönderi değiştirilemiyor" - -#: sequencer.c:4122 -#, c-format -msgid "invalid file: '%s'" -msgstr "geçersiz dosya: '%s'" - -#: sequencer.c:4124 -#, c-format -msgid "invalid contents: '%s'" -msgstr "geçersiz içerik: '%s'" - -#: sequencer.c:4127 -msgid "" -"\n" -"You have uncommitted changes in your working tree. Please, commit them\n" -"first and then run 'git rebase --continue' again." -msgstr "" -"\n" -"Çalışma ağacınızda gönderilmemiş değişiklikleriniz var. Lütfen önce\n" -"onları gönderin ve ardından 'git rebase --continue' yapın." - -#: sequencer.c:4163 sequencer.c:4202 -#, c-format -msgid "could not write file: '%s'" -msgstr "dosya yazılamadı: '%s'" - -#: sequencer.c:4217 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "CHERRY_PICK_HEAD kaldırılamadı" - -#: sequencer.c:4224 -msgid "could not commit staged changes." -msgstr "Hazırlanmış değişiklikler gönderilemedi." - -#: sequencer.c:4338 -#, c-format -msgid "%s: can't cherry-pick a %s" -msgstr "%s: Bir %s seçip alınamıyor" - -#: sequencer.c:4342 -#, c-format -msgid "%s: bad revision" -msgstr "%s hatalı revizyon" - -#: sequencer.c:4377 -msgid "can't revert as initial commit" -msgstr "ilk gönderi geri alınamaz" - -#: sequencer.c:4846 -msgid "make_script: unhandled options" -msgstr "make_script: ele alınmayan seçenekler" - -#: sequencer.c:4849 -msgid "make_script: error preparing revisions" -msgstr "make_script: revizyonlar hazırlanırken hata" - -#: sequencer.c:5083 sequencer.c:5100 -msgid "nothing to do" -msgstr "yapılacak bir şey yok" - -#: sequencer.c:5119 -msgid "could not skip unnecessary pick commands" -msgstr "gerekli olmayan seçim komutları atlanamadı" - -#: sequencer.c:5213 -msgid "the script was already rearranged." -msgstr "betik halihazırda yeniden düzenlenmişti" - -#: setup.c:124 -#, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s', '%s' konumunda depo dışında" - -#: setup.c:175 -#, c-format -msgid "" -"%s: no such path in the working tree.\n" -"Use 'git <command> -- <path>...' to specify paths that do not exist locally." -msgstr "" -"%s: Çalışma ağacında böyle bir yol yok.\n" -"Yerelde var olmayan yolları belirtmek için 'git <komut> -- <yol>... kullanın." - -#: setup.c:188 -#, c-format -msgid "" -"ambiguous argument '%s': unknown revision or path not in the working tree.\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git <command> [<revision>...] -- [<file>...]'" -msgstr "" -"Belirsiz değişken '%s': Çalışma ağacında olmayan bilinmeyen revizyon veya " -"yol.\n" -"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n" -"'git <komut> [<revizyon>...] -- [<dosya>...]'" - -#: setup.c:254 -#, c-format -msgid "option '%s' must come before non-option arguments" -msgstr "'%s' seçeneği seçenek olmayan değişkenlerden önce gelmeli" - -#: setup.c:273 -#, c-format -msgid "" -"ambiguous argument '%s': both revision and filename\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git <command> [<revision>...] -- [<file>...]'" -msgstr "" -"Belirsiz değişken '%s': Hem değişken hem dosya adı.\n" -"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n" -"'git <komut> [<revizyon>...] -- [<dosya>...]'" - -#: setup.c:409 -msgid "unable to set up work tree using invalid config" -msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor" - -#: setup.c:413 -msgid "this operation must be run in a work tree" -msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı" - -#: setup.c:559 -#, c-format -msgid "Expected git repo version <= %d, found %d" -msgstr "Beklenen git repo sürümü <= %d, %d bulundu" - -#: setup.c:567 -msgid "unknown repository extensions found:" -msgstr "bilinmeyen depo genişletmeleri bulundu:" - -#: setup.c:586 -#, c-format -msgid "error opening '%s'" -msgstr "'%s' açılırken hata" - -#: setup.c:588 -#, c-format -msgid "too large to be a .git file: '%s'" -msgstr "bir .git dosyası olabilmek için çok büyük: '%s'" - -#: setup.c:590 -#, c-format -msgid "error reading %s" -msgstr "%s okunurken hata" - -#: setup.c:592 -#, c-format -msgid "invalid gitfile format: %s" -msgstr "geçersiz gitfile biçimi: %s" - -#: setup.c:594 -#, c-format -msgid "no path in gitfile: %s" -msgstr "gitfile içinde yol yok: %s" - -#: setup.c:596 -#, c-format -msgid "not a git repository: %s" -msgstr "bir git deposu değil: %s" - -#: setup.c:695 -#, c-format -msgid "'$%s' too big" -msgstr "'$%s' çok büyük" - -#: setup.c:709 -#, c-format -msgid "not a git repository: '%s'" -msgstr "bir git deposu değil: '%s'" - -#: setup.c:738 setup.c:740 setup.c:771 -#, c-format -msgid "cannot chdir to '%s'" -msgstr "'%s' konumuna chdir yapılamıyor" - -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 -msgid "cannot come back to cwd" -msgstr "cwd'ye geri dönülemiyor" - -#: setup.c:870 -#, c-format -msgid "failed to stat '%*s%s%s'" -msgstr "'%*s%s%s' bilgileri alınamadı" - -#: setup.c:1108 -msgid "Unable to read current working directory" -msgstr "Şu anki çalışma dizini okunamıyor" - -#: setup.c:1117 setup.c:1123 -#, c-format -msgid "cannot change to '%s'" -msgstr "şuraya değiştirilemiyor: '%s'" - -#: setup.c:1128 -#, c-format -msgid "not a git repository (or any of the parent directories): %s" -msgstr "bir git deposu (veya üst dizinlerinden birisi) değil: %s" - -#: setup.c:1134 -#, c-format -msgid "" -"not a git repository (or any parent up to mount point %s)\n" -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." -msgstr "" -"Bir git deposu veya (%s bağlama noktasına kadar olan üstü) değil\n" -"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM " -"ayarlanmamış)." - -#: setup.c:1245 -#, c-format -msgid "" -"problem with core.sharedRepository filemode value (0%.3o).\n" -"The owner of files must always have read and write permissions." -msgstr "" -"core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n" -"Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir." - -#: setup.c:1289 -msgid "open /dev/null or dup failed" -msgstr "/dev/null açılması veya açıklayıcı çoğaltılması başarısız" - -#: setup.c:1304 -msgid "fork failed" -msgstr "çatallama başarısız" - -#: setup.c:1309 -msgid "setsid failed" -msgstr "setsid başarısız" - -#: sha1-file.c:452 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates" - -#: sha1-file.c:503 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s" - -#: sha1-file.c:575 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin" - -#: sha1-file.c:582 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "nesne dizini olağanlaştırılamıyor: %s" - -#: sha1-file.c:625 -msgid "unable to fdopen alternates lockfile" -msgstr "alternatifler kilit dosyası fdopen yapılamıyor" - -#: sha1-file.c:643 -msgid "unable to read alternates file" -msgstr "alternatifler dosyası okunamıyor" - -#: sha1-file.c:650 -msgid "unable to move new alternates file into place" -msgstr "yeni alternatifler dosyası yerine taşınamıyor" - -#: sha1-file.c:685 -#, c-format -msgid "path '%s' does not exist" -msgstr "'%s' diye bir yol yok" - -#: sha1-file.c:711 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor." - -#: sha1-file.c:717 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "Başvuru deposu '%s' yerel bir depo değil." - -#: sha1-file.c:723 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "başvuru deposu '%s' sığ" - -#: sha1-file.c:731 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "başvuru deposu '%s' aşılı" - -#: sha1-file.c:791 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s" - -#: sha1-file.c:943 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor" - -#: sha1-file.c:964 -msgid "mmap failed" -msgstr "mmap başarısız" - -#: sha1-file.c:1128 -#, c-format -msgid "object file %s is empty" -msgstr "nesne dosyası %s boş" - -#: sha1-file.c:1263 sha1-file.c:2443 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "hasar görmüş gevşek nesne '%s'" - -#: sha1-file.c:1265 sha1-file.c:2447 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "gevşek nesne '%s' sonunda anlamsız veri" - -#: sha1-file.c:1307 -msgid "invalid object type" -msgstr "geçersiz nesne türü" - -#: sha1-file.c:1391 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor" - -#: sha1-file.c:1394 -#, c-format -msgid "unable to unpack %s header" -msgstr "%s üstbilgisi açılamıyor" - -#: sha1-file.c:1400 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "%s üstbilgisi paketi --allow-unknown-type ile ayrıştırılamıyor" - -#: sha1-file.c:1403 -#, c-format -msgid "unable to parse %s header" -msgstr "%s üstbilgisi ayrıştırılamıyor" - -#: sha1-file.c:1629 -#, c-format -msgid "failed to read object %s" -msgstr "%s nesnesi okunamadı" - -#: sha1-file.c:1633 -#, c-format -msgid "replacement %s not found for %s" -msgstr "%s yedeği %s için bulunamadı" - -#: sha1-file.c:1637 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş" - -#: sha1-file.c:1641 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş" - -#: sha1-file.c:1746 -#, c-format -msgid "unable to write file %s" -msgstr "%s dosyası yazılamıyor" - -#: sha1-file.c:1753 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "'%s' ögesine izin ayarlanamıyor" - -#: sha1-file.c:1760 -msgid "file write error" -msgstr "dosya yazım hatası" - -#: sha1-file.c:1780 -msgid "error when closing loose object file" -msgstr "gevşek nesne dosyası kapatılırken hata" - -#: sha1-file.c:1845 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "%s depo veritabanına nesne eklemek için yetersiz izin" - -#: sha1-file.c:1847 -msgid "unable to create temporary file" -msgstr "geçici dosya oluşturulamıyor" - -#: sha1-file.c:1871 -msgid "unable to write loose object file" -msgstr "gevşek nesne dosyası yazılamıyor" - -#: sha1-file.c:1877 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "yeni nesne %s söndürülemiyor (%d)" - -#: sha1-file.c:1881 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)" - -#: sha1-file.c:1885 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı" - -#: sha1-file.c:1895 builtin/pack-objects.c:1054 -#, c-format -msgid "failed utime() on %s" -msgstr "%s üzerinde utime() başarısız" - -#: sha1-file.c:1972 -#, c-format -msgid "cannot read object for %s" -msgstr "%s için nesne okunamıyor" - -#: sha1-file.c:2011 -msgid "corrupt commit" -msgstr "hasar görmüş gönderi" - -#: sha1-file.c:2019 -msgid "corrupt tag" -msgstr "hasar görmüş etiket" - -#: sha1-file.c:2119 -#, c-format -msgid "read error while indexing %s" -msgstr "%s indekslenirken okuma hatası" - -#: sha1-file.c:2122 -#, c-format -msgid "short read while indexing %s" -msgstr "%s indekslenirken kısa read" - -#: sha1-file.c:2195 sha1-file.c:2205 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s: veritabanına ekleme başarısız" - -#: sha1-file.c:2211 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s: desteklenmeyen dosya türü" - -#: sha1-file.c:2235 -#, c-format -msgid "%s is not a valid object" -msgstr "%s geçerli bir nesne değil" - -#: sha1-file.c:2237 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s geçerli bir '%s' nesnesi değil" - -#: sha1-file.c:2264 builtin/index-pack.c:155 -#, c-format -msgid "unable to open %s" -msgstr "%s açılamıyor" - -#: sha1-file.c:2454 sha1-file.c:2507 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)" - -#: sha1-file.c:2478 -#, c-format -msgid "unable to mmap %s" -msgstr "%s mmap yapılamadı" - -#: sha1-file.c:2483 -#, c-format -msgid "unable to unpack header of %s" -msgstr "%s üstbilgisi açılamıyor" - -#: sha1-file.c:2489 -#, c-format -msgid "unable to parse header of %s" -msgstr "%s üstbilgisi ayrıştırılamıyor" - -#: sha1-file.c:2500 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "%s içeriği açılamıyor" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "kısa SHA1 %s belirsiz" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "Adaylar:" - -#: sha1-name.c:796 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git normalde hiçbir zaman 40 onaltılı karakterlerle biten bir başvuru\n" -"oluşturmaz, çünkü 40 onaltılı bir başvuru, onu belirlediğiniz zaman yok\n" -"sayılacaktır. Bu başvurular yanlışlıkla oluşturulmuş olabilir. Örneğin:\n" -"\n" -"\tgit switch -c $br $(git rev-parse ...)\n" -"\n" -"komutunda \"$br\" bir şekilde boş kalmış ve 40 onaltılı bir başvuru\n" -"oluşturulmuş. Lütfen bu başvuruları inceleyin ve gerekirse silin. Bu " -"iletiyi\n" -"kapatmak için \"git config advice.objectNameWarning\" yapın." - -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "'%.*s' günlüğünde yalnızca %d girdi var" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "'%s' yolu disk üzerinde mevcut, ancak '%.*s' içinde değil" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"'%s' yolu mevcut, ancak '%s' değil\n" -"İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "'%s' yolu '%.*s' içinde mevcut değil" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"'%s' yolu indekste, ancak %d numaralı alanda değil\n" -"İpucu: Şunu mu demek istediniz: ':%d:%s'?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"'%s' yolu indekste, ancak '%s' değil\n" -"İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "'%s' yolu diskte mevcut, ancak indekste değil" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "göreceli yol sözdizimi çalışma ağacı dışında kullanılamaz" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "geçersiz nesne adı: '%.*s'" - -#. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 -#, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u GiB" - -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u GiB/sn" - -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u MiB" - -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u MiB/sn" - -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u KiB" - -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u KiB/sn" - -#. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u bayt" -msgstr[1] "%u bayt" - -#. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 -#, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u bayt/sn" -msgstr[1] "%u bayt/sn" - -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "'%s' düzenlenemedi" - -#: submodule.c:114 submodule.c:143 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "" -"Birleştirilmemiş .gitmodules değiştirilemiyor, önce birleştirme " -"çakışmalarını çözün" - -#: submodule.c:118 submodule.c:147 -#, c-format -msgid "Could not find section in .gitmodules where path=%s" -msgstr ".gitmodules içinde path=%s olan bölüm bulunamadı" - -#: submodule.c:154 -#, c-format -msgid "Could not remove .gitmodules entry for %s" -msgstr "%s için .gitmodules girdisi kaldırılamadı" - -#: submodule.c:165 -msgid "staging updated .gitmodules failed" -msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu" - -#: submodule.c:327 -#, c-format -msgid "in unpopulated submodule '%s'" -msgstr "içi doldurulmamış '%s' altmodülünde" - -#: submodule.c:358 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Yol belirteci '%s' '%.*s' altmodülünde" - -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "hatalı --ignore-submodules değişkeni: %s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"%s gönderisinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle " -"çarpışıyor. Atlanıyor." - -#: submodule.c:910 -#, c-format -msgid "submodule entry '%s' (%s) is a %s, not a commit" -msgstr "altmodül girdisi '%s' (%s) bir %s, gönderi değil" - -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' " -"çalıştırılamadı" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "'%s' altmodülü için işlem başarısız oldu" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "HEAD geçerli bir başvuru olarak çözülemedi." - -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "'%s' altmodülü itiliyor\n" - -#: submodule.c:1161 -#, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "'%s' altmodülü itilemiyor\n" - -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "%s%s altmodülü getiriliyor\n" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "'%s' altmodülüne erişilemedi\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Altmodül getirilirken hata:\n" -"%s" - -#: submodule.c:1662 -#, c-format -msgid "'%s' not recognized as a git repository" -msgstr "'%s' bir git deposu olarak tanımlanamadı" - -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "'%s' altmodülü içinde 'git status --porcelain=2' çalıştırılamadı" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "'%s' altmodülü içinde 'git status --porcelain=2' başarısız oldu" - -#: submodule.c:1800 -#, c-format -msgid "could not start 'git status' in submodule '%s'" -msgstr "'%s' altmodülü içinde 'git status' başlatılamadı" - -#: submodule.c:1813 -#, c-format -msgid "could not run 'git status' in submodule '%s'" -msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı" - -#: submodule.c:1828 -#, c-format -msgid "Could not unset core.worktree setting in submodule '%s'" -msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı" - -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "'%s' altmodülüne özyinelenemedi" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "altmodül indeksi sıfırlanamadı" - -#: submodule.c:1918 -#, c-format -msgid "submodule '%s' has dirty index" -msgstr "'%s' altmodülü indeksi kirli" - -#: submodule.c:1970 -#, c-format -msgid "Submodule '%s' could not be updated." -msgstr "'%s' altmodülü güncellenemedi." - -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde" - -#: submodule.c:2059 -#, c-format -msgid "" -"relocate_gitdir for submodule '%s' with more than one worktree not supported" -msgstr "" -"relocate_gitdir birden çok çalışma ağaçlı '%s' altmodülü için desteklenmiyor" - -#: submodule.c:2071 submodule.c:2130 -#, c-format -msgid "could not lookup name for submodule '%s'" -msgstr "'%s' altmodülü adı bakılamadı" - -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor" - -#: submodule.c:2082 -#, c-format -msgid "" -"Migrating git directory of '%s%s' from\n" -"'%s' to\n" -"'%s'\n" -msgstr "" -"'%s%s' git dizini göç ettiriliyor:\n" -"şuradan: '%s'\n" -"şuraya: '%s'\n" - -#: submodule.c:2209 -msgid "could not start ls-files in .." -msgstr "ls-files şurada başlatılamadı .." - -#: submodule.c:2248 -#, c-format -msgid "ls-tree returned unexpected return code %d" -msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı" - -#: submodule-config.c:236 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "kuşku doğuran altmodül yok sayılıyor: %s" - -#: submodule-config.c:303 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "submodule.fetchjobs için negatif değerlere izin verilmiyor" - -#: submodule-config.c:401 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "" -"'%s' bir komut satırı seçeneği olarak yorumlanabileceğinden yok sayılıyor: %s" - -#: submodule-config.c:498 -#, c-format -msgid "invalid value for %s" -msgstr "%s için geçersiz değer" - -#: submodule-config.c:765 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr ".gitmodules girdisi %s güncellenemedi" - -#: trailer.c:238 -#, c-format -msgid "running trailer command '%s' failed" -msgstr "'%s' artbilgi komutunu çalıştırma başarısız oldu" - -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 -#, c-format -msgid "unknown value '%s' for key '%s'" -msgstr "bilinmeyen değer '%s' ('%s' anahtarı için)" - -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 -#, c-format -msgid "more than one %s" -msgstr "birden çok %s" - -#: trailer.c:730 -#, c-format -msgid "empty trailer token in trailer '%.*s'" -msgstr "'%.*s' artbilgisi içinde boş artbilgi simgesi" - -#: trailer.c:750 -#, c-format -msgid "could not read input file '%s'" -msgstr "'%s' girdi dosyası okunamadı" - -#: trailer.c:753 -msgid "could not read from stdin" -msgstr "stdin'den okunamadı" - -#: trailer.c:1011 wrapper.c:665 -#, c-format -msgid "could not stat %s" -msgstr "%s dosya bilgileri alınamadı" - -#: trailer.c:1013 -#, c-format -msgid "file %s is not a regular file" -msgstr "%s dosyası sıradan bir dosya değil" - -#: trailer.c:1015 -#, c-format -msgid "file %s is not writable by user" -msgstr "%s dosyası kullanıcı tarafından yazılabilir değil" - -#: trailer.c:1027 -msgid "could not open temporary file" -msgstr "geçici dosya açılamadı" - -#: trailer.c:1067 -#, c-format -msgid "could not rename temporary file to %s" -msgstr "geçici dosya adı %s olarak değiştirilemedi" - -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n" - -#: transport.c:145 -#, c-format -msgid "could not read bundle '%s'" -msgstr "'%s' demeti okunamadı" - -#: transport.c:214 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport: Geçersiz derinlik seçeneği '%s'" - -#: transport.c:266 -msgid "see protocol.version in 'git help config' for more details" -msgstr "ayrıntılar için 'git help config' içinde protocol.version'a bakın" - -#: transport.c:267 -msgid "server options require protocol version 2 or later" -msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir" - -#: transport.c:632 -msgid "could not parse transport.color.* config" -msgstr "transport.color.* yapılandırması ayrıştırılamadı" - -#: transport.c:705 -msgid "support for protocol v2 not implemented yet" -msgstr "protokol v2 desteği henüz yerine getirilmedi" - -#: transport.c:831 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "'%s' yapılandırması için bilinmeyen değer: %s" - -#: transport.c:897 -#, c-format -msgid "transport '%s' not allowed" -msgstr "'%s' taşıyıcısına izin verilmiyor" - -#: transport.c:949 -msgid "git-over-rsync is no longer supported" -msgstr "git-over-rsync artık desteklenmiyor" - -#: transport.c:1044 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "" -"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n" -"değişiklikler içeriyor:\n" - -#: transport.c:1048 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" -msgstr "" -"\n" -"Lütfen\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"deneyin veya bir uzak konuma itmek için yola cd yapıp\n" -"\n" -"\tgit push\n" -"\n" -"kullanın.\n" -"\n" - -#: transport.c:1056 -msgid "Aborting." -msgstr "İptal ediliyor" - -#: transport.c:1201 -msgid "failed to push all needed submodules" -msgstr "gereken tüm altmodüller itilemedi" - -#: transport.c:1345 transport-helper.c:657 -msgid "operation not supported by protocol" -msgstr "işlem protokol tarafından desteklenmiyor" - -#: transport-helper.c:61 transport-helper.c:90 -msgid "full write to remote helper failed" -msgstr "uzak konum yardımcısına tam yazım başarısız" - -#: transport-helper.c:144 -#, c-format -msgid "unable to find remote helper for '%s'" -msgstr "'%s' için uzak konum yardımcısı bulunamadı" - -#: transport-helper.c:160 transport-helper.c:571 -msgid "can't dup helper output fd" -msgstr "uzak konum yardımcısı çıktısı için dosya açıklayıcısı çoğaltılamıyor" - -#: transport-helper.c:211 -#, c-format -msgid "" -"unknown mandatory capability %s; this remote helper probably needs newer " -"version of Git" -msgstr "" -"bilinmeyen zorunlu %s yeteneği; bu uzak konum yardımcısı büyük olasılıkla " -"Git'in daha yeni bir sürümüne gereksinim duyuyor" - -#: transport-helper.c:217 -msgid "this remote helper should implement refspec capability" -msgstr "bu uzak konum yardımcısı refspec yapabilirliğini yerine getirmeli" - -#: transport-helper.c:284 transport-helper.c:425 -#, c-format -msgid "%s unexpectedly said: '%s'" -msgstr "%s beklenmedik bir biçimde şunu söyledi: '%s'" - -#: transport-helper.c:414 -#, c-format -msgid "%s also locked %s" -msgstr "%s ayrıca şunu kilitledi: %s" - -#: transport-helper.c:493 -msgid "couldn't run fast-import" -msgstr "fast-import çalıştırılamadı" - -#: transport-helper.c:516 -msgid "error while running fast-import" -msgstr "fast-import çalıştırılırken hata" - -#: transport-helper.c:545 transport-helper.c:1134 -#, c-format -msgid "could not read ref %s" -msgstr "%s başvurusu okunamadı" - -#: transport-helper.c:590 -#, c-format -msgid "unknown response to connect: %s" -msgstr "'connect'e bilinmeyen yanıt: %s" - -#: transport-helper.c:612 -msgid "setting remote service path not supported by protocol" -msgstr "uzak servis yolu ayarlama protokolce desteklenmiyor" - -#: transport-helper.c:614 -msgid "invalid remote service path" -msgstr "geçersiz uzak konum servis yolu" - -#: transport-helper.c:660 -#, c-format -msgid "can't connect to subservice %s" -msgstr "%s altservisine bağlanamıyor" - -#: transport-helper.c:736 -#, c-format -msgid "expected ok/error, helper said '%s'" -msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'" - -#: transport-helper.c:789 -#, c-format -msgid "helper reported unexpected status of %s" -msgstr "yardımcı %s beklenmedik durumu bildirdi" - -#: transport-helper.c:850 -#, c-format -msgid "helper %s does not support dry-run" -msgstr "%s yardımcısı 'dry-run' desteklemiyor" - -#: transport-helper.c:853 -#, c-format -msgid "helper %s does not support --signed" -msgstr "%s yardımcısı --signed desteklemiyor" - -#: transport-helper.c:856 -#, c-format -msgid "helper %s does not support --signed=if-asked" -msgstr "%s yardımcısı --signed=if-asked desteklemiyor" - -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "%s yardımcısı --atomic desteklemiyor" - -#: transport-helper.c:867 -#, c-format -msgid "helper %s does not support 'push-option'" -msgstr "%s yardımcısı 'push-option' desteklemiyor" - -#: transport-helper.c:965 -msgid "remote-helper doesn't support push; refspec needed" -msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli" - -#: transport-helper.c:970 -#, c-format -msgid "helper %s does not support 'force'" -msgstr "%s yardımcısı 'force' desteklemiyor" - -#: transport-helper.c:1017 -msgid "couldn't run fast-export" -msgstr "fast-export çalıştırılamadı" - -#: transport-helper.c:1022 -msgid "error while running fast-export" -msgstr "fast-export çalıştırılırken hata" - -#: transport-helper.c:1047 -#, c-format -msgid "" -"No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" -msgstr "" -"Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n" -"Belki de bir dal belirtmelisiniz, örneğin: 'master'.\n" - -#: transport-helper.c:1120 -#, c-format -msgid "malformed response in ref list: %s" -msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s" - -#: transport-helper.c:1272 -#, c-format -msgid "read(%s) failed" -msgstr "read(%s) başarısız oldu" - -#: transport-helper.c:1299 -#, c-format -msgid "write(%s) failed" -msgstr "write(%s) başarısız oldu" - -#: transport-helper.c:1348 -#, c-format -msgid "%s thread failed" -msgstr "%s iş parçacığı başarısız oldu" - -#: transport-helper.c:1352 -#, c-format -msgid "%s thread failed to join: %s" -msgstr "%s iş parçacığı eklenemedi: %s" - -#: transport-helper.c:1371 transport-helper.c:1375 -#, c-format -msgid "can't start thread for copying data: %s" -msgstr "veri kopyalama için iş parçacığı başlatılamıyor: %s" - -#: transport-helper.c:1412 -#, c-format -msgid "%s process failed to wait" -msgstr "%s işlemi bekleyemedi" - -#: transport-helper.c:1416 -#, c-format -msgid "%s process failed" -msgstr "%s işlemi başarısız oldu" - -#: transport-helper.c:1434 transport-helper.c:1443 -msgid "can't start thread for copying data" -msgstr "veri kopyalama için iş parçacığı başlatılamıyor" - -#: tree-walk.c:32 -msgid "too-short tree object" -msgstr "ağaç nesnesi çok kısa" - -#: tree-walk.c:38 -msgid "malformed mode in tree entry" -msgstr "ağaç girdisinde hatalı oluşturulmuş kip" - -#: tree-walk.c:42 -msgid "empty filename in tree entry" -msgstr "ağaç girdisinde boş dosya adı" - -#: tree-walk.c:117 -msgid "too-short tree file" -msgstr "ağaç dosyası çok kısa" - -#: unpack-trees.c:110 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you switch branches." -msgstr "" -"Çıkış yapılarak aşağıdaki dosyalardaki yerel değişikliklerin üzerine " -"yazılacak:\n" -"%%sLütfen dal değiştirmeden önce değişikliklerinizi gönderin veya zulalayın." - -#: unpack-trees.c:112 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%s" -msgstr "" -"Çıkış yapılarak aşağıdaki dosyalardaki yerel değişikliklerin üzerine " -"yazılacak:\n" -"%%s" - -#: unpack-trees.c:115 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you merge." -msgstr "" -"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine " -"yazılacak:\n" -"%%sLütfen birleştirmeden önce değişikliklerinizi gönderin veya zulalayın." - -#: unpack-trees.c:117 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%s" -msgstr "" -"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine " -"yazılacak:\n" -"%%s" - -#: unpack-trees.c:120 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%sPlease commit your changes or stash them before you %s." -msgstr "" -"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n" -"%%sLütfen %s yapmadan önce değişikliklerinizi gönderin veya zulalayın." - -#: unpack-trees.c:122 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%s" -msgstr "" -"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n" -"%%s" - -#: unpack-trees.c:127 -#, c-format -msgid "" -"Updating the following directories would lose untracked files in them:\n" -"%s" -msgstr "" -"Aşağıdaki dizinler güncellenerek içlerindeki izlenmeyen dosyalar " -"kaybedilecek:\n" -"%s" - -#: unpack-trees.c:131 -#, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you switch branches." -msgstr "" -"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" -"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın." - -#: unpack-trees.c:133 -#, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%s" -msgstr "" -"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" -"%%s" - -#: unpack-trees.c:136 -#, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" -"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın." - -#: unpack-trees.c:138 -#, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%s" -msgstr "" -"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" -"%%s" - -#: unpack-trees.c:141 -#, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you %s." -msgstr "" -"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" -"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın." - -#: unpack-trees.c:143 -#, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%s" -msgstr "" -"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n" -"%%s" - -#: unpack-trees.c:149 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%sPlease move or remove them before you switch branches." -msgstr "" -"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine " -"yazılacak:\n" -"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın." - -#: unpack-trees.c:151 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%s" -msgstr "" -"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine " -"yazılacak:\n" -"%%s" - -#: unpack-trees.c:154 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine " -"yazılacak:\n" -"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın." - -#: unpack-trees.c:156 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%s" -msgstr "" -"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine " -"yazılacak:\n" -"%%s" - -#: unpack-trees.c:159 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you %s." -msgstr "" -"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n" -"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın." - -#: unpack-trees.c:161 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%s" -msgstr "" -"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n" -"%%s" - -#: unpack-trees.c:169 -#, c-format -msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "'%s' girdisi '%s' ile üst üste biniyor. Bağlanamıyor." - -#: unpack-trees.c:172 -#, c-format -msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" -"%s" -msgstr "" -"Aralıklı çıkış güncellenemiyor: Aşağıdaki girdiler güncel değil:\n" -"%s" - -#: unpack-trees.c:174 -#, c-format -msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" -"%s" -msgstr "" -"Aralıklı çıkış güncellemesi ile aşağıdaki çalışma ağacı dosyalarının üzerine " -"yazılacak:\n" -"%s" - -#: unpack-trees.c:176 -#, c-format -msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" -"%s" -msgstr "" -"Aralıklı çıkış güncellemesi ile aşağıdaki çalışma ağacı dosyaları " -"kaldırılacak:\n" -"%s" - -#: unpack-trees.c:178 -#, c-format -msgid "" -"Cannot update submodule:\n" -"%s" -msgstr "" -"Altmodül güncellenemiyor:\n" -"%s" - -#: unpack-trees.c:255 -#, c-format -msgid "Aborting\n" -msgstr "İptal ediliyor\n" - -#: unpack-trees.c:317 -msgid "Updating files" -msgstr "Dosyalar güncelleniyor" - -#: unpack-trees.c:349 -msgid "" -"the following paths have collided (e.g. case-sensitive paths\n" -"on a case-insensitive filesystem) and only one from the same\n" -"colliding group is in the working tree:\n" -msgstr "" -"Aşağıdaki yollar birbiriyle çarpıştı (örn. BÜYÜK/küçük harf duyarlı\n" -"olmayan dosya sisteminde BÜYÜK/küçük harf duyarlı yollar) ve aynı çarpışan\n" -"gruptan yalnızca bir tanesi çalışma ağacında:\n" - -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "İndeks bayrakları güncelleniyor" - -#: urlmatch.c:163 -msgid "invalid URL scheme name or missing '://' suffix" -msgstr "geçersiz URL şeması veya eksik '://' eki" - -#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 -#, c-format -msgid "invalid %XX escape sequence" -msgstr "geçersiz %XX kaçış sırası" - -#: urlmatch.c:215 -msgid "missing host and scheme is not 'file:'" -msgstr "ana bilgisayar eksik ve şema 'file:' değil" - -#: urlmatch.c:232 -msgid "a 'file:' URL may not have a port number" -msgstr "bir 'file:' URL'sinin kapı numarası olmayabilir" - -#: urlmatch.c:247 -msgid "invalid characters in host name" -msgstr "ana bilgisayar adında geçersiz karakter" - -#: urlmatch.c:292 urlmatch.c:303 -msgid "invalid port number" -msgstr "geçersiz kapı numarası" - -#: urlmatch.c:371 -msgid "invalid '..' path segment" -msgstr "geçersiz '..' yol kesimi" - -#: walker.c:170 -msgid "Fetching objects" -msgstr "Nesneler getiriliyor" - -#: worktree.c:259 builtin/am.c:2099 -#, c-format -msgid "failed to read '%s'" -msgstr "'%s' okunamadı" - -#: worktree.c:305 -#, c-format -msgid "'%s' at main working tree is not the repository directory" -msgstr "ana çalışma ağacındaki '%s' depo dizini değil" - -#: worktree.c:316 -#, c-format -msgid "'%s' file does not contain absolute path to the working tree location" -msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor" - -#: worktree.c:328 -#, c-format -msgid "'%s' does not exist" -msgstr "'%s' mevcut değil" - -#: worktree.c:334 -#, c-format -msgid "'%s' is not a .git file, error code %d" -msgstr "'%s' bir .git dosyası değil, hata kodu %d" - -#: worktree.c:342 -#, c-format -msgid "'%s' does not point back to '%s'" -msgstr "'%s' şuna geri işaret etmiyor: '%s'" - -#: wrapper.c:186 wrapper.c:356 -#, c-format -msgid "could not open '%s' for reading and writing" -msgstr "'%s' okuma ve yazma için açılamadı" - -#: wrapper.c:387 wrapper.c:588 -#, c-format -msgid "unable to access '%s'" -msgstr "'%s' erişilemiyor" - -#: wrapper.c:596 -msgid "unable to get current working directory" -msgstr "geçerli çalışma dizini alınamıyor" - -#: wt-status.c:158 -msgid "Unmerged paths:" -msgstr "Birleştirilmemiş yollar:" - -#: wt-status.c:187 wt-status.c:219 -msgid " (use \"git restore --staged <file>...\" to unstage)" -msgstr "" -" (hazırlıktan çıkarmak için \"git restore --staged <dosya>...\" kullanın)" - -#: wt-status.c:190 wt-status.c:222 -#, c-format -msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" -msgstr "" -" (hazırlıktan çıkarmak için \"git restore --source=%s --staged <dosya>...\" " -"kullanın)" - -#: wt-status.c:193 wt-status.c:225 -msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (hazırlıktan çıkarmak için \"git rm --cached <dosya>...\" kullanın)" - -#: wt-status.c:197 -msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " (hazırlığı bitirmek için \"git add <dosya>...\" kullanın)" - -#: wt-status.c:199 wt-status.c:203 -msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr "" -" (hazırlığı bitirmek için uygun bir biçimde \"git add/rm <dosya>...\" " -"kullanın)" - -#: wt-status.c:201 -msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)" - -#: wt-status.c:211 wt-status.c:1074 -msgid "Changes to be committed:" -msgstr "Gönderilecek değişiklikler:" - -#: wt-status.c:234 wt-status.c:1083 -msgid "Changes not staged for commit:" -msgstr "Gönderi için hazırlanmamış değişiklikler:" - -#: wt-status.c:238 -msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr "" -" (gönderilecekleri güncellemek için \"git add <dosya>...\" kullanın)" - -#: wt-status.c:240 -msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr "" -" (gönderilecekleri güncellemek için \"git add/rm <dosya>...\" kullanın)" - -#: wt-status.c:241 -msgid "" -" (use \"git restore <file>...\" to discard changes in working directory)" -msgstr "" -" (çalışma dizinindeki değişiklikleri atmak için \"git restore <dosya>...\" " -"kullanın)" - -#: wt-status.c:243 -msgid " (commit or discard the untracked or modified content in submodules)" -msgstr " (altmodüllerdeki izlenmeyen/değiştirilen içeriği gönder veya at)" - -#: wt-status.c:254 -#, c-format -msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (gönderilecekler arasına koymak için \"git %s <dosya>...\" kullanın)" - -#: wt-status.c:268 -msgid "both deleted:" -msgstr "ikimiz de sildik:" - -#: wt-status.c:270 -msgid "added by us:" -msgstr "biz ekledik:" - -#: wt-status.c:272 -msgid "deleted by them:" -msgstr "onlar sildi:" - -#: wt-status.c:274 -msgid "added by them:" -msgstr "onlar ekledi:" - -#: wt-status.c:276 -msgid "deleted by us:" -msgstr "biz sildik:" - -#: wt-status.c:278 -msgid "both added:" -msgstr "ikimiz de ekledik:" - -#: wt-status.c:280 -msgid "both modified:" -msgstr "ikimiz de değiştirdik:" - -#: wt-status.c:290 -msgid "new file:" -msgstr "yeni dosya:" - -#: wt-status.c:292 -msgid "copied:" -msgstr "kopyalandı:" - -#: wt-status.c:294 -msgid "deleted:" -msgstr "silindi:" - -#: wt-status.c:296 -msgid "modified:" -msgstr "değiştirildi:" - -#: wt-status.c:298 -msgid "renamed:" -msgstr "yeniden adlandırıldı:" - -#: wt-status.c:300 -msgid "typechange:" -msgstr "türü değiştirildi:" - -#: wt-status.c:302 -msgid "unknown:" -msgstr "bilinmiyor" - -#: wt-status.c:304 -msgid "unmerged:" -msgstr "birleştirilmedi:" - -#: wt-status.c:384 -msgid "new commits, " -msgstr "yeni gönderiler, " - -#: wt-status.c:386 -msgid "modified content, " -msgstr "değiştirilen içerik, " - -#: wt-status.c:388 -msgid "untracked content, " -msgstr "izlenmeyen içerik, " - -#: wt-status.c:906 -#, c-format -msgid "Your stash currently has %d entry" -msgid_plural "Your stash currently has %d entries" -msgstr[0] "Zulanızda şu anda %d girdi var" -msgstr[1] "Zulanızda şu anda %d girdi var" - -#: wt-status.c:938 -msgid "Submodules changed but not updated:" -msgstr "Değiştirilen ancak güncellenmeyen altmodüller:" - -#: wt-status.c:940 -msgid "Submodule changes to be committed:" -msgstr "Gönderilecek altmodül değişiklikleri:" - -#: wt-status.c:1022 -msgid "" -"Do not modify or remove the line above.\n" -"Everything below it will be ignored." -msgstr "" -"Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n" -"Altındaki her şey yok sayılacaktır." - -#: wt-status.c:1114 -#, c-format -msgid "" -"\n" -"It took %.2f seconds to compute the branch ahead/behind values.\n" -"You can use '--no-ahead-behind' to avoid this.\n" -msgstr "" -"\n" -"Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n" -"Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n" - -#: wt-status.c:1144 -msgid "You have unmerged paths." -msgstr "Birleştirilmemiş yollarınız var." - -#: wt-status.c:1147 -msgid " (fix conflicts and run \"git commit\")" -msgstr " (çakışmaları onar ve \"git commit\" çalıştır)" - -#: wt-status.c:1149 -msgid " (use \"git merge --abort\" to abort the merge)" -msgstr " (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)" - -#: wt-status.c:1153 -msgid "All conflicts fixed but you are still merging." -msgstr "Tüm çakışmalar onarıldı ancak siz hâlâ birleştiriyorsunuz." - -#: wt-status.c:1156 -msgid " (use \"git commit\" to conclude merge)" -msgstr " (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)" - -#: wt-status.c:1165 -msgid "You are in the middle of an am session." -msgstr "Bir 'am' oturumunun tam ortasındasınız." - -#: wt-status.c:1168 -msgid "The current patch is empty." -msgstr "Mevcut yama boş." - -#: wt-status.c:1172 -msgid " (fix conflicts and then run \"git am --continue\")" -msgstr " (çakışmaları onar ve ardından \"git am --continue\" çalıştır)" - -#: wt-status.c:1174 -msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (bu yamayı atlamak için \"git am --skip\" kullanın" - -#: wt-status.c:1176 -msgid " (use \"git am --abort\" to restore the original branch)" -msgstr " (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)" - -#: wt-status.c:1309 -msgid "git-rebase-todo is missing." -msgstr "git-rebase-todo eksik" - -#: wt-status.c:1311 -msgid "No commands done." -msgstr "Yerine getirilen bir komut yok." - -#: wt-status.c:1314 -#, c-format -msgid "Last command done (%d command done):" -msgid_plural "Last commands done (%d commands done):" -msgstr[0] "Son yerine getirilen komut (toplamda %d komut):" -msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):" - -#: wt-status.c:1325 -#, c-format -msgid " (see more in file %s)" -msgstr " (ek bilgi için %s dosyasına bakın)" - -#: wt-status.c:1330 -msgid "No commands remaining." -msgstr "Kalan komut yok." - -#: wt-status.c:1333 -#, c-format -msgid "Next command to do (%d remaining command):" -msgid_plural "Next commands to do (%d remaining commands):" -msgstr[0] "Sıradaki yerine getirilecek komut (%d kalan komut):" -msgstr[1] "Sıradaki yerine getirilecek komutlar (%d kalan komut):" - -#: wt-status.c:1341 -msgid " (use \"git rebase --edit-todo\" to view and edit)" -msgstr " (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)" - -#: wt-status.c:1353 -#, c-format -msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz." - -#: wt-status.c:1358 -msgid "You are currently rebasing." -msgstr "Şu anda yeniden temellendirme yapmaktasınız." - -#: wt-status.c:1371 -msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)" - -#: wt-status.c:1373 -msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (bu yamayı atlamak için \"git rebase --skip\" kullanın)" - -#: wt-status.c:1375 -msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)" - -#: wt-status.c:1382 -msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)" - -#: wt-status.c:1386 -#, c-format -msgid "" -"You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "" -"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir gönderiyi " -"parçalara bölüyorsunuz." - -#: wt-status.c:1391 -msgid "You are currently splitting a commit during a rebase." -msgstr "" -"Şu anda bir yeniden temellendirme sırasında bir gönderiyi parçalara " -"bölüyorsunuz." - -#: wt-status.c:1394 -msgid " (Once your working directory is clean, run \"git rebase --continue\")" -msgstr "" -" (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)" - -#: wt-status.c:1398 -#, c-format -msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "" -"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir gönderiyi " -"düzenliyorsunuz." - -#: wt-status.c:1403 -msgid "You are currently editing a commit during a rebase." -msgstr "" -"Şu anda bir yeniden temellendirme sırasında bir gönderiyi düzenliyorsunuz." - -#: wt-status.c:1406 -msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " (geçerli gönderiyi değiştirmek için \"git commit --amend\" kullanın)" - -#: wt-status.c:1408 -msgid "" -" (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr "" -" (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)" - -#: wt-status.c:1419 -msgid "Cherry-pick currently in progress." -msgstr "Seç-al şu anda sürmekte." - -#: wt-status.c:1422 -#, c-format -msgid "You are currently cherry-picking commit %s." -msgstr "Şu anda %s gönderisini seç-al yapıyorsunuz." - -#: wt-status.c:1429 -msgid " (fix conflicts and run \"git cherry-pick --continue\")" -msgstr " (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)" - -#: wt-status.c:1432 -msgid " (run \"git cherry-pick --continue\" to continue)" -msgstr " (sürdürmek için \"git cherry-pick --continue\" çalıştır)" - -#: wt-status.c:1435 -msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)" - -#: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)" - -#: wt-status.c:1439 -msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" -msgstr " (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)" - -#: wt-status.c:1449 -msgid "Revert currently in progress." -msgstr "Geriye al şu anda sürmekte." - -#: wt-status.c:1452 -#, c-format -msgid "You are currently reverting commit %s." -msgstr "Şu anda %s gönderisini geri alıyorsunuz." - -#: wt-status.c:1458 -msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " (çakışmaları onar ve \"git revert --continue\" çalıştır)" - -#: wt-status.c:1461 -msgid " (run \"git revert --continue\" to continue)" -msgstr " (sürdürmek için \"git revert --continue\" çalıştır)" - -#: wt-status.c:1464 -msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)" - -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (bu yamayı atlamak için \"git revert --skip\" kullanın)" - -#: wt-status.c:1468 -msgid " (use \"git revert --abort\" to cancel the revert operation)" -msgstr " (geri al işlemini iptal için \"git revert --abort\" kullanın)" - -#: wt-status.c:1478 -#, c-format -msgid "You are currently bisecting, started from branch '%s'." -msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı." - -#: wt-status.c:1482 -msgid "You are currently bisecting." -msgstr "Şu anda ikili arama yapıyorsunuz" - -#: wt-status.c:1485 -msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " (ilk dala dönmek için \"git bisect reset\" kullanın)" - -#: wt-status.c:1694 -msgid "On branch " -msgstr "Şu dalda: " - -#: wt-status.c:1701 -msgid "interactive rebase in progress; onto " -msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: " - -#: wt-status.c:1703 -msgid "rebase in progress; onto " -msgstr "şunun üzerine yeniden temellendirme sürmekte: " - -#: wt-status.c:1713 -msgid "Not currently on any branch." -msgstr "Şu anda bir dal üzerinde değil." - -#: wt-status.c:1730 -msgid "Initial commit" -msgstr "İlk gönderi" - -#: wt-status.c:1731 -msgid "No commits yet" -msgstr "Henüz bir gönderi yok" - -#: wt-status.c:1745 -msgid "Untracked files" -msgstr "İzlenmeyen dosyalar" - -#: wt-status.c:1747 -msgid "Ignored files" -msgstr "Yok sayılan dosyalar" - -#: wt-status.c:1751 -#, c-format -msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." -msgstr "" -"İzlenmeyen dosyaların sayıp dökülmesi %.2f saniye sürdü. 'status -uno' bunu\n" -"hızlandırabilir, ancak yeni dosyaları kendinizin eklemeyi unutmaması\n" -"konusunda dikkatli olmalısınız (ek bilgi için 'git help status')." - -#: wt-status.c:1757 -#, c-format -msgid "Untracked files not listed%s" -msgstr "İzlenmeyen dosyalar listelenmiyor%s" - -#: wt-status.c:1759 -msgid " (use -u option to show untracked files)" -msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)" - -#: wt-status.c:1765 -msgid "No changes" -msgstr "Değişiklik yok" - -#: wt-status.c:1770 -#, c-format -msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "" -"Gönderiye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" " -"kullanın)\n" - -#: wt-status.c:1773 -#, c-format -msgid "no changes added to commit\n" -msgstr "Gönderiye eklenen değişiklik yok\n" - -#: wt-status.c:1776 -#, c-format -msgid "" -"nothing added to commit but untracked files present (use \"git add\" to " -"track)\n" -msgstr "" -"gönderiye bir şey eklenmedi ancak izlenmeyen dosyalar var (izlemek için\n" -"\"git add\" kullanın)\n" - -#: wt-status.c:1779 -#, c-format -msgid "nothing added to commit but untracked files present\n" -msgstr "gönderiye bir şey eklenmedi ancak izlenmeyen dosyalar var\n" - -#: wt-status.c:1782 -#, c-format -msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "" -"Gönderilecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için " -"\"git add\" kullanın)\n" - -#: wt-status.c:1785 wt-status.c:1790 -#, c-format -msgid "nothing to commit\n" -msgstr "Gönderilecek bir şey yok\n" - -#: wt-status.c:1788 -#, c-format -msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "" -"Gönderilecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n" - -#: wt-status.c:1792 -#, c-format -msgid "nothing to commit, working tree clean\n" -msgstr "Gönderilecek bir şey yok, çalışma ağacı temiz\n" - -#: wt-status.c:1905 -msgid "No commits yet on " -msgstr "Şurada henüz bir gönderi yok: " - -#: wt-status.c:1909 -msgid "HEAD (no branch)" -msgstr "HEAD (dal yok)" - -#: wt-status.c:1940 -msgid "different" -msgstr "değişik" - -#: wt-status.c:1942 wt-status.c:1950 -msgid "behind " -msgstr "şunun arkasında: " - -#: wt-status.c:1945 wt-status.c:1948 -msgid "ahead " -msgstr "şunun önünde: " - -#. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 -#, c-format -msgid "cannot %s: You have unstaged changes." -msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var." - -#: wt-status.c:2476 -msgid "additionally, your index contains uncommitted changes." -msgstr "Ek olarak, indeksiniz gönderilmemiş değişiklikler içeriyor." - -#: wt-status.c:2478 -#, c-format -msgid "cannot %s: Your index contains uncommitted changes." -msgstr "%s yapılamıyor: İndeksiniz gönderilmemiş değişiklikler içeriyor." - -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "'%s' bağlantısı kesilemedi" - -#: builtin/add.c:26 -msgid "git add [<options>] [--] <pathspec>..." -msgstr "git add [<seçenekler>] [--] <yol-blrtç>..." - -#: builtin/add.c:88 -#, c-format -msgid "unexpected diff status %c" -msgstr "beklenmedik diff durumu %c" - -#: builtin/add.c:93 builtin/commit.c:288 -msgid "updating files failed" -msgstr "dosyaları güncelleme başarısız" - -#: builtin/add.c:103 -#, c-format -msgid "remove '%s'\n" -msgstr "kaldır: '%s'\n" - -#: builtin/add.c:178 -msgid "Unstaged changes after refreshing the index:" -msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:" - -#: builtin/add.c:266 builtin/rev-parse.c:899 -msgid "Could not read the index" -msgstr "İndeks okunamadı" - -#: builtin/add.c:277 -#, c-format -msgid "Could not open '%s' for writing." -msgstr "'%s' yazım için açılamadı." - -#: builtin/add.c:281 -msgid "Could not write patch" -msgstr "Yama yazılamadı" - -#: builtin/add.c:284 -msgid "editing patch failed" -msgstr "yamayı düzenleme başarısız" - -#: builtin/add.c:287 -#, c-format -msgid "Could not stat '%s'" -msgstr "'%s' dosya bilgileri alınamadı" - -#: builtin/add.c:289 -msgid "Empty patch. Aborted." -msgstr "Boş yama. İptal edildi." - -#: builtin/add.c:294 -#, c-format -msgid "Could not apply '%s'" -msgstr "'%s' uygulanamadı" - -#: builtin/add.c:302 -msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "" -"Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok " -"sayılıyor:\n" - -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 -msgid "dry run" -msgstr "sınama turu" - -#: builtin/add.c:325 -msgid "interactive picking" -msgstr "etkileşimli seçim" - -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 -msgid "select hunks interactively" -msgstr "parçaları etkileşimli olarak seç" - -#: builtin/add.c:327 -msgid "edit current diff and apply" -msgstr "geçerli diff'i düzenle ve uygula" - -#: builtin/add.c:328 -msgid "allow adding otherwise ignored files" -msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver" - -#: builtin/add.c:329 -msgid "update tracked files" -msgstr "izlenen dosyaları güncelle" - -#: builtin/add.c:330 -msgid "renormalize EOL of tracked files (implies -u)" -msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)" - -#: builtin/add.c:331 -msgid "record only the fact that the path will be added later" -msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz" - -#: builtin/add.c:332 -msgid "add changes from all tracked and untracked files" -msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle" - -#: builtin/add.c:335 -msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "çalışma ağacında kaldırılan yolları yok say (--no-all ile aynı)" - -#: builtin/add.c:337 -msgid "don't add, only refresh the index" -msgstr "ekleme, yalnızca indeksi yenile" - -#: builtin/add.c:338 -msgid "just skip files which cannot be added because of errors" -msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla" - -#: builtin/add.c:339 -msgid "check if - even missing - files are ignored in dry run" -msgstr "" -"dosyaların -eksik olsalar bile- sınama turunda yok sayılıp sayılmadığını " -"denetle" - -#: builtin/add.c:341 builtin/update-index.c:1004 -msgid "override the executable bit of the listed files" -msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl" - -#: builtin/add.c:343 -msgid "warn when adding an embedded repository" -msgstr "gömülü bir depo eklenirken uyar" - -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "'git stash -p' için arka uç" - -#: builtin/add.c:363 -#, c-format -msgid "" -"You've added another git repository inside your current repository.\n" -"Clones of the outer repository will not contain the contents of\n" -"the embedded repository and will not know how to obtain it.\n" -"If you meant to add a submodule, use:\n" -"\n" -"\tgit submodule add <url> %s\n" -"\n" -"If you added this path by mistake, you can remove it from the\n" -"index with:\n" -"\n" -"\tgit rm --cached %s\n" -"\n" -"See \"git help submodule\" for more information." -msgstr "" -"Mevcut deponuzun içine başka bir git deposu eklediniz.\n" -"Dış deponun klonları gömülen deponun içeriğini içermez ve onları\n" -"nasıl alabileceğini bilemez. Eğer bir altmodül eklemek istediyseniz\n" -"şunu kullanın:\n" -"\n" -"\tgit submodule add <url> %s\n" -"\n" -"Eğer bu yolu yanlışlıkla eklediyseniz aşağıdaki komutla indeksten\n" -"kaldırabilirsiniz:\n" -"\n" -"\tgit rm --cached %s\n" -"\n" -"Ek bilgi için: \"git help submodule\"." - -#: builtin/add.c:391 -#, c-format -msgid "adding embedded git repository: %s" -msgstr "gömülü git deposu ekleniyor: %s" - -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Gerçekten eklemek istiyorsanız -f kullanın.\n" -"Bu iletiyi 'git config advice.addIgnoredFile false'\n" -"kullanarak kapatabilirsiniz." - -#: builtin/add.c:419 -msgid "adding files failed" -msgstr "dosya ekleme başarısız" - -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file, --edit ile uyumsuz" - -#: builtin/add.c:476 -msgid "-A and -u are mutually incompatible" -msgstr "-A ve -u karşılıklı olarak uyumlu" - -#: builtin/add.c:479 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "" -"--ignore-missing seçeneği yalnızca --dry-run seçeneği ile birlikte " -"kullanılabilir" - -#: builtin/add.c:483 -#, c-format -msgid "--chmod param '%s' must be either -x or +x" -msgstr "--chmod param '%s' ya -x ya da +x olmalıdır" - -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file yol belirteci değişkenleri ile uyumsuz" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor" - -#: builtin/add.c:512 -#, c-format -msgid "Nothing specified, nothing added.\n" -msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n" - -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"'git add .' mı demek istediniz?\n" -"Bu iletiyi 'git config advice.addEmptyPathspec false'\n" -"yaparak kapatabilirsiniz." - -#: builtin/am.c:352 -msgid "could not parse author script" -msgstr "yazar betiği ayrıştırılamadı" - -#: builtin/am.c:436 -#, c-format -msgid "'%s' was deleted by the applypatch-msg hook" -msgstr "'%s' applypatch-msg kancası tarafından silindi" - -#: builtin/am.c:478 -#, c-format -msgid "Malformed input line: '%s'." -msgstr "Hatalı oluşturulmuş girdi satırı: '%s'." - -#: builtin/am.c:516 -#, c-format -msgid "Failed to copy notes from '%s' to '%s'" -msgstr "Notların '%s' konumundan '%s' konumuna kopyalanması başarısız" - -#: builtin/am.c:542 -msgid "fseek failed" -msgstr "fseek başarısız oldu" - -#: builtin/am.c:730 -#, c-format -msgid "could not parse patch '%s'" -msgstr "'%s' yaması ayrıştırılamadı" - -#: builtin/am.c:795 -msgid "Only one StGIT patch series can be applied at once" -msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir" - -#: builtin/am.c:843 -msgid "invalid timestamp" -msgstr "geçersiz zaman damgası" - -#: builtin/am.c:848 builtin/am.c:860 -msgid "invalid Date line" -msgstr "geçersiz tarih satırı" - -#: builtin/am.c:855 -msgid "invalid timezone offset" -msgstr "geçersiz zaman dilimi ofseti" - -#: builtin/am.c:948 -msgid "Patch format detection failed." -msgstr "Yama biçimi algılaması başarısız." - -#: builtin/am.c:953 builtin/clone.c:409 -#, c-format -msgid "failed to create directory '%s'" -msgstr "'%s' dizini oluşturulamadı" - -#: builtin/am.c:958 -msgid "Failed to split patches." -msgstr "Yamalar parçalanıp bölünemedi." - -#: builtin/am.c:1089 -#, c-format -msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "Bu sorunu çözdüğünüzde \"%s --continue\" çalıştırın." - -#: builtin/am.c:1090 -#, c-format -msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "Eğer bu yamayı atlamayı yeğliyorsanız \"%s --skip\" çalıştırın." - -#: builtin/am.c:1091 -#, c-format -msgid "To restore the original branch and stop patching, run \"%s --abort\"." -msgstr "" -"İlk dalı eski durumuna getirip yamalamayı durdurmak için \"%s --abort\" " -"çalıştır." - -#: builtin/am.c:1174 -msgid "Patch sent with format=flowed; space at the end of lines might be lost." -msgstr "" -"Yama format=flowed ile gönderildi; satır sonlarındaki boşluk kaybolmuş " -"olabilir." - -#: builtin/am.c:1202 -msgid "Patch is empty." -msgstr "Yama boş." - -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "%s gönderisinde yazar satırı eksik" - -#: builtin/am.c:1270 -#, c-format -msgid "invalid ident line: %.*s" -msgstr "geçersiz tanımlama satırı: %.*s" - -#: builtin/am.c:1489 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "" -"Depo 3 yönlü birleştirmeye geri çekilebilme için gereken ikili nesnelere iye " -"değil." - -#: builtin/am.c:1491 -msgid "Using index info to reconstruct a base tree..." -msgstr "Bir temel ağacını yeniden yapmak için indeks bilgisi kullanılıyor..." - -#: builtin/am.c:1510 -msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" -"Yamanızı elle mi düzenlediniz?\n" -"Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor." - -#: builtin/am.c:1516 -msgid "Falling back to patching base and 3-way merge..." -msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..." - -#: builtin/am.c:1542 -msgid "Failed to merge in the changes." -msgstr "Değişiklikler birleştirilemedi." - -#: builtin/am.c:1574 -msgid "applying to an empty history" -msgstr "boş bir geçmişe uygulanıyor" - -#: builtin/am.c:1621 builtin/am.c:1625 -#, c-format -msgid "cannot resume: %s does not exist." -msgstr "sürdürülemiyor: %s yok" - -#: builtin/am.c:1643 -msgid "Commit Body is:" -msgstr "Gönderi gövdesi:" - -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#. -#: builtin/am.c:1653 -#, c-format -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -msgstr "" -"Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: " - -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "indeks dosyası yazılamıyor" - -#: builtin/am.c:1704 -#, c-format -msgid "Dirty index: cannot apply patches (dirty: %s)" -msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)" - -#: builtin/am.c:1744 builtin/am.c:1812 -#, c-format -msgid "Applying: %.*s" -msgstr "Uygulanıyor: %.*s" - -#: builtin/am.c:1761 -msgid "No changes -- Patch already applied." -msgstr "Değişiklik yok -- Yama halihazırda uygulandı." - -#: builtin/am.c:1767 -#, c-format -msgid "Patch failed at %s %.*s" -msgstr "Yama şurada başarısız oldu: %s %.*s" - -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "" -"Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın" - -#: builtin/am.c:1815 -msgid "" -"No changes - did you forget to use 'git add'?\n" -"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 "" -"Değişiklik yok - 'git add' yapmayı mı unuttunuz?\n" -"Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n" -"aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz." - -#: builtin/am.c:1822 -msgid "" -"You still have unmerged paths in your index.\n" -"You should 'git add' each file with resolved conflicts to mark them as " -"such.\n" -"You might run `git rm` on a file to accept \"deleted by them\" for it." -msgstr "" -"İndeksinizde hâlâ birleştirilmemiş yollar var.\n" -"Çakışmaları çözülen tüm dosyaları 'git add' ile çözüldü olarak " -"imlemelisiniz.\n" -"Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' " -"yapabilirsiniz." - -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 -#, c-format -msgid "Could not parse object '%s'." -msgstr "'%s' nesnesi ayrıştırılamadı." - -#: builtin/am.c:1981 -msgid "failed to clean index" -msgstr "indeks temizlenemedi" - -#: builtin/am.c:2025 -msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" -msgstr "" -"Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n" -"ORIG_HEAD'e geri sarılmıyor." - -#: builtin/am.c:2132 -#, c-format -msgid "Invalid value for --patch-format: %s" -msgstr "Geçersiz --patch-format değeri: %s" - -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "--show-current-patch için geçersiz değer: %s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz" - -#: builtin/am.c:2207 -msgid "git am [<options>] [(<mbox> | <Maildir>)...]" -msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]" - -#: builtin/am.c:2208 -msgid "git am [<options>] (--continue | --skip | --abort)" -msgstr "git am [<seçenekler>] (--continue | --skip | --abort)" - -#: builtin/am.c:2214 -msgid "run interactively" -msgstr "etkileşimli olarak çalıştır" - -#: builtin/am.c:2216 -msgid "historical option -- no-op" -msgstr "tarihi seçenek -- no-op" - -#: builtin/am.c:2218 -msgid "allow fall back on 3way merging if needed" -msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver" - -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 -msgid "be quiet" -msgstr "sessiz ol" - -#: builtin/am.c:2221 -msgid "add a Signed-off-by line to the commit message" -msgstr "gönderi iletisine bir Signed-off-by satırı ekle" - -#: builtin/am.c:2224 -msgid "recode into utf8 (default)" -msgstr "utf8 olarak yeniden kodla (öntanımlı)" - -#: builtin/am.c:2226 -msgid "pass -k flag to git-mailinfo" -msgstr "'git-mailinfo'ya -k bayrağını geçir" - -#: builtin/am.c:2228 -msgid "pass -b flag to git-mailinfo" -msgstr "'git-mailinfo'ya -b bayrağını geçir" - -#: builtin/am.c:2230 -msgid "pass -m flag to git-mailinfo" -msgstr "'git-mailinfo'ya -m bayrağını geçir" - -#: builtin/am.c:2232 -msgid "pass --keep-cr flag to git-mailsplit for mbox format" -msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir" - -#: builtin/am.c:2235 -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "" -"'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme" - -#: builtin/am.c:2238 -msgid "strip everything before a scissors line" -msgstr "bir kesim çizgisinden önceki her şeyi çıkar" - -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 -msgid "pass it through git-apply" -msgstr "git-apply aracılığıyla geçir" - -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 -msgid "n" -msgstr "n" - -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 -msgid "format" -msgstr "biçim" - -#: builtin/am.c:2264 -msgid "format the patch(es) are in" -msgstr "yama biçimi" - -#: builtin/am.c:2270 -msgid "override error message when patch failure occurs" -msgstr "yama başarısız olduğunda hata iletisini geçersiz kıl" - -#: builtin/am.c:2272 -msgid "continue applying patches after resolving a conflict" -msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür" - -#: builtin/am.c:2275 -msgid "synonyms for --continue" -msgstr "--continue eşanlamlıları" - -#: builtin/am.c:2278 -msgid "skip the current patch" -msgstr "geçerli yamayı atla" - -#: builtin/am.c:2281 -msgid "restore the original branch and abort the patching operation." -msgstr "ilk dalı eski durumuna getir ve yamalama işlemini iptal et" - -#: builtin/am.c:2284 -msgid "abort the patching operation but keep HEAD where it is." -msgstr "yamalama işlemini iptal et ancak HEAD'i olduğu yerde bırak" - -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "uygulanmakta olan yamayı göster" - -#: builtin/am.c:2293 -msgid "lie about committer date" -msgstr "gönderici tarihi hakkında yalan söyle" - -#: builtin/am.c:2295 -msgid "use current timestamp for author date" -msgstr "yazar tarihi için geçerli zaman damgasını kullan" - -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 -msgid "key-id" -msgstr "key-id" - -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 -msgid "GPG-sign commits" -msgstr "GPG imzalı gönderiler" - -#: builtin/am.c:2301 -msgid "(internal use for git-rebase)" -msgstr "(git-rebase için iç kullanım)" - -#: builtin/am.c:2319 -msgid "" -"The -b/--binary option has been a no-op for long time, and\n" -"it will be removed. Please do not use it anymore." -msgstr "" -"-b/--binary seçeneği uzunca bir süredir düzgün çalışmıyordu ve\n" -"yakında kaldırılacak. Lütfen artık kullanmayın." - -#: builtin/am.c:2326 -msgid "failed to read the index" -msgstr "indeks okunamadı" - -#: builtin/am.c:2341 -#, c-format -msgid "previous rebase directory %s still exists but mbox given." -msgstr "" -"Bir önceki yeniden temellendirme dizini %s hâlâ mevcut ancak mbox verildi." - -#: builtin/am.c:2365 -#, c-format -msgid "" -"Stray %s directory found.\n" -"Use \"git am --abort\" to remove it." -msgstr "" -"Başıboş %s dizini bulundu.\n" -"Kaldırmak için \"git am --abort\" kullanın." - -#: builtin/am.c:2371 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "Yapılmakta olan bir çözüm işlemi yok, sürdürmüyoruz." - -#: builtin/am.c:2381 -msgid "interactive mode requires patches on the command line" -msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir" - -#: builtin/apply.c:8 -msgid "git apply [<options>] [<patch>...]" -msgstr "git apply [<seçenekler>] [<patch>...]" - -#: builtin/archive.c:17 -#, c-format -msgid "could not create archive file '%s'" -msgstr "arşiv dosyası '%s' oluşturulamadı" - -#: builtin/archive.c:20 -msgid "could not redirect output" -msgstr "çıktı yeniden yönlendirilemedi" - -#: builtin/archive.c:37 -msgid "git archive: Remote with no URL" -msgstr "git archive: URL'si olmayan uzak konum" - -#: builtin/archive.c:61 -msgid "git archive: expected ACK/NAK, got a flush packet" -msgstr "git archive: ACK/NAK bekleniyordu, floş paketi alındı" - -#: builtin/archive.c:64 -#, c-format -msgid "git archive: NACK %s" -msgstr "git archive NACK %s" - -#: builtin/archive.c:65 -msgid "git archive: protocol error" -msgstr "git archive: Protokol hatası" - -#: builtin/archive.c:69 -msgid "git archive: expected a flush" -msgstr "git archive: floş bekleniyordu" - -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "git bisect--helper --next-all [--no-checkout]" - -#: builtin/bisect--helper.c:23 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "git bisect--helper --write-terms <kötü_terim> <iyi_terim>" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<gönderi>]" - -#: builtin/bisect--helper.c:26 -msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-write [--no-log] <durum> <revizyon> <iyi_terim> " -"<kötü_terim>" - -#: builtin/bisect--helper.c:27 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-check-and-set-terms <komut> <iyi_terim> " -"<kötü_terim>" - -#: builtin/bisect--helper.c:28 -msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "" -"git bisect--helper --bisect-next-check <iyi_terim> <kötü_terim> [<terim>]" - -#: builtin/bisect--helper.c:29 -msgid "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" -msgstr "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" - -#: builtin/bisect--helper.c:30 -msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" -msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<terim> --term-{new,bad}" -"=<terim>][--no-checkout] [<kötü> [<iyi>...]] [--] [<yollar>...]" - -#: builtin/bisect--helper.c:86 -#, c-format -msgid "'%s' is not a valid term" -msgstr "'%s' geçerli bir terim değil" - -#: builtin/bisect--helper.c:90 -#, c-format -msgid "can't use the builtin command '%s' as a term" -msgstr "'%s yerleşik komutu bir terim olarak kullanılamıyor" - -#: builtin/bisect--helper.c:100 -#, c-format -msgid "can't change the meaning of the term '%s'" -msgstr "'%s' teriminin anlamı değiştirilemiyor" - -#: builtin/bisect--helper.c:111 -msgid "please use two different terms" -msgstr "lütfen iki değişik terim kullanın" - -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "BISECT_TERMS dosyası açılamadı" - -#: builtin/bisect--helper.c:155 -#, c-format -msgid "We are not bisecting.\n" -msgstr "İkili arama yapmıyoruz.\n" - -#: builtin/bisect--helper.c:163 -#, c-format -msgid "'%s' is not a valid commit" -msgstr "'%s' geçerli bir gönderi değil" - -#: builtin/bisect--helper.c:172 -#, c-format -msgid "" -"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." -msgstr "" -"Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <gönderi>' deneyin." - -#: builtin/bisect--helper.c:216 -#, c-format -msgid "Bad bisect_write argument: %s" -msgstr "Hatalı bisect_write değişkeni: %s" - -#: builtin/bisect--helper.c:221 -#, c-format -msgid "couldn't get the oid of the rev '%s'" -msgstr "'%s' revizyonunun oid'si alınamadı" - -#: builtin/bisect--helper.c:233 -#, c-format -msgid "couldn't open the file '%s'" -msgstr "'%s' dosyası açılamadı" - -#: builtin/bisect--helper.c:259 -#, c-format -msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "Geçersiz komut: Şu anda bir %s/%s ikili aramasındasınız" - -#: builtin/bisect--helper.c:286 -#, c-format -msgid "" -"You 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 "" -"Bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n" -"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz." - -#: builtin/bisect--helper.c:290 -#, c-format -msgid "" -"You need to start by \"git bisect start\".\n" -"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\" ile başlamalısınız.\n" -"Bundan sonra bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n" -"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz." - -#: builtin/bisect--helper.c:310 -#, c-format -msgid "bisecting only with a %s commit" -msgstr "yalnızca bir %s gönderisi ile ikili arama yapılıyor" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#. -#: builtin/bisect--helper.c:318 -msgid "Are you sure [Y/n]? " -msgstr "Emin misiniz [Y/n]? " - -#: builtin/bisect--helper.c:379 -msgid "no terms defined" -msgstr "hiçbir terim tanımlanmadı" - -#: builtin/bisect--helper.c:382 -#, c-format -msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" -msgstr "" -"Mevcut terimleriniz eski durum için %s ve\n" -"yeni durum için %s.\n" - -#: builtin/bisect--helper.c:392 -#, c-format -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' için geçersiz değişken %s.\n" -"Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new." - -#: builtin/bisect--helper.c:478 -#, c-format -msgid "unrecognized option: '%s'" -msgstr "tanımlanamayan seçenek: '%s'" - -#: builtin/bisect--helper.c:482 -#, c-format -msgid "'%s' does not appear to be a valid revision" -msgstr "'%s' geçerli bir revizyon değil gibi görünüyor" - -#: builtin/bisect--helper.c:514 -msgid "bad HEAD - I need a HEAD" -msgstr "hatalı HEAD - Bana bir HEAD gerek" - -#: builtin/bisect--helper.c:529 -#, c-format -msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "'%s' çıkış yapımı başarısız. 'git bisect start <geçerli-dal>' deneyin." - -#: builtin/bisect--helper.c:550 -msgid "won't bisect on cg-seek'ed tree" -msgstr "cg-seek yapılmış bir ağaçta ikili arama yapılmayacak" - -#: builtin/bisect--helper.c:553 -msgid "bad HEAD - strange symbolic ref" -msgstr "hatalı HEAD - tuhaf sembolik başvuru" - -#: builtin/bisect--helper.c:577 -#, c-format -msgid "invalid ref: '%s'" -msgstr "geçersiz başvuru: '%s'" - -#: builtin/bisect--helper.c:633 -msgid "perform 'git bisect next'" -msgstr "'git bisect next' gerçekleştir" - -#: builtin/bisect--helper.c:635 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "terimleri .git/BISECT_TERMS konumuna yaz" - -#: builtin/bisect--helper.c:637 -msgid "cleanup the bisection state" -msgstr "ikili arama durumunu temizle" - -#: builtin/bisect--helper.c:639 -msgid "check for expected revs" -msgstr "beklenen başvurular için denetle" - -#: builtin/bisect--helper.c:641 -msgid "reset the bisection state" -msgstr "ikili arama durumunu sıfırla" - -#: builtin/bisect--helper.c:643 -msgid "write out the bisection state in BISECT_LOG" -msgstr "ikili arama durumunu BISECT_LOG içine yaz" - -#: builtin/bisect--helper.c:645 -msgid "check and set terms in a bisection state" -msgstr "bir ikili arama durumundaki terimleri denetle ve ayarla" - -#: builtin/bisect--helper.c:647 -msgid "check whether bad or good terms exist" -msgstr "iyi veya kötü terimlerin olup olmadığını denetle" - -#: builtin/bisect--helper.c:649 -msgid "print out the bisect terms" -msgstr "ikili arama terimlerini yazdır" - -#: builtin/bisect--helper.c:651 -msgid "start the bisect session" -msgstr "ikili arama oturumunu başlat" - -#: builtin/bisect--helper.c:653 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "geçerli gönderiyi çıkış yapmak yerine BISECT_HEAD güncelle" - -#: builtin/bisect--helper.c:655 -msgid "no log for BISECT_WRITE" -msgstr "BISECT_WRITE için günlük yok" - -#: builtin/bisect--helper.c:673 -msgid "--write-terms requires two arguments" -msgstr "--write-terms iki değişken gerektiriyor" - -#: builtin/bisect--helper.c:677 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state bir değişken gerektirmiyor" - -#: builtin/bisect--helper.c:684 -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset bir değişken veya gönderi gerektirmiyor" - -#: builtin/bisect--helper.c:688 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write 4 veya 5 değişken gerektiriyor" - -#: builtin/bisect--helper.c:694 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "--check-and-set-terms 3 değişken gerektiriyor" - -#: builtin/bisect--helper.c:700 -msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "--bisect-next-check 2 veya 3 değişken gerektiriyor" - -#: builtin/bisect--helper.c:706 -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms 0 veya 1 değişken gerektiriyor" - -#: builtin/blame.c:31 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git blame [<seçenekler>] [<rev-sçnk>] [<rev>] [--] <dosya>" - -#: builtin/blame.c:36 -msgid "<rev-opts> are documented in git-rev-list(1)" -msgstr "<rev-sçnk>, git-rev-list(1) içinde belgelendirilmiştir" - -#: builtin/blame.c:409 -#, c-format -msgid "expecting a color: %s" -msgstr "bir renk bekleniyor: %s" - -#: builtin/blame.c:416 -msgid "must end with a color" -msgstr "bir renk ile bitmeli" - -#: builtin/blame.c:729 -#, c-format -msgid "invalid color '%s' in color.blame.repeatedLines" -msgstr "color.blame.repeatedLines içinde geçersiz renk '%s'" - -#: builtin/blame.c:747 -msgid "invalid value for blame.coloring" -msgstr "blame.coloring için geçersiz değer" - -#: builtin/blame.c:822 -#, c-format -msgid "cannot find revision %s to ignore" -msgstr "yok saymak için %s revizyonu bulunamıyor" - -#: builtin/blame.c:844 -msgid "Show blame entries as we find them, incrementally" -msgstr "genel bakış girdilerini buldukça artan biçimde göster" - -#: builtin/blame.c:845 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "sınır gönderileri için boş SHA-1 göster (Öntanımlı: Kapalı)" - -#: builtin/blame.c:846 -msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "kök gönderilerini sınır olarak varsayma (Öntanımlı: Kapalı)" - -#: builtin/blame.c:847 -msgid "Show work cost statistics" -msgstr "iş maliyet istatistiklerini göster" - -#: builtin/blame.c:848 -msgid "Force progress reporting" -msgstr "durum bildirmeyi zorla" - -#: builtin/blame.c:849 -msgid "Show output score for blame entries" -msgstr "genel bakış girdileri için çıktı skorunu göster" - -#: builtin/blame.c:850 -msgid "Show original filename (Default: auto)" -msgstr "orijinal dosya adını göster (Öntanımlı: Otomatik)" - -#: builtin/blame.c:851 -msgid "Show original linenumber (Default: off)" -msgstr "orijinal satır numarasını göster (Öntanımlı: Kapalı)" - -#: builtin/blame.c:852 -msgid "Show in a format designed for machine consumption" -msgstr "makine işlemesi için tasarlanmış bir biçimde göster" - -#: builtin/blame.c:853 -msgid "Show porcelain format with per-line commit information" -msgstr "okunabilir biçimde her satır için gönderi bilgisi ile göster" - -#: builtin/blame.c:854 -msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "git-annotate ile aynı çıktı kipini kullan (Öntanımlı: Kapalı)" - -#: builtin/blame.c:855 -msgid "Show raw timestamp (Default: off)" -msgstr "ham zaman damgasını göster (Öntanımlı: Kapalı)" - -#: builtin/blame.c:856 -msgid "Show long commit SHA1 (Default: off)" -msgstr "uzun gönderi SHA1'ini göster (Öntanımlı: Kapalı)" - -#: builtin/blame.c:857 -msgid "Suppress author name and timestamp (Default: off)" -msgstr "yazar adını ve zaman damgasını gizle (Öntanımlı: Kapalı)" - -#: builtin/blame.c:858 -msgid "Show author email instead of name (Default: off)" -msgstr "yazar adı yerine e-postasını göster (Öntanımlı: Kapalı)" - -#: builtin/blame.c:859 -msgid "Ignore whitespace differences" -msgstr "boşluk ayrımlarını yok say" - -#: builtin/blame.c:860 builtin/log.c:1702 -msgid "rev" -msgstr "revizyon" - -#: builtin/blame.c:860 -msgid "Ignore <rev> when blaming" -msgstr "suçlarken <revizyon>'u yok say" - -#: builtin/blame.c:861 -msgid "Ignore revisions from <file>" -msgstr "<dosya>'dan olan revizyonları yok say" - -#: builtin/blame.c:862 -msgid "color redundant metadata from previous line differently" -msgstr "bir önceki dosyadan gereksiz üstveriyi başka biçimde renklendir" - -#: builtin/blame.c:863 -msgid "color lines by age" -msgstr "satırları yaşına göre renklendir" - -#: builtin/blame.c:864 -msgid "Spend extra cycles to find better match" -msgstr "daha iyi eşleşme bulmak için ek döngüler harca" - -#: builtin/blame.c:865 -msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "git-rev-list çağırma yerine <dosya>'dan olan revizyonları kullan" - -#: builtin/blame.c:866 -msgid "Use <file>'s contents as the final image" -msgstr "<dosya>'nın içeriğini son görüntü olarak kullan" - -#: builtin/blame.c:867 builtin/blame.c:868 -msgid "score" -msgstr "skor" - -#: builtin/blame.c:867 -msgid "Find line copies within and across files" -msgstr "satır kopyalarını dosyalar içinde ve arasında ara" - -#: builtin/blame.c:868 -msgid "Find line movements within and across files" -msgstr "satır hareketlerini dosyalar içinde ve arasında ara" - -#: builtin/blame.c:869 -msgid "n,m" -msgstr "n,m" - -#: builtin/blame.c:869 -msgid "Process only line range n,m, counting from 1" -msgstr "1'den saymaya başlayarak yalnızca n,m satır aralığını işle" - -#: builtin/blame.c:921 -msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz" - -#. TRANSLATORS: This string is used to tell us the -#. maximum display width for a relative timestamp in -#. "git blame" output. For C locale, "4 years, 11 -#. months ago", which takes 22 places, is the longest -#. among various forms of relative timestamps, but -#. your language may need more or fewer display -#. columns. -#. -#: builtin/blame.c:972 -msgid "4 years, 11 months ago" -msgstr "4 yıl 11 ay önce" - -#: builtin/blame.c:1079 -#, c-format -msgid "file %s has only %lu line" -msgid_plural "file %s has only %lu lines" -msgstr[0] "%s dosyasında yalnızca %lu satır var" -msgstr[1] "%s dosyasında yalnızca %lu satır var" - -#: builtin/blame.c:1125 -msgid "Blaming lines" -msgstr "Genel bakış satırları" - -#: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<seçenekler>] [-r | -a] [--merged | --no-merged]" - -#: builtin/branch.c:30 -msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" -msgstr "git branch [<seçenekler>] [-l] [-f] <dal-adı> [<başlama-noktası>]" - -#: builtin/branch.c:31 -msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." -msgstr "git branch [<seçenekler>] [-r] (-d | -D) <dal-adı>..." - -#: builtin/branch.c:32 -msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" -msgstr "git branch [<seçenekler>] (-m | -M) [<eski-dal>] <yeni-dal>" - -#: builtin/branch.c:33 -msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" -msgstr "git branch [<seçenekler>] (-c | -C) [<eski-dal>] <yeni-dal>" - -#: builtin/branch.c:34 -msgid "git branch [<options>] [-r | -a] [--points-at]" -msgstr "git branch [<seçenekler>] [-r | -a] [--points-at]" - -#: builtin/branch.c:35 -msgid "git branch [<options>] [-r | -a] [--format]" -msgstr "git branch [<seçenekler>] [-r | -a] [--format]" - -#: builtin/branch.c:154 -#, c-format -msgid "" -"deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." -msgstr "" -"'%s' dalı siliniyor: Bu dal '%s'\n" -" dalına birleştirilmiş, ancak HEAD'e henüz birleştirilmemiş" - -#: builtin/branch.c:158 -#, c-format -msgid "" -"not deleting branch '%s' that is not yet merged to\n" -" '%s', even though it is merged to HEAD." -msgstr "" -"'%s' dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına rağmen\n" -" '%s' dalına birleştirilmemiş." - -#: builtin/branch.c:172 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "'%s' için gönderi nesnesi aranamadı" - -#: builtin/branch.c:176 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"'%s' dalı tümüyle birleştirilmemiş.\n" -"Eğer silmek istediğinizden eminseniz 'git branch -D %s' çalıştırın." - -#: builtin/branch.c:189 -msgid "Update of config-file failed" -msgstr "config-file güncellemesi başarısız" - -#: builtin/branch.c:220 -msgid "cannot use -a with -d" -msgstr "-a, -d ile kullanılamıyor" - -#: builtin/branch.c:226 -msgid "Couldn't look up commit object for HEAD" -msgstr "HEAD için gönderi nesnesi aranamadı" - -#: builtin/branch.c:240 -#, c-format -msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "Şurada çıkış yapılmış '%s' dalı silinemiyor: '%s'" - -#: builtin/branch.c:255 -#, c-format -msgid "remote-tracking branch '%s' not found." -msgstr "uzak izleme dalı '%s' bulunamadı" - -#: builtin/branch.c:256 -#, c-format -msgid "branch '%s' not found." -msgstr "'%s' dalı bulunamadı" - -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "Uzak izleme dalı '%s' silinirken hata" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "'%s' dalı silinirken hata" - -#: builtin/branch.c:279 -#, c-format -msgid "Deleted remote-tracking branch %s (was %s).\n" -msgstr "Uzak izleme dalı %s silindi (%s idi).\n" - -#: builtin/branch.c:280 -#, c-format -msgid "Deleted branch %s (was %s).\n" -msgstr "%s dalı silindi (%s idi).\n" - -#: builtin/branch.c:429 builtin/tag.c:61 -msgid "unable to parse format string" -msgstr "biçim dizisi ayrıştırılamıyor" - -#: builtin/branch.c:460 -msgid "could not resolve HEAD" -msgstr "HEAD çözülemedi" - -#: builtin/branch.c:466 -#, c-format -msgid "HEAD (%s) points outside of refs/heads/" -msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor" - -#: builtin/branch.c:481 -#, c-format -msgid "Branch %s is being rebased at %s" -msgstr "%s dalı %s konumunda yeniden temellendiriliyor" - -#: builtin/branch.c:485 -#, c-format -msgid "Branch %s is being bisected at %s" -msgstr "%s dalı %s konumunda ikili aranıyor" - -#: builtin/branch.c:502 -msgid "cannot copy the current branch while not on any." -msgstr "bir dalın üzerinde değilken geçerli dal kopyalanamaz" - -#: builtin/branch.c:504 -msgid "cannot rename the current branch while not on any." -msgstr "bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz" - -#: builtin/branch.c:515 -#, c-format -msgid "Invalid branch name: '%s'" -msgstr "Geçersiz dal adı: '%s'" - -#: builtin/branch.c:542 -msgid "Branch rename failed" -msgstr "Dal yeniden adlandırması başarısız" - -#: builtin/branch.c:544 -msgid "Branch copy failed" -msgstr "Dal kopyalaması başarısız" - -#: builtin/branch.c:548 -#, c-format -msgid "Created a copy of a misnamed branch '%s'" -msgstr "Yanlış adlandırılan '%s' dalının bir kopyası oluşturuldu" - -#: builtin/branch.c:551 -#, c-format -msgid "Renamed a misnamed branch '%s' away" -msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı" - -#: builtin/branch.c:557 -#, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "Dal %s olarak yeniden adlandırıldı, ancak HEAD güncellenmedi!" - -#: builtin/branch.c:566 -msgid "Branch is renamed, but update of config-file failed" -msgstr "Dal yeniden adlandırıldı, ancak config-file güncellemesi başarısız" - -#: builtin/branch.c:568 -msgid "Branch is copied, but update of config-file failed" -msgstr "Dal kopyalandı, ancak config-file güncellemesi başarısız" - -#: builtin/branch.c:584 -#, c-format -msgid "" -"Please edit the description for the branch\n" -" %s\n" -"Lines starting with '%c' will be stripped.\n" -msgstr "" -"Lütfen dal açıklamasını düzenleyin:\n" -"\t%s\n" -"'%c' ile başlayan satırlar çıkarılacaktır.\n" - -#: builtin/branch.c:618 -msgid "Generic options" -msgstr "Genel seçenekler" - -#: builtin/branch.c:620 -msgid "show hash and subject, give twice for upstream branch" -msgstr "sağlamayı ve konuyu göster, üstkaynak dalı için iki kez ver" - -#: builtin/branch.c:621 -msgid "suppress informational messages" -msgstr "bilgi iletilerini gizle" - -#: builtin/branch.c:622 -msgid "set up tracking mode (see git-pull(1))" -msgstr "izleme kipini ayarla (bilgi için: git-pull(1))" - -#: builtin/branch.c:624 -msgid "do not use" -msgstr "kullanma" - -#: builtin/branch.c:626 builtin/rebase.c:513 -msgid "upstream" -msgstr "üstkaynak" - -#: builtin/branch.c:626 -msgid "change the upstream info" -msgstr "üstkaynak bilgisini değiştir" - -#: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "üstkaynak bilgisini kaldır" - -#: builtin/branch.c:628 -msgid "use colored output" -msgstr "renklendirilmiş çıktı kullan" - -#: builtin/branch.c:629 -msgid "act on remote-tracking branches" -msgstr "uzak izleyen dallarda iş yap" - -#: builtin/branch.c:631 builtin/branch.c:633 -msgid "print only branches that contain the commit" -msgstr "yalnızca gönderiyi içeren dalları yazdır" - -#: builtin/branch.c:632 builtin/branch.c:634 -msgid "print only branches that don't contain the commit" -msgstr "yalnızca gönderiyi içermeyen dalları yazdır" - -#: builtin/branch.c:637 -msgid "Specific git-branch actions:" -msgstr "Özel git-branch eylemleri:" - -#: builtin/branch.c:638 -msgid "list both remote-tracking and local branches" -msgstr "hem uzak izleyen hem de yerel dalları listele" - -#: builtin/branch.c:640 -msgid "delete fully merged branch" -msgstr "tümüyle birleştirilen dalı sil" - -#: builtin/branch.c:641 -msgid "delete branch (even if not merged)" -msgstr "dalı sil (birleştirilmemiş olsa bile)" - -#: builtin/branch.c:642 -msgid "move/rename a branch and its reflog" -msgstr "bir dalı ve onun başvuru günlüğünü taşı/yeniden adlandır" - -#: builtin/branch.c:643 -msgid "move/rename a branch, even if target exists" -msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile" - -#: builtin/branch.c:644 -msgid "copy a branch and its reflog" -msgstr "bir dalı ve onun başvuru günlüğünü kopyala" - -#: builtin/branch.c:645 -msgid "copy a branch, even if target exists" -msgstr "bir dalı kopyala, hedef var olsa bile" - -#: builtin/branch.c:646 -msgid "list branch names" -msgstr "dal adlarını listele" - -#: builtin/branch.c:647 -msgid "show current branch name" -msgstr "geçerli dal adını göster" - -#: builtin/branch.c:648 -msgid "create the branch's reflog" -msgstr "dalın başvuru günlüğünü oluştur" - -#: builtin/branch.c:650 -msgid "edit the description for the branch" -msgstr "dalın açıklamasını düzenle" - -#: builtin/branch.c:651 -msgid "force creation, move/rename, deletion" -msgstr "zorla oluştur, taşı/yeniden adlandır, sil" - -#: builtin/branch.c:652 -msgid "print only branches that are merged" -msgstr "yalnızca birleştirilen dalları yazdır" - -#: builtin/branch.c:653 -msgid "print only branches that are not merged" -msgstr "yalnızca birleştirilmeyen dalları yazdır" - -#: builtin/branch.c:654 -msgid "list branches in columns" -msgstr "dalları sütunlarla listele" - -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:433 -msgid "object" -msgstr "nesne" - -#: builtin/branch.c:658 -msgid "print only branches of the object" -msgstr "yalnızca nesnenin dallarını yazdır" - -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 -msgid "sorting and filtering are case insensitive" -msgstr "sıralama ve süzme BÜYÜK/küçük harf duyarlı değildir" - -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 -#: builtin/verify-tag.c:38 -msgid "format to use for the output" -msgstr "çıktı için kullanılacak biçim" - -#: builtin/branch.c:684 builtin/clone.c:785 -msgid "HEAD not found below refs/heads!" -msgstr "HEAD, refs/heads altında bulunamadı!" - -#: builtin/branch.c:708 -msgid "--column and --verbose are incompatible" -msgstr "--column ve --verbose birbiriyle uyumsuz" - -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 -msgid "branch name required" -msgstr "dal adı gerekli" - -#: builtin/branch.c:753 -msgid "Cannot give description to detached HEAD" -msgstr "Ayrılmış HEAD'e açıklama verilemiyor" - -#: builtin/branch.c:758 -msgid "cannot edit description of more than one branch" -msgstr "birden çok dalın açıklaması düzenlenemiyor" - -#: builtin/branch.c:765 -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "'%s' dalında henüz bir gönderi yok." - -#: builtin/branch.c:768 -#, c-format -msgid "No branch named '%s'." -msgstr "'%s' adında bir dal yok." - -#: builtin/branch.c:783 -msgid "too many branches for a copy operation" -msgstr "bir kopyalama işlemi için çok fazla dal" - -#: builtin/branch.c:792 -msgid "too many arguments for a rename operation" -msgstr "bir yeniden adlandırma işlemi için çok fazla değişken" - -#: builtin/branch.c:797 -msgid "too many arguments to set new upstream" -msgstr "yeni üstkaynak ayarlamak için çok fazla değişken" - -#: builtin/branch.c:801 -#, c-format -msgid "" -"could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "" -"HEAD'in üst kaynağı %s olarak ayarlanamadı, çünkü herhangi bir dala işaret " -"etmiyor." - -#: builtin/branch.c:804 builtin/branch.c:827 -#, c-format -msgid "no such branch '%s'" -msgstr "'%s' diye bir dal yok" - -#: builtin/branch.c:808 -#, c-format -msgid "branch '%s' does not exist" -msgstr "'%s' diye bir dal mevcut değil" - -#: builtin/branch.c:821 -msgid "too many arguments to unset upstream" -msgstr "üst kaynağı kaldırmak için çok fazla değişken" - -#: builtin/branch.c:825 -msgid "could not unset upstream of HEAD when it does not point to any branch." -msgstr "" -"HEAD'in üst kaynağı kaldırılamadı, çünkü herhangi bir dala işaret etmiyor." - -#: builtin/branch.c:831 -#, c-format -msgid "Branch '%s' has no upstream information" -msgstr "'%s' dalının üstkaynak bilgisi yok" - -#: builtin/branch.c:841 -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'in -a ve -r seçenekleri bir dal adı almaz.\n" -"Şunu mu demek istediniz: -a|-r --list <dizgi>?" - -#: builtin/branch.c:845 -msgid "" -"the '--set-upstream' option is no longer supported. Please use '--track' or " -"'--set-upstream-to' instead." -msgstr "" -"--set-upstream seçeneği artık desteklenmiyor. Lütfen --track veya --set-" -"upstream-to kullanın." - -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<seçenekler>] <dosya> <git-rev-liste değişkenler>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<seçenekler>] <dosya>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <dosya> [<başvuru-adı>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "ilerleme çubuğunu gösterme" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "ilerleme çubuğunu göster" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "ilerleme çubuğunu nesne yazımı aşaması sırasında göster" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "Bir demet oluşturmak için bir depo gerekli." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "demet ayrıntılarını gösterme" - -#: builtin/bundle.c:119 -#, c-format -msgid "%s is okay\n" -msgstr "%s tamam\n" - -#: builtin/bundle.c:160 -msgid "Need a repository to unbundle." -msgstr "Demeti çözmek için bir depo gerekli" - -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Bilinmeyen altkomut: %s" - -#: builtin/cat-file.c:595 -msgid "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | <type> | --textconv | --filters) [--path=<path>] <object>" -msgstr "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | <tür> | --textconv | --filters) [--path=<yol>] <nesne>" - -#: builtin/cat-file.c:596 -msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" -msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" - -#: builtin/cat-file.c:617 -msgid "only one batch option may be specified" -msgstr "yalnızca bir toplu iş seçeneği belirtilebilir" - -#: builtin/cat-file.c:635 -msgid "<type> can be one of: blob, tree, commit, tag" -msgstr "<tür> yalnızca şunlardan biri olabilir: blob, tree, commit, tag" - -#: builtin/cat-file.c:636 -msgid "show object type" -msgstr "nesne türünü göster" - -#: builtin/cat-file.c:637 -msgid "show object size" -msgstr "nesne boyutunu göster" - -#: builtin/cat-file.c:639 -msgid "exit with zero when there's no error" -msgstr "hata yoksa sıfır koduyla çık" - -#: builtin/cat-file.c:640 -msgid "pretty-print object's content" -msgstr "nesne içeriğini hoş biçimde göster" - -#: builtin/cat-file.c:642 -msgid "for blob objects, run textconv on object's content" -msgstr "ikili nesneler için nesne içeriği üzerinde textconv çalıştır" - -#: builtin/cat-file.c:644 -msgid "for blob objects, run filters on object's content" -msgstr "ikili nesneler için nesne içeriği üzerinde süzgeçler çalıştır" - -#: builtin/cat-file.c:645 git-submodule.sh:1002 -msgid "blob" -msgstr "ikili nesne" - -#: builtin/cat-file.c:646 -msgid "use a specific path for --textconv/--filters" -msgstr "--textconv/--filters için belirli bir yol kullan" - -#: builtin/cat-file.c:648 -msgid "allow -s and -t to work with broken/corrupt objects" -msgstr "-s ve -t'nin bozuk/hasar görmüş nesnelerle çalışmasına izin ver" - -#: builtin/cat-file.c:649 -msgid "buffer --batch output" -msgstr "--batch çıktısını arabelleğe al" - -#: builtin/cat-file.c:651 -msgid "show info and content of objects fed from the standard input" -msgstr "standart girdi'den beslenen nesnelerin bilgisini ve içeriğini göster" - -#: builtin/cat-file.c:655 -msgid "show info about objects fed from the standard input" -msgstr "standart girdi'den beslenen nesneler hakkında bilgi göster" - -#: builtin/cat-file.c:659 -msgid "follow in-tree symlinks (used with --batch or --batch-check)" -msgstr "" -"ağaç içi sembolik bağları izle (--batch veya --batch-check ile kullanılır)" - -#: builtin/cat-file.c:661 -msgid "show all objects with --batch or --batch-check" -msgstr "--batch veya --batch-check ile olan tüm nesneleri göster" - -#: builtin/cat-file.c:663 -msgid "do not order --batch-all-objects output" -msgstr "--batch-all-objects çıktısını sıralama" - -#: builtin/check-attr.c:13 -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <öznitelik>...] [--] <yol-adı>..." - -#: builtin/check-attr.c:14 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <öznitelik>...]" - -#: builtin/check-attr.c:21 -msgid "report all attributes set on file" -msgstr "tüm dosya özniteliklerini bildir" - -#: builtin/check-attr.c:22 -msgid "use .gitattributes only from the index" -msgstr "yalnızca indeksteki .gitattributes'u kullan" - -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 -msgid "read file names from stdin" -msgstr "dosya adlarını stdin'den oku" - -#: builtin/check-attr.c:25 builtin/check-ignore.c:27 -msgid "terminate input and output records by a NUL character" -msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır" - -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 -msgid "suppress progress reporting" -msgstr "ilerleme bildirimini gizle" - -#: builtin/check-ignore.c:29 -msgid "show non-matching input paths" -msgstr "eşleşmeyen girdi yollarını göster" - -#: builtin/check-ignore.c:31 -msgid "ignore index when checking" -msgstr "denetlerken indeksi yok say" - -#: builtin/check-ignore.c:163 -msgid "cannot specify pathnames with --stdin" -msgstr "yol adları --stdin ile belirtilemiyor" - -#: builtin/check-ignore.c:166 -msgid "-z only makes sense with --stdin" -msgstr "-z yalnızca --stdin ile bir anlam ifade eder" - -#: builtin/check-ignore.c:168 -msgid "no path specified" -msgstr "bir yol belirtilmedi" - -#: builtin/check-ignore.c:172 -msgid "--quiet is only valid with a single pathname" -msgstr "--quiet yalnızca tek bir yol adı ile geçerlidir" - -#: builtin/check-ignore.c:174 -msgid "cannot have both --quiet and --verbose" -msgstr "hem --quiet hem --verbose birlikte kullanılamaz" - -#: builtin/check-ignore.c:177 -msgid "--non-matching is only valid with --verbose" -msgstr "--non-matching yalnızca --verbose ile geçerlidir" - -#: builtin/check-mailmap.c:9 -msgid "git check-mailmap [<options>] <contact>..." -msgstr "git check-mailmap [<seçenekler>] <contact>..." - -#: builtin/check-mailmap.c:14 -msgid "also read contacts from stdin" -msgstr "stdin'den kişileri de oku" - -#: builtin/check-mailmap.c:25 -#, c-format -msgid "unable to parse contact: %s" -msgstr "kişi ayrıştırılamadı: %s" - -#: builtin/check-mailmap.c:48 -msgid "no contacts specified" -msgstr "kişi belirtilmedi" - -#: builtin/checkout-index.c:131 -msgid "git checkout-index [<options>] [--] [<file>...]" -msgstr "git checkout-index [<seçenekler>] [--] [<dosya>...]" - -#: builtin/checkout-index.c:148 -msgid "stage should be between 1 and 3 or all" -msgstr "stage 1 ve 3 arasında veya tümü olmalıdır" - -#: builtin/checkout-index.c:164 -msgid "check out all files in the index" -msgstr "indeksteki tüm dosyaları çıkış yap" - -#: builtin/checkout-index.c:165 -msgid "force overwrite of existing files" -msgstr "mevcut dosyaların üzerine yazılmasını zorla" - -#: builtin/checkout-index.c:167 -msgid "no warning for existing files and files not in index" -msgstr "mevcut dosyalar ve indekste olmayan dosyalar için uyarma" - -#: builtin/checkout-index.c:169 -msgid "don't checkout new files" -msgstr "yeni dosyaları çıkış yapma" - -#: builtin/checkout-index.c:171 -msgid "update stat information in the index file" -msgstr "indeks dosyasındaki dosya bilgilerini güncelle" - -#: builtin/checkout-index.c:175 -msgid "read list of paths from the standard input" -msgstr "yolların listesini standart girdi'den oku" - -#: builtin/checkout-index.c:177 -msgid "write the content to temporary files" -msgstr "içeriği geçici dosyalara yaz" - -#: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 -msgid "string" -msgstr "dizi" - -#: builtin/checkout-index.c:179 -msgid "when creating files, prepend <string>" -msgstr "dosyalar oluştururken başına <dizi> ekle" - -#: builtin/checkout-index.c:181 -msgid "copy out the files from named stage" -msgstr "dosyaları adı verilen alandan kopyala" - -#: builtin/checkout.c:31 -msgid "git checkout [<options>] <branch>" -msgstr "git checkout [<seçenekler>] <dal>" - -#: builtin/checkout.c:32 -msgid "git checkout [<options>] [<branch>] -- <file>..." -msgstr "git checkout [<seçenekler>] [<dal>] -- <dosya>..." - -#: builtin/checkout.c:37 -msgid "git switch [<options>] [<branch>]" -msgstr "git switch [<seçenekler>] [<dal>]" - -#: builtin/checkout.c:42 -msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..." - -#: builtin/checkout.c:175 builtin/checkout.c:214 -#, c-format -msgid "path '%s' does not have our version" -msgstr "'%s' yolu bizdeki sürüme iye değil" - -#: builtin/checkout.c:177 builtin/checkout.c:216 -#, c-format -msgid "path '%s' does not have their version" -msgstr "'%s' yolu onlardaki sürüme iye değil" - -#: builtin/checkout.c:193 -#, c-format -msgid "path '%s' does not have all necessary versions" -msgstr "'%s' yolu gereken tüm sürümlere iye değil" - -#: builtin/checkout.c:243 -#, c-format -msgid "path '%s' does not have necessary versions" -msgstr "'%s' yolu gereken sürümlere iye değil" - -#: builtin/checkout.c:261 -#, c-format -msgid "path '%s': cannot merge" -msgstr "'%s' yolu: Birleştirilemiyor" - -#: builtin/checkout.c:277 -#, c-format -msgid "Unable to add merge result for '%s'" -msgstr "'%s' için birleştirme sonuçları eklenemiyor" - -#: builtin/checkout.c:377 -#, c-format -msgid "Recreated %d merge conflict" -msgid_plural "Recreated %d merge conflicts" -msgstr[0] "%d birleştirme çakışması yeniden oluşturuldu" -msgstr[1] "%d birleştirme çakışması yeniden oluşturuldu" - -#: builtin/checkout.c:382 -#, c-format -msgid "Updated %d path from %s" -msgid_plural "Updated %d paths from %s" -msgstr[0] "%d yol şuradan güncellendi: %s" -msgstr[1] "%d yol şuradan güncellendi: %s" - -#: builtin/checkout.c:389 -#, c-format -msgid "Updated %d path from the index" -msgid_plural "Updated %d paths from the index" -msgstr[0] "%d yol indeksten güncellendi" -msgstr[1] "%d yol indeksten güncellendi" - -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 -#, c-format -msgid "'%s' cannot be used with updating paths" -msgstr "'%s' güncellenmekte olan yollarla kullanılamaz" - -#: builtin/checkout.c:425 builtin/checkout.c:428 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "'%s', %s ile birlikte kullanılamaz" - -#: builtin/checkout.c:432 -#, c-format -msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "Aynı anda hem yolları güncelleyip hem de '%s' dalına geçilemiyor." - -#: builtin/checkout.c:436 -#, c-format -msgid "neither '%s' or '%s' is specified" -msgstr "ne '%s' ne de '%s' belirtilmiş" - -#: builtin/checkout.c:440 -#, c-format -msgid "'%s' must be used when '%s' is not specified" -msgstr "'%s', '%s' ögesinin belirtilmediği durumlarda kullanılmalıdır" - -#: builtin/checkout.c:445 builtin/checkout.c:450 -#, c-format -msgid "'%s' or '%s' cannot be used with %s" -msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz" - -#: builtin/checkout.c:509 builtin/checkout.c:516 -#, c-format -msgid "path '%s' is unmerged" -msgstr "'%s' yolu birleştirilmemiş" - -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 -msgid "you need to resolve your current index first" -msgstr "önce geçerli indeksinizi çözmelisiniz" - -#: builtin/checkout.c:734 -#, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"aşağıdaki hazırlanmış değişiklikler içeren dosyalarla sürdürülemiyor:\n" -"%s" - -#: builtin/checkout.c:837 -#, c-format -msgid "Can not do reflog for '%s': %s\n" -msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n" - -#: builtin/checkout.c:879 -msgid "HEAD is now at" -msgstr "HEAD şimdi şurada:" - -#: builtin/checkout.c:883 builtin/clone.c:717 -msgid "unable to update HEAD" -msgstr "HEAD güncellenemiyor" - -#: builtin/checkout.c:887 -#, c-format -msgid "Reset branch '%s'\n" -msgstr "'%s' dalı sıfırlandı.\n" - -#: builtin/checkout.c:890 -#, c-format -msgid "Already on '%s'\n" -msgstr "Halihazırda '%s' üzerinde\n" - -#: builtin/checkout.c:894 -#, c-format -msgid "Switched to and reset branch '%s'\n" -msgstr "'%s' dalına geçildi ve sıfırlandı.\n" - -#: builtin/checkout.c:896 builtin/checkout.c:1320 -#, c-format -msgid "Switched to a new branch '%s'\n" -msgstr "Yeni '%s' dalına geçildi.\n" - -#: builtin/checkout.c:898 -#, c-format -msgid "Switched to branch '%s'\n" -msgstr "'%s' dalına geçildi.\n" - -#: builtin/checkout.c:949 -#, c-format -msgid " ... and %d more.\n" -msgstr "... ve %d daha.\n" - -#: builtin/checkout.c:955 -#, c-format -msgid "" -"Warning: you are leaving %d commit behind, not connected to\n" -"any of your branches:\n" -"\n" -"%s\n" -msgid_plural "" -"Warning: you are leaving %d commits behind, not connected to\n" -"any of your branches:\n" -"\n" -"%s\n" -msgstr[0] "" -"Uyarı: Arkanızda dallarınızdan hiçbirine bağlı olmayın %d gönderi\n" -"bırakıyorsunuz:\n" -"\n" -"%s\n" -msgstr[1] "" -"Uyarı: Arkanızda dallarınızdan hiçbirine bağlı olmayın %d gönderi\n" -"bırakıyorsunuz:\n" -"\n" -"%s\n" - -#: builtin/checkout.c:974 -#, c-format -msgid "" -"If you want to keep it by creating a new branch, this may be a good time\n" -"to do so with:\n" -"\n" -" git branch <new-branch-name> %s\n" -"\n" -msgid_plural "" -"If you want to keep them by creating a new branch, this may be a good time\n" -"to do so with:\n" -"\n" -" git branch <new-branch-name> %s\n" -"\n" -msgstr[0] "" -"Eğer bunu yeni bir dal oluşturup tutmak istiyorsanız şimdi bunu yapmak\n" -"için iyi bir zaman olabilir:\n" -"\n" -"\tgit branch <yeni-dal-adı> %s\n" -"\n" -msgstr[1] "" -"Eğer bunları yeni bir dal oluşturup tutmak istiyorsanız şimdi bunu yapmak\n" -"için iyi bir zaman olabilir:\n" -"\n" -"\tgit branch <yeni-dal-adı> %s\n" -"\n" - -#: builtin/checkout.c:1009 -msgid "internal error in revision walk" -msgstr "revizyonlarda gezinirken iç hata" - -#: builtin/checkout.c:1013 -msgid "Previous HEAD position was" -msgstr "Önceki HEAD konumu şuydu:" - -#: builtin/checkout.c:1053 builtin/checkout.c:1315 -msgid "You are on a branch yet to be born" -msgstr "Henüz doğmamış bir dal üzerindesiniz" - -#: builtin/checkout.c:1128 -#, c-format -msgid "" -"'%s' could be both a local file and a tracking branch.\n" -"Please use -- (and optionally --no-guess) to disambiguate" -msgstr "" -"'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n" -"Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin." - -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Eğer bir uzak izleme dalını çıkış yapmak istediyseniz örn. 'origin',\n" -"bunu adı --track seçeneği ile tam olarak nitelendirip yapabilirsiniz.\n" -"\n" -"\tgit checkout --track origin/<ad>\n" -"\n" -"Eğer her zaman belirsiz <ad> çıkışlarının bir uzak konumu tercih etmesini\n" -"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultsRemote=origin\n" -"ayarını yapmayı düşünün." - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' birden çok (%d) uzak izleme dalıyla eşleşti" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "yalnızca bir başvuru bekleniyordu" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "yalnızca bir başvuru bekleniyordu, %d verildi" - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 -#, c-format -msgid "invalid reference: %s" -msgstr "geçersiz başvuru: %s" - -#: builtin/checkout.c:1287 builtin/checkout.c:1649 -#, c-format -msgid "reference is not a tree: %s" -msgstr "başvuru bir ağaca değil: %s" - -#: builtin/checkout.c:1334 -#, c-format -msgid "a branch is expected, got tag '%s'" -msgstr "bir dal bekleniyordu, '%s' etiketi alındı" - -#: builtin/checkout.c:1336 -#, c-format -msgid "a branch is expected, got remote branch '%s'" -msgstr "bir dal bekleniyordu, '%s' uzak dal alındı" - -#: builtin/checkout.c:1337 builtin/checkout.c:1345 -#, c-format -msgid "a branch is expected, got '%s'" -msgstr "bir dal bekleniyordu, '%s' alındı" - -#: builtin/checkout.c:1340 -#, c-format -msgid "a branch is expected, got commit '%s'" -msgstr "bir dal bekleniyordu, '%s' gönderisi alındı" - -#: builtin/checkout.c:1356 -msgid "" -"cannot switch branch while merging\n" -"Consider \"git merge --quit\" or \"git worktree add\"." -msgstr "" -"Birleştirme yaparken dal değiştirilemiyor.\n" -"\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün." - -#: builtin/checkout.c:1360 -msgid "" -"cannot switch branch in the middle of an am session\n" -"Consider \"git am --quit\" or \"git worktree add\"." -msgstr "" -"Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n" -"\"git am --quit\" veya \"git worktree add\" yapmayı düşünün." - -#: builtin/checkout.c:1364 -msgid "" -"cannot switch branch while rebasing\n" -"Consider \"git rebase --quit\" or \"git worktree add\"." -msgstr "" -"Yeniden temellendirme yaparken dal değiştirilemiyor.\n" -"\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün." - -#: builtin/checkout.c:1368 -msgid "" -"cannot switch branch while cherry-picking\n" -"Consider \"git cherry-pick --quit\" or \"git worktree add\"." -msgstr "" -"Seç-al yaparken dal değiştirilemiyor.\n" -"\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün." - -#: builtin/checkout.c:1372 -msgid "" -"cannot switch branch while reverting\n" -"Consider \"git revert --quit\" or \"git worktree add\"." -msgstr "" -"Geri al yaparken dal değiştirilemiyor.\n" -"\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün." - -#: builtin/checkout.c:1376 -msgid "you are switching branch while bisecting" -msgstr "ikili arama yaparken dal değiştiriyorsunuz" - -#: builtin/checkout.c:1383 -msgid "paths cannot be used with switching branches" -msgstr "dal değiştirilirken yollar kullanılamaz" - -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 -#, c-format -msgid "'%s' cannot be used with switching branches" -msgstr "dal değiştirilirken '%s' kullanılamaz" - -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 -#, c-format -msgid "'%s' cannot be used with '%s'" -msgstr "'%s', '%s' ile birlikte kullanılamaz" - -#: builtin/checkout.c:1411 -#, c-format -msgid "'%s' cannot take <start-point>" -msgstr "'%s', <başlama-noktası> alamaz" - -#: builtin/checkout.c:1419 -#, c-format -msgid "Cannot switch branch to a non-commit '%s'" -msgstr "Dal gönderi olmayan '%s' ögesine değiştirilemez" - -#: builtin/checkout.c:1426 -msgid "missing branch or commit argument" -msgstr "dal veya gönderi değişkeni eksik" - -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "durum belirtmeyi zorla" - -#: builtin/checkout.c:1469 -msgid "perform a 3-way merge with the new branch" -msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir" - -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 -msgid "style" -msgstr "stil" - -#: builtin/checkout.c:1471 -msgid "conflict style (merge or diff3)" -msgstr "çakışma stili (birleştirme veya diff3)" - -#: builtin/checkout.c:1483 builtin/worktree.c:496 -msgid "detach HEAD at named commit" -msgstr "adı verilen gönderide HEAD'i ayır" - -#: builtin/checkout.c:1484 -msgid "set upstream info for new branch" -msgstr "yeni dal için üstkaynak bilgisi ayarla" - -#: builtin/checkout.c:1486 -msgid "force checkout (throw away local modifications)" -msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)" - -#: builtin/checkout.c:1488 -msgid "new-branch" -msgstr "yeni dal" - -#: builtin/checkout.c:1488 -msgid "new unparented branch" -msgstr "yeni üst ögesi olmayan dal" - -#: builtin/checkout.c:1490 builtin/merge.c:289 -msgid "update ignored files (default)" -msgstr "yok sayılan dosyaları güncelle (öntanımlı)" - -#: builtin/checkout.c:1493 -msgid "do not check if another worktree is holding the given ref" -msgstr "" -"verilen başvuruyu başka bir çalışma ağacının tutup tutmadığını denetleme" - -#: builtin/checkout.c:1506 -msgid "checkout our version for unmerged files" -msgstr "birleştirilmeyen dosyalar için bizim sürümü çıkış yap" - -#: builtin/checkout.c:1509 -msgid "checkout their version for unmerged files" -msgstr "birleştirilmeyen dosyalar için onların sürümünü çıkış yap" - -#: builtin/checkout.c:1513 -msgid "do not limit pathspecs to sparse entries only" -msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama" - -#: builtin/checkout.c:1565 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B ve --orphan birlikte kullanılmaz" - -#: builtin/checkout.c:1568 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p ve --overlay birlikte kullanılmaz" - -#: builtin/checkout.c:1605 -msgid "--track needs a branch name" -msgstr "--track için bir dal adı gerekli" - -#: builtin/checkout.c:1610 -msgid "missing branch name; try -b" -msgstr "eksik dal adı; -b deneyin" - -#: builtin/checkout.c:1642 -#, c-format -msgid "could not resolve %s" -msgstr "%s çözülemedi" - -#: builtin/checkout.c:1658 -msgid "invalid path specification" -msgstr "geçersiz yol belirtimi" - -#: builtin/checkout.c:1665 -#, c-format -msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "'%s' bir gönderi değil ve ondan bir '%s' dalı oluşturulamaz" - -#: builtin/checkout.c:1669 -#, c-format -msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout: --detach bir '%s' yol değişkeni almıyor" - -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file, --detach ile uyumsuz" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file, --patch ile uyumsuz" - -#: builtin/checkout.c:1692 -msgid "" -"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" -"checking out of the index." -msgstr "" -"git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n" -"birlikte kullanılamaz" - -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "eski durumuna getirilecek yolları belirtmelisiniz" - -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 -msgid "branch" -msgstr "dal" - -#: builtin/checkout.c:1724 -msgid "create and checkout a new branch" -msgstr "yeni bir dal oluştur ve çıkış yap" - -#: builtin/checkout.c:1726 -msgid "create/reset and checkout a branch" -msgstr "bir dal oluştur/sıfırla ve çıkış yap" - -#: builtin/checkout.c:1727 -msgid "create reflog for new branch" -msgstr "yeni dal için başvuru günlüğü oluştur" - -#: builtin/checkout.c:1729 -msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "'git checkout <böyle-bir-dal-yok>'a temkinli yaklaş (öntanımlı)" - -#: builtin/checkout.c:1730 -msgid "use overlay mode (default)" -msgstr "yerpaylaşım kipini kullan (öntanımlı)" - -#: builtin/checkout.c:1775 -msgid "create and switch to a new branch" -msgstr "yeni bir dal oluştur ve ona geç" - -#: builtin/checkout.c:1777 -msgid "create/reset and switch to a branch" -msgstr "bir dal oluştur/sıfırla ve ona geç" - -#: builtin/checkout.c:1779 -msgid "second guess 'git switch <no-such-branch>'" -msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş" - -#: builtin/checkout.c:1781 -msgid "throw away local modifications" -msgstr "yerel değişiklikleri çöpe at" - -#: builtin/checkout.c:1813 -msgid "which tree-ish to checkout from" -msgstr "çıkış yapılacak ağacımsı" - -#: builtin/checkout.c:1815 -msgid "restore the index" -msgstr "indeksi eski durumuna getir" - -#: builtin/checkout.c:1817 -msgid "restore the working tree (default)" -msgstr "çalışma ağacını eski durumuna getir" - -#: builtin/checkout.c:1819 -msgid "ignore unmerged entries" -msgstr "birleştirilmemiş girdileri yok say" - -#: builtin/checkout.c:1820 -msgid "use overlay mode" -msgstr "yerpaylaşım kipini kullan" - -#: builtin/clean.c:28 -msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <dizgi>] [-x | -X] [--] <yollar>..." - -#: builtin/clean.c:32 -#, c-format -msgid "Removing %s\n" -msgstr "%s kaldırılıyor\n" - -#: builtin/clean.c:33 -#, c-format -msgid "Would remove %s\n" -msgstr "%s kaldırılacak\n" - -#: builtin/clean.c:34 -#, c-format -msgid "Skipping repository %s\n" -msgstr "%s dizini atlanıyor\n" - -#: builtin/clean.c:35 -#, c-format -msgid "Would skip repository %s\n" -msgstr "%s dizini atlanacak\n" - -#: builtin/clean.c:36 -#, c-format -msgid "failed to remove %s" -msgstr "%s kaldırılamadı" - -#: builtin/clean.c:37 -#, c-format -msgid "could not lstat %s\n" -msgstr "%s 'lstat' yapılamadı\n" - -#: builtin/clean.c:301 git-add--interactive.perl:595 -#, c-format -msgid "" -"Prompt help:\n" -"1 - select a numbered item\n" -"foo - select item based on unique prefix\n" -" - (empty) select nothing\n" -msgstr "" -"İstem yardımı:\n" -"1 - numaralandırılmış bir öge seç\n" -"foo - benzersiz öneke dayanarak bir öge seç\n" -" - (boş) hiçbir şey seçme\n" - -#: builtin/clean.c:305 git-add--interactive.perl:604 -#, c-format -msgid "" -"Prompt help:\n" -"1 - select a single item\n" -"3-5 - select a range of items\n" -"2-3,6-9 - select multiple ranges\n" -"foo - select item based on unique prefix\n" -"-... - unselect specified items\n" -"* - choose all items\n" -" - (empty) finish selecting\n" -msgstr "" -"İstem yardımı:1 - tek bir öge seç\n" -"3-5 - bir öge aralığı seç\n" -"2-3,6-9 - birden çok erim seç\n" -"foo - benzersiz öneke dayanarak bir öge seç\n" -"-... - belirtilen ögelerin seçimini kaldır\n" -"* - tüm ögeleri seç\n" -" - (boş) seçimi bitir\n" - -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 -#, c-format, perl-format -msgid "Huh (%s)?\n" -msgstr "Pardon (%s)?\n" - -#: builtin/clean.c:663 -#, c-format -msgid "Input ignore patterns>> " -msgstr "Girdi yok sayma dizgileri>> " - -#: builtin/clean.c:700 -#, c-format -msgid "WARNING: Cannot find items matched by: %s" -msgstr "UYARI: Şununla eşleşen ögeler bulunamıyor: %s" - -#: builtin/clean.c:721 -msgid "Select items to delete" -msgstr "Silinecek ögeleri seçin" - -#. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 -#, c-format -msgid "Remove %s [y/N]? " -msgstr "%s kaldırılsın mı [y/N]? " - -#: builtin/clean.c:795 -msgid "" -"clean - start cleaning\n" -"filter by pattern - exclude items from deletion\n" -"select by numbers - select items to be deleted by numbers\n" -"ask each - confirm each deletion (like \"rm -i\")\n" -"quit - stop cleaning\n" -"help - this screen\n" -"? - help for prompt selection" -msgstr "" -"clean - temizliğe başla\n" -"filter by pattern - silinmeyecek ögeleri belirle\n" -"select by numbers - silinecek ögeleri sayıları ile seç\n" -"ask each - her silmeyi onayla (\"rm -i\" gibi)\n" -"quit - temizliği durdur\n" -"help - bu ekranı görüntüle\n" -"? - istem seçimi için yardım" - -#: builtin/clean.c:831 -msgid "Would remove the following item:" -msgid_plural "Would remove the following items:" -msgstr[0] "Aşağıdaki öge kaldırılacak:" -msgstr[1] "Aşağıdaki ögeler kaldırılacak:" - -#: builtin/clean.c:847 -msgid "No more files to clean, exiting." -msgstr "Temizlenecek başka dosya yok, çıkılıyor." - -#: builtin/clean.c:909 -msgid "do not print names of files removed" -msgstr "kaldırılan dosyaların adlarını yazdırma" - -#: builtin/clean.c:911 -msgid "force" -msgstr "zorla" - -#: builtin/clean.c:912 -msgid "interactive cleaning" -msgstr "etkileşimli temizlik" - -#: builtin/clean.c:914 -msgid "remove whole directories" -msgstr "dizinleri tümüyle kaldır" - -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 -#: builtin/show-ref.c:179 -msgid "pattern" -msgstr "dizgi" - -#: builtin/clean.c:916 -msgid "add <pattern> to ignore rules" -msgstr "yok sayma kurallarına <dizgi> ekle" - -#: builtin/clean.c:917 -msgid "remove ignored files, too" -msgstr "yok sayılan dosyalar da kaldırıldı" - -#: builtin/clean.c:919 -msgid "remove only ignored files" -msgstr "yalnızca yok sayılan dosyaları kaldır" - -#: builtin/clean.c:937 -msgid "-x and -X cannot be used together" -msgstr "-x ve -X birlikte kullanılamaz" - -#: builtin/clean.c:941 -msgid "" -"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " -"clean" -msgstr "" -"clean.requireForce 'true' olarak ayarlanmış ve ne -i, ne -n, ne de -f " -"verilmiş; temizleme reddediliyor" - -#: builtin/clean.c:944 -msgid "" -"clean.requireForce defaults to true and neither -i, -n, nor -f given; " -"refusing to clean" -msgstr "" -"clean.requireForce öntanımlı olarak 'true' ve ne -i, ne -n, ne de -f " -"verilmiş; temizleme reddediliyor" - -#: builtin/clone.c:45 -msgid "git clone [<options>] [--] <repo> [<dir>]" -msgstr "git clone [<seçenekler>] [--] <depo> [<dizin>]" - -#: builtin/clone.c:93 -msgid "don't create a checkout" -msgstr "çıkış yapma!" - -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 -msgid "create a bare repository" -msgstr "çıplak bir depo oluştur" - -#: builtin/clone.c:98 -msgid "create a mirror repository (implies bare)" -msgstr "bir yansı depo oluştur (çıplak ima eder)" - -#: builtin/clone.c:100 -msgid "to clone from a local repository" -msgstr "bir yerel depodan klonla" - -#: builtin/clone.c:102 -msgid "don't use local hardlinks, always copy" -msgstr "yerel sabit bağları kullanma, her zaman kopyala" - -#: builtin/clone.c:104 -msgid "setup as shared repository" -msgstr "paylaşılan depo ayarla" - -#: builtin/clone.c:107 -msgid "pathspec" -msgstr "yol belirteci" - -#: builtin/clone.c:107 -msgid "initialize submodules in the clone" -msgstr "klon içerisindeki altmodülleri ilklendir" - -#: builtin/clone.c:110 -msgid "number of submodules cloned in parallel" -msgstr "paralelde klonlanan altmodüllerin sayısı" - -#: builtin/clone.c:111 builtin/init-db.c:486 -msgid "template-directory" -msgstr "şablon dizini" - -#: builtin/clone.c:112 builtin/init-db.c:487 -msgid "directory from which templates will be used" -msgstr "şablonların kullanılacağı dizin" - -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 -msgid "reference repository" -msgstr "başvuru deposu" - -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 -msgid "use --reference only while cloning" -msgstr "--reference'ı yalnızca klonlarken kullan" - -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 -msgid "name" -msgstr "ad" - -#: builtin/clone.c:120 -msgid "use <name> instead of 'origin' to track upstream" -msgstr "üstkaynağı izlemek için 'origin' yerine <ad> kullan" - -#: builtin/clone.c:122 -msgid "checkout <branch> instead of the remote's HEAD" -msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap" - -#: builtin/clone.c:124 -msgid "path to git-upload-pack on the remote" -msgstr "uzak konumdaki git-upload-pack'e olan yol" - -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 -msgid "depth" -msgstr "derinlik" - -#: builtin/clone.c:126 -msgid "create a shallow clone of that depth" -msgstr "verilen derinlikte sığ bir depo oluştur" - -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 -msgid "time" -msgstr "zaman" - -#: builtin/clone.c:128 -msgid "create a shallow clone since a specific time" -msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur" - -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 -msgid "revision" -msgstr "revizyon" - -#: builtin/clone.c:130 builtin/fetch.c:173 -msgid "deepen history of shallow clone, excluding rev" -msgstr "revizyonu hariç tutarak sığ klonun geçmişini derinleştir" - -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 -msgid "clone only one branch, HEAD or --branch" -msgstr "yalnızca bir dal klonla, HEAD veya --branch" - -#: builtin/clone.c:134 -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin" - -#: builtin/clone.c:136 -msgid "any cloned submodules will be shallow" -msgstr "klonlanan altmodüller sığ olacak" - -#: builtin/clone.c:137 builtin/init-db.c:495 -msgid "gitdir" -msgstr "git dizini" - -#: builtin/clone.c:138 builtin/init-db.c:496 -msgid "separate git dir from working tree" -msgstr "git dizinini çalışma ağacından ayır" - -#: builtin/clone.c:139 -msgid "key=value" -msgstr "anahtar=değer" - -#: builtin/clone.c:140 -msgid "set config inside the new repository" -msgstr "yapılandırmayı yeni deponun içinde ayarla" - -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 -msgid "server-specific" -msgstr "sunucuya özel" - -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "iletme seçeneği" - -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 -msgid "use IPv4 addresses only" -msgstr "yalnızca IPv4 adresleri kullan" - -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 -msgid "use IPv6 addresses only" -msgstr "yalnızca IPv6 adresleri kullan" - -#: builtin/clone.c:149 -msgid "any cloned submodules will use their remote-tracking branch" -msgstr "klonlanan herhangi bir altmodül kendi uzak izleme dallarını kullanacak" - -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "" -"sparse-checkout dosyasını yalnızca kökteki dosyaları içerecek biçimde " -"ilklendir" - -#: builtin/clone.c:287 -msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -msgstr "" -"Bir dizin adı tahmin edilemedi.\n" -"Lütfen komut satırında bir dizin belirtin." - -#: builtin/clone.c:340 -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: '%s' için alternatif eklenemedi: %s\n" - -#: builtin/clone.c:413 -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s var ve bir dizin değil" - -#: builtin/clone.c:430 -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "yineleyici '%s' üzerinden çalıştırılamadı" - -#: builtin/clone.c:460 -#, c-format -msgid "failed to create link '%s'" -msgstr "'%s' bağı oluşturulamadı" - -#: builtin/clone.c:464 -#, c-format -msgid "failed to copy file to '%s'" -msgstr "dosya şuraya kopyalanamadı: '%s'" - -#: builtin/clone.c:469 -#, c-format -msgid "failed to iterate over '%s'" -msgstr "'%s' üzerinde yinelenemedi" - -#: builtin/clone.c:494 -#, c-format -msgid "done.\n" -msgstr "bitti.\n" - -#: builtin/clone.c:508 -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"Klonlama başarılı oldu, ancak çıkış yapılamadı.\n" -"Neyin çıkış yapılıp yapılmadığını 'git status' ile inceleyebilir\n" -"ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n" - -#: builtin/clone.c:585 -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "Klonlanacak %s uzak dal bulunamadı." - -#: builtin/clone.c:705 -#, c-format -msgid "unable to update %s" -msgstr "%s güncellenemiyor" - -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "sparse-checkout ilklendirilemedi" - -#: builtin/clone.c:776 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "" -"uzak konum HEAD'i var olmayan başvuruya bağlanıyor, çıkış yapılamıyor.\n" - -#: builtin/clone.c:807 -msgid "unable to checkout working tree" -msgstr "çalışma ağacı çıkış yapılamıyor" - -#: builtin/clone.c:862 -msgid "unable to write parameters to config file" -msgstr "parametreler yapılandırma dosyasına yazılamıyor" - -#: builtin/clone.c:925 -msgid "cannot repack to clean up" -msgstr "temizlik için yeniden paketlenemiyor" - -#: builtin/clone.c:927 -msgid "cannot unlink temporary alternates file" -msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor" - -#: builtin/clone.c:965 builtin/receive-pack.c:1950 -msgid "Too many arguments." -msgstr "Çok fazla değişken." - -#: builtin/clone.c:969 -msgid "You must specify a repository to clone." -msgstr "Klonlamak için bir depo belirtmelisiniz." - -#: builtin/clone.c:982 -#, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "--bare ve --origin %s seçenekleri birbiriyle uyumsuz." - -#: builtin/clone.c:985 -msgid "--bare and --separate-git-dir are incompatible." -msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz." - -#: builtin/clone.c:998 -#, c-format -msgid "repository '%s' does not exist" -msgstr "'%s' deposu mevcut değil" - -#: builtin/clone.c:1004 builtin/fetch.c:1796 -#, c-format -msgid "depth %s is not a positive number" -msgstr "%s derinliği pozitif bir sayı değil" - -#: builtin/clone.c:1014 -#, c-format -msgid "destination path '%s' already exists and is not an empty directory." -msgstr "Hedef yolu '%s' halihazırda mevcut ve boş bir dizin değil." - -#: builtin/clone.c:1024 -#, c-format -msgid "working tree '%s' already exists." -msgstr "Çalışma ağacı '%s' halihazırda mevcut." - -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "şunun öncü dizinleri oluşturulamadı: '%s'" - -#: builtin/clone.c:1044 -#, c-format -msgid "could not create work tree dir '%s'" -msgstr "'%s' çalışma ağacı dizini oluşturulamadı" - -#: builtin/clone.c:1064 -#, c-format -msgid "Cloning into bare repository '%s'...\n" -msgstr "'%s' çıplak deposuna klonlanıyor...\n" - -#: builtin/clone.c:1066 -#, c-format -msgid "Cloning into '%s'...\n" -msgstr "Şuraya klonlanıyor: '%s'...\n" - -#: builtin/clone.c:1090 -msgid "" -"clone --recursive is not compatible with both --reference and --reference-if-" -"able" -msgstr "" -"clone --recursive hem --reference hem --reference-if-able ile uyumlu değil" - -#: builtin/clone.c:1154 -msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth yerel klonlarda yok sayılır; yerine file:// kullanın." - -#: builtin/clone.c:1156 -msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since yerel klonlarda yok sayılır; yerine file:// kullanın." - -#: builtin/clone.c:1158 -msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "" -"--shallow-exclude yerel klonlarda yok sayılır; yerine file:// kullanın." - -#: builtin/clone.c:1160 -msgid "--filter is ignored in local clones; use file:// instead." -msgstr "--filter yerel klonlarda yok sayılır; yerine file:// kullanın." - -#: builtin/clone.c:1163 -msgid "source repository is shallow, ignoring --local" -msgstr "kaynak depo sığ, --local yok sayılıyor" - -#: builtin/clone.c:1168 -msgid "--local is ignored" -msgstr "--local yok sayıldı" - -#: builtin/clone.c:1243 builtin/clone.c:1251 -#, c-format -msgid "Remote branch %s not found in upstream %s" -msgstr "%s uzak dalı %s üstkaynağında bulunamadı" - -#: builtin/clone.c:1254 -msgid "You appear to have cloned an empty repository." -msgstr "Boş bir depoyu klonlamış görünüyorsunuz." - -#: builtin/column.c:10 -msgid "git column [<options>]" -msgstr "git column [<seçenekler>]" - -#: builtin/column.c:27 -msgid "lookup config vars" -msgstr "yapılandırma değişkenlerini ara" - -#: builtin/column.c:28 builtin/column.c:29 -msgid "layout to use" -msgstr "kullanılacak yerleşim" - -#: builtin/column.c:30 -msgid "Maximum width" -msgstr "olabilecek en çok genişlik" - -#: builtin/column.c:31 -msgid "Padding space on left border" -msgstr "sol kenardaki dolgu boşluğu" - -#: builtin/column.c:32 -msgid "Padding space on right border" -msgstr "sağ kenardaki dolgu boşluğu" - -#: builtin/column.c:33 -msgid "Padding space between columns" -msgstr "sütunlar arasındaki dolgu boşluğu" - -#: builtin/column.c:51 -msgid "--command must be the first argument" -msgstr "--command ilk değişken olmalı" - -#: builtin/commit-tree.c:18 -msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" -msgstr "" -"git commit-tree [(-p <üst-öge>)...] [-S[<anahtor-no>]] [(-m <ileti>)...] [(-" -"F <dosya>)...] <ağaç>" - -#: builtin/commit-tree.c:31 -#, c-format -msgid "duplicate parent %s ignored" -msgstr "yinelenmiş üst öge %s yok sayıldı" - -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 -#, c-format -msgid "not a valid object name %s" -msgstr "%s geçerli bir nesne adı değil" - -#: builtin/commit-tree.c:93 -#, c-format -msgid "git commit-tree: failed to open '%s'" -msgstr "git commit-tree: '%s' açılamadı" - -#: builtin/commit-tree.c:96 -#, c-format -msgid "git commit-tree: failed to read '%s'" -msgstr "git commit-tree: '%s' okunamadı" - -#: builtin/commit-tree.c:98 -#, c-format -msgid "git commit-tree: failed to close '%s'" -msgstr "git commit-tree: '%s' kapatılamadı" - -#: builtin/commit-tree.c:111 -msgid "parent" -msgstr "üst öge" - -#: builtin/commit-tree.c:112 -msgid "id of a parent commit object" -msgstr "bir üst gönderi ögesinin no'su" - -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 -#: builtin/tag.c:412 -msgid "message" -msgstr "ileti" - -#: builtin/commit-tree.c:115 builtin/commit.c:1501 -msgid "commit message" -msgstr "gönderi iletisi" - -#: builtin/commit-tree.c:118 -msgid "read commit log message from file" -msgstr "gönderi günlük iletisini dosyadan oku" - -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 -msgid "GPG sign commit" -msgstr "gönderiyi GPG ile imzala" - -#: builtin/commit-tree.c:133 -msgid "must give exactly one tree" -msgstr "bir tam ağaç vermeli" - -#: builtin/commit-tree.c:140 -msgid "git commit-tree: failed to read" -msgstr "git commit-tree: okunamadı" - -#: builtin/commit.c:41 -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<seçenekler>] [--] <yol-blrtç>..." - -#: builtin/commit.c:46 -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<seçenekler>] [--] <yol-blrtç>..." - -#: builtin/commit.c:51 -msgid "" -"You asked to amend the most recent commit, but doing so would make\n" -"it empty. You can repeat your command with --allow-empty, or you can\n" -"remove the commit entirely with \"git reset HEAD^\".\n" -msgstr "" -"En son yapılan gönderiyi değiştirmek istediniz, ancak bu onu\n" -"boşaltacaktır. Komutunuzu --allow-empty ile yineleyebilir veya\n" -"gönderiyi \"git reset HEAD^\" ile tümüyle kaldırabilirsiniz.\n" - -#: builtin/commit.c:56 -msgid "" -"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" -"If you wish to commit it anyway, use:\n" -"\n" -" git commit --allow-empty\n" -"\n" -msgstr "" -"Bir önceki seç-al büyük olasılıkla çakışma çözümünden dolayı şu anda boş.\n" -"Yine de göndermek isterseniz şunu kullanın:\n" -"\n" -"\tgit commit --allow-empty\n" -"\n" - -#: builtin/commit.c:63 -msgid "Otherwise, please use 'git cherry-pick --skip'\n" -msgstr "Aksi durumda lütfen 'git cherry-pick --skip' kullanın.\n" - -#: builtin/commit.c:66 -msgid "" -"and then use:\n" -"\n" -" git cherry-pick --continue\n" -"\n" -"to resume cherry-picking the remaining commits.\n" -"If you wish to skip this commit, use:\n" -"\n" -" git cherry-pick --skip\n" -"\n" -msgstr "" -"ve sonra geri kalan gönderileri seç-al yapmayı sürdürmek için:\n" -"\n" -"\tgit cherry-pick --continue\n" -"\n" -"kullanın.\n" -"Bu gönderiyi atlamak isterseniz şunu kullanın:\n" -"\n" -"\tgit cherry-pick --continue\n" -"\n" - -#: builtin/commit.c:315 -msgid "failed to unpack HEAD tree object" -msgstr "HEAD ağaç nesnesi açılamadı" - -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file, -a ile bir anlam ifade etmiyor" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor." - -#: builtin/commit.c:376 -msgid "unable to create temporary index" -msgstr "geçici indeks oluşturulamıyor" - -#: builtin/commit.c:385 -msgid "interactive add failed" -msgstr "etkileşimli ekleme başarısız" - -#: builtin/commit.c:400 -msgid "unable to update temporary index" -msgstr "geçici indeks güncellenemiyor" - -#: builtin/commit.c:402 -msgid "Failed to update main cache tree" -msgstr "Ana önbellek ağacı güncellenemedi" - -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 -msgid "unable to write new_index file" -msgstr "new_index_file yazılamıyor" - -#: builtin/commit.c:479 -msgid "cannot do a partial commit during a merge." -msgstr "Bir birleştirme sırasında kısmi gönderi yapılamaz." - -#: builtin/commit.c:481 -msgid "cannot do a partial commit during a cherry-pick." -msgstr "Bir seç-al sırasında kısmi gönderi yapılamaz." - -#: builtin/commit.c:489 -msgid "cannot read the index" -msgstr "indeks okunamıyor" - -#: builtin/commit.c:508 -msgid "unable to write temporary index file" -msgstr "geçici indeks dosyası yazılamıyor" - -#: builtin/commit.c:606 -#, c-format -msgid "commit '%s' lacks author header" -msgstr "'%s' gönderisinde yazar üstbilgisi yok" - -#: builtin/commit.c:608 -#, c-format -msgid "commit '%s' has malformed author line" -msgstr "'%s' gönderisindeki yazar satırı hatalı oluşturulmuş" - -#: builtin/commit.c:627 -msgid "malformed --author parameter" -msgstr "hatalı oluşturulmuş --author parametresi" - -#: builtin/commit.c:680 -msgid "" -"unable to select a comment character that is not used\n" -"in the current commit message" -msgstr "" -"mevcut gönderi iletisinde kullanılmayan bir yorum\n" -"karakteri seçilemiyor" - -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 -#, c-format -msgid "could not lookup commit %s" -msgstr "%s gönderisi aranamadı" - -#: builtin/commit.c:730 builtin/shortlog.c:319 -#, c-format -msgid "(reading log message from standard input)\n" -msgstr "(günlük iletisi standart girdi'den okunuyor)\n" - -#: builtin/commit.c:732 -msgid "could not read log from standard input" -msgstr "günlük standart girdi'den okunamadı" - -#: builtin/commit.c:736 -#, c-format -msgid "could not read log file '%s'" -msgstr "günlük dosyası '%s' okunamadı" - -#: builtin/commit.c:767 builtin/commit.c:783 -msgid "could not read SQUASH_MSG" -msgstr "SQUASH_MSG okunamadı" - -#: builtin/commit.c:774 -msgid "could not read MERGE_MSG" -msgstr "MERGE_MSG okunamadı" - -#: builtin/commit.c:834 -msgid "could not write commit template" -msgstr "gönderi şablonu yazılamadı" - -#: builtin/commit.c:853 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" -msgstr "" -"\n" -"Görünüşe bakılırsa bir birleştirme gönderiyorsunuz.\n" -"Eğer bu doğru değilse lütfen şu dosyayı kaldırın:\n" -"\t%s\n" -"ve yeniden deneyin.\n" - -#: builtin/commit.c:858 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" -msgstr "" -"\n" -"Görünüşe göre bir seç-al gönderiyorsunuz.\n" -"Eğer bu doğru değilse lütfen şu dosyayı kaldırın:\n" -"\t%s\n" -"ve yeniden deneyin.\n" - -#: builtin/commit.c:871 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"Lütfen değişiklikleriniz için bir gönderi iletisi girin. '%c' ile başlayan\n" -"satırlar yok sayılacaktır. Boş bir ileti gönderiyi iptal eder.\n" - -#: builtin/commit.c:879 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"Lütfen değişiklikleriniz için bir gönderi iletisi girin. '%c' ile başlayan\n" -"satırlar tutulacaktır; isterseniz onları kaldırabilirsiniz.\n" -"Boş bir ileti gönderiyi iptal eder.\n" - -#: builtin/commit.c:896 -#, c-format -msgid "%sAuthor: %.*s <%.*s>" -msgstr "%sYazar: %.*s <%.*s>" - -#: builtin/commit.c:904 -#, c-format -msgid "%sDate: %s" -msgstr "%sTarih: %s" - -#: builtin/commit.c:911 -#, c-format -msgid "%sCommitter: %.*s <%.*s>" -msgstr "%sGönderen: %.*s <%.*s>" - -#: builtin/commit.c:929 -msgid "Cannot read index" -msgstr "İndeks okunamıyor" - -#: builtin/commit.c:997 -msgid "Error building trees" -msgstr "Ağaçlar yapılırken hata" - -#: builtin/commit.c:1011 builtin/tag.c:275 -#, c-format -msgid "Please supply the message using either -m or -F option.\n" -msgstr "Lütfen iletiyi -m veya -F seçeneğini kullanarak destekleyin.\n" - -#: builtin/commit.c:1055 -#, c-format -msgid "--author '%s' is not 'Name <email>' and matches no existing author" -msgstr "" -"--author '%s', 'Ad <e-posta>' biçiminde değil ve mevcut bir yazarla " -"eşleşmiyor" - -#: builtin/commit.c:1069 -#, c-format -msgid "Invalid ignored mode '%s'" -msgstr "Geçersiz yok sayılanları göster kipi '%s'" - -#: builtin/commit.c:1087 builtin/commit.c:1327 -#, c-format -msgid "Invalid untracked files mode '%s'" -msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'" - -#: builtin/commit.c:1127 -msgid "--long and -z are incompatible" -msgstr "--long ve -z birbiriyle uyumsuz" - -#: builtin/commit.c:1171 -msgid "Using both --reset-author and --author does not make sense" -msgstr "Hem --reset-author ve hem --author birlikte bir anlam ifade etmiyor" - -#: builtin/commit.c:1180 -msgid "You have nothing to amend." -msgstr "Değiştirecek bir şeyiniz yok." - -#: builtin/commit.c:1183 -msgid "You are in the middle of a merge -- cannot amend." -msgstr "Bir birleştirmenin tam ortasındasınız -- değiştirme yapılamıyor." - -#: builtin/commit.c:1185 -msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor." - -#: builtin/commit.c:1188 -msgid "Options --squash and --fixup cannot be used together" -msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz" - -#: builtin/commit.c:1198 -msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "-c/-C/-F/--fixup arasından yalnızca bir tanesi kullanılabilir." - -#: builtin/commit.c:1200 -msgid "Option -m cannot be combined with -c/-C/-F." -msgstr "-m seçeneği -c/-C/-F ile birlikte kullanılamaz." - -#: builtin/commit.c:1208 -msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "" -"--reset-author yalnızca -C, -c veya --amend ile birlikte kullanılabilir." - -#: builtin/commit.c:1225 -msgid "Only one of --include/--only/--all/--interactive/--patch can be used." -msgstr "" -"--include/--only/--all/--interactive/--patch arasından yalnızca bir tanesi " -"kullanılabilir." - -#: builtin/commit.c:1231 -#, c-format -msgid "paths '%s ...' with -a does not make sense" -msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor" - -#: builtin/commit.c:1362 builtin/commit.c:1524 -msgid "show status concisely" -msgstr "durumu kısaca göster" - -#: builtin/commit.c:1364 builtin/commit.c:1526 -msgid "show branch information" -msgstr "dal bilgisini göster" - -#: builtin/commit.c:1366 -msgid "show stash information" -msgstr "zula bilgisini göster" - -#: builtin/commit.c:1368 builtin/commit.c:1528 -msgid "compute full ahead/behind values" -msgstr "tam önünde/arkasında değerlerini hesapla" - -#: builtin/commit.c:1370 -msgid "version" -msgstr "sürüm" - -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 -msgid "machine-readable output" -msgstr "makine tarafından okunabilir çıktı" - -#: builtin/commit.c:1373 builtin/commit.c:1532 -msgid "show status in long format (default)" -msgstr "durumu uzun biçimde göster (öntanımlı)" - -#: builtin/commit.c:1376 builtin/commit.c:1535 -msgid "terminate entries with NUL" -msgstr "girdileri NUL ile sonlandır" - -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 -msgid "mode" -msgstr "kip" - -#: builtin/commit.c:1379 builtin/commit.c:1538 -msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "" -"izlenmeyen dosyaları göster, ist. bağlı kipler: all, normal, no (Öntanım.: " -"all)" - -#: builtin/commit.c:1383 -msgid "" -"show ignored files, optional modes: traditional, matching, no. (Default: " -"traditional)" -msgstr "" -"yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) " -"matching (eşleşen), no (hayır) (Öntanımlı: traditional)." - -#: builtin/commit.c:1385 parse-options.h:192 -msgid "when" -msgstr "ne zaman" - -#: builtin/commit.c:1386 -msgid "" -"ignore changes to submodules, optional when: all, dirty, untracked. " -"(Default: all)" -msgstr "" -"altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all " -"(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)." - -#: builtin/commit.c:1388 -msgid "list untracked files in columns" -msgstr "izlenmeyen dosyaları sütunlarla göster" - -#: builtin/commit.c:1389 -msgid "do not detect renames" -msgstr "yeniden adlandırmaları algılama" - -#: builtin/commit.c:1391 -msgid "detect renames, optionally set similarity index" -msgstr "" -"yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla" - -#: builtin/commit.c:1411 -msgid "Unsupported combination of ignored and untracked-files arguments" -msgstr "" -"Yok sayılan ve izlenmeyen dosyalar değişkenlerinin desteklenmeyen birlikte " -"kullanımı" - -#: builtin/commit.c:1494 -msgid "suppress summary after successful commit" -msgstr "başarılı gönderinin ardından özeti gizle" - -#: builtin/commit.c:1495 -msgid "show diff in commit message template" -msgstr "diff'i gönderi iletisi şablonunda göster" - -#: builtin/commit.c:1497 -msgid "Commit message options" -msgstr "Gönderi iletisi seçenekleri" - -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 -msgid "read message from file" -msgstr "iletiyi dosyadan oku" - -#: builtin/commit.c:1499 -msgid "author" -msgstr "yazar" - -#: builtin/commit.c:1499 -msgid "override author for commit" -msgstr "gönderi yazarını geçersiz kıl" - -#: builtin/commit.c:1500 builtin/gc.c:538 -msgid "date" -msgstr "tarih" - -#: builtin/commit.c:1500 -msgid "override date for commit" -msgstr "gönderi tarihini geçersiz kıl" - -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 -msgid "commit" -msgstr "gönderi" - -#: builtin/commit.c:1502 -msgid "reuse and edit message from specified commit" -msgstr "belirtilen gönderinin iletisini düzenle ve yeniden kullan" - -#: builtin/commit.c:1503 -msgid "reuse message from specified commit" -msgstr "belirtilen gönderinin iletisini yeniden kullan" - -#: builtin/commit.c:1504 -msgid "use autosquash formatted message to fixup specified commit" -msgstr "" -"belirtilen gönderiyi düzeltmek için kendiliğinden tıkıştırma tarafından " -"biçimlendirilen iletiyi kullan" - -#: builtin/commit.c:1505 -msgid "use autosquash formatted message to squash specified commit" -msgstr "" -"belirtilen gönderiyi tıkıştırmak için kendiliğinden tıkıştırma tarafından " -"biçimlendirilen iletiyi kullan" - -#: builtin/commit.c:1506 -msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "" -"gönderinin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)" - -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "Signed-off-by: ekle" - -#: builtin/commit.c:1508 -msgid "use specified template file" -msgstr "belirtilen şablon dosyasını kullan" - -#: builtin/commit.c:1509 -msgid "force edit of commit" -msgstr "gönderiyi zorla düzenle" - -#: builtin/commit.c:1511 -msgid "include status in commit message template" -msgstr "gönderi iletisi şablonunda durumu içer" - -#: builtin/commit.c:1516 -msgid "Commit contents options" -msgstr "Gönderi içeriği seçenekleri" - -#: builtin/commit.c:1517 -msgid "commit all changed files" -msgstr "değiştirilen tüm dosyaları gönder" - -#: builtin/commit.c:1518 -msgid "add specified files to index for commit" -msgstr "belirtilen dosyaları gönderi için indekse ekle" - -#: builtin/commit.c:1519 -msgid "interactively add files" -msgstr "dosyaları etkileşimli olarak ekle" - -#: builtin/commit.c:1520 -msgid "interactively add changes" -msgstr "değişiklikleri etkileşimli olarak ekle" - -#: builtin/commit.c:1521 -msgid "commit only specified files" -msgstr "yalnızca belirtilen dosyaları gönder" - -#: builtin/commit.c:1522 -msgid "bypass pre-commit and commit-msg hooks" -msgstr "pre-commit ve commit-msg kancalarını atla" - -#: builtin/commit.c:1523 -msgid "show what would be committed" -msgstr "neyin gönderileceğini göster" - -#: builtin/commit.c:1536 -msgid "amend previous commit" -msgstr "önceki gönderiyi değiştir" - -#: builtin/commit.c:1537 -msgid "bypass post-rewrite hook" -msgstr "post-rewrite kancasını atla" - -#: builtin/commit.c:1544 -msgid "ok to record an empty change" -msgstr "boş bir değişikliğin kaydı yazılabilir" - -#: builtin/commit.c:1546 -msgid "ok to record a change with an empty message" -msgstr "boş iletili bir değişikliğin kaydı yazılabilir" - -#: builtin/commit.c:1619 -#, c-format -msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)" - -#: builtin/commit.c:1626 -msgid "could not read MERGE_MODE" -msgstr "MERGE_MODE okunamadı" - -#: builtin/commit.c:1645 -#, c-format -msgid "could not read commit message: %s" -msgstr "gönderi iletisi okunamadı: %s" - -#: builtin/commit.c:1652 -#, c-format -msgid "Aborting commit due to empty commit message.\n" -msgstr "Gönderi iletisinin boş olması nedeniyle gönderi iptal ediliyor.\n" - -#: builtin/commit.c:1657 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "Gönderi iptal ediliyor; iletiyi düzenlemediniz.\n" - -#: builtin/commit.c:1691 -msgid "" -"repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git restore --staged :/\" to recover." -msgstr "" -"Depo güncellendi, ancak new_index dosyası yazılamıyor.\n" -"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." - -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <nsndzn>] [--shallow] [--[no-]progress]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <nsndzn>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <bölüm-sçnklr>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "'%s' ile eşleşen nesne dizini bulunamadı" - -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 -msgid "dir" -msgstr "dizin" - -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 -msgid "The object directory to store the graph" -msgstr "Grafiğin depolanacağı nesne dizini" - -#: builtin/commit-graph.c:71 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "commit-graph parçalara bölünmüşse yalnızca uç dosyayı doğrula" - -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "commit-graph '%s' açılamadı" - -#: builtin/commit-graph.c:128 -msgid "start walk at all refs" -msgstr "tüm başvurularda gezinmeyi başlat" - -#: builtin/commit-graph.c:130 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "stdin tarafından listelenen paket indekslerini tara" - -#: builtin/commit-graph.c:132 -msgid "start walk at commits listed by stdin" -msgstr "stdin tarafından listelenen tüm gönderilerde gezinmeyi başlat" - -#: builtin/commit-graph.c:134 -msgid "include all commits already in the commit-graph file" -msgstr "halihazırda commit-graph dosyasında bulunan tüm gönderileri içer" - -#: builtin/commit-graph.c:137 -msgid "allow writing an incremental commit-graph file" -msgstr "artan bir commit-graph dosyasının yazımına izin ver" - -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 -msgid "maximum number of commits in a non-base split commit-graph" -msgstr "" -"bir temel olmayan parçalara bölünmüş commit-graph içinde en çok olabilecek " -"gönderi sayısı" - -#: builtin/commit-graph.c:141 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "" -"bölünmüş bir commit-graph'ın iki düzeyi arasında olabilecek en büyük oran" - -#: builtin/commit-graph.c:159 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "" -"--reachable, --stdin-commits veya --stdin-packs'ten en çok birini kullan" - -#: builtin/config.c:11 -msgid "git config [<options>]" -msgstr "git config [<seçenekler>]" - -#: builtin/config.c:104 builtin/env--helper.c:23 -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "tanımlanamayan --type değişkeni, %s" - -#: builtin/config.c:116 -msgid "only one type at a time" -msgstr "bir kerede yalnızca bir tür" - -#: builtin/config.c:125 -msgid "Config file location" -msgstr "Yapılandırma dosyası konumu" - -#: builtin/config.c:126 -msgid "use global config file" -msgstr "global yapılandırma dosyası kullan" - -#: builtin/config.c:127 -msgid "use system config file" -msgstr "sistem yapılandırma dosyası kullan" - -#: builtin/config.c:128 -msgid "use repository config file" -msgstr "depo yapılandırma dosyası kullan" - -#: builtin/config.c:129 -msgid "use per-worktree config file" -msgstr "her çalışma ağacına özel bir yapılandırma dosyası kullan" - -#: builtin/config.c:130 -msgid "use given config file" -msgstr "verilen yapılandırma dosyasını kullan" - -#: builtin/config.c:131 -msgid "blob-id" -msgstr "ikili nesne numarası" - -#: builtin/config.c:131 -msgid "read config from given blob object" -msgstr "verilen ikili nesneden yapılandırmayı oku" - -#: builtin/config.c:132 -msgid "Action" -msgstr "Eylem" - -#: builtin/config.c:133 -msgid "get value: name [value-regex]" -msgstr "değer al: ad [düzenli ifade değeri]" - -#: builtin/config.c:134 -msgid "get all values: key [value-regex]" -msgstr "tüm değerleri al: anahtar [düzenli ifade değeri]" - -#: builtin/config.c:135 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "" -"düzenli ifade için değerleri al: düzenli ifade adı [düzenli ifade değeri]" - -#: builtin/config.c:136 -msgid "get value specific for the URL: section[.var] URL" -msgstr "URL için özel olan değeri al: bölüm[.var] URL" - -#: builtin/config.c:137 -msgid "replace all matching variables: name value [value_regex]" -msgstr "tüm eşleşen değişkenleri değiştir: ad değer [düzenli ifade değeri]" - -#: builtin/config.c:138 -msgid "add a new variable: name value" -msgstr "yeni bir değişken ekle: ad değer" - -#: builtin/config.c:139 -msgid "remove a variable: name [value-regex]" -msgstr "bir değişken kaldır: ad [düzenli ifade değeri]" - -#: builtin/config.c:140 -msgid "remove all matches: name [value-regex]" -msgstr "tüm eşleşmeleri kaldır: ad [düzenli ifade değeri]" - -#: builtin/config.c:141 -msgid "rename section: old-name new-name" -msgstr "bölümü yeniden adlandır: eski_ad yeni_ad" - -#: builtin/config.c:142 -msgid "remove a section: name" -msgstr "bir bölümü kaldır: ad" - -#: builtin/config.c:143 -msgid "list all" -msgstr "tümünü listele" - -#: builtin/config.c:144 -msgid "open an editor" -msgstr "bir düzenleyici aç" - -#: builtin/config.c:145 -msgid "find the color configured: slot [default]" -msgstr "yapılandırılan rengi bul: yuva [öntanımlı]" - -#: builtin/config.c:146 -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "renk ayarını bul: yuva [stdout tty]" - -#: builtin/config.c:147 -msgid "Type" -msgstr "Tür" - -#: builtin/config.c:148 builtin/env--helper.c:38 -msgid "value is given this type" -msgstr "değer bu türde verildi" - -#: builtin/config.c:149 -msgid "value is \"true\" or \"false\"" -msgstr "değer \"true\" (doğru) veya \"false\" (yanlış)" - -#: builtin/config.c:150 -msgid "value is decimal number" -msgstr "değer ondalık sayı" - -#: builtin/config.c:151 -msgid "value is --bool or --int" -msgstr "değer --bool veya --int" - -#: builtin/config.c:152 -msgid "value is a path (file or directory name)" -msgstr "değer bir yol (dosya veya dizin adı)" - -#: builtin/config.c:153 -msgid "value is an expiry date" -msgstr "değer bir son kullanım tarihi" - -#: builtin/config.c:154 -msgid "Other" -msgstr "Diğer" - -#: builtin/config.c:155 -msgid "terminate values with NUL byte" -msgstr "değerleri NUL baytı ile sonlandır" - -#: builtin/config.c:156 -msgid "show variable names only" -msgstr "yalnızca değişken adlarını göster" - -#: builtin/config.c:157 -msgid "respect include directives on lookup" -msgstr "arama sırasında içerme yönergelerine uy" - -#: builtin/config.c:158 -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ı)" - -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"yapılandırmanın kapsamını göster (çalışma ağacı, yerel, global, sistem, " -"komut)" - -#: builtin/config.c:160 builtin/env--helper.c:40 -msgid "value" -msgstr "değer" - -#: builtin/config.c:160 -msgid "with --get, use default value when missing entry" -msgstr "--get ile girdi verilmemişse öntanımlı değeri kullan" - -#: builtin/config.c:174 -#, c-format -msgid "wrong number of arguments, should be %d" -msgstr "yanlış değişken sayısı, %d olmalı" - -#: builtin/config.c:176 -#, c-format -msgid "wrong number of arguments, should be from %d to %d" -msgstr "yanlış değişken sayısı, %d ile %d arasında olmalı" - -#: builtin/config.c:324 -#, c-format -msgid "invalid key pattern: %s" -msgstr "geçersiz anahtar dizgisi: %s" - -#: builtin/config.c:360 -#, c-format -msgid "failed to format default config value: %s" -msgstr "öntanımlı yapılandırma değeri biçimlendirilemedi: %s" - -#: builtin/config.c:417 -#, c-format -msgid "cannot parse color '%s'" -msgstr "renk ayrıştırılamıyor: '%s'" - -#: builtin/config.c:459 -msgid "unable to parse default color value" -msgstr "öntanımlı renk değeri ayrıştırılamıyor" - -#: builtin/config.c:512 builtin/config.c:768 -msgid "not in a git directory" -msgstr "bir git dizininde değil" - -#: builtin/config.c:515 -msgid "writing to stdin is not supported" -msgstr "stdin'e yazma desteklenmiyor" - -#: builtin/config.c:518 -msgid "writing config blobs is not supported" -msgstr "yapılandırma ikili nesneleri yazımı desteklenmiyor" - -#: builtin/config.c:603 -#, c-format -msgid "" -"# This is Git's per-user configuration file.\n" -"[user]\n" -"# Please adapt and uncomment the following lines:\n" -"#\tname = %s\n" -"#\temail = %s\n" -msgstr "" -"# Bu Git'in kullanıcıya özel yapılandırma dosyasıdır.\n" -"[kullanıcı]\n" -"Lütfen aşağıdaki satırları yorumdan çıkarın ve özelleştirin:\n" -"#\tad = %s\n" -"#\te-posta = %s\n" - -#: builtin/config.c:627 -msgid "only one config file at a time" -msgstr "bir kerede yalnızca bir yapılandırma dosyası" - -#: builtin/config.c:632 -msgid "--local can only be used inside a git repository" -msgstr "--local yalnızca bir git deposu içinde kullanılabilir" - -#: builtin/config.c:635 -msgid "--blob can only be used inside a git repository" -msgstr "--blob yalnızca bir git deposu içinde kullanılabilir" - -#: builtin/config.c:655 -msgid "$HOME not set" -msgstr "$HOME ayarlanmamış" - -#: builtin/config.c:679 -msgid "" -"--worktree cannot be used with multiple working trees unless the config\n" -"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" -"section in \"git help worktree\" for details" -msgstr "" -"--worktree, worktreeConfig yapılandırma genişletmesi etkinleştirilmediği\n" -"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." - -#: builtin/config.c:714 -msgid "--get-color and variable type are incoherent" -msgstr "--get-color ve değişken türü tutarsız" - -#: builtin/config.c:719 -msgid "only one action at a time" -msgstr "bir kerede yalnızca bir eylem" - -#: builtin/config.c:732 -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only yalnızca şunlara uygulanabilir: --list, --get-regexp" - -#: builtin/config.c:738 -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" - -#: builtin/config.c:744 -msgid "--default is only applicable to --get" -msgstr "--default yalnızca şuna uygulanabilir: --get" - -#: builtin/config.c:757 -#, c-format -msgid "unable to read config file '%s'" -msgstr "'%s' yapılandırma dosyası okunamıyor" - -#: builtin/config.c:760 -msgid "error processing config file(s)" -msgstr "yapılandırma dosyaları işlenirken hata" - -#: builtin/config.c:770 -msgid "editing stdin is not supported" -msgstr "stdin'i düzenleme desteklenmiyor" - -#: builtin/config.c:772 -msgid "editing blobs is not supported" -msgstr "ikili nesneleri düzenleme desteklenmiyor" - -#: builtin/config.c:786 -#, c-format -msgid "cannot create configuration file %s" -msgstr "%s yapılandırma dosyası oluşturulamıyor" - -#: builtin/config.c:799 -#, c-format -msgid "" -"cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." -msgstr "" -"Tek bir değer ile birden çok değerin üzerine yazılamıyor.\n" -" %s değerini değiştirmek için bir düzenli ifade, --add veya --replace-" -"all kullanın." - -#: builtin/config.c:873 builtin/config.c:884 -#, c-format -msgid "no such section: %s" -msgstr "böyle bir bölüm yok: %s" - -#: builtin/count-objects.c:90 -msgid "git count-objects [-v] [-H | --human-readable]" -msgstr "git count-objects [-v] [-H | --human-readable]" - -#: builtin/count-objects.c:100 -msgid "print sizes in human readable format" -msgstr "yazdırma boyutları kişi tarafından okunabilir biçimde" - -#: builtin/describe.c:26 -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<seçenekler>] [<gönderimsi>...]" - -#: builtin/describe.c:27 -msgid "git describe [<options>] --dirty" -msgstr "git describe [<seçenekler>] --dirty" - -#: builtin/describe.c:62 -msgid "head" -msgstr "dal ucu" - -#: builtin/describe.c:62 -msgid "lightweight" -msgstr "hafif" - -#: builtin/describe.c:62 -msgid "annotated" -msgstr "ek açıklamalı" - -#: builtin/describe.c:275 -#, c-format -msgid "annotated tag %s not available" -msgstr "%s ek açıklamalı etiketi mevcut değil" - -#: builtin/describe.c:279 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "%s ek açıklamalı etiketinde gömülü ad yok" - -#: builtin/describe.c:281 -#, c-format -msgid "tag '%s' is really '%s' here" -msgstr "'%s' etiketi gerçekte burada '%s'" - -#: builtin/describe.c:325 -#, c-format -msgid "no tag exactly matches '%s'" -msgstr "'%s' ile herhangi bir etiket tam olarak eşleşmiyor" - -#: builtin/describe.c:327 -#, c-format -msgid "No exact match on refs or tags, searching to describe\n" -msgstr "" -"Kesin olarak eşleşen başvuru veya etiket yok, betimlemek için aranıyor\n" - -#: builtin/describe.c:394 -#, c-format -msgid "finished search at %s\n" -msgstr "arama şurada bitirildi: %s\n" - -#: builtin/describe.c:421 -#, c-format -msgid "" -"No annotated tags can describe '%s'.\n" -"However, there were unannotated tags: try --tags." -msgstr "" -"Hiçbir ek açıklamalı etiket şunu betimleyemiyor: '%s'.\n" -"Bunun yanında ek açıklaması olmayan etiketler vardı, --tags deneyin." - -#: builtin/describe.c:425 -#, c-format -msgid "" -"No tags can describe '%s'.\n" -"Try --always, or create some tags." -msgstr "" -"Şunu hiçbir etiket betimleyemez: '%s'.\n" -"--always deneyin veya birkaç etiket oluşturun." - -#: builtin/describe.c:455 -#, c-format -msgid "traversed %lu commits\n" -msgstr "%lu gönderi katedildi\n" - -#: builtin/describe.c:458 -#, c-format -msgid "" -"more than %i tags found; listed %i most recent\n" -"gave up search at %s\n" -msgstr "" -"%i etiketten fazla etiket bulundu; en son %i listelendi\n" -"şu konumda arama bırakıldı: %s\n" - -#: builtin/describe.c:526 -#, c-format -msgid "describe %s\n" -msgstr "şunu tanımla: %s\n" - -#: builtin/describe.c:529 -#, c-format -msgid "Not a valid object name %s" -msgstr "%s geçerli bir nesne adı değil" - -#: builtin/describe.c:537 -#, c-format -msgid "%s is neither a commit nor blob" -msgstr "%s ne bir gönderi ne de ikili nesne" - -#: builtin/describe.c:551 -msgid "find the tag that comes after the commit" -msgstr "gönderinin ardından gelen etiketi bul" - -#: builtin/describe.c:552 -msgid "debug search strategy on stderr" -msgstr "stderr'deki arama stratejisini ayıkla" - -#: builtin/describe.c:553 -msgid "use any ref" -msgstr "herhangi bir başvuruyu kullan" - -#: builtin/describe.c:554 -msgid "use any tag, even unannotated" -msgstr "herhangi bir etiketi kullan, ek açıklaması olmasa bile" - -#: builtin/describe.c:555 -msgid "always use long format" -msgstr "her zaman uzun biçimi kullan" - -#: builtin/describe.c:556 -msgid "only follow first parent" -msgstr "yalnızca ilk üst ögeyi izle" - -#: builtin/describe.c:559 -msgid "only output exact matches" -msgstr "yalnızca kesin eşleşmeleri çıktı ver" - -#: builtin/describe.c:561 -msgid "consider <n> most recent tags (default: 10)" -msgstr "<n> en son etiketi dikkate al (öntanımlı: 10)" - -#: builtin/describe.c:563 -msgid "only consider tags matching <pattern>" -msgstr "yalnızca <dizgi> ile eşleşen etiketleri dikkate al" - -#: builtin/describe.c:565 -msgid "do not consider tags matching <pattern>" -msgstr "<dizgi> ile eşleşen etiketleri dikkate alma" - -#: builtin/describe.c:567 builtin/name-rev.c:535 -msgid "show abbreviated commit object as fallback" -msgstr "kısaltılmış gönderi nesnesini geri çekilinecek nesne olarak göster" - -#: builtin/describe.c:568 builtin/describe.c:571 -msgid "mark" -msgstr "im" - -#: builtin/describe.c:569 -msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "<im>'i kirli çalışma ağacına iliştir (öntanımlı: \"-dirty\")" - -#: builtin/describe.c:572 -msgid "append <mark> on broken working tree (default: \"-broken\")" -msgstr "<im>'i bozuk çalışma ağacına iliştir (öntanımlı: \"-broken\")" - -#: builtin/describe.c:590 -msgid "--long is incompatible with --abbrev=0" -msgstr "--long, --abbrev=0 ile uyumsuz" - -#: builtin/describe.c:619 -msgid "No names found, cannot describe anything." -msgstr "Hiçbir ad bulunamadı, hiçbir şey betimlenemiyor." - -#: builtin/describe.c:670 -msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty, gönderimsilerle uyumsuz" - -#: builtin/describe.c:672 -msgid "--broken is incompatible with commit-ishes" -msgstr "--broken, gönderimsilerle uyumsuz" - -#: builtin/diff.c:84 -#, c-format -msgid "'%s': not a regular file or symlink" -msgstr "'%s': Sıradan bir dosya veya sembolik bağ değil" - -#: builtin/diff.c:235 -#, c-format -msgid "invalid option: %s" -msgstr "geçersiz seçenek: %s" - -#: builtin/diff.c:350 -msgid "Not a git repository" -msgstr "Bir git deposu değil" - -#: builtin/diff.c:394 -#, c-format -msgid "invalid object '%s' given." -msgstr "geçersiz nesne '%s' verildi" - -#: builtin/diff.c:403 -#, c-format -msgid "more than two blobs given: '%s'" -msgstr "ikiden çok ikili nesne verildi: '%s'" - -#: builtin/diff.c:408 -#, c-format -msgid "unhandled object '%s' given." -msgstr "ele alınmayan nesne '%s' verildi" - -#: builtin/difftool.c:30 -msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" -msgstr "git difftool [<seçenekler>] [<gönderi> [<gönderi>]] [--] [<yol>...]" - -#: builtin/difftool.c:260 -#, c-format -msgid "failed: %d" -msgstr "başarısız: %d" - -#: builtin/difftool.c:302 -#, c-format -msgid "could not read symlink %s" -msgstr "%s sembolik bağı okunamadı" - -#: builtin/difftool.c:304 -#, c-format -msgid "could not read symlink file %s" -msgstr "%s sembolik bağ dosyası okunamadı" - -#: builtin/difftool.c:312 -#, c-format -msgid "could not read object %s for symlink %s" -msgstr "%s nesnesi %s sembolik bağı için okunamadı" - -#: builtin/difftool.c:413 -msgid "" -"combined diff formats('-c' and '--cc') are not supported in\n" -"directory diff mode('-d' and '--dir-diff')." -msgstr "" -"Birleştirilmiş diff biçimleri (-c ve --cc) dizin diff kipinde\n" -"(-d ve --dir-diff) desteklenmiyor." - -#: builtin/difftool.c:634 -#, c-format -msgid "both files modified: '%s' and '%s'." -msgstr "Her iki dosya da değiştirildi: '%s' ve '%s'." - -#: builtin/difftool.c:636 -msgid "working tree file has been left." -msgstr "Çalışma ağacı dosyası bırakıldı." - -#: builtin/difftool.c:647 -#, c-format -msgid "temporary files exist in '%s'." -msgstr "'%s' konumunda geçici dosyalar var." - -#: builtin/difftool.c:648 -msgid "you may want to cleanup or recover these." -msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz." - -#: builtin/difftool.c:697 -msgid "use `diff.guitool` instead of `diff.tool`" -msgstr "'diff.tool' yerine 'diff.guitool' kullan" - -#: builtin/difftool.c:699 -msgid "perform a full-directory diff" -msgstr "bir tam dizin diff'i gerçekleştir" - -#: builtin/difftool.c:701 -msgid "do not prompt before launching a diff tool" -msgstr "bir diff aracı çalıştırmadan önce sorma" - -#: builtin/difftool.c:706 -msgid "use symlinks in dir-diff mode" -msgstr "dir-diff kipinde sembolik bağlar kullan" - -#: builtin/difftool.c:707 -msgid "tool" -msgstr "araç" - -#: builtin/difftool.c:708 -msgid "use the specified diff tool" -msgstr "belirtilen diff aracını kullan" - -#: builtin/difftool.c:710 -msgid "print a list of diff tools that may be used with `--tool`" -msgstr "'-tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar" - -#: builtin/difftool.c:713 -msgid "" -"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " -"code" -msgstr "" -"çalıştırılan bir diff aracı sıfır olmayan bir çıkış kodu döndürdüğünde 'git-" -"difftool'un çıkış yapmasını sağla" - -#: builtin/difftool.c:716 -msgid "specify a custom command for viewing diffs" -msgstr "diff'leri görüntülemek için özel bir komut belirle" - -#: builtin/difftool.c:717 -msgid "passed to `diff`" -msgstr "'diff'e aktarıldı" - -#: builtin/difftool.c:732 -msgid "difftool requires worktree or --no-index" -msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor" - -#: builtin/difftool.c:739 -msgid "--dir-diff is incompatible with --no-index" -msgstr "-dir-diff, --no-index ile uyumsuz" - -#: builtin/difftool.c:742 -msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz" - -#: builtin/difftool.c:750 -msgid "no <tool> given for --tool=<tool>" -msgstr "--tool=<araç> için bir <araç> verilmedi" - -#: builtin/difftool.c:757 -msgid "no <cmd> given for --extcmd=<cmd>" -msgstr "--extcmd=<komut> için bir <komut> verilmedi" - -#: builtin/env--helper.c:6 -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <seçenekler> <ortam-dğşkn>" - -#: builtin/env--helper.c:37 builtin/hash-object.c:98 -msgid "type" -msgstr "tür" - -#: builtin/env--helper.c:41 -msgid "default for git_env_*(...) to fall back on" -msgstr "git_env_*(...)'ın geri çekileceği öntanımlı" - -#: builtin/env--helper.c:43 -msgid "be quiet only use git_env_*() value as exit code" -msgstr "sessiz ol, yalnızca git_env*() değerini çıkış kodu olarak kullan" - -#: builtin/env--helper.c:62 -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" -"--default seçeneği, --type=bool ile birlikte bir Boole değeri bekliyor, '%s' " -"değil" - -#: builtin/env--helper.c:77 -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" -msgstr "" -"--default seçeneği, --type=ulong ile birlikte bir imzalanmamış uzun değer " -"bekliyor, '%s' değil" - -#: builtin/fast-export.c:29 -msgid "git fast-export [rev-list-opts]" -msgstr "git fast-export [rev-list-opts]" - -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "" -"Hata: İç içe geçmiş etiketler --mark-tags belirtilmediği sürece dışa " -"aktarılamaz." - -#: builtin/fast-export.c:1152 -msgid "show progress after <n> objects" -msgstr "<n> nesneden sonra ilerlemeyi göster" - -#: builtin/fast-export.c:1154 -msgid "select handling of signed tags" -msgstr "imzalanan etiketlerin nasıl işleneceğini seçin" - -#: builtin/fast-export.c:1157 -msgid "select handling of tags that tag filtered objects" -msgstr "nesnelerce süzülen etiketlerin nasıl işleneceğini seçin" - -#: builtin/fast-export.c:1160 -msgid "select handling of commit messages in an alternate encoding" -msgstr "başka bir kodlamaya iye gönderi iletilerinin nasıl işleneceğini seçin" - -#: builtin/fast-export.c:1163 -msgid "Dump marks to this file" -msgstr "imleri bu dosyaya boşalt" - -#: builtin/fast-export.c:1165 -msgid "Import marks from this file" -msgstr "imleri bu dosyadan içe aktar" - -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "eğer varsa bu dosyadan imleri içe aktar" - -#: builtin/fast-export.c:1171 -msgid "Fake a tagger when tags lack one" -msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran" - -#: builtin/fast-export.c:1173 -msgid "Output full tree for each commit" -msgstr "her gönderi için tüm ağacın çıktısını ver" - -#: builtin/fast-export.c:1175 -msgid "Use the done feature to terminate the stream" -msgstr "akışı sonlandırmak için 'done' özelliğini kullan" - -#: builtin/fast-export.c:1176 -msgid "Skip output of blob data" -msgstr "ikili nesne verisi çıktısını atla" - -#: builtin/fast-export.c:1177 builtin/log.c:1705 -msgid "refspec" -msgstr "başvuru belirteci" - -#: builtin/fast-export.c:1178 -msgid "Apply refspec to exported refs" -msgstr "başvuru belirtecini dışa aktarılan başvurulara aktar" - -#: builtin/fast-export.c:1179 -msgid "anonymize output" -msgstr "çıktı kimliğini gizle" - -#: builtin/fast-export.c:1181 -msgid "Reference parents which are not in fast-export stream by object id" -msgstr "'fast-export' akışında olmayan üst ögelere nesne numarası ile başvur" - -#: builtin/fast-export.c:1183 -msgid "Show original object ids of blobs/commits" -msgstr "ikili nesnelerin/gönderilerin orijinal nesne numaralarını göster" - -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "etiketleri im numaralarıyla adlandır" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarılamadı" - -#: builtin/fetch.c:34 -msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "git fetch [<seçenekler>] [<depo> [<bşvr-blrtç>...]]" - -#: builtin/fetch.c:35 -msgid "git fetch [<options>] <group>" -msgstr "git fetch [<seçenekler>] <grup>" - -#: builtin/fetch.c:36 -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]" - -#: builtin/fetch.c:37 -msgid "git fetch --all [<options>]" -msgstr "git fetch --all [<seçenekler>]" - -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel negatif olamaz" - -#: builtin/fetch.c:139 builtin/pull.c:184 -msgid "fetch from all remotes" -msgstr "tüm uzak konumlardan getir" - -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "git pull/fetch için üstkaynak ayarla" - -#: builtin/fetch.c:143 builtin/pull.c:187 -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir" - -#: builtin/fetch.c:145 builtin/pull.c:190 -msgid "path to upload pack on remote end" -msgstr "uzak uçtaki yükleme paketine olan yol" - -#: builtin/fetch.c:146 -msgid "force overwrite of local reference" -msgstr "yerel başvurunun üzerine zorla yaz" - -#: builtin/fetch.c:148 -msgid "fetch from multiple remotes" -msgstr "birden çok uzak konumdan getir" - -#: builtin/fetch.c:150 builtin/pull.c:194 -msgid "fetch all tags and associated objects" -msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir" - -#: builtin/fetch.c:152 -msgid "do not fetch all tags (--no-tags)" -msgstr "tüm etiketleri getirme (--no-tags)" - -#: builtin/fetch.c:154 -msgid "number of submodules fetched in parallel" -msgstr "paralelde getirilen altmodüllerin sayısı" - -#: builtin/fetch.c:156 builtin/pull.c:197 -msgid "prune remote-tracking branches no longer on remote" -msgstr "artık uzak konumda olmayan uzak izleme dallarını buda" - -#: builtin/fetch.c:158 -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "" -"artık uzak konumda olmayan yerel etiketleri buda ve değiştirilen etiketleri " -"güncelle" - -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 -msgid "on-demand" -msgstr "istek üzerine" - -#: builtin/fetch.c:160 -msgid "control recursive fetching of submodules" -msgstr "altmodüllerin özyineli getirilmesini denetle" - -#: builtin/fetch.c:164 builtin/pull.c:205 -msgid "keep downloaded pack" -msgstr "indirilen paketi tut" - -#: builtin/fetch.c:166 -msgid "allow updating of HEAD ref" -msgstr "HEAD başvurusunun güncellenmesine izin ver" - -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 -msgid "deepen history of shallow clone" -msgstr "sığ klonun geçmişini derinleştir" - -#: builtin/fetch.c:171 -msgid "deepen history of shallow repository based on time" -msgstr "zamana bağlı olarak sığ deponun geçmişini derinleştir" - -#: builtin/fetch.c:177 builtin/pull.c:211 -msgid "convert to a complete repository" -msgstr "tam bir depoya dönüştür" - -#: builtin/fetch.c:180 -msgid "prepend this to submodule path output" -msgstr "bunu altmodül yol çıktısının başına ekle" - -#: builtin/fetch.c:183 -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "" -"altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma " -"dosyalarından daha az önceliğe iye)" - -#: builtin/fetch.c:187 builtin/pull.c:214 -msgid "accept refs that update .git/shallow" -msgstr ".git/shallow'u güncelleyen başvuruları kabul et" - -#: builtin/fetch.c:188 builtin/pull.c:216 -msgid "refmap" -msgstr "ilgili başvuru" - -#: builtin/fetch.c:189 builtin/pull.c:217 -msgid "specify fetch refmap" -msgstr "getirme ile ilgili başvuruları belirt" - -#: builtin/fetch.c:196 -msgid "report that we have only objects reachable from this object" -msgstr "yalnızca bu nesneden ulaşılabilir nesnelerimiz olduğunu bildir" - -#: builtin/fetch.c:199 -msgid "run 'gc --auto' after fetching" -msgstr "getirme sonrasında 'gc --auto' çalıştır" - -#: builtin/fetch.c:201 builtin/pull.c:226 -msgid "check for forced-updates on all updated branches" -msgstr "tüm güncellenmiş dalları zorlanmış güncellemeler için denetle" - -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "getirdikten sonra gönderi grafiğini yaz" - -#: builtin/fetch.c:513 -msgid "Couldn't find remote ref HEAD" -msgstr "Uzak HEAD başvurusu bulunamadı" - -#: builtin/fetch.c:653 -#, c-format -msgid "configuration fetch.output contains invalid value %s" -msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s" - -#: builtin/fetch.c:751 -#, c-format -msgid "object %s not found" -msgstr "%s nesnesi bulunamadı" - -#: builtin/fetch.c:755 -msgid "[up to date]" -msgstr "[güncel]" - -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 -msgid "[rejected]" -msgstr "[reddedildi]" - -#: builtin/fetch.c:769 -msgid "can't fetch in current branch" -msgstr "geçerli dalda getirme yapılamıyor" - -#: builtin/fetch.c:779 -msgid "[tag update]" -msgstr "[etiket güncellemesi]" - -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 -msgid "unable to update local ref" -msgstr "yerel başvuru güncellenemiyor" - -#: builtin/fetch.c:784 -msgid "would clobber existing tag" -msgstr "var olan etiketi değiştirecektir" - -#: builtin/fetch.c:806 -msgid "[new tag]" -msgstr "[yeni etiket]" - -#: builtin/fetch.c:809 -msgid "[new branch]" -msgstr "[yeni dal]" - -#: builtin/fetch.c:812 -msgid "[new ref]" -msgstr "[yeni başvuru]" - -#: builtin/fetch.c:851 -msgid "forced update" -msgstr "zorlanmış güncelleme" - -#: builtin/fetch.c:856 -msgid "non-fast-forward" -msgstr "ileri sarım değil" - -#: builtin/fetch.c:877 -msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." -msgstr "" -"Getirme normalde hangi dallarda zorla güncelleme yapıldığını belirtir,\n" -"ancak bu denetleme kapatılmış. Yeniden açmak için --show-forced-updates\n" -"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın." - -#: builtin/fetch.c:881 -#, c-format -msgid "" -"It took %.2f seconds to check forced updates. You can use\n" -"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " -"false'\n" -" to avoid this check.\n" -msgstr "" -"Zorla güncellemeleri denetleme %.2f saniye sürdü. --no-show-forced-updates\n" -"kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n" -"bu denetlemeden kaçınabilirsiniz.\n" - -#: builtin/fetch.c:920 -#, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s tüm gerekli nesneleri göndermedi\n" - -#: builtin/fetch.c:941 -#, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "%s reddedilmeli, çünkü sığ köklerin güncellenmesine izin verilmiyor" - -#: builtin/fetch.c:1026 builtin/fetch.c:1164 -#, c-format -msgid "From %.*s\n" -msgstr "Şuradan: %.*s\n" - -#: builtin/fetch.c:1037 -#, c-format -msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" -msgstr "" -"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n" -"kullanarak eski ve çakışan dalları kaldırmayı deneyin" - -#: builtin/fetch.c:1134 -#, c-format -msgid " (%s will become dangling)" -msgstr " (%s sarkacak)" - -#: builtin/fetch.c:1135 -#, c-format -msgid " (%s has become dangling)" -msgstr " (%s sarkmaya başladı)" - -#: builtin/fetch.c:1167 -msgid "[deleted]" -msgstr "[silindi]" - -#: builtin/fetch.c:1168 builtin/remote.c:1112 -msgid "(none)" -msgstr "(yok)" - -#: builtin/fetch.c:1191 -#, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "Çıplak olmayan deponun geçerli %s dalına getirme reddediliyor" - -#: builtin/fetch.c:1210 -#, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil" - -#: builtin/fetch.c:1213 -#, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "\"%s\" seçeneği %s için yok sayılıyor\n" - -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "bilinmeyen dal türü" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"Kaynak dal bulunamadı.\n" -"--set-upstream-option ile tam olarak bir dal belirtmeniz gerekiyor." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 -#, c-format -msgid "Fetching %s\n" -msgstr "%s getiriliyor\n" - -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 -#, c-format -msgid "Could not fetch %s" -msgstr "%s getirilemedi" - -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "'%s' getirilemedi (çıkış kodu: %d)\n" - -#: builtin/fetch.c:1693 -msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." -msgstr "" -"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n" -"alınacağı bir URL veya uzak konum adı belirtin." - -#: builtin/fetch.c:1730 -msgid "You need to specify a tag name." -msgstr "Bir etiket adı belirtmeniz gerekiyor." - -#: builtin/fetch.c:1780 -msgid "Negative depth in --deepen is not supported" -msgstr "--deepen için negatif derinlik desteklenmiyor" - -#: builtin/fetch.c:1782 -msgid "--deepen and --depth are mutually exclusive" -msgstr "--deepen ve --depth birlikte kullanılamaz" - -#: builtin/fetch.c:1787 -msgid "--depth and --unshallow cannot be used together" -msgstr "--depth ve --unshallow birlikte kullanılamaz" - -#: builtin/fetch.c:1789 -msgid "--unshallow on a complete repository does not make sense" -msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor" - -#: builtin/fetch.c:1805 -msgid "fetch --all does not take a repository argument" -msgstr "fetch --all bir depo değişkeni almıyor" - -#: builtin/fetch.c:1807 -msgid "fetch --all does not make sense with refspecs" -msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor" - -#: builtin/fetch.c:1816 -#, c-format -msgid "No such remote or remote group: %s" -msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s" - -#: builtin/fetch.c:1823 -msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "" -"Bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor" - -#: builtin/fetch.c:1841 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialclone" -msgstr "" -"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum " -"ile kullanılabilir." - -#: builtin/fmt-merge-msg.c:18 -msgid "" -"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" -msgstr "" -"git fmt-merge-msg [-m <ileti>] [--log[=<n>] | --no-log] [--file <dosya>]" - -#: builtin/fmt-merge-msg.c:671 -msgid "populate log with at most <n> entries from shortlog" -msgstr "günlüğü kısa günlükten en az <n> girdi ile doldur" - -#: builtin/fmt-merge-msg.c:674 -msgid "alias for --log (deprecated)" -msgstr "--log için arma (kullanım dışı)" - -#: builtin/fmt-merge-msg.c:677 -msgid "text" -msgstr "metin" - -#: builtin/fmt-merge-msg.c:678 -msgid "use <text> as start of message" -msgstr "iletinin başlangıcı olarak <metin> kullan" - -#: builtin/fmt-merge-msg.c:679 -msgid "file to read from" -msgstr "okunacak dosya" - -#: builtin/for-each-ref.c:10 -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<seçenekler>] [<dizgi>]" - -#: builtin/for-each-ref.c:11 -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <nesne>]" - -#: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<gönderi>]]" - -#: builtin/for-each-ref.c:13 -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<gönderi>]] [--no-contains [<gönderi>]]" - -#: builtin/for-each-ref.c:28 -msgid "quote placeholders suitably for shells" -msgstr "yer tutucuları kabuğun anlayabileceği biçimde tırnak içine al" - -#: builtin/for-each-ref.c:30 -msgid "quote placeholders suitably for perl" -msgstr "yer tutucuları perl'in anlayabileceği biçimde tırnak içine al" - -#: builtin/for-each-ref.c:32 -msgid "quote placeholders suitably for python" -msgstr "yer tutucuları python'un anlayabileceği biçimde tırnak içine al" - -#: builtin/for-each-ref.c:34 -msgid "quote placeholders suitably for Tcl" -msgstr "yer tutucuları Tcl'nin anlayabileceği biçimde tırnak içine al" - -#: builtin/for-each-ref.c:37 -msgid "show only <n> matched refs" -msgstr "yalnızca <n> eşleşen başvuruyu göster" - -#: builtin/for-each-ref.c:39 builtin/tag.c:439 -msgid "respect format colors" -msgstr "biçim renklerine uy" - -#: builtin/for-each-ref.c:42 -msgid "print only refs which points at the given object" -msgstr "yalnızca verilen nesneye işaret eden başvuruları yazdır" - -#: builtin/for-each-ref.c:44 -msgid "print only refs that are merged" -msgstr "yalnızca birleştirilen başvuruları yazdır" - -#: builtin/for-each-ref.c:45 -msgid "print only refs that are not merged" -msgstr "yalnızca birleştirilmemiş başvuruları yazdır" - -#: builtin/for-each-ref.c:46 -msgid "print only refs which contain the commit" -msgstr "yalnızca gönderiyi içeren başvuruları yazdır" - -#: builtin/for-each-ref.c:47 -msgid "print only refs which don't contain the commit" -msgstr "yalnızca gönderiyi içermeyen başvuruları yazdır" - -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 -msgid "unknown" -msgstr "bilinmeyen" - -#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 -#, c-format -msgid "error in %s %s: %s" -msgstr "%s %s içinde hata: %s" - -#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 -#, c-format -msgid "warning in %s %s: %s" -msgstr "%s %s içinde uyarı: %s" - -#: builtin/fsck.c:143 builtin/fsck.c:146 -#, c-format -msgid "broken link from %7s %s" -msgstr "şuradan kırık bağ: %7s %s" - -#: builtin/fsck.c:155 -msgid "wrong object type in link" -msgstr "bağda yanlış nesne türü" - -#: builtin/fsck.c:171 -#, c-format -msgid "" -"broken link from %7s %s\n" -" to %7s %s" -msgstr "" -"şuradan kırık bağ: %7s %s\n" -" şuraya: %7s %s" - -#: builtin/fsck.c:282 -#, c-format -msgid "missing %s %s" -msgstr "eksik %s %s" - -#: builtin/fsck.c:309 -#, c-format -msgid "unreachable %s %s" -msgstr "ulaşılamayan %s %s" - -#: builtin/fsck.c:329 -#, c-format -msgid "dangling %s %s" -msgstr "sarkan %s %s" - -#: builtin/fsck.c:339 -msgid "could not create lost-found" -msgstr "lost-found oluşturulamadı" - -#: builtin/fsck.c:350 -#, c-format -msgid "could not finish '%s'" -msgstr "'%s' bitirilemedi" - -#: builtin/fsck.c:367 -#, c-format -msgid "Checking %s" -msgstr "%s denetleniyor" - -#: builtin/fsck.c:405 -#, c-format -msgid "Checking connectivity (%d objects)" -msgstr "Bağlanabilirlik denetleniyor (%d nesne)" - -#: builtin/fsck.c:424 -#, c-format -msgid "Checking %s %s" -msgstr "%s %s denetleniyor" - -#: builtin/fsck.c:429 -msgid "broken links" -msgstr "kırık bağlar" - -#: builtin/fsck.c:438 -#, c-format -msgid "root %s" -msgstr "kök %s" - -#: builtin/fsck.c:446 -#, c-format -msgid "tagged %s %s (%s) in %s" -msgstr "%s %s (%s) şurada etiketlendi: %s" - -#: builtin/fsck.c:475 -#, c-format -msgid "%s: object corrupt or missing" -msgstr "%s: nesne hasar görmüş veya kayıp" - -#: builtin/fsck.c:500 -#, c-format -msgid "%s: invalid reflog entry %s" -msgstr "%s: geçersiz başvuru günlüğü girdisi %s" - -#: builtin/fsck.c:514 -#, c-format -msgid "Checking reflog %s->%s" -msgstr "Başvuru günlüğü denetleniyor: %s->%s" - -#: builtin/fsck.c:548 -#, c-format -msgid "%s: invalid sha1 pointer %s" -msgstr "%s: geçersiz sha1 işaretçisi %s" - -#: builtin/fsck.c:555 -#, c-format -msgid "%s: not a commit" -msgstr "%s: bir gönderi değil" - -#: builtin/fsck.c:609 -msgid "notice: No default references" -msgstr "Uyarı: Öntanımlı başvurular yok" - -#: builtin/fsck.c:624 -#, c-format -msgid "%s: object corrupt or missing: %s" -msgstr "%s: nesne hasar görmüş veya kayıp: %s" - -#: builtin/fsck.c:637 -#, c-format -msgid "%s: object could not be parsed: %s" -msgstr "%s: nesne ayrıştırılamadı: %s" - -#: builtin/fsck.c:657 -#, c-format -msgid "bad sha1 file: %s" -msgstr "hatalı sha1 dosyası: %s" - -#: builtin/fsck.c:672 -msgid "Checking object directory" -msgstr "Nesne dizini denetleniyor" - -#: builtin/fsck.c:675 -msgid "Checking object directories" -msgstr "Nesne dizinleri denetleniyor" - -#: builtin/fsck.c:690 -#, c-format -msgid "Checking %s link" -msgstr "%s bağ denetleniyor" - -#: builtin/fsck.c:695 builtin/index-pack.c:843 -#, c-format -msgid "invalid %s" -msgstr "geçersiz %s" - -#: builtin/fsck.c:702 -#, c-format -msgid "%s points to something strange (%s)" -msgstr "%s garip bir şeye işaret ediyor (%s)" - -#: builtin/fsck.c:708 -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s: ayrık HEAD bir şeye işaret etmiyor" - -#: builtin/fsck.c:712 -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)" - -#: builtin/fsck.c:724 -msgid "Checking cache tree" -msgstr "Önbellek ağacı denetleniyor" - -#: builtin/fsck.c:729 -#, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi" - -#: builtin/fsck.c:738 -msgid "non-tree in cache-tree" -msgstr "cache-tree içinde ağaç olmayan öge" - -#: builtin/fsck.c:769 -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<seçenekler>] [<nesne>...]" - -#: builtin/fsck.c:775 -msgid "show unreachable objects" -msgstr "ulaşılamayan nesneleri göster" - -#: builtin/fsck.c:776 -msgid "show dangling objects" -msgstr "sarkan nesneleri göster" - -#: builtin/fsck.c:777 -msgid "report tags" -msgstr "etiketleri bildir" - -#: builtin/fsck.c:778 -msgid "report root nodes" -msgstr "kök düğümleri bildir" - -#: builtin/fsck.c:779 -msgid "make index objects head nodes" -msgstr "indeks nesnelerini dal ucu düğümü yap" - -#: builtin/fsck.c:780 -msgid "make reflogs head nodes (default)" -msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)" - -#: builtin/fsck.c:781 -msgid "also consider packs and alternate objects" -msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al" - -#: builtin/fsck.c:782 -msgid "check only connectivity" -msgstr "yalnızca bağlanabilirliği denetle" - -#: builtin/fsck.c:783 -msgid "enable more strict checking" -msgstr "daha kesin denetlemeyi etkinleştir" - -#: builtin/fsck.c:785 -msgid "write dangling objects in .git/lost-found" -msgstr "sarkan nesneleri .git/lost-found'a yaz" - -#: builtin/fsck.c:786 builtin/prune.c:132 -msgid "show progress" -msgstr "ilerlemeyi göster" - -#: builtin/fsck.c:787 -msgid "show verbose names for reachable objects" -msgstr "ulaşılabilir nesneler için ayrıntılı adları göster" - -#: builtin/fsck.c:846 builtin/index-pack.c:225 -msgid "Checking objects" -msgstr "Nesneler denetleniyor" - -#: builtin/fsck.c:874 -#, c-format -msgid "%s: object missing" -msgstr "%s: nesne kayıp" - -#: builtin/fsck.c:885 -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı" - -#: builtin/gc.c:35 -msgid "git gc [<options>]" -msgstr "git gc [<seçenekler>]" - -#: builtin/gc.c:90 -#, c-format -msgid "Failed to fstat %s: %s" -msgstr "%s fstat yapılamadı: %s" - -#: builtin/gc.c:126 -#, c-format -msgid "failed to parse '%s' value '%s'" -msgstr "'%s' değeri '%s' ayrıştırılamadı" - -#: builtin/gc.c:475 builtin/init-db.c:55 -#, c-format -msgid "cannot stat '%s'" -msgstr "'%s' bilgileri alınamıyor" - -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 -#, c-format -msgid "cannot read '%s'" -msgstr "'%s' okunamıyor" - -#: builtin/gc.c:491 -#, c-format -msgid "" -"The last gc run reported the following. Please correct the root cause\n" -"and remove %s.\n" -"Automatic cleanup will not be performed until the file is removed.\n" -"\n" -"%s" -msgstr "" -"En son yapılan 'gc' işlemi aşağıdakileri bildirdi. Lütfen sorunun ana\n" -"nedenini düzeltin ve %s ögesini kaldırın.\n" -"Kendiliğinden temizlik dosya kaldırılana değin gerçekleştirilmeyecektir.\n" -"\n" -"%s" - -#: builtin/gc.c:539 -msgid "prune unreferenced objects" -msgstr "başvurulmayan nesneleri buda" - -#: builtin/gc.c:541 -msgid "be more thorough (increased runtime)" -msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)" - -#: builtin/gc.c:542 -msgid "enable auto-gc mode" -msgstr "auto-gc kipini etkinleştir" - -#: builtin/gc.c:545 -msgid "force running gc even if there may be another gc running" -msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır" - -#: builtin/gc.c:548 -msgid "repack all other packs except the largest pack" -msgstr "en büyük paket dışındaki diğer tüm paketleri yeniden paketle" - -#: builtin/gc.c:565 -#, c-format -msgid "failed to parse gc.logexpiry value %s" -msgstr "gc.logexpiry değeri %s ayrıştırılamadı" - -#: builtin/gc.c:576 -#, c-format -msgid "failed to parse prune expiry value %s" -msgstr "'prune expiry' değeri %s ayrıştırılamadı" - -#: builtin/gc.c:596 -#, c-format -msgid "Auto packing the repository in background for optimum performance.\n" -msgstr "En iyi başarım için depo arka planda kendiliğinden paketleniyor.\n" - -#: builtin/gc.c:598 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "En iyi başarım için depo kendiliğinden paketleniyor.\n" - -#: builtin/gc.c:599 -#, c-format -msgid "See \"git help gc\" for manual housekeeping.\n" -msgstr "El ile ortalık temizliği için \"git help gc\"ye bakın.\n" - -#: builtin/gc.c:639 -#, c-format -msgid "" -"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" -msgstr "" -"gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --" -"force kullanın)" - -#: builtin/gc.c:694 -msgid "" -"There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "" -"Çok fazla ulaşılabilir boşta nesne var; kaldırmak için 'git prune' kullanın." - -#: builtin/grep.c:30 -msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [<seçenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]" - -#: builtin/grep.c:225 -#, c-format -msgid "grep: failed to create thread: %s" -msgstr "grep: iş parçacığı oluşturulamadı: %s" - -#: builtin/grep.c:279 -#, c-format -msgid "invalid number of threads specified (%d) for %s" -msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için" - -#. TRANSLATORS: %s is the configuration -#. variable for tweaking threads, currently -#. grep.threads -#. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "iş parçacığı desteği yok, %s yok sayılıyor" - -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 -#, c-format -msgid "unable to read tree (%s)" -msgstr "ağaç okunamıyor (%s)" - -#: builtin/grep.c:633 -#, c-format -msgid "unable to grep from object of type %s" -msgstr "%s türündeki bir nesneden grep yapılamıyor" - -#: builtin/grep.c:704 -#, c-format -msgid "switch `%c' expects a numerical value" -msgstr "'%c' anahtarı sayısal bir değer bekliyor" - -#: builtin/grep.c:803 -msgid "search in index instead of in the work tree" -msgstr "çalışma ağacı yerine indekste ara" - -#: builtin/grep.c:805 -msgid "find in contents not managed by git" -msgstr "git tarafından yönetilmeyen içerikte bul" - -#: builtin/grep.c:807 -msgid "search in both tracked and untracked files" -msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara" - -#: builtin/grep.c:809 -msgid "ignore files specified via '.gitignore'" -msgstr "'.gitignore'da belirtilen dosyaları yok say" - -#: builtin/grep.c:811 -msgid "recursively search in each submodule" -msgstr "her altmodülde özyineli olarak ara" - -#: builtin/grep.c:814 -msgid "show non-matching lines" -msgstr "eşleşmeyen satırları göster" - -#: builtin/grep.c:816 -msgid "case insensitive matching" -msgstr "BÜYÜK/küçük harf duyarsız eşleşme" - -#: builtin/grep.c:818 -msgid "match patterns only at word boundaries" -msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir" - -#: builtin/grep.c:820 -msgid "process binary files as text" -msgstr "ikili dosyaları metin olarak işle" - -#: builtin/grep.c:822 -msgid "don't match patterns in binary files" -msgstr "ikili dosyalardaki dizgileri eşleştirme" - -#: builtin/grep.c:825 -msgid "process binary files with textconv filters" -msgstr "ikili dosyaları textconv süzgeçleri ile işle" - -#: builtin/grep.c:827 -msgid "search in subdirectories (default)" -msgstr "altdizinlerde ara (öntanımlı)" - -#: builtin/grep.c:829 -msgid "descend at most <depth> levels" -msgstr "en çok <derinlik> düzeyine in" - -#: builtin/grep.c:833 -msgid "use extended POSIX regular expressions" -msgstr "genişletilmiş POSIX düzenli ifadelerini kullan" - -#: builtin/grep.c:836 -msgid "use basic POSIX regular expressions (default)" -msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)" - -#: builtin/grep.c:839 -msgid "interpret patterns as fixed strings" -msgstr "dizgileri sabit diziler olarak yorumla" - -#: builtin/grep.c:842 -msgid "use Perl-compatible regular expressions" -msgstr "Perl uyumlu düzenli ifadeler kullan" - -#: builtin/grep.c:845 -msgid "show line numbers" -msgstr "satır numaralarını göster" - -#: builtin/grep.c:846 -msgid "show column number of first match" -msgstr "ilk eşleşmenin sütun numarasını göster" - -#: builtin/grep.c:847 -msgid "don't show filenames" -msgstr "dosya adlarını gösterme" - -#: builtin/grep.c:848 -msgid "show filenames" -msgstr "dosya adlarını göster" - -#: builtin/grep.c:850 -msgid "show filenames relative to top directory" -msgstr "dosya adlarını en üst dizine göreceli olarak göster" - -#: builtin/grep.c:852 -msgid "show only filenames instead of matching lines" -msgstr "eşleşen satırlar yerine yalnızca dosya adlarını göster" - -#: builtin/grep.c:854 -msgid "synonym for --files-with-matches" -msgstr "--files-with-matches eşanlamlısı" - -#: builtin/grep.c:857 -msgid "show only the names of files without match" -msgstr "eşleşme olmadan yalnızca dosya adlarını göster" - -#: builtin/grep.c:859 -msgid "print NUL after filenames" -msgstr "dosya adlarından sonra NUL yazdır" - -#: builtin/grep.c:862 -msgid "show only matching parts of a line" -msgstr "yalnızca bir satırın eşleşen kısımlarını göster" - -#: builtin/grep.c:864 -msgid "show the number of matches instead of matching lines" -msgstr "eşleşen satırlar yerine eşleşme sayısını göster" - -#: builtin/grep.c:865 -msgid "highlight matches" -msgstr "eşleşmeleri vurgula" - -#: builtin/grep.c:867 -msgid "print empty line between matches from different files" -msgstr "başka dosyalardan olan eşleşmelerin arasına boş satır yazdır" - -#: builtin/grep.c:869 -msgid "show filename only once above matches from same file" -msgstr "" -"aynı dosyadan olan eşleşmelerin üzerinde dosya adını yalnızca bir kez göster" - -#: builtin/grep.c:872 -msgid "show <n> context lines before and after matches" -msgstr "eşleşmelerden önce ve sonra <n> satır bağlam göster" - -#: builtin/grep.c:875 -msgid "show <n> context lines before matches" -msgstr "eşleşmelerden önce <n> satır bağlam göster" - -#: builtin/grep.c:877 -msgid "show <n> context lines after matches" -msgstr "eşleşmelerden sonra <n> satır bağlam göster" - -#: builtin/grep.c:879 -msgid "use <n> worker threads" -msgstr "<n> iş parçacığı kullan" - -#: builtin/grep.c:880 -msgid "shortcut for -C NUM" -msgstr "-C NUM için kısayol" - -#: builtin/grep.c:883 -msgid "show a line with the function name before matches" -msgstr "eşleşmelerden önce işlev adının olduğu bir satır göster" - -#: builtin/grep.c:885 -msgid "show the surrounding function" -msgstr "çevresindeki işlevi göster" - -#: builtin/grep.c:888 -msgid "read patterns from file" -msgstr "dizgileri dosyadan oku" - -#: builtin/grep.c:890 -msgid "match <pattern>" -msgstr "<dizgi> ile eşleş" - -#: builtin/grep.c:892 -msgid "combine patterns specified with -e" -msgstr "-e ile belirtilen dizgileri birleştir" - -#: builtin/grep.c:904 -msgid "indicate hit with exit status without output" -msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme" - -#: builtin/grep.c:906 -msgid "show only matches from files that match all patterns" -msgstr "yalnızca tüm dizgilerle eşleşen dosyalardan eşleşmeleri göster" - -#: builtin/grep.c:908 -msgid "show parse tree for grep expression" -msgstr "grep ifadesi için ayrıştırma ağacını göster" - -#: builtin/grep.c:912 -msgid "pager" -msgstr "sayfalayıcı" - -#: builtin/grep.c:912 -msgid "show matching files in the pager" -msgstr "sayfalayıcıda eşleşen dosyaları göster" - -#: builtin/grep.c:916 -msgid "allow calling of grep(1) (ignored by this build)" -msgstr "grep(1)'in çağrılmasına izin ver (bu yapım tarafından yok sayıldı)" - -#: builtin/grep.c:983 -msgid "no pattern given" -msgstr "bir dizgi verilmedi" - -#: builtin/grep.c:1019 -msgid "--no-index or --untracked cannot be used with revs" -msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz" - -#: builtin/grep.c:1027 -#, c-format -msgid "unable to resolve revision: %s" -msgstr "revizyon çözülemiyor: %s" - -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "--untracked, --recurse-submodules ile desteklenmiyor" - -#: builtin/grep.c:1061 -msgid "invalid option combination, ignoring --threads" -msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor" - -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 -msgid "no threads support, ignoring --threads" -msgstr "iş parçacığı desteği yok, --threads yok sayılıyor" - -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)" - -#: builtin/grep.c:1101 -msgid "--open-files-in-pager only works on the worktree" -msgstr "--open-files-in-pager yalnızca çalışma ağacında çalışır" - -#: builtin/grep.c:1127 -msgid "--cached or --untracked cannot be used with --no-index" -msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor" - -#: builtin/grep.c:1133 -msgid "--[no-]exclude-standard cannot be used for tracked contents" -msgstr "--[no-]exclude-standard, izlenen içerik için kullanılamıyor" - -#: builtin/grep.c:1141 -msgid "both --cached and trees are given" -msgstr "hem --cached hem ağaçlar verilmiş" - -#: builtin/hash-object.c:85 -msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." -msgstr "" -"git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters] [--stdin] " -"[--] <dosya>..." - -#: builtin/hash-object.c:86 -msgid "git hash-object --stdin-paths" -msgstr "git hash-object --stdin-paths" - -#: builtin/hash-object.c:98 -msgid "object type" -msgstr "nesne türü" - -#: builtin/hash-object.c:99 -msgid "write the object into the object database" -msgstr "nesneyi nesne veritabanına yaz" - -#: builtin/hash-object.c:101 -msgid "read the object from stdin" -msgstr "nesneyi stdin'den oku" - -#: builtin/hash-object.c:103 -msgid "store file as is without filters" -msgstr "dosyayı süzgeçler olmadan olduğu gibi depola" - -#: builtin/hash-object.c:104 -msgid "" -"just hash any random garbage to create corrupt objects for debugging Git" -msgstr "" -"Git hata ayıklamasında kullanmak için çer çöp toplayarak hasarlı nesneler " -"oluştur" - -#: builtin/hash-object.c:105 -msgid "process file as it were from this path" -msgstr "dosyayı sanki bu yoldanmış gibi işle" - -#: builtin/help.c:46 -msgid "print all available commands" -msgstr "tüm kullanılabilir komutlar yazdır" - -#: builtin/help.c:47 -msgid "exclude guides" -msgstr "kılavuzları hariç tut" - -#: builtin/help.c:48 -msgid "print list of useful guides" -msgstr "kullanışlı kılavuzların listesini çıkar" - -#: builtin/help.c:49 -msgid "print all configuration variable names" -msgstr "tüm yapılandırma değişkenleri adlarını yazdır" - -#: builtin/help.c:51 -msgid "show man page" -msgstr "man sayfasını göster" - -#: builtin/help.c:52 -msgid "show manual in web browser" -msgstr "kılavuzu web tarayıcısında göster" - -#: builtin/help.c:54 -msgid "show info page" -msgstr "bilgi sayfasını göster" - -#: builtin/help.c:56 -msgid "print command description" -msgstr "komut açıklamasını yazdır" - -#: builtin/help.c:61 -msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" -msgstr "git help [--all] [--guides] [--man | --web | --info] [<komut>]" - -#: builtin/help.c:77 -#, c-format -msgid "unrecognized help format '%s'" -msgstr "tanımlanamayan yardım biçimi '%s'" - -#: builtin/help.c:104 -msgid "Failed to start emacsclient." -msgstr "emacsclient başlatılamadı." - -#: builtin/help.c:117 -msgid "Failed to parse emacsclient version." -msgstr "emacsclient sürümü ayrıştırılamadı." - -#: builtin/help.c:125 -#, c-format -msgid "emacsclient version '%d' too old (< 22)." -msgstr "emacsclient sürümü '%d' pek eski (<22)." - -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 -#, c-format -msgid "failed to exec '%s'" -msgstr "'%s' çalıştırılamadı" - -#: builtin/help.c:221 -#, c-format -msgid "" -"'%s': path for unsupported man viewer.\n" -"Please consider using 'man.<tool>.cmd' instead." -msgstr "" -"'%s': desteklenmeyen man görüntüleyicisi yolu.\n" -"Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün." - -#: builtin/help.c:233 -#, c-format -msgid "" -"'%s': cmd for supported man viewer.\n" -"Please consider using 'man.<tool>.path' instead." -msgstr "" -"'%s': desteklenmeyen man görüntüleyicisi komutu.\n" -"Bunun yerine 'man.<araç>.path' kullanmayı düşünün." - -#: builtin/help.c:350 -#, c-format -msgid "'%s': unknown man viewer." -msgstr "'%s': Bilinmeyen man görüntüleyicisi." - -#: builtin/help.c:367 -msgid "no man viewer handled the request" -msgstr "isteğe hiçbir man görüntüleyicisi ele almadı" - -#: builtin/help.c:375 -msgid "no info viewer handled the request" -msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı" - -#: builtin/help.c:434 builtin/help.c:445 git.c:336 -#, c-format -msgid "'%s' is aliased to '%s'" -msgstr "'%s', '%s' olarak armalanmış" - -#: builtin/help.c:448 git.c:365 -#, c-format -msgid "bad alias.%s string: %s" -msgstr "hatalı alias.%s dizisi: %s" - -#: builtin/help.c:477 builtin/help.c:507 -#, c-format -msgid "usage: %s%s" -msgstr "kullanım: %s%s" - -#: builtin/help.c:491 -msgid "'git help config' for more information" -msgstr "ek bilgi için: 'git help config'" - -#: builtin/index-pack.c:185 -#, c-format -msgid "object type mismatch at %s" -msgstr "%s konumunda nesne türü uyuşmazlığı" - -#: builtin/index-pack.c:205 -#, c-format -msgid "did not receive expected object %s" -msgstr "beklenen nesne %s alınmadı" - -#: builtin/index-pack.c:208 -#, c-format -msgid "object %s: expected type %s, found %s" -msgstr "nesne %s: beklenen tür %s, bulunan %s" - -#: builtin/index-pack.c:258 -#, c-format -msgid "cannot fill %d byte" -msgid_plural "cannot fill %d bytes" -msgstr[0] "%d bayt doldurulamıyor" -msgstr[1] "%d bayt doldurulamıyor" - -#: builtin/index-pack.c:268 -msgid "early EOF" -msgstr "erken dosya sonu" - -#: builtin/index-pack.c:269 -msgid "read error on input" -msgstr "girdide okuma hatası" - -#: builtin/index-pack.c:281 -msgid "used more bytes than were available" -msgstr "kullanılabilir olandan daha çok bayt kullanıldı" - -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 -msgid "pack too large for current definition of off_t" -msgstr "paket off_t'nin geçerli tanımı için çok büyük" - -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 -msgid "pack exceeds maximum allowed size" -msgstr "paket izin verilen en büyük boyutu aşıyor" - -#: builtin/index-pack.c:312 -#, c-format -msgid "cannot open packfile '%s'" -msgstr "'%s' paket dosyası açılamıyor" - -#: builtin/index-pack.c:326 -msgid "pack signature mismatch" -msgstr "paket imzası uyuşmazlığı" - -#: builtin/index-pack.c:328 -#, c-format -msgid "pack version %<PRIu32> unsupported" -msgstr "paket sürümü %<PRIu32> desteklenmiyor" - -#: builtin/index-pack.c:346 -#, c-format -msgid "pack has bad object at offset %<PRIuMAX>: %s" -msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s" - -#: builtin/index-pack.c:466 -#, c-format -msgid "inflate returned %d" -msgstr "şişirme programı %d döndürdü" - -#: builtin/index-pack.c:515 -msgid "offset value overflow for delta base object" -msgstr "delta tabanı nesnesi için ofset değeri taşımı" - -#: builtin/index-pack.c:523 -msgid "delta base offset is out of bound" -msgstr "delta tabanı ofseti sınırlar dışında" - -#: builtin/index-pack.c:531 -#, c-format -msgid "unknown object type %d" -msgstr "bilinmeyen nesne türü %d" - -#: builtin/index-pack.c:562 -msgid "cannot pread pack file" -msgstr "paket dosyası 'pread' yapılamıyor" - -#: builtin/index-pack.c:564 -#, c-format -msgid "premature end of pack file, %<PRIuMAX> byte missing" -msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" -msgstr[0] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik" -msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik" - -#: builtin/index-pack.c:590 -msgid "serious inflate inconsistency" -msgstr "ciddi şişirme programı tutarsızlığı" - -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 -#, c-format -msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "%s İLE SHA1 ÇARPIŞMASI BULUNDU!" - -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 -#, c-format -msgid "unable to read %s" -msgstr "%s okunamıyor" - -#: builtin/index-pack.c:802 -#, c-format -msgid "cannot read existing object info %s" -msgstr "mevcut %s nesne bilgisi okunamıyor" - -#: builtin/index-pack.c:810 -#, c-format -msgid "cannot read existing object %s" -msgstr "mevcut %s nesnesi okunamıyor" - -#: builtin/index-pack.c:824 -#, c-format -msgid "invalid blob object %s" -msgstr "geçersiz %s ikili nesnesi" - -#: builtin/index-pack.c:827 builtin/index-pack.c:846 -msgid "fsck error in packed object" -msgstr "paketlenmiş nesne içinde fsck hatası" - -#: builtin/index-pack.c:848 -#, c-format -msgid "Not all child objects of %s are reachable" -msgstr "%s ögesinin tüm alt ögeleri ulaşılabilir değil" - -#: builtin/index-pack.c:920 builtin/index-pack.c:951 -msgid "failed to apply delta" -msgstr "delta uygulanamadı" - -#: builtin/index-pack.c:1121 -msgid "Receiving objects" -msgstr "Nesneler alınıyor" - -#: builtin/index-pack.c:1121 -msgid "Indexing objects" -msgstr "Nesneler indeksleniyor" - -#: builtin/index-pack.c:1155 -msgid "pack is corrupted (SHA1 mismatch)" -msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)" - -#: builtin/index-pack.c:1160 -msgid "cannot fstat packfile" -msgstr "paket dosyası fstat yapılamıyor" - -#: builtin/index-pack.c:1163 -msgid "pack has junk at the end" -msgstr "paket sonunda döküntüler var" - -#: builtin/index-pack.c:1175 -msgid "confusion beyond insanity in parse_pack_objects()" -msgstr "parse_pack_objects() içindeki karmaşa akıl almaz düzeyde" - -#: builtin/index-pack.c:1198 -msgid "Resolving deltas" -msgstr "Deltalar çözülüyor" - -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 -#, c-format -msgid "unable to create thread: %s" -msgstr "iş parçacığı oluşturulamadı: %s" - -#: builtin/index-pack.c:1249 -msgid "confusion beyond insanity" -msgstr "karmaşa akıl almaz düzeyde" - -#: builtin/index-pack.c:1255 -#, c-format -msgid "completed with %d local object" -msgid_plural "completed with %d local objects" -msgstr[0] "%d yerel nesneyle tamamlandı" -msgstr[1] "%d yerel nesneyle tamamlandı" - -#: builtin/index-pack.c:1267 -#, c-format -msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)" - -#: builtin/index-pack.c:1271 -#, c-format -msgid "pack has %d unresolved delta" -msgid_plural "pack has %d unresolved deltas" -msgstr[0] "paketin %d çözülmemiş deltası var" -msgstr[1] "paketin %d çözülmemiş deltası var" - -#: builtin/index-pack.c:1295 -#, c-format -msgid "unable to deflate appended object (%d)" -msgstr "iliştirilen nesne söndürülemedi (%d)" - -#: builtin/index-pack.c:1392 -#, c-format -msgid "local object %s is corrupt" -msgstr "yerel nesne %s hasarlı" - -#: builtin/index-pack.c:1406 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "paket dosyası adı '%s', '.pack' ile bitmiyor" - -#: builtin/index-pack.c:1431 -#, c-format -msgid "cannot write %s file '%s'" -msgstr "%s dosyası '%s' yazılamıyor" - -#: builtin/index-pack.c:1439 -#, c-format -msgid "cannot close written %s file '%s'" -msgstr "yazılmış %s dosyası '%s' kapatılamıyor" - -#: builtin/index-pack.c:1463 -msgid "error while closing pack file" -msgstr "paket dosyası kapatılırken hata" - -#: builtin/index-pack.c:1477 -msgid "cannot store pack file" -msgstr "paket dosyası depolanamıyor" - -#: builtin/index-pack.c:1485 -msgid "cannot store index file" -msgstr "indeks dosyası depolanamıyor" - -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 -#, c-format -msgid "bad pack.indexversion=%<PRIu32>" -msgstr "hatalı pack.indexversion=%<PRIu32>" - -#: builtin/index-pack.c:1597 -#, c-format -msgid "Cannot open existing pack file '%s'" -msgstr "Mevcut paket dosyası '%s' açılamıyor" - -#: builtin/index-pack.c:1599 -#, c-format -msgid "Cannot open existing pack idx file for '%s'" -msgstr "'%s' için mevcut paket idx dosyası açılamıyor" - -#: builtin/index-pack.c:1647 -#, c-format -msgid "non delta: %d object" -msgid_plural "non delta: %d objects" -msgstr[0] "delta değil: %d nesne" -msgstr[1] "delta değil: %d nesne" - -#: builtin/index-pack.c:1654 -#, c-format -msgid "chain length = %d: %lu object" -msgid_plural "chain length = %d: %lu objects" -msgstr[0] "zincir uzunluğu = %d: %lu nesne" -msgstr[1] "zincir uzunluğu = %d: %lu nesne" - -#: builtin/index-pack.c:1693 -msgid "Cannot come back to cwd" -msgstr "Şu anki çalışma dizinine geri gelinemiyor" - -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 -#, c-format -msgid "bad %s" -msgstr "hatalı %s" - -#: builtin/index-pack.c:1781 -msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin, --stdin olmadan kullanılamaz" - -#: builtin/index-pack.c:1783 -msgid "--stdin requires a git repository" -msgstr "--stdin bir git dizini gerektirir" - -#: builtin/index-pack.c:1789 -msgid "--verify with no packfile name given" -msgstr "--verify ile bir paket dosyası adı verilmedi" - -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 -msgid "fsck error in pack objects" -msgstr "paket nesnelerinde fsck hatası" - -#: builtin/init-db.c:61 -#, c-format -msgid "cannot stat template '%s'" -msgstr "'%s' şablonunun bilgileri alınamıyor" - -#: builtin/init-db.c:66 -#, c-format -msgid "cannot opendir '%s'" -msgstr "'%s' opendir yapılamıyor" - -#: builtin/init-db.c:78 -#, c-format -msgid "cannot readlink '%s'" -msgstr "'%s' readlink yapılamıyor" - -#: builtin/init-db.c:80 -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "'%s', '%s' ögesine sembolik bağla bağlanamıyor" - -#: builtin/init-db.c:86 -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "'%s' şuraya kopyalanamıyor: '%s'" - -#: builtin/init-db.c:90 -#, c-format -msgid "ignoring template %s" -msgstr "%s şablonu yok sayılıyor" - -#: builtin/init-db.c:121 -#, c-format -msgid "templates not found in %s" -msgstr "şablonlar %s içinde bulunamadı" - -#: builtin/init-db.c:136 -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s" - -#: builtin/init-db.c:334 -#, c-format -msgid "unable to handle file type %d" -msgstr "%d dosya türü işlenemiyor" - -#: builtin/init-db.c:337 -#, c-format -msgid "unable to move %s to %s" -msgstr "%s şuraya taşınamıyor: %s" - -#: builtin/init-db.c:354 builtin/init-db.c:357 -#, c-format -msgid "%s already exists" -msgstr "%s halihazırda var" - -#: builtin/init-db.c:413 -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "%s%s içindeki mevcut paylaşılan Git deposu yeniden ilklendirildi\n" - -#: builtin/init-db.c:414 -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "%s%s içindeki mevcut Git deposu yeniden ilklendirildi\n" - -#: builtin/init-db.c:418 -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n" - -#: builtin/init-db.c:419 -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "%s%s içinde boş Git deposu ilklendirildi\n" - -#: builtin/init-db.c:468 -msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" -msgstr "" -"git init [-q | --quiet] [--bare] [--template=<şablon-dizini>] [--" -"shared[=<izinler>]] [<dizin>]" - -#: builtin/init-db.c:491 -msgid "permissions" -msgstr "izinler" - -#: builtin/init-db.c:492 -msgid "specify that the git repository is to be shared amongst several users" -msgstr "git deposunun kullanıcılar arasında paylaşıp paylaşılmayacağını belirt" - -#: builtin/init-db.c:529 builtin/init-db.c:534 -#, c-format -msgid "cannot mkdir %s" -msgstr "%s mkdir yapılamıyor" - -#: builtin/init-db.c:538 -#, c-format -msgid "cannot chdir to %s" -msgstr "%s ögesine chdir yapılamıyor" - -#: builtin/init-db.c:559 -#, c-format -msgid "" -"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" -"dir=<directory>)" -msgstr "" -"%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden " -"izin verilmiyor" - -#: builtin/init-db.c:587 -#, c-format -msgid "Cannot access work tree '%s'" -msgstr "'%s' çalışma ağacına erişilemiyor" - -#: builtin/interpret-trailers.c:16 -msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" -msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<değer>])...] [<dosya>...]" - -#: builtin/interpret-trailers.c:95 -msgid "edit files in place" -msgstr "dosyaları yerinde düzenle" - -#: builtin/interpret-trailers.c:96 -msgid "trim empty trailers" -msgstr "boş artbilgileri kırp" - -#: builtin/interpret-trailers.c:99 -msgid "where to place the new trailer" -msgstr "yeni artbilgiler nereye yerleştirilecek" - -#: builtin/interpret-trailers.c:101 -msgid "action if trailer already exists" -msgstr "artbilgi halihazırda varsa yapılacak eylem" - -#: builtin/interpret-trailers.c:103 -msgid "action if trailer is missing" -msgstr "artbilgi eksikse yapılacak eylem" - -#: builtin/interpret-trailers.c:105 -msgid "output only the trailers" -msgstr "yalnızca artbilgileri çıktı ver" - -#: builtin/interpret-trailers.c:106 -msgid "do not apply config rules" -msgstr "yapılandırma kurallarını uygulama" - -#: builtin/interpret-trailers.c:107 -msgid "join whitespace-continued values" -msgstr "boşluk ile sürdürülen değerleri uç uca ekle" - -#: builtin/interpret-trailers.c:108 -msgid "set parsing options" -msgstr "ayrıştırma seçeneklerini ayarla" - -#: builtin/interpret-trailers.c:110 -msgid "do not treat --- specially" -msgstr "şuna özel davranma: ---" - -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "artbilgi" - -#: builtin/interpret-trailers.c:112 -msgid "trailer(s) to add" -msgstr "eklenecek artbilgi(ler)" - -#: builtin/interpret-trailers.c:123 -msgid "--trailer with --only-input does not make sense" -msgstr "--trailer ile --only-input bir anlam ifade etmiyor" - -#: builtin/interpret-trailers.c:133 -msgid "no input file given for in-place editing" -msgstr "yerinde düzenleme için girdi dosyası verilmedi" - -#: builtin/log.c:56 -msgid "git log [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git log [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]" - -#: builtin/log.c:57 -msgid "git show [<options>] <object>..." -msgstr "git show [<seçenekler>] <nesne>..." - -#: builtin/log.c:110 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "geçersiz --decorate seçeneği: %s" - -#: builtin/log.c:174 -msgid "show source" -msgstr "kaynağı göster" - -#: builtin/log.c:175 -msgid "Use mail map file" -msgstr "posta eşlem dosyasını kullan" - -#: builtin/log.c:177 -msgid "only decorate refs that match <pattern>" -msgstr "yalnızca <dizgi> ile eşleşen başvuruları süsle" - -#: builtin/log.c:179 -msgid "do not decorate refs that match <pattern>" -msgstr "<dizgi> ile eşleşen başvuruları süsleme" - -#: builtin/log.c:180 -msgid "decorate options" -msgstr "süsleme seçenekleri" - -#: builtin/log.c:183 -msgid "Process line range n,m in file, counting from 1" -msgstr "dosya içindeki n,m satır aralığını 1'den sayarak işle" - -#: builtin/log.c:281 -#, c-format -msgid "Final output: %d %s\n" -msgstr "Son çıktı: %d %s\n" - -#: builtin/log.c:535 -#, c-format -msgid "git show %s: bad file" -msgstr "git show %s: hatalı dosya" - -#: builtin/log.c:550 builtin/log.c:645 -#, c-format -msgid "could not read object %s" -msgstr "%s nesnesi okunamadı" - -#: builtin/log.c:670 -#, c-format -msgid "unknown type: %d" -msgstr "bilinmeyen tür: %d" - -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s: açıklama kipinden geçersiz kapak sayfası" - -#: builtin/log.c:821 -msgid "format.headers without value" -msgstr "format.headers değere iye değil" - -#: builtin/log.c:936 -msgid "name of output directory is too long" -msgstr "çıktı dizininin adı pek uzun" - -#: builtin/log.c:952 -#, c-format -msgid "cannot open patch file %s" -msgstr "%s yama dosyası okunamıyor" - -#: builtin/log.c:969 -msgid "need exactly one range" -msgstr "bir tam erim gerekiyor" - -#: builtin/log.c:979 -msgid "not a range" -msgstr "bir erim değil" - -#: builtin/log.c:1143 -msgid "cover letter needs email format" -msgstr "niyet mektubu için e-posta biçimi gerekli" - -#: builtin/log.c:1149 -msgid "failed to create cover-letter file" -msgstr "cover-letter dosyası oluşturulamadı" - -#: builtin/log.c:1228 -#, c-format -msgid "insane in-reply-to: %s" -msgstr "akıl almaz in-reply-to: %s" - -#: builtin/log.c:1255 -msgid "git format-patch [<options>] [<since> | <revision-range>]" -msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]" - -#: builtin/log.c:1313 -msgid "two output directories?" -msgstr "iki çıktı dizini?" - -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 -#, c-format -msgid "unknown commit %s" -msgstr "bilinmeyen gönderi %s" - -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 -#: builtin/replace.c:210 -#, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "'%s' geçerli bir başvuru olarak çözülemedi" - -#: builtin/log.c:1439 -msgid "could not find exact merge base" -msgstr "kesin birleştirme temeli bulunamadı" - -#: builtin/log.c:1443 -msgid "" -"failed to get upstream, if you want to record base commit automatically,\n" -"please use git branch --set-upstream-to to track a remote branch.\n" -"Or you could specify base commit by --base=<base-commit-id> manually" -msgstr "" -"Üstkaynak alınamadı; taban gönderisinin kaydını kendiliğinden yazmak\n" -"istiyorsanız lütfen git branch --set-upstream-to kullanarak bir uzak dalı\n" -"izleyin. Bunun dışında taban gönderisini kendiniz --base=<taban-gönderisi-" -"no>\n" -"kullanarak el ile belirtebilirsiniz." - -#: builtin/log.c:1463 -msgid "failed to find exact merge base" -msgstr "kesin birleştirme temeli bulunamadı" - -#: builtin/log.c:1474 -msgid "base commit should be the ancestor of revision list" -msgstr "taban gönderisi revizyon listesinin atası olmalı" - -#: builtin/log.c:1478 -msgid "base commit shouldn't be in revision list" -msgstr "taban gönderisi revizyon listesinde olmamalı" - -#: builtin/log.c:1531 -msgid "cannot get patch id" -msgstr "yama numarası alınamıyor" - -#: builtin/log.c:1583 -msgid "failed to infer range-diff ranges" -msgstr "range-diff erimlerinden bir anlam çıkarılamadı" - -#: builtin/log.c:1629 -msgid "use [PATCH n/m] even with a single patch" -msgstr "bir yamayla bile olsa [PATCH n/m] kullan" - -#: builtin/log.c:1632 -msgid "use [PATCH] even with multiple patches" -msgstr "birden çok yama bile olsa [PATCH] kullan" - -#: builtin/log.c:1636 -msgid "print patches to standard out" -msgstr "yamaları standart çıktıya yazdır" - -#: builtin/log.c:1638 -msgid "generate a cover letter" -msgstr "bir niyet mektubu oluştur" - -#: builtin/log.c:1640 -msgid "use simple number sequence for output file names" -msgstr "çıktı dosya adları için yalın sayı dizisi oluştur" - -#: builtin/log.c:1641 -msgid "sfx" -msgstr "sonek" - -#: builtin/log.c:1642 -msgid "use <sfx> instead of '.patch'" -msgstr "'.patch' yerine <sonek> kullan" - -#: builtin/log.c:1644 -msgid "start numbering patches at <n> instead of 1" -msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla" - -#: builtin/log.c:1646 -msgid "mark the series as Nth re-roll" -msgstr "diziyi n. deneme olarak imle" - -#: builtin/log.c:1648 -msgid "Use [RFC PATCH] instead of [PATCH]" -msgstr "[PATCH] yerine [RFC PATCH] kullan" - -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "açıklama kipinden kapak sayfası kipi" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "niyet mektubunun bazı kısımlarını dalın açıklamasından oluştur" - -#: builtin/log.c:1654 -msgid "Use [<prefix>] instead of [PATCH]" -msgstr "[PATCH] yerine [<önek>] kullan" - -#: builtin/log.c:1657 -msgid "store resulting files in <dir>" -msgstr "ortaya çıkan dosyaları <dizin>'de depola" - -#: builtin/log.c:1660 -msgid "don't strip/add [PATCH]" -msgstr "[PATCH]'i soyma/ekleme" - -#: builtin/log.c:1663 -msgid "don't output binary diffs" -msgstr "ikili diff'leri çıktı verme" - -#: builtin/log.c:1665 -msgid "output all-zero hash in From header" -msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver" - -#: builtin/log.c:1667 -msgid "don't include a patch matching a commit upstream" -msgstr "üstkaynaktaki bir gönderi ile eşleşen bir yamayı içerme" - -#: builtin/log.c:1669 -msgid "show patch format instead of default (patch + stat)" -msgstr "öntanımlı yerine yama biçimini göster (patch + stat)" - -#: builtin/log.c:1671 -msgid "Messaging" -msgstr "İletileşme" - -#: builtin/log.c:1672 -msgid "header" -msgstr "başlık" - -#: builtin/log.c:1673 -msgid "add email header" -msgstr "e-posta başlığı ekle" - -#: builtin/log.c:1674 builtin/log.c:1676 -msgid "email" -msgstr "e-posta" - -#: builtin/log.c:1674 -msgid "add To: header" -msgstr "To: başlığı ekle" - -#: builtin/log.c:1676 -msgid "add Cc: header" -msgstr "Cc: başlığı ekle" - -#: builtin/log.c:1678 -msgid "ident" -msgstr "tanımlayıcı" - -#: builtin/log.c:1679 -msgid "set From address to <ident> (or committer ident if absent)" -msgstr "" -"From adresini <tanımlayıcı> olarak ayarla (veya yoksa gönderici " -"tanımlayıcısı)" - -#: builtin/log.c:1681 -msgid "message-id" -msgstr "ileti no" - -#: builtin/log.c:1682 -msgid "make first mail a reply to <message-id>" -msgstr "ilk postayı <ileti no>'ya bir yanıt yap" - -#: builtin/log.c:1683 builtin/log.c:1686 -msgid "boundary" -msgstr "sınır" - -#: builtin/log.c:1684 -msgid "attach the patch" -msgstr "yamayı ekle" - -#: builtin/log.c:1687 -msgid "inline the patch" -msgstr "yamayı iletiye koy" - -#: builtin/log.c:1691 -msgid "enable message threading, styles: shallow, deep" -msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep" - -#: builtin/log.c:1693 -msgid "signature" -msgstr "imza" - -#: builtin/log.c:1694 -msgid "add a signature" -msgstr "imza ekle" - -#: builtin/log.c:1695 -msgid "base-commit" -msgstr "taban gönderi" - -#: builtin/log.c:1696 -msgid "add prerequisite tree info to the patch series" -msgstr "yama dizisine önkoşulan ağaç bilgisini ekle" - -#: builtin/log.c:1698 -msgid "add a signature from a file" -msgstr "dosyadan bir imza ekle" - -#: builtin/log.c:1699 -msgid "don't print the patch filenames" -msgstr "yama dosya adlarını yazdırma" - -#: builtin/log.c:1701 -msgid "show progress while generating patches" -msgstr "yamalar oluşturulurken ilerlemeyi göster" - -#: builtin/log.c:1703 -msgid "show changes against <rev> in cover letter or single patch" -msgstr "" -"<rev> karşısındaki değişiklikleri niyet mektubunda veya tek bir yamada göster" - -#: builtin/log.c:1706 -msgid "show changes against <refspec> in cover letter or single patch" -msgstr "" -"<bşvr-blrtç> karşısındaki değişiklikleri niyet mektubunda veya tek bir " -"yamada göster" - -#: builtin/log.c:1708 -msgid "percentage by which creation is weighted" -msgstr "oluşumun tartıldığı yüzde" - -#: builtin/log.c:1792 -#, c-format -msgid "invalid ident line: %s" -msgstr "geçersiz tanımlayıcı satırı: %s" - -#: builtin/log.c:1807 -msgid "-n and -k are mutually exclusive" -msgstr "-n ve -k birlikte kullanılamaz" - -#: builtin/log.c:1809 -msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz" - -#: builtin/log.c:1817 -msgid "--name-only does not make sense" -msgstr "--name-only bir anlam ifade etmiyor" - -#: builtin/log.c:1819 -msgid "--name-status does not make sense" -msgstr "--name-status bir anlam ifade etmiyor" - -#: builtin/log.c:1821 -msgid "--check does not make sense" -msgstr "--check bir anlam ifade etmiyor" - -#: builtin/log.c:1854 -msgid "standard output, or directory, which one?" -msgstr "standart çıktı veya dizin, hangisi?" - -#: builtin/log.c:1958 -msgid "--interdiff requires --cover-letter or single patch" -msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor" - -#: builtin/log.c:1962 -msgid "Interdiff:" -msgstr "Interdiff:" - -#: builtin/log.c:1963 -#, c-format -msgid "Interdiff against v%d:" -msgstr "Interdiff v%d karşısında:" - -#: builtin/log.c:1969 -msgid "--creation-factor requires --range-diff" -msgstr "--creation-factor, --range-diff gerektiriyor" - -#: builtin/log.c:1973 -msgid "--range-diff requires --cover-letter or single patch" -msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor" - -#: builtin/log.c:1981 -msgid "Range-diff:" -msgstr "Range-diff:" - -#: builtin/log.c:1982 -#, c-format -msgid "Range-diff against v%d:" -msgstr "Range-diff v%d karşısında:" - -#: builtin/log.c:1993 -#, c-format -msgid "unable to read signature file '%s'" -msgstr "'%s' imza dosyası okunamıyor" - -#: builtin/log.c:2029 -msgid "Generating patches" -msgstr "Yamalar oluşturuluyor" - -#: builtin/log.c:2073 -msgid "failed to create output files" -msgstr "çıktı dosyaları oluşturulamadı" - -#: builtin/log.c:2132 -msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]" - -#: builtin/log.c:2186 -#, c-format -msgid "" -"Could not find a tracked remote branch, please specify <upstream> manually.\n" -msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n" - -#: builtin/ls-files.c:470 -msgid "git ls-files [<options>] [<file>...]" -msgstr "git ls-files [<seçenekler>] [<dosya>...]" - -#: builtin/ls-files.c:526 -msgid "identify the file status with tags" -msgstr "dosya durumunu etiketlerle tanımla" - -#: builtin/ls-files.c:528 -msgid "use lowercase letters for 'assume unchanged' files" -msgstr "'değiştirilmediği düşünülen' dosyaları küçük harflerle göster" - -#: builtin/ls-files.c:530 -msgid "use lowercase letters for 'fsmonitor clean' files" -msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster" - -#: builtin/ls-files.c:532 -msgid "show cached files in the output (default)" -msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)" - -#: builtin/ls-files.c:534 -msgid "show deleted files in the output" -msgstr "silinen dosyaları çıktıda göster" - -#: builtin/ls-files.c:536 -msgid "show modified files in the output" -msgstr "değiştirilen dosyaları çıktıda göster" - -#: builtin/ls-files.c:538 -msgid "show other files in the output" -msgstr "diğer dosyaları çıktıda göster" - -#: builtin/ls-files.c:540 -msgid "show ignored files in the output" -msgstr "yok sayılan dosyaları çıktıda göster" - -#: builtin/ls-files.c:543 -msgid "show staged contents' object name in the output" -msgstr "hazırlanan içeriğin nesne adını çıktıda göster" - -#: builtin/ls-files.c:545 -msgid "show files on the filesystem that need to be removed" -msgstr "dosya sistemindeki kaldırılması gereken dosyaları göster" - -#: builtin/ls-files.c:547 -msgid "show 'other' directories' names only" -msgstr "'diğer' dizinlerin yalnızca adını göster" - -#: builtin/ls-files.c:549 -msgid "show line endings of files" -msgstr "dosyaların satır sonlarını göster" - -#: builtin/ls-files.c:551 -msgid "don't show empty directories" -msgstr "boş dizinleri gösterme" - -#: builtin/ls-files.c:554 -msgid "show unmerged files in the output" -msgstr "birleştirilmemiş dosyaları çıktıda göster" - -#: builtin/ls-files.c:556 -msgid "show resolve-undo information" -msgstr "'resolve-undo' bilgisini göster" - -#: builtin/ls-files.c:558 -msgid "skip files matching pattern" -msgstr "dizgi ile eşleşen dosyaları atla" - -#: builtin/ls-files.c:561 -msgid "exclude patterns are read from <file>" -msgstr "hariç tutma dizgileri <dosya>'dan okunuyor" - -#: builtin/ls-files.c:564 -msgid "read additional per-directory exclude patterns in <file>" -msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku" - -#: builtin/ls-files.c:566 -msgid "add the standard git exclusions" -msgstr "standart git hariç tutmalarını ekle" - -#: builtin/ls-files.c:570 -msgid "make the output relative to the project top directory" -msgstr "çıktıyı en üst proje dizinine göreceli olarak yap" - -#: builtin/ls-files.c:573 -msgid "recurse through submodules" -msgstr "altmodüller içinden özyinele" - -#: builtin/ls-files.c:575 -msgid "if any <file> is not in the index, treat this as an error" -msgstr "eğer bir <dosya> indekste değilse bunu bir hata olarak gör" - -#: builtin/ls-files.c:576 -msgid "tree-ish" -msgstr "ağacımsı" - -#: builtin/ls-files.c:577 -msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "<ağacımsı>'dan bu yana kaldırılan yolların hâlâ var olduğunu varsay" - -#: builtin/ls-files.c:579 -msgid "show debugging data" -msgstr "hata ayıklama verisini göster" - -#: builtin/ls-remote.c:9 -msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<repository> [<refs>...]]" -msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<depo> [<başvurular>...]]" - -#: builtin/ls-remote.c:59 -msgid "do not print remote URL" -msgstr "uzak konum URL'sini yazdırma" - -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 -msgid "exec" -msgstr "çalıştır" - -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 -msgid "path of git-upload-pack on the remote host" -msgstr "uzak konum makinesindeki git-upload-pack yolu" - -#: builtin/ls-remote.c:65 -msgid "limit to tags" -msgstr "etiketlere kısıtla" - -#: builtin/ls-remote.c:66 -msgid "limit to heads" -msgstr "uç gönderilere kısıtla" - -#: builtin/ls-remote.c:67 -msgid "do not show peeled tags" -msgstr "soyulmuş etiketleri gösterme" - -#: builtin/ls-remote.c:69 -msgid "take url.<base>.insteadOf into account" -msgstr "url.<temel>.insteadOf'u dikkate al" - -#: builtin/ls-remote.c:72 -msgid "exit with exit code 2 if no matching refs are found" -msgstr "eşleşen başvuru bulunamazsa 2 numaralı çıkış koduyla çık" - -#: builtin/ls-remote.c:75 -msgid "show underlying ref in addition to the object pointed by it" -msgstr "işaret ettiği nesneye ek olarak altında yatan başvuruyu göster" - -#: builtin/ls-tree.c:30 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<seçenekler>] <ağacımsı> [<yol>...]" - -#: builtin/ls-tree.c:128 -msgid "only show trees" -msgstr "yalnızca ağaçları göster" - -#: builtin/ls-tree.c:130 -msgid "recurse into subtrees" -msgstr "altağaçlara özyinele" - -#: builtin/ls-tree.c:132 -msgid "show trees when recursing" -msgstr "özyinelerken ağaçları göster" - -#: builtin/ls-tree.c:135 -msgid "terminate entries with NUL byte" -msgstr "girdileri NUL baytı ile sonlandır" - -#: builtin/ls-tree.c:136 -msgid "include object size" -msgstr "nesne boyutunu içer" - -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 -msgid "list only filenames" -msgstr "yalnızca dosya adlarını listele" - -#: builtin/ls-tree.c:143 -msgid "use full path names" -msgstr "tam yol adlarını kullan" - -#: builtin/ls-tree.c:145 -msgid "list entire tree; not just current directory (implies --full-name)" -msgstr "yalnızca geçerli dizini değil tüm ağacı listele (--full-name ima eder)" - -#: builtin/mailsplit.c:241 -#, c-format -msgid "empty mbox: '%s'" -msgstr "boş mbox: '%s'" - -#: builtin/merge.c:55 -msgid "git merge [<options>] [<commit>...]" -msgstr "git merge [<seçenekler>] [<gönderi>...]" - -#: builtin/merge.c:56 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:57 -msgid "git merge --continue" -msgstr "git merge --continue" - -#: builtin/merge.c:119 -msgid "switch `m' requires a value" -msgstr "'m' anahtarı bir değer gerektiriyor" - -#: builtin/merge.c:142 -#, c-format -msgid "option `%s' requires a value" -msgstr "'%s' seçeneği bir değer gerektiriyor" - -#: builtin/merge.c:188 -#, c-format -msgid "Could not find merge strategy '%s'.\n" -msgstr "Birleştirme stratejisi '%s' bulunamadı.\n" - -#: builtin/merge.c:189 -#, c-format -msgid "Available strategies are:" -msgstr "Kullanılabilir stratejiler:" - -#: builtin/merge.c:194 -#, c-format -msgid "Available custom strategies are:" -msgstr "Kullanılabilir özel stratejiler:" - -#: builtin/merge.c:245 builtin/pull.c:132 -msgid "do not show a diffstat at the end of the merge" -msgstr "birleştirmenin sonunda bir diffstat gösterme" - -#: builtin/merge.c:248 builtin/pull.c:135 -msgid "show a diffstat at the end of the merge" -msgstr "birleştirmenin sonunda bir diffstat göster" - -#: builtin/merge.c:249 builtin/pull.c:138 -msgid "(synonym to --stat)" -msgstr "(--stat eşanlamlısı)" - -#: builtin/merge.c:251 builtin/pull.c:141 -msgid "add (at most <n>) entries from shortlog to merge commit message" -msgstr "" -"kısa günlükten birleştirme gönderisi iletisine girdiler (en çok <n>) ekle" - -#: builtin/merge.c:254 builtin/pull.c:147 -msgid "create a single commit instead of doing a merge" -msgstr "bir birleştirme yerine tek bir gönderi oluştur" - -#: builtin/merge.c:256 builtin/pull.c:150 -msgid "perform a commit if the merge succeeds (default)" -msgstr "birleştirme başarılı olursa bir gönderi gerçekleştir (öntanımlı)" - -#: builtin/merge.c:258 builtin/pull.c:153 -msgid "edit message before committing" -msgstr "göndermeden önce iletiyi düzenle" - -#: builtin/merge.c:260 -msgid "allow fast-forward (default)" -msgstr "ileri sarıma izin ver (öntanımlı)" - -#: builtin/merge.c:262 builtin/pull.c:160 -msgid "abort if fast-forward is not possible" -msgstr "ileri sarım olanaklı değilse iptal et" - -#: builtin/merge.c:266 builtin/pull.c:163 -msgid "verify that the named commit has a valid GPG signature" -msgstr "adı verilen gönderinin geçerli bir GPG imzası olduğunu doğrula" - -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 -msgid "strategy" -msgstr "strateji" - -#: builtin/merge.c:268 builtin/pull.c:168 -msgid "merge strategy to use" -msgstr "kullanılacak birleştirme stratejisi" - -#: builtin/merge.c:269 builtin/pull.c:171 -msgid "option=value" -msgstr "seçenek=değer" - -#: builtin/merge.c:270 builtin/pull.c:172 -msgid "option for selected merge strategy" -msgstr "seçili birleştirme stratejisi için seçenekler" - -#: builtin/merge.c:272 -msgid "merge commit message (for a non-fast-forward merge)" -msgstr "" -"birleştirme gönderisi iletisi (ileri sarım olmayan bir birleştirme için)" - -#: builtin/merge.c:279 -msgid "abort the current in-progress merge" -msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et" - -#: builtin/merge.c:281 -msgid "--abort but leave index and working tree alone" -msgstr "--abort, ancak indeksi ve çalışma ağacını değiştirmeden bırakın" - -#: builtin/merge.c:283 -msgid "continue the current in-progress merge" -msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün" - -#: builtin/merge.c:285 builtin/pull.c:179 -msgid "allow merging unrelated histories" -msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver" - -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "pre-merge-commit ve commit-msg kancalarını atla" - -#: builtin/merge.c:308 -msgid "could not run stash." -msgstr "zula alınamadı" - -#: builtin/merge.c:313 -msgid "stash failed" -msgstr "zula başarısız oldu" - -#: builtin/merge.c:318 -#, c-format -msgid "not a valid object: %s" -msgstr "geçerli bir nesne değil: %s" - -#: builtin/merge.c:340 builtin/merge.c:357 -msgid "read-tree failed" -msgstr "read-tree başarısız oldu" - -#: builtin/merge.c:387 -msgid " (nothing to squash)" -msgstr " (tıkıştırılacak bir şey yok)" - -#: builtin/merge.c:398 -#, c-format -msgid "Squash commit -- not updating HEAD\n" -msgstr "Tıkıştırma gönderisi -- HEAD güncellenmiyor\n" - -#: builtin/merge.c:448 -#, c-format -msgid "No merge message -- not updating HEAD\n" -msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n" - -#: builtin/merge.c:499 -#, c-format -msgid "'%s' does not point to a commit" -msgstr "'%s' bir gönderiye işaret etmiyor" - -#: builtin/merge.c:586 -#, c-format -msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "Hatalı branch.%s.mergeoptions dizisi: %s" - -#: builtin/merge.c:708 -msgid "Not handling anything other than two heads merge." -msgstr "İki uç gönderi birleştirmesi dışında bir şey yapılmıyor." - -#: builtin/merge.c:722 -#, c-format -msgid "Unknown option for merge-recursive: -X%s" -msgstr "merge-recursive için geçersiz seçenek: -X%s" - -#: builtin/merge.c:737 -#, c-format -msgid "unable to write %s" -msgstr "%s yazılamıyor" - -#: builtin/merge.c:789 -#, c-format -msgid "Could not read from '%s'" -msgstr "Şuradan okunamadı: '%s'" - -#: builtin/merge.c:798 -#, c-format -msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "Birleştirme gönderilmiyor, tamamlamak için 'git commit' kullanın.\n" - -#: builtin/merge.c:804 -msgid "" -"Please enter a commit message to explain why this merge is necessary,\n" -"especially if it merges an updated upstream into a topic branch.\n" -"\n" -msgstr "" -"Bu birleştirmenin neden gerekli olduğunu açıklamak için bir gönderi iletisi\n" -"girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n" -"\n" - -#: builtin/merge.c:809 -msgid "An empty message aborts the commit.\n" -msgstr "Boş bir ileti gönderiyi iptal eder.\n" - -#: builtin/merge.c:812 -#, c-format -msgid "" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" -msgstr "" -"'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti gönderiyi\n" -"iptal eder.\n" - -#: builtin/merge.c:865 -msgid "Empty commit message." -msgstr "Boş gönderi iletisi." - -#: builtin/merge.c:880 -#, c-format -msgid "Wonderful.\n" -msgstr "Harika.\n" - -#: builtin/merge.c:941 -#, c-format -msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "" -"Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu gönderin.\n" - -#: builtin/merge.c:980 -msgid "No current branch." -msgstr "Geçerli dal yok." - -#: builtin/merge.c:982 -msgid "No remote for the current branch." -msgstr "Geçerli dal için uzak konum yok." - -#: builtin/merge.c:984 -msgid "No default upstream defined for the current branch." -msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış." - -#: builtin/merge.c:989 -#, c-format -msgid "No remote-tracking branch for %s from %s" -msgstr "%s için %s konumundan uzak izleyen dal yok" - -#: builtin/merge.c:1046 -#, c-format -msgid "Bad value '%s' in environment '%s'" -msgstr "Hatalı değer '%s', '%s' ortamında" - -#: builtin/merge.c:1149 -#, c-format -msgid "not something we can merge in %s: %s" -msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s" - -#: builtin/merge.c:1183 -msgid "not something we can merge" -msgstr "birleştirebileceğimiz bir şey değil" - -#: builtin/merge.c:1286 -msgid "--abort expects no arguments" -msgstr "--abort bir değişken beklemez" - -#: builtin/merge.c:1290 -msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)." - -#: builtin/merge.c:1299 -msgid "--quit expects no arguments" -msgstr "--quit bir değişken beklemez" - -#: builtin/merge.c:1312 -msgid "--continue expects no arguments" -msgstr "--continue bir değişken beklemez" - -#: builtin/merge.c:1316 -msgid "There is no merge in progress (MERGE_HEAD missing)." -msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)." - -#: builtin/merge.c:1332 -msgid "" -"You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you merge." -msgstr "" -"Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n" -"Lütfen birleştirmeden önce değişikliklerinizi gönderin." - -#: builtin/merge.c:1339 -msgid "" -"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you merge." -msgstr "" -"Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n" -"Lütfen birleştirmeden önce değişikliklerinizi gönderin." - -#: builtin/merge.c:1342 -msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)." - -#: builtin/merge.c:1356 -msgid "You cannot combine --squash with --no-ff." -msgstr "--squash ile --no-ff birlikte kullanılamaz." - -#: builtin/merge.c:1358 -msgid "You cannot combine --squash with --commit." -msgstr "--squash ile --commit birlikte kullanılamaz." - -#: builtin/merge.c:1374 -msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "Belirtilen bir gönderi yok ve merge.defaultToUpstream ayarlanmamış." - -#: builtin/merge.c:1391 -msgid "Squash commit into empty head not supported yet" -msgstr "Gönderiyi boş dal ucuna tıkıştırma henüz desteklenmiyor" - -#: builtin/merge.c:1393 -msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "" -"İleri sarım olmayan gönderiyi boş dal ucuna yapmak bir anlam ifade etmiyor" - -#: builtin/merge.c:1398 -#, c-format -msgid "%s - not something we can merge" -msgstr "%s - birleştirebileceğimiz bir şey değil" - -#: builtin/merge.c:1400 -msgid "Can merge only exactly one commit into empty head" -msgstr "Boş dal ucuna tam olarak yalnızca bir gönderi birleştirilebilir" - -#: builtin/merge.c:1481 -msgid "refusing to merge unrelated histories" -msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor" - -#: builtin/merge.c:1490 -msgid "Already up to date." -msgstr "Her şey güncel." - -#: builtin/merge.c:1500 -#, c-format -msgid "Updating %s..%s\n" -msgstr "Güncelleniyor: %s..%s\n" - -#: builtin/merge.c:1542 -#, c-format -msgid "Trying really trivial in-index merge...\n" -msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n" - -#: builtin/merge.c:1549 -#, c-format -msgid "Nope.\n" -msgstr "Yok.\n" - -#: builtin/merge.c:1574 -msgid "Already up to date. Yeeah!" -msgstr "Her şey güncel. İşte bu!" - -#: builtin/merge.c:1580 -msgid "Not possible to fast-forward, aborting." -msgstr "İleri sarma olanaklı değil, iptal ediliyor." - -#: builtin/merge.c:1603 builtin/merge.c:1668 -#, c-format -msgid "Rewinding the tree to pristine...\n" -msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n" - -#: builtin/merge.c:1607 -#, c-format -msgid "Trying merge strategy %s...\n" -msgstr "%s birleştirme stratejisi deneniyor...\n" - -#: builtin/merge.c:1659 -#, c-format -msgid "No merge strategy handled the merge.\n" -msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n" - -#: builtin/merge.c:1661 -#, c-format -msgid "Merge with strategy %s failed.\n" -msgstr "%s stratejisi ile birleştirme başarısız oldu.\n" - -#: builtin/merge.c:1670 -#, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "El ile çözümü hazırlamak için %s kullanılıyor.\n" - -#: builtin/merge.c:1682 -#, c-format -msgid "Automatic merge went well; stopped before committing as requested\n" -msgstr "" -"Otomatik birleştirme iyi geçti; istendiği üzere gönderme öncesinde durdu.\n" - -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <gönderi> <gönderi>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <gönderi>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <gönderi>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <gönderi> <gönderi>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <başvuru> [<gönderi>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "tüm ortak ataları çıktı ver" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "tek bir n yönlü birleştirme için ataları bul" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "başkaları tarafından ulaşılabilir revizyonları listele" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "ilki diğerlerinin atası mı?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "<gönderi>'nin nerede <başvuru>'nun günlüğünden çatallandığını bul" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<seçenekler>] [-L <ad1> [-L <orij> [-L <ad2>]]] <dosya1> " -"<orij-dosya> <dosya2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "sonuçları standart çıktıya gönder" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "diff3 tabanlı birleştirme kullan" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "çakışmalarda bizim sürümü kullan" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "çakışmalarda onların sürümünü kullan" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "çakışmalarda birlik olmuş bir sürüm kullan" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "çakışmalarda bu imleyici boyutunu kullan" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "çakışmalar hakkında uyarma" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "file1/orig-file/file2 için etiketler yapıştır" - -#: builtin/merge-recursive.c:47 -#, c-format -msgid "unknown option %s" -msgstr "bilinmeyen seçenek %s" - -#: builtin/merge-recursive.c:53 -#, c-format -msgid "could not parse object '%s'" -msgstr "'%s' nesnesi ayrıştırılamadı" - -#: builtin/merge-recursive.c:57 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "%d tabandan fazlası işlenemiyor. %s yok sayılıyor." -msgstr[1] "%d tabandan fazlası işlenemiyor. %s yok sayılıyor." - -#: builtin/merge-recursive.c:65 -msgid "not handling anything other than two heads merge." -msgstr "iki dal ucu birleştirmesinden başka bir şey işlenmiyor" - -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "'%s' başvurusu çözülemedi" - -#: builtin/merge-recursive.c:82 -#, c-format -msgid "Merging %s with %s\n" -msgstr "%s, %s ile birleştiriliyor\n" - -#: builtin/mktree.c:66 -msgid "git mktree [-z] [--missing] [--batch]" -msgstr "git mktree [-z] [--missing] [--batch]" - -#: builtin/mktree.c:154 -msgid "input is NUL terminated" -msgstr "girdi NUL ile sonlandırıldı" - -#: builtin/mktree.c:155 builtin/write-tree.c:26 -msgid "allow missing objects" -msgstr "eksik nesnelere izin ver" - -#: builtin/mktree.c:156 -msgid "allow creation of more than one tree" -msgstr "birden çok ağacın oluşturulmasına izin ver" - -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" -"git multi-pack-index [<seçenekler>] (write|verify|expire|repack --batch-" -"size=<boyut>)" - -#: builtin/multi-pack-index.c:26 -msgid "object directory containing set of packfile and pack-index pairs" -msgstr "nesne dizini paket dosyası seti ve pack-index eşleri içeriyor" - -#: builtin/multi-pack-index.c:29 -msgid "" -"during repack, collect pack-files of smaller size into a batch that is " -"larger than this size" -msgstr "" -"yeniden paketleme sırasında daha küçük boyutlu paket dosyalarını bu boyuttan " -"daha büyük bir toplu iş olarak toplayın" - -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 -msgid "too many arguments" -msgstr "çok fazla değişken" - -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" -msgstr "--batch-size seçeneği yalnızca 'repack' altkomutu için" - -#: builtin/multi-pack-index.c:69 -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "tanımlanamayan altkomut: %s" - -#: builtin/mv.c:18 -msgid "git mv [<options>] <source>... <destination>" -msgstr "git mv [<seçenekler>] <kaynak>... <hedef>" - -#: builtin/mv.c:83 -#, c-format -msgid "Directory %s is in index and no submodule?" -msgstr "%s dizini indekste ve altmodül değil mi?" - -#: builtin/mv.c:85 -msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"İlerlemek için lütfen değişikliklerinizi .gitmodules'e hazırlayın veya " -"zulalayın" - -#: builtin/mv.c:103 -#, c-format -msgid "%.*s is in index" -msgstr "%.*s indekste" - -#: builtin/mv.c:125 -msgid "force move/rename even if target exists" -msgstr "hedef var olsa bile zorla taşı/yeniden adlandır" - -#: builtin/mv.c:127 -msgid "skip move/rename errors" -msgstr "taşı/yeniden adlandır hatalarını atla" - -#: builtin/mv.c:169 -#, c-format -msgid "destination '%s' is not a directory" -msgstr "'%s' hedefi bir dizin değil" - -#: builtin/mv.c:180 -#, c-format -msgid "Checking rename of '%s' to '%s'\n" -msgstr "'%s'->'%s' yeniden adlandırması denetleniyor\n" - -#: builtin/mv.c:184 -msgid "bad source" -msgstr "hatalı kaynak" - -#: builtin/mv.c:187 -msgid "can not move directory into itself" -msgstr "dizin kendi içine taşınamıyor" - -#: builtin/mv.c:190 -msgid "cannot move directory over file" -msgstr "dizin dosya üzerinden taşınamıyor" - -#: builtin/mv.c:199 -msgid "source directory is empty" -msgstr "kaynak dizin boş" - -#: builtin/mv.c:224 -msgid "not under version control" -msgstr "sürüm denetimi altında değil" - -#: builtin/mv.c:227 -msgid "destination exists" -msgstr "hedef mevcut" - -#: builtin/mv.c:235 -#, c-format -msgid "overwriting '%s'" -msgstr "üzerine yazılıyor: '%s'" - -#: builtin/mv.c:238 -msgid "Cannot overwrite" -msgstr "Üzerine yazılamıyor" - -#: builtin/mv.c:241 -msgid "multiple sources for the same target" -msgstr "aynı hedef için birden çok kaynak" - -#: builtin/mv.c:243 -msgid "destination directory does not exist" -msgstr "hedef dizin mevcut değil" - -#: builtin/mv.c:250 -#, c-format -msgid "%s, source=%s, destination=%s" -msgstr "%s, kaynak=%s, hedef:%s" - -#: builtin/mv.c:271 -#, c-format -msgid "Renaming %s to %s\n" -msgstr "%s, %s olarak yeniden adlandırılıyor\n" - -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 -#, c-format -msgid "renaming '%s' failed" -msgstr "'%s' yeniden adlandırılamadı" - -#: builtin/name-rev.c:465 -msgid "git name-rev [<options>] <commit>..." -msgstr "git name-rev [<seçenekler>] <gönderi>..." - -#: builtin/name-rev.c:466 -msgid "git name-rev [<options>] --all" -msgstr "git name-rev [<seçenekler>] --all" - -#: builtin/name-rev.c:467 -msgid "git name-rev [<options>] --stdin" -msgstr "git name-rev [<seçenekler>] --stdin" - -#: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" -msgstr "yalnızca adları yazdır (SHA-1 yok)" - -#: builtin/name-rev.c:525 -msgid "only use tags to name the commits" -msgstr "gönderileri adlandırmak için yalnızca etiketleri kullan" - -#: builtin/name-rev.c:527 -msgid "only use refs matching <pattern>" -msgstr "yalnızca <dizgi> ile eşleşen başvuruları kullan" - -#: builtin/name-rev.c:529 -msgid "ignore refs matching <pattern>" -msgstr "<dizgi> ile eşleşen başvuruları yok say" - -#: builtin/name-rev.c:531 -msgid "list all commits reachable from all refs" -msgstr "tüm başvurulardan ulaşılabilir olan tüm gönderileri listele" - -#: builtin/name-rev.c:532 -msgid "read from stdin" -msgstr "stdin'den oku" - -#: builtin/name-rev.c:533 -msgid "allow to print `undefined` names (default)" -msgstr "'tanımlanmayan' adların yazdırılmasına izin ver (öntanımlı)" - -#: builtin/name-rev.c:539 -msgid "dereference tags in the input (internal use)" -msgstr "girdide etiketlerin başvurularını kaldır (iç kullanım)" - -#: builtin/notes.c:28 -msgid "git notes [--ref <notes-ref>] [list [<object>]]" -msgstr "git notes [--ref <not-bşvr>] [list [<nesne>]]" - -#: builtin/notes.c:29 -msgid "" -"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " -"| (-c | -C) <object>] [<object>]" -msgstr "" -"git notes [--ref <not-bşvr>] add [-f] [--allow-empty] [-m <ileti> | -F " -"<dosya> | (-c | -C) <nesne>] [<nesne>]" - -#: builtin/notes.c:30 -msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" -msgstr "git notes [--ref <not-bşvr>] copy [-f] <nesneden> <nesneye>" - -#: builtin/notes.c:31 -msgid "" -"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " -"(-c | -C) <object>] [<object>]" -msgstr "" -"git notes [--ref <not-bşvr>] append [--allow-empty] [-m <ileti> | -F <dosya> " -"| (-c | -C) <nesne>] [<nesne>]" - -#: builtin/notes.c:32 -msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" -msgstr "git notes [--ref <not-bşvr>] edit [--allow-empty] [<nesne>]" - -#: builtin/notes.c:33 -msgid "git notes [--ref <notes-ref>] show [<object>]" -msgstr "git notes [--ref <not-bşvr>] show [<nesne>]" - -#: builtin/notes.c:34 -msgid "" -"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" -msgstr "" -"git notes [--ref <not-bşvr>] merge [-v | -q] [-s <strateji>] <not-bşvr>" - -#: builtin/notes.c:35 -msgid "git notes merge --commit [-v | -q]" -msgstr "git notes merge --commit [-v | -q]" - -#: builtin/notes.c:36 -msgid "git notes merge --abort [-v | -q]" -msgstr "git notes merge --abort [-v | -q]" - -#: builtin/notes.c:37 -msgid "git notes [--ref <notes-ref>] remove [<object>...]" -msgstr "git notes [--ref <not-bşvr>] remove [<nesne>...]" - -#: builtin/notes.c:38 -msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" -msgstr "git notes [--ref <not-bşvr>] prune [-n] [-v]" - -#: builtin/notes.c:39 -msgid "git notes [--ref <notes-ref>] get-ref" -msgstr "git notes [--ref <not-bşvr>] get-ref" - -#: builtin/notes.c:44 -msgid "git notes [list [<object>]]" -msgstr "git notes [list [<nesne>]]" - -#: builtin/notes.c:49 -msgid "git notes add [<options>] [<object>]" -msgstr "git notes add [<seçenekler>] [<nesne>]" - -#: builtin/notes.c:54 -msgid "git notes copy [<options>] <from-object> <to-object>" -msgstr "git notes copy [<seçenekler>] <nesneden> <nesneye>" - -#: builtin/notes.c:55 -msgid "git notes copy --stdin [<from-object> <to-object>]..." -msgstr "git notes copy --stdin [<nesneden> <nesneye>]..." - -#: builtin/notes.c:60 -msgid "git notes append [<options>] [<object>]" -msgstr "git notes append [<seçenekler>] [<nesne>]" - -#: builtin/notes.c:65 -msgid "git notes edit [<object>]" -msgstr "git notes edit [<nesne>]" - -#: builtin/notes.c:70 -msgid "git notes show [<object>]" -msgstr "git notes show [<nesne>]" - -#: builtin/notes.c:75 -msgid "git notes merge [<options>] <notes-ref>" -msgstr "git notes merge [<seçenekler>] <not-bşvr>" - -#: builtin/notes.c:76 -msgid "git notes merge --commit [<options>]" -msgstr "git notes merge --commit [<seçenekler>]" - -#: builtin/notes.c:77 -msgid "git notes merge --abort [<options>]" -msgstr "git notes merge --abort [<seçenekler>]" - -#: builtin/notes.c:82 -msgid "git notes remove [<object>]" -msgstr "git notes remove [<nesne>]" - -#: builtin/notes.c:87 -msgid "git notes prune [<options>]" -msgstr "git notes prune [<seçenekler>]" - -#: builtin/notes.c:92 -msgid "git notes get-ref" -msgstr "git notes get-ref" - -#: builtin/notes.c:97 -msgid "Write/edit the notes for the following object:" -msgstr "Aşağıdaki nesneler için not yaz/düzenle:" - -#: builtin/notes.c:150 -#, c-format -msgid "unable to start 'show' for object '%s'" -msgstr "'%s' nesnesi için 'show' başlatılamıyor" - -#: builtin/notes.c:154 -msgid "could not read 'show' output" -msgstr "'show' çıktısı okunamadı" - -#: builtin/notes.c:162 -#, c-format -msgid "failed to finish 'show' for object '%s'" -msgstr "'%s' nesnesi için 'show' bitirilemedi" - -#: builtin/notes.c:197 -msgid "please supply the note contents using either -m or -F option" -msgstr "not içeriğini lütfen -m veya -F seçeneğini kullanarak sağlayın" - -#: builtin/notes.c:206 -msgid "unable to write note object" -msgstr "not nesnesi yazılamıyor" - -#: builtin/notes.c:208 -#, c-format -msgid "the note contents have been left in %s" -msgstr "not içeriği %s içinde bırakıldı" - -#: builtin/notes.c:242 builtin/tag.c:532 -#, c-format -msgid "could not open or read '%s'" -msgstr "'%s' açılamadı veya okunamadı" - -#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 -#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 -#, c-format -msgid "failed to resolve '%s' as a valid ref." -msgstr "'%s' geçerli bir başvuru olarak çözülemedi" - -#: builtin/notes.c:265 -#, c-format -msgid "failed to read object '%s'." -msgstr "'%s' nesnesi okunamadı." - -#: builtin/notes.c:268 -#, c-format -msgid "cannot read note data from non-blob object '%s'." -msgstr "İkili nesne olmayan '%s' nesnesinden not verisi okunamıyor." - -#: builtin/notes.c:309 -#, c-format -msgid "malformed input line: '%s'." -msgstr "hatalı oluşturulmuş girdi satırı: '%s'" - -#: builtin/notes.c:324 -#, c-format -msgid "failed to copy notes from '%s' to '%s'" -msgstr "notlar '%s' konumundan '%s' konumuna kopyalanamadı" - -#. TRANSLATORS: the first %s will be replaced by a git -#. notes command: 'add', 'merge', 'remove', etc. -#. -#: builtin/notes.c:356 -#, c-format -msgid "refusing to %s notes in %s (outside of refs/notes/)" -msgstr "notları %s yapma (%s içinde) reddediliyor (refs/notes/ dışında)" - -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "çok fazla parametre" - -#: builtin/notes.c:389 builtin/notes.c:678 -#, c-format -msgid "no note found for object %s." -msgstr "%s nesnesi için not bulunamadı." - -#: builtin/notes.c:410 builtin/notes.c:576 -msgid "note contents as a string" -msgstr "not içeriği dizi olarak" - -#: builtin/notes.c:413 builtin/notes.c:579 -msgid "note contents in a file" -msgstr "not içeriği bir dosyada" - -#: builtin/notes.c:416 builtin/notes.c:582 -msgid "reuse and edit specified note object" -msgstr "belirtilen not nesnesini düzenle ve yeniden kullan" - -#: builtin/notes.c:419 builtin/notes.c:585 -msgid "reuse specified note object" -msgstr "belirtilen not nesnesini yeniden kullan" - -#: builtin/notes.c:422 builtin/notes.c:588 -msgid "allow storing empty note" -msgstr "boş not depolamasına izin ver" - -#: builtin/notes.c:423 builtin/notes.c:496 -msgid "replace existing notes" -msgstr "var olan notları başkalarıyla değiştir" - -#: builtin/notes.c:448 -#, c-format -msgid "" -"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " -"existing notes" -msgstr "" -"Not eklenemiyor. %s nesnesi için halihazırda var olan notlar bulundu. Bu " -"notların üzerine yazmak için '-f' kullanın." - -#: builtin/notes.c:463 builtin/notes.c:544 -#, c-format -msgid "Overwriting existing notes for object %s\n" -msgstr "%s nesnesi için var olan notların üzerine yazılıyor\n" - -#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 -#, c-format -msgid "Removing note for object %s\n" -msgstr "%s nesnesi için olan not kaldırılıyor\n" - -#: builtin/notes.c:497 -msgid "read objects from stdin" -msgstr "nesneleri stdin'den oku" - -#: builtin/notes.c:499 -msgid "load rewriting config for <command> (implies --stdin)" -msgstr "<komut> için yapılandırma yeniden yazımını yükle (--stdin ima eder)" - -#: builtin/notes.c:517 -msgid "too few parameters" -msgstr "çok az parametre" - -#: builtin/notes.c:538 -#, c-format -msgid "" -"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " -"existing notes" -msgstr "" -"Notlar kopyalanamıyor. %s nesnesi için halihazırda var olan notlar bulundu. " -"Bu notların üzerine yazmak için '-f' kullanın." - -#: builtin/notes.c:550 -#, c-format -msgid "missing notes on source object %s. Cannot copy." -msgstr "%s kaynak nesnesi için not eksik. Kopyalanamıyor." - -#: builtin/notes.c:603 -#, c-format -msgid "" -"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" -"Please use 'git notes add -f -m/-F/-c/-C' instead.\n" -msgstr "" -"-m/-F/-c/-C seçenekleri 'edit' komutu için kullanım dışı bırakıldı.\n" -"Lütfen bunun yerine 'git notes add -f -m/-F/-c/-C' kullanın.\n" - -#: builtin/notes.c:698 -msgid "failed to delete ref NOTES_MERGE_PARTIAL" -msgstr "NOTES_MERGE_PARTIAL başvurusu silinemedi" - -#: builtin/notes.c:700 -msgid "failed to delete ref NOTES_MERGE_REF" -msgstr "NOTES_MERGE_REF başvurusu silinemedi" - -#: builtin/notes.c:702 -msgid "failed to remove 'git notes merge' worktree" -msgstr "'git remove merge' çalışma ağacı kaldırılamadı" - -#: builtin/notes.c:722 -msgid "failed to read ref NOTES_MERGE_PARTIAL" -msgstr "NOTES_MERGE_PARTIAL başvurusu okunamadı" - -#: builtin/notes.c:724 -msgid "could not find commit from NOTES_MERGE_PARTIAL." -msgstr "NOTES_MERGE_PARTIAL ögesinden gönderi bulunamadı." - -#: builtin/notes.c:726 -msgid "could not parse commit from NOTES_MERGE_PARTIAL." -msgstr "NOTES_MERGE_PARTIAL ögesinden gönderi ayrıştırılamadı" - -#: builtin/notes.c:739 -msgid "failed to resolve NOTES_MERGE_REF" -msgstr "NOTES_MERGE_REF çözülemedi" - -#: builtin/notes.c:742 -msgid "failed to finalize notes merge" -msgstr "not birleştirilmesi tamamlanamadı" - -#: builtin/notes.c:768 -#, c-format -msgid "unknown notes merge strategy %s" -msgstr "bilinmeyen not birleştirme stratejisi %s" - -#: builtin/notes.c:784 -msgid "General options" -msgstr "Genel seçenekler" - -#: builtin/notes.c:786 -msgid "Merge options" -msgstr "Birleştirme seçenekleri" - -#: builtin/notes.c:788 -msgid "" -"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" -"cat_sort_uniq)" -msgstr "" -"not çakışmalarını verilen stratejiyi kullanarak çöz (el ile/bizimkionlarınki/" -"birlik olmuş/cat_sort_uniq)" - -#: builtin/notes.c:790 -msgid "Committing unmerged notes" -msgstr "Birleştirilmemiş notlar gönderiliyor" - -#: builtin/notes.c:792 -msgid "finalize notes merge by committing unmerged notes" -msgstr "birleştirilmemiş notları göndererek not birleştirmesini tamamla" - -#: builtin/notes.c:794 -msgid "Aborting notes merge resolution" -msgstr "Notlar birleştirmesi çözümü iptal ediliyor" - -#: builtin/notes.c:796 -msgid "abort notes merge" -msgstr "not birleştirmesini iptal et" - -#: builtin/notes.c:807 -msgid "cannot mix --commit, --abort or -s/--strategy" -msgstr "--commit, --abort veya -s/--strategy karıştırılamıyor" - -#: builtin/notes.c:812 -msgid "must specify a notes ref to merge" -msgstr "birleştirmek için bir not başvurusu belirtilmeli" - -#: builtin/notes.c:836 -#, c-format -msgid "unknown -s/--strategy: %s" -msgstr "bilinmeyen -s/--strategy: %s" - -#: builtin/notes.c:873 -#, c-format -msgid "a notes merge into %s is already in-progress at %s" -msgstr "%s konumuna bir not birleştirmesi halihazırda %s konumunda sürüyor" - -#: builtin/notes.c:876 -#, c-format -msgid "failed to store link to current notes ref (%s)" -msgstr "geçerli not başvurusuna bağlantı depolanamadı (%s)" - -#: builtin/notes.c:878 -#, c-format -msgid "" -"Automatic notes merge failed. Fix conflicts in %s and commit the result with " -"'git notes merge --commit', or abort the merge with 'git notes merge --" -"abort'.\n" -msgstr "" -"Kendiliğinden not birleştirmesi başarısız oldu. %s içindeki çakışmaları " -"çözün ve sonucu 'git notes merge --commit' ile gönderin. Birleştirmeyi iptal " -"etmek isterseniz 'git notes merge --abort' kullanarak bunu yapabilirsiniz.\n" - -#: builtin/notes.c:897 builtin/tag.c:545 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "'%s' geçerli bir başvuru olarak çözülemiyor" - -#: builtin/notes.c:900 -#, c-format -msgid "Object %s has no note\n" -msgstr "%s nesnesinin notu yok\n" - -#: builtin/notes.c:912 -msgid "attempt to remove non-existent note is not an error" -msgstr "var olmayan notu kaldırma denemesi bir hata değil" - -#: builtin/notes.c:915 -msgid "read object names from the standard input" -msgstr "nesne adlarını standart girdi'den oku" - -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 -msgid "do not remove, show only" -msgstr "kaldırma, yalnızca göster" - -#: builtin/notes.c:955 -msgid "report pruned notes" -msgstr "budanmış notları kaldır" - -#: builtin/notes.c:998 -msgid "notes-ref" -msgstr "not başvurusu" - -#: builtin/notes.c:999 -msgid "use notes from <notes-ref>" -msgstr "notları <not-bşvr>'ndan kullan" - -#: builtin/notes.c:1034 builtin/stash.c:1643 -#, c-format -msgid "unknown subcommand: %s" -msgstr "bilinmeyen altkomut: %s" - -#: builtin/pack-objects.c:52 -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "" -"git pack-objects --stdout [<seçenekler>...] [< <bşvr-liste> | < <nesne-" -"liste>]" - -#: builtin/pack-objects.c:53 -msgid "" -"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" -msgstr "" -"git pack-objects [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]" - -#: builtin/pack-objects.c:430 -#, c-format -msgid "bad packed object CRC for %s" -msgstr "%s için hatalı paketlenmiş nesne CRC'si" - -#: builtin/pack-objects.c:441 -#, c-format -msgid "corrupt packed object for %s" -msgstr "%s için hasar görmüş paketlenmiş nesne" - -#: builtin/pack-objects.c:572 -#, c-format -msgid "recursive delta detected for object %s" -msgstr "%s nesnesi için özyineli delta algılandı" - -#: builtin/pack-objects.c:783 -#, c-format -msgid "ordered %u objects, expected %<PRIu32>" -msgstr "%u nesne sipariş verildi, %<PRIu32> bekleniyordu" - -#: builtin/pack-objects.c:972 -msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" -msgstr "" -"biteşlem yazımı kapatılıyor, paketler pack.packSizeLimit dolayısıyla " -"parçalara ayrılmış" - -#: builtin/pack-objects.c:985 -msgid "Writing objects" -msgstr "Nesneler yazılıyor" - -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 -#, c-format -msgid "failed to stat %s" -msgstr "%s bilgileri alınamıyor" - -#: builtin/pack-objects.c:1099 -#, c-format -msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" -msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)" - -#: builtin/pack-objects.c:1297 -msgid "disabling bitmap writing, as some objects are not being packed" -msgstr "bazı nesneler paketlenmediğinden dolayı biteşlem yazımı kapatılıyor" - -#: builtin/pack-objects.c:1724 -#, c-format -msgid "delta base offset overflow in pack for %s" -msgstr "%s için paket içinde delta taban ofset taşımı" - -#: builtin/pack-objects.c:1733 -#, c-format -msgid "delta base offset out of bound for %s" -msgstr "%s için delta taban ofseti sınırların dışında" - -#: builtin/pack-objects.c:2004 -msgid "Counting objects" -msgstr "Nesneler sayılıyor" - -#: builtin/pack-objects.c:2149 -#, c-format -msgid "unable to parse object header of %s" -msgstr "%s nesne üstbilgisi ayrıştırılamıyor" - -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 -#, c-format -msgid "object %s cannot be read" -msgstr "%s nesnesi okunamıyor" - -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 -#, c-format -msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" -msgstr "%s nesnesi için tutarsız nesne uzunluğu (%<PRIuMAX> / %<PRIuMAX>)" - -#: builtin/pack-objects.c:2259 -msgid "suboptimal pack - out of memory" -msgstr "standart altı paket - bellek yetersiz" - -#: builtin/pack-objects.c:2574 -#, c-format -msgid "Delta compression using up to %d threads" -msgstr "Delta sıkıştırması %d iş parçacığı kullanıyor" - -#: builtin/pack-objects.c:2713 -#, c-format -msgid "unable to pack objects reachable from tag %s" -msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor" - -#: builtin/pack-objects.c:2801 -msgid "Compressing objects" -msgstr "Nesneler sıkıştırılıyor" - -#: builtin/pack-objects.c:2807 -msgid "inconsistency with delta count" -msgstr "delta sayımında tutarsızlık" - -#: builtin/pack-objects.c:2888 -#, c-format -msgid "" -"expected edge object ID, got garbage:\n" -" %s" -msgstr "" -"sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n" -" %s" - -#: builtin/pack-objects.c:2894 -#, c-format -msgid "" -"expected object ID, got garbage:\n" -" %s" -msgstr "" -"nesne numarası bekleniyordu, anlamsız veri alındı:\n" -"%s" - -#: builtin/pack-objects.c:2992 -msgid "invalid value for --missing" -msgstr "--missing için geçersiz değer" - -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 -msgid "cannot open pack index" -msgstr "paket indeksi açılamıyor" - -#: builtin/pack-objects.c:3082 -#, c-format -msgid "loose object at %s could not be examined" -msgstr "%s konumundaki gevşek nesne incelenemedi" - -#: builtin/pack-objects.c:3167 -msgid "unable to force loose object" -msgstr "gevşek nesne zorlanamıyor" - -#: builtin/pack-objects.c:3260 -#, c-format -msgid "not a rev '%s'" -msgstr "bir revizyon değil: '%s'" - -#: builtin/pack-objects.c:3263 -#, c-format -msgid "bad revision '%s'" -msgstr "hatalı revizyon: '%s'" - -#: builtin/pack-objects.c:3288 -msgid "unable to add recent objects" -msgstr "en son nesneler eklenemiyor" - -#: builtin/pack-objects.c:3341 -#, c-format -msgid "unsupported index version %s" -msgstr "desteklenmeyen indeks sürümü %s" - -#: builtin/pack-objects.c:3345 -#, c-format -msgid "bad index version '%s'" -msgstr "hatalı indeks sürümü '%s'" - -#: builtin/pack-objects.c:3383 -msgid "<version>[,<offset>]" -msgstr "<sürüm>[,<ofset>]" - -#: builtin/pack-objects.c:3384 -msgid "write the pack index file in the specified idx format version" -msgstr "paket indeks dosyasını belirtilen idx biçiminde yaz" - -#: builtin/pack-objects.c:3387 -msgid "maximum size of each output pack file" -msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu" - -#: builtin/pack-objects.c:3389 -msgid "ignore borrowed objects from alternate object store" -msgstr "alternatif nesne mağazasından ödünç alınan nesneleri yok say" - -#: builtin/pack-objects.c:3391 -msgid "ignore packed objects" -msgstr "paketlenmiş nesneleri yok say" - -#: builtin/pack-objects.c:3393 -msgid "limit pack window by objects" -msgstr "paket penceresini nesnelerle sınırla" - -#: builtin/pack-objects.c:3395 -msgid "limit pack window by memory in addition to object limit" -msgstr "paket penceresini nesne limitine ek olarak bellek ile kısıtla" - -#: builtin/pack-objects.c:3397 -msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "ortaya çıkan pakette olabilecek en büyük delta zincirinin uzunluğu" - -#: builtin/pack-objects.c:3399 -msgid "reuse existing deltas" -msgstr "var olan deltaları yeniden kullan" - -#: builtin/pack-objects.c:3401 -msgid "reuse existing objects" -msgstr "var olan nesneleri yeniden kullan" - -#: builtin/pack-objects.c:3403 -msgid "use OFS_DELTA objects" -msgstr "OFS_DELTA nesneleri kullan" - -#: builtin/pack-objects.c:3405 -msgid "use threads when searching for best delta matches" -msgstr "en iyi delta eşleşmelerini ararken iş parçacıklarını kullan" - -#: builtin/pack-objects.c:3407 -msgid "do not create an empty pack output" -msgstr "boş bir paket çıktısı oluşturma" - -#: builtin/pack-objects.c:3409 -msgid "read revision arguments from standard input" -msgstr "revizyon değişkenlerini standart girdi'den oku" - -#: builtin/pack-objects.c:3411 -msgid "limit the objects to those that are not yet packed" -msgstr "nesneleri henüz paketlenmeyenlere kısıtla" - -#: builtin/pack-objects.c:3414 -msgid "include objects reachable from any reference" -msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer" - -#: builtin/pack-objects.c:3417 -msgid "include objects referred by reflog entries" -msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer" - -#: builtin/pack-objects.c:3420 -msgid "include objects referred to by the index" -msgstr "indeks tarafından başvurulan nesneleri içer" - -#: builtin/pack-objects.c:3423 -msgid "output pack to stdout" -msgstr "paketi stdout'a çıktı ver" - -#: builtin/pack-objects.c:3425 -msgid "include tag objects that refer to objects to be packed" -msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer" - -#: builtin/pack-objects.c:3427 -msgid "keep unreachable objects" -msgstr "ulaşılamayan nesneleri tut" - -#: builtin/pack-objects.c:3429 -msgid "pack loose unreachable objects" -msgstr "ulaşılamayan gevşek nesneleri paketle" - -#: builtin/pack-objects.c:3431 -msgid "unpack unreachable objects newer than <time>" -msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç" - -#: builtin/pack-objects.c:3434 -msgid "use the sparse reachability algorithm" -msgstr "aralıklı ulaşılabilirlik algoritmasını kullan" - -#: builtin/pack-objects.c:3436 -msgid "create thin packs" -msgstr "ince paketler oluştur" - -#: builtin/pack-objects.c:3438 -msgid "create packs suitable for shallow fetches" -msgstr "sığ getirmelere uygun paketler oluştur" - -#: builtin/pack-objects.c:3440 -msgid "ignore packs that have companion .keep file" -msgstr "eşlik eden .keep dosyasına iye paketleri yok say" - -#: builtin/pack-objects.c:3442 -msgid "ignore this pack" -msgstr "bu paketi yok say" - -#: builtin/pack-objects.c:3444 -msgid "pack compression level" -msgstr "paket sıkıştırma düzeyi" - -#: builtin/pack-objects.c:3446 -msgid "do not hide commits by grafts" -msgstr "aşılarla gelen gönderileri gizleme" - -#: builtin/pack-objects.c:3448 -msgid "use a bitmap index if available to speed up counting objects" -msgstr "" -"nesnelerin sayımını hızlandırmak için eğer varsa bir biteşlem indeksi kullan" - -#: builtin/pack-objects.c:3450 -msgid "write a bitmap index together with the pack index" -msgstr "paket indeksiyle birlikte bir biteşlem indeksi de yaz" - -#: builtin/pack-objects.c:3454 -msgid "write a bitmap index if possible" -msgstr "eğer olanaklıysa bir biteşlem indeksi yaz" - -#: builtin/pack-objects.c:3458 -msgid "handling for missing objects" -msgstr "eksik nesneler için işlem" - -#: builtin/pack-objects.c:3461 -msgid "do not pack objects in promisor packfiles" -msgstr "nesneleri vaatçi paket dosyalarıyla paketleme" - -#: builtin/pack-objects.c:3463 -msgid "respect islands during delta compression" -msgstr "delta sıkıştırması sırasında adalara uy" - -#: builtin/pack-objects.c:3492 -#, c-format -msgid "delta chain depth %d is too deep, forcing %d" -msgstr "delta zincir derinliği %d çok derin, %d zorlanıyor" - -#: builtin/pack-objects.c:3497 -#, c-format -msgid "pack.deltaCacheLimit is too high, forcing %d" -msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor" - -#: builtin/pack-objects.c:3551 -msgid "--max-pack-size cannot be used to build a pack for transfer" -msgstr "--max-pack-size, aktarım için bir paket yapımında kullanılamaz" - -#: builtin/pack-objects.c:3553 -msgid "minimum pack size limit is 1 MiB" -msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır" - -#: builtin/pack-objects.c:3558 -msgid "--thin cannot be used to build an indexable pack" -msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz" - -#: builtin/pack-objects.c:3561 -msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz" - -#: builtin/pack-objects.c:3567 -msgid "cannot use --filter without --stdout" -msgstr "--filter, --stdout olmadan kullanılamaz" - -#: builtin/pack-objects.c:3627 -msgid "Enumerating objects" -msgstr "Nesneler sayıp dökülüyor" - -#: builtin/pack-objects.c:3657 -#, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" -msgstr "" -"Toplam %<PRIu32> (delta %<PRIu32>), yeniden kullanılan %<PRIu32> (delta " -"%<PRIu32>), yeniden kullanılan paket %<PRIu32>" - -#: builtin/pack-refs.c:8 -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<seçenekler>]" - -#: builtin/pack-refs.c:16 -msgid "pack everything" -msgstr "her şeyi paketle" - -#: builtin/pack-refs.c:17 -msgid "prune loose refs (default)" -msgstr "gevşek başvuruları buda (öntanımlı)" - -#: builtin/prune-packed.c:9 -msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" -msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" - -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "Yinelenmiş nesneler kaldırılıyor" - -#: builtin/prune.c:12 -msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" -msgstr "" -"git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]" - -#: builtin/prune.c:131 -msgid "report pruned objects" -msgstr "budanmış nesneleri bildir" - -#: builtin/prune.c:134 -msgid "expire objects older than <time>" -msgstr "<zaman>'dan daha eski nesnelerin hükmünü kaldır" - -#: builtin/prune.c:136 -msgid "limit traversal to objects outside promisor packfiles" -msgstr "promisor paket dosyalarının dışındaki nesnelere taramayı kısıtla" - -#: builtin/prune.c:150 -msgid "cannot prune in a precious-objects repo" -msgstr "bir precious-objects deposu içinde budama yapılamıyor" - -#: builtin/pull.c:45 builtin/pull.c:47 -#, c-format -msgid "Invalid value for %s: %s" -msgstr "%s için geçersiz değer: %s" - -#: builtin/pull.c:67 -msgid "git pull [<options>] [<repository> [<refspec>...]]" -msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]" - -#: builtin/pull.c:122 -msgid "control for recursive fetching of submodules" -msgstr "altmodüllerin özyineli getirilmesi için denetleme" - -#: builtin/pull.c:126 -msgid "Options related to merging" -msgstr "Birleştirme ile ilgili seçenekler" - -#: builtin/pull.c:129 -msgid "incorporate changes by rebasing rather than merging" -msgstr "değişiklikleri birleştirme yerine yeniden temellendirme ile kat" - -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 -msgid "allow fast-forward" -msgstr "ileri sarıma izin ver" - -#: builtin/pull.c:166 -msgid "automatically stash/stash pop before and after rebase" -msgstr "" -"yeniden temellendirme öncesi ve sonrasında kendiliğinden zulala/zulayı patlat" - -#: builtin/pull.c:182 -msgid "Options related to fetching" -msgstr "Getirme ile ilgili seçenekler" - -#: builtin/pull.c:192 -msgid "force overwrite of local branch" -msgstr "zorla yerel dalın üzerine yaz" - -#: builtin/pull.c:200 -msgid "number of submodules pulled in parallel" -msgstr "paralelde çekilen altmodüllerin sayısı" - -#: builtin/pull.c:300 -#, c-format -msgid "Invalid value for pull.ff: %s" -msgstr "pull.ff için geçersiz değer: %s" - -#: builtin/pull.c:426 -msgid "" -"There is no candidate for rebasing against among the refs that you just " -"fetched." -msgstr "" -"Az önce getirdiğiniz referanslar arasında yeniden temellendirme için aday " -"yok." - -#: builtin/pull.c:428 -msgid "" -"There are no candidates for merging among the refs that you just fetched." -msgstr "Az önce getirdiğiniz başvurular arasında birleştirme için aday yok." - -#: builtin/pull.c:429 -msgid "" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "" -"Genellikle bu, uzak uçta eşleşmesi olmayan bir joker başvuru belirteci\n" -"sağladığınız anlamına gelir." - -#: builtin/pull.c:432 -#, c-format -msgid "" -"You asked to pull from the remote '%s', but did not specify\n" -"a branch. Because this is not the default configured remote\n" -"for your current branch, you must specify a branch on the command line." -msgstr "" -"'%s' uzak konumundan çekme yapmak istediniz, ancak bir dal belirtmediniz.\n" -"Bu, geçerli dalınız için öntanımlı yapılandırılmış uzak konum olmadığından,\n" -"komut satırında bir dal belirtmeniz gerekir." - -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 -msgid "You are not currently on a branch." -msgstr "Şu anda bir dal üzerinde değilsiniz." - -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 -msgid "Please specify which branch you want to rebase against." -msgstr "" -"Lütfen hangi dala karşı yeniden temellendirme yapmak istediğinizi belirtin." - -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 -msgid "Please specify which branch you want to merge with." -msgstr "Lütfen hangi dal ile birleştirmek istediğinizi belirtin." - -#: builtin/pull.c:442 builtin/pull.c:457 -msgid "See git-pull(1) for details." -msgstr "Ayrıntılar için: git-pull(1)" - -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 -msgid "<remote>" -msgstr "<uzak-konum>" - -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 -#: git-parse-remote.sh:65 -msgid "<branch>" -msgstr "<dal>" - -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 -msgid "There is no tracking information for the current branch." -msgstr "Geçerli dal için izleme bilgisi yok." - -#: builtin/pull.c:461 git-parse-remote.sh:95 -msgid "" -"If you wish to set tracking information for this branch you can do so with:" -msgstr "" -"Eğer bu dal için izleme bilgisi ayarlamak isterseniz şununla yapabilirsiniz:" - -#: builtin/pull.c:466 -#, c-format -msgid "" -"Your configuration specifies to merge with the ref '%s'\n" -"from the remote, but no such ref was fetched." -msgstr "" -"Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi söylüyor,\n" -"ancak böyle bir başvuru getirilmedi." - -#: builtin/pull.c:576 -#, c-format -msgid "unable to access commit %s" -msgstr "%s gönderisine erişilemedi" - -#: builtin/pull.c:857 -msgid "ignoring --verify-signatures for rebase" -msgstr "yeniden temellendirme için --verify-signature yok sayılıyor" - -#: builtin/pull.c:912 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "--[no-]autostash seçeneği yalnızca --rebase ile geçerli." - -#: builtin/pull.c:920 -msgid "Updating an unborn branch with changes added to the index." -msgstr "İndekse eklenen değişikliklerle henüz doğmamış bir dal güncelleniyor." - -#: builtin/pull.c:924 -msgid "pull with rebase" -msgstr "yeniden temellendirme ile çek" - -#: builtin/pull.c:925 -msgid "please commit or stash them." -msgstr "Lütfen onları gönderin veya zulalayın." - -#: builtin/pull.c:950 -#, c-format -msgid "" -"fetch updated the current branch head.\n" -"fast-forwarding your working tree from\n" -"commit %s." -msgstr "" -"Getirme geçerli dal ucunu güncelledi.\n" -"Çalışma ağacınız %s gönderisinden\n" -"ileri sarılıyor." - -#: builtin/pull.c:956 -#, c-format -msgid "" -"Cannot fast-forward your working tree.\n" -"After making sure that you saved anything precious from\n" -"$ git diff %s\n" -"output, run\n" -"$ git reset --hard\n" -"to recover." -msgstr "" -"Çalışma ağacınız ileri sarılamıyor.\n" -"$ git diff %s\n" -"çıktısından gerekli olacağını düşündüğünüz ögeleri\n" -"kaydettiğinizden emin olduktan sonra kurtarma için\n" -"$ git reset --hard\n" -"komutunu çalıştırın." - -#: builtin/pull.c:971 -msgid "Cannot merge multiple branches into empty head." -msgstr "Boş dal ucuna birden çok dal birleştirilemez." - -#: builtin/pull.c:975 -msgid "Cannot rebase onto multiple branches." -msgstr "Birden çok dala yeniden temellendirme yapılamaz." - -#: builtin/pull.c:982 -msgid "cannot rebase with locally recorded submodule modifications" -msgstr "" -"yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme " -"yapılamaz" - -#: builtin/push.c:19 -msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git push [<seçenekler>] [<depo> [<bşvr-blrtç>...]]" - -#: builtin/push.c:112 -msgid "tag shorthand without <tag>" -msgstr "stenografiyi <etiket> olmadan etiketle" - -#: builtin/push.c:122 -msgid "--delete only accepts plain target ref names" -msgstr "--delete yalnızca düz hedef başvuru adlarını kabul eder" - -#: builtin/push.c:168 -msgid "" -"\n" -"To choose either option permanently, see push.default in 'git help config'." -msgstr "" -"\n" -"Bu seçeneklerden birini kalıcı olarak seçmek için 'git help config' içinde " -"push.default girdisine bakın." - -#: builtin/push.c:171 -#, c-format -msgid "" -"The upstream branch of your current branch does not match\n" -"the name of your current branch. To push to the upstream branch\n" -"on the remote, use\n" -"\n" -" git push %s HEAD:%s\n" -"\n" -"To push to the branch of the same name on the remote, use\n" -"\n" -" git push %s HEAD\n" -"%s" -msgstr "" -"Geçerli dalınızın üstkaynak dalı, geçerli dalınızın adıyla\n" -"eşleşmiyor. Uzak konumdaki üstkaynağa gitmek için şunu kullanın:\n" -"\n" -"\tgit push %s HEAD:%s\n" -"\n" -"Uzak konumdaki aynı adlı dala itmek içinse şunu kullanın:\n" -"\n" -"\tgit push %s HEAD\n" -"%s" - -#: builtin/push.c:186 -#, c-format -msgid "" -"You are not currently on a branch.\n" -"To push the history leading to the current (detached HEAD)\n" -"state now, use\n" -"\n" -" git push %s HEAD:<name-of-remote-branch>\n" -msgstr "" -"Şu anda bir dal üzerinde değilsiniz.\n" -"Geçerli duruma (ayrık HEAD) yol açan geçmişi şimdi itmek\n" -"için şunu kullanın:\n" -"\n" -"\tgit push %s HEAD:<uzak-konum-dalının-adı>\n" - -#: builtin/push.c:200 -#, c-format -msgid "" -"The current branch %s has no upstream branch.\n" -"To push the current branch and set the remote as upstream, use\n" -"\n" -" git push --set-upstream %s %s\n" -msgstr "" -"Geçerli %s dalının bir üstkaynak dalı yok.\n" -"Geçerli dalı itmek ve uzak konumu üstkaynak olarak ayarlamak\n" -"için şunu kullanın:\n" -"\n" -"\tgit push --set-upstream %s %s\n" - -#: builtin/push.c:208 -#, c-format -msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "Geçerli %s dalının birden çok üstkaynağı var, itme reddediliyor." - -#: builtin/push.c:211 -#, c-format -msgid "" -"You are pushing to remote '%s', which is not the upstream of\n" -"your current branch '%s', without telling me what to push\n" -"to update which remote branch." -msgstr "" -"'%s' uzak konumuna hangi uzak dalı güncellemek için neyin\n" -"itileceğini belirtmeden itiyorsunuz, ancak o geçerli '%s'\n" -"dalınızın üstkaynağı değil." - -#: builtin/push.c:270 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "" -"İtmek için bir başvuru belirteci belirtmediniz ve push.default \"nothing\"." - -#: builtin/push.c:277 -msgid "" -"Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." -msgstr "" -"Güncellemeler reddedildi çünkü geçerli dalınızın ucu kendisinin\n" -"uzak konum karşıtından geride. Yeniden itmeden önce uzak konumdaki\n" -"değişiklikleri entegre edin (örn. 'git pull'...).\n" -"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın." - -#: builtin/push.c:283 -msgid "" -"Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and integrate the remote changes\n" -"(e.g. 'git pull ...') before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." -msgstr "" -"Güncellemeler reddedildi çünkü itilmiş bir dal ucu kendisinin\n" -"uzak konum karşıtından geride. Yeniden itmeden önce bu dalı çıkış\n" -"yapın ve uzak konumdaki değişiklikleri entegre edin (örn. 'git pull'...).\n" -"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın." - -#: builtin/push.c:289 -msgid "" -"Updates were rejected because the remote contains work that you do\n" -"not have locally. This is usually caused by another repository pushing\n" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." -msgstr "" -"Güncellemeler reddedildi çünkü uzak konumda henüz yerelde iyesi olmadığınız\n" -"değişiklikler var. Bu genelde başka bir deponun aynı başvuruya itmesinden\n" -"dolayı olur. Yeniden itmeden önce uzak konumdaki değişiklikleri entegre\n" -"etmek isteyebilirsiniz (örn. 'git pull'...).\n" -"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın." - -#: builtin/push.c:296 -msgid "Updates were rejected because the tag already exists in the remote." -msgstr "Güncellemeler reddedildi çünkü etiket uzak konumda halihazırda var." - -#: builtin/push.c:299 -msgid "" -"You cannot update a remote ref that points at a non-commit object,\n" -"or update a remote ref to make it point at a non-commit object,\n" -"without using the '--force' option.\n" -msgstr "" -"Gönderi olmayan bir nesneye işaret eden uzak başvuruyu güncelleyemez\n" -"veya --force seçeneğini kullanmadan bir uzak başvuruyu gönderi\n" -"olmayan bir nesneye işaret etmesini sağlaması için güncelleyemezsiniz.\n" - -#: builtin/push.c:360 -#, c-format -msgid "Pushing to %s\n" -msgstr "Şuraya itiliyor: %s\n" - -#: builtin/push.c:367 -#, c-format -msgid "failed to push some refs to '%s'" -msgstr "bazı başvurular '%s' konumuna itilemedi" - -#: builtin/push.c:542 -msgid "repository" -msgstr "depo" - -#: builtin/push.c:543 builtin/send-pack.c:164 -msgid "push all refs" -msgstr "tüm başvuruları it" - -#: builtin/push.c:544 builtin/send-pack.c:166 -msgid "mirror all refs" -msgstr "tüm başvuruları yansıla" - -#: builtin/push.c:546 -msgid "delete refs" -msgstr "başvuruları sil" - -#: builtin/push.c:547 -msgid "push tags (can't be used with --all or --mirror)" -msgstr "etiketleri it (--all veya --mirror ile kullanılamaz)" - -#: builtin/push.c:550 builtin/send-pack.c:167 -msgid "force updates" -msgstr "zorla güncelle" - -#: builtin/push.c:552 builtin/send-pack.c:181 -msgid "<refname>:<expect>" -msgstr "<başvuruadı>:<bekle>" - -#: builtin/push.c:553 builtin/send-pack.c:182 -msgid "require old value of ref to be at this value" -msgstr "başvurunun eski değerinin bu değerde olmasını gerektir" - -#: builtin/push.c:556 -msgid "control recursive pushing of submodules" -msgstr "altmodüllerin özyineli itilmesini denetle" - -#: builtin/push.c:558 builtin/send-pack.c:175 -msgid "use thin pack" -msgstr "ince paket kullan" - -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 -msgid "receive pack program" -msgstr "paket programını al" - -#: builtin/push.c:561 -msgid "set upstream for git pull/status" -msgstr "git pull/status için üstkaynak ayarla" - -#: builtin/push.c:564 -msgid "prune locally removed refs" -msgstr "yerelde kaldırılan başvuruları buda" - -#: builtin/push.c:566 -msgid "bypass pre-push hook" -msgstr "pre-push kancasını atla" - -#: builtin/push.c:567 -msgid "push missing but relevant tags" -msgstr "eksik ancak ilgili etiketleri it" - -#: builtin/push.c:570 builtin/send-pack.c:169 -msgid "GPG sign the push" -msgstr "itmeyi GPG ile imzala" - -#: builtin/push.c:572 builtin/send-pack.c:176 -msgid "request atomic transaction on remote side" -msgstr "uzak tarafta atomsal işlem iste" - -#: builtin/push.c:590 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete; --all, --mirror ve --tags ile uyumsuz" - -#: builtin/push.c:592 -msgid "--delete doesn't make sense without any refs" -msgstr "--delete bir başvuru olmadan anlam ifade etmiyor" - -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "hatalı depo '%s'" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Yapılandırılan itme hedefi yok.\n" -"Ya URL'yi komut satırından belirtin ya da şunu kullanarak bir uzak konum " -"deposu yapılandırın:\n" -"\n" -"\tgit remote add <ad> <url>\n" -"\n" -"ardından uzak konum adını kullanarak itin:\n" -"\n" -"\tgit push <ad>\n" - -#: builtin/push.c:628 -msgid "--all and --tags are incompatible" -msgstr "--all ve --tags birbiriyle uyumsuz" - -#: builtin/push.c:630 -msgid "--all can't be combined with refspecs" -msgstr "--all başvuru belirteçleriyle birleştirilemez" - -#: builtin/push.c:634 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror ve --tags birbiriyle uyumsuz" - -#: builtin/push.c:636 -msgid "--mirror can't be combined with refspecs" -msgstr "--mirror başvuru belirteçleriyle birleştirilemez" - -#: builtin/push.c:639 -msgid "--all and --mirror are incompatible" -msgstr "--all ve --mirror birbiriyle uyumsuz" - -#: builtin/push.c:643 -msgid "push options must not have new line characters" -msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı" - -#: builtin/range-diff.c:8 -msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" -msgstr "" -"git range-diff [<seçenekler>] <old-base>..<old-tip> <new-base>..<new-tip>" - -#: builtin/range-diff.c:9 -msgid "git range-diff [<options>] <old-tip>...<new-tip>" -msgstr "git range-diff [<seçenekler>] <old-tip>...<new-tip>" - -#: builtin/range-diff.c:10 -msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" -msgstr "git range-diff [<seçenekler>] <base> <old-tip> <new-tip>" - -#: builtin/range-diff.c:22 -msgid "Percentage by which creation is weighted" -msgstr "oluşumun tartıldığı yüzde" - -#: builtin/range-diff.c:24 -msgid "use simple diff colors" -msgstr "yalın diff renklerini kullan" - -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "notlar" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "'git log'a aktarıldı" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 -#, c-format -msgid "no .. in range: '%s'" -msgstr "erimde .. yok: '%s'" - -#: builtin/range-diff.c:64 -msgid "single arg format must be symmetric range" -msgstr "tekli değişken biçimi simetrik erim olmalı" - -#: builtin/range-diff.c:79 -msgid "need two commit ranges" -msgstr "iki gönderi erimi gerekli" - -#: builtin/read-tree.c:41 -msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" -msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<önek>) [-" -"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<dosya>] (--empty | <ağacımsı1> [<ağacımsı2> [<ağacımsı3>]])" - -#: builtin/read-tree.c:124 -msgid "write resulting index to <file>" -msgstr "ortaya çıkan indeksi <dosya>'ya yaz" - -#: builtin/read-tree.c:127 -msgid "only empty the index" -msgstr "yalnızca indeksi boşalt" - -#: builtin/read-tree.c:129 -msgid "Merging" -msgstr "Birleştiriliyor" - -#: builtin/read-tree.c:131 -msgid "perform a merge in addition to a read" -msgstr "bir okumaya ek olarak bir birleştirme gerçekleştir" - -#: builtin/read-tree.c:133 -msgid "3-way merge if no file level merging required" -msgstr "dosya düzeyinde birleştirme gerekmiyorsa 3 yönlü birleştir" - -#: builtin/read-tree.c:135 -msgid "3-way merge in presence of adds and removes" -msgstr "eklemeler ve kaldırmalar varlığında 3 yönlü birleştir" - -#: builtin/read-tree.c:137 -msgid "same as -m, but discard unmerged entries" -msgstr "-m ile aynı, ancak birleştirilmeyen girdileri atar" - -#: builtin/read-tree.c:138 -msgid "<subdirectory>/" -msgstr "<altdizin>/" - -#: builtin/read-tree.c:139 -msgid "read the tree into the index under <subdirectory>/" -msgstr "ağacı indekse <altdizin>/ altında oku" - -#: builtin/read-tree.c:142 -msgid "update working tree with merge result" -msgstr "birleştirme sonucuyla çalışma ağacını güncelleştir" - -#: builtin/read-tree.c:144 -msgid "gitignore" -msgstr "gitignore" - -#: builtin/read-tree.c:145 -msgid "allow explicitly ignored files to be overwritten" -msgstr "açıkça yok sayılan dosyaların üzerine yazılmasına izin ver" - -#: builtin/read-tree.c:148 -msgid "don't check the working tree after merging" -msgstr "birleştirmeden sonra çalışma ağacını denetleme" - -#: builtin/read-tree.c:149 -msgid "don't update the index or the work tree" -msgstr "indeksi veya çalışma ağacını güncelleme" - -#: builtin/read-tree.c:151 -msgid "skip applying sparse checkout filter" -msgstr "aralıklı çıkış süzgeci uygulamayı atla" - -#: builtin/read-tree.c:153 -msgid "debug unpack-trees" -msgstr "unpack-trees hatalarını ayıkla" - -#: builtin/read-tree.c:157 -msgid "suppress feedback messages" -msgstr "geribildirim iletilerini gizle" - -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Öncelikle geçerli indeksinizi çözmelisiniz" - -#: builtin/rebase.c:32 -msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" -msgstr "" -"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel> | --keep-" -"base] [<üstkaynak> [<dal>]]" - -#: builtin/rebase.c:34 -msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" -msgstr "" -"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel>] --root " -"[<dal>]" - -#: builtin/rebase.c:36 -msgid "git rebase --continue | --abort | --skip | --edit-todo" -msgstr "git rebase --continue | --abort | --skip | --edit-todo" - -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "kullanılamaz yapılacaklar listesi: '%s'" - -#: builtin/rebase.c:292 -#, c-format -msgid "could not create temporary %s" -msgstr "geçici %s oluşturulamadı" - -#: builtin/rebase.c:298 -msgid "could not mark as interactive" -msgstr "etkileşimli olarak imlenemedi" - -#: builtin/rebase.c:352 -msgid "could not generate todo list" -msgstr "yapılacaklar listesi oluşturulamadı" - -#: builtin/rebase.c:391 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "bir taban gönderisi --upstream veya --onto ile sağlanmalıdır" - -#: builtin/rebase.c:461 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<seçenekler>]" - -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(KULLANIM DIŞI) boş gönderileri tut" - -#: builtin/rebase.c:478 builtin/revert.c:128 -msgid "allow commits with empty messages" -msgstr "boş iletili gönderilere izin ver" - -#: builtin/rebase.c:480 -msgid "rebase merge commits" -msgstr "birleştirme gönderilerini yeniden temellendir" - -#: builtin/rebase.c:482 -msgid "keep original branch points of cousins" -msgstr "kuzenlerin orijinal dal noktalarını tut" - -#: builtin/rebase.c:484 -msgid "move commits that begin with squash!/fixup!" -msgstr "squash!/fixup! ile başlayan gönderileri taşı" - -#: builtin/rebase.c:485 -msgid "sign commits" -msgstr "gönderileri imzala" - -#: builtin/rebase.c:487 builtin/rebase.c:1490 -msgid "display a diffstat of what changed upstream" -msgstr "üstkaynakta nelerin değiştiğini gösteren bir diffstat görüntüle" - -#: builtin/rebase.c:489 -msgid "continue rebase" -msgstr "yeniden temellendirmeyi sürdür" - -#: builtin/rebase.c:491 -msgid "skip commit" -msgstr "gönderiyi atla" - -#: builtin/rebase.c:492 -msgid "edit the todo list" -msgstr "yapılacaklar listesini düzenle" - -#: builtin/rebase.c:494 -msgid "show the current patch" -msgstr "geçerli yamayı göster" - -#: builtin/rebase.c:497 -msgid "shorten commit ids in the todo list" -msgstr "yapılacaklar listesindeki gönderi numaralarını kısalt" - -#: builtin/rebase.c:499 -msgid "expand commit ids in the todo list" -msgstr "yapılacaklar listesindeki gönderi numaralarını genişlet" - -#: builtin/rebase.c:501 -msgid "check the todo list" -msgstr "yapılacaklar listesini denetle" - -#: builtin/rebase.c:503 -msgid "rearrange fixup/squash lines" -msgstr "fixup/squash satırlarını yeniden düzenle" - -#: builtin/rebase.c:505 -msgid "insert exec commands in todo list" -msgstr "yapılacaklar listesine 'exec' komutları ekle" - -#: builtin/rebase.c:506 -msgid "onto" -msgstr "üzerine" - -#: builtin/rebase.c:509 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase.c:509 -msgid "restrict revision" -msgstr "revizyonu sınırla" - -#: builtin/rebase.c:511 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase.c:512 -msgid "squash onto" -msgstr "tıkıştır" - -#: builtin/rebase.c:514 -msgid "the upstream commit" -msgstr "üstkaynak gönderisi" - -#: builtin/rebase.c:516 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase.c:516 -msgid "head name" -msgstr "dal ucu adı" - -#: builtin/rebase.c:521 -msgid "rebase strategy" -msgstr "yeniden temellendirme stratejisi" - -#: builtin/rebase.c:522 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase.c:523 -msgid "strategy options" -msgstr "strateji seçenekleri" - -#: builtin/rebase.c:524 -msgid "switch-to" -msgstr "switch-to" - -#: builtin/rebase.c:525 -msgid "the branch or commit to checkout" -msgstr "çıkış yapılacak dal veya gönderi" - -#: builtin/rebase.c:526 -msgid "onto-name" -msgstr "onto-name" - -#: builtin/rebase.c:526 -msgid "onto name" -msgstr "'onto' adı:" - -#: builtin/rebase.c:527 -msgid "cmd" -msgstr "komut" - -#: builtin/rebase.c:527 -msgid "the command to run" -msgstr "çalıştırılacak komut" - -#: builtin/rebase.c:530 builtin/rebase.c:1584 -msgid "automatically re-schedule any `exec` that fails" -msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla" - -#: builtin/rebase.c:546 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "" -"--[no-]rebase-cousins seçeneğinin --rebase-merges olmadan hiçbir etkisi yok" - -#: builtin/rebase.c:562 -#, c-format -msgid "%s requires an interactive rebase" -msgstr "%s bir etkileşimli yeniden temellendirme gerektiriyor" - -#: builtin/rebase.c:612 -#, c-format -msgid "could not get 'onto': '%s'" -msgstr "'onto' alınamadı: '%s'" - -#: builtin/rebase.c:627 -#, c-format -msgid "invalid orig-head: '%s'" -msgstr "geçersiz orig-head: '%s'" - -#: builtin/rebase.c:652 -#, c-format -msgid "ignoring invalid allow_rerere_autoupdate: '%s'" -msgstr "geçersiz allow_rerere_autoupdate yok sayılıyor: '%s'" - -#: builtin/rebase.c:728 -#, c-format -msgid "Could not read '%s'" -msgstr "'%s' okunamadı" - -#: builtin/rebase.c:746 -#, c-format -msgid "Cannot store %s" -msgstr "%s depolanamıyor" - -#: builtin/rebase.c:853 -msgid "could not determine HEAD revision" -msgstr "HEAD revizyonu saptanamadı" - -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 -msgid "" -"Resolve all conflicts manually, mark them as resolved with\n" -"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" -"You can instead skip this commit: run \"git rebase --skip\".\n" -"To abort and get back to the state before \"git rebase\", run \"git rebase --" -"abort\"." -msgstr "" -"Tüm çakışmaları el ile çözün, onları \"git add/rm <çakışan-dosyalar>\"\n" -"ile tamam olarak imleyin, ardından \"git rebase --continue\" çalıştırın.\n" -"Bunun yerine bu gönderiyi atlayabilirsiniz: \"git rebase --skip\" yapın.\n" -"İptal edip \"git rebase\" öncesine geri dönmek için \"git rebase --abort\"\n" -"çalıştırın." - -#: builtin/rebase.c:1058 -#, c-format -msgid "" -"\n" -"git encountered an error while preparing the patches to replay\n" -"these revisions:\n" -"\n" -" %s\n" -"\n" -"As a result, git cannot rebase them." -msgstr "" -"\n" -"Git, yamaları bu revizyonları yeniden oynatmak için hazırlarken bir\n" -"hatayla karşılaştı:\n" -"\n" -"\t%s\n" -"\n" -"Bunun sonucu olarak git onları yeniden temellendiremiyor." - -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\"" - -#: builtin/rebase.c:1401 -#, c-format -msgid "" -"%s\n" -"Please specify which branch you want to rebase against.\n" -"See git-rebase(1) for details.\n" -"\n" -" git rebase '<branch>'\n" -"\n" -msgstr "" -"%s\n" -"Lütfen hangi dala karşı yeniden temellendirmek istediğinizi belirtin.\n" -"Ayrıntılar için: git-rebase(1)\n" -"\n" -"\tgit rebase '<dal>'\n" -"\n" - -#: builtin/rebase.c:1417 -#, c-format -msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -"\n" -msgstr "" -"Eğer bu dal için izleme bilgisi ayarlamak istiyorsanız şunu kullanın:\n" -"\n" -"\tgit branch --set-upstream-to=%s/<dal> %s\n" -"\n" - -#: builtin/rebase.c:1447 -msgid "exec commands cannot contain newlines" -msgstr "'exec' komutları yenisatırlar içeremez" - -#: builtin/rebase.c:1451 -msgid "empty exec command" -msgstr "boş 'exec' komutu" - -#: builtin/rebase.c:1481 -msgid "rebase onto given branch instead of upstream" -msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir" - -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "üstkaynağın birleştirme temelini ve dalını geçerli temel olarak kullan" - -#: builtin/rebase.c:1485 -msgid "allow pre-rebase hook to run" -msgstr "pre-rebase kancasının çalışmasına izin ver" - -#: builtin/rebase.c:1487 -msgid "be quiet. implies --no-stat" -msgstr "sessiz ol (--no-stat ima eder)" - -#: builtin/rebase.c:1493 -msgid "do not show diffstat of what changed upstream" -msgstr "üstkaynakta nelerin değiştiğini gösteren diffstat gösterme" - -#: builtin/rebase.c:1496 -msgid "add a Signed-off-by: line to each commit" -msgstr "her gönderiye bir Signed-off-by satırı ekle" - -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 -msgid "passed to 'git am'" -msgstr "'git am'a aktarıldı" - -#: builtin/rebase.c:1506 builtin/rebase.c:1508 -msgid "passed to 'git apply'" -msgstr "'git apply'a aktarıldı" - -#: builtin/rebase.c:1510 builtin/rebase.c:1513 -msgid "cherry-pick all commits, even if unchanged" -msgstr "değiştirilmemiş olsa bile tüm gönderileri seç-al yap" - -#: builtin/rebase.c:1515 -msgid "continue" -msgstr "sürdür" - -#: builtin/rebase.c:1518 -msgid "skip current patch and continue" -msgstr "geçerli yamayı atla ve sürdür" - -#: builtin/rebase.c:1520 -msgid "abort and check out the original branch" -msgstr "iptal et ve orijinal dalı çıkış yap" - -#: builtin/rebase.c:1523 -msgid "abort but keep HEAD where it is" -msgstr "iptal et, ancak HEAD'i olduğu yerde bırak" - -#: builtin/rebase.c:1524 -msgid "edit the todo list during an interactive rebase" -msgstr "" -"bir etkileşimli yeniden temellendirme sırasında yapılacaklar listesini " -"düzenle" - -#: builtin/rebase.c:1527 -msgid "show the patch file being applied or merged" -msgstr "yama dosyası uygulanırken veya birleştirilirken göster" - -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan" - -#: builtin/rebase.c:1534 -msgid "use merging strategies to rebase" -msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan" - -#: builtin/rebase.c:1538 -msgid "let the user edit the list of commits to rebase" -msgstr "" -"yeniden temellendirilecek gönderilerin listesini kullanıcının düzenlemesine " -"izin ver" - -#: builtin/rebase.c:1542 -msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "" -"(KULLANIM DIŞI) birleştirmeleri yok saymak yerine onları yeniden oluşturmaya " -"çalış" - -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "boşalan gönderiler nasıl işlensin" - -#: builtin/rebase.c:1554 -msgid "move commits that begin with squash!/fixup! under -i" -msgstr "-i altındaki squash!/fixup! ile başlayan gönderileri taşı" - -#: builtin/rebase.c:1560 -msgid "automatically stash/stash pop before and after" -msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat" - -#: builtin/rebase.c:1562 -msgid "add exec lines after each commit of the editable list" -msgstr "düzenlenebilir listenin her gönderisinden sonra exec satırları ekle" - -#: builtin/rebase.c:1566 -msgid "allow rebasing commits with empty messages" -msgstr "boş iletili gönderilerin yeniden temellendirilmesine izin ver" - -#: builtin/rebase.c:1570 -msgid "try to rebase merges instead of skipping them" -msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene" - -#: builtin/rebase.c:1573 -msgid "use 'merge-base --fork-point' to refine upstream" -msgstr "üstkaynağı arılaştırmak için 'merge-base --fork-point' kullan" - -#: builtin/rebase.c:1575 -msgid "use the given merge strategy" -msgstr "verilen birleştirme stratejisini kullan" - -#: builtin/rebase.c:1577 builtin/revert.c:115 -msgid "option" -msgstr "seçenek" - -#: builtin/rebase.c:1578 -msgid "pass the argument through to the merge strategy" -msgstr "değişkeni birleştirme stratejisine aktar" - -#: builtin/rebase.c:1581 -msgid "rebase all reachable commits up to the root(s)" -msgstr "ulaşılabilir tüm gönderileri kök(ler)e kadar yeniden temellendir" - -#: builtin/rebase.c:1598 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"'rebase.useBuiltin' desteği kaldırıldı!\n" -"Ayrıntılar için 'git help config' içindeki girdisine bakın." - -#: builtin/rebase.c:1604 -msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "Görünüşe göre 'git am' sürmekte. Yeniden temellendirilemiyor." - -#: builtin/rebase.c:1645 -msgid "" -"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." -msgstr "" -"'git rebase --preserve-merges' kullanım dışı. Yerine --rebase-merges " -"kullanın." - -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "--keep-base ile --onto birlikte kullanılamaz" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "--keep-base ile --root birlikte kullanılamaz" - -#: builtin/rebase.c:1656 -msgid "No rebase in progress?" -msgstr "Süren bir yeniden temellendirme yok?" - -#: builtin/rebase.c:1660 -msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "" -"--edit-todo seçeneği yalnızca etkileşimli yeniden temellendirme sırasında " -"kullanılabilir." - -#: builtin/rebase.c:1683 -msgid "Cannot read HEAD" -msgstr "HEAD okunamıyor" - -#: builtin/rebase.c:1695 -msgid "" -"You must edit all merge conflicts and then\n" -"mark them as resolved using git add" -msgstr "" -"Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n" -"git add kullanarak tamamlandı olarak imlemelisiniz." - -#: builtin/rebase.c:1714 -msgid "could not discard worktree changes" -msgstr "çalışma ağacı değişiklikleri atılamadı" - -#: builtin/rebase.c:1733 -#, c-format -msgid "could not move back to %s" -msgstr "%s konumuna geri taşınamadı" - -#: builtin/rebase.c:1778 -#, c-format -msgid "" -"It seems that there is already a %s directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t%s\n" -"If that is not the case, please\n" -"\t%s\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there.\n" -msgstr "" -"Görünüşe bakılırsa bir %s dizini zaten var ve merak\n" -"ediyorum acaba siz başka bir yeniden temellendirmenin ortasında mısınız?\n" -"Durum buysa lütfen şunu deneyin:\n" -"\t%s\n" -"Eğer başka bir şeyse, lütfen\n" -"\t%s\n" -"yapın ve beni yeniden çalıştırın. Ben sizi belki orada hâlâ değerli bir\n" -"şeyler olabilir diye durdurdum.\n" - -#: builtin/rebase.c:1806 -msgid "switch `C' expects a numerical value" -msgstr "'C' anahtarı sayısal bir değer bekliyor" - -#: builtin/rebase.c:1847 -#, c-format -msgid "Unknown mode: %s" -msgstr "Bilinmeyen kip: %s" - -#: builtin/rebase.c:1869 -msgid "--strategy requires --merge or --interactive" -msgstr "--strategy, --merge veya --interactive gerektiriyor" - -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s" - -#: builtin/rebase.c:1937 -msgid "--reschedule-failed-exec requires --exec or --interactive" -msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor" - -#: builtin/rebase.c:1957 -msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "--preserve-merges ile --rebase-merges birlikte kullanılamıyor" - -#: builtin/rebase.c:1961 -msgid "" -"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -msgstr "" -"hata: --preserve-merges ile --reschedule-failed-exec birlikte kullanılamıyor" - -#: builtin/rebase.c:1985 -#, c-format -msgid "invalid upstream '%s'" -msgstr "geçersiz üstkaynak '%s'" - -#: builtin/rebase.c:1991 -msgid "Could not create new root commit" -msgstr "Yeni kök gönderi oluşturulamadı" - -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "'%s': tam olarak dallı bir birleştirme temeli gerekli" - -#: builtin/rebase.c:2020 -#, c-format -msgid "'%s': need exactly one merge base" -msgstr "'%s': tam olarak bir birleştirme temeli gerekiyor" - -#: builtin/rebase.c:2028 -#, c-format -msgid "Does not point to a valid commit '%s'" -msgstr "'%s' geçerli bir gönderiye işaret etmiyor" - -#: builtin/rebase.c:2054 -#, c-format -msgid "fatal: no such branch/commit '%s'" -msgstr "onulmaz: böyle bir dal/gönderi yok: '%s'" - -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 -#, c-format -msgid "No such ref: %s" -msgstr "Böyle bir başvuru yok: %s" - -#: builtin/rebase.c:2073 -msgid "Could not resolve HEAD to a revision" -msgstr "HEAD bir revizyona çözülemedi" - -#: builtin/rebase.c:2111 -msgid "Cannot autostash" -msgstr "Kendiliğinden zulalanamıyor" - -#: builtin/rebase.c:2114 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "Beklenmedik zula yanıtı: '%s'" - -#: builtin/rebase.c:2120 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "'%s' için dizin oluşturulamadı" - -#: builtin/rebase.c:2123 -#, c-format -msgid "Created autostash: %s\n" -msgstr "Zula kendiliğinden oluşturuldu: %s\n" - -#: builtin/rebase.c:2126 -msgid "could not reset --hard" -msgstr "'reset --hard' yapılamadı" - -#: builtin/rebase.c:2135 -msgid "Please commit or stash them." -msgstr "Lütfen onları gönderin veya zulalayın." - -#: builtin/rebase.c:2169 -#, c-format -msgid "could not switch to %s" -msgstr "şuraya geçilemedi: %s" - -#: builtin/rebase.c:2180 -msgid "HEAD is up to date." -msgstr "HEAD güncel." - -#: builtin/rebase.c:2182 -#, c-format -msgid "Current branch %s is up to date.\n" -msgstr "Geçerli dal %s güncel.\n" - -#: builtin/rebase.c:2190 -msgid "HEAD is up to date, rebase forced." -msgstr "HEAD güncel, yeniden temellendirme zorlandı." - -#: builtin/rebase.c:2192 -#, c-format -msgid "Current branch %s is up to date, rebase forced.\n" -msgstr "Geçerli dal %s güncel, yeniden temellendirme zorlandı.\n" - -#: builtin/rebase.c:2200 -msgid "The pre-rebase hook refused to rebase." -msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti." - -#: builtin/rebase.c:2207 -#, c-format -msgid "Changes to %s:\n" -msgstr "%s için olan değişiklikler:\n" - -#: builtin/rebase.c:2210 -#, c-format -msgid "Changes from %s to %s:\n" -msgstr "%s -> %s değişiklikleri:\n" - -#: builtin/rebase.c:2235 -#, c-format -msgid "First, rewinding head to replay your work on top of it...\n" -msgstr "" -"Öncelikle dal ucu üzerindeki çalışmanızı yeniden oynatmak için geri " -"sarılıyor...\n" - -#: builtin/rebase.c:2244 -msgid "Could not detach HEAD" -msgstr "HEAD ayrılamadı" - -#: builtin/rebase.c:2253 -#, c-format -msgid "Fast-forwarded %s to %s.\n" -msgstr "%s, %s konumuna ileri sarıldı.\n" - -#: builtin/receive-pack.c:33 -msgid "git receive-pack <git-dir>" -msgstr "git receive-pack <git-dizini>" - -#: builtin/receive-pack.c:821 -msgid "" -"By default, updating the current branch in a non-bare repository\n" -"is denied, because it will make the index and work tree inconsistent\n" -"with what you pushed, and will require 'git reset --hard' to match\n" -"the work tree to HEAD.\n" -"\n" -"You can set the 'receive.denyCurrentBranch' configuration variable\n" -"to 'ignore' or 'warn' in the remote repository to allow pushing into\n" -"its current branch; however, this is not recommended unless you\n" -"arranged to update its work tree to match what you pushed in some\n" -"other way.\n" -"\n" -"To squelch this message and still keep the default behaviour, set\n" -"'receive.denyCurrentBranch' configuration variable to 'refuse'." -msgstr "" -"Öntanımlı olarak, çıplak olmayan bir depodaki geçerli dalı güncelleme\n" -"reddedilir, çünkü bu indeksi ve çalışma ağacını ittiğinizle tutarsız\n" -"duruma getirir ve çalışma ağacını HEAD ile eşleştirmek için\n" -"'git reset --hard' gerektirir.\n" -"Geçerli dalına itmeye izin vermek için uzak depodaki 'receive." -"denyCurrentBranch'\n" -"yapılandırma değişkenini 'ignore' veya 'warn' olarak ayarlayabilirsiniz,\n" -"ancak bu onun çalışma ağacını ittiğinizle eşleştirecek bir yol bulmadığınız\n" -"sürece önerilmez.\n" -"Bu iletiyi susturup öntanımlı davranışı tutmak için 'receive." -"denyCurrentBranch'\n" -"yapılandırma değişkenini 'refuse' olarak ayarlayın." - -#: builtin/receive-pack.c:841 -msgid "" -"By default, deleting the current branch is denied, because the next\n" -"'git clone' won't result in any file checked out, causing confusion.\n" -"\n" -"You can set 'receive.denyDeleteCurrent' configuration variable to\n" -"'warn' or 'ignore' in the remote repository to allow deleting the\n" -"current branch, with or without a warning message.\n" -"\n" -"To squelch this message, you can set it to 'refuse'." -msgstr "" -"Öntanımlı olarak, geçerli dalı silme reddedilir, çünkü bir sonraki 'git " -"clone'\n" -"hiçbir dosyanın çıkış yapılamamasına neden olup karmaşa doğurur.\n" -"\n" -"Geçerli dalın bir uyarı iletisiyle veya ileti olmadan silinebilmesine izin\n" -"vermek için uzak depodaki 'receive.denyDeleteCurrent' yapılandırma\n" -"değişkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n" -"Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın." - -#: builtin/receive-pack.c:1938 -msgid "quiet" -msgstr "sessiz" - -#: builtin/receive-pack.c:1952 -msgid "You must specify a directory." -msgstr "Bir dizin belirtmelisiniz." - -#: builtin/reflog.c:17 -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" -"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " -"<refs>..." -msgstr "" -"git reflog expire [--expire=<zaman>] [--expire-unreachable=<zaman>] [--" -"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " -"<başvurular>..." - -#: builtin/reflog.c:22 -msgid "" -"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " -"<refs>..." -msgstr "" -"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " -"<başvurular>..." - -#: builtin/reflog.c:25 -msgid "git reflog exists <ref>" -msgstr "git reflog exists <başvuru>" - -#: builtin/reflog.c:568 builtin/reflog.c:573 -#, c-format -msgid "'%s' is not a valid timestamp" -msgstr "'%s' geçerli bir zaman damgası değil" - -#: builtin/reflog.c:606 -#, c-format -msgid "Marking reachable objects..." -msgstr "Ulaşılabilir nesneler imleniyor..." - -#: builtin/reflog.c:644 -#, c-format -msgid "%s points nowhere!" -msgstr "%s hiçbir yere işaret etmiyor!" - -#: builtin/reflog.c:696 -msgid "no reflog specified to delete" -msgstr "silmek için bir başvuru günlüğü belirtilmedi" - -#: builtin/reflog.c:705 -#, c-format -msgid "not a reflog: %s" -msgstr "bir başvuru günlüğü değil: %s" - -#: builtin/reflog.c:710 -#, c-format -msgid "no reflog for '%s'" -msgstr "'%s' için başvuru günlüğü yok" - -#: builtin/reflog.c:756 -#, c-format -msgid "invalid ref format: %s" -msgstr "geçersiz başvuru biçimi: %s" - -#: builtin/reflog.c:765 -msgid "git reflog [ show | expire | delete | exists ]" -msgstr "git reflog [ show | expire | delete | exists ]" - -#: builtin/remote.c:17 -msgid "git remote [-v | --verbose]" -msgstr "git remote [-v | --verbose]" - -#: builtin/remote.c:18 -msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" -"mirror=<fetch|push>] <name> <url>" -msgstr "" -"git remote add [-t <dal>] [-m <master>] [-f] [--tags | --no-tags] [--" -"mirror=<getir|it>] <ad> <url>" - -#: builtin/remote.c:19 builtin/remote.c:39 -msgid "git remote rename <old> <new>" -msgstr "git remote rename <eski> <yeni>" - -#: builtin/remote.c:20 builtin/remote.c:44 -msgid "git remote remove <name>" -msgstr "git remote remove <ad>" - -#: builtin/remote.c:21 builtin/remote.c:49 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <ad> (-a | --auto | -d | --delete | <dal>)" - -#: builtin/remote.c:22 -msgid "git remote [-v | --verbose] show [-n] <name>" -msgstr "git remote [-v | --verbose] show [-n] <ad>" - -#: builtin/remote.c:23 -msgid "git remote prune [-n | --dry-run] <name>" -msgstr "git remote prune [-n | --dry-run] <ad>" - -#: builtin/remote.c:24 -msgid "" -"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -msgstr "" -"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <uzak-k>)...]" - -#: builtin/remote.c:25 -msgid "git remote set-branches [--add] <name> <branch>..." -msgstr "git remote set-branches [--add] <ad> <dal>..." - -#: builtin/remote.c:26 builtin/remote.c:75 -msgid "git remote get-url [--push] [--all] <name>" -msgstr "git remote get-url [--push] [--all] <ad>" - -#: builtin/remote.c:27 builtin/remote.c:80 -msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" -msgstr "git remote set-url [--push] <ad> <yeni-url> [<eski-url>]" - -#: builtin/remote.c:28 builtin/remote.c:81 -msgid "git remote set-url --add <name> <newurl>" -msgstr "git remote set-url --add <ad> <yeni-url>" - -#: builtin/remote.c:29 builtin/remote.c:82 -msgid "git remote set-url --delete <name> <url>" -msgstr "git remote set-url --delete <ad> <url>" - -#: builtin/remote.c:34 -msgid "git remote add [<options>] <name> <url>" -msgstr "git remote add [<seçenekler>] <ad> <url>" - -#: builtin/remote.c:54 -msgid "git remote set-branches <name> <branch>..." -msgstr "git remote set-branches <ad> <dal>..." - -#: builtin/remote.c:55 -msgid "git remote set-branches --add <name> <branch>..." -msgstr "git remote set-branches --add <ad> <dal>..." - -#: builtin/remote.c:60 -msgid "git remote show [<options>] <name>" -msgstr "git remote show [<seçenekler>] <ad>" - -#: builtin/remote.c:65 -msgid "git remote prune [<options>] <name>" -msgstr "git remote prune [<seçenekler>] <ad>" - -#: builtin/remote.c:70 -msgid "git remote update [<options>] [<group> | <remote>]..." -msgstr "git remote update [<seçenekler>] [<grup> | <uzak-konum>]..." - -#: builtin/remote.c:99 -#, c-format -msgid "Updating %s" -msgstr "%s güncelleniyor" - -#: builtin/remote.c:131 -msgid "" -"--mirror is dangerous and deprecated; please\n" -"\t use --mirror=fetch or --mirror=push instead" -msgstr "" -"--mirror tehlikeli ve artık kullanım dışı; lütfen\n" -"\t yerine --mirror-fetch veya --mirror=push kullanın." - -#: builtin/remote.c:148 -#, c-format -msgid "unknown mirror argument: %s" -msgstr "bilinmeyen mirror değişkeni: %s" - -#: builtin/remote.c:164 -msgid "fetch the remote branches" -msgstr "uzak konum dallarını getir" - -#: builtin/remote.c:166 -msgid "import all tags and associated objects when fetching" -msgstr "getirirken tüm etiketleri ve ilişkili nesneleri içe aktar" - -#: builtin/remote.c:169 -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "veya hiçbir etiketi getirme (--no-tags)" - -#: builtin/remote.c:171 -msgid "branch(es) to track" -msgstr "izlenecek dal(lar)" - -#: builtin/remote.c:172 -msgid "master branch" -msgstr "ana dal" - -#: builtin/remote.c:174 -msgid "set up remote as a mirror to push to or fetch from" -msgstr "" -"uzak konum deposunu ona itilecek veya ondan getirilecek bir yansı olarak " -"ayarla" - -#: builtin/remote.c:186 -msgid "specifying a master branch makes no sense with --mirror" -msgstr "--mirror ile bir ana dal belirtmek anlam ifade etmiyor" - -#: builtin/remote.c:188 -msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "" -"izlemek için dallar belirtmek yalnızca getirme yansılarıyla anlamifade ediyor" - -#: builtin/remote.c:195 builtin/remote.c:696 -#, c-format -msgid "remote %s already exists." -msgstr "%s uzak konumu halihazırda var." - -#: builtin/remote.c:199 builtin/remote.c:700 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "'%s' geçerli bir uzak konum adı değil" - -#: builtin/remote.c:239 -#, c-format -msgid "Could not setup master '%s'" -msgstr "'%s' ana dalı ayarlanamadı" - -#: builtin/remote.c:354 -#, c-format -msgid "Could not get fetch map for refspec %s" -msgstr "%s başvuru belirteci için getirme haritası alınamadı" - -#: builtin/remote.c:453 builtin/remote.c:461 -msgid "(matching)" -msgstr "(eşleşiyor)" - -#: builtin/remote.c:465 -msgid "(delete)" -msgstr "(sil)" - -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "'%s' ayarlanamadı" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"Şuradaki %s yapılandırması remote.pushDefault:\n" -"\t%s:%d\n" -"artık var olmayan '%s' uzak konumunu adlandırıyor." - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 -#, c-format -msgid "No such remote: '%s'" -msgstr "Böyle bir uzak konum yok: '%s'" - -#: builtin/remote.c:706 -#, c-format -msgid "Could not rename config section '%s' to '%s'" -msgstr "'%s' yapılandırma bölümü '%s' olarak yeniden adlandırılamadı" - -#: builtin/remote.c:726 -#, c-format -msgid "" -"Not updating non-default fetch refspec\n" -"\t%s\n" -"\tPlease update the configuration manually if necessary." -msgstr "" -"Öntanımlı olmayan getirme başvuru belirteci güncellenmiyor.\n" -"\t%s\n" -"\tLütfen gerekirse yapılandırmayı el ile güncelleyin." - -#: builtin/remote.c:766 -#, c-format -msgid "deleting '%s' failed" -msgstr "'%s' silinmesi başarısız" - -#: builtin/remote.c:800 -#, c-format -msgid "creating '%s' failed" -msgstr "'%s' oluşturulması başarısız" - -#: builtin/remote.c:876 -msgid "" -"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" -"to delete it, use:" -msgid_plural "" -"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" -"to delete them, use:" -msgstr[0] "" -"Not: refs/remotes hiyerarşisi dışındaki bir dal kaldırılmadı;\n" -"onu silmek için şunu kullanın:" -msgstr[1] "" -"Not: refs/remotes hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n" -"onları silmek için şunu kullanın:" - -#: builtin/remote.c:890 -#, c-format -msgid "Could not remove config section '%s'" -msgstr "'%s' yapılandırsa bölümü kaldırılamadı" - -#: builtin/remote.c:993 -#, c-format -msgid " new (next fetch will store in remotes/%s)" -msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s" - -#: builtin/remote.c:996 -msgid " tracked" -msgstr " izlendi" - -#: builtin/remote.c:998 -msgid " stale (use 'git remote prune' to remove)" -msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)" - -#: builtin/remote.c:1000 -msgid " ???" -msgstr " ???" - -#: builtin/remote.c:1041 -#, c-format -msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" -msgstr "geçersiz branch.%s.merge; birden çok dala yeniden temellendirilemiyor" - -#: builtin/remote.c:1050 -#, c-format -msgid "rebases interactively onto remote %s" -msgstr "%s uzak konumuna etkileşimli olarak yeniden temellendirir" - -#: builtin/remote.c:1052 -#, c-format -msgid "rebases interactively (with merges) onto remote %s" -msgstr "" -"%s uzak konumuna etkileşimli olarak (birleştirmelerle birlikte) yeniden " -"temellendirir" - -#: builtin/remote.c:1055 -#, c-format -msgid "rebases onto remote %s" -msgstr "%s uzak konumuna yeniden temellendirir" - -#: builtin/remote.c:1059 -#, c-format -msgid " merges with remote %s" -msgstr " %s uzak konumu ile birleştirir" - -#: builtin/remote.c:1062 -#, c-format -msgid "merges with remote %s" -msgstr "%s uzak konumu ile birleştirir" - -#: builtin/remote.c:1065 -#, c-format -msgid "%-*s and with remote %s\n" -msgstr "%-*s ve %s uzak konumu ile birlikte\n" - -#: builtin/remote.c:1108 -msgid "create" -msgstr "oluştur" - -#: builtin/remote.c:1111 -msgid "delete" -msgstr "sil" - -#: builtin/remote.c:1115 -msgid "up to date" -msgstr "güncel" - -#: builtin/remote.c:1118 -msgid "fast-forwardable" -msgstr "ileri sarılabilir" - -#: builtin/remote.c:1121 -msgid "local out of date" -msgstr "yerelin tarihi geçmiş" - -#: builtin/remote.c:1128 -#, c-format -msgid " %-*s forces to %-*s (%s)" -msgstr " %-*s şuna zorluyor: %-*s (%s)" - -#: builtin/remote.c:1131 -#, c-format -msgid " %-*s pushes to %-*s (%s)" -msgstr " %-*s şuna itiyor: %-*s (%s)" - -#: builtin/remote.c:1135 -#, c-format -msgid " %-*s forces to %s" -msgstr " %-*s şuna zorluyor: %s" - -#: builtin/remote.c:1138 -#, c-format -msgid " %-*s pushes to %s" -msgstr " %-*s şuna itiyor: %s" - -#: builtin/remote.c:1206 -msgid "do not query remotes" -msgstr "uzak konumları sorgulama" - -#: builtin/remote.c:1233 -#, c-format -msgid "* remote %s" -msgstr "* uzak konum %s" - -#: builtin/remote.c:1234 -#, c-format -msgid " Fetch URL: %s" -msgstr " URL'yi getir: %s" - -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 -msgid "(no URL)" -msgstr "(URL yok)" - -#. TRANSLATORS: the colon ':' should align -#. with the one in " Fetch URL: %s" -#. translation. -#. -#: builtin/remote.c:1249 builtin/remote.c:1251 -#, c-format -msgid " Push URL: %s" -msgstr " URL'yi it: %s" - -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 -#, c-format -msgid " HEAD branch: %s" -msgstr " HEAD dalı: %s" - -#: builtin/remote.c:1253 -msgid "(not queried)" -msgstr "(sorgulanmadı" - -#: builtin/remote.c:1255 -msgid "(unknown)" -msgstr "(bilinmiyor)" - -#: builtin/remote.c:1259 -#, c-format -msgid "" -" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr "" -" HEAD dalı (uzak konum HEAD'i belirsiz, aşağıdakilerden biri olabilir):\n" - -#: builtin/remote.c:1271 -#, c-format -msgid " Remote branch:%s" -msgid_plural " Remote branches:%s" -msgstr[0] " Uzak dal:%s" -msgstr[1] " Uzak dallar:%s" - -#: builtin/remote.c:1274 builtin/remote.c:1300 -msgid " (status not queried)" -msgstr " (durum sorgulanmadı)" - -#: builtin/remote.c:1283 -msgid " Local branch configured for 'git pull':" -msgid_plural " Local branches configured for 'git pull':" -msgstr[0] " 'git pull' için yapılandırılan yerel dal:" -msgstr[1] " 'git pull' için yapılandırılan yerel dallar:" - -#: builtin/remote.c:1291 -msgid " Local refs will be mirrored by 'git push'" -msgstr " Yerel başvurular 'git pull' tarafından yansılanacak" - -#: builtin/remote.c:1297 -#, c-format -msgid " Local ref configured for 'git push'%s:" -msgid_plural " Local refs configured for 'git push'%s:" -msgstr[0] " 'git push'%s için yapılandırılan yerel başvuru:" -msgstr[1] " 'git push'%s için yapılandırılan yerel başvurular:" - -#: builtin/remote.c:1318 -msgid "set refs/remotes/<name>/HEAD according to remote" -msgstr "refs/remotes/<ad>/HEAD'i uzak konuma göre ayarla" - -#: builtin/remote.c:1320 -msgid "delete refs/remotes/<name>/HEAD" -msgstr "refs/remotes/<ad>/HEAD'i sil" - -#: builtin/remote.c:1335 -msgid "Cannot determine remote HEAD" -msgstr "Uzak konum HEAD'i belirlenemiyor" - -#: builtin/remote.c:1337 -msgid "Multiple remote HEAD branches. Please choose one explicitly with:" -msgstr "Birden çok uzak konum HEAD dalı. Lütfen birini açıkça seçin:" - -#: builtin/remote.c:1347 -#, c-format -msgid "Could not delete %s" -msgstr "%s silinemedi" - -#: builtin/remote.c:1355 -#, c-format -msgid "Not a valid ref: %s" -msgstr "Geçerli bir başvuru değil: %s" - -#: builtin/remote.c:1357 -#, c-format -msgid "Could not setup %s" -msgstr "%s ayarlanamadı" - -#: builtin/remote.c:1375 -#, c-format -msgid " %s will become dangling!" -msgstr " %s sarkacak!" - -#: builtin/remote.c:1376 -#, c-format -msgid " %s has become dangling!" -msgstr " %s sarkmaya başladı!" - -#: builtin/remote.c:1386 -#, c-format -msgid "Pruning %s" -msgstr "%s budanıyor" - -#: builtin/remote.c:1387 -#, c-format -msgid "URL: %s" -msgstr "URL: %s" - -#: builtin/remote.c:1403 -#, c-format -msgid " * [would prune] %s" -msgstr " * %s [budanacak]" - -#: builtin/remote.c:1406 -#, c-format -msgid " * [pruned] %s" -msgstr " * %s [budandı]" - -#: builtin/remote.c:1451 -msgid "prune remotes after fetching" -msgstr "getirme sonrasında uzak konumları buda" - -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 -#, c-format -msgid "No such remote '%s'" -msgstr "Böyle bir uzak konum yok '%s'" - -#: builtin/remote.c:1530 -msgid "add branch" -msgstr "dal ekle" - -#: builtin/remote.c:1537 -msgid "no remote specified" -msgstr "uzak konum belirtilmedi" - -#: builtin/remote.c:1554 -msgid "query push URLs rather than fetch URLs" -msgstr "itme URL'lerinden çok getirme URL'lerini sorgula" - -#: builtin/remote.c:1556 -msgid "return all URLs" -msgstr "tüm URL'leri döndür" - -#: builtin/remote.c:1584 -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "'%s' uzak konumu için URL yapılandırılmamış" - -#: builtin/remote.c:1610 -msgid "manipulate push URLs" -msgstr "itme URL'lerini değiştir" - -#: builtin/remote.c:1612 -msgid "add URL" -msgstr "URL ekle" - -#: builtin/remote.c:1614 -msgid "delete URLs" -msgstr "URL'leri sil" - -#: builtin/remote.c:1621 -msgid "--add --delete doesn't make sense" -msgstr "--add --delete bir anlam ifade etmiyor" - -#: builtin/remote.c:1660 -#, c-format -msgid "Invalid old URL pattern: %s" -msgstr "Geçersiz eski URL dizgisi: %s" - -#: builtin/remote.c:1668 -#, c-format -msgid "No such URL found: %s" -msgstr "Böyle bir URL bulunamadı: %s" - -#: builtin/remote.c:1670 -msgid "Will not delete all non-push URLs" -msgstr "Tüm itme olmayan URL'ler silinmeyecek" - -#: builtin/repack.c:23 -msgid "git repack [<options>]" -msgstr "git repack [<seçenekler>]" - -#: builtin/repack.c:28 -msgid "" -"Incremental repacks are incompatible with bitmap indexes. Use\n" -"--no-write-bitmap-index or disable the pack.writebitmaps configuration." -msgstr "" -"Artan yeniden paketlemeler biteşlem indeksleri ile uyumsuzdur.\n" -"--no-write-bitmap-index kullanın veya pack.writebitmaps yapılandırmasını\n" -"devre dışı bırakın." - -#: builtin/repack.c:191 -msgid "could not start pack-objects to repack promisor objects" -msgstr "vaatçi nesneleri yeniden paketleme için pack-objects başlatılamadı" - -#: builtin/repack.c:230 builtin/repack.c:416 -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "" -"repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor." - -#: builtin/repack.c:254 -msgid "could not finish pack-objects to repack promisor objects" -msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi" - -#: builtin/repack.c:292 -msgid "pack everything in a single pack" -msgstr "her şeyi tek bir pakete sığdır" - -#: builtin/repack.c:294 -msgid "same as -a, and turn unreachable objects loose" -msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır" - -#: builtin/repack.c:297 -msgid "remove redundant packs, and run git-prune-packed" -msgstr "gereksiz paketleri kaldır ve 'git prune-packed' çalıştır" - -#: builtin/repack.c:299 -msgid "pass --no-reuse-delta to git-pack-objects" -msgstr "'git-pack-objects'e --no-reuse-delta geçir" - -#: builtin/repack.c:301 -msgid "pass --no-reuse-object to git-pack-objects" -msgstr "'git-pack-objects'e --no-reuse-object geçir" - -#: builtin/repack.c:303 -msgid "do not run git-update-server-info" -msgstr "'git-update-server-info' çalıştırma" - -#: builtin/repack.c:306 -msgid "pass --local to git-pack-objects" -msgstr "--local'ı 'git-pack-objects'e geçir" - -#: builtin/repack.c:308 -msgid "write bitmap index" -msgstr "biteşlem indeksi yaz" - -#: builtin/repack.c:310 -msgid "pass --delta-islands to git-pack-objects" -msgstr "--delta-islands'ı 'git-pack-objects'e geçir" - -#: builtin/repack.c:311 -msgid "approxidate" -msgstr "yaklaşık tarih" - -#: builtin/repack.c:312 -msgid "with -A, do not loosen objects older than this" -msgstr "-A ile, bundan daha eski nesneleri bırakma" - -#: builtin/repack.c:314 -msgid "with -a, repack unreachable objects" -msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle" - -#: builtin/repack.c:316 -msgid "size of the window used for delta compression" -msgstr "delta sıkıştırması için kullanılan pencerenin boyutu" - -#: builtin/repack.c:317 builtin/repack.c:323 -msgid "bytes" -msgstr "baytlar" - -#: builtin/repack.c:318 -msgid "same as the above, but limit memory size instead of entries count" -msgstr "yukarıdakiyle aynı, ancak girdi sayısı yerine bellek boyutunu kısıtla" - -#: builtin/repack.c:320 -msgid "limits the maximum delta depth" -msgstr "olabilecek en büyük delta derinliğini kısıtlar" - -#: builtin/repack.c:322 -msgid "limits the maximum number of threads" -msgstr "iş parçacıklarının olabilecek en büyük sayısını kısıtlar" - -#: builtin/repack.c:324 -msgid "maximum size of each packfile" -msgstr "her paket dosyasının olabilecek en büyük boyutu" - -#: builtin/repack.c:326 -msgid "repack objects in packs marked with .keep" -msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle" - -#: builtin/repack.c:328 -msgid "do not repack this pack" -msgstr "bu paketi yeniden paketleme" - -#: builtin/repack.c:338 -msgid "cannot delete packs in a precious-objects repo" -msgstr "bir precious-objects deposundaki paketler silinemiyor" - -#: builtin/repack.c:342 -msgid "--keep-unreachable and -A are incompatible" -msgstr "--keep-unreachable ve -A birbiriyle uyumsuz" - -#: builtin/repack.c:425 -msgid "Nothing new to pack." -msgstr "Paketlenecek yeni bir şey yok." - -#: builtin/repack.c:486 -#, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" -"UYARI: Kullanılan bazı paketler, dosyanın yeni\n" -"UYARI: sürümüyle değiştirilmek üzere adlarının\n" -"UYARI: önüne önek olarak old- koyularak yeniden\n" -"UYARI: adlandırılmıştır. Ancak işlem başarısız\n" -"UYARI: oldu ve bunları orijinal adlarına döndürme\n" -"UYARI: girişimi de başarısız oldu.\n" -"UYARI: Lütfen bunları %s içinde el ile yeniden adlandırın:\n" - -#: builtin/repack.c:534 -#, c-format -msgid "failed to remove '%s'" -msgstr "'%s' kaldırılamadı" - -#: builtin/replace.c:22 -msgid "git replace [-f] <object> <replacement>" -msgstr "git replace [-f] <nesne> <değişim>" - -#: builtin/replace.c:23 -msgid "git replace [-f] --edit <object>" -msgstr "git replace [-f] --edit <nesne>" - -#: builtin/replace.c:24 -msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "git replace [-f] --graft <gönderi> [<üst-öge>...]" - -#: builtin/replace.c:25 -msgid "git replace [-f] --convert-graft-file" -msgstr "git replace [-f] --convert-graft-file" - -#: builtin/replace.c:26 -msgid "git replace -d <object>..." -msgstr "git replace -d <nesne>..." - -#: builtin/replace.c:27 -msgid "git replace [--format=<format>] [-l [<pattern>]]" -msgstr "git replace [--format=<biçim>] [-l [<dizgi>]]" - -#: builtin/replace.c:90 -#, c-format -msgid "" -"invalid replace format '%s'\n" -"valid formats are 'short', 'medium' and 'long'" -msgstr "" -"geçersiz değiştirme biçimi '%s'\n" -"geçerli biçimler: 'short' (kısa), 'medium' (orta) ve 'long' (uzun)" - -#: builtin/replace.c:125 -#, c-format -msgid "replace ref '%s' not found" -msgstr "değiştirme başvurusu '%s' bulunamadı" - -#: builtin/replace.c:141 -#, c-format -msgid "Deleted replace ref '%s'" -msgstr "Değiştirme başvurusu '%s' silindi" - -#: builtin/replace.c:153 -#, c-format -msgid "'%s' is not a valid ref name" -msgstr "'%s' geçerli bir başvuru adı değil" - -#: builtin/replace.c:158 -#, c-format -msgid "replace ref '%s' already exists" -msgstr "değiştirme başvurusu '%s' halihazırda mevcut" - -#: builtin/replace.c:178 -#, c-format -msgid "" -"Objects must be of the same type.\n" -"'%s' points to a replaced object of type '%s'\n" -"while '%s' points to a replacement object of type '%s'." -msgstr "" -"Nesneler aynı türden olmalıdır.\n" -"'%s', '%s' türünden değiştirilmiş bir nesneye işaret ederken\n" -"'%s' ise yerine geçecek '%s' türünden bir nesneye işaret ediyor." - -#: builtin/replace.c:229 -#, c-format -msgid "unable to open %s for writing" -msgstr "%s yazma için açılamıyor" - -#: builtin/replace.c:242 -msgid "cat-file reported failure" -msgstr "cat-file hata bildirdi" - -#: builtin/replace.c:258 -#, c-format -msgid "unable to open %s for reading" -msgstr "%s okuma için açılamıyor" - -#: builtin/replace.c:272 -msgid "unable to spawn mktree" -msgstr "mktree ortaya çıkarılamıyor" - -#: builtin/replace.c:276 -msgid "unable to read from mktree" -msgstr "mktree'den okunamıyor" - -#: builtin/replace.c:285 -msgid "mktree reported failure" -msgstr "mktree hata bildirdi" - -#: builtin/replace.c:289 -msgid "mktree did not return an object name" -msgstr "mktree bir nesne adı döndürmedi" - -#: builtin/replace.c:298 -#, c-format -msgid "unable to fstat %s" -msgstr "%s 'fstat' yapılamıyor" - -#: builtin/replace.c:303 -msgid "unable to write object to database" -msgstr "nesne veritabanına yazılamıyor" - -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "geçerli bir nesne adı değil: '%s'" - -#: builtin/replace.c:326 -#, c-format -msgid "unable to get object type for %s" -msgstr "%s için nesne türü alınamadı" - -#: builtin/replace.c:342 -msgid "editing object file failed" -msgstr "nesne dosyasını düzenleme başarısız" - -#: builtin/replace.c:351 -#, c-format -msgid "new object is the same as the old one: '%s'" -msgstr "yeni nesne eskisiyle aynı: '%s'" - -#: builtin/replace.c:384 -#, c-format -msgid "could not parse %s as a commit" -msgstr "%s, bir gönderi olarak ayrıştırılamadı" - -#: builtin/replace.c:416 -#, c-format -msgid "bad mergetag in commit '%s'" -msgstr "'%s' gönderisinde hatalı birleştirme etiketi" - -#: builtin/replace.c:418 -#, c-format -msgid "malformed mergetag in commit '%s'" -msgstr "'%s' gönderisinde hatalı oluşturulmuş birleştirme etiketi" - -#: builtin/replace.c:430 -#, c-format -msgid "" -"original commit '%s' contains mergetag '%s' that is discarded; use --edit " -"instead of --graft" -msgstr "" -"'%s' orijinal gönderisi atılmış olan '%s' birleştirme etiketini içeriyor; --" -"graft yerine --edit kullanın" - -#: builtin/replace.c:469 -#, c-format -msgid "the original commit '%s' has a gpg signature" -msgstr "'%s' orijinal gönderisinin bir gpg imzası var" - -#: builtin/replace.c:470 -msgid "the signature will be removed in the replacement commit!" -msgstr "imza, yerine geçecek gönderide kaldırılacak" - -#: builtin/replace.c:480 -#, c-format -msgid "could not write replacement commit for: '%s'" -msgstr "şunun yerine geçecek gönderi yazılamadı: '%s'" - -#: builtin/replace.c:488 -#, c-format -msgid "graft for '%s' unnecessary" -msgstr "'%s' için aşı gereksiz" - -#: builtin/replace.c:492 -#, c-format -msgid "new commit is the same as the old one: '%s'" -msgstr "yeni gönderi eskisiyle aynı: '%s'" - -#: builtin/replace.c:527 -#, c-format -msgid "" -"could not convert the following graft(s):\n" -"%s" -msgstr "" -"aşağıdaki aşı(lar) dönüştürülemedi:\n" -"%s" - -#: builtin/replace.c:548 -msgid "list replace refs" -msgstr "değiştirme başvurularını listele" - -#: builtin/replace.c:549 -msgid "delete replace refs" -msgstr "değiştirme başvurularını sil" - -#: builtin/replace.c:550 -msgid "edit existing object" -msgstr "geçerli nesneyi düzenle" - -#: builtin/replace.c:551 -msgid "change a commit's parents" -msgstr "bir gönderinin üst ögelerini değiştir" - -#: builtin/replace.c:552 -msgid "convert existing graft file" -msgstr "mevcut aşı dosyasını dönüştür" - -#: builtin/replace.c:553 -msgid "replace the ref if it exists" -msgstr "başvuru mevcutsa onu değiştir" - -#: builtin/replace.c:555 -msgid "do not pretty-print contents for --edit" -msgstr "--edit içeriğini hoş biçimde gösterme" - -#: builtin/replace.c:556 -msgid "use this format" -msgstr "bu biçimi kullan" - -#: builtin/replace.c:569 -msgid "--format cannot be used when not listing" -msgstr "--format, listelemiyorken kullanılamaz" - -#: builtin/replace.c:577 -msgid "-f only makes sense when writing a replacement" -msgstr "-f yalnızca yerine geçecek bir nesne yazılırken anlam ifade eder" - -#: builtin/replace.c:581 -msgid "--raw only makes sense with --edit" -msgstr "--raw yalnızca --edit ile anlam ifade eder" - -#: builtin/replace.c:587 -msgid "-d needs at least one argument" -msgstr "-d için en azından bir değişken gerekli" - -#: builtin/replace.c:593 -msgid "bad number of arguments" -msgstr "hatalı değişken sayısı" - -#: builtin/replace.c:599 -msgid "-e needs exactly one argument" -msgstr "-e için tam olarak bir değişken gerekli" - -#: builtin/replace.c:605 -msgid "-g needs at least one argument" -msgstr "-g için en azından bir değişken gerekli" - -#: builtin/replace.c:611 -msgid "--convert-graft-file takes no argument" -msgstr "--convert-graft-file değişken almaz" - -#: builtin/replace.c:617 -msgid "only one pattern can be given with -l" -msgstr "-l ile yalnızca bir dizgi verilebilir" - -#: builtin/rerere.c:13 -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <yol>... | status | remaining | diff | gc]" - -#: builtin/rerere.c:60 -msgid "register clean resolutions in index" -msgstr "indeksteki temiz çözümlerin kaydını yap" - -#: builtin/rerere.c:79 -msgid "'git rerere forget' without paths is deprecated" -msgstr "yol olmadan 'git rerere forget' kullanım dışı" - -#: builtin/rerere.c:113 -#, c-format -msgid "unable to generate diff for '%s'" -msgstr "'%s' için diff oluşturulamıyor" - -#: builtin/reset.c:32 -msgid "" -"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -msgstr "" -"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<gönderi>]" - -#: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<ağacımsı>] [--] <yol-blrtç>..." - -#: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<ağacımsı>]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "git reset --patch [<ağacımsı>] [--] [<yol-blrtç>...]" - -#: builtin/reset.c:41 -msgid "mixed" -msgstr "karışık" - -#: builtin/reset.c:41 -msgid "soft" -msgstr "yumuşak" - -#: builtin/reset.c:41 -msgid "hard" -msgstr "sert" - -#: builtin/reset.c:41 -msgid "merge" -msgstr "birleştir" - -#: builtin/reset.c:41 -msgid "keep" -msgstr "tut" - -#: builtin/reset.c:82 -msgid "You do not have a valid HEAD." -msgstr "Geçerli bir HEAD'iniz yok." - -#: builtin/reset.c:84 -msgid "Failed to find tree of HEAD." -msgstr "HEAD ağacı bulunamadı." - -#: builtin/reset.c:90 -#, c-format -msgid "Failed to find tree of %s." -msgstr "%s ağacı bulunamadı." - -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD şimdi şurada: %s" - -#: builtin/reset.c:194 -#, c-format -msgid "Cannot do a %s reset in the middle of a merge." -msgstr "Bir birleştirmenin ortasında %s sıfırlaması yapılamıyor." - -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 -msgid "be quiet, only report errors" -msgstr "sessiz ol, yalnızca hataları bildir" - -#: builtin/reset.c:296 -msgid "reset HEAD and index" -msgstr "HEAD'i ve indeksi sıfırla" - -#: builtin/reset.c:297 -msgid "reset only HEAD" -msgstr "yalnızca HEAD'i sıfırla" - -#: builtin/reset.c:299 builtin/reset.c:301 -msgid "reset HEAD, index and working tree" -msgstr "HEAD'i, indeksi ve çalışma ağacını sıfırla" - -#: builtin/reset.c:303 -msgid "reset HEAD but keep local changes" -msgstr "HEAD'i sıfırla, ancak yerel değişiklikleri tut" - -#: builtin/reset.c:309 -msgid "record only the fact that removed paths will be added later" -msgstr "" -"yalnızca kaldırılan yolların daha sonra ekleneceği gerçeğinin kaydını yaz" - -#: builtin/reset.c:343 -#, c-format -msgid "Failed to resolve '%s' as a valid revision." -msgstr "'%s' geçerli bir revizyon olarak çözülemedi." - -#: builtin/reset.c:351 -#, c-format -msgid "Failed to resolve '%s' as a valid tree." -msgstr "'%s' geçerli bir ağaç olarak çözülemedi." - -#: builtin/reset.c:360 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch, --{hard,mixed,soft} ile uyumsuz" - -#: builtin/reset.c:370 -msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "" -"belirtilmiş yol ile --mixed kullanım dışı; yerine 'git reset -- <yollar>' " -"kullanın." - -#: builtin/reset.c:372 -#, c-format -msgid "Cannot do %s reset with paths." -msgstr "Belirtilmiş yol varken %s sıfırlaması yapılamıyor." - -#: builtin/reset.c:387 -#, c-format -msgid "%s reset is not allowed in a bare repository" -msgstr "%s sıfırlamasına çıplak bir depoda izin verilmiyor" - -#: builtin/reset.c:391 -msgid "-N can only be used with --mixed" -msgstr "-N yalnızca --mixed ile birlikte kullanılabilir" - -#: builtin/reset.c:412 -msgid "Unstaged changes after reset:" -msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:" - -#: builtin/reset.c:415 -#, c-format -msgid "" -"\n" -"It took %.2f seconds to enumerate unstaged changes after reset. You can\n" -"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" -"to make this the default.\n" -msgstr "" -"\n" -"Sıfırlama sonrasında hazırlanmamış değişiklikleri sayıp dökme %.2f saniye\n" -"sürdü. Bundan kaçınmak için --quiet kullanabilir, öntanımlı yapmak içinse\n" -"reset.quiet yapılandırma değişkenini 'true' olarak değiştirebilirsiniz.\n" - -#: builtin/reset.c:425 -#, c-format -msgid "Could not reset index file to revision '%s'." -msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı." - -#: builtin/reset.c:429 -msgid "Could not write new index file." -msgstr "Yeni indeks dosyası yazılamadı." - -#: builtin/rev-list.c:499 -msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor" - -#: builtin/rev-list.c:560 -msgid "object filtering requires --objects" -msgstr "nesne süzme --objects gerektiriyor" - -#: builtin/rev-list.c:610 -msgid "rev-list does not support display of notes" -msgstr "rev-list not görüntülemesini desteklemiyor" - -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "imlenmiş sayım, --objects ile uyumsuz" - -#: builtin/rev-parse.c:408 -msgid "git rev-parse --parseopt [<options>] -- [<args>...]" -msgstr "git rev-parse --parseopt [<seçenekler>] -- [<değişkenler>...]" - -#: builtin/rev-parse.c:413 -msgid "keep the `--` passed as an arg" -msgstr "'--'i geçirilen bir değişken olarak tut" - -#: builtin/rev-parse.c:415 -msgid "stop parsing after the first non-option argument" -msgstr "seçenek olmayan ilk değişkenden sonra ayrıştırmayı durdur" - -#: builtin/rev-parse.c:418 -msgid "output in stuck long form" -msgstr "uzun biçimde çıktı ver" - -#: builtin/rev-parse.c:551 -msgid "" -"git rev-parse --parseopt [<options>] -- [<args>...]\n" -" or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [<options>] [<arg>...]\n" -"\n" -"Run \"git rev-parse --parseopt -h\" for more information on the first usage." -msgstr "" -"git rev-parse --parseopt [<seçenekler>] -- [<değişkenler>...]\n" -"\tor: git rev-parse --sq-quote [<değişkenler>...]\n" -"\tor: git rev-parse [<seçenekler>] [<değişkenler>...]\n" -"\n" -"İlki hakkında ek bilgi için \"git rev-parse --parseopt -h\" çalıştırın." - -#: builtin/revert.c:24 -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<seçenekler>] <gönderimsi>..." - -#: builtin/revert.c:25 -msgid "git revert <subcommand>" -msgstr "git revert <altkomut>" - -#: builtin/revert.c:30 -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<seçenekler>] <gönderimsi>..." - -#: builtin/revert.c:31 -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <altkomut>" - -#: builtin/revert.c:72 -#, c-format -msgid "option `%s' expects a number greater than zero" -msgstr "'%s' seçeneği sıfırdan büyük bir sayı bekliyor" - -#: builtin/revert.c:92 -#, c-format -msgid "%s: %s cannot be used with %s" -msgstr "%s: %s, %s ile birlikte kullanılamaz" - -#: builtin/revert.c:102 -msgid "end revert or cherry-pick sequence" -msgstr "geri al veya seç-al dizisini sonlandır" - -#: builtin/revert.c:103 -msgid "resume revert or cherry-pick sequence" -msgstr "geri al veya seç-al dizisini sürdür" - -#: builtin/revert.c:104 -msgid "cancel revert or cherry-pick sequence" -msgstr "geri al veya seç-al dizisini iptal et" - -#: builtin/revert.c:105 -msgid "skip current commit and continue" -msgstr "geçerli gönderiyi atla ve sürdür" - -#: builtin/revert.c:107 -msgid "don't automatically commit" -msgstr "kendiliğinden gönderme" - -#: builtin/revert.c:108 -msgid "edit the commit message" -msgstr "gönderi iletisini düzenle" - -#: builtin/revert.c:111 -msgid "parent-number" -msgstr "üst öge numarası" - -#: builtin/revert.c:112 -msgid "select mainline parent" -msgstr "ana üst ögeyi seç" - -#: builtin/revert.c:114 -msgid "merge strategy" -msgstr "birleştirme stratejisi" - -#: builtin/revert.c:116 -msgid "option for merge strategy" -msgstr "birleştirme stratejisi için seçenek" - -#: builtin/revert.c:125 -msgid "append commit name" -msgstr "gönderi adını iliştir" - -#: builtin/revert.c:127 -msgid "preserve initially empty commits" -msgstr "başlangıçta boş olan gönderileri koru" - -#: builtin/revert.c:129 -msgid "keep redundant, empty commits" -msgstr "gereksiz, boş gönderileri tut" - -#: builtin/revert.c:232 -msgid "revert failed" -msgstr "geri al başarısız" - -#: builtin/revert.c:245 -msgid "cherry-pick failed" -msgstr "seç-al başarısız" - -#: builtin/rm.c:19 -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<seçenekler>] [--] <dosya>..." - -#: builtin/rm.c:207 -msgid "" -"the following file has staged content different from both the\n" -"file and the HEAD:" -msgid_plural "" -"the following files have staged content different from both the\n" -"file and the HEAD:" -msgstr[0] "" -"Aşağıdaki dosyanın hem HEAD'den hem de dosyadan farklı hazırlanmış\n" -"içeriği mevcut:" -msgstr[1] "" -"Aşağıdaki dosyaların hem HEAD'den hem de dosyadan farklı hazırlanmış\n" -"içeriği mevcut:" - -#: builtin/rm.c:212 -msgid "" -"\n" -"(use -f to force removal)" -msgstr "" -"\n" -"(zorla kaldırmak için -f kullanın)" - -#: builtin/rm.c:216 -msgid "the following file has changes staged in the index:" -msgid_plural "the following files have changes staged in the index:" -msgstr[0] "Aşağıdaki dosyanın indekste hazırlanmış değişiklikleri mevcut:" -msgstr[1] "Aşağıdaki dosyaların indekste hazırlanmış değişiklikleri mevcut:" - -#: builtin/rm.c:220 builtin/rm.c:229 -msgid "" -"\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" -"\n" -"(dosyayı tutmak için --cached, zorla kaldırmak için -f kullanın)" - -#: builtin/rm.c:226 -msgid "the following file has local modifications:" -msgid_plural "the following files have local modifications:" -msgstr[0] "Aşağıdaki dosyanın yerel değişiklikleri var:" -msgstr[1] "Aşağıdaki dosyaların yerel değişiklikleri var:" - -#: builtin/rm.c:243 -msgid "do not list removed files" -msgstr "kaldırılan dosyaları listeleme" - -#: builtin/rm.c:244 -msgid "only remove from the index" -msgstr "yalnızca indeksten kaldır" - -#: builtin/rm.c:245 -msgid "override the up-to-date check" -msgstr "güncellik denetlemesini geçersiz kıl" - -#: builtin/rm.c:246 -msgid "allow recursive removal" -msgstr "özyineli kaldırmaya izin ver" - -#: builtin/rm.c:248 -msgid "exit with a zero status even if nothing matched" -msgstr "hiçbir şey eşleşmemiş olsa bile sıfır koduyla çık" - -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "Yol belirteci verilmedi. Hangi dosyaları kaldırmalıyım?" - -#: builtin/rm.c:305 -msgid "please stage your changes to .gitmodules or stash them to proceed" -msgstr "" -"ilerlemek için lütfen değişikliklerinizi .gitmodules'a hazırlayın veya " -"zulalayın" - -#: builtin/rm.c:323 -#, c-format -msgid "not removing '%s' recursively without -r" -msgstr "'%s', -r olmadan özyineli olarak kaldırılmıyor" - -#: builtin/rm.c:362 -#, c-format -msgid "git rm: unable to remove %s" -msgstr "git rm: %s kaldırılamadı" - -#: builtin/send-pack.c:20 -msgid "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " -"[<ref>...]\n" -" --all and explicit <ref> specification are mutually exclusive." -msgstr "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<makine>:]<dizin> " -"[<başvuru>...]\n" -" --all ve açık <başvuru> tanımlaması birlikte kullanılamaz." - -#: builtin/send-pack.c:163 -msgid "remote name" -msgstr "uzak konum adı" - -#: builtin/send-pack.c:177 -msgid "use stateless RPC protocol" -msgstr "durumsuz RPC protokolünü kullan" - -#: builtin/send-pack.c:178 -msgid "read refs from stdin" -msgstr "başvuruları stdin'den oku" - -#: builtin/send-pack.c:179 -msgid "print status from remote helper" -msgstr "uzak konum yardımcısından durum yazdır" - -#: builtin/shortlog.c:14 -msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git shortlog [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]" - -#: builtin/shortlog.c:15 -msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "git log --pretty=short | git shortlog [<seçenekler>]" - -#: builtin/shortlog.c:264 -msgid "Group by committer rather than author" -msgstr "Yazar yerine gönderici ile grupla" - -#: builtin/shortlog.c:266 -msgid "sort output according to the number of commits per author" -msgstr "çıktıyı yazar başına olan gönderi sayısına göre sırala" - -#: builtin/shortlog.c:268 -msgid "Suppress commit descriptions, only provides commit count" -msgstr "Gönderi açıklamalarını gizle, yalnızca gönderi sayısını ver" - -#: builtin/shortlog.c:270 -msgid "Show the email address of each author" -msgstr "Her yazarın e-posta adresini göster" - -#: builtin/shortlog.c:271 -msgid "<w>[,<i1>[,<i2>]]" -msgstr "<w>[,<i1>[,<i2>]]" - -#: builtin/shortlog.c:272 -msgid "Linewrap output" -msgstr "Çıktı satırlarını kaydır" - -#: builtin/shortlog.c:301 -msgid "too many arguments given outside repository" -msgstr "depo dışında çok fazla değişken verildi" - -#: builtin/show-branch.c:13 -msgid "" -"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" -msgstr "" -"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<ne-zaman>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" - -#: builtin/show-branch.c:17 -msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g | --reflog)[=<n>[,<temel>]] [--list] [<başvuru>]" - -#: builtin/show-branch.c:395 -#, c-format -msgid "ignoring %s; cannot handle more than %d ref" -msgid_plural "ignoring %s; cannot handle more than %d refs" -msgstr[0] "%s yok sayılıyor; %d başvurudan fazlası işlenemiyor" -msgstr[1] "%s yok sayılıyor; %d başvurudan fazlası işlenemiyor" - -#: builtin/show-branch.c:548 -#, c-format -msgid "no matching refs with %s" -msgstr "%s ile eşleşen başvuru yok" - -#: builtin/show-branch.c:645 -msgid "show remote-tracking and local branches" -msgstr "uzak izleme dallarını ve yerel dalları göster" - -#: builtin/show-branch.c:647 -msgid "show remote-tracking branches" -msgstr "uzak izleme dallarını göster" - -#: builtin/show-branch.c:649 -msgid "color '*!+-' corresponding to the branch" -msgstr "'*!+-'i dala göre renklendir" - -#: builtin/show-branch.c:651 -msgid "show <n> more commits after the common ancestor" -msgstr "ortak atadan sonra <n> gönderi daha göster" - -#: builtin/show-branch.c:653 -msgid "synonym to more=-1" -msgstr "more=-+ eşanlamlısı" - -#: builtin/show-branch.c:654 -msgid "suppress naming strings" -msgstr "adlandırma dizilerini gizle" - -#: builtin/show-branch.c:656 -msgid "include the current branch" -msgstr "geçerli dalı içer" - -#: builtin/show-branch.c:658 -msgid "name commits with their object names" -msgstr "gönderileri kendi nesne adlarıyla adlandır" - -#: builtin/show-branch.c:660 -msgid "show possible merge bases" -msgstr "olası birleştirme temellerini göster" - -#: builtin/show-branch.c:662 -msgid "show refs unreachable from any other ref" -msgstr "başka başvurudan erişilemeyen başvuruları göster" - -#: builtin/show-branch.c:664 -msgid "show commits in topological order" -msgstr "gönderileri ilingesel sırada göster" - -#: builtin/show-branch.c:667 -msgid "show only commits not on the first branch" -msgstr "yalnızca birinci dalda olmayan gönderileri göster" - -#: builtin/show-branch.c:669 -msgid "show merges reachable from only one tip" -msgstr "yalnızca bir uçtan ulaşılabilir olan birleştirmeleri göster" - -#: builtin/show-branch.c:671 -msgid "topologically sort, maintaining date order where possible" -msgstr "olabildiğince tarih sırasını koruyarak ilingesel biçimde sırala" - -#: builtin/show-branch.c:674 -msgid "<n>[,<base>]" -msgstr "<n>[,<temel>]" - -#: builtin/show-branch.c:675 -msgid "show <n> most recent ref-log entries starting at base" -msgstr "tabanda başlayarak en yeni <n> başvuru günlüğü girdilerini göster" - -#: builtin/show-branch.c:711 -msgid "" -"--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "" -"--reflog; --all, --remotes, --independent veya --merge-base ile uyumsuz" - -#: builtin/show-branch.c:735 -msgid "no branches given, and HEAD is not valid" -msgstr "dal verilmedi ve HEAD geçersiz" - -#: builtin/show-branch.c:738 -msgid "--reflog option needs one branch name" -msgstr "--reflog seçeneği için bir dal adı gerekli" - -#: builtin/show-branch.c:741 -#, c-format -msgid "only %d entry can be shown at one time." -msgid_plural "only %d entries can be shown at one time." -msgstr[0] "aynı anda yalnızca %d girdi gösterilebilir" -msgstr[1] "aynı anda yalnızca %d girdi gösterilebilir" - -#: builtin/show-branch.c:745 -#, c-format -msgid "no such ref %s" -msgstr "böyle bir başvuru yok: %s" - -#: builtin/show-branch.c:831 -#, c-format -msgid "cannot handle more than %d rev." -msgid_plural "cannot handle more than %d revs." -msgstr[0] "%d revizyondan başkası işlenemiyor." -msgstr[1] "%d revizyondan başkası işlenemiyor." - -#: builtin/show-branch.c:835 -#, c-format -msgid "'%s' is not a valid ref." -msgstr "'%s' geçerli bir başvuru değil." - -#: builtin/show-branch.c:838 -#, c-format -msgid "cannot find commit %s (%s)" -msgstr "%s gönderisi bulunamıyor (%s)" - -#: builtin/show-ref.c:12 -msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" -msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<dizgi>...]" - -#: builtin/show-ref.c:13 -msgid "git show-ref --exclude-existing[=<pattern>]" -msgstr "git show-ref --exclude-existing[=<dizgi>]" - -#: builtin/show-ref.c:162 -msgid "only show tags (can be combined with heads)" -msgstr "yalnızca etiketleri göster (dal uçlarıyla birlikte kullanılabilir)" - -#: builtin/show-ref.c:163 -msgid "only show heads (can be combined with tags)" -msgstr "yalnızca dal uçlarını göster (etiketlerle birlikte kullanılabilir)" - -#: builtin/show-ref.c:164 -msgid "stricter reference checking, requires exact ref path" -msgstr "daha sıkı başvuru denetlemesi; kesin başvuru yolu gerektirir" - -#: builtin/show-ref.c:167 builtin/show-ref.c:169 -msgid "show the HEAD reference, even if it would be filtered out" -msgstr "süzülüp dışarıda kalsa bile HEAD başvurusunu göster" - -#: builtin/show-ref.c:171 -msgid "dereference tags into object IDs" -msgstr "etiketleri nesne numaralarına çevir" - -#: builtin/show-ref.c:173 -msgid "only show SHA1 hash using <n> digits" -msgstr "SHA1 sağlamasını yalnızca <n> basamak kullanarak göster" - -#: builtin/show-ref.c:177 -msgid "do not print results to stdout (useful with --verify)" -msgstr "sonuçları stdout'a yazdırma (--verify ile birlikte kullanışlı)" - -#: builtin/show-ref.c:179 -msgid "show refs from stdin that aren't in local repository" -msgstr "stdin'den yerel bir depoda olmayan başvuruları göster" - -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <seçenekler>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "aralıklı çıkışı koni kipinde ilklendir" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "aralıklı çıkış ilklendir" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "'%s' açılamadı" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "'%s' yolu olağanlaştırılamadı" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "dizgileri stdin'den oku" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "aralıklı çıkış dizgileri ayarla" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "aralıklı çıkışı devre dışı bırak" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "çalışma dizini yenilenirken hata" - -#: builtin/stash.c:22 builtin/stash.c:38 -msgid "git stash list [<options>]" -msgstr "git stash list [<seçenekler>]" - -#: builtin/stash.c:23 builtin/stash.c:43 -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<seçenekler>] [<zula>]" - -#: builtin/stash.c:24 builtin/stash.c:48 -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<zula>]" - -#: builtin/stash.c:25 -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]" - -#: builtin/stash.c:26 builtin/stash.c:63 -msgid "git stash branch <branchname> [<stash>]" -msgstr "git stash branch <dal-adı> [<zula>]" - -#: builtin/stash.c:27 builtin/stash.c:68 -msgid "git stash clear" -msgstr "git stash clear" - -#: builtin/stash.c:28 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n" -" [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n" -" [--] [<yol-blrtç>...]]" - -#: builtin/stash.c:32 builtin/stash.c:85 -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<ileti>]" - -#: builtin/stash.c:53 -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<zula>]" - -#: builtin/stash.c:58 -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<zula>]" - -#: builtin/stash.c:73 -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <gönderi>" - -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n" -" [--] [<yol-blrtç>...]]" - -#: builtin/stash.c:128 -#, c-format -msgid "'%s' is not a stash-like commit" -msgstr "'%s' zulaya benzer bir gönderi değil" - -#: builtin/stash.c:148 -#, c-format -msgid "Too many revisions specified:%s" -msgstr "Çok fazla revizyon belirtildi:%s" - -#: builtin/stash.c:162 git-legacy-stash.sh:549 -msgid "No stash entries found." -msgstr "Zula girdisi bulunamadı." - -#: builtin/stash.c:176 -#, c-format -msgid "%s is not a valid reference" -msgstr "%s geçerli bir başvuru değil" - -#: builtin/stash.c:225 git-legacy-stash.sh:75 -msgid "git stash clear with parameters is unimplemented" -msgstr "parametreli git stash clear henüz kullanılabilir değil" - -#: builtin/stash.c:404 -msgid "cannot apply a stash in the middle of a merge" -msgstr "bir birleştirmenin ortasında zula uygulanamıyor" - -#: builtin/stash.c:415 -#, c-format -msgid "could not generate diff %s^!." -msgstr "diff oluşturulamadı: %s^!." - -#: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." -msgstr "İndekste çakışmalar var. --index olmadan deneyin." - -#: builtin/stash.c:428 -msgid "could not save index tree" -msgstr "indeks ağacı kaydedilemedi" - -#: builtin/stash.c:437 -msgid "could not restore untracked files from stash" -msgstr "izlenmeyen dosyalar zuladan geri getirilemedi" - -#: builtin/stash.c:451 -#, c-format -msgid "Merging %s with %s" -msgstr "%s, %s ile birleştiriliyor" - -#: builtin/stash.c:461 git-legacy-stash.sh:681 -msgid "Index was not unstashed." -msgstr "İndeks zuladan çıkartılmamıştı." - -#: builtin/stash.c:522 builtin/stash.c:621 -msgid "attempt to recreate the index" -msgstr "indeks yeniden oluşturulmaya çalışılıyor" - -#: builtin/stash.c:555 -#, c-format -msgid "Dropped %s (%s)" -msgstr "%s bırakıldı (%s)" - -#: builtin/stash.c:558 -#, c-format -msgid "%s: Could not drop stash entry" -msgstr "%s: Zula girdisi bırakılamadı" - -#: builtin/stash.c:583 -#, c-format -msgid "'%s' is not a stash reference" -msgstr "'%s' bir zula başvurusu değil" - -#: builtin/stash.c:633 git-legacy-stash.sh:695 -msgid "The stash entry is kept in case you need it again." -msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor." - -#: builtin/stash.c:656 git-legacy-stash.sh:713 -msgid "No branch name specified" -msgstr "Dal adı belirtilmedi" - -#: builtin/stash.c:796 builtin/stash.c:833 -#, c-format -msgid "Cannot update %s with %s" -msgstr "%s, %s ile güncellenemiyor" - -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 -msgid "stash message" -msgstr "zula iletisi" - -#: builtin/stash.c:824 -msgid "\"git stash store\" requires one <commit> argument" -msgstr "\"git stash store\" bir <gönderi> değişkeni gerektirir" - -#: builtin/stash.c:1049 git-legacy-stash.sh:218 -msgid "No changes selected" -msgstr "Değişiklik seçilmedi" - -#: builtin/stash.c:1149 git-legacy-stash.sh:150 -msgid "You do not have the initial commit yet" -msgstr "Henüz ilk gönderiniz yok" - -#: builtin/stash.c:1176 git-legacy-stash.sh:165 -msgid "Cannot save the current index state" -msgstr "Geçerli indeks durumu kaydedilemiyor" - -#: builtin/stash.c:1185 git-legacy-stash.sh:180 -msgid "Cannot save the untracked files" -msgstr "İzlenmeyen dosyalar kaydedilemiyor" - -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 -msgid "Cannot save the current worktree state" -msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor" - -#: builtin/stash.c:1233 git-legacy-stash.sh:234 -msgid "Cannot record working tree state" -msgstr "Çalışma ağacı durumu kaydı yazılamıyor" - -#: builtin/stash.c:1282 git-legacy-stash.sh:338 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanılamıyor" - -#: builtin/stash.c:1298 -msgid "Did you forget to 'git add'?" -msgstr "'git add' yapmayı mı unuttunuz?" - -#: builtin/stash.c:1313 git-legacy-stash.sh:346 -msgid "No local changes to save" -msgstr "Kaydedilecek yerel değişiklik yok" - -#: builtin/stash.c:1320 git-legacy-stash.sh:351 -msgid "Cannot initialize stash" -msgstr "Zula ilklendirilemiyor" - -#: builtin/stash.c:1335 git-legacy-stash.sh:355 -msgid "Cannot save the current status" -msgstr "Geçerli durum kaydedilemiyor" - -#: builtin/stash.c:1340 -#, c-format -msgid "Saved working directory and index state %s" -msgstr "Çalışma dizini ve indeks durumu %s kaydedildi" - -#: builtin/stash.c:1430 git-legacy-stash.sh:385 -msgid "Cannot remove worktree changes" -msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor" - -#: builtin/stash.c:1469 builtin/stash.c:1534 -msgid "keep index" -msgstr "indeksi tut" - -#: builtin/stash.c:1471 builtin/stash.c:1536 -msgid "stash in patch mode" -msgstr "yama kipinde zula" - -#: builtin/stash.c:1472 builtin/stash.c:1537 -msgid "quiet mode" -msgstr "sessiz kip" - -#: builtin/stash.c:1474 builtin/stash.c:1539 -msgid "include untracked files in stash" -msgstr "zulada izlenmeyen dosyaları içer" - -#: builtin/stash.c:1476 builtin/stash.c:1541 -msgid "include ignore files" -msgstr "yok sayma dosyalarını içer" - -#: builtin/stash.c:1600 -#, c-format -msgid "could not exec %s" -msgstr "%s 'exec' yapılamadı" - -#: builtin/stripspace.c:18 -msgid "git stripspace [-s | --strip-comments]" -msgstr "git stripspace [-s | --strip-comments]" - -#: builtin/stripspace.c:19 -msgid "git stripspace [-c | --comment-lines]" -msgstr "git stripspace [-c | --comment-lines]" - -#: builtin/stripspace.c:37 -msgid "skip and remove all lines starting with comment character" -msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır" - -#: builtin/stripspace.c:40 -msgid "prepend comment character and space to each line" -msgstr "her satırın başına yorum karakteri ve boşluk koy" - -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 -#, c-format -msgid "Expecting a full ref name, got %s" -msgstr "Tam bir başvuru adı bekleniyordu, %s alındı" - -#: builtin/submodule--helper.c:64 -msgid "submodule--helper print-default-remote takes no arguments" -msgstr "submodule--helper print-default-remote değişken almaz" - -#: builtin/submodule--helper.c:102 -#, c-format -msgid "cannot strip one component off url '%s'" -msgstr "'%s' url'sinden bir bileşen çıkarılamıyor" - -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 -msgid "alternative anchor for relative paths" -msgstr "göreceli yollar için alternatif tutturucu" - -#: builtin/submodule--helper.c:415 -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]" - -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 -#, c-format -msgid "No url found for submodule path '%s' in .gitmodules" -msgstr ".gitmodules içinde '%s' altmodül yolu için url bulunamadı" - -#: builtin/submodule--helper.c:524 -#, c-format -msgid "Entering '%s'\n" -msgstr "Giriliyor: '%s'\n" - -#: builtin/submodule--helper.c:527 -#, c-format -msgid "" -"run_command returned non-zero status for %s\n" -"." -msgstr "" -"run_command, %s için sıfır olmayan durum döndürdü\n" -"." - -#: builtin/submodule--helper.c:549 -#, c-format -msgid "" -"run_command returned non-zero status while recursing in the nested " -"submodules of %s\n" -"." -msgstr "" -"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken " -"sıfır olmayan durum döndürdü" - -#: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" -msgstr "Her altmodül komutu girişinin çıktısını gizle" - -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 -msgid "Recurse into nested submodules" -msgstr "İç içe geçmiş altmodüller içine özyinele" - -#: builtin/submodule--helper.c:572 -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>" - -#: builtin/submodule--helper.c:599 -#, c-format -msgid "" -"could not look up configuration '%s'. Assuming this repository is its own " -"authoritative upstream." -msgstr "" -"'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu " -"varsayılıyor." - -#: builtin/submodule--helper.c:667 -#, c-format -msgid "Failed to register url for submodule path '%s'" -msgstr "Altmodül yolu url'si '%s' kaydı yapılamadı" - -#: builtin/submodule--helper.c:671 -#, c-format -msgid "Submodule '%s' (%s) registered for path '%s'\n" -msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapıldı\n" - -#: builtin/submodule--helper.c:681 -#, c-format -msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "uyarı: '%s' altmodülü için komut güncellemesi önerilmiyor\n" - -#: builtin/submodule--helper.c:688 -#, c-format -msgid "Failed to register update mode for submodule path '%s'" -msgstr "'%s' altmodülü yolu için güncelleme kipi kaydı yapılamadı" - -#: builtin/submodule--helper.c:710 -msgid "Suppress output for initializing a submodule" -msgstr "Bir altmodül ilklendirmesi çıktısını gizle" - -#: builtin/submodule--helper.c:715 -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<seçenekler>] [<yol>]" - -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 -#, c-format -msgid "no submodule mapping found in .gitmodules for path '%s'" -msgstr "'%s' yolu için .gitmodules içinde altmodül eşlemi bulunmadı" - -#: builtin/submodule--helper.c:837 -#, c-format -msgid "could not resolve HEAD ref inside the submodule '%s'" -msgstr "'%s' altmodülü içinde HEAD başvurusu çözülemedi" - -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 -#, c-format -msgid "failed to recurse into submodule '%s'" -msgstr "'%s' altmodülüne özyinelenemedi" - -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 -msgid "Suppress submodule status output" -msgstr "Altmodül durum çıktısını gizle" - -#: builtin/submodule--helper.c:889 -msgid "" -"Use commit stored in the index instead of the one stored in the submodule " -"HEAD" -msgstr "" -"Altmodül HEAD'i içinde depolanan gönderi yerine indekste depolanan gönderiyi " -"kullan" - -#: builtin/submodule--helper.c:890 -msgid "recurse into nested submodules" -msgstr "iç içe geçmiş altmodüle özyinele" - -#: builtin/submodule--helper.c:895 -msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" -msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]" - -#: builtin/submodule--helper.c:919 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <yol>" - -#: builtin/submodule--helper.c:983 -#, c-format -msgid "Synchronizing submodule url for '%s'\n" -msgstr "'%s' için altmodül url'si eşitleniyor\n" - -#: builtin/submodule--helper.c:989 -#, c-format -msgid "failed to register url for submodule path '%s'" -msgstr "'%s' altmodülü yolu için url kaydı yapılamadı" - -#: builtin/submodule--helper.c:1003 -#, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "'%s' altmodülü için öntanımlı uzak konum alınamadı" - -#: builtin/submodule--helper.c:1014 -#, c-format -msgid "failed to update remote for submodule '%s'" -msgstr "'%s' altmodülü için uzak konum güncellenemedi" - -#: builtin/submodule--helper.c:1061 -msgid "Suppress output of synchronizing submodule url" -msgstr "Altmodül url'si eşitleme çıktısını gizle" - -#: builtin/submodule--helper.c:1068 -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]" - -#: builtin/submodule--helper.c:1122 -#, c-format -msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " -"really want to remove it including all of its history)" -msgstr "" -"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil " -"olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)" - -#: builtin/submodule--helper.c:1134 -#, c-format -msgid "" -"Submodule work tree '%s' contains local modifications; use '-f' to discard " -"them" -msgstr "" -"Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için " -"'-f' kullanın" - -#: builtin/submodule--helper.c:1142 -#, c-format -msgid "Cleared directory '%s'\n" -msgstr "'%s' dizini temizlendi\n" - -#: builtin/submodule--helper.c:1144 -#, c-format -msgid "Could not remove submodule work tree '%s'\n" -msgstr "'%s' altmodül çalışma ağacı kaldırılamadı\n" - -#: builtin/submodule--helper.c:1155 -#, c-format -msgid "could not create empty submodule directory %s" -msgstr "boş altmodül dizini %s oluşturulamadı" - -#: builtin/submodule--helper.c:1171 -#, c-format -msgid "Submodule '%s' (%s) unregistered for path '%s'\n" -msgstr "'%s' altmodülü (%s), '%s' yoluna kaydı yapılmamış\n" - -#: builtin/submodule--helper.c:1200 -msgid "Remove submodule working trees even if they contain local changes" -msgstr "Altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır" - -#: builtin/submodule--helper.c:1201 -msgid "Unregister all submodules" -msgstr "Tüm altmodüllerin kaydını kaldır" - -#: builtin/submodule--helper.c:1206 -msgid "" -"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" -msgstr "" -"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]" - -#: builtin/submodule--helper.c:1220 -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "" -"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '-all' " -"kullanın" - -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"Bir süperprojenin alternatifinden hesaplanan bir alternatif geçersiz.\n" -"Böyle bir durumda Git'in alternatifsiz klonlamasına izin vermek için\n" -"submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n" -"--reference yerine --reference-if-able kullanarak klonlayın." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 -#, c-format -msgid "submodule '%s' cannot add alternate: %s" -msgstr "'%s' altmodülü alternatif ekleyemiyor: %s" - -#: builtin/submodule--helper.c:1367 -#, c-format -msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" -msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı" - -#: builtin/submodule--helper.c:1374 -#, c-format -msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı" - -#: builtin/submodule--helper.c:1398 -msgid "where the new submodule will be cloned to" -msgstr "yeni altmodülün nereye klonlanacağı" - -#: builtin/submodule--helper.c:1401 -msgid "name of the new submodule" -msgstr "yeni altmodülün adı" - -#: builtin/submodule--helper.c:1404 -msgid "url where to clone the submodule from" -msgstr "altmodülün klonlanacağı url konumu" - -#: builtin/submodule--helper.c:1412 -msgid "depth for shallow clones" -msgstr "sığ klonların derinliği" - -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 -msgid "force cloning progress" -msgstr "zorla klonla" - -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "boş olmayan dizine klonlamaya izin verme" - -#: builtin/submodule--helper.c:1424 -msgid "" -"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" -msgstr "" -"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] " -"[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "" -"başka bir altmodülün git dizininde '%s' oluşturma/kullanma reddediliyor" - -#: builtin/submodule--helper.c:1460 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "'%s' ögesinin '%s' altmodül yoluna klonlanması başarısız" - -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "dizin boş değil: '%s'" - -#: builtin/submodule--helper.c:1476 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "'%s' için altmodül dizini alınamadı" - -#: builtin/submodule--helper.c:1512 -#, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için" - -#: builtin/submodule--helper.c:1516 -#, c-format -msgid "Invalid update mode '%s' configured for submodule path '%s'" -msgstr "Geçersiz güncelleme kipi '%s', '%s' altmodül yolu için yapılandırılmış" - -#: builtin/submodule--helper.c:1617 -#, c-format -msgid "Submodule path '%s' not initialized" -msgstr "Altmodül yolu '%s' ilklendirilmedi" - -#: builtin/submodule--helper.c:1621 -msgid "Maybe you want to use 'update --init'?" -msgstr "'update --init' mi kullanmak istersiniz?" - -#: builtin/submodule--helper.c:1651 -#, c-format -msgid "Skipping unmerged submodule %s" -msgstr "Birleştirilmemiş altmodül %s atlanıyor" - -#: builtin/submodule--helper.c:1680 -#, c-format -msgid "Skipping submodule '%s'" -msgstr "'%s' altmodülü atlanıyor" - -#: builtin/submodule--helper.c:1830 -#, c-format -msgid "Failed to clone '%s'. Retry scheduled" -msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı." - -#: builtin/submodule--helper.c:1841 -#, c-format -msgid "Failed to clone '%s' a second time, aborting" -msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor" - -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 -msgid "path into the working tree" -msgstr "çalışma ağacına giden yol" - -#: builtin/submodule--helper.c:1906 -msgid "path into the working tree, across nested submodule boundaries" -msgstr "iç içe geçmiş altmodül sınırları üzerinden çalışma ağacına giden yol" - -#: builtin/submodule--helper.c:1910 -msgid "rebase, merge, checkout or none" -msgstr "rebase, merge, checkout veya none" - -#: builtin/submodule--helper.c:1916 -msgid "Create a shallow clone truncated to the specified number of revisions" -msgstr "Belirli bir revizyon sayısına kısaltılmış sığ klon oluştur" - -#: builtin/submodule--helper.c:1919 -msgid "parallel jobs" -msgstr "paralel işler" - -#: builtin/submodule--helper.c:1921 -msgid "whether the initial clone should follow the shallow recommendation" -msgstr "ilk klonun sığlık üzerine olan tavsiyeyi izleyip izlemeyeceği" - -#: builtin/submodule--helper.c:1922 -msgid "don't print cloning progress" -msgstr "klonlama işlemini yazdırma" - -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]" - -#: builtin/submodule--helper.c:1946 -msgid "bad value for update parameter" -msgstr "güncelleme parametresi için hatalı değer" - -#: builtin/submodule--helper.c:1994 -#, c-format -msgid "" -"Submodule (%s) branch configured to inherit branch from superproject, but " -"the superproject is not on any branch" -msgstr "" -"Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı, ancak " -"süperproje herhangi bir dalda değil" - -#: builtin/submodule--helper.c:2117 -#, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "'%s' altmodülü için depo tutacağı alınamadı" - -#: builtin/submodule--helper.c:2150 -msgid "recurse into submodules" -msgstr "altmodüllere özyinele" - -#: builtin/submodule--helper.c:2156 -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]" - -#: builtin/submodule--helper.c:2212 -msgid "check if it is safe to write to the .gitmodules file" -msgstr ".gitmodules dosyasına yazım güvenli mi değil mi denetle" - -#: builtin/submodule--helper.c:2215 -msgid "unset the config in the .gitmodules file" -msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır" - -#: builtin/submodule--helper.c:2220 -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <ad> [<değer>]" - -#: builtin/submodule--helper.c:2221 -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <ad>" - -#: builtin/submodule--helper.c:2222 -msgid "git submodule--helper config --check-writeable" -msgstr "git submodule--helper config --check-writeable" - -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 -#, sh-format -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol" - -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s, --super-prefix desteklemiyor" - -#: builtin/submodule--helper.c:2297 -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' geçerli bir submodule-helper altkomutu değil" - -#: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<seçenekler>] <ad> [<başvuru>]" - -#: builtin/symbolic-ref.c:9 -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <ad>" - -#: builtin/symbolic-ref.c:40 -msgid "suppress error message for non-symbolic (detached) refs" -msgstr "sembolik olmayan (ayrık) başvurular için hata iletisini gizle" - -#: builtin/symbolic-ref.c:41 -msgid "delete symbolic ref" -msgstr "sembolik başvuruyu sil" - -#: builtin/symbolic-ref.c:42 -msgid "shorten ref output" -msgstr "başvuru çıktısını kısalt" - -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 -msgid "reason" -msgstr "neden" - -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 -msgid "reason of the update" -msgstr "güncelleme nedeni" - -#: builtin/tag.c:25 -msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -"\t\t<tagname> [<head>]" -msgstr "" -"git tag [-a | -s | -u <anahtar-no>] [-f] [-m <ileti> | -F <dosya>]\n" -"\t\t<etiket-adı> [<dal-ucu>]" - -#: builtin/tag.c:27 -msgid "git tag -d <tagname>..." -msgstr "git tag -d <etiket-adı>..." - -#: builtin/tag.c:28 -msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" -msgstr "" -"git tag -l [-n[<sayı>]] [--contains <gönderi>] [--no-contains <gönderi>] [--" -"points-at <nesne>]\n" -"\t\t[--format=<biçim>] [--[no-]merged [<gönderi>]] [<dizgi>...]" - -#: builtin/tag.c:30 -msgid "git tag -v [--format=<format>] <tagname>..." -msgstr "git tag -v [--format=<biçim>] <etiket-adı>..." - -#: builtin/tag.c:89 -#, c-format -msgid "tag '%s' not found." -msgstr "'%s' etiketi bulunamadı." - -#: builtin/tag.c:105 -#, c-format -msgid "Deleted tag '%s' (was %s)\n" -msgstr "'%s' etiketi silindi (%s idi)\n" - -#: builtin/tag.c:135 -#, c-format -msgid "" -"\n" -"Write a message for tag:\n" -" %s\n" -"Lines starting with '%c' will be ignored.\n" -msgstr "" -"\n" -"Etiket için bir ileti yazın:\n" -" %s\n" -"'%c' ile başlayan satırlar yok sayılacaktır.\n" - -#: builtin/tag.c:139 -#, c-format -msgid "" -"\n" -"Write a message for tag:\n" -" %s\n" -"Lines starting with '%c' will be kept; you may remove them yourself if you " -"want to.\n" -msgstr "" -"\n" -"Etiket için bir ileti yazın:\n" -" %s\n" -"'%c' ile başlayan satırlar tutulacaktır; isterseniz onları " -"kaldırabilirsiniz.\n" - -#: builtin/tag.c:198 -msgid "unable to sign the tag" -msgstr "etiket imzalanamıyor" - -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "etiket dosyası yazılamıyor" - -#: builtin/tag.c:216 -#, c-format -msgid "" -"You have created a nested tag. The object referred to by your new tag is\n" -"already a tag. If you meant to tag the object that it points to, use:\n" -"\n" -"\tgit tag -f %s %s^{}" -msgstr "" -"İç içe geçmiş bir etiket oluşturdunuz. Sizin yeni etiketinizce başvurulan\n" -"nesne zaten bir etiket. İşaret ettiği nesneyi etiketlemek istediyseniz:\n" -"\n" -"\tgit tag -f %s %s^{}" - -#: builtin/tag.c:232 -msgid "bad object type." -msgstr "hatalı nesne türü" - -#: builtin/tag.c:284 -msgid "no tag message?" -msgstr "etiket iletisi yok mu?" - -#: builtin/tag.c:291 -#, c-format -msgid "The tag message has been left in %s\n" -msgstr "Etiket iletisi %s içinde bırakıldı\n" - -#: builtin/tag.c:402 -msgid "list tag names" -msgstr "etiket adlarını listele" - -#: builtin/tag.c:404 -msgid "print <n> lines of each tag message" -msgstr "her etiket iletisinin <n> satırını listele" - -#: builtin/tag.c:406 -msgid "delete tags" -msgstr "etiketleri sil" - -#: builtin/tag.c:407 -msgid "verify tags" -msgstr "etiketleri doğrula" - -#: builtin/tag.c:409 -msgid "Tag creation options" -msgstr "Etiket oluşturma seçenekleri" - -#: builtin/tag.c:411 -msgid "annotated tag, needs a message" -msgstr "açıklama eklenmiş etiket için bir ileti gerek" - -#: builtin/tag.c:413 -msgid "tag message" -msgstr "etiket iletisi" - -#: builtin/tag.c:415 -msgid "force edit of tag message" -msgstr "etiket iletisini zorla düzenle" - -#: builtin/tag.c:416 -msgid "annotated and GPG-signed tag" -msgstr "açıklama eklenmiş ve GPG imzalı etiket" - -#: builtin/tag.c:419 -msgid "use another key to sign the tag" -msgstr "etiketi imzalamak için başka bir anahtar kullanın" - -#: builtin/tag.c:420 -msgid "replace the tag if exists" -msgstr "eğer varsa etiketi başkasıyla değiştir" - -#: builtin/tag.c:421 builtin/update-ref.c:369 -msgid "create a reflog" -msgstr "bir başvuru günlüğü oluştur" - -#: builtin/tag.c:423 -msgid "Tag listing options" -msgstr "Etiket listeleme seçenekleri" - -#: builtin/tag.c:424 -msgid "show tag list in columns" -msgstr "etiket listesini sütunlarla göster" - -#: builtin/tag.c:425 builtin/tag.c:427 -msgid "print only tags that contain the commit" -msgstr "yalnızca gönderiyi içeren etiketleri yazdır" - -#: builtin/tag.c:426 builtin/tag.c:428 -msgid "print only tags that don't contain the commit" -msgstr "yalnızca gönderi içermeyen etiketleri yazdır" - -#: builtin/tag.c:429 -msgid "print only tags that are merged" -msgstr "yalnızca birleştirilen etiketleri yazdır" - -#: builtin/tag.c:430 -msgid "print only tags that are not merged" -msgstr "yalnızca birleştirilmeyen etiketleri yazdır" - -#: builtin/tag.c:434 -msgid "print only tags of the object" -msgstr "yalnızca nesnenin etiketlerini yazdır" - -#: builtin/tag.c:482 -msgid "--column and -n are incompatible" -msgstr "--column ve -n birbiriyle uyumsuz" - -#: builtin/tag.c:504 -msgid "-n option is only allowed in list mode" -msgstr "-n seçeneğine yalnızca liste kipinde izin verilir" - -#: builtin/tag.c:506 -msgid "--contains option is only allowed in list mode" -msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir" - -#: builtin/tag.c:508 -msgid "--no-contains option is only allowed in list mode" -msgstr "--no-contains seçeneğine yalnızca liste kipinde izin verilir" - -#: builtin/tag.c:510 -msgid "--points-at option is only allowed in list mode" -msgstr "--points-at seçeneğine yalnızca liste kipinde izin verilir" - -#: builtin/tag.c:512 -msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "" -"--merged ve --no-merged seçeneklerine yalnızca liste kipinde izin verilir" - -#: builtin/tag.c:523 -msgid "only one -F or -m option is allowed." -msgstr "yalnızca bir -F veya -m seçeneğine izin verilir" - -#: builtin/tag.c:542 -msgid "too many params" -msgstr "çok fazla parametre" - -#: builtin/tag.c:548 -#, c-format -msgid "'%s' is not a valid tag name." -msgstr "'%s' geçerli bir etiket adı değil." - -#: builtin/tag.c:553 -#, c-format -msgid "tag '%s' already exists" -msgstr "'%s' etiketi halihazırda var" - -#: builtin/tag.c:584 -#, c-format -msgid "Updated tag '%s' (was %s)\n" -msgstr "'%s' etiketi güncellendi (%s idi)\n" - -#: builtin/unpack-objects.c:502 -msgid "Unpacking objects" -msgstr "Nesneler açılıyor" - -#: builtin/update-index.c:84 -#, c-format -msgid "failed to create directory %s" -msgstr "%s dizini oluşturulamadı" - -#: builtin/update-index.c:100 -#, c-format -msgid "failed to create file %s" -msgstr "%s dosyası oluşturulamadı" - -#: builtin/update-index.c:108 -#, c-format -msgid "failed to delete file %s" -msgstr "%s dosyası silinemedi" - -#: builtin/update-index.c:115 builtin/update-index.c:221 -#, c-format -msgid "failed to delete directory %s" -msgstr "%s dizini silinemedi" - -#: builtin/update-index.c:140 -#, c-format -msgid "Testing mtime in '%s' " -msgstr "'%s' içindeki mtime sınanıyor " - -#: builtin/update-index.c:154 -msgid "directory stat info does not change after adding a new file" -msgstr "dizin bilgileri yeni bir dosya ekledikten sonra değişmez" - -#: builtin/update-index.c:167 -msgid "directory stat info does not change after adding a new directory" -msgstr "dizin bilgileri yeni bir dizin ekledikten sonra değişmez" - -#: builtin/update-index.c:180 -msgid "directory stat info changes after updating a file" -msgstr "dizin bilgileri bir dosya güncellemesinden sonra değişir" - -#: builtin/update-index.c:191 -msgid "directory stat info changes after adding a file inside subdirectory" -msgstr "dizin bilgileri altdizin içine yeni bir dosya ekledikten sonra değişir" - -#: builtin/update-index.c:202 -msgid "directory stat info does not change after deleting a file" -msgstr "dizin bilgileri bir dosya sildikten sonra değişmez" - -#: builtin/update-index.c:215 -msgid "directory stat info does not change after deleting a directory" -msgstr "dizin bilgileri bir dizin sildikten sonra değişmez" - -#: builtin/update-index.c:222 -msgid " OK" -msgstr " Tamam" - -#: builtin/update-index.c:591 -msgid "git update-index [<options>] [--] [<file>...]" -msgstr "git update-index [<seçenekler>] [--] [<dosya>...]" - -#: builtin/update-index.c:974 -msgid "continue refresh even when index needs update" -msgstr "indeksin güncellenmesi gerekse bile yenilemeyi sürdür" - -#: builtin/update-index.c:977 -msgid "refresh: ignore submodules" -msgstr "refresh: altmodülleri yok say" - -#: builtin/update-index.c:980 -msgid "do not ignore new files" -msgstr "yeni dosyaları yok sayma" - -#: builtin/update-index.c:982 -msgid "let files replace directories and vice-versa" -msgstr "dosyaların dizinlerin yerine geçmesine ve tersine izin ver" - -#: builtin/update-index.c:984 -msgid "notice files missing from worktree" -msgstr "çalışma ağacından eksik olan dosyaları fark et" - -#: builtin/update-index.c:986 -msgid "refresh even if index contains unmerged entries" -msgstr "indekste birleştirilmemiş girdiler olsa bile yenile" - -#: builtin/update-index.c:989 -msgid "refresh stat information" -msgstr "dosya durum bilgisini yenile" - -#: builtin/update-index.c:993 -msgid "like --refresh, but ignore assume-unchanged setting" -msgstr "--refresh gibi, ancak assume-unchanged ayarını yok sayar" - -#: builtin/update-index.c:997 -msgid "<mode>,<object>,<path>" -msgstr "<kip>,<nesne>,<yol>" - -#: builtin/update-index.c:998 -msgid "add the specified entry to the index" -msgstr "belirtilen girdiyi indekse ekle" - -#: builtin/update-index.c:1008 -msgid "mark files as \"not changing\"" -msgstr "dosyaları \"not changing\" olarak imle" - -#: builtin/update-index.c:1011 -msgid "clear assumed-unchanged bit" -msgstr "assumed-unchanged kısmını temizle" - -#: builtin/update-index.c:1014 -msgid "mark files as \"index-only\"" -msgstr "dosyaları \"index-only\" olarak imle" - -#: builtin/update-index.c:1017 -msgid "clear skip-worktree bit" -msgstr "skip-worktree kısmını atla" - -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "'index-only' girdilerine dokunma" - -#: builtin/update-index.c:1022 -msgid "add to index only; do not add content to object database" -msgstr "yalnızca indekse ekle; içeriğe nesne veritabanına ekleme" - -#: builtin/update-index.c:1024 -msgid "remove named paths even if present in worktree" -msgstr "çalışma ağacında mevcut olsa bile ad verilen yolları kaldır" - -#: builtin/update-index.c:1026 -msgid "with --stdin: input lines are terminated by null bytes" -msgstr "--stdin ile: girdi satırları boş baytlarla sonlandırılır" - -#: builtin/update-index.c:1028 -msgid "read list of paths to be updated from standard input" -msgstr "güncellenecek yol listelerini standart girdi'den oku" - -#: builtin/update-index.c:1032 -msgid "add entries from standard input to the index" -msgstr "indekse standart girdi'den girdiler ekle" - -#: builtin/update-index.c:1036 -msgid "repopulate stages #2 and #3 for the listed paths" -msgstr "#2 ve #3 numaralı adımları listelenmiş yollar için yeniden doldur" - -#: builtin/update-index.c:1040 -msgid "only update entries that differ from HEAD" -msgstr "yalnızca HEAD'den farklı olan girdileri güncelle" - -#: builtin/update-index.c:1044 -msgid "ignore files missing from worktree" -msgstr "çalışma ağacından eksik olan dosyaları yok say" - -#: builtin/update-index.c:1047 -msgid "report actions to standard output" -msgstr "eylemleri standart çıktı'ya bildir" - -#: builtin/update-index.c:1049 -msgid "(for porcelains) forget saved unresolved conflicts" -msgstr "(okunabilir veri için) kaydedilmiş çözülmeyen çakışmaları unut" - -#: builtin/update-index.c:1053 -msgid "write index in this format" -msgstr "indeksi bu biçimle yaz" - -#: builtin/update-index.c:1055 -msgid "enable or disable split index" -msgstr "bölünmüş indeksi etkinleştir veya devre dışı bırak" - -#: builtin/update-index.c:1057 -msgid "enable/disable untracked cache" -msgstr "izlenmeyen önbelleği etkinleştir/devre dışı bırak" - -#: builtin/update-index.c:1059 -msgid "test if the filesystem supports untracked cache" -msgstr "dosya sisteminin izlenmeyen önbellek destekleyip desteklemediğini sına" - -#: builtin/update-index.c:1061 -msgid "enable untracked cache without testing the filesystem" -msgstr "dosya sistemini sınamadan izlenmeyen önbelleği etkinleştir" - -#: builtin/update-index.c:1063 -msgid "write out the index even if is not flagged as changed" -msgstr "değiştirilmiş olarak imlenmese bile indeksi yaz" - -#: builtin/update-index.c:1065 -msgid "enable or disable file system monitor" -msgstr "dosya sistemi monitörünü etkinleştir veya devre dışı bırak" - -#: builtin/update-index.c:1067 -msgid "mark files as fsmonitor valid" -msgstr "dosyaları dosya sistemi monitöründe geçerli olarak imle" - -#: builtin/update-index.c:1070 -msgid "clear fsmonitor valid bit" -msgstr "dosya sistemi monitöründe geçerli kısmını temizle" - -#: builtin/update-index.c:1173 -msgid "" -"core.splitIndex is set to false; remove or change it, if you really want to " -"enable split index" -msgstr "" -"core.splitIndex 'false' olarak ayarlanmış; bölünmüş indeksi etkinleştirmeyi " -"gerçekten istiyorsanız bunu kaldırın veya değiştirin" - -#: builtin/update-index.c:1182 -msgid "" -"core.splitIndex is set to true; remove or change it, if you really want to " -"disable split index" -msgstr "" -"core.splitIndex 'true' olarak ayarlanmış; bölünmüş indeksi devre dışı " -"bırakmayı gerçekten istiyorsanız bunu kaldırın veya değiştirin" - -#: builtin/update-index.c:1194 -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" - -#: builtin/update-index.c:1198 -msgid "Untracked cache disabled" -msgstr "İzlenmeyen önbellek devre dışı bırakıldı" - -#: builtin/update-index.c:1206 -msgid "" -"core.untrackedCache is set to false; remove or change it, if you really want " -"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" - -#: builtin/update-index.c:1210 -#, c-format -msgid "Untracked cache enabled for '%s'" -msgstr "İzlenmeyen önbellek '%s' için etkinleştirildi" - -#: builtin/update-index.c:1218 -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" - -#: builtin/update-index.c:1222 -msgid "fsmonitor enabled" -msgstr "dosya sistemi monitörü etkin" - -#: builtin/update-index.c:1225 -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" - -#: builtin/update-index.c:1229 -msgid "fsmonitor disabled" -msgstr "dosya sistemi monitörü devre dışı" - -#: builtin/update-ref.c:10 -msgid "git update-ref [<options>] -d <refname> [<old-val>]" -msgstr "git update-ref [<seçenekler>] -d <bşvr-adı> [<eski-değer>]" - -#: builtin/update-ref.c:11 -msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" -msgstr "" -"git update-ref [<seçenekler>] <bşvr-adı> <yeni-değer> [<eski-değer>]" - -#: builtin/update-ref.c:12 -msgid "git update-ref [<options>] --stdin [-z]" -msgstr "git update-ref [<seçenekler>] --stdin [-z]" - -#: builtin/update-ref.c:364 -msgid "delete the reference" -msgstr "başvuruyu sil" - -#: builtin/update-ref.c:366 -msgid "update <refname> not the one it points to" -msgstr "<başvuru-adı>'nı güncelleyin, işaret ettiğini değil" - -#: builtin/update-ref.c:367 -msgid "stdin has NUL-terminated arguments" -msgstr "stdin'de NUL ile sonlandırılan değişkenler var" - -#: builtin/update-ref.c:368 -msgid "read updates from stdin" -msgstr "güncellemeleri stdin'den oku" - -#: builtin/update-server-info.c:7 -msgid "git update-server-info [--force]" -msgstr "git update-server-info [--force]" - -#: builtin/update-server-info.c:15 -msgid "update the info files from scratch" -msgstr "bilgi dosyalarını en baştan güncelle" - -#: builtin/upload-pack.c:11 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<seçenekler>] <dizin>" - -#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 -msgid "quit after a single request/response exchange" -msgstr "tek bir istek/yanıt değiş tokuşundan sonra çık" - -#: builtin/upload-pack.c:25 -msgid "exit immediately after initial ref advertisement" -msgstr "ilk başvuru tanıtımından sonra hemen çık" - -#: builtin/upload-pack.c:27 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "eğer <dizin> bir Git dizini değilse <dizin>/.git/ deneme" - -#: builtin/upload-pack.c:29 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "aktarımı <n> saniye hareketsizlikten sonra kes" - -#: builtin/verify-commit.c:19 -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <gönderi>..." - -#: builtin/verify-commit.c:68 -msgid "print commit contents" -msgstr "gönderi içeriğini yazdır" - -#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 -msgid "print raw gpg status output" -msgstr "ham gpg durum çıktısını yazdır" - -#: builtin/verify-pack.c:55 -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..." - -#: builtin/verify-pack.c:65 -msgid "verbose" -msgstr "ayrıntılı anlatım" - -#: builtin/verify-pack.c:67 -msgid "show statistics only" -msgstr "yalnızca istatistikleri göster" - -#: builtin/verify-tag.c:18 -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<biçim>] <etiket>..." - -#: builtin/verify-tag.c:36 -msgid "print tag contents" -msgstr "etiket içeriğini yazdır" - -#: builtin/worktree.c:17 -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<seçenekler>] <yol> [<gönderimsi>]" - -#: builtin/worktree.c:18 -msgid "git worktree list [<options>]" -msgstr "git worktree list [<seçenekler>]" - -#: builtin/worktree.c:19 -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<seçenekler>] <yol>" - -#: builtin/worktree.c:20 -msgid "git worktree move <worktree> <new-path>" -msgstr "git worktree move <ç-ağacı> <yeni-yol>" - -#: builtin/worktree.c:21 -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<seçenekler>]" - -#: builtin/worktree.c:22 -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<seçenekler>] <ç-ağacı>" - -#: builtin/worktree.c:23 -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <yol>" - -#: builtin/worktree.c:60 builtin/worktree.c:891 -#, c-format -msgid "failed to delete '%s'" -msgstr "'%s' silinemedi" - -#: builtin/worktree.c:79 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "çalışma-ağacı/%s kaldırılıyor: geçerli bir dizin değil" - -#: builtin/worktree.c:85 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" -msgstr "çalışma-ağacı/%s kaldırılıyor: gitdir dosyası yok" - -#: builtin/worktree.c:90 builtin/worktree.c:99 -#, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "çalışma-ağacı/%s kaldırılıyor: gitdir dosyası okunamıyor (%s)" - -#: builtin/worktree.c:109 -#, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "" -"çalışma-ağacı/%s kaldırılıyor: yetersiz veri (%<PRIuMAX> bayt bekleniyordu, " -"%<PRIuMAX> okundu" - -#: builtin/worktree.c:117 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "çalışma-ağacı/%s kaldırılıyor: geçersiz gitdir dosyası" - -#: builtin/worktree.c:126 -#, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "" -"çalışma-ağacı/%s kaldırılıyor: gitdir dosyası olmayan bir konuma işaret " -"ediyor" - -#: builtin/worktree.c:165 -msgid "report pruned working trees" -msgstr "budanan çalışma ağaçlarını bildir" - -#: builtin/worktree.c:167 -msgid "expire working trees older than <time>" -msgstr "<zaman>'dan eski çalışma ağaçlarının hükmünü kaldır" - -#: builtin/worktree.c:234 -#, c-format -msgid "'%s' already exists" -msgstr "'%s' halihazırda var" - -#: builtin/worktree.c:244 -#, c-format -msgid "unable to re-add worktree '%s'" -msgstr "'%s' çalışma ağacı yeniden eklenemiyor" - -#: builtin/worktree.c:249 -#, c-format -msgid "" -"'%s' is a missing but locked worktree;\n" -"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" -msgstr "" -"'%s' eksik ancak kilitli bir çalışma ağacı;\n" -"geçersiz kılmak için 'add -f -f', temizlemek için 'unlock', 'prune' veya " -"'remove' kullanın" - -#: builtin/worktree.c:251 -#, c-format -msgid "" -"'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" -msgstr "" -"'%s' eksik ancak halihazırda kaydı yapılmış bir çalışma ağacı;\n" -"geçersiz kılmak için 'add -f', temizlemek için 'prune' veya 'remove' kullanın" - -#: builtin/worktree.c:301 -#, c-format -msgid "could not create directory of '%s'" -msgstr "'%s' dizini oluşturulamadı" - -#: builtin/worktree.c:432 builtin/worktree.c:438 -#, c-format -msgid "Preparing worktree (new branch '%s')" -msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')" - -#: builtin/worktree.c:434 -#, c-format -msgid "Preparing worktree (resetting branch '%s'; was at %s)" -msgstr "Çalışma ağacı hazırlanıyor ('%s' dalı sıfırlanıyor; %s konumundaydı)" - -#: builtin/worktree.c:443 -#, c-format -msgid "Preparing worktree (checking out '%s')" -msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)" - -#: builtin/worktree.c:449 -#, c-format -msgid "Preparing worktree (detached HEAD %s)" -msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)" - -#: builtin/worktree.c:490 -msgid "checkout <branch> even if already checked out in other worktree" -msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap" - -#: builtin/worktree.c:493 -msgid "create a new branch" -msgstr "yeni bir dal oluştur" - -#: builtin/worktree.c:495 -msgid "create or reset a branch" -msgstr "yeni bir dal oluştur veya sıfırla" - -#: builtin/worktree.c:497 -msgid "populate the new working tree" -msgstr "yeni çalışma ağacını doldur" - -#: builtin/worktree.c:498 -msgid "keep the new working tree locked" -msgstr "yeni çalışma ağacını kilitli tut" - -#: builtin/worktree.c:501 -msgid "set up tracking mode (see git-branch(1))" -msgstr "izleme kipini ayarla (bkz: git-branch(1))" - -#: builtin/worktree.c:504 -msgid "try to match the new branch name with a remote-tracking branch" -msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene" - -#: builtin/worktree.c:512 -msgid "-b, -B, and --detach are mutually exclusive" -msgstr "-b, -B ve --detach birlikte kullanılamaz" - -#: builtin/worktree.c:573 -msgid "--[no-]track can only be used if a new branch is created" -msgstr "--[no-]track yalnızca yeni bir dal oluşturulmuşsa kullanılabilir" - -#: builtin/worktree.c:673 -msgid "reason for locking" -msgstr "kilitleme nedeni" - -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 -#, c-format -msgid "'%s' is not a working tree" -msgstr "'%s' bir çalışma ağacı değil" - -#: builtin/worktree.c:687 builtin/worktree.c:720 -msgid "The main working tree cannot be locked or unlocked" -msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz" - -#: builtin/worktree.c:692 -#, c-format -msgid "'%s' is already locked, reason: %s" -msgstr "'%s' halihazırda kilitli, nedeni: %s" - -#: builtin/worktree.c:694 -#, c-format -msgid "'%s' is already locked" -msgstr "'%s' halihazırda kilitli" - -#: builtin/worktree.c:722 -#, c-format -msgid "'%s' is not locked" -msgstr "'%s' kilitli değil" - -#: builtin/worktree.c:763 -msgid "working trees containing submodules cannot be moved or removed" -msgstr "altmodül içeren çalışma ağaçları taşınamaz veya kaldırılamaz" - -#: builtin/worktree.c:771 -msgid "force move even if worktree is dirty or locked" -msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla taşı" - -#: builtin/worktree.c:794 builtin/worktree.c:921 -#, c-format -msgid "'%s' is a main working tree" -msgstr "'%s' bir ana çalışma ağacı" - -#: builtin/worktree.c:799 -#, c-format -msgid "could not figure out destination name from '%s'" -msgstr "hedef adı şuradan anlaşılamadı: '%s'" - -#: builtin/worktree.c:805 -#, c-format -msgid "target '%s' already exists" -msgstr "'%s' hedefi halihazırda var" - -#: builtin/worktree.c:813 -#, c-format -msgid "" -"cannot move a locked working tree, lock reason: %s\n" -"use 'move -f -f' to override or unlock first" -msgstr "" -"kilitli bir çalışma ağacı taşınamıyor, kilit nedeni: %s\n" -"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın" - -#: builtin/worktree.c:815 -msgid "" -"cannot move a locked working tree;\n" -"use 'move -f -f' to override or unlock first" -msgstr "" -"kilitli bir çalışma ağacı taşınamıyor;\n" -"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın" - -#: builtin/worktree.c:818 -#, c-format -msgid "validation failed, cannot move working tree: %s" -msgstr "doğrulama başarısız, çalışma ağacı taşınamıyor: %s" - -#: builtin/worktree.c:823 -#, c-format -msgid "failed to move '%s' to '%s'" -msgstr "'%s' -> '%s' taşıması başarısız" - -#: builtin/worktree.c:871 -#, c-format -msgid "failed to run 'git status' on '%s'" -msgstr "'%s' üzerinde 'git status' çalıştırılamadı" - -#: builtin/worktree.c:875 -#, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "" -"'%s' değiştirilmiş veya izlenmeyen dosyalar içeriyor, silmek için --force " -"kullanın" - -#: builtin/worktree.c:880 -#, c-format -msgid "failed to run 'git status' on '%s', code %d" -msgstr "'%s' üzerinde 'git status' çalıştırılamadı, kod %d" - -#: builtin/worktree.c:903 -msgid "force removal even if worktree is dirty or locked" -msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla kaldır" - -#: builtin/worktree.c:926 -#, c-format -msgid "" -"cannot remove a locked working tree, lock reason: %s\n" -"use 'remove -f -f' to override or unlock first" -msgstr "" -"kilitli bir çalışma ağacı kaldırılamıyor, kilit nedeni: %s\n" -"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın" - -#: builtin/worktree.c:928 -msgid "" -"cannot remove a locked working tree;\n" -"use 'remove -f -f' to override or unlock first" -msgstr "" -"kilitli bir çalışma ağacı kaldırılamıyor;\n" -"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın" - -#: builtin/worktree.c:931 -#, c-format -msgid "validation failed, cannot remove working tree: %s" -msgstr "doğrulama başarısız, çalışma ağacı kaldırılamıyor: %s" - -#: builtin/write-tree.c:15 -msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" -msgstr "git write-tree [--missing-ok] [--prefix=<önek>/]" - -#: builtin/write-tree.c:28 -msgid "<prefix>/" -msgstr "<önek>/" - -#: builtin/write-tree.c:29 -msgid "write tree object for a subdirectory <prefix>" -msgstr "bir <önek> altdizini için ağaç nesnesi yaz" - -#: builtin/write-tree.c:31 -msgid "only useful for debugging" -msgstr "yalnızca hata ayıklama için yararlı" - -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "'mark' komutu bekleniyordu, %s alındı" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "'to' komutu bekleniyordu, %s alındı" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı" - -#: credential-cache--daemon.c:223 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" -"Soket dizininizdeki izinler çok gevşek; diğer kullanıcılar sizin\n" -"önbelleğe alınmış yetkilerinizi okuyabilirler. Şunu çalıştırmayı düşünün:\n" -"\n" -"\tchmod 0700 %s" - -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "hata ayıklama iletilerini stderr'e yazdır" - -#: t/helper/test-reach.c:152 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "%s gönderisi ulaşılabilir olarak imlenmedi" - -#: t/helper/test-reach.c:162 -msgid "too many commits marked reachable" -msgstr "çok fazla gönderi ulaşılabilir olarak imlenmiş" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<seçenekler>]" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "becerileri gösterdikten hemen sonra çık" - -#: git.c:27 -msgid "" -"git [--version] [--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" -" <command> [<args>]" -msgstr "" -"git [--version] [--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" -" <komut> [<değişkenler>]" - -#: git.c:34 -msgid "" -"'git help -a' and 'git help -g' list available subcommands and some\n" -"concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept.\n" -"See 'git help git' for an overview of the system." -msgstr "" -"'git help -a' ve 'git help -g' kullanılabilir komutları ve bazı konsept\n" -"kılavuzlarını listeler. Belirli bir komut veya konsept üzerine bilgi almak\n" -"için 'git help <komut>' veya 'git help <konsept>' yazın. Genel bir görünüm\n" -"için 'git help git' kullanabilirsiniz." - -#: git.c:186 -#, c-format -msgid "no directory given for --git-dir\n" -msgstr "--git-dir için dizin verilmedi\n" - -#: git.c:200 -#, c-format -msgid "no namespace given for --namespace\n" -msgstr "--namespace için ad alanı verilmedi\n" - -#: git.c:214 -#, c-format -msgid "no directory given for --work-tree\n" -msgstr "--work-tree için dizin verilmedi\n" - -#: git.c:228 -#, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "--super-prefix için önek verilmedi\n" - -#: git.c:250 -#, c-format -msgid "-c expects a configuration string\n" -msgstr "-c bir yapılandırma dizisi bekliyor\n" - -#: git.c:288 -#, c-format -msgid "no directory given for -C\n" -msgstr "-C için dizin verilmedi\n" - -#: git.c:314 -#, c-format -msgid "unknown option: %s\n" -msgstr "bilinmeyen seçenek: %s\n" - -#: git.c:360 -#, c-format -msgid "while expanding alias '%s': '%s'" -msgstr "'%s' arması genişletirilirken: '%s'" - -#: git.c:369 -#, c-format -msgid "" -"alias '%s' changes environment variables.\n" -"You can use '!git' in the alias to do this" -msgstr "" -"'%s' arması ortam değişkenlerini değiştirir.\n" -"Bunu yapmak için armada '!git' kullanabilirsiniz." - -#: git.c:376 -#, c-format -msgid "empty alias for %s" -msgstr "%s için boş arma" - -#: git.c:379 -#, c-format -msgid "recursive alias: %s" -msgstr "özyineli arma: %s" - -#: git.c:459 -msgid "write failure on standard output" -msgstr "standart çıktı'da yazma hatası" - -#: git.c:461 -msgid "unknown write failure on standard output" -msgstr "standart çıktı'da bilinmeyen yazma hatası" - -#: git.c:463 -msgid "close failed on standard output" -msgstr "standart çıktı'da kapatma başarısız" - -#: git.c:793 -#, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "arma döngüsü algılandı: '%s' genişletilmesi sonlanmıyor:%s" - -#: git.c:843 -#, c-format -msgid "cannot handle %s as a builtin" -msgstr "%s bir yerleşik olarak işlenemiyor" - -#: git.c:856 -#, c-format -msgid "" -"usage: %s\n" -"\n" -msgstr "" -"kullanım: %s\n" -"\n" - -#: git.c:876 -#, c-format -msgid "expansion of alias '%s' failed; '%s' is not a git command\n" -msgstr "" -"'%s' armasının genişletilmesi başarısız oldu; '%s' bir git komutu değil\n" - -#: git.c:888 -#, c-format -msgid "failed to run command '%s': %s\n" -msgstr "'%s' komutu çalıştırılamadı: %s\n" - -#: http.c:378 -#, c-format -msgid "negative value for http.postbuffer; defaulting to %d" -msgstr "http.postbuffer için negatif değer; %d olarak varsayılıyor" - -#: http.c:399 -msgid "Delegation control is not supported with cURL < 7.22.0" -msgstr "Delegasyon denetimi cURL < 7.22.0 tarafından desteklenmiyor" - -#: http.c:408 -msgid "Public key pinning not supported with cURL < 7.44.0" -msgstr "Ortak anahtar iğnelemesi cURL < 7.44.0 tarafından desteklenmiyor" - -#: http.c:876 -msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" -msgstr "CURLSSLOPT_NO_REVOKE cURL < 7.44.0 tarafından desteklenmiyor" - -#: http.c:949 -msgid "Protocol restrictions not supported with cURL < 7.19.4" -msgstr "Protokol sınırlamaları cURL < 7.19.4 tarafından desteklenmiyor" - -#: http.c:1086 -#, c-format -msgid "Unsupported SSL backend '%s'. Supported SSL backends:" -msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uçları:" - -#: http.c:1093 -#, c-format -msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" -msgstr "" -"SSL arka ucu '%s' olarak ayarlanamadı: cURL, SSL arka uçları olmadan yapılmış" - -#: http.c:1097 -#, c-format -msgid "Could not set SSL backend to '%s': already set" -msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış" - -#: http.c:1966 -#, c-format -msgid "" -"unable to update url base from redirection:\n" -" asked for: %s\n" -" redirect: %s" -msgstr "" -"yeniden yönlendirerek url tabanı güncellenemiyor:\n" -" şu istendi: %s\n" -" yönlenen: %s" - -#: remote-curl.c:166 -#, c-format -msgid "invalid quoting in push-option value: '%s'" -msgstr "push-option değerinde geçersiz tırnak içine alım: '%s'" - -#: remote-curl.c:263 -#, c-format -msgid "%sinfo/refs not valid: is this a git repository?" -msgstr "%sinfo/refs geçerli değil: bu bir git deposu mu?" - -#: remote-curl.c:364 -msgid "invalid server response; expected service, got flush packet" -msgstr "geçersiz sunucu yanıtı; servis bekleniyordu, floş paketi alındı" - -#: remote-curl.c:395 -#, c-format -msgid "invalid server response; got '%s'" -msgstr "geçersiz sunucu yanıtı; '%s' alındı" - -#: remote-curl.c:455 -#, c-format -msgid "repository '%s' not found" -msgstr "'%s' deposu bulunamadı" - -#: remote-curl.c:459 -#, c-format -msgid "Authentication failed for '%s'" -msgstr "'%s' için kimlik doğrulaması başarısız" - -#: remote-curl.c:463 -#, c-format -msgid "unable to access '%s': %s" -msgstr "'%s' erişilemiyor: %s" - -#: remote-curl.c:469 -#, c-format -msgid "redirecting to %s" -msgstr "şuraya yeniden yönlendiriliyor: %s" - -#: remote-curl.c:593 -msgid "shouldn't have EOF when not gentle on EOF" -msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır" - -#: remote-curl.c:673 -msgid "unable to rewind rpc post data - try increasing http.postBuffer" -msgstr "" -"rpc sonrası verisi geri sarılamıyor - https.postBuffer'ı artırmayı deneyin" - -#: remote-curl.c:733 -#, c-format -msgid "RPC failed; %s" -msgstr "RPC başarısız oldu; %s" - -#: remote-curl.c:773 -msgid "cannot handle pushes this big" -msgstr "bu kadar büyük itmeler işlenemiyor" - -#: remote-curl.c:888 -#, c-format -msgid "cannot deflate request; zlib deflate error %d" -msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d" - -#: remote-curl.c:892 -#, c-format -msgid "cannot deflate request; zlib end error %d" -msgstr "istek söndürülemiyor; 'zlib end' hatası %d" - -#: remote-curl.c:1023 -msgid "dumb http transport does not support shallow capabilities" -msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor" - -#: remote-curl.c:1038 -msgid "fetch failed." -msgstr "getirme başarısız." - -#: remote-curl.c:1086 -msgid "cannot fetch by sha1 over smart http" -msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor" - -#: remote-curl.c:1130 remote-curl.c:1136 -#, c-format -msgid "protocol error: expected sha/ref, got '%s'" -msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı" - -#: remote-curl.c:1148 remote-curl.c:1263 -#, c-format -msgid "http transport does not support %s" -msgstr "http taşıyıcısı %s desteklemiyor" - -#: remote-curl.c:1184 -msgid "git-http-push failed" -msgstr "git-http-push başarısız" - -#: remote-curl.c:1369 -msgid "remote-curl: usage: git remote-curl <remote> [<url>]" -msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]" - -#: remote-curl.c:1401 -msgid "remote-curl: error reading command stream from git" -msgstr "remote-curl: git'ten komut akışı okunurken hata" - -#: remote-curl.c:1408 -msgid "remote-curl: fetch attempted without a local repo" -msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı" - -#: remote-curl.c:1448 -#, c-format -msgid "remote-curl: unknown command '%s' from git" -msgstr "remote-curl: git'ten bilinmeyen komut '%s'" - -#: list-objects-filter-options.h:85 -msgid "args" -msgstr "değişkenler" - -#: list-objects-filter-options.h:86 -msgid "object filtering" -msgstr "nesne süzümü" - -#: parse-options.h:183 -msgid "expiry-date" -msgstr "son kullanım tarihi" - -#: parse-options.h:197 -msgid "no-op (backward compatibility)" -msgstr "işlem yok (geriye dönük uyumluluk için)" - -#: parse-options.h:309 -msgid "be more verbose" -msgstr "daha ayrıntılı anlat" - -#: parse-options.h:311 -msgid "be more quiet" -msgstr "daha sessiz ol" - -#: parse-options.h:317 -msgid "use <n> digits to display SHA-1s" -msgstr "SHA-1'leri görüntülemek için <n> rakam kullan" - -#: parse-options.h:336 -msgid "how to strip spaces and #comments from message" -msgstr "iletiden boşlukları ve #yorumları çıkart" - -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "yol belirtecini dosyadan oku" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" -"--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır" - -#: ref-filter.h:101 -msgid "key" -msgstr "anahtar" - -#: ref-filter.h:101 -msgid "field name to sort on" -msgstr "üzerine sıralanacak alan adı" - -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "" -"eğer olanaklıysa indeksi yeniden kullanılmış çakışma çözümü ile güncelle" - -#: wt-status.h:67 -msgid "HEAD detached at " -msgstr "HEAD şurada ayrıldı: " - -#: wt-status.h:68 -msgid "HEAD detached from " -msgstr "HEAD şundan ayrıldı: " - -#: command-list.h:50 -msgid "Add file contents to the index" -msgstr "Dosya içeriğini indekse ekle" - -#: command-list.h:51 -msgid "Apply a series of patches from a mailbox" -msgstr "Bir posta kutusundan bir dizi yama uygula" - -#: command-list.h:52 -msgid "Annotate file lines with commit information" -msgstr "Gönderi bilgisini dosya içi açıklama olarak ekle" - -#: command-list.h:53 -msgid "Apply a patch to files and/or to the index" -msgstr "İndekse ve/veya dosyalara bir yama uygula" - -#: command-list.h:54 -msgid "Import a GNU Arch repository into Git" -msgstr "Git'e bir GNU Arch deposu içe aktar" - -#: command-list.h:55 -msgid "Create an archive of files from a named tree" -msgstr "Ad verilmiş ağaçtan bir dosyalar arşivi oluştur" - -#: command-list.h:56 -msgid "Use binary search to find the commit that introduced a bug" -msgstr "Hatalara neden olan gönderiyi bulmada ikili arama kullan" - -#: command-list.h:57 -msgid "Show what revision and author last modified each line of a file" -msgstr "Dosya satırlarını son değiştiren revizyon/yazarı göster" - -#: command-list.h:58 -msgid "List, create, or delete branches" -msgstr "Dallar oluştur, sil veya listele" - -#: command-list.h:59 -msgid "Move objects and refs by archive" -msgstr "Nesneleri ve başvuruları arşive göre taşı" - -#: command-list.h:60 -msgid "Provide content or type and size information for repository objects" -msgstr "Depo nesneleri için içerik veya tür/boyut bilgisi sağla" - -#: command-list.h:61 -msgid "Display gitattributes information" -msgstr "gitattributes bilgisini görüntüle" - -#: command-list.h:62 -msgid "Debug gitignore / exclude files" -msgstr "gitignore / exclude dosyalarında hata ayıkla" - -#: command-list.h:63 -msgid "Show canonical names and email addresses of contacts" -msgstr "Kişilerin adlarını ve e-posta adreslerini göster" - -#: command-list.h:64 -msgid "Switch branches or restore working tree files" -msgstr "Dal değiştir veya çalışma ağacını eski haline geri getir" - -#: command-list.h:65 -msgid "Copy files from the index to the working tree" -msgstr "Dosyaları indeksten çalışma ağacına kopyala" - -#: command-list.h:66 -msgid "Ensures that a reference name is well formed" -msgstr "Bir başvuru adının düzgünce oluşturulduğundan emin ol" - -#: command-list.h:67 -msgid "Find commits yet to be applied to upstream" -msgstr "Henüz üstkaynağa uygulanmayan gönderileri bul" - -#: command-list.h:68 -msgid "Apply the changes introduced by some existing commits" -msgstr "Mevcut bazı gönderilerin getirdiği değişiklikleri uygula" - -#: command-list.h:69 -msgid "Graphical alternative to git-commit" -msgstr "git-commit için grafik tabanlı alternatif" - -#: command-list.h:70 -msgid "Remove untracked files from the working tree" -msgstr "İzlenmeyen dosyaları çalışma ağacından kaldır" - -#: command-list.h:71 -msgid "Clone a repository into a new directory" -msgstr "Bir depoyu yeni bir dizine klonla" - -#: command-list.h:72 -msgid "Display data in columns" -msgstr "Verileri sütunlarla göster" - -#: command-list.h:73 -msgid "Record changes to the repository" -msgstr "Değişikliklerin kaydını depoya yaz" - -#: command-list.h:74 -msgid "Write and verify Git commit-graph files" -msgstr "Git commit-graph dosyalarını doğrula ve yaz" - -#: command-list.h:75 -msgid "Create a new commit object" -msgstr "Yeni bir gönderi nesnesi oluştur" - -#: command-list.h:76 -msgid "Get and set repository or global options" -msgstr "Depoyu veya global seçenekleri al ve ayarla" - -#: command-list.h:77 -msgid "Count unpacked number of objects and their disk consumption" -msgstr "Açılmamış nesne sayısını ve disk kullanımını hesapla" - -#: command-list.h:78 -msgid "Retrieve and store user credentials" -msgstr "Kullanıcı yetkilerini al ve depola" - -#: command-list.h:79 -msgid "Helper to temporarily store passwords in memory" -msgstr "Parolaları geçici olarak bellekte saklamak için yardımcı" - -#: command-list.h:80 -msgid "Helper to store credentials on disk" -msgstr "Yetkileri diskte saklamak için yardımcı" - -#: command-list.h:81 -msgid "Export a single commit to a CVS checkout" -msgstr "Bir CVS çıkışına tek bir gönderiyi dışa aktar" - -#: command-list.h:82 -msgid "Salvage your data out of another SCM people love to hate" -msgstr "Tiskindiğiniz başka bir KDY'den verileri kurtar" - -#: command-list.h:83 -msgid "A CVS server emulator for Git" -msgstr "Git için bir SCV sunucusu öykünücüsü" - -#: command-list.h:84 -msgid "A really simple server for Git repositories" -msgstr "Git depoları için gerçekten yalın bir sunucu" - -#: command-list.h:85 -msgid "Give an object a human readable name based on an available ref" -msgstr "Uygun bir başvuruyu temel alıp nesneye okunabilir ad ver" - -#: command-list.h:86 -msgid "Show changes between commits, commit and working tree, etc" -msgstr "Gönderiler, gönderi ve ağaçlar vb. arası değişiklikler" - -#: command-list.h:87 -msgid "Compares files in the working tree and the index" -msgstr "İndeksteki ve çalışma ağacındaki dosyaları sıkıştır" - -#: command-list.h:88 -msgid "Compare a tree to the working tree or index" -msgstr "Bir ağacı çalışma ağacı veya indeks ile karşılaştır" - -#: command-list.h:89 -msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "" -"İki ağaç nesnesi ile bulunan ikililerin içerik ve kiplerini karşılaştır" - -#: command-list.h:90 -msgid "Show changes using common diff tools" -msgstr "Değişiklikleri yaygın diff araçlarıyla göster" - -#: command-list.h:91 -msgid "Git data exporter" -msgstr "Git veri dışa aktarıcısı" - -#: command-list.h:92 -msgid "Backend for fast Git data importers" -msgstr "Hızlı Git veri dışa aktarıcıları için arka uç" - -#: command-list.h:93 -msgid "Download objects and refs from another repository" -msgstr "Başka bir depodan nesneleri ve başvuruları indir" - -#: command-list.h:94 -msgid "Receive missing objects from another repository" -msgstr "Başka bir depodan eksik nesneleri al" - -#: command-list.h:95 -msgid "Rewrite branches" -msgstr "Dalları yeniden yaz" - -#: command-list.h:96 -msgid "Produce a merge commit message" -msgstr "Bir birleştirme gönderisi iletisi oluştur" - -#: command-list.h:97 -msgid "Output information on each ref" -msgstr "Her başvuru üzerine bilgi çıktı ver" - -#: command-list.h:98 -msgid "Prepare patches for e-mail submission" -msgstr "E-posta teslimi için yamaları hazırla" - -#: command-list.h:99 -msgid "Verifies the connectivity and validity of the objects in the database" -msgstr "Veritab. nesnelerin bağlanırlığını ve geçerliliğini sına" - -#: command-list.h:100 -msgid "Cleanup unnecessary files and optimize the local repository" -msgstr "Gereksiz dosyaları temizle ve yerel depoyu eniyile" - -#: command-list.h:101 -msgid "Extract commit ID from an archive created using git-archive" -msgstr "Gönderi iletisini bir git-archive arşivinden çıkartıp al" - -#: command-list.h:102 -msgid "Print lines matching a pattern" -msgstr "Bir dizgi ile eşleşen satırları yazdır" - -#: command-list.h:103 -msgid "A portable graphical interface to Git" -msgstr "Git için taşınabilir bir grafik arabirim" - -#: command-list.h:104 -msgid "Compute object ID and optionally creates a blob from a file" -msgstr "Sağlamayı hesapla ve isteğe göre dosyadan ikili oluştur" - -#: command-list.h:105 -msgid "Display help information about Git" -msgstr "Git yardım bilgisini görüntüle" - -#: command-list.h:106 -msgid "Server side implementation of Git over HTTP" -msgstr "Git'in HTTP üzerinden sunucu tarafı uygulaması" - -#: command-list.h:107 -msgid "Download from a remote Git repository via HTTP" -msgstr "HTTP üzerinden uzak bir Git deposundan indir" - -#: command-list.h:108 -msgid "Push objects over HTTP/DAV to another repository" -msgstr "Nesneleri HTTP/DAV üzerinden başka bir depoya it" - -#: command-list.h:109 -msgid "Send a collection of patches from stdin to an IMAP folder" -msgstr "stdin'den bir IMAP klasörüne bir yama derlemesi gönder" - -#: command-list.h:110 -msgid "Build pack index file for an existing packed archive" -msgstr "Mevcut paketli bir arşiv için paket indeks dosyası yap" - -#: command-list.h:111 -msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "Boş bir Git deposu oluştur veya var olanı yeniden başlat" - -#: command-list.h:112 -msgid "Instantly browse your working repository in gitweb" -msgstr "gitweb'deki çalışma deposuna anında göz at" - -#: command-list.h:113 -msgid "Add or parse structured information in commit messages" -msgstr "Gönderi iletilerine düzenli bilgi ekle veya ayrıştır" - -#: command-list.h:114 -msgid "The Git repository browser" -msgstr "Git depo tarayıcısı" - -#: command-list.h:115 -msgid "Show commit logs" -msgstr "Gönderi günlüklerini göster" - -#: command-list.h:116 -msgid "Show information about files in the index and the working tree" -msgstr "İndeks ve çalışma ağacındaki dosya bilgilerini göster" - -#: command-list.h:117 -msgid "List references in a remote repository" -msgstr "Uzak bir depodaki başvuruları listele" - -#: command-list.h:118 -msgid "List the contents of a tree object" -msgstr "Bir ağaç nesnesinin içeriğini listele" - -#: command-list.h:119 -msgid "Extracts patch and authorship from a single e-mail message" -msgstr "E-posta iletisinden yama ve yazar bilgisini çıkart" - -#: command-list.h:120 -msgid "Simple UNIX mbox splitter program" -msgstr "Yalın UNIX mbox bölücü yazılımı" - -#: command-list.h:121 -msgid "Join two or more development histories together" -msgstr "İki veya daha fazla geliştirme geçmişini birleştir" - -#: command-list.h:122 -msgid "Find as good common ancestors as possible for a merge" -msgstr "Birleştirme için olabildiğince en iyi ortak ataları bul" - -#: command-list.h:123 -msgid "Run a three-way file merge" -msgstr "Bir üç yönlü dosya birleştirmesi çalıştır" - -#: command-list.h:124 -msgid "Run a merge for files needing merging" -msgstr "Birleştirilmesi gereken dosyaları birleştir" - -#: command-list.h:125 -msgid "The standard helper program to use with git-merge-index" -msgstr "Bu yardımcı program git-merge-index kullanımı içindir" - -#: command-list.h:126 -msgid "Run merge conflict resolution tools to resolve merge conflicts" -msgstr "Çakışmaları çözmek için çözüm araçlarını çalıştır" - -#: command-list.h:127 -msgid "Show three-way merge without touching index" -msgstr "İndekse dokunmadan üçlü birleştirmeyi göster" - -#: command-list.h:128 -msgid "Write and verify multi-pack-indexes" -msgstr "multi-pack-index doğrula ve yaz" - -#: command-list.h:129 -msgid "Creates a tag object" -msgstr "Bir etiket nesnesi oluştur" - -#: command-list.h:130 -msgid "Build a tree-object from ls-tree formatted text" -msgstr "ls-tree biçimli metinden bir ağaç nesnesi yap" - -#: command-list.h:131 -msgid "Move or rename a file, a directory, or a symlink" -msgstr "Dosya, dizin veya sembolik bağları taşı/yeniden adlandır" - -#: command-list.h:132 -msgid "Find symbolic names for given revs" -msgstr "Verilen revizyonlar için sembolik adları bul" - -#: command-list.h:133 -msgid "Add or inspect object notes" -msgstr "Nesne notları ekle veya incele" - -#: command-list.h:134 -msgid "Import from and submit to Perforce repositories" -msgstr "Perforce depolarından içe aktar ve onlara gönder" - -#: command-list.h:135 -msgid "Create a packed archive of objects" -msgstr "Paketlenmiş bir nesne arşivi oluştur" - -#: command-list.h:136 -msgid "Find redundant pack files" -msgstr "Gereksiz paket dosyalarını bul" - -#: command-list.h:137 -msgid "Pack heads and tags for efficient repository access" -msgstr "Etkili depo erişimi için dal uçları ve etiketler paketle" - -#: command-list.h:138 -msgid "Routines to help parsing remote repository access parameters" -msgstr "Uzak depo erişim parametrelerini ayrıştırmaya yardımcı rutinler" - -#: command-list.h:139 -msgid "Compute unique ID for a patch" -msgstr "Bir yama için eşi olmayan numara hesapla" - -#: command-list.h:140 -msgid "Prune all unreachable objects from the object database" -msgstr "Ulaşılamayan tüm nesneleri nesne veritabanından buda" - -#: command-list.h:141 -msgid "Remove extra objects that are already in pack files" -msgstr "Halihazırda paket dosyalarında olan ek nesneleri kaldır" - -#: command-list.h:142 -msgid "Fetch from and integrate with another repository or a local branch" -msgstr "Başka bir depo veya yerel daldan getir ve entegre et" - -#: command-list.h:143 -msgid "Update remote refs along with associated objects" -msgstr "İlişkin nesnelerle birlikte uzak başvuruları da güncelle" - -#: command-list.h:144 -msgid "Applies a quilt patchset onto the current branch" -msgstr "Geçerli dala bir \"Quilt\" yama seti uygula" - -#: command-list.h:145 -msgid "Compare two commit ranges (e.g. two versions of a branch)" -msgstr "İki gönderi erimini karşılaştır (bir dalın iki sürümü)" - -#: command-list.h:146 -msgid "Reads tree information into the index" -msgstr "Ağaç bilgisini indekse okur" - -#: command-list.h:147 -msgid "Reapply commits on top of another base tip" -msgstr "Gönderileri başka bir temel ucu üzerine uygula" - -#: command-list.h:148 -msgid "Receive what is pushed into the repository" -msgstr "Depoya ne itildiyse al" - -#: command-list.h:149 -msgid "Manage reflog information" -msgstr "Başvuru günlüğü bilgisini yönet" - -#: command-list.h:150 -msgid "Manage set of tracked repositories" -msgstr "İzlenen depolar setini yönet" - -#: command-list.h:151 -msgid "Pack unpacked objects in a repository" -msgstr "Bir depodaki paketlenmemiş nesneleri paketle" - -#: command-list.h:152 -msgid "Create, list, delete refs to replace objects" -msgstr "Nesne değiştirmek için başvurular oluştur, sil, listele" - -#: command-list.h:153 -msgid "Generates a summary of pending changes" -msgstr "Bekleyen değişikliklerin bir özetini çıkart" - -#: command-list.h:154 -msgid "Reuse recorded resolution of conflicted merges" -msgstr "Çakışan birleştirmelerin kayıtlı çözümlerini yen. kullan" - -#: command-list.h:155 -msgid "Reset current HEAD to the specified state" -msgstr "Geçerli HEAD'i belirtilen duruma sıfırla" - -#: command-list.h:156 -msgid "Restore working tree files" -msgstr "Çalışma ağacı dosyalarını eski durumuna getir" - -#: command-list.h:157 -msgid "Revert some existing commits" -msgstr "Bazı var olan gönderileri geri al" - -#: command-list.h:158 -msgid "Lists commit objects in reverse chronological order" -msgstr "Gönderi nesnelerini ters kronolojik sırada listele" - -#: command-list.h:159 -msgid "Pick out and massage parameters" -msgstr "Parametreleri al ve üzerinde çalış" - -#: command-list.h:160 -msgid "Remove files from the working tree and from the index" -msgstr "Dosyaları çalışma ağacından ve indeksten kaldır" - -#: command-list.h:161 -msgid "Send a collection of patches as emails" -msgstr "Bir yama derlemesini e-posta olarak gönder" - -#: command-list.h:162 -msgid "Push objects over Git protocol to another repository" -msgstr "Nesneleri Git protokolü üzerinden başka bir depoya it" - -#: command-list.h:163 -msgid "Restricted login shell for Git-only SSH access" -msgstr "Yalnızca Git SSH erişimi için kısıtlandırılmış oturum açma kabuğu" - -#: command-list.h:164 -msgid "Summarize 'git log' output" -msgstr "'git log' çıktısını özetle" - -#: command-list.h:165 -msgid "Show various types of objects" -msgstr "Çeşitli türde nesneleri göster" - -#: command-list.h:166 -msgid "Show branches and their commits" -msgstr "Dalları ve onların gönderilerini göster" - -#: command-list.h:167 -msgid "Show packed archive index" -msgstr "Paketlenmiş arşiv indeksini göster" - -#: command-list.h:168 -msgid "List references in a local repository" -msgstr "Yerel bir depodaki başvuruları listele" - -#: command-list.h:169 -msgid "Git's i18n setup code for shell scripts" -msgstr "Kabuk betikleri için Git'in i18n kurulum kodu" - -#: command-list.h:170 -msgid "Common Git shell script setup code" -msgstr "Ortak Git kabuk betiği kurulum kodu" - -#: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Aralıklı çıkışı ilklendir ve güncelle" - -#: command-list.h:172 -msgid "Stash the changes in a dirty working directory away" -msgstr "Kirli bir çalışma dizinindeki değişiklikleri zulala" - -#: command-list.h:173 -msgid "Add file contents to the staging area" -msgstr "Dosya içeriğini hazırlama alanına ekle" - -#: command-list.h:174 -msgid "Show the working tree status" -msgstr "Çalışma ağacı durumunu göster" - -#: command-list.h:175 -msgid "Remove unnecessary whitespace" -msgstr "Gereksiz boşlukları kaldır" - -#: command-list.h:176 -msgid "Initialize, update or inspect submodules" -msgstr "Altmodülleri ilklendir, güncelle veya incele" - -#: command-list.h:177 -msgid "Bidirectional operation between a Subversion repository and Git" -msgstr "Bir Subversion ve Git deposu arasında iki yönlü işlemler" - -#: command-list.h:178 -msgid "Switch branches" -msgstr "Dal değiştir" - -#: command-list.h:179 -msgid "Read, modify and delete symbolic refs" -msgstr "Sembolik başvuruları oku, düzenle ve sil" - -#: command-list.h:180 -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "GPG imzalı bir etiket oluştur, sil, listele veya doğrula" - -#: command-list.h:181 -msgid "Creates a temporary file with a blob's contents" -msgstr "Bir ikili nesnenin içeriği ile geçici bir dosya oluştur" - -#: command-list.h:182 -msgid "Unpack objects from a packed archive" -msgstr "Paketlenmiş bir arşivden nesneleri çıkar" - -#: command-list.h:183 -msgid "Register file contents in the working tree to the index" -msgstr "Çalışma ağacındaki dosya içeriğini indekse kaydet" - -#: command-list.h:184 -msgid "Update the object name stored in a ref safely" -msgstr "Güvenlice bir başvuruda depolanan nesne adını güncelle" - -#: command-list.h:185 -msgid "Update auxiliary info file to help dumb servers" -msgstr "" -"Programlanamayan sunuculara destek için yardımcı veri dosyasını güncelle" - -#: command-list.h:186 -msgid "Send archive back to git-archive" -msgstr "Arşivi git-archive'e geri gönder" - -#: command-list.h:187 -msgid "Send objects packed back to git-fetch-pack" -msgstr "Nesneleri git-fetch-pack'e paketlenmiş olarak geri gönder" - -#: command-list.h:188 -msgid "Show a Git logical variable" -msgstr "Bir mantıksal Git değişkeni göster" - -#: command-list.h:189 -msgid "Check the GPG signature of commits" -msgstr "Gönderilerin GPG imzasını denetle" - -#: command-list.h:190 -msgid "Validate packed Git archive files" -msgstr "Paketlenmiş Git arşiv dosyalarını doğrula" - -#: command-list.h:191 -msgid "Check the GPG signature of tags" -msgstr "Etiketlerin GPG imzasını doğrula" - -#: command-list.h:192 -msgid "Git web interface (web frontend to Git repositories)" -msgstr "Git web arabirimi (Git depoları için web ön ucu)" - -#: command-list.h:193 -msgid "Show logs with difference each commit introduces" -msgstr "Günlükleri her gönderinin sunduğu değişikliklerle göster" - -#: command-list.h:194 -msgid "Manage multiple working trees" -msgstr "Birden çok çalışma ağacını yönet" - -#: command-list.h:195 -msgid "Create a tree object from the current index" -msgstr "Geçerli indeksten bir ağaç nesnesi oluştur" - -#: command-list.h:196 -msgid "Defining attributes per path" -msgstr "Öznitelikleri yola göre tanımla" - -#: command-list.h:197 -msgid "Git command-line interface and conventions" -msgstr "Git komut satırı arabirimi ve kuralları" - -#: command-list.h:198 -msgid "A Git core tutorial for developers" -msgstr "Geliştiriciler için Git çekirdeği eğitmeni" - -#: command-list.h:199 -msgid "Git for CVS users" -msgstr "CVS kullanıcıları için Git" - -#: command-list.h:200 -msgid "Tweaking diff output" -msgstr "diff çıktısı için ince ayarlar" - -#: command-list.h:201 -msgid "A useful minimum set of commands for Everyday Git" -msgstr "Günlük Git kullanımı için yararlı komutlar" - -#: command-list.h:202 -msgid "A Git Glossary" -msgstr "Git Kavram Dizini" - -#: command-list.h:203 -msgid "Hooks used by Git" -msgstr "Git tarafından kullanılan kancalar" - -#: command-list.h:204 -msgid "Specifies intentionally untracked files to ignore" -msgstr "Özellikle yok sayılması istenen dosyaları belirt" - -#: command-list.h:205 -msgid "Defining submodule properties" -msgstr "Altmodül özelliklerini tanımlama" - -#: command-list.h:206 -msgid "Git namespaces" -msgstr "Git ad alanları" - -#: command-list.h:207 -msgid "Git Repository Layout" -msgstr "Git Depo Yerleşimi" - -#: command-list.h:208 -msgid "Specifying revisions and ranges for Git" -msgstr "Git için revizyonları ve erimleri belirtme" - -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Bir depoyu bir başkasının içine bağlama" - -#: command-list.h:210 -msgid "A tutorial introduction to Git: part two" -msgstr "Git'e Giriş: Bölüm 2" - -#: command-list.h:211 -msgid "A tutorial introduction to Git" -msgstr "Git'e Giriş" - -#: command-list.h:212 -msgid "An overview of recommended workflows with Git" -msgstr "Önerilen Git çalışma akışlarına genel bakış" - -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "\"git bisect start\" ile başlamalısınız" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? " - -#: git-bisect.sh:101 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "Hatalı revizyon girdisi: $arg" - -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Hatalı revizyon girdisi: $bisected_head" - -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Hatalı revizyon girdisi: $rev" - -#: git-bisect.sh:139 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "'git bisect $TERM_BAD' yalnızca bir değişken alabilir." - -#: git-bisect.sh:209 -msgid "No logfile given" -msgstr "Günlük dosyası verilmedi" - -#: git-bisect.sh:210 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "$file yeniden oynatım için okunamıyor" - -#: git-bisect.sh:232 -msgid "?? what are you talking about?" -msgstr "?? neden söz ediyorsun?" - -#: git-bisect.sh:241 -msgid "bisect run failed: no command provided." -msgstr "ikili arama başarısız: Komut verilmedi." - -#: git-bisect.sh:246 -#, sh-format -msgid "running $command" -msgstr "$command çalıştırılıyor" - -#: git-bisect.sh:253 -#, sh-format -msgid "" -"bisect run failed:\n" -"exit code $res from '$command' is < 0 or >= 128" -msgstr "" -"bisect çalıştırılamadı:\n" -"çıkış kodu $res, '$command' konumundan, < 0 veya >= 128" - -#: git-bisect.sh:279 -msgid "bisect run cannot continue any more" -msgstr "bisect daha fazla çalıştırılamıyor" - -#: git-bisect.sh:285 -#, sh-format -msgid "" -"bisect run failed:\n" -"'bisect_state $state' exited with error code $res" -msgstr "" -"ikili arama çalıştırılamadı:\n" -"'bisect_state $state' $res hata koduyla çıktı" - -#: git-bisect.sh:292 -msgid "bisect run success" -msgstr "ikili arama başarılı" - -#: git-bisect.sh:300 -msgid "We are not bisecting." -msgstr "İkili arama yapmıyoruz." - -#: git-merge-octopus.sh:46 -msgid "" -"Error: Your local changes to the following files would be overwritten by " -"merge" -msgstr "" -"Hata: Birleştirme ile aşağıdaki dosyalara olan değişikliklerin üzerine " -"yazılacak" - -#: git-merge-octopus.sh:61 -msgid "Automated merge did not work." -msgstr "Otomatikleştirilmiş birleştirme işe yaramadı." - -#: git-merge-octopus.sh:62 -msgid "Should not be doing an octopus." -msgstr "Bir ahtapot birleştirmesi yapılmamalı." - -#: git-merge-octopus.sh:73 -#, sh-format -msgid "Unable to find common commit with $pretty_name" -msgstr "$pretty_name ile olan ortak gönderi bulunamıyor" - -#: git-merge-octopus.sh:77 -#, sh-format -msgid "Already up to date with $pretty_name" -msgstr "$pretty_name ile her şey güncel" - -#: git-merge-octopus.sh:89 -#, sh-format -msgid "Fast-forwarding to: $pretty_name" -msgstr "Şuraya ileri sarılıyor: $pretty_name" - -#: git-merge-octopus.sh:97 -#, sh-format -msgid "Trying simple merge with $pretty_name" -msgstr "$pretty_name ile yalın birleştirme deneniyor" - -#: git-merge-octopus.sh:102 -msgid "Simple merge did not work, trying automatic merge." -msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor" - -#: git-legacy-stash.sh:221 -msgid "Cannot remove temporary index (can't happen)" -msgstr "Geçici indeks kaldırılamıyor (olanaklı değil)" - -#: git-legacy-stash.sh:272 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "$ref_stash, $w_commit ile güncellenemiyor" - -#: git-legacy-stash.sh:324 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "hata: 'stash push' için bilinmeyen seçenek: $option" - -#: git-legacy-stash.sh:356 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "$stash_msg indeks durumu ve çalışma dizini kaydedildi" - -#: git-legacy-stash.sh:536 -#, sh-format -msgid "unknown option: $opt" -msgstr "bilinmeyen seçenek: $opt" - -#: git-legacy-stash.sh:556 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "Çok fazla revizyon belirtildi: $REV" - -#: git-legacy-stash.sh:571 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference geçerli bir başvuru değil" - -#: git-legacy-stash.sh:599 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' zula benzeri bir gönderi değil" - -#: git-legacy-stash.sh:610 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' bir zula başvurusu değil" - -#: git-legacy-stash.sh:618 -msgid "unable to refresh index" -msgstr "indeks yenilenemiyor" - -#: git-legacy-stash.sh:622 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "Bir birleştirmenin ortasında zula uygulanamıyor" - -#: git-legacy-stash.sh:630 -msgid "Conflicts in index. Try without --index." -msgstr "İndekste çakışmalar var. --index olmadan deneyin." - -#: git-legacy-stash.sh:632 -msgid "Could not save index tree" -msgstr "İndeks ağacı kaydedilemedi" - -#: git-legacy-stash.sh:641 -msgid "Could not restore untracked files from stash entry" -msgstr "İzlenmeyen dosyalar zuladan eski durumlarına getirilemedi" - -#: git-legacy-stash.sh:666 -msgid "Cannot unstage modified files" -msgstr "Değiştirilen dosyalar hazırlıktan çıkarılamaz" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "${REV} bırakıldı ($s)" - -#: git-legacy-stash.sh:705 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "${REV}: Zula girdisi bırakılamadı" - -#: git-legacy-stash.sh:792 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Onları eski durumuna getirmek için \"git stash apply\" yazın)" - -#: git-submodule.sh:203 -msgid "Relative path can only be used from the toplevel of the working tree" -msgstr "" -"Göreceli yol yalnızca çalışma ağacının en üst düzeyinden kullanılabilir" - -#: git-submodule.sh:213 -#, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "depo URL'si: '$repo' kesin olmalı veya ./|../ ile başlamalıdır" - -#: git-submodule.sh:232 -#, sh-format -msgid "'$sm_path' already exists in the index" -msgstr "'$sm_path' indekste halihazırda var" - -#: git-submodule.sh:235 -#, sh-format -msgid "'$sm_path' already exists in the index and is not a submodule" -msgstr "'$sm_path' indekste halihazırda var ve bir altmodül değil" - -#: git-submodule.sh:242 -#, sh-format -msgid "'$sm_path' does not have a commit checked out" -msgstr "'$sm_path' çıkış yapılan bir gönderiye iye değil" - -#: git-submodule.sh:273 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "'$sm_path' konumundaki mevcut depo indekse ekleniyor" - -#: git-submodule.sh:275 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' halihazırda mevcut ve geçerli bir git deposu değil" - -#: git-submodule.sh:283 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "'$sm_name' için bir git deposu yerelde şu uzak konumlarla bulundu:" - -#: git-submodule.sh:285 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"Bu yerel git dizinini\n" -" $realrepo\n" -"konumundan bir kez daha klonlamak yerine yeniden kullanmak istiyorsanız\n" -"--force seçeneğini kullanın. Eğer bu git dizini doğru depo değilse veya \n" -"bunun ne anlama geldiğinden emin değilseniz --name seçeneği ile başka bir\n" -"ad seçin." - -#: git-submodule.sh:291 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "'$sm_name' altmodülü için yerel git dizini yeniden etkinleştiriliyor." - -#: git-submodule.sh:303 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "'$sm_path' altmodülü çıkış yapılamıyor" - -#: git-submodule.sh:308 -#, sh-format -msgid "Failed to add submodule '$sm_path'" -msgstr "'$sm_path' altmodülü eklenemedi" - -#: git-submodule.sh:317 -#, sh-format -msgid "Failed to register submodule '$sm_path'" -msgstr "'$sm_path' altmodülü kaydı yapılamadı" - -#: git-submodule.sh:590 -#, sh-format -msgid "Unable to find current revision in submodule path '$displaypath'" -msgstr "'$displaypath' altmodül yolunda geçerli revizyon bulunamadı" - -#: git-submodule.sh:600 -#, sh-format -msgid "Unable to fetch in submodule path '$sm_path'" -msgstr "'$sm_path' altmodül yolunda getirme yapılamadı" - -#: git-submodule.sh:605 -#, sh-format -msgid "" -"Unable to find current ${remote_name}/${branch} revision in submodule path " -"'$sm_path'" -msgstr "" -"'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu " -"bulunamadı" - -#: git-submodule.sh:623 -#, sh-format -msgid "" -"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " -"$sha1:" -msgstr "" -"'$displaypath' altmodül yolunda getirme yapılamadı; $sha1 doğrudan " -"getirilmeye çalışılıyor" - -#: git-submodule.sh:629 -#, sh-format -msgid "" -"Fetched in submodule path '$displaypath', but it did not contain $sha1. " -"Direct fetching of that commit failed." -msgstr "" -"'$displaypath' altmodül yolunda getirme tamamlandı, ancak $sha1 içermiyor. " -"Bu gönderinin doğrudan getirilmesi başarısız oldu." - -#: git-submodule.sh:636 -#, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "'$displaypath' altmodül yolunda '$sha1' çıkışı yapılamadı" - -#: git-submodule.sh:637 -#, sh-format -msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı" - -#: git-submodule.sh:641 -#, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "'$sha1', '$displaypath' altmodül yolunda yeniden temellendirilemedi" - -#: git-submodule.sh:642 -#, sh-format -msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "Altmodül yolu '$displaypath': '$sha1' içine yeniden temellendirildi" - -#: git-submodule.sh:647 -#, sh-format -msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "'$sha1', '$displaypath' altmodül yolunda birleştirilemedi" - -#: git-submodule.sh:648 -#, sh-format -msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "Altmodül yolu '$displaypath': '$sha1' içinde birleştirildi" - -#: git-submodule.sh:653 -#, sh-format -msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" -msgstr "'$displaypath' altmodül yolunda '$command $sha1' çalıştırılamadı" - -#: git-submodule.sh:654 -#, sh-format -msgid "Submodule path '$displaypath': '$command $sha1'" -msgstr "Altmodül yolu '$displaypath': '$command $sha1'" - -#: git-submodule.sh:685 -#, sh-format -msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "'$displaypath' altmodül yoluna özyinelenemedi" - -#: git-submodule.sh:896 -msgid "The --cached option cannot be used with the --files option" -msgstr "--cached seçeneği --files seçeneği ile birlikte kullanılamaz" - -#: git-submodule.sh:948 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "beklenmedik kip $mod_dst" - -#: git-submodule.sh:968 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " Uyarı: $display_name, $sha1_src gönderisini içermiyor" - -#: git-submodule.sh:971 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " Uyarı: $display_name, $sha1_dst gönderisini içermiyor" - -#: git-submodule.sh:974 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " Uyarı: $display_name, $sha1_src ve $sha1_dst gönderilerini içermiyor" - -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Ayrıntılar için: git-${cmd}(1)" - -#: git-rebase--preserve-merges.sh:109 -msgid "Applied autostash." -msgstr "Kendiliğinden zulalama uygulandı." - -#: git-rebase--preserve-merges.sh:112 -#, sh-format -msgid "Cannot store $stash_sha1" -msgstr "$stash_sha1 depolanamıyor" - -#: git-rebase--preserve-merges.sh:191 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "Yeniden temellendiriliyor ($new_count/$total)" - -#: git-rebase--preserve-merges.sh:207 -msgid "" -"\n" -"Commands:\n" -"p, pick <commit> = use commit\n" -"r, reword <commit> = use commit, but edit the commit message\n" -"e, edit <commit> = use commit, but stop for amending\n" -"s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <commit> = run command (the rest of the line) using shell\n" -"d, drop <commit> = remove commit\n" -"l, label <label> = label current HEAD with a name\n" -"t, reset <label> = reset HEAD to a label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" -"\n" -"These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "" -"\n" -"Komutlar:\n" -"p, pick <gönderi> = gönderiyi kullan\n" -"r, reword <gönderi> = gönderiyi kullan, ancak gönderi iletisini düzenle\n" -"e, edit <gönderi> = gönderiyi kullan, ancak değiştirme için dur\n" -"s, squash <gönderi> = gönderiyi kullan, ancak önceki gönderi içine karıştır\n" -"f, fixup <gönderi> = \"squash\" gibi, ancak bu gönderinin günlük iletisini " -"at\n" -"x, exec <gönderi> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n" -"d, drop <gönderi> = gönderiyi kaldır\n" -"l, label <etiket> = geçerli HEAD'i bir ad ile etiketle\n" -"t, reset <etiket> = HEAD'i bir etikete sıfırla\n" -"m, merge [-C <gönderi> | -c <gönderi>] <etiket> [# <tek-satır>]\n" -". orijinal birleştirme gönderisi iletisini kullanarak bir\n" -". birleştirme gönderisi oluştur (veya teksatır, eğer bir orijinal\n" -". birleştirme gönderisi belirtilmemişse). Gönderi iletisini yeniden\n" -". yazmak için -c <gönderi> kullanın.\n" -"\n" -"Bu satırlar yeniden sıralanabilirler, yukarıdan aşağıya çalıştırılırlar.\n" - -#: git-rebase--preserve-merges.sh:270 -#, sh-format -msgid "" -"You can amend the commit now, with\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Once you are satisfied with your changes, run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Gönderiyi şimdi şu komutla değiştirebilirsiniz:\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:295 -#, sh-format -msgid "$sha1: not a commit that can be picked" -msgstr "$sha1: seçilebilecek bir gönderi değil" - -#: git-rebase--preserve-merges.sh:334 -#, sh-format -msgid "Invalid commit name: $sha1" -msgstr "Geçersiz gönderi adı: $sha1" - -#: git-rebase--preserve-merges.sh:364 -msgid "Cannot write current commit's replacement sha1" -msgstr "Geçerli gönderinin yerine geçecek sha1 yazılamıyor" - -#: git-rebase--preserve-merges.sh:415 -#, sh-format -msgid "Fast-forward to $sha1" -msgstr "Şuraya ileri sar: $sha1" - -#: git-rebase--preserve-merges.sh:417 -#, sh-format -msgid "Cannot fast-forward to $sha1" -msgstr "Şuraya ileri sarılamıyor: $sha1" - -#: git-rebase--preserve-merges.sh:426 -#, sh-format -msgid "Cannot move HEAD to $first_parent" -msgstr "HEAD şuraya taşınamıyor: $first_parent" - -#: git-rebase--preserve-merges.sh:431 -#, sh-format -msgid "Refusing to squash a merge: $sha1" -msgstr "Bir birleştirmeyi tıkıştırma reddediliyor: $sha1" - -#: git-rebase--preserve-merges.sh:449 -#, sh-format -msgid "Error redoing merge $sha1" -msgstr "$sha1 birleştirmesi yeniden yapılırken hata" - -#: git-rebase--preserve-merges.sh:458 -#, sh-format -msgid "Could not pick $sha1" -msgstr "$sha1 seçilemedi" - -#: git-rebase--preserve-merges.sh:467 -#, sh-format -msgid "This is the commit message #${n}:" -msgstr "Gönderi iletisi #${n}:" - -#: git-rebase--preserve-merges.sh:472 -#, sh-format -msgid "The commit message #${n} will be skipped:" -msgstr "Gönderi iletisi #${n} atlanacak:" - -#: git-rebase--preserve-merges.sh:483 -#, sh-format -msgid "This is a combination of $count commit." -msgid_plural "This is a combination of $count commits." -msgstr[0] "Bu $count gönderinin bir birleşimidir." -msgstr[1] "Bu $count gönderinin bir birleşimidir." - -#: git-rebase--preserve-merges.sh:492 -#, sh-format -msgid "Cannot write $fixup_msg" -msgstr "$fixup_msg yazılamıyor" - -#: git-rebase--preserve-merges.sh:495 -msgid "This is a combination of 2 commits." -msgstr "Bu 2 gönderinin bir birleşimidir." - -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 -#, sh-format -msgid "Could not apply $sha1... $rest" -msgstr "$sha1... $rest uygulanamadı" - -#: git-rebase--preserve-merges.sh:611 -#, sh-format -msgid "" -"Could not amend commit after successfully picking $sha1... $rest\n" -"This is most likely due to an empty commit message, or the pre-commit hook\n" -"failed. If the pre-commit hook failed, you may need to resolve the issue " -"before\n" -"you are able to reword the commit." -msgstr "" -"$sha1... $rest başarıyla seçildikten sonra gönderi değiştirilemedi.\n" -"Bu büyük olasılıkla boş bir gönderi iletisinden veya pre-commit kancasının\n" -"başarısız olmasından kaynaklıdır. Eğer pre-commit kancası başarısız olduysa\n" -"gönderiyi düzenleyebilmeye başlamanız için bu sorunu çözmeniz gerekebilir." - -#: git-rebase--preserve-merges.sh:626 -#, sh-format -msgid "Stopped at $sha1_abbrev... $rest" -msgstr "Şurada duruldu: $sha1_abbrev... $rest" - -#: git-rebase--preserve-merges.sh:641 -#, sh-format -msgid "Cannot '$squash_style' without a previous commit" -msgstr "Öncesinde bir gönderi olmadan '$squash_style' yapılamıyor" - -#: git-rebase--preserve-merges.sh:683 -#, sh-format -msgid "Executing: $rest" -msgstr "Çalıştırılıyor: $rest" - -#: git-rebase--preserve-merges.sh:691 -#, sh-format -msgid "Execution failed: $rest" -msgstr "Çalıştırma başarısız: $rest" - -#: git-rebase--preserve-merges.sh:693 -msgid "and made changes to the index and/or the working tree" -msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yaptı" - -#: git-rebase--preserve-merges.sh:695 -msgid "" -"You can fix the problem, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Sorunu çözüp sürdürmek için şunu çalıştırın\n" -"\n" -"\tgit rebase --continue" - -#. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 -#, sh-format -msgid "" -"Execution succeeded: $rest\n" -"but left changes to the index and/or the working tree\n" -"Commit or stash your changes, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"Çalıştırma başarılı: $rest\n" -"ancak indekse ve/veya çalışma ağacına değişiklikler bıraktı.\n" -"Değişikliklerinizi gönderin veya zulalayın, ardından şunu çalıştırın:\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:719 -#, sh-format -msgid "Unknown command: $command $sha1 $rest" -msgstr "Bilinmeyen komut: $command $sha1 $rest" - -#: git-rebase--preserve-merges.sh:720 -msgid "Please fix this using 'git rebase --edit-todo'." -msgstr "Lütfen bunu 'git rebase --edit-todo' kullanarak onarın." - -#: git-rebase--preserve-merges.sh:755 -#, sh-format -msgid "Successfully rebased and updated $head_name." -msgstr "$head_name başarıyla yeniden temellendirildi ve güncellendi." - -#: git-rebase--preserve-merges.sh:812 -msgid "Could not remove CHERRY_PICK_HEAD" -msgstr "CHERRY_PICK_HEAD kaldırılamadı" - -#: git-rebase--preserve-merges.sh:817 -#, sh-format -msgid "" -"You have staged changes in your working tree.\n" -"If these changes are meant to be\n" -"squashed into the previous commit, run:\n" -"\n" -" git commit --amend $gpg_sign_opt_quoted\n" -"\n" -"If they are meant to go into a new commit, run:\n" -"\n" -" git commit $gpg_sign_opt_quoted\n" -"\n" -"In both cases, once you're done, continue with:\n" -"\n" -" git rebase --continue\n" -msgstr "" -"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n" -"Eğer bu değişiklikleri bir önceki gönderiye tıkıştırmak\n" -"istediyseniz şu komutu çalıştırın:\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Eğer yeni bir gönderi içinse şunu çalıştırın:\n" -"\n" -"\tgit commit $gpg_sign_opt_quoted\n" -"\n" -"Her iki durumda da işinizi bitirdikten sonra şununla sürdürün:\n" -"\n" -"\tgit rebase --continue\n" - -#: git-rebase--preserve-merges.sh:834 -msgid "Error trying to find the author identity to amend commit" -msgstr "Gönderiyi değiştirmek için yazar kimliğini bulmaya çalışırken hata" - -#: git-rebase--preserve-merges.sh:839 -msgid "" -"You have uncommitted changes in your working tree. Please commit them\n" -"first and then run 'git rebase --continue' again." -msgstr "" -"Çalışma ağacınızda gönderilmemiş değişiklikleriniz var. Lütfen önce onları\n" -"gönderin ve ardından yeniden 'git rebase --continue' çalıştırın." - -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 -msgid "Could not commit staged changes." -msgstr "Hazırlanan değişiklikler gönderilemedi." - -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 -msgid "Could not execute editor" -msgstr "Düzenleyici çalıştırılamadı" - -#: git-rebase--preserve-merges.sh:900 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "$switch_to çıkışı yapılamadı" - -#: git-rebase--preserve-merges.sh:907 -msgid "No HEAD?" -msgstr "HEAD yok mu?" - -#: git-rebase--preserve-merges.sh:908 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "Geçici $state_dir oluşturulamadı" - -#: git-rebase--preserve-merges.sh:911 -msgid "Could not mark as interactive" -msgstr "Etkileşimli olarak imlenemedi" - -#: git-rebase--preserve-merges.sh:943 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "" -"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)" -msgstr[1] "" -"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)" - -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Boş gönderilerin yorum olarak varsayıldığını kenara yazın." - -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 -msgid "Could not init rewritten commits" -msgstr "Yeniden yazılan gönderiler başlatılamıyor" - -#: git-sh-setup.sh:89 git-sh-setup.sh:94 -#, sh-format -msgid "usage: $dashless $USAGE" -msgstr "kullanım: $dashless $USAGE" - -#: git-sh-setup.sh:191 -#, sh-format -msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "$cdup konumuna chdir yapılamıyor, çalışma ağacının en üst düzeyi" - -#: git-sh-setup.sh:200 git-sh-setup.sh:207 -#, sh-format -msgid "fatal: $program_name cannot be used without a working tree." -msgstr "onulmaz: $program_name bir çalışma ağacı olmadan kullanılamaz" - -#: git-sh-setup.sh:221 -msgid "Cannot rebase: You have unstaged changes." -msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var." - -#: git-sh-setup.sh:224 -msgid "Cannot rewrite branches: You have unstaged changes." -msgstr "Dallar yeniden yazılamıyor: Hazırlanmamış değişiklikleriniz var." - -#: git-sh-setup.sh:227 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "" -"Yeniden temellendirme ile çekilemiyor: Hazırlanmamış değişiklikleriniz var." - -#: git-sh-setup.sh:230 -#, sh-format -msgid "Cannot $action: You have unstaged changes." -msgstr "$action yapılamıyor: Hazırlanmamış değişiklikleriniz var." - -#: git-sh-setup.sh:243 -msgid "Cannot rebase: Your index contains uncommitted changes." -msgstr "" -"Yeniden temellendirme yapılamıyor: İndeksinizde gönderilmemiş " -"değişiklikleriniz var." - -#: git-sh-setup.sh:246 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "" -"Yeniden temellendirme ile çekilemiyor: İndeksinizde gönderilmemiş " -"değişiklikleriniz var." - -#: git-sh-setup.sh:249 -#, sh-format -msgid "Cannot $action: Your index contains uncommitted changes." -msgstr "$action yapılamıyor: İndeksinizde gönderilmemiş değişiklikleriniz var." - -#: git-sh-setup.sh:253 -msgid "Additionally, your index contains uncommitted changes." -msgstr "Ek olarak, indeksinizde gönderilmemiş değişiklikleriniz var." - -#: git-sh-setup.sh:373 -msgid "You need to run this command from the toplevel of the working tree." -msgstr "Bu komutu çalışma ağacının en üst düzeyinden çalıştırmanız gerekiyor." - -#: git-sh-setup.sh:378 -msgid "Unable to determine absolute path of git directory" -msgstr "Git dizininin kesin yolu algılanamıyor" - -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#: git-add--interactive.perl:634 -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "%d yola dokunuldu\n" -msgstr[1] "%d yola dokunuldu\n" - -#: git-add--interactive.perl:1053 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama\n" -"için imlenecektir." - -#: git-add--interactive.perl:1056 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama\n" -"için imlenecektir." - -#: git-add--interactive.perl:1059 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan\n" -"çıkarılma için imlenecektir." - -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama\n" -"için imlenecektir." - -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" -"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya\n" -"çıkarım için imlenecektir." - -#: git-add--interactive.perl:1111 -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "parça düzenleme dosyası yazım için açılamadı: %s" - -#: git-add--interactive.perl:1118 -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"'%s' satır kaldırmak için onları ' ' satır yapın (bağlam).\n" -"'%s' satır kaldırmak için onları silin.\n" -"%s ile başlayan satırlar kaldırılacaktır.\n" - -#: git-add--interactive.perl:1140 -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "parça düzenleme dosyası okuma için açılamadı: %s" - -#: git-add--interactive.perl:1248 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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" -msgstr "" -"y - bu parçayı hazırla\n" -"n - bu parçayı hazırlama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlama\n" -"a - bu parçayı ve sonraki tüm parçaları hazırla\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama" - -#: git-add--interactive.perl:1254 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı zulala\n" -"n - bu parçayı zulalama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini zulalama\n" -"a - bu parçayı ve sonraki tüm parçaları zulala\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama" - -#: git-add--interactive.perl:1260 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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" -msgstr "" -"y - bu parçayı hazırlıktan çıkar\n" -"n - bu parçayı hazırlıktan çıkarma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlıktan çıkarma\n" -"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma" - -#: git-add--interactive.perl:1266 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı indekse uygula\n" -"n - bu parçayı indekse uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama" - -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı çalışma ağacından at\n" -"n - bu parçayı çalışma ağacından atma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n" -"a - bu parçayı ve sonraki tüm parçaları at\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini atma" - -#: git-add--interactive.perl:1278 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı çalışma ağacından ve indeksten at\n" -"n - bu parçayı çalışma ağacından ve indeksten atma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n" -"a - bu parçayı ve sonraki tüm parçaları at\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini atma" - -#: git-add--interactive.perl:1284 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı indekse ve çalışma ağacına uygula\n" -"n - bu parçayı indekse ve çalışma ağacına uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama" - -#: git-add--interactive.perl:1296 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı çalışma ağacına uygula\n" -"n - bu parçayı çalışma ağacına uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama" - -#: git-add--interactive.perl:1311 -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - gidilecek bir parça seç\n" -"/ - verilen düzenli ifade ile eşleşen bir parça ara\n" -"j - bu parça için sonra karar ver, bir sonraki karar verilmemiş parçayı gör\n" -"J - bu parça için sonra karar ver, bir sonraki parçayı gör\n" -"k - bu parça için sonra karar ver, bir önceki karar verilmemiş parçayı gör\n" -"K - bu parça için sonra karar ver, bir önceki parçayı gör\n" -"s - geçerli parçayı daha ufak parçalara böl\n" -"e - geçerli parçayı el ile düzenle\n" -"? - yardımı yazdır\n" - -#: git-add--interactive.perl:1342 -msgid "The selected hunks do not apply to the index!\n" -msgstr "Seçili parçalar indekse uygulanamıyor!\n" - -#: git-add--interactive.perl:1357 -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "birleştirilmeyenler yok sayılıyor: %s\n" - -#: git-add--interactive.perl:1468 -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1469 -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1470 -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1570 -msgid "No other hunks to goto\n" -msgstr "Gidilecek başka parça yok\n" - -#: git-add--interactive.perl:1588 -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "Geçersiz sayı: '%s'\n" - -#: git-add--interactive.perl:1593 -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir.\n" -msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir.\n" - -#: git-add--interactive.perl:1619 -msgid "No other hunks to search\n" -msgstr "Aranacak başka parça yok\n" - -#: git-add--interactive.perl:1636 -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "Hatalı oluşturulmuş arama düzenli ifadesi %s: %s\n" - -#: git-add--interactive.perl:1646 -msgid "No hunk matches the given pattern\n" -msgstr "Verilen dizgi ile hiçbir parça eşleşmiyor\n" - -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 -msgid "No previous hunk\n" -msgstr "Öncesinde parça yok\n" - -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 -msgid "No next hunk\n" -msgstr "Sonrasında parça yok\n" - -#: git-add--interactive.perl:1692 -msgid "Sorry, cannot split this hunk\n" -msgstr "Üzgünüm, bu parça bölünemiyor\n" - -#: git-add--interactive.perl:1698 -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "%d parçaya bölündü.\n" -msgstr[1] "%d parçaya bölündü.\n" - -#: git-add--interactive.perl:1708 -msgid "Sorry, cannot edit this hunk\n" -msgstr "Üzgünüm, bu parça düzenlenemiyor\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - değişiklik içeren yolları göster\n" -"update - çalışma ağacı durumunu hazırlanan değişiklik setine ekle\n" -"revert - hazırlanan değişiklik setini HEAD sürümüne geri al\n" -"patch - parçaları seç ve seçici olarak güncelle\n" -"diff - HEAD ve indeks arasındaki diff'i (ayrımları) görüntüle\n" -"add untracked - izlenmeyen dosyaların içeriğini hazırlanan değişiklik setine " -"ekle\n" - -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 -msgid "missing --" -msgstr "-- eksik" - -#: git-add--interactive.perl:1821 -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "bilinmeyen --patch kipi: %s" - -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "geçersiz değişken %s, -- bekleniyor" - -#: git-send-email.perl:138 -msgid "local zone differs from GMT by a non-minute interval\n" -msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n" - -#: git-send-email.perl:145 git-send-email.perl:151 -msgid "local time offset greater than or equal to 24 hours\n" -msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n" - -#: git-send-email.perl:223 git-send-email.perl:229 -msgid "the editor exited uncleanly, aborting everything" -msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor" - -#: git-send-email.perl:310 -#, perl-format -msgid "" -"'%s' contains an intermediate version of the email you were composing.\n" -msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n" - -#: git-send-email.perl:315 -#, perl-format -msgid "'%s.final' contains the composed email.\n" -msgstr "'%s.final' yazılan e-postayı içeriyor.\n" - -#: git-send-email.perl:408 -msgid "--dump-aliases incompatible with other options\n" -msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n" - -#: git-send-email.perl:481 git-send-email.perl:683 -msgid "Cannot run git format-patch from outside a repository\n" -msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n" - -#: git-send-email.perl:484 -msgid "" -"`batch-size` and `relogin` must be specified together (via command-line or " -"configuration option)\n" -msgstr "" -"'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya " -"yapılandırma seçeneklerinden)\n" - -#: git-send-email.perl:497 -#, perl-format -msgid "Unknown --suppress-cc field: '%s'\n" -msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n" - -#: git-send-email.perl:528 -#, perl-format -msgid "Unknown --confirm setting: '%s'\n" -msgstr "Bilinmeyen --confirm ayarı: '%s'\n" - -#: git-send-email.perl:556 -#, perl-format -msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n" - -#: git-send-email.perl:558 -#, perl-format -msgid "warning: `:include:` not supported: %s\n" -msgstr "uyarı: ':include:' desteklenmiyor: %s\n" - -#: git-send-email.perl:560 -#, perl-format -msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" -msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n" - -#: git-send-email.perl:565 -#, perl-format -msgid "warning: sendmail line is not recognized: %s\n" -msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n" - -#: git-send-email.perl:649 -#, perl-format -msgid "" -"File '%s' exists but it could also be the range of commits\n" -"to produce patches for. Please disambiguate by...\n" -"\n" -" * Saying \"./%s\" if you mean a file; or\n" -" * Giving --format-patch option if you mean a range.\n" -msgstr "" -"'%s' dosyası mevcut, ancak aynı zamanda yama üretilecek gönderilerin\n" -"bir erimi de olabilir. Lütfen şunları kullanarak açıklık getirin:\n" -"\n" -"\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n" -"\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n" - -#: git-send-email.perl:670 -#, perl-format -msgid "Failed to opendir %s: %s" -msgstr "%s opendir yapılamadı: %s" - -#: git-send-email.perl:694 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"onulmaz: %s: %s\n" -"uyarı: hiçbir yama gönderilmedi\n" - -#: git-send-email.perl:705 -msgid "" -"\n" -"No patch files specified!\n" -"\n" -msgstr "" -"\n" -"Hiçbir yama dosyası belirtilmedi!\n" -"\n" - -#: git-send-email.perl:718 -#, perl-format -msgid "No subject line in %s?" -msgstr "%s içinde konu satırı yok mu?" - -#: git-send-email.perl:728 -#, perl-format -msgid "Failed to open for writing %s: %s" -msgstr "%s yazma için açılamadı: %s" - -#: git-send-email.perl:739 -msgid "" -"Lines beginning in \"GIT:\" will be removed.\n" -"Consider including an overall diffstat or table of contents\n" -"for the patch you are writing.\n" -"\n" -"Clear the body content if you don't wish to send a summary.\n" -msgstr "" -"\"GIT:\" ile başlayan satırlar kaldırılacaktır.\n" -"Yazdığınız yama için genel bir diffstat veya içerik tablosu\n" -"eklemeyi düşünün.\n" -"\n" -"Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n" - -#: git-send-email.perl:763 -#, perl-format -msgid "Failed to open %s: %s" -msgstr "%s açılamadı: %s" - -#: git-send-email.perl:780 -#, perl-format -msgid "Failed to open %s.final: %s" -msgstr "%s.final açılamadı: %s" - -#: git-send-email.perl:823 -msgid "Summary email is empty, skipping it\n" -msgstr "Özet e-postası boş, atlanıyor\n" - -#. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 -#, perl-format -msgid "Are you sure you want to use <%s> [y/N]? " -msgstr "<%s> kullanmak istediğinizden emin misiniz [y/N]? " - -#: git-send-email.perl:913 -msgid "" -"The following files are 8bit, but do not declare a Content-Transfer-" -"Encoding.\n" -msgstr "" -"Aşağıdaki dosyalar 8 bit, ancak Content-Transfer-Encoding desteklemiyorlar.\n" - -#: git-send-email.perl:918 -msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? " - -#: git-send-email.perl:926 -#, perl-format -msgid "" -"Refusing to send because the patch\n" -"\t%s\n" -"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " -"want to send.\n" -msgstr "" -"Gönderme reddediliyor, çünkü\n" -"\t%s\n" -"içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek " -"istiyorsanız --force kullanın.\n" - -#: git-send-email.perl:945 -msgid "To whom should the emails be sent (if anyone)?" -msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?" - -#: git-send-email.perl:963 -#, perl-format -msgid "fatal: alias '%s' expands to itself\n" -msgstr "onulmaz: '%s' arması kendisine genişliyor\n" - -#: git-send-email.perl:975 -msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " -msgstr "" -"İlk e-posta için Message-ID, In-Reply-To olarak kullanılsın mı (eğer " -"gerekliyse)?" - -#: git-send-email.perl:1033 git-send-email.perl:1041 -#, perl-format -msgid "error: unable to extract a valid address from: %s\n" -msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n" - -#. TRANSLATORS: Make sure to include [q] [d] [e] in your -#. translation. The program will only accept English input -#. at this point. -#: git-send-email.perl:1045 -msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): " - -#: git-send-email.perl:1362 -#, perl-format -msgid "CA path \"%s\" does not exist" -msgstr "CA yolu \"%s\" mevcut değil" - -#: git-send-email.perl:1445 -msgid "" -" The Cc list above has been expanded by additional\n" -" addresses found in the patch commit message. By default\n" -" send-email prompts before sending whenever this occurs.\n" -" This behavior is controlled by the sendemail.confirm\n" -" configuration setting.\n" -"\n" -" For additional information, run 'git send-email --help'.\n" -" To retain the current behavior, but squelch this message,\n" -" run 'git config --global sendemail.confirm auto'.\n" -"\n" -msgstr "" -" Yukarıdaki Cc listesi yama gönderi iletisinde bulunan adresler\n" -" kullanılarak genişletilmiştir. Bu gerçekleştiğinde send-email\n" -" öntanımlı olarak iletiyi göndermeden önce sorar. Bu davranış\n" -" sendemail.confirm yapılandırma ayarıyla denetlenir.\n" -"\n" -" Ek bilgi için 'git send-email --help' çalıştırın.\n" -" Geçerli davranışı korumak, ancak bu iletiyi susturmak için\n" -" 'git config --global sendemail.confirm auto' çalıştırın.\n" -"\n" - -#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your -#. translation. The program will only accept English input -#. at this point. -#: git-send-email.perl:1460 -msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -msgstr "" -"Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): " - -#: git-send-email.perl:1463 -msgid "Send this email reply required" -msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder" - -#: git-send-email.perl:1491 -msgid "The required SMTP server is not properly defined." -msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış." - -#: git-send-email.perl:1538 -#, perl-format -msgid "Server does not support STARTTLS! %s" -msgstr "Sunucu STARTTLS desteklemiyor! %s" - -#: git-send-email.perl:1543 git-send-email.perl:1547 -#, perl-format -msgid "STARTTLS failed! %s" -msgstr "STARTTLS başarısız oldu! %s" - -#: git-send-email.perl:1556 -msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." -msgstr "" -"SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug " -"yapın." - -#: git-send-email.perl:1574 -#, perl-format -msgid "Failed to send %s\n" -msgstr "%s gönderilemedi\n" - -#: git-send-email.perl:1577 -#, perl-format -msgid "Dry-Sent %s\n" -msgstr "%s gönderilir gibi yapıldı\n" - -#: git-send-email.perl:1577 -#, perl-format -msgid "Sent %s\n" -msgstr "%s gönderildi\n" - -#: git-send-email.perl:1579 -msgid "Dry-OK. Log says:\n" -msgstr "Sınama tamam. Günlük çıktısı:\n" - -#: git-send-email.perl:1579 -msgid "OK. Log says:\n" -msgstr "Tamam. Günlük çıktısı:\n" - -#: git-send-email.perl:1591 -msgid "Result: " -msgstr "Sonuç: " - -#: git-send-email.perl:1594 -msgid "Result: OK\n" -msgstr "Sonuç: Tamam\n" - -#: git-send-email.perl:1612 -#, perl-format -msgid "can't open file %s" -msgstr "%s dosyası açılamıyor" - -#: git-send-email.perl:1659 git-send-email.perl:1679 -#, perl-format -msgid "(mbox) Adding cc: %s from line '%s'\n" -msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n" - -#: git-send-email.perl:1665 -#, perl-format -msgid "(mbox) Adding to: %s from line '%s'\n" -msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n" - -#: git-send-email.perl:1718 -#, perl-format -msgid "(non-mbox) Adding cc: %s from line '%s'\n" -msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n" - -#: git-send-email.perl:1753 -#, perl-format -msgid "(body) Adding cc: %s from line '%s'\n" -msgstr "(body) Cc: %s, '%s' satırından ekleniyor\n" - -#: git-send-email.perl:1864 -#, perl-format -msgid "(%s) Could not execute '%s'" -msgstr "(%s) '%s' çalıştırılamadı" - -#: git-send-email.perl:1871 -#, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n" - -#: git-send-email.perl:1875 -#, perl-format -msgid "(%s) failed to close pipe to '%s'" -msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'" - -#: git-send-email.perl:1905 -msgid "cannot send message as 7bit" -msgstr "ileti 7 bit olarak gönderilemiyor" - -#: git-send-email.perl:1913 -msgid "invalid transfer encoding" -msgstr "geçersiz aktarım kodlaması" - -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 -#, perl-format -msgid "unable to open %s: %s\n" -msgstr "%s açılamıyor: %s\n" - -#: git-send-email.perl:1957 -#, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s: yama 998 karakterden daha uzun bir satır içeriyor" - -#: git-send-email.perl:1974 -#, perl-format -msgid "Skipping %s with backup suffix '%s'.\n" -msgstr "%s, yedek sonek '%s' ile atlanıyor.\n" - -#. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 -#, perl-format -msgid "Do you really want to send %s? [y|N]: " -msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: " diff --git a/third_party/git/po/vi.po b/third_party/git/po/vi.po index 5459484048..b8aa93a2c7 100644 --- a/third_party/git/po/vi.po +++ b/third_party/git/po/vi.po @@ -2,15 +2,14 @@ # 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. # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. -# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. -# Đoàn Trần Công Danh <congdanhqx@gmail.com>, 2020. +# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. # msgid "" msgstr "" -"Project-Id-Version: git v2.26.0\n" +"Project-Id-Version: git v2.23.0-rc2\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-16 08:52+0700\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-11 07:08+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" @@ -23,732 +22,45 @@ msgstr "" "X-Poedit-Basepath: ..\n" "X-Generator: Gtranslator 2.91.7\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "Hả (%s)?" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "không thể đọc bảng mục lục" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "nhị phân" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "không có gì" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "không thay đổi" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "Cập nhật" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "không thể đưa “%s” lên bệ phóng" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "không thể ghi bảng mục lục" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "đã cập nhật %d đường dẫn\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "chú ý: %s giờ đã bỏ theo dõi.\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "Hoàn nguyên" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "Không thể phân tích cú pháp HEAD^{tree}" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "đã hoàn nguyên %d đường dẫn\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "Không có tập tin nào chưa được theo dõi.\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "Thêm các cái chưa được theo dõi" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "đã thêm %d đường dẫn\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "bỏ qua những thứ chưa hòa trộn: %s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "Không có thay đổi nào.\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "Cập nhật miếng vá" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "Xem xét lại diff" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "hiển thị đường dẫn với các thay đổi" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "" -"thêm trạng thái cây làm việc vào tập hợp các thay đổi đã được đưa lên bệ " -"phóng" - -#: add-interactive.c:1006 -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 " -"bản HEAD" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "chọn các “khúc” và cập nhật có tuyển chọn" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "xem khác biệt giữa HEAD và mục lục" - -#: add-interactive.c:1012 -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" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "Trợ giúp về nhắc:" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "chọn một mục đơn" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "chọn một vùng các mục" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "chọn nhiều vùng" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "chọn mục dựa trên tiền tố duy nhất" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "bỏ chọn các mục đã cho" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "chọn tất cả các mục" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "(để trống) hoàn tất chọn lựa" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "tùy chọn mục bằng số" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "(để trống) không chọn gì" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** Lệnh ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "Giờ thì sao" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "đã đưa lên bệ phóng" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "chưa đưa lên bệ phóng" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "đường-dẫn" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "không thể đọc lại bảng mục lục" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "Tạm biệt.\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Xóa khỏi bệ phóng [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-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,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "" -"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu " -"để chuyển lên bệ phóng." - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 cũng như 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 cũng như bất kỳ cái nào còn lại trong tập " -"tin\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Tạm cất khúc này [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "" -"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu " -"để tạm cất." - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - tạm cất khúc này\n" -"n - đừng tạm cất khúc này\n" -"q - thoát; đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại\n" -"a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n" -"d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-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,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "" -"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu " -"để bỏ ra khỏi bệ phóng." - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 cũng như 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 cũng như bất kỳ cái nào còn lại trong " -"tập tin\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Áo dụng khúc này vào mục lục [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "" -"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu " -"để áp dụng." - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - áp dụng khúc này vào mục lục\n" -"n - đừng áp dụng khúc này vào mục lục\n" -"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n" -"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n" -"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Loại bỏ khúc này khỏi cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "" -"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu " -"để loại bỏ." - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - loại bỏ khúc này khỏi cây làm việc\n" -"n - đừng loại bỏ khúc khỏi cây làm việc\n" -"q - thoát; đừng loại bỏ khúc này cũng như bất kỳ cái nào còn lại\n" -"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n" -"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Loại bỏ khúc này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - loại bỏ khúc này khỏi mục lục và cây làm việc\n" -"n - đừng loại bỏ khúc khỏi mục lục và cây làm việc\n" -"q - thoát; đừng loại bỏ khúc này cũng như bất kỳ cái nào còn lại\n" -"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n" -"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Áp dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - áp dụng khúc này vào mục lục và cây làm việc\n" -"n - đừng áp dụng khúc vào mục lục và cây làm việc\n" -"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n" -"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n" -"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - áp dụng khúc này vào cây làm việc\n" -"n - đừng áp dụng khúc vào cây làm việc\n" -"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n" -"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n" -"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "không thể phân tích cú pháp phần đầu của khúc “%.*s”" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "không thể phân tích cú pháp phần đầu khúc đã tô màu “%.*s”" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "không thể phân tích cú pháp khác biệt" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "không thể phân tích khác biệt được tô màu" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "gặp lỗi khi chạy “%s”" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "đầu ra không khớp từ interactive.diffFilter" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "" -"Bộ lọc của bạn phải duy trì một quan hệ một-đến-một\n" -"giữa các dòng đầu vào và đầu ra của nó." - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"cần dòng ngữ cảnh #%d trong\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"các khối không chồng đè lên nhau:\n" -"%.*s\n" -"\tkhông được kết thúc bằng:\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"Để gỡ bỏ dòng “%c”, sửa chúng thành những dòng ' ' (ngữ cảnh).\n" -"Để gõ bỏ dòng “%c”, xóa chúng đi.\n" -"Những dòng bắt đầu bằng %c sẽ bị loại bỏ.\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Nếu miếng vá không được áp dụng sạch sẽ, bạn sẽ có một cơ hội\n" -"để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n" -"sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "không thể phân tích cú pháp phần đầu khúc" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "'git apply --cached' gặp lỗi" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại " -"bỏ!) [y/n]? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "Vẫn áp dụng chúng cho cây làm việc? " - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "Đã không áp dụng gì cả.\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế tiếp\n" -"J - để lại khúc này là chưa quyết định, xem khúc kế tiếp\n" -"k - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế trước\n" -"K - để lại khúc này là chưa quyết định, xem khúc kế trước\n" -"g - chọn một khúc muốn tới\n" -"/ - tìm một khúc khớp với biểu thức chính quy đưa ra\n" -"s - chia khúc hiện tại thành các khúc nhỏ hơn\n" -"e - sửa bằng tay khúc hiện hành\n" -"? - hiển thị trợ giúp\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "Không có khúc kế trước" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "Không có khúc kế tiếp" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "Không còn khúc nào để mà nhảy đến" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "nhảy đến khúc nào (<ret> để xem thêm)? " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "nhảy đến khúc nào? " - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "Số không hợp lệ: “%s”" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc." - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "Không còn khúc nào để mà tìm kiếm" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "tìm kiếm cho biểu thức chính quy? " - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "Không thấy khúc nào khớp mẫu đã cho" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "Rất tiếc, không thể chia nhỏ khúc này" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "Chi nhỏ thành %d khúc." - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "Rất tiếc, không thể sửa khúc này" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "'git apply' gặp lỗi" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sgợi ý: %.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được " "hòa trộn." -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "" "Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "" "Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn." -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được " "hòa trộn." -#: advice.c:186 +#: advice.c:180 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." @@ -756,23 +68,23 @@ msgstr "" "Sửa chúng trong cây làm việc, và sau đó dùng lệnh “git add/rm <tập-tin>”\n" "dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao." -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "Thoát ra bởi vì xung đột không thể giải quyết." -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)." -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn." -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất." -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -900,7 +212,17 @@ msgstr "chế độ không hợp lệ trên dòng %d: %s" msgid "inconsistent header lines %d and %d" msgstr "phần đầu mâu thuẫn dòng %d và %d" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "chi tiết: dòng không cần: %.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -912,91 +234,81 @@ msgstr[0] "" "phần đầu diff cho git thiếu thông tin tên tập tin khi gỡ bỏ đi %d trong " "thành phần dẫn đầu tên của đường dẫn (dòng %d)" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "chi tiết: dòng không cần: %.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "tập tin mới phụ thuộc vào nội dung cũ" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "tập tin mới %s phụ thuộc vào nội dung cũ" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "tập tin đã xóa %s vẫn còn nội dung" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "miếng vá định dạng nhị phân sai hỏng tại dòng %d: %.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "miếng vá định dạng nhị phân không được nhận ra tại dòng %d" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ với “rác” tại dòng %d" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "không thể mở hay đọc %s" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Ngữ cảnh bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" +msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1005,439 +317,453 @@ msgstr "" "trong khi đang tìm kiếm cho:\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "thiếu dữ liệu của miếng vá định dạng nhị phân cho “%s”" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "không thể reverse-apply một miếng vá nhị phân mà không đảo ngược khúc thành " "“%s”" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "không thể áp dụng miếng vá nhị phân thành “%s” mà không có dòng chỉ mục đầy " "đủ" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" "miếng vá áp dụng cho “%s” (%s), cái mà không khớp với các nội dung hiện tại." -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "miếng vá áp dụng cho một “%s” trống rỗng nhưng nó lại không trống" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "không thể đọc postimage %s cần thiết cho “%s”" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "miếng vá định dạng nhị phân không được áp dụng cho “%s”" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " "%s)" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "gặp lỗi khi vá: %s:%ld" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "không thể lấy ra %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "gặp lỗi khi đọc %s" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa hoặc đổi tên" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s: không tồn tại trong bảng mục lục" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Đang trở lại hòa trộn “3-đường”…\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "không thể đọc nội dung hiện hành của “%s”" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Đã áp dụng miếng vá %s với các xung đột.\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ.\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, cần %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "đường dẫn không hợp lệ “%s”" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s: đã sẵn có trong thư mục đang làm việc" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s…" -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)." -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "không thể thêm %s vào chỉ mục tạm thời" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "không thể ghi mục lục tạm vào %s" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "miếng vá sai hỏng cho mô-đun-con %s" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "không thể lấy thống kê về tập tin %s mới hơn đã được tạo" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "không thể thêm mục nhớ đệm cho %s" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "gặp lỗi khi ghi vào “%s”" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "không thể ghi vào tập tin “%s” chế độ %o" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ." -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "lỗi nội bộ" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…" -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "không mở được “%s”" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "Đoạn dữ liệu #%d bị từ chối." -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "Bỏ qua đường dẫn “%s”." -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "không thể đọc tập tin lưu bảng mục lục" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "không thể mở miếng vá “%s”: %s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "đã chấm dứt %d lỗi khoảng trắng" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d dòng thêm khoảng trắng lỗi." -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Không thể ghi tập tin lưu bảng mục lục mới" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "đường-dẫn" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "số" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "đánh dấu các tập tin mới với “git add --intent-to-add”" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "" "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" -msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp" +msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "hành động" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" -msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi tìm ngữ cảnh" +msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi quét nội dung" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" -msgstr "đừng hy vọng có ít nhất một dòng ngữ cảnh" +msgstr "đừng hy vọng có ít nhất một dòng nội dung" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "chi tiết" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "gốc" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "treo thêm <root> vào tất cả các tên tập tin" @@ -1460,7 +786,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào" @@ -1492,7 +818,7 @@ msgstr "định_dạng" msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "tiền_tố" @@ -1500,12 +826,11 @@ msgstr "tiền_tố" msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "tập_tin" @@ -1538,7 +863,7 @@ msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "kho" @@ -1546,7 +871,7 @@ msgstr "kho" msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho nén từ kho chứa <kho> trên máy chủ" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "lệnh" @@ -1577,66 +902,66 @@ msgstr "Không hiểu định dạng “%s”" msgid "Argument not supported for format '%s': -%d" msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "không thể stream blob “%s”" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "chế độ tập tin lục không được hỗ trợ: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "không thể đọc %s" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "không thể bắt đầu bộ lọc “%s”" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "không thể chuyển hướng mô tả" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "bộ lọc “%s” đã báo cáo lỗi" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "đường dẫn không hợp lệ UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "đường dẫn quá dài (%d ký tự, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "lỗi giải nén (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "dấu vết thời gian là quá lớn cho hệ thống này: %<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s không phải tên thuộc tính hợp lệ" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s không được phép: %s:%d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1654,12 +979,12 @@ msgstr "Nội dung được trích dẫn sai trong tập tin “%s”: %s" msgid "We cannot bisect more!\n" msgstr "Chúng tôi không bisect thêm nữa!\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "Không phải tên đối tượng commit %s hợp lệ" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1668,7 +993,7 @@ msgstr "" "Hòa trộn trên %s là sai.\n" "Điều đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1677,7 +1002,7 @@ msgstr "" "Hòa trộn trên %s là mới.\n" "Gần như chắc chắn là có thay đổi giữa %s và [%s].\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1686,7 +1011,7 @@ msgstr "" "Hòa trộn trên %s là %s.\n" "Điều đó có nghĩa là lần chuyển giao “%s” đầu tiên là giữa %s và [%s].\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1697,7 +1022,7 @@ msgstr "" "git bisect không thể làm việc đúng đắn trong trường hợp này.\n" "Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1709,36 +1034,36 @@ msgstr "" "%s.\n" "Chúng tôi vẫn cứ tiếp tục." -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "cần một điểm xét duyệt %s" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo tập tin “%s”" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "không thể đọc tập tin “%s”" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "việc đọc tham chiếu bisect gặp lỗi" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s là cả %s và %s\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1747,7 +1072,7 @@ msgstr "" "Không tìm thấy lần chuyển giao kiểm tra được nào.\n" "Có lẽ bạn bắt đầu với các tham số đường dẫn sai?\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1756,46 +1081,46 @@ msgstr[0] "(ước chừng %d bước)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "tùy chọn--contents và --reverse không được trộn vào nhau." -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-" "tiên" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "không có đường dẫn %s trong “%s”" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "không thể đọc blob %s cho đường dẫn “%s”" @@ -1951,8 +1276,8 @@ msgstr "“%s” không giống như tập tin v2 bundle (định dạng dump c msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu không được thừa nhận: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "không thể mở “%s”" @@ -1981,62 +1306,62 @@ msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "không thể nhân đôi bộ mô tả bundle" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "Không thể sản sinh đối tượng gói" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "đối tượng gói đã chết" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list đã chết" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "Từ chối tạo một bó dữ liệu trống rỗng." -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "không thể tạo “%s”" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "mục lục gói đã chết" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "giá trị màu không hợp lệ: %.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "không thể phân tích cú pháp %s" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s không phải là một lần chuyển giao!" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2056,28 +1381,28 @@ msgstr "" "Tắt lời nhắn này bằng cách chạy\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s." -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s." -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Lần chuyển giao %s không có chữ ký GPG." -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2087,184 +1412,174 @@ msgstr "" "Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n" "cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "bảng tìm kiếm mảnh đồ-thị-các-lần-chuyển-giao còn thiếu; tập tin có thể sẽ " "không hoàn thiện" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "bù mảnh đồ-thị-các-lần-chuyển-giao không đúng chỗ %08x%08x" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "mã mảnh đồ-thị-các-lần-chuyển-giao %08x xuất hiện nhiều lần" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" "móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng '%s' không phải là " "một mã băm" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã " "bị hỏng" -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "không thể tìm thấy lần chuyển giao %s" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "không thể phân tích lần chuyển giao “%s”" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "không thể lấy kiểu của đối tượng “%s”" -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "Đang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "" "Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần " "chuyển giao" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "Đang dọn dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" "Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "gặp lỗi thêm gói %s" -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "gặp lỗi khi mở mục lục cho “%s”" -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "" "Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao từ %d tham chiếu" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "mã số đối tượng lần chuyển giao không hợp lệ: %s" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "" "Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối " "tượng đã đóng gói" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "Đang đếm các lần chuyển giao khác nhau trong đồ thị lần chuyển giao" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "không thể tạo “%s”" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao" -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao" -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm thời" -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "Đang quét các lần chuyển giao đã hòa trộn" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s”" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao" @@ -2277,25 +1592,25 @@ msgstr "định dạng đồ họa các lần chuyển giao không thể ghi %d msgid "too many commits to write graph" msgstr "có quá nhiều lần chuyển giao để ghi đồ thị" -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là " "đã hỏng" -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != " "%u" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các-lần-chuyển-giao" @@ -2304,39 +1619,39 @@ msgstr "gặp lỗi khi phân tích lần chuyển giao từ %s đồ-thị-các msgid "Verifying commits in commit graph" msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ " "thị lần chuyển giao" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != " "%s" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm " "dứt quá sớm" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2344,7 +1659,7 @@ msgstr "" "đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, " "nhưng không phải số không ở chỗ khác" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2352,12 +1667,12 @@ msgstr "" "đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển " "giao %s, nhưng số không ở chỗ khác" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -2406,7 +1721,7 @@ msgstr "khóa không chứa một phần: %s" msgid "key does not contain variable name: %s" msgstr "khóa không chứa bất kỳ một tên biến nào: %s" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "khóa không đúng: %s" @@ -2544,7 +1859,7 @@ msgstr "giá trị cho %s sai dạng: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "phải là một trong số nothing, matching, simple, upstream hay current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "mức nén gói %d không hợp lệ" @@ -2569,105 +1884,111 @@ msgstr "không thể phân giải điểm xét duyệt “%s”" msgid "failed to parse %s" msgstr "gặp lỗi khi phân tích cú pháp %s" -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "không thể phân tích cấu hình dòng lệnh" -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình" -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "%s không hợp lệ: “%s”" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "" +"không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100" -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh" -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "tên của phần không hợp lệ “%s”" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s có đa giá trị" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”" -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "không thể khóa tập tin cấu hình %s" -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "đang mở “%s”" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "mẫu không hợp lệ: %s" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "tập tin cấu hình “%s” không hợp lệ" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "fstat trên %s gặp lỗi" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "không thể mmap “%s”" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "chmod trên %s gặp lỗi" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "không thể ghi tập tin cấu hình “%s”" -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "không thể đặt “%s” thành “%s”" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "không thể thôi đặt “%s”" -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "tên của phần không hợp lệ: %s" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "thiếu giá trị cho cho “%s”" @@ -2791,7 +2112,7 @@ msgstr "không thể tìm thấy %s (%s)" msgid "unknown port %s" msgstr "không hiểu cổng %s" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "đã khóa tên máy lạ “%s”" @@ -2806,58 +2127,58 @@ msgstr "đã khóa cổng lạ “%s”" msgid "cannot start proxy %s" msgstr "không thể khởi chạy ủy nhiệm “%s”" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "chưa chỉ định đường dẫn; xem'git help pull” để biết cú pháp url hợp lệ" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "ssh biến thể “simple” không hỗ trợ -4" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "ssh biến thể “simple” không hỗ trợ -6" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh biến thể “simple” không hỗ trợ đặt cổng" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "đã khóa tên đường dẫn lạ “%s”" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "không thể rẽ nhánh tiến trình con" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Đang kiểm tra kết nối" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "Không thể chạy “git rev-list”" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "gặp lỗi khi ghi vào rev-list" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d không hợp lệ" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF nên được thay bằng LF trong %s" -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2866,12 +2187,12 @@ msgstr "" "CRLF sẽ bị thay thế bằng LF trong %s.\n" "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn" -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF nên thay bằng CRLF trong %s" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2880,19 +2201,19 @@ msgstr "" "LF sẽ bị thay thế bằng CRLF trong %s.\n" "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn" -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM bị cấm trong “%s” nếu được mã hóa là %s" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." msgstr "" -"Tập tin “%s” có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%.*s như " -"là bảng mã cây làm việc." +"Tập tin “%s” có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%s như là " +"bảng mã cây làm việc." #: convert.c:304 #, c-format @@ -2908,50 +2229,50 @@ msgstr "" "Tập tin “%s” còn thiếu ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%sBE hay " "UTF-%sLE (còn phục thuộc vào thứ tự byte) như là bảng mã cây làm việc." -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "gặp lỗi khi mã hóa “%s” từ “%s” sang “%s”" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "mã hóa “%s” từ %s thành %s và ngược trở lại không phải là cùng" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "không thể rẽ nhánh tiến trình để chạy bộ lọc bên ngoài “%s”" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "không thể cấp đầu vào cho bộ lọc bên ngoài “%s”" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "chạy bộ lọc bên ngoài “%s” gặp lỗi %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "đọc từ bộ lọc bên ngoài “%s” gặp lỗi" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "gặp lỗi khi chạy bộ lọc bên ngoài “%s”" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "gặp kiểu bộ lọc thừa" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "tên đường dẫn quá dài cho bộ lọc bên ngoài" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2960,74 +2281,74 @@ msgstr "" "bộ lọc bên ngoài “%s” không sẵn sàng nữa mặc dù không phải tất cả các đường " "dẫn đã được lọc" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false là không phải bảng-mã-cây-làm-việc hợp lệ" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: gặp lỗi khi xóa bộ lọc “%s”" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: smudge bộ lọc %s gặp lỗi" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "ở thời tương lai" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> giây trước" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> phút trước" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> giờ trước" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> ngày trước" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> tuần trước" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> tháng trước" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" msgstr[0] "%<PRIuMAX> năm" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> tháng trước" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3063,7 +2384,7 @@ msgstr "Đã đánh dấu %d island, xong.\n" msgid "failed to read orderfile '%s'" msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "Đang thực hiện dò tìm đổi tên không chính xác" @@ -3129,35 +2450,35 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow cần chính xác một đặc tả đường dẫn" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "giá trị --stat không hợp lệ: “%s”" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "tùy chọn “%s” cần một giá trị bằng số" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3166,42 +2487,42 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "không hiểu giá trị sau ws-error-highlight=%.*s" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "không thể phân giải “%s”" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s cần dạng <n>/<m>" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s cần một ký tự, nhưng lại nhận được “%s”" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "đối số --color-moved sai: %s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws" -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3209,158 +2530,158 @@ msgstr "" "tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và " "\"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "tham số cho %s không hợp lệ" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "đối số --word-diff sai: %s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "Các tùy chọn định dạng khi xuất các khác biệt" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "tạo miếng vá" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "tạo khác biệt với <n> dòng ngữ cảnh" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "tạo khác biệt ở định dạng thô" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "đồng nghĩa với “-p --raw”" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "đồng nghĩa với “-p --stat”" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "--stat thuận tiện cho máy đọc" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "chỉ xuất những dòng cuối của --stat" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<tham_số_1,tham_số_2>…" -#: diff.c:5290 +#: diff.c:5303 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" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "đồng nghĩa với --dirstat=cumulative" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "đồng nghĩa với --dirstat=files,param1,param2…" -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "chỉ hiển thị tên của các tập tin đổi" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<rộng>[,<name-width>[,<số-lượng>]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "tạo diffstat" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<rộng>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "tạo diffstat với độ rộng đã cho" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "tạo diffstat với tên độ rộng đã cho" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "tạo diffstat với độ rộng đồ thị đã cho" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<số_lượng>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "tạo diffstat với các dòng bị giới hạn" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "tạo tổng hợp xúc tích trong diffstat" -#: diff.c:5332 +#: diff.c:5345 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" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục" "\"" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "hiển thị thay đổi được tô màu" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "<kiểu>" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -"tô sáng các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” " +"tô sang các lỗi về khoảng trắng trong các dòng “context”, “old” và “new” " "trong khác biệt" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3368,89 +2689,89 @@ msgstr "" "không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra " "trong --raw hay --numstat" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<tiền_tố>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\"" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\"" -#: diff.c:5352 +#: diff.c:5365 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" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ " "định" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<ký_tự>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "Tùy chọn khác biệt đổi tên" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "dò tìm các tên thay đổi" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "dò bản sao" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "tắt dò tìm đổi tên" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" -msgstr "dùng các blob trống rống như là nguồn đổi tên" +msgstr "dung các blob trống rống như là nguồn đổi tên" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3458,156 +2779,156 @@ msgstr "" "ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt " "quá giới hạn đưa ra" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "Tùy chọn thuật toán khác biệt" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "sản sinh khác biệt ít nhất có thể" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"patience diff\"" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\"" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<thuật toán>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "chọn một thuật toán khác biệt" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<văn bản>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\"" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<chế độ>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -"hiển thị khác biệt từ, sử dụng <chế độ> để bỏ giới hạn các từ bị thay đổi" +"hiển thị khác biệt từ, sử dung <chế độ> để bỏ giới hạn các từ bị thay đổi" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<regex>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "dùng <regex> để quyết định từ là cái gì" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "các dòng di chuyển của mã mà được tô màu khác nhau" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" -msgstr "cách bỏ qua khoảng trắng trong --color-moved" +msgstr "bỏ qua khoảng trắng như thế nào trong --color-moved" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "Các tùy chọn khác biệt khác" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -"khi chạy từ thư mục con, thực thi các thay đổi bên ngoài và hiển thị các " +"khi chạy từ thư mục con, thự thi các thay đổi bên ngoài và hiển thị các " "đường dẫn liên quan" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "coi mọi tập tin là dạng văn bản thường" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt" -#: diff.c:5466 +#: diff.c:5479 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" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "tắt mọi kết xuất của chương trình" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "" "chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị " "phân" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<khi>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<định dạng>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "ẩn các mục “git add -N” từ bảng mục lục" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<chuỗi>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3615,7 +2936,7 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của " "chuỗi được chỉ ra" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3623,23 +2944,23 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu " "thức chính quy được chỉ ra" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng" -#: diff.c:5501 +#: diff.c:5514 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 kết xuất" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "<mã-số-đối-tượng>" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3647,33 +2968,33 @@ msgstr "" "tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối " "tượng được chỉ ra" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "chọn các tập tin theo kiểu khác biệt" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<tập_tin>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "Xuất ra một tập tin cụ thể" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "" "nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin." -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "" "chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin." -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3681,62 +3002,43 @@ msgstr "" "bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần " "nữa." -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào mà git biết" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "mẫu không được thừa nhận: “%s”" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "mẫu âm không được thừa nhận: “%s”" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu '%s' đã bị lặp lại" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "vô hiệu khớp mẫu nón" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "không thể dùng %s như là một tập tin loại trừ" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "không thể mở thư mục “%s”" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "gặp lỗi khi lấy tên và thông tin của nhân" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "bộ nhớ tạm không theo vết bị tắt trên hệ thống hay vị trí này" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "tập tin ghi bảng mục lục bị hỏng trong kho %s" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "không thể tạo thư mục cho %s" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" -msgstr "không thể di dời thư mục git từ “%s” sang “%s”" +msgstr "không thể di cư thư mục git từ “%s” sang “%s”" #: editor.c:73 #, c-format @@ -3752,12 +3054,12 @@ msgstr "Nội dung lọc" msgid "could not stat file '%s'" msgstr "không thể lấy thống kê tập tin “%s”" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "đường dẫn không gian tên git \"%s\" sai" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "không thể đặt GIT_DIR thành “%s”" @@ -3767,270 +3069,266 @@ msgstr "không thể đặt GIT_DIR thành “%s”" msgid "too many args to run %s" msgstr "quá nhiều tham số để chạy %s" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Máy chủ không có địa chỉ URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: cần danh sách shallow" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: cần một gói đẩy sau danh sách shallow" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "không thể ghi lên máy phục vụ" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc cần multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "dòng shallow không hợp lệ: %s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "dòng unshallow không hợp lệ: %s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "không tìm thấy đối tượng: %s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "lỗi trong đối tượng: %s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "không tìm shallow nào: %s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "cần shallow/unshallow, nhưng lại nhận được %s" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "nhận %s %d - %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "lần chuyển giao %s không hợp lệ" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "chịu thua" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "xong" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "nhận %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Đánh dấu %s là đã hoàn thành" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "đã sẵn có %s (%s)" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "lỗi giao thức: phần đầu gói bị sai" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: không thể rẽ nhánh %s" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s gặp lỗi" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "có lỗi trong sideband demultiplexer" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "Phiên bản máy chủ là %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "Máy chủ hỗ trợ %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "Máy chủ không hỗ trợ máy khách shallow" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "Máy chủ không hỗ trợ --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "Máy chủ không hỗ trợ --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "Máy chủ không hỗ trợ --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "không có lần chuyển giao chung nào" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch gặp lỗi." -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "Máy chủ không hỗ trợ yêu cầu shallow" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "Máy chủ hỗ trợ bộ lọc" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "không thể ghi các yêu cầu lên máy phục vụ" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "gặp lỗi khi đọc phần đầu của đoạn %s" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "cần “%s”, nhưng lại nhận “%s”" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "gặp dòng không được thừa nhận: “%s”" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "cần tập tin gói để gửi sau “ready”" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "không cần thêm phần nào để gửi sau “ready”" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "lỗi xử lý thông tin shallow: %d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "cần wanted-ref, nhưng lại nhận được “%s”" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" -msgstr "wanted-ref không được mong đợi: “%s”" +msgstr "không cần wanted-ref: “%s”" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "lỗi khi xử lý wanted refs: %d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "không khớp phần đầu máy chủ" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "không có máy chủ tham chiếu nào như %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" "Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" msgstr "gpg gặp lỗi khi ký dữ liệu" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "không thể tạo tập tin tạm thời" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"mẫu đã cho có chứa NULL byte (qua -f <file>). Điều này chỉ được hỗ trợ với -" -"P dưới PCRE v2" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "“%s”: không thể đọc %s" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "gặp lỗi khi lấy thống kê về “%s”" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "“%s”: đọc ngắn" @@ -4080,7 +3378,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Lệnh/bộ hỏi ở mức thấp" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "Lệnh/Đồng bộ kho ở mức thấp" #: help.c:38 @@ -4169,12 +3467,12 @@ msgstr[0] "" msgid "git version [<options>]" msgstr "git version [<các tùy chọn>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4239,61 +3537,46 @@ msgstr "không cho phép tên định danh là rỗng (cho <%s>)" msgid "name consists only of disallowed characters: %s" msgstr "tên chỉ được phép bao gồm các ký tự sau: %s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "ngày tháng không hợp lệ: %s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "mục “%s” trong cây %s có nút cây, nhưng không phải là một cây" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "mục “%s” trong cây %s có nút blob, nhưng không phải là một blob" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "không thể tải cây gốc cho lần chuyển giao “%s”" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "không thể truy cập các blob rải rác trong '%s'" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "không thể phân tích dữ liệu bộ lọc rải rác trong %s" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "cần “tree:<depth>”" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "đặc tả bộ lọc không hợp lệ “%s”" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "phải thoát char trong sub-filter-spec: '%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "mong đợi một cái gì đó sau khi kết hợp:" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "không thể thay đổi nhân bản từng phần máy chủ promisor" #: lockfile.c:151 #, c-format @@ -4323,116 +3606,120 @@ msgstr "Không thể tạo “%s.lock”: %s" msgid "failed to read the cache" msgstr "gặp lỗi khi đọc bộ nhớ đệm" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(commit sai)\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”; việc hòa trộn bị bãi bỏ." -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "addinfo_cache gặp lỗi khi làm mới đối với đường dẫn “%s”; việc hòa trộn bị " "bãi bỏ." -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "gặp lỗi khi xây dựng cây" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "gặp lỗi khi tạo đường dẫn “%s”%s" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Gỡ bỏ %s để tạo chỗ (room) cho thư mục con\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là một xung đột D/F?" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể đọc đối tượng %s “%s”" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "mong đợi đối tượng blob cho %s “%s”" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "gặp lỗi khi mở “%s”: %s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "gặp lỗi khi tạo liên kết mềm (symlink) “%s”: %s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format 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”" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format 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)" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-" "trộn)" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, 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:" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s”" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không tìm thấy các lần chuyển giao " "theo sau hòa trộn)" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không chuyển tiếp nhanh được)" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4449,33 +3736,33 @@ msgstr "" "\n" "cái mà sẽ chấp nhận gợi ý này.\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format 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)" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "Gặp lỗi khi thực hiện trộn nội bộ" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "Không thể thêm %s vào cơ sở dữ liệu" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Lỗi: từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó ghi vào " "%s." -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4484,7 +3771,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree)." -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4493,7 +3780,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree)." -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4502,7 +3789,7 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " "còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4511,45 +3798,45 @@ msgstr "" "XUNG ĐỘT (%s/xóa): %s bị xóa trong %s và %s đến %s trong %s. Phiên bản %s " "của %s còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Từ chối đóng tập tin không được theo dõi tại “%s”" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Từ chối đóng tập tin không được theo dõi tại “%s”, ngay cả khi nó ở trên " "đường." -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm trong %s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s là một thư mục trong %s thay vào đó thêm vào như là %s" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Từ chối đóng tập tin không được theo dõi tại “%s”; thay vào đó đang thêm " "thành %s" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4558,17 +3845,17 @@ msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " "tên \"%s\"->\"%s\" trong \"%s\"%s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s. Đổi tên %s->%s trong %s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4579,7 +3866,7 @@ msgstr "" "vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến " "nhận một phần nhiều của các tập tin." -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4588,7 +3875,7 @@ msgstr "" "XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách " "của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s." -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4597,7 +3884,7 @@ msgstr "" "XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; " "các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4606,7 +3893,7 @@ 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" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -4615,52 +3902,52 @@ msgstr "" "CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng " "bị đổi tên." -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "không thể đọc đối tượng %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "đối tượng %s không phải là một blob" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "sửa đổi" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "đã sửa" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "nội dung" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "mô-đun-con" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "Thay vào đó thêm vào %s" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4669,7 +3956,7 @@ msgstr "" "Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục " "đã được đổi tên trong %s; di chuyển nó đến %s." -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4678,7 +3965,7 @@ msgstr "" "XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được " "đổi tên thành %s, đoán là nó nên được di chuyển đến %s." -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4687,7 +3974,7 @@ msgstr "" "Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một " "thư mục đã được đổi tên trong %s; di chuyển nó đến %s." -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4696,243 +3983,227 @@ msgstr "" "XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư " "mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s." -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "Đang xóa %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "tập-tin/thư-mục" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "thư-mục/tập-tin" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "XUNG ĐỘT (%s): Ở đây không có thư mục nào có tên %s trong %s. Thêm %s như là " "%s" -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "Thêm \"%s\"" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "XUNG ĐỘT (thêm/thêm): Xung đột hòa trộn trong %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " +"hòa trộn:\n" +" %s" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "Đã cập nhật rồi!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "hòa trộn các cây %s và %s gặp lỗi" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "Đang trộn:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "hòa trộn không trả về lần chuyển giao nào" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh " -"hòa trộn:\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tích đối tượng “%s”" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục." -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "không nhận ra phiên bản %d của multi-pack-index" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "phiên bản băm “%u” không khớp" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "khoảng bù đoạn không hợp lệ (quá lớn)" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "mã mảnh kết thúc multi-pack-index xuất hiện sớm hơn bình thường" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index thiếu mảnh pack-name cần thiết" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s” trước “%s”" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id sai: %u (%u các gói tổng)" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nhỏ" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "gặp lỗi khi thêm tập tin gói “%s”" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "gặp lỗi khi mở pack-index “%s”" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "Đang thêm tập tin gói từ multi-pack-index" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "đã không thấy tập tin gói %s để mà xóa" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "Đang ghi các khúc vào multi-pack-index" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "gặp lỗi khi xóa multi-pack-index tại %s" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "Đang khóa cho các gói bị tham chiếu" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "Thẩm tra thứ tự OID trong multi-pack-index" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" +msgstr "Thẩm tra thứ tự OID trong MIDX" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "Đang sắp xếp các đối tượng theo tập tin gói" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "Đang thẩm tra các khoảng bù đối tượng" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" "khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "Đang đếm các đối tượng được tham chiếu" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "Đang tìm và xóa các gói không được tham chiếu" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "không thể lấy thông tin thống kê về các đối tượng gói" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "không thể hoàn thiện các đối tượng gói" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "không thể tạo tuyến lazy_dir: %s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "không thể tạo tuyến lazy_name: %s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "không thể gia nhập tuyến lazy_name: %s" @@ -4979,32 +4250,32 @@ msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Giá trị %s sai: “%s”" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "kiểu đối tượng \"%s\" không hợp lệ" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "đối tượng %s là một %s, không phải là một %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "đối tượng %s có mã kiểu %d chưa biết" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "không thể phân tích đối tượng: “%s”" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "mã băm không khớp %s" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "vị trí tương đối trước điểm kết thúc của tập tin gói (.idx hỏng à?)" @@ -5019,11 +4290,6 @@ msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "vị trí tương đối vượt quá cuối của chỉ mục gói cho %s (mục lục bị cắt cụt à?)" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "không thể lấy kích cỡ của %s" - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -5039,7 +4305,7 @@ msgstr "%s là xung khắc với %s" msgid "%s : incompatible with something else" msgstr "%s : xung khắc với các cái khác" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s k nhận giá trị" @@ -5049,41 +4315,41 @@ msgstr "%s k nhận giá trị" msgid "%s isn't available" msgstr "%s không sẵn có" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s cần một giá trị dạng số không âm với một hậu tố tùy chọn k/m/g" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "tùy chọn chưa rõ rang: %s (nên là --%s%s hay --%s%s)" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang)?" +msgid "did you mean `--%s` (with two dashes ?)" +msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang?)" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "không hiểu tùy chọn “%s”" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "không hiểu tùy chọn “%c”" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "không hiểu tùy chọn non-ascii trong chuỗi: “%s”" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "…" -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "cách dùng: %s" @@ -5091,21 +4357,21 @@ msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-SỐ" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "bí danh của --%s" @@ -5130,35 +4396,35 @@ msgstr "tùy chọn “%s” cần \"always\", \"auto\", hoặc \"never\"" msgid "malformed object name '%s'" msgstr "tên đối tượng dị hình “%s”" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Không thể làm %s được ghi bởi nhóm" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Ký tự thoát chuỗi “\\” không được phép là ký tự cuối trong giá trị thuộc tính" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "Chỉ có một đặc tả “attr:” là được phép." -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "đặc tả attr phải không được để trống" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "tên thuộc tính không hợp lệ %s" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "các cài đặt đặc tả đường dẫn “glob” và “noglob” toàn cục là xung khắc nhau" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -5166,55 +4432,50 @@ msgstr "" "cài đặt đặc tả đường dẫn “literal” toàn cục là xung khắc với các cài đặt đặc " "tả đường dẫn toàn cục khác" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "tham số không hợp lệ cho “tiền tố” màu nhiệm đặc tả đường đẫn" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Số màu nhiệm đặc tả đường dẫn không hợp lệ “%.*s” trong “%s”" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Thiếu “)” tại cuối của số màu nhiệm đặc tả đường dẫn trong “%s”" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Chưa viết mã cho số màu nhiệm đặc tả đường dẫn “%c” trong “%s”" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: “literal” và “glob” xung khắc nhau" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s: “%s” ngoài một kho chứa tại '%s'" +msgid "%s: '%s' is outside repository" +msgstr "%s: “%s” ngoài một kho chứa" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "“%s” (mnemonic: “%c”)" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: số mầu nhiệm đặc tả đường dẫn chưa được hỗ trợ bởi lệnh này: %s" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "đặc tả đường dẫn “%s” vượt ra ngoài liên kết mềm" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "dòng được trích dẫn sai: %s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "không thể đẩy dữ liệu của gói lên đĩa" @@ -5275,42 +4536,33 @@ msgstr "Làm mới bảng mục lục" msgid "unable to create threaded lstat: %s" msgstr "không thể tạo tuyến trình lstat: %s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "không thể phân tích định dạng --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Máy chủ không có địa chỉ URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng '/': %s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "không thể lấy thông tin thống kê về “log“" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "không thể đọc kết xuất “log”" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "không thể phân tích lần chuyển giao “%s”" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "không thể phân tích cú pháp phần đầu git “%.*s”" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "gặp lỗi khi tạo khác biệt" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "không thể phân tích nhật ký cho “%s”" @@ -5351,16 +4603,16 @@ msgstr "không thể thêm %s vào bảng mục lục" msgid "unable to stat '%s'" msgstr "không thể lấy thống kê “%s”" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "%s có vẻ không phải là tập tin và cũng chẳng phải là một thư mục" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Làm tươi mới bảng mục lục" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5369,7 +4621,7 @@ msgstr "" "index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5378,161 +4630,150 @@ msgstr "" "GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n" "Dùng phiên bản %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "chữ ký sai 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "phiên bản mục lục sai %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được" -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "đang lờ đi phần mở rộng %.4s" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "không hiểu định dạng mục lục 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "trường tên sai sạng trong mục lục, gần đường dẫn “%s”" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "các mục tin stage không đúng thứ tự trong mục lục" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "nhiều mục stage cho tập tin hòa trộn “%s”" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "các mục tin stage không đúng thứ tự cho “%s”" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "không thể tạo tuyến load_cache_entries: %s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "không thể gia nhập tuyến load_cache_entries: %s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: mở tập tin mục lục gặp lỗi" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: không thể lấy thống kê bảng mục lục đã mở" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: tập tin mục lục nhỏ hơn mong đợi" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: không thể ánh xạ tập tin mục lục" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "không thể tạo tuyến load_index_extensions: %s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "không thể gia nhập tuyến load_index_extensions: %s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "không thể đóng “%s”" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "không thể mở thư mục git: %s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "không thể bỏ liên kết (unlink): “%s”" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "không thể sửa các bít phân quyền trên “%s”" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: không thể xóa bỏ stage #0" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --" -"continue”.\n" -"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "không nhận ra cài đặt %s cho tùy chọn rebase.missingCommitsCheck. Nên bỏ qua." -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5578,13 +4819,13 @@ msgstr "" "Những dòng này có thể đảo ngược thứ tự; chúng chạy từ trên đỉnh xuống dưới " "đáy.\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Cải tổ %s vào %s (%d lệnh )" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5593,7 +4834,7 @@ msgstr "" "Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần " "chuyển giao.\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5601,7 +4842,7 @@ msgstr "" "\n" "Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5615,7 +4856,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5625,19 +4866,22 @@ msgstr "" "Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "không thể ghi “%s”" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "không thể ghi “%s”." +msgid "could not copy '%s' to '%s'." +msgstr "không thể chép “%s” sang “%s”." -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5646,7 +4890,7 @@ msgstr "" "Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n" "Các lần chuyển giao bị xóa (từ mới đến cũ):\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5664,13 +4908,6 @@ msgstr "" "Cánh ứng xử có thể là: ignore, warn, error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "không thể đọc “%s”." - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5681,7 +4918,7 @@ msgstr "“%s” không chỉ đến một lần chuyển giao hợp lệ nào c msgid "ignoring dangling symref %s" msgstr "đang lờ đi tham chiếu mềm thừa %s" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "đang lờ đi tham chiếu hỏng %s" @@ -5706,15 +4943,14 @@ msgstr "tham chiếu “%s” đã có từ trước rồi" msgid "unexpected object ID when writing '%s'" msgstr "không cần ID đối tượng khi ghi “%s”" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "không thể ghi vào “%s”" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "không thể mở “%s” để ghi" @@ -5749,37 +4985,37 @@ msgstr "từ chối cập nhật tham chiếu với tên sai “%s”" msgid "update_ref failed for ref '%s': %s" msgstr "update_ref bị lỗi cho ref “%s”: %s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "không cho phép đa cập nhật cho tham chiếu “%s”" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "“%s” sẵn có; không thể tạo “%s”" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "không thể xử lý “%s” và “%s” cùng một lúc" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "không thể gỡ bỏ tham chiếu: %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "không thể xóa bỏ tham chiếu %s: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "không thể xóa bỏ tham chiếu: %s" @@ -5789,7 +5025,7 @@ msgstr "không thể xóa bỏ tham chiếu: %s" msgid "invalid refspec '%s'" msgstr "refspec không hợp lệ “%s”" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "đã ra đi" @@ -5808,122 +5044,122 @@ msgstr "đằng sau %d" msgid "ahead %d, behind %d" msgstr "trước %d, sau %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "cần định dạng: %%(color:<color>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "không nhận ra màu: %%(màu:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "đối số không được thừa nhận %%(%s): %s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) không nhận các đối số" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "tham số không được thừa nhận %%(objectname): %s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) không nhận các đối số" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) không nhận các đối số" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) không nhận các đối số" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "không hiểu tham số %%(trailers): %s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "cần nội dung mang giá trị dương:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "đối số không được thừa nhận %%(contents): %s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "cần nội dung mang giá trị dương:shot=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "đối số không được thừa nhận %%(objectname): %s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "cần định dạng: %%(align:<width>,<position>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "vị trí không được thừa nhận:%s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "chiều rộng không được thừa nhận:%s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "đối số không được thừa nhận %%(align): %s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "đối số không được thừa nhận %%(if): %s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "tên trường dị hình: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "không hiểu tên trường: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -5931,159 +5167,159 @@ msgstr "" "không phải là một kho git, nhưng trường “%.*s” yêu cầu truy cập vào dữ liệu " "đối tượng" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "chuỗi định dạng dị hình %s" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "không nhánh, đang cải tổ %s" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "không nhánh, đang cải tổ HEAD %s đã tách rời" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "không nhánh, di chuyển nửa bước được bắt đầu tại %s" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "không nhánh" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "thiếu đối tượng %s cho %s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer gặp lỗi trên %s cho %s" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "đối tượng dị hình tại “%s”" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "đang lờ đi tham chiếu với tên hỏng %s" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "định dạng: thiếu nguyên tử %%(end)" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "tùy chọn “%s” là xung khắc với tùy chọn --merged" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "tùy chọn “%s” là xung khắc với tùy chọn --no-merged" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "tên đối tượng dị hình %s" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "cấu hình viết tắt máy chủ không thể bắt đầu bằng “/”: %s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "đã đưa ra nhiều hơn một gói nhận về, đang sử dụng cái đầu tiên" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "đã đưa ra nhiều hơn một gói tải lên, đang sử dụng cái đầu tiên" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Không thể lấy về cả %s và %s cho %s" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s thường theo dõi %s, không phải %s" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s theo dõi cả %s và %s" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "khóa “%s” của mẫu k có “*”" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "giá trị “%s” của mẫu k có “*”" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "refspec %s nguồn không khớp bất kỳ cái gì" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "refspec %s nguồn khớp nhiều hơn một" @@ -6092,7 +5328,7 @@ msgstr "refspec %s nguồn khớp nhiều hơn một" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6117,7 +5353,7 @@ msgstr "" "Nếu cả hai là không thể, thì chúng tôi cũng chịu thua. Bạn phải dùng tham " "chiếu dạng đầy đủ." -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6128,7 +5364,7 @@ msgstr "" "Có phải ý bạn là một tạo một nhánh mới bằng cách đẩy lên\n" "“%s:refs/heads/%s”?" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6139,7 +5375,7 @@ msgstr "" "Có phải ý bạn là một tạo một thẻ mới bằng cách đẩy lên\n" "“%s:refs/tags/%s”?" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6150,7 +5386,7 @@ msgstr "" "Có phải ý bạn là một tạo một cây mới bằng cách đẩy lên\n" "“%s:refs/tags/%s”?" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6161,115 +5397,115 @@ msgstr "" "Có phải ý bạn là một tạo một blob mới bằng cách đẩy lên\n" "“%s:refs/tags/%s”?" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "“%s” không thể được phân giải thành nhánh" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "không thể xóa “%s”: tham chiếu trên máy chủ không tồn tại" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "dst refspec %s khớp nhiều hơn một" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "dst ref %s nhận từ hơn một nguồn" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD không chỉ đến một nhánh nào cả" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "không có nhánh nào như thế: “%s”" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "nhánh thượng nguồn “%s” không được lưu lại như là một nhánh theo dõi máy chủ" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "nhánh “%s” không có máy chủ để đẩy lên" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "đẩy refspecs cho “%s” không bao gồm “%s”" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "đẩy lên mà không có đích (push.default là “nothing”)" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "không thể tìm thấy tham chiếu máy chủ %s" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Đang bỏ qua tham chiếu thú vị nội bộ “%s”" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Nhánh của bạn đã cập nhật với “%s”.\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Nhánh của bạn và “%s” tham chiếu đến các lần chuyển giao khác nhau.\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (dùng \"%s\" để biết thêm chi tiết)\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6278,11 +5514,11 @@ msgstr[0] "" "Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được chuyển-" "tiếp-nhanh.\n" -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6295,13 +5531,13 @@ msgstr[0] "" "và có %d và %d lần chuyển giao khác nhau cho từng cái,\n" "tương ứng với mỗi lần.\n" -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " "bạn)\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "không thể phân tích tên đối tượng mong muốn “%s”" @@ -6316,7 +5552,7 @@ msgstr "tên tham chiếu thay thế bị sai: %s" msgid "duplicate replace ref: %s" msgstr "tham chiếu thay thế bị trùng: %s" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "độ sâu thay thế quá cao cho đối tượng %s" @@ -6379,8 +5615,8 @@ msgstr "không thể unlink stray “%s”" msgid "Recorded preimage for '%s'" msgstr "Preimage đã được ghi lại cho “%s”" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "không thể tạo thư mục “%s”" @@ -6414,20 +5650,20 @@ msgstr "Quên phân giải cho “%s”\n" msgid "unable to open rr-cache directory" msgstr "không thể mở thư mục rr-cache" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent xung khắc với --bisect" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L vẫn chưa hỗ trợ định dạng khác biệt nào ngoài -p và -s" @@ -6449,30 +5685,30 @@ msgstr "" "Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n" "Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“." -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "gặp gói flush không cần trong khi đọc tình trạng giải nén gói trên máy chủ" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "không thể phân tích tình trạng unpack máy chủ: %s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "máy chủ gặp lỗi unpack: %s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "gặp lỗi khi ký chứng thực đẩy" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "kết thúc nhận không hỗ trợ đẩy --signed" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6480,47 +5716,47 @@ msgstr "" "đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --" "signed" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "kết thúc nhận không hỗ trợ đẩy --atomic" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "chế độ dọn dẹp ghi chú các lần chuyển giao không hợp lệ “%s”" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "không thể xóa bỏ “%s”" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "không thể gỡ bỏ “%s”" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "hoàn nguyên" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:329 -msgid "rebase" -msgstr "rebase" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "rebase -i" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "không nhận ra thao tác: %d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6528,7 +5764,7 @@ msgstr "" "sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" "với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6538,110 +5774,115 @@ msgstr "" "với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n" "và chuyển giao kết quả bằng lệnh “git commit”" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "không thể khóa “%s”" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "không thể ghi eol vào “%s”" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "gặp lỗi khi hoàn thành “%s”" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "không thể đọc “%s”" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s." -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý." -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s: chuyển-tiếp-nhanh" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "không thể cập nhật cây bộ nhớ đệm" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "không thể phân giải lần chuyển giao HEAD" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "không có khóa hiện diện trong “%.*s”" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "không thể giải trích dẫn giá trị của “%s”" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "không hiểu biến “%s”" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "thiếu “GIT_AUTHOR_NAME”" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "thiếu “GIT_AUTHOR_EMAIL”" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "thiếu “GIT_AUTHOR_DATE”" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "định dạng ngày tháng không hợp lệ “%s” trong “%s”" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6670,11 +5911,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "ghi chuyển giao gốc" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "móc “prepare-commit-msg” bị lỗi" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6705,7 +5950,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6733,327 +5978,328 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "" "không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr " (root-commit)" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "không thể phân tích HEAD" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s không phải là một lần chuyển giao!" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "không thể phân tích tác giả của lần chuyển giao" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lỗi khi ghi một cây" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "không thể đọc phần chú thích (message) từ “%s”" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "không thể phân tích lần chuyển giao %s" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "không hiểu câu lệnh %d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "Đây là tổ hợp của %d lần chuyển giao." -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "cần một HEAD để sửa" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "không thể đọc HEAD" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "không thể đọc phần chú thích (message) của HEAD" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "không thể ghi “%s”" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "không thể đọc phần chú thích (message) của %s" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "tập tin lưu mục lục của bạn không được hòa trộn." -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "không thể sửa chữa lần chuyển giao gốc" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "lần chuyển giao %s không có cha mẹ %d" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "không thể lấy ghi chú lần chuyển giao cho %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "không thể đổi tên “%s” thành “%s”" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "không thể hoàn nguyên %s… %s" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "không thể áp dụng miếng vá %s… %s" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "xóa %s %s -- vá nội dung thượng nguồn đã có\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: gặp lỗi đọc bảng mục lục" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s không nhận các đối số: “%s”" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "thiếu đối số cho %s" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "không thể phân tích cú pháp “%s”" +msgid "could not parse '%.*s'" +msgstr "không thể phân tích cú pháp “%.*s”" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "dòng không hợp lệ %d: %.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "không thể đọc “%s”." + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "đang hủy bỏ các thao tác hoàn nguyên đang thực hiện" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”." -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "không có lần chuyển giao nào được phân tích." -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "không thể cherry-pick trong khi hoàn nguyên." -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick." -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "giá trị cho %s không hợp lệ: %s" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "squash-onto không dùng được" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "bảng tùy chọn dị hình: “%s”" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "có thao tác hoàn nguyên đang được thực hiện" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "có thao tác “cherry-pick” đang được thực hiện" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "không thể tạo thư mục xếp dãy “%s”" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "không thể khóa HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay hoàn nguyên trong tiến trình" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "không mở được “%s”" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "không thể đọc “%s”: %s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "gặp kết thúc tập tin đột xuất" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của " "bạn!" -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "không có tiến trình hoàn nguyên nào" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "không có cherry-pick đang được thực hiện" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "ở đây không có gì để mà bỏ qua cả" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7062,21 +6308,21 @@ msgstr "" "bạn đã sẵn sàng chuyển giao chưa?\n" "thử \"git %s --continue\"" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "không thể cập nhật %s" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "không thể đọc HEAD" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "không thể chép “%s” sang “%s”" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7095,22 +6341,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "Không thể áp dụng %s… %.*s" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "Không hòa trộn %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "không thể chép “%s” sang “%s”" -#: sequencer.c:3129 +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "không thể đọc bảng mục lục" + +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7125,11 +6376,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7146,72 +6397,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "tên nhãn dị hình: “%.*s”" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "ghi lần chuyển giao gốc giả" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "đang ghi squash-onto" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "gặp lỗi khi tìm cây của %s" -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "không thể ghi bảng mục lục" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "không thể phân giải “%s”" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "không thể phân tích “%.*s”" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "chẳng có gì để hòa trộn: “%.*s”" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "không thể lấy chú thích của lần chuyển giao của “%s”" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "không thể ngay cả khi thử hòa trộn “%.*s”" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Đã áp dụng autostash.\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "không thử lưu “%s”" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7223,26 +6478,31 @@ msgstr "" "Bạn có thể chạy lệnh \"git stash pop\" hay \"git stash drop\" bất kỳ lúc " "nào.\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "không thể lấy ra %s" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s không phải là một OID hợp lệ" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "không thể tách rời HEAD" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "Dừng lại ở HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "Dừng lại ở %s\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7263,48 +6523,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Dừng lại ở %s… %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "không hiểu câu lệnh %d" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "không thể đọc orig-head" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "không thể đọc “onto”." -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "không thể cập nhật HEAD thành %s" -#: sequencer.c:4111 +#: sequencer.c:4115 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." -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "không thể tu bỏ một lần chuyển giao không tồn tại" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "tập tin không hợp lệ: “%s”" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "nội dung không hợp lệ: “%s”" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7314,59 +6574,69 @@ msgstr "" "Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n" "chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa." -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "không thể ghi tập tin: “%s”" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "không thể xóa bỏ CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng." -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: không thể cherry-pick một %s" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s: điểm xét duyệt sai" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script: các tùy chọn được không xử lý" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --" +"continue”.\n" +"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "không có gì để làm" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "văn lệnh đã sẵn được sắp đặt rồi." -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "“%s” ngoài một kho chứa tại '%s'" +msgid "'%s' is outside repository" +msgstr "“%s” ở ngoài một kho chứa" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7376,7 +6646,7 @@ msgstr "" "Dùng “git <lệnh> -- <đường/dẫn>…” để chỉ định đường dẫn mà nó không tồn tại " "một cách nội bộ." -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7388,12 +6658,12 @@ msgstr "" "Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n" "“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "tùy chọn “%s” phải trước các đối số đầu tiên không có tùy chọn" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7404,92 +6674,92 @@ msgstr "" "Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n" "“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "không thể cài đặt thư mục làm việc sử dụng cấu hình không hợp lệ" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "thao tác này phải được thực hiện trong thư mục làm việc" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Cần phiên bản kho git <= %d, nhưng lại nhận được %d" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "tìm thấy phần mở rộng kho chưa biết:" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "gặp lỗi khi mở “%s”" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "tập tin .git là quá lớn: “%s”" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "gặp lỗi khi đọc %s" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "định dạng tập tin git không hợp lệ: %s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "không có đường dẫn trong tập tin git: %s" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "không phải là kho git: %s" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "“$%s” quá lớn" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "không phải là kho git: “%s”" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "không thể chdir (chuyển đổi thư mục) sang “%s”" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "không thể quay lại cwd" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "gặp lỗi khi lấy thống kê về “%*s%s%s”" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Không thể đọc thư mục làm việc hiện hành" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "không thể chuyển sang “%s”" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "không phải là kho git (hoặc bất kỳ thư mục cha mẹ nào): %s" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7499,7 +6769,7 @@ msgstr "" "Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa " "đặt)." -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7508,284 +6778,284 @@ msgstr "" "gặp vấn đề với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n" "người sở hữu tập tin phải luôn có quyền đọc và ghi." -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "gặp lỗi khi mở “/dev/null” hay dup" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "gặp lỗi khi rẽ nhánh tiến trình" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "setsid gặp lỗi" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "không thể thường hóa đường dẫn đối tượng thay thế: “%s”" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "không thể fdopen tập tin khóa thay thế" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "không thể đọc tập tin thay thế" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "không thể di chuyển tập tin thay thế vào chỗ" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "đường dẫn “%s” không tồn tại" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ." -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "kho tham chiếu “%s” không phải là một kho nội bộ." -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "kho tham chiếu “%s” là nông" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "kho tham chiếu “%s” bị cấy ghép" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "mmap gặp lỗi" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "tập tin đối tượng %s trống rỗng" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "đối tượng mất hỏng “%s”" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "gặp rác tại cuối của đối tượng bị mất “%s”" -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "kiểu đối tượng không hợp lệ" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type" -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "không thể giải gói phần đầu %s" -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type" -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "không thể phân tích phần đầu của “%s”" -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "gặp lỗi khi đọc đối tượng “%s”" -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "c%s thay thế không được tìm thấy cho %s" -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng" -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng" -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "không thể ghi tập tin %s" -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "không thể đặt quyền thành “%s”" -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "lỗi ghi tập tin" -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "gặp lỗi trong khi đóng tập tin đối tượng" -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "không thể tạo tập tin tạm thời" -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "không thể ghi tập tin đối tượng đã mất" -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "không thể xả nén đối tượng mới %s (%d)" -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "gặp lỗi utime() trên “%s”" -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "không thể đọc đối tượng cho %s" -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "lần chuyển giao sai hỏng" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "thẻ sai hỏng" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "gặp lỗi đọc khi đánh mục lục %s" -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "không đọc ngắn khi đánh mục lục %s" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s: kiểu tập tin không được hỗ trợ" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s không phải là một đối tượng hợp lệ" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s không phải là một đối tượng “%s” hợp lệ" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "không thể mở %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mã băm không khớp cho %s (cần %s)" -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "không thể mmap %s" -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "không thể giải gói phần đầu của “%s”" -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "không thể phân tích phần đầu của “%s”" -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "không thể giải gói nội dung của “%s”" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "tóm lược SHA1 %s chưa rõ ràng" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Các ứng cử là:" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7809,127 +7079,56 @@ msgstr "" "này\n" "bằng cách chạy lệnh \"git config advice.objectNameWarning false\"" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "nhật ký cho '%.*s' chỉ đi lại cho %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "nhật ký cho '%.*s' chỉ có %d mục" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "đường dẫn “%s” có ở trên đĩa, nhưng không trong “%.*s”" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"đường dẫn '%s' tồn tại, nhưng không phải '%s'\n" -"gợi ý: Có phải ý bạn là '%.*s:%s' aka '%.*s:./%s'?" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "đường dẫn “%s” không tồn tại trong '%.*s'" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"đường dẫn '%s' nằm trong chỉ mục, nhưng không phải ở giai đoạn %d\n" -"gợi ý: Có phải ý bạn là ':%d:%s'?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"đường dẫn '%s' nằm trong chỉ mục, nhưng không phải '%s'\n" -"gợi ý: Có phải ý bạn là ':% d:%s ' aka ':%d:./%s'?" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "đường dẫn '%s' tồn tại trên đĩa, nhưng không có trong chỉ mục" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "đường dẫn “%s” không tồn tại (không trên đĩa cũng không trong mục lục)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "cú pháp đường dẫn tương đối không thể thể dùng ngoài cây làm việc" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "'%.*s' không phải là tên đối tượng hợp lệ" - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/giây" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/giây" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/giây" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u byte" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/giây" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "không thể sửa “%s”" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7960,128 +7159,52 @@ msgstr "trong mô-đun-con không có gì “%s”" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "đối số --ignore-submodules sai: %s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "" -"Mô-đun-con trong lần chuyển giao %s tại đường dẫn: '%s' va chạm với mô-đun-" -"con cùng tên. Nên bỏ qua nó." - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" "mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "" -"Không thể chạy lệnh “git rev-list <các lần chuyển giao> --not --remotes -n " -"1” trong mô-đun-con “%s”" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "xử lý cho mô-đun-con “%s” gặp lỗi" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu hợp lệ." -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "Đẩy lên mô-đun-con “%s”\n" - -#: submodule.c:1161 +#: submodule.c:1481 #, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "Không thể đẩy lên mô-đun-con “%s”\n" - -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "Đang lấy về mô-đun-con %s%s\n" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "Không thể truy cập mô-đun-con “%s”\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"Có lỗi khi lấy về mô-đun-con:\n" -" “%s”" +msgid "Could not access submodule '%s'" +msgstr "Không thể truy cập mô-đun-con “%s”" -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "không nhận ra “%s” là một kho git" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "Không thể chạy “git status --porcelain=2” trong mô-đun-con “%s”" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "“git status --porcelain=2” gặp lỗi trong mô-đun-con “%s”" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "không thể chạy “git status” trong mô-đun-con “%s”" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "không thể đệ quy vào trong mô-đun-con “%s”" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "không thể đặt lại mục lục của mô-đun-con" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "mô-đun-con “%s” có mục lục còn bẩn" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Mô-đun-con “%s” không thể được cập nhật." -#: submodule.c:2038 -#, c-format -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'" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8089,17 +7212,12 @@ msgstr "" "relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa " "được hỗ trợ" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "từ chối di chuyển ' %s ' vào trong một thư mục git sẵn có" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8110,37 +7228,42 @@ msgstr "" "“%s” sang\n" "“%s”\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "không thể đệ quy vào trong mô-đun-con “%s”" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "không thể lấy thông tin thống kê về ls-files trong .." -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree trả về mã không như mong đợi %d" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "đang lờ đi tên mô-đun-con mập mờ: %s" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "không cho phép giá trị âm ở submodule.fetchJobs" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "đang bỏ qua “%s” cái mà có thể được phiên dịch như là một tùy chọn dòng " "lệnh: %s" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "giá trị cho %s không hợp lệ" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Không thể cập nhật mục .gitmodules %s" @@ -8156,7 +7279,7 @@ msgstr "chạy lệnh kéo theo “%s” gặp lỗi" msgid "unknown value '%s' for key '%s'" msgstr "không hiểu giá trị “%s” cho khóa “%s”" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "nhiều hơn một %s" @@ -8175,7 +7298,7 @@ msgstr "không đọc được tập tin đầu vào “%s”" msgid "could not read from stdin" msgstr "không thể đọc từ đầu vào tiêu chuẩn" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "không thể lấy thông tin thống kê về %s" @@ -8204,47 +7327,47 @@ msgstr "không thể đổi tên tập tin tạm thời thành %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Không thể đặt thượng nguồn của “%s” thành “%s” của “%s”\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "không thể đọc bó “%s”" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "vận chuyển: tùy chọn độ sâu “%s” không hợp lệ" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "xem protocol.version trong “git help config” để có thêm thông tin" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "các tùy chọn máy chủ yêu cầu giao thức phiên bản 2 hoặc mới hơn" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "không thể phân tích cú pháp cấu hình transport.color.*" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "không cho phép phương thức vận chuyển “%s”" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync không còn được hỗ trợ nữa" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8253,7 +7376,7 @@ msgstr "" "Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n" "có thể được tìm thấy trên mọi máy phục vụ:\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8280,32 +7403,32 @@ msgstr "" "để đẩy chúng lên máy phục vụ.\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "Bãi bỏ." -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "thao tác không được gia thức hỗ trợ" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "ghi đầy đủ lên bộ hỗ trợ máy chủ gặp lỗi" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "không thể tìm thấy bộ hỗ trợ máy chủ cho “%s”" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "không thể nhân đôi fd dầu ra bộ hỗ trợ" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -8314,104 +7437,99 @@ msgstr "" "không hiểu capability bắt buộc %s; bộ hỗ trợ máy chủ này gần như chắc chắn " "là cần phiên bản Git mới hơn" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "bộ hỗ trợ máy chủ này cần phải thực thi capability đặc tả tham chiếu" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s said bất ngờ: “%s”" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s cũng khóa %s" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "không thể chạy fast-import" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "gặp lỗi trong khi chạy fast-import" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "không thể đọc tham chiếu %s" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "không hiểu đáp ứng để kết nối: %s" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "giao thức này không hỗ trợ cài đặt đường dẫn dịch vụ máy chủ" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "đường dẫn dịch vụ máy chủ không hợp lệ" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "không thể kết nối đến dịch vụ phụ %s" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s”" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "bộ hỗ trợ báo cáo rằng không cần tình trạng của %s" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s không hỗ trợ dry-run" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s không hỗ trợ --signed" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s không hỗ trợ --signed=if-asked" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "helper %s không hỗ trợ --atomic" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s không hỗ trợ “push-option”" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s không hỗ trợ “force”" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "không thể chạy fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "gặp lỗi trong khi chạy fast-export" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8421,67 +7539,67 @@ msgstr "" "cả.\n" "Tuy nhiên bạn nên chỉ định một nhánh như “master” chẳng hạn.\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "read(%s) gặp lỗi" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "write(%s) gặp lỗi" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "tuyến trình %s gặp lỗi" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "xử lý %s gặp lỗi khi đợi" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "xử lý %s gặp lỗi" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "đối tượng cây quá ngắn" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "chế độ dị hình trong đề mục cây" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "tên tập tin trống rỗng trong mục tin cây" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "tập tin cây quá ngắn" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8492,7 +7610,7 @@ msgstr "" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn " "chuyển nhánh." -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8502,7 +7620,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8513,7 +7631,7 @@ msgstr "" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa " "trộn." -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8523,7 +7641,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8533,7 +7651,7 @@ msgstr "" "%s:\n" "%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s." -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8543,7 +7661,7 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8553,7 +7671,7 @@ msgstr "" "trong nó:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8563,7 +7681,7 @@ msgstr "" "checkout:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh." -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8573,7 +7691,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8583,7 +7701,7 @@ msgstr "" "trộn:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn." -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8593,7 +7711,7 @@ msgstr "" "trộn:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8602,7 +7720,7 @@ msgstr "" "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s." -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8611,7 +7729,7 @@ msgstr "" "Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8622,7 +7740,7 @@ msgstr "" "checkout:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh." -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8633,7 +7751,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8643,7 +7761,7 @@ msgstr "" "hòa trộn:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn." -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8653,7 +7771,7 @@ msgstr "" "hòa trộn:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8663,7 +7781,7 @@ msgstr "" "%s:\n" "%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s." -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8673,12 +7791,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Mục “%s” đè lên “%s”. Không thể buộc." -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8687,7 +7805,7 @@ msgstr "" "Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8698,7 +7816,7 @@ msgstr "" "nhật checkout rải rác:\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8709,7 +7827,7 @@ msgstr "" "nhật checkout rải rác:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8718,16 +7836,16 @@ msgstr "" "Không thể cập nhật mô-đun-con:\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Bãi bỏ\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "Đang cập nhật các tập tin" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8737,10 +7855,6 @@ msgstr "" "HOA/thường trên một hệ thống tập tin không phân biệt HOA/thường)\n" "và chỉ một từ cùng một nhóm xung đột là trong cây làm việc hiện tại:\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "Đang cập nhật các cờ mục lục" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "tên lược đồ URL không hợp lệ, hoặc thiếu hậu tố “://”" @@ -8770,52 +7884,48 @@ msgstr "tên cổng không hợp lệ" msgid "invalid '..' path segment" msgstr "đoạn đường dẫn “..” không hợp lệ" -#: walker.c:170 -msgid "Fetching objects" -msgstr "Đang lấy về các đối tượng" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "gặp lỗi khi đọc “%s”" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "“%s” tại cây làm việc chình không phải là thư mục kho" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" không tồn tại" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "“%s” không phải là tập tin .git, mã lỗi %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "“%s” không chỉ ngược đến “%s”" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "không thể mở “%s” để đọc và ghi" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "không thể truy cập “%s”" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "không thể lấy thư mục làm việc hiện hành" @@ -9162,91 +8272,83 @@ msgstr "" "continue\")" #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " (dùng \"git cherry-pick --skip\" để bỏ qua miếng vá này)" - -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Hoàn nguyên hiện tại đang thực hiện." -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")" -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (chạy lệnh \"git revert --continue\" để tiếp tục)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")" -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " (dùng lệnh \"git revert --skip\" để bỏ qua lần vá này)" - -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" "Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ " "nhánh “%s”." -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)." -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "rebase đang được thực hiện: lên trên " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "Lần chuyển giao khởi tạo" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "Vẫn chưa chuyển giao" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9258,32 +8360,32 @@ msgstr "" "có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n" "tự thêm các tập tin mới (xem “git help status”.." -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s" -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc " "\"git commit -a\")\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào để chuyển giao\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9292,209 +8394,200 @@ msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được " "theo dõi hiện diện\n" -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để " "đưa vào theo dõi)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao\n" -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n" -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "Vẫn không thực hiện lệnh chuyển giao nào " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "khác" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "phía trước " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, 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." -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "" "thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao." -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<các tùy chọn>] [--] <pathspec>…" -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không như mong đợi %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "cập nhật tập tin gặp lỗi" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "gỡ bỏ “%s”\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "" "Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "gặp lỗi khi sửa miếng vá" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "Không thể lấy thông tin thống kê về “%s”" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Nên bỏ qua." -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "Không thể áp dụng miếng vá “%s”" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "chọn “hunks” theo kiểu tương tác" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "sửa diff hiện nay và áp dụng nó" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "cho phép thêm các tập tin bị bỏ qua khác" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "cập nhật các tập tin được theo dõi" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "thường hóa lại EOL của các tập tin được theo dõi (ý là -u)" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "" "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " "vết" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "không thêm, chỉ làm tươi mới bảng mục lục" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "" "kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "ghi đè lên bít thi hành của các tập tin được liệt kê" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "cảnh báo khi thêm một kho nhúng" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "ứng dụng chạy phía sau cho 'git stash -p'" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9525,174 +8618,150 @@ msgstr "" "\n" "Xem \"git help submodule\" để biết thêm chi tiết." -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "thêm cần một kho git nhúng: %s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"Sử dụng -f nếu bạn thực sự muốn thêm chúng.\n" -"Tắt thông báo này bằng cách chạy lệnh\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file xung khắc với --interactive/--patch" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file xung khắc với --edit" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod tham số “%s” phải hoặc là -x hay +x" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file xung khắc với các tham số đặc tả đường dẫn" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul cần --pathspec-from-file" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"Có lẽ bạn muốn chạy 'git add .'?\n" -"Tắt thông báo này bằng cách chạy lệnh\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Có lẽ ý bạn là “git add .” phải không?\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "không thể phân tích cú pháp văn lệnh tác giả" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "“%s” bị xóa bởi móc applypatch-msg" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng đầu vào dị hình: “%s”." -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gặp lỗi khi sao chép ghi chú (note) từ “%s” tới “%s”" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "fseek gặp lỗi" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "không thể phân tích cú pháp “%s”" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Chỉ có một sê-ri miếng vá StGIT được áp dụng một lúc" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "dấu thời gian không hợp lệ" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "dòng Ngày tháng không hợp lệ" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "độ lệch múi giờ không hợp lệ" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Dò tìm định dạng miếng vá gặp lỗi." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Gặp lỗi khi chia nhỏ các miếng vá." -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "không thể ghi tập tin lưu mục lục" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"." -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Nếu bạn muốn bỏ qua miếng vá này, hãy chạy lệnh \"%s --skip\" để thay thế." -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Để phục hồi lại nhánh gốc và dừng vá, hãy chạy \"%s --abort\"." -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Miếng vá được gửi với format=flowed; khoảng trống ở cuối của các dòng có thể " "bị mất." -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Miếng vá trống rỗng." -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "thiếu dòng tác giả trong lần chuyển gia %s" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "dòng thụt lề không hợp lệ: %.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "không thể phân tích lần chuyển giao “%s”" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”." -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "" "Sử dụng thông tin trong bảng mục lục để cấu trúc lại một cây (tree) cơ sở…" -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9700,24 +8769,24 @@ msgstr "" "Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" "Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…" -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "Gặp lỗi khi trộn vào các thay đổi." -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "áp dụng vào một lịch sử trống rỗng" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "không thể phục hồi: %s không tồn tại." -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "Thân của lần chuyển giao là:" @@ -9725,41 +8794,37 @@ msgstr "Thân của lần chuyển giao là:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, 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]: " -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "không thể ghi tập tin lưu mục lục" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "Áp dụng: %.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "Gặp lỗi khi vá tại %s %.*s" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "Dùng “git am --show-current-patch=diff” để xem miếng vá bị lỗi" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "Dùng “git am --show-current-patch” để xem miếng vá bị lỗi" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9770,7 +8835,7 @@ msgstr "" "đã 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." -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9783,17 +8848,17 @@ msgstr "" "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ó." -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Không thể phân tích đối tượng “%s”." -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "gặp lỗi khi dọn bảng mục lục" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -9801,154 +8866,144 @@ msgstr "" "Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n" "Không thể chuyển tới ORIG_HEAD" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Giá trị không hợp lệ cho --patch-format: %s" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "Giá trị không hợp lệ cho --show-current-patch: %s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s xung khắc với --show-current-patch=%s" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "chạy kiểu tương tác" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "tùy chọn lịch sử -- không-toán-tử" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "im lặng" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "thêm dòng Signed-off-by cho ghi chú của lần chuyển giao" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "chuyển mã thành utf8 (mặc định)" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "chuyển cờ -k cho git-mailinfo" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "chuyển cờ -b cho git-mailinfo" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "chuyển cờ -m cho git-mailinfo" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "cắt mọi thứ trước dòng scissors" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "chuyển nó qua git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "định dạng" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "định dạng (các) miếng vá theo" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "đồng nghĩa với --continue" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "bỏ qua miếng vá hiện hành" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá." -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD chỉ đến nó." -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "hiển thị miếng vá đã được áp dụng rồi" +#: builtin/am.c:2244 +msgid "show the patch being applied." +msgstr "hiển thị miếng vá đã được áp dụng rồi." -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "nói dối về ngày chuyển giao" -#: builtin/am.c:2295 +#: builtin/am.c:2250 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ả" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "mã-số-khóa" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "Các lần chuyển giao ký-GPG" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "(dùng nội bộ cho git-rebase)" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9956,16 +9011,16 @@ msgstr "" "Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n" "nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa." -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra." -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -9974,11 +9029,11 @@ msgstr "" "Tìm thấy thư mục lạc %s.\n" "Dùng \"git am --abort\" để loại bỏ nó đi." -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lênh" @@ -10101,7 +9156,7 @@ msgstr "Chúng tôi đang không bisect.\n" msgid "'%s' is not a valid commit" msgstr "“%s” không phải một lần chuyển giao hợp lệ" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10109,27 +9164,27 @@ msgstr "" "không thể lấy ra HEAD nguyên thủy của “%s”. Hãy thử “git bisect reset <lần-" "chuyển-giao>”." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Đối số bisect_write sai: %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "không thể lấy oid của điểm xét duyệt “%s”" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "không thể mở tập tin “%s”" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Lệnh không hợp lệ: bạn hiện đang ở một bisect %s/%s" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10138,7 +9193,7 @@ msgstr "" "Bạn phải chỉ cho tôi ít nhất một điểm %s và một %s.\n" "Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho cái đó." -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10149,7 +9204,7 @@ msgstr "" "Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n" "Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng." -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s" @@ -10158,15 +9213,15 @@ msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "Bạn có chắc chắn chưa [Y/n]? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "chưa định nghĩa thời kỳ nào" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10175,7 +9230,7 @@ msgstr "" "Bạn hiện tại đang ở thời kỳ %s cho tình trạng cũ\n" "và %s cho tình trạng mới.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10184,266 +9239,270 @@ msgstr "" "tham số không hợp lệ %s cho “git bisect terms”.\n" "Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new." -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "tùy chọn không được thừa nhận: “%s”" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "“%s” không có vẻ như là một điểm xét duyệt hợp lệ" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "sai HEAD - Tôi cần một HEAD" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "lấy ra “%s” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>\"." -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "sai HEAD - tham chiếu mềm kỳ lạ" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "refspec không hợp lệ: “%s”" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "thực hiện “git bisect next”" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "ghi thời kỳ vào .git/BISECT_TERMS" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "dọn dẹp tình trạng di chuyển nửa bước" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "kiểm tra cho điểm xem xét cần dùng" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "đặt lại trạng di chuyển nửa bước" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "ghi ra tình trạng di chuyển nửa bước trong BISECT_LOG" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "kiểm tra và đặt thời điểm trong di chuyển nửa bước" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "in ra các thời điểm di chuyển nửa bước" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "bắt đầu phiên di chuyển nửa bước" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" "cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hành" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "không có nhật ký cho BISECT_WRITE" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms cần hai tham số" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state không nhận đối số" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "" "--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write cần 4 hoặc 5 tham số" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms cần 3 tham số" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check cần 2 hoặc 3 tham số" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms cần 0 hoặc 1 tham số" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<các tùy chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "cần một màu: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "phải kết thúc bằng một màu" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "màu không hợp lệ “%s” trong color.blame.repeatedLines" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "màu không hợp lệ cho blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "không thể tìm thấy điểm xét duyệt %s để mà bỏ qua" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "Ép buộc báo cáo tiến triển công việc" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Dùng cùng chế độ xuất ra với git-annotate (Mặc định: off)" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "Hiển thị SHA1 của lần chuyển giao dạng dài (Mặc định: off)" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "rev" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" -msgstr "Bỏ qua <rev> khi blame" +msgstr "bỏ qua <rev> khi blame" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "Bỏ qua các điểm xét duyệt từ <tập tin>" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "siêu dữ liệu dư thừa màu từ dòng trước khác hẳn" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "các dòng màu theo tuổi" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Dùng một phỏng đoán thử nghiệm để tăng cường các diff" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "điểm số" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress không được dùng cùng với --incremental hay các định dạng porcelain" @@ -10456,17 +9515,17 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "4 năm, 11 tháng trước" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "tập tin %s chỉ có %lu dòng" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "Các dòng blame" @@ -10675,7 +9734,7 @@ msgstr "cài đặt chế độ theo dõi (xem git-pull(1))" msgid "do not use" msgstr "không dùng" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "thượng nguồn" @@ -10684,8 +9743,8 @@ msgid "change the upstream info" msgstr "thay đổi thông tin thượng nguồn" #: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "bỏ đặt thông tin thượng nguồn" +msgid "Unset the upstream info" +msgstr "Bỏ đặt thông tin thượng nguồn" #: builtin/branch.c:628 msgid "use colored output" @@ -10786,7 +9845,7 @@ msgstr "sắp xếp và lọc là phân biệt HOA thường" msgid "format to use for the output" msgstr "định dạng sẽ dùng cho đầu ra" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "Không tìm thấy HEAD ở dưới refs/heads!" @@ -10876,65 +9935,20 @@ msgstr "" "tùy chọn --set-upstream đã không còn được hỗ trợ nữa. Vui lòng dùng “--" "track” hoặc “--set-upstream-to” để thay thế." -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<các tùy chọn>] <tập_tin> <git-rev-list args>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<các tùy chọn>] <tập-tin>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <tập tin> [<tên tham chiếu>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "không hiển thị bộ đo tiến trình" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "hiển thị bộ đo tiến trình" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "Cần một kho chứa để có thể tạo một bundle." - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "không hiển thị chi tiết bundle (bó)" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "“%s” tốt\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "Cần một kho chứa để có thể tạo một bundle." + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "Cần một kho chứa để có thể giải nén một bundle." -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "chi tiết; phải được đặt trước một lệnh-con" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Không hiểu câu lệnh con: %s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10942,7 +9956,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10950,72 +9964,72 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "chỉ một tùy chọn batch được chỉ ra" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<kiểu> là một trong số: blob, tree, commit hoặc tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "hiển thị kiểu đối tượng" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "hiển thị kích thước đối tượng" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "thoát với 0 khi không có lỗi" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "in nội dung đối tượng dạng dễ đọc" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "với đối tượng blob, chạy lệnh textconv trên nội dung của đối tượng" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "dùng một đường dẫn rõ ràng cho --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "cho phép -s và -t để làm việc với các đối tượng sai/hỏng" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "đệm kết xuất --batch" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "" "hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "hiển thị các thông tin về đối tượng fed từ đầu vào tiêu chuẩn" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "theo liên kết mềm trong-cây (được dùng với --batch hay --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "hiển thị mọi đối tượng với --batch hay --batch-check" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "đừng sắp xếp đầu ra --batch-all-objects" @@ -11043,8 +10057,8 @@ msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" msgid "terminate input and output records by a NUL character" msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "chặn các báo cáo tiến trình hoạt động" @@ -11056,27 +10070,27 @@ msgstr "hiển thị những đường dẫn đầu vào không khớp với m msgid "ignore index when checking" msgstr "bỏ qua mục lục khi kiểm tra" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "không thể chỉ định các tên đường dẫn với --stdin" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z chỉ hợp lý với --stdin" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "chưa chỉ ra đường dẫn" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "tùy-chọn --non-matching chỉ hợp lệ khi dùng với --verbose" @@ -11135,9 +10149,9 @@ msgid "write the content to temporary files" msgstr "ghi nội dung vào tập tin tạm" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "chuỗi" @@ -11165,96 +10179,96 @@ msgstr "git switch [<các tùy chọn>] [<nhánh>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "đường dẫn “%s” không có các phiên bản của chúng ta" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "đường dẫn “%s” không có các phiên bản của chúng" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "đường dẫn “%s” không có tất cả các phiên bản cần thiết" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "đường dẫn “%s” không có các phiên bản cần thiết" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "đường dẫn “%s”: không thể hòa trộn" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Không thể thêm kết quả hòa trộn cho “%s”" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Đã tạo lại %d xung đột hòa trộn" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Đã cập nhật đường dẫn %d từ %s" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Đã cập nhật đường dẫn %d từ mục lục" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "không được dùng “%s” với các đường dẫn cập nhật" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "không được dùng “%s” với %s" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Không thể cập nhật các đường dẫn và chuyển đến nhánh “%s” cùng một lúc." -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "không chỉ định '%s' không '%s'" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "phải có “%s” khi không chỉ định “%s”" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' hay '%s' không thể được sử dụng với %s" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "đường dẫn “%s” không được hòa trộn" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11264,50 +10278,56 @@ msgstr "" "sau:\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "" +"các thay đổi đã đưa lên bệ phóng trong các tập tin sau đây có thể bị mất: %s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Không thể thực hiện reflog cho “%s”: %s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD hiện giờ tại" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "không thể cập nhật HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "Đặt lại nhánh “%s”\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "Đã sẵn sàng trên “%s”\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Đã chuyển đến nhánh mới “%s”\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "Đã chuyển đến nhánh “%s”\n" -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " … và nhiều hơn %d.\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11326,7 +10346,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11347,19 +10367,28 @@ msgstr[0] "" " git branch <tên_nhánh_mới> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "Vị trí trước kia của HEAD là" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "chỉ cần một tham chiếu" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11368,71 +10397,37 @@ msgstr "" "“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n" "Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn" -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"Nếu ý bạn là lấy ra nhánh máy chủ được theo dõi, ví dụ “origin”,\n" -"bạn có thể làm như vậy bằng cách chỉ định đầy đủ tên với tùy chọn --track:\n" -"\n" -" git checkout --track origin/<tên>\n" -"\n" -"Nếu bạn muốn luôn lấy ra từ một <tên> một máy chủ ưa thích\n" -"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n" -"checkout.defaultRemote=origin trong cấu hình của bạn." - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "“%s” khớp với nhiều (%d) nhánh máy chủ được theo dõi" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "chỉ cần một tham chiếu" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d." - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu không hợp lệ: %s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "tham chiếu không phải là một cây:%s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "cần một nhánh, nhưng lại nhận được “%s”" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "cần một nhánh, nhưng lại nhận được “%s”" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11440,7 +10435,7 @@ msgstr "" "không thể chuyển nhánh trong khi đang hòa trộn\n" "Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11448,7 +10443,7 @@ msgstr "" "không thể chuyển nhanh ở giữa một phiên am\n" "Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11456,7 +10451,7 @@ msgstr "" "không thể chuyển nhánh trong khi cải tổ\n" "Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"." -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11464,7 +10459,7 @@ msgstr "" "không thể chuyển nhánh trong khi cherry-picking\n" "Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"." -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11472,148 +10467,143 @@ msgstr "" "không thể chuyển nhánh trong khi hoàn nguyên\n" "Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"." -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "" "bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa " "bước" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "“%s” không thể được sử dụng với các nhánh chuyển" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "“%s” không thể được dùng với “%s”" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "“%s” không thể nhận <điểm-đầu>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "thiếu tham số là nhánh hoặc lần chuyển giao" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến triển công việc" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "kiểu" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "xung đột kiểu (hòa trộn hoặc diff3)" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "rời bỏ HEAD tại lần chuyển giao theo tên" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "đặt thông tin thượng nguồn cho nhánh mới" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "nhánh-mới" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "nhánh không cha mới" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "" "lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" -msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục rải rác" +msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p và --overlay loại từ lẫn nhau" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track cần tên một nhánh" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "thiếu tên nhánh; hãy thử -b" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "không thể phân giải “%s”" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "bạn phải chỉ định các thư mục muốn hồi phục" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "đường dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo " "từ đó" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file xung khắc với --detach" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file xung khắc với --patch" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11621,69 +10611,95 @@ msgstr "" "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" "checkout bảng mục lục (index)." -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "bạn phải chỉ định các thư mục muốn hồi phục" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"“%s” khớp hơn một nhánh máy chủ được theo dõi.\n" +"Chúng tôi tìm thấy %d máy chủ với một tham chiếu khớp. Do đó chúng tôi cố " +"để\n" +"phân giải tham số như là một đường dẫn, nhưng cũng gặp lỗi!\n" +"\n" +"Nếu ý bạn là lấy ra nhánh máy chủ được theo dõi, ví dụ “origin”,\n" +"bạn có thể làm như vậy bằng cách chỉ định đầy đủ tên với tùy chọn --track:\n" +"\n" +" git checkout --track origin/<tên>\n" +"\n" +"Nếu bạn muốn luôn lấy ra từ một <tên> một náy chủ ưa thích\n" +"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n" +"checkout.defaultRemote=origin trong cấu hình của bạn." -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "nhánh" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "tạo và checkout một nhánh mới" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "tạo/đặt_lại và checkout một nhánh" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "tạo reflog cho nhánh mới" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "đoán thứ hai 'git checkout <không-nhánh-nào-như-vậy>' (mặc định)" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "dùng chế độ che phủ (mặc định)" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "tạo và chuyển đến một nhánh mới" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "tạo/đặt_lại và chuyển đến một nhánh" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\"" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "vứt bỏ các sửa đổi địa phương" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "lấy ra từ tree-ish nào" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "phục hồi bảng mục lục" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "phục hồi cây làm việc (mặc định)" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "bỏ qua những thứ chưa hòa trộn: %s" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "dùng chế độ che phủ" @@ -11724,7 +10740,7 @@ msgstr "gặp lỗi khi gỡ bỏ %s" msgid "could not lstat %s\n" msgstr "không thể lấy thông tin thống kê đầy đủ của %s\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11737,7 +10753,7 @@ msgstr "" "foo - chọn mục trên cơ sở tiền tố duy nhất\n" " - (để trống) không chọn gì cả\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11758,33 +10774,38 @@ msgstr "" "* - chọn tất\n" " - (để trống) kết thúc việc chọn\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Hả (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "Mẫu để lọc các tập tin đầu vào cần lờ đi>> " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "CẢNH BÁO: Không tìm thấy các mục được khớp bởi: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "Chọn mục muốn xóa" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "Xóa bỏ “%s” [y/N]? " -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "Tạm biệt.\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11802,55 +10823,63 @@ msgstr "" "help - hiển thị chính trợ giúp này\n" "? - trợ giúp dành cho chọn bằng cách nhắc" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** Lệnh ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "Giờ thì sao" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Có muốn gỡ bỏ (các) mục sau đây không:" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "Không còn tập-tin nào để dọn dẹp, đang thoát ra." -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "ép buộc" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "dọn bằng kiểu tương tác" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng nhau" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11858,7 +10887,7 @@ msgstr "" "clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà " "cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11866,7 +10895,7 @@ msgstr "" "clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n " "mà cũng không -f; từ chối lệnh dọn dẹp (clean)" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<các tùy chọn>] [--] <kho> [<t.mục>]" @@ -11914,18 +10943,18 @@ msgstr "thư-mục-mẫu" msgid "directory from which templates will be used" msgstr "thư mục mà tại đó các mẫu sẽ được dùng" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "kho tham chiếu" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "chỉ dùng --reference khi nhân bản" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "tên" @@ -11941,8 +10970,8 @@ msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ" msgid "path to git-upload-pack on the remote" msgstr "đường dẫn đến git-upload-pack trên máy chủ" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "độ-sâu" @@ -11950,7 +10979,7 @@ msgstr "độ-sâu" msgid "create a shallow clone of that depth" msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "thời-gian" @@ -11958,17 +10987,16 @@ msgstr "thời-gian" msgid "create a shallow clone since a specific time" msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "điểm xét duyệt" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "làm sâu hơn lịch sử của bản sao shallow, bằng điểm xét duyệt loại trừ" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch" @@ -11998,23 +11026,23 @@ msgstr "khóa=giá_trị" msgid "set config inside the new repository" msgstr "đặt cấu hình bên trong một kho chứa mới" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "đặc-tả-máy-phục-vụ" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "tùy chọn để chuyển giao" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "chỉ dùng địa chỉ IPv4" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "chỉ dùng địa chỉ IPv6" @@ -12022,11 +11050,7 @@ msgstr "chỉ dùng địa chỉ IPv6" msgid "any cloned submodules will use their remote-tracking branch" msgstr "mọi mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "khởi tạo tập tin sparse-checkout để bao gồm chỉ các tập tin ở gốc" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12034,42 +11058,47 @@ msgstr "" "Không đoán được thư mục tên là gì.\n" "Vui lòng chỉ định tên một thư mục trên dòng lệnh" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s có tồn tại nhưng lại không phải là một thư mục" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "gặp lỗi khi bắt đầu lặp qua “%s”" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "gặp lỗi khi tạo được liên kết mềm %s" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "gặp lỗi khi sao chép tập tin và “%s”" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "gặp lỗi khi lặp qua “%s”" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "hoàn tất.\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12079,99 +11108,95 @@ msgstr "" "Bạn kiểm tra kỹ xem cái gì được lấy ra bằng lệnh “git status”\n" "và thử lấy ra với lệnh 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)." -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "không thể cập nhật %s" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "gặp lỗi khi khởi tạo sparse-checkout" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "không thể lấy ra (checkout) cây làm việc" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "không thể ghi các tham số vào tập tin cấu hình" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "không thể đóng gói để dọn dẹp" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "không thể bỏ liên kết tập tin thay thế tạm thời" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Có quá nhiều đối số." -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "độ sâu %s không phải là một số nguyên dương" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng." -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "cây làm việc “%s” đã sẵn tồn tại rồi." -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "không thể tạo các thư mục dẫn đầu của “%s”" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "không thể tạo cây thư mục làm việc dir “%s”" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Đang nhân bản thành kho chứa bare “%s”…\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”…\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12179,41 +11204,41 @@ msgstr "" "nhân bản --recursive không tương thích với cả hai --reference và --reference-" "if-able" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " "thế." -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay " "thế." -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "--filter bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế." -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "kho nguồn là nông, nên bỏ qua --local" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local bị lờ đi" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "Bạn hình như là đã nhân bản một kho trống rỗng." @@ -12262,7 +11287,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "không phải là tên đối tượng hợp lệ “%s”" @@ -12290,13 +11315,13 @@ msgstr "cha-mẹ" msgid "id of a parent commit object" msgstr "mã số của đối tượng chuyển giao cha mẹ" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "chú thích" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "chú thích của lần chuyển giao" @@ -12304,8 +11329,8 @@ msgstr "chú thích của lần chuyển giao" msgid "read commit log message from file" msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Ký lần chuyển giao dùng GPG" @@ -12383,67 +11408,59 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "gặp lỗi khi tháo dỡ HEAD đối tượng cây" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file với -a là không có ý nghĩa gì" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "không thể tạo bảng mục lục tạm thời" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "gặp lỗi khi thêm bằng cách tương" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "không thể cập nhật bảng mục lục tạm thời" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "Gặp lỗi khi cập nhật cây bộ nhớ đệm" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "không thể ghi tập tin lưu bảng mục lục mới (new_index)" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "" "không thể thực hiện việc chuyển giao cục bộ trong khi đang được hòa trộn." -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "không thể thực hiện việc chuyển giao bộ phận trong khi đang cherry-pick." -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "không đọc được bảng mục lục" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "không thể ghi tập tin lưu bảng mục lục tạm thời" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "lần chuyển giao “%s” thiếu phần tác giả ở đầu" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "lần chuyển giao “%s” có phần tác giả ở đầu dị dạng" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "đối số cho --author bị dị hình" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -12451,38 +11468,38 @@ msgstr "" "không thể chọn một ký tự ghi chú cái mà không được dùng\n" "trong phần ghi chú hiện tại" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "không thể đọc nhật ký từ đầu vào tiêu chuẩn" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "không đọc được tệp nhật ký “%s”" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "không thể đọc SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "không thể đọc MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "không thể ghi mẫu chuyển giao" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12497,7 +11514,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12512,7 +11529,7 @@ msgstr "" "\t%s\n" "và thử lại.\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12523,7 +11540,7 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " "chuyển giao.\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12535,148 +11552,152 @@ msgstr "" "bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" "Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sTác giả: %.*s <%.*s>" -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%sNgày tháng: %s" -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sNgười chuyển giao: %.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "Không đọc được bảng mục lục" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy cung cấp lời chú giải hoặc là dùng tùy chọn -m hoặc là -F.\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author “%s” không phải là “Họ và tên <thư điện tửl>” và không khớp bất kỳ " "tác giả nào sẵn có" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Chế độ bỏ qua không hợp lệ “%s”" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Chế độ cho các tập tin chưa được theo dõi không hợp lệ “%s”" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "Sử dụng cả hai tùy chọn --reset-author và --author không hợp lý" -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "Không có gì để mà “tu bổ” cả." -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình hòa trộn -- không thể thực hiện việc “tu bổ”." -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" "Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu " "bổ”." -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "Các tùy chọn --squash và --fixup không thể sử dụng cùng với nhau" -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Chỉ được dùng một trong số tùy chọn trong số -c/-C/-F/--fixup." -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F." -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author chỉ có thể được sử dụng với tùy chọn -C, -c hay --amend." -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Chỉ một trong các tùy chọn --include/--only/--all/--interactive/--patch được " "sử dụng." -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "Không đường dẫn với các tùy chọn --include/--only không hợp lý." + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "các đường dẫn “%s …” với tùy chọn -a không hợp lý" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "hiển thị thông tin về tạm cất" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "tính đầy đủ giá trị trước/sau" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "phiên bản" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -12684,11 +11705,11 @@ msgstr "" "hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, " "no. (Mặc định: traditional)" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "khi" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -12696,176 +11717,176 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "không dò tìm các tên thay đổi" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "dò các tên thay đổi, tùy ý đặt mục lục tương tự" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Không hỗ trỡ tổ hợp các tham số các tập tin bị bỏ qua và không được theo dõi" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "ghi đè ngày tháng cho lần chuyển giao" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "lần_chuyển_giao" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho nhưng có cho sửa chữa" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 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" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 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)" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "(nên dùng) thêm dòng Signed-off-by:" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "bao gồm các trạng thái trong mẫu ghi chú chuyển giao" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "vòng qua móc (hook) pre-commit và commit-msg" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "“tu bổ” (amend) lần commit trước" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "không thể đọc phần chú thích (message) của lần chuyển giao: %s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Bãi bỏ việc chuyển giao bởi vì phần chú thích của nó trống rỗng.\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" "Đang bỏ qua việc chuyển giao; bạn đã không biên soạn phần chú thích " "(message).\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12876,83 +11897,84 @@ msgstr "" "có bị đầy quá hay quota (hạn nghạch đĩa cứng) bị vượt quá,\n" "và sau đó \"git restore --staged :/\" để khắc phục." -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <objdir>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <objdir>]" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" msgstr "" -"git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow] [--" -"[no-]progress]" +"git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" +"reachable|--stdin-packs|--stdin-commits] <split options>" msgstr "" "git commit-graph write [--object-dir </thư/mục/đối/tượng>] [--append|--" -"split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <các " -"tùy chọn chia tách>" +"split] [--reachable|--stdin-packs|--stdin-commits] <các tùy chọn chia tách>" -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”" - -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "tmục" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "Thư mục đối tượng để lưu đồ thị" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "" "nếu đồ-thị-các-lần-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Không thể mở đồ thị chuyển giao “%s”" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "bắt đầu di chuyển tại mọi tham chiếu" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "quét dó các mục lục gói được liệt kê bởi đầu vào tiêu chuẩn cho các lần " "chuyển giao" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "" "bắt đầu di chuyển tại các lần chuyển giao được liệt kê bởi đầu vào tiêu chuẩn" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "" "bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ-thị-các-lần-chuyển-" "giao" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "cho phép ghi một tập tin đồ họa các lần chuyển giao lớn lên" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "số lượng tối đa của các lần chuyển giao trong một đồ-thị-các-lần-chuyển-giao " "chia cắt không-cơ-sở" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "tỷ lệ tối đa giữa hai mức của một đồ-thị-các-lần-chuyển-giao chia cắt" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" "không thể sử dụng hơn một --reachable, --stdin-commits, hay --stdin-packs" @@ -12961,213 +11983,207 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<các tùy chọn>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "đối số không được thừa nhận --type, %s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "chỉ một kiểu một lần" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "Vị trí tập tin cấu hình" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "dùng tập tin cấu hình toàn cục" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "sử dụng tập tin cấu hình hệ thống" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "dùng tập tin cấu hình của kho" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "dùng tập tin cấu hình per-worktree" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "sử dụng tập tin cấu hình đã cho" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "đọc cấu hình từ đối tượng blob đã cho" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "Hành động" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "lấy giá-trị: tên [value-regex]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "lấy tất cả giá-trị: khóa [value-regex]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "lấy giá trị cho regexp: name-regex [value-regex]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "thêm biến mới: tên giá-trị" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "gỡ bỏ biến: tên [value-regex]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "đổi tên phần: tên-cũ tên-mới" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "gỡ bỏ phần: tên" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "liệt kê tất" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "mở một trình biên soạn" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "tìm cấu hình màu sắc: slot [mặc định]" -#: builtin/config.c:146 +#: builtin/config.c:145 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]" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "Kiểu" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "giá trị được đưa kiểu này" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "giá trị là \"true\" hoặc \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "giá trị ở dạng số thập phân" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "giá trị là --bool hoặc --int" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "giá trị là một ngày hết hạn" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "Khác" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "chấm dứt giá trị với byte NUL" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "chỉ hiển thị các tên biến" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "tôn trọng kể cà các hướng trong tìm kiếm" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng " "lệnh)" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -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)" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "giá trị" -#: builtin/config.c:160 +#: builtin/config.c:158 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" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "sai số lượng tham số, phải là %d" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "sai số lượng tham số, phải từ %d đến %d" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "mẫu khóa không hợp lệ: %s" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "gặp lỗi khi định dạng giá trị cấu hình mặc định: %s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "không thể phân tích màu “%s”" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "không thể phân tích giá trị màu mặc định" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "không trong thư mục git" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "việc ghi ra đầu ra tiêu chuẩn là không được hỗ trợ" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "không hỗ trợ ghi cấu hình các blob" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13182,23 +12198,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "chỉ một tập tin cấu hình một lần" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local chỉ có thể được dùng bên trong một kho git" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob chỉ có thể được dùng bên trong một kho git" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "Chưa đặt biến môi trường HOME" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13208,19 +12224,19 @@ 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" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "--get-color và kiểu biến là không mạch lạc" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "chỉ một thao tác mỗi lần" -#: builtin/config.c:732 +#: builtin/config.c:706 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" -#: builtin/config.c:738 +#: builtin/config.c:712 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" @@ -13228,33 +12244,33 @@ msgstr "" "--show-origin chỉ được áp dụng cho --get, --get-all, --get-regexp, hoặc --" "list" -#: builtin/config.c:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default chỉ được áp dụng cho --get" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "không thể đọc tập tin cấu hình “%s”" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "gặp lỗi khi xử lý các tập tin cấu hình" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "sửa chữa đầu ra tiêu chuẩn là không được hỗ trợ" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "việc sửa chữa các blob là không được hỗ trợ" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "không thể tạo tập tin cấu hình “%s”" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13263,7 +12279,7 @@ msgstr "" "không thể ghi đè nhiều giá trị với một giá trị đơn\n" " Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "không có đoạn: %s" @@ -13276,57 +12292,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<các tùy chọn>] <commit-ish>*" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<các tùy chọn>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "phía trước" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "hạng nhẹ" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "có diễn giải" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "thẻ đã được ghi chú %s không sẵn để dùng" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "thẻ được chú giải %s không có tên nhúng" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "không có thẻ nào khớp chính xác với “%s”" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "Không có tham chiếu hay thẻ khớp đúng, đang tìm kiếm mô tả\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "việc tìm kiếm đã kết thúc tại %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13335,7 +12351,7 @@ msgstr "" "Không có thẻ được chú giải nào được mô tả là “%s”.\n" "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags." -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13344,12 +12360,12 @@ msgstr "" "Không có thẻ có thể mô tả “%s”.\n" "Hãy thử --always, hoặc tạo một số thẻ." -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "đã xuyên %lu qua lần chuyển giao\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13358,90 +12374,90 @@ msgstr "" "tìm thấy nhiều hơn %i thẻ; đã liệt kê %i cái gần\n" "đây nhất bỏ đi tìm kiếm tại %s\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "mô tả %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "Không phải tên đối tượng %s hợp lệ" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s không phải là một lần commit cũng không phải blob" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "tìm các thẻ mà nó đến trước lần chuyển giao" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "dùng ref bất kỳ" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "dùng thẻ bất kỳ, cả khi “unannotated”" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "luôn dùng định dạng dài" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "chỉ theo cha mẹ đầu tiên" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "chỉ xuất những gì khớp chính xác" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "không coi rằng các thẻ khớp với <mẫu>" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "dấu" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "thêm <dấu> trên cây thư mục làm việc bị hỏng (mặc định \"-broken\")" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long là xung khắc với tùy chọn --abbrev=0" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "Không tìm thấy các tên, không thể mô tả gì cả." -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty là xung khắc với các tùy chọn commit-ish" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken là xung khắc với commit-ishes" @@ -13480,27 +12496,27 @@ msgstr "" "git difftool [<các tùy chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] </" "đường/dẫn>…]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "gặp lỗi: %d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "không thể đọc liên kết mềm %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "không đọc được tập tin liên kết mềm %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "không thể đọc đối tượng %s cho liên kết mềm %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13508,53 +12524,53 @@ msgstr "" "các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n" "chế độ diff thư mục(“-d” và “--dir-diff”)." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "cây làm việc ở bên trái." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "các tập tin tạm đã sẵn có trong “%s”." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "bạn có lẽ muốn dọn dẹp hay phục hồi ở đây." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "thực hiện một diff toàn thư mục" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "đừng nhắc khi khởi chạy công cụ diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "dùng liên kết mềm trong diff-thư-mục" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "công cụ" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "dùng công cụ diff đã cho" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13562,31 +12578,31 @@ msgstr "" "làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số " "không" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "chỉ định một lệnh tùy ý để xem diff" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "chuyển cho “diff”" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool cần cây làm việc hoặc --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff xung khắc với --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool và --extcmd loại từ lẫn nhau" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>" @@ -13625,184 +12641,160 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "Lỗi: không thể xuất thẻ lồng nhau trừ khi --mark-tags được chỉ định." - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "hiển thị tiến triển sau <n> đối tượng" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "chọn điều khiển của thẻ đã ký" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "" "chọn bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "Đổ các đánh dấu này vào tập-tin" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "Nhập vào đánh dấu từ tập tin này" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "Nhập vào đánh dấu từ tập tin sẵn có" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "Bỏ qua kết xuất của dữ liệu blob" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "Áp dụng refspec cho refs đã xuất" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "kết xuất anonymize" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Các cha mẹ tham chiếu cái mà k trong luồng dữ liệu fast-export bởi mã id đối " "tượng" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "Hiển thị các mã id nguyên gốc của blobs/commits" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "Gắn nhãn thẻ ID dấu" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "Không thể chuyển qua cả hai --import-marks và --import-marks-if-exists" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<các tùy chọn>] [<kho-chứa> [<refspec>…]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<các tùy chọn>] [<nhóm>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<các tùy chọn>] [(<kho> | <nhóm>)…]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<các tùy chọn>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel không thể âm" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "lấy về từ tất cả các máy chủ" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "đặt thượng nguồn cho git pull/fetch" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "nối thêm vào .git/FETCH_HEAD thay vì ghi đè lên nó" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "đường dẫn đến gói tải lên trên máy chủ cuối" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "ép buộc ghi đè lên tham chiếu nội bộ" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "lấy từ nhiều máy chủ cùng lúc" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "lấy tất cả các thẻ cùng với các đối tượng liên quan đến nó" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "không lấy tất cả các thẻ (--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "số lượng mô-đun-con được lấy đồng thời" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "" "cắt cụt (prune) các nhánh “remote-tracking” không còn tồn tại trên máy chủ " "nữa" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi" -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "khi-cần" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "giữ lại gói đã tải về" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "cho phép cập nhật th.chiếu HEAD" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "làm sâu hơn lịch sử của kho bản sao shallow dựa trên thời gian" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "chuyển đổi hoàn toàn sang kho git" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 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" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -13810,95 +12802,91 @@ msgstr "" "mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập " "tin cấu hình config)" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "chấp nhận tham chiếu cập nhật .git/shallow" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "chỉ ra refmap cần lấy về" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "" "báo cáo rằng chúng ta chỉ có các đối tượng tiếp cận được từ đối tượng này" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "chạy 'gc --auto' sau khi lấy về" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "kiểm cho các-cập-nhật-bắt-buộc trên mọi nhánh đã cập nhật" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "ghi ra đồ thị các lần chuyển giao sau khi lấy về" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "không tìm thấy đối tượng %s" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "không thể fetch (lấy) về nhánh hiện hành" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "không thể cập nhật tham chiếu nội bộ" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "nên xóa chồng các thẻ có sẵn" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "không-phải-chuyển-tiếp-nhanh" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13908,7 +12896,7 @@ msgstr "" "nhưng lựa chọn bị tắt. Để kích hoạt lại, sử dụng cờ\n" "'--show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13921,22 +12909,22 @@ msgstr "" "false'\n" "để tránh kiểm tra này.\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13945,81 +12933,60 @@ msgstr "" "một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n" " “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho " "trần (bare)" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "phát hiện nhiều nhánh, không tương thích với --set-upstream" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "không cài đặt thượng nguồn cho một nhánh được theo dõi trên máy chủ" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "không cài đặt thượng nguồn cho một thẻ nhánh trên máy chủ" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "không hiểu kiểu nhánh" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"không tìm thấy nhánh nguồn.\n" -"bạn cần phải chỉ định chính xác một nhánh với tùy chọn --set-upstream." - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy “%s” về\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Không thể lấy“%s” về" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "không thể lấy “%s” (mã thoát: %d)\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "" +"--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions." +"partialClone" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14027,44 +12994,44 @@ msgstr "" "Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" "tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14079,23 +13046,23 @@ msgstr "" "git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-" "tin>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 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”" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "bí danh cho --log (không được dùng)" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "văn bản" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "dùng <văn bản thường> để bắt đầu ghi chú" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "tập tin để đọc dữ liệu từ đó" @@ -14161,32 +13128,32 @@ msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển gi msgid "print only refs which don't contain the commit" msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "không hiểu" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "lỗi trong %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "có cảnh báo trong %s %s: %s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "liên kết gãy từ %7s %s" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "kiểu đối tượng sai trong liên kết" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -14195,216 +13162,216 @@ msgstr "" "liên kết gãy từ %7s %s \n" " tới %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "thiếu %s %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "không tiếp cận được %s %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "dangling %s %s" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "không thể tạo lost-found" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "không thể hoàn thành “%s”" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Đang kiểm tra %s" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Đang kiểm tra kết nối (%d đối tượng)" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Đang kiểm tra %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "các liên kết bị gẫy" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "gốc %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "đã đánh thẻ %s %s (%s) trong %s" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: đối tượng thiếu hay hỏng" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: mục reflog không hợp lệ %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: con trỏ sha1 không hợp lệ %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: không phải là một lần chuyển giao" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "cảnh báo: Không có các tham chiếu mặc định" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: thiếu đối tượng hoặc hỏng: %s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: không thể phân tích cú đối tượng: %s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "tập tin sha1 sai: %s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Đang kiểm tra thư mục đối tượng" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Đang kiểm tra các thư mục đối tượng" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Đang lấy liên kết %s" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "%s không hợp lệ" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s chỉ đến thứ gì đó xa lạ (%s)" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD đã tách rời không chỉ vào đâu cả" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Đang kiểm tra cây nhớ tạm" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: con trỏ sha1 không hợp lệ trong cache-tree" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "non-tree trong cache-tree" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "hiển thị các đối tượng không thể đọc được" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "hiển thị các đối tượng không được quản lý" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "báo cáo các thẻ" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "báo cáo node gốc" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "tạo “index objects head nodes”" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "tạo “reflogs head nodes” (mặc định)" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "cũng cân nhắc đến các đối tượng gói và thay thế" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "chỉ kiểm tra kết nối" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "cho phép kiểm tra hạn chế hơn" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "ghi các đối tượng không được quản lý trong .git/lost-found" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "hiển thị quá trình" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "hiển thị tên chi tiết cho các đối tượng đọc được" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Đang kiểm tra các đối tượng" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s: thiếu đối tượng" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s”" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<các tùy chọn>]" @@ -14418,17 +13385,17 @@ msgstr "Gặp lỗi khi lấy thông tin thống kê về tập tin %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "gặp lỗi khi phân tích “%s” giá trị “%s”" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "không thể lấy thông tin thống kê về “%s”" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14443,54 +13410,54 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "xóa bỏ các đối tượng không được tham chiếu" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "cẩn thận hơn nữa (tăng thời gian chạy)" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "bật chế độ auto-gc" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "đóng gói lại tất cả các gói khác ngoại trừ gói lớn nhất" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "gặp lỗi khi phân tích giá trị gc.logexpiry %s" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "gặp lỗi khi phân tích giá trị prune %s" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm " "việc.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14498,14 +13465,14 @@ msgstr "" "gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không " "phải thế)" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” " "để xóa bỏ chúng đi." -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<các tùy chọn>] [-e] <mẫu> [<rev>…] [[--] </đường/dẫn>…]" @@ -14523,259 +13490,259 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "không hỗ trợ đa tuyến, bỏ qua %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "không thể đọc cây (%s)" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyển đến “%c” cần một giá trị bằng số" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "tìm trong bảng mục lục thay vì trong cây làm việc" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "tìm trong nội dung không được quản lý bởi git" -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "tìm kiếm đệ quy trong từng mô-đun-con" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "hiển thị những dòng không khớp với mẫu" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "phân biệt HOA/thường" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "chỉ khớp mẫu tại đường ranh giới từ" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "xử lý tập tin nhị phân như là dạng văn bản thường" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "không khớp mẫu trong các tập tin nhị phân" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "tìm kiếm trong thư mục con (mặc định)" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "hạ xuống ít nhất là mức <sâu>" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "dùng biểu thức chính qui POSIX có mở rộng" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "diễn dịch các mẫu như là chuỗi cố định" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "sử dụng biểu thức chính quy tương thích Perl" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "hiển thị số của dòng" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "hiển thị số cột của khớp với mẫu đầu tiên" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "không hiển thị tên tập tin" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "hiển thị các tên tập tin" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "đồng nghĩa với --files-with-matches" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "thêm NUL vào sau tên tập tin" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "tô sáng phần khớp mẫu" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "" "hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "hiển thị <n> dòng nội dung trước khớp" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "hiển thị <n> dòng nội dung sau khớp" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "dùng <n> tuyến trình làm việc" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "dạng viết tắt của -C SỐ" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "hiển thị dòng vói tên hàm trước các lần khớp" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "hiển thị hàm bao quanh" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "đọc mẫu từ tập-tin" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "match <mẫu>" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e" -#: builtin/grep.c:904 +#: builtin/grep.c:914 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" -#: builtin/grep.c:906 +#: builtin/grep.c:916 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" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "dàn trang" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "hiển thị các tập tin khớp trong trang giấy" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "chưa chỉ ra mẫu" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index hay --untracked không được sử dụng cùng với revs" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "không thể phân giải điểm xét duyệt: %s" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "tùy chọn --untracked không được hỗ trợ với --recurse-submodules" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "không hỗ trợ đa tuyến, bỏ qua --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "số tuyến chỉ ra không hợp lệ (%d)" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc" -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "tùy chọn không được hỗ trợ với --recurse-submodules" + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached hay --untracked không được sử dụng với --no-index" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "cả hai --cached và các cây phải được chỉ ra" @@ -14958,11 +13925,11 @@ msgstr "lỗi đọc ở đầu vào" msgid "used more bytes than were available" msgstr "sử dụng nhiều hơn số lượng byte mà nó sẵn có" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "gói đã vượt quá cỡ tối đa được phép" @@ -15017,187 +13984,187 @@ msgstr[0] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte" msgid "serious inflate inconsistency" msgstr "sự mâu thuẫn xả nén nghiêm trọng" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "không thể đọc %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "không thể đọc thông tin đối tượng sẵn có %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "không thể đọc đối tượng đã tồn tại %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "đối tượng blob không hợp lệ %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "lỗi fsck trong đối tượng đóng gói" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể với tới được" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "gặp lỗi khi áp dụng delta" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "Đang nhận về các đối tượng" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "Các đối tượng bảng mục lục" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "gói bị sai hỏng (SHA1 không khớp)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "không thể lấy thông tin thống kê packfile" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "pack có phần thừa ở cuối" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "lộn xộn hơn cả điên rồ khi chạy hàm parse_pack_objects()" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "Đang phân giải các delta" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "không thể tạo tuyến: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "lộn xộn hơn cả điên rồ" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "đầy đủ với %d đối tượng nội bộ" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Gặp tổng kiểm tra tail không cần cho %s (đĩa hỏng?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "gói có %d delta chưa được giải quyết" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "không thể xả nén đối tượng nối thêm (%d)" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "đối tượng nội bộ %s bị hỏng" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằng đuôi “.pack”" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "không thể ghi %s tập tin “%s”" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "không thể đóng tập tin được ghi %s “%s”" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "gặp lỗi trong khi đóng tập tin gói" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "không thể lưu tập tin gói" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "không thể lưu trữ tập tin ghi mục lục" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "sai pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Không thể mở tập tin gói đã sẵn có “%s”" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Không thể mở tập tin idx của gói cho “%s”" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "không delta: %d đối tượng" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "chiều dài xích = %d: %lu đối tượng" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "%s sai" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin cần một kho git" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "lỗi fsck trong các đối tượng gói" @@ -15380,126 +14347,121 @@ msgstr "--trailer cùng với --only-input không hợp lý" msgid "no input file given for in-place editing" msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<các tùy chọn>] [<vùng-xem-xét>] [[--] </đường/dẫn>…]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<các tùy chọn>] <đối-tượng>…" -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "tùy chọn--decorate không hợp lệ: %s" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "hiển thị mã nguồn" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Sử dụng tập tin ánh xạ thư" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "không tô sáng các tham chiếu khớp với <mẫu>" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "các tùy chọn trang trí" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: sai tập tin" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "không thể đọc đối tượng %s" -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "không nhận ra kiểu: %d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s: bao bọc không hợp lệ từ chế độ mô tả" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "tên của thư mục kết xuất quá dài" -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "không thể mở tập tin miếng vá: %s" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "cần chính xác một vùng" -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "không phải là một vùng" -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "“cover letter” cần cho định dạng thư" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "gặp lỗi khi tạo các tập tin cover-letter" -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:1255 +#: builtin/log.c:1186 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>]" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "hai thư mục kết xuất?" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "không hiểu lần chuyển giao %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ" -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "không tìm thấy nền hòa trộn chính xác" -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15510,279 +14472,271 @@ msgstr "" "nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n" "\"--base=<base-commit-id>\" một cách thủ công" -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "gặp lỗi khi tìm nền hòa trộn chính xác" -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt" -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt" -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "không thể lấy mã miếng vá" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "gặp lỗi khi suy luận range-diff (vùng khác biệt)" -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Dùng [RFC VÁ] thay cho [VÁ]" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "cover-from-description-mode" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "xuất mọi mã băm all-zero trong phần đầu From" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "thụt lề" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "lần_chuyển_giao_nền" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "thêm chữ ký từ một tập tin" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá " "đơn" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "tỷ lệ phần trăm theo cái tạo là weighted" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "dòng thụt lề không hợp lệ: %s" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n và -k loại từ lẫn nhau" -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc và -k xung khắc nhau" -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?" -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff cần --cover-letter hoặc vá đơn" -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff dựa trên v%d:" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor yêu cầu --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn" -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff dựa trên v%d:" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "không thể đọc tập tin chữ ký “%s”" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "Đang tạo các miếng vá" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "gặp lỗi khi tạo các tập tin kết xuất" -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15911,7 +14865,7 @@ msgstr "" msgid "do not print remote URL" msgstr "không hiển thị URL máy chủ" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "thực thi" @@ -15996,150 +14950,150 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "switch “m” yêu cầu một giá trị" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "tùy chọn “%s” yêu cầu một giá trị" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "Các chiến lược sẵn sàng là:" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "Các chiến lược tùy chỉnh sẵn sàng là:" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "(đồng nghĩa với --stat)" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "sửa chú thích trước khi chuyển giao" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "cho phép chuyển-tiếp-nhanh (mặc định)" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "chiến lược" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "chiến lược hòa trộn sẽ dùng" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "tùy_chọn=giá_trị" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "tùy chọn cho chiến lược hòa trộn đã chọn" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-" "nhanh)" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện" -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "--abort nhưng để lại bảng mục lục và cây làm việc" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "cho phép hòa trộn lịch sử không liên quan" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "vòng qua móc (hook) pre-merge-commit và commit-msg" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" +msgstr "thẩm tra móc (hook) commit-msg" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "không thể chạy stash." -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "lệnh tạm cất gặp lỗi" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "không phải là một đối tượng hợp lệ: %s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "read-tree gặp lỗi" -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " (không có gì để squash)" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Squash commit -- không cập nhật HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "“%s” không chỉ đến một lần chuyển giao nào cả" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuỗi branch.%s.mergeoptions sai: %s" @@ -16195,75 +15149,75 @@ msgstr "" "Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n" "thích rỗng sẽ hủy bỏ lần chuyển giao.\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "Tuyệt vời.\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết " "quả.\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "Không phải nhánh hiện hành." -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hành." -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành." -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Không nhánh mạng theo dõi cho %s từ %s" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Giá trị sai “%s” trong biến môi trường “%s”" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort không nhận các đối số" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" "Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "--quit không nhận các đối số" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue không nhận đối số" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16271,7 +15225,7 @@ msgstr "" "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16279,98 +15233,98 @@ msgstr "" "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" "Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn." -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "Bạn không thể kết hợp --squash với --no-ff." -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "Bạn không thể kết hợp --squash với --commit." -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt." -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "" "Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "từ chối hòa trộn lịch sử không liên quan" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "Đã cập nhật rồi." -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "Đã cập nhật rồi. Yeeah!" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua." -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Đang tua lại cây thành thời xa xưa…\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s…\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16457,32 +15411,32 @@ msgstr "không cảnh báo về các xung đột xảy ra" msgid "set labels for file1/orig-file/file2" msgstr "đặt nhãn cho tập-tin-1/tập-tin-gốc/tập-tin-2" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "không hiểu tùy chọn %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "không thể phân tích đối tượng “%s”" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "không thể xử lý nhiều hơn %d nền. Bỏ qua %s." -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "không xử lý gì ngoài hai head hòa trộn." -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "không thể phân giải tham chiếu %s" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "Đang hòa trộn %s với %s\n" @@ -16505,17 +15459,17 @@ msgstr "cho phép tạo nhiều hơn một cây" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [<các-tùy-chọn>] (write|verify|expire|repack --batch-" -"size=<cỡ>)" +"git multi-pack-index [--object-dir=<thư/mục>] (write|verify|expire|repack --" +"batch-size=<cỡ>)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "thư mục đối tượng có chứa một bộ các tập tin gói và cặp pack-index" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -16523,15 +15477,15 @@ msgstr "" "trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn " "vào một bó cái mà lớn hơn kích thước này" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "có quá nhiều đối số" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "tùy chọn --batch-size chỉ cho lệnh con 'repack'" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "không hiểu câu lệnh con: %s" @@ -16624,53 +15578,53 @@ msgstr "%s, nguồn=%s, đích=%s" msgid "Renaming %s to %s\n" msgstr "Đổi tên %s thành %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "gặp lỗi khi đổi tên “%s”" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<các tùy chọn>] <commit>…" -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<các tùy chọn>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<các tùy chọn>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "chỉ hiển thị tên (không SHA-1)" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "chỉ dùng các thẻ để đặt tên cho các lần chuyển giao" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "chỉ sử dụng các tham chiếu khớp với <mẫu>" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "bỏ qua các tham chiếu khớp với <mẫu>" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "" "liệt kê tất cả các lần chuyển giao có thể đọc được từ tất cả các tham chiếu" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "đọc từ đầu vào tiêu chuẩn" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "cho phép in các tên “chưa định nghĩa” (mặc định)" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "bãi bỏ tham chiếu các thẻ trong đầu vào (dùng nội bộ)" @@ -17068,7 +16022,7 @@ msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "không gỡ bỏ, chỉ hiển thị" @@ -17084,7 +16038,7 @@ msgstr "notes-ref" msgid "use notes from <notes-ref>" msgstr "dùng “notes” từ <notes-ref>" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "không hiểu câu lệnh con: %s" @@ -17103,103 +16057,126 @@ msgstr "" "git pack-objects [các tùy chọn…] <base-name> [< <danh-sách-ref> | < <danh-" "sách-đối-tượng>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "CRC của đối tượng gói sai với %s" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "đối tượng đã đóng gói sai hỏng cho %s" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "dò thấy delta đệ quy cho đối tượng %s" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "tập tin gói không hợp lệ: %s" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "không thể mở tập tin gói để dùng lại: %s" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "không thể di chuyển vị trí đọc trong tập tin gói dùng lại" + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "không thể đọc từ tập tin gói dùng lại" + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Đang ghi lại các đối tượng" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "gặp lỗi khi lấy thông tin thống kê về %s" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "Đang đếm các đối tượng" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "không thể lấy kích cỡ của %s" + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "không thể phân tích phần đầu đối tượng của “%s”" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "không thể đọc đối tượng %s" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với " "%<PRIuMAX>)" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - hết bộ nhớ" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "Nén delta dùng tới %d tuyến trình" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "Đang nén các đối tượng" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "mâu thuẫn với số lượng delta" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17208,7 +16185,7 @@ msgstr "" "cần ID đối tượng cạnh, nhận được rác:\n" " %s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17217,235 +16194,247 @@ msgstr "" "cần ID đối tượng, nhận được rác:\n" " %s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "giá trị cho --missing không hợp lệ" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "không thể mở mục lục của gói" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "đối tượng mất tại %s không thể đã kiểm tra" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "không thể buộc mất đối tượng" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "không phải một rev “%s”" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "điểm xem xét sai “%s”" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "không thể thêm các đối tượng mới dùng" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "phiên bản mục lục không được hỗ trợ %s" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "phiên bản mục lục sai “%s”" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "không hiển thị bộ đo tiến trình" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "hiển thị bộ đo tiến trình" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<phiên bản>[,offset]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "kcíh thước tối đa cho tập tin gói được tạo" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "bỏ qua các đối tượng đóng gói" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "giới hạn cửa sổ đóng gói theo đối tượng" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "dùng lại các delta sẵn có" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "dùng lại các đối tượng sẵn có" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "dùng các đối tượng OFS_DELTA" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 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" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "không thể tạo kết xuất gói trống rỗng" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "xuất gói ra đầu ra tiêu chuẩn" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "giữ lại các đối tượng không thể đọc được" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "pack mất các đối tượng không thể đọc được" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "" "xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" -msgstr "sử dụng thuật toán “sparse reachability”" +msgstr "dung thuật toán “sparse reachability”" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "tạo gói nhẹ" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "tạo gói để phù hợp cho lấy về nông (shallow)" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "bỏ qua gói này" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "mức nén gói" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "không ẩn các lần chuyển giao bởi “grafts”" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "ghi một mục lục ánh xạ cùng với mục lục gói" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "ghi mục lục ánh xạ nếu được" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "xử lý cho thiếu đối tượng" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "tôn trọng island trong suốt quá trình nén “delta”" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "không thể dùng tùy chọn --filter mà không có --stdout" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "Đánh số các đối tượng" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" -msgstr "" -"Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>)" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17487,53 +16476,53 @@ msgstr "giới hạn giao đến các đối tượng nằm ngoài các tập ti msgid "cannot prune in a precious-objects repo" msgstr "không thể tỉa bớt trong một kho đối_tượng_vĩ_đại" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Giá trị không hợp lệ %s: %s" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<các tùy chọn>] [<kho-chứa> [<refspec>…]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "điều khiển việc lấy về đệ quy của các mô-đun-con" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "Các tùy chọn liên quan đến hòa trộn" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "các thay đổi hợp nhất bằng cải tổ thay vì hòa trộn" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "cho phép chuyển-tiếp-nhanh" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "Các tùy chọn liên quan đến lệnh lấy về" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "ép buộc ghi đè lên nhánh nội bộ" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "số lượng mô-đun-con được đẩy lên đồng thời" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Giá trị không hợp lệ cho pull.ff: %s" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -17541,14 +16530,14 @@ msgstr "" "Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa " "lấy về." -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy " "về." -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17557,7 +16546,7 @@ msgstr "" "tự\n" "đại diện mà nó lại không khớp trên điểm cuối máy phục vụ." -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17569,43 +16558,43 @@ msgstr "" "theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n" "một nhánh trên dòng lệnh." -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Hiện tại bạn chẳng ở nhánh nào cả." -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại." -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào." -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "Xem git-pull(1) để biết thêm chi tiết." -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<máy chủ>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<nhánh>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành." -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17614,34 +16603,34 @@ msgstr "" "Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n" "từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về." -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "không thể truy cập lần chuyển giao “%s”" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "bỏ qua --verify-signatures khi rebase" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase." -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào " "bảng mục lục." -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "pull với rebase" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng." -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17652,7 +16641,7 @@ msgstr "" "đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n" "lần chuyển giaot %s." -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17670,15 +16659,15 @@ msgstr "" "$ git reset --hard\n" "để khôi phục lại." -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng." -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh." -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ" @@ -17687,15 +16676,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<các tùy chọn>] [<kho-chứa> [<refspec>…]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "dùng tốc ký thẻ không có <thẻ>" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete chỉ chấp nhận các tên tham chiếu dạng thường" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17704,7 +16693,7 @@ msgstr "" "Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help " "config”." -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17729,7 +16718,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17744,7 +16733,7 @@ msgstr "" "\n" " git push %s HEAD:<tên-của-nhánh-máy-chủ>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17758,12 +16747,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Nhánh hiện tại %s có nhiều nhánh thượng nguồn, từ chối push." -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17775,14 +16764,14 @@ msgstr "" "nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n" "để cập nhật nhánh máy chủ nào." -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không " "là gì cả\"." -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17795,7 +16784,7 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17809,7 +16798,7 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17824,11 +16813,11 @@ msgstr "" "Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi " "tiết." -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ." -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -17840,140 +16829,140 @@ msgstr "" "đối tượng\n" "không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "Đang đẩy lên %s\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "repository (kho) sai “%s”" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Chưa cấu hình đích để đẩy lên.\n" +"Hoặc là chỉ ra URL từ dòng lệnh hoặc là cấu hình một kho máy chủ sử dụng\n" +"\n" +" git remote add <tên> <url>\n" +"\n" +"và sau đó đẩy lên sử dụng tên máy chủ\n" +"\n" +" git push <tên>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "kho" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "đẩy tất cả các tham chiếu" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "mirror tất cả các tham chiếu" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "xóa các tham chiếu" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<tên-tham-chiếu>:<cần>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "chương trình nhận gói" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn cho git pull/status" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "xén tỉa những tham chiếu bị gỡ bỏ" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "vòng qua móc tiền-đẩy (pre-push)" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "ký lần đẩy dùng GPG" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "repository (kho) sai “%s”" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Chưa cấu hình đích để đẩy lên.\n" -"Hoặc là chỉ ra URL từ dòng lệnh hoặc là cấu hình một kho máy chủ sử dụng\n" -"\n" -" git remote add <tên> <url>\n" -"\n" -"và sau đó đẩy lên sử dụng tên máy chủ\n" -"\n" -" git push <tên>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "các tùy chọn push phải không có ký tự dòng mới" @@ -17990,32 +16979,24 @@ msgstr "git range-diff [<các tùy chọn>] <old-tip>…<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<các tùy chọn>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "Tỷ lệ phần trăm cái tạo là weighted" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "dùng màu diff đơn giản" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "ghi chú" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "chuyển cho “git log”" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "không có .. trong vùng: “%s”" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "định dạng đối số đơn phải là một vùng đối xứng" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "cần hai vùng lần chuyển giao" @@ -18099,17 +17080,13 @@ msgstr "gỡ lỗi “unpack-trees”" msgid "suppress feedback messages" msgstr "không xuất các thông tin phản hồi" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "Bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase> | --keep-" -"base] [<upstream>] [<nhánh>]]" +"git rebase [-i] [các tùy chọn] [--exec <lệnh>] [--onto <newbase>] " +"[<upstream>] [<nhánh>]" #: builtin/rebase.c:34 msgid "" @@ -18122,207 +17099,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "danh sách cần làm không dùng được: “%s”" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "không thể ghi “%s”." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "không HEAD?" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "không thể tạo %s tạm thời" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "không thể đánh dấu là tương tác" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "không thể tạo danh sách cần làm" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "lần chuyển giao cơ sỏ phải được chỉ định với --upstream hoặc --onto" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<các tùy chọn>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(CŨ) giữ lại các lần chuyển giao rỗng" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "giữ lại các lần chuyển giao rỗng" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "chấp nhận chuyển giao mà không ghi chú gì" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "cải tổ các lần chuyển giao hòa trộn" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "giữ các điểm nhánh nguyên bản của các anh em họ" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "ký các lần chuyển giao" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "hiển thị một diffstat của những thay đổi thượng nguồn" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "tiếp tục cải tổ" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "bỏ qua lần chuyển giao" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "sửa danh sách cần làm" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "hiển thị miếng vá hiện hành" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "rút ngắn mã chuyển giao trong danh sách cần làm" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "khai triển mã chuyển giao trong danh sách cần làm" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "kiểm tra danh sách cần làm" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "sắp xếp lại các dòng fixup/squash" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "chèn các lệnh thực thi trong danh sách cần làm" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "lên trên" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "điểm-xét-duyệt-hạn-chế" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "điểm xét duyệt hạn chế" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "squash-lên-trên" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "squash lên trên" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "lần chuyển giao thượng nguồn" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "tên-đầu" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "tên đầu" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "chiến lược cải tổ" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "tùy-chọn-chiến-lược" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "các tùy chọn chiến lược" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "chuyển-đến" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "nhánh hay lần chuyển giao lần lấy ra" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "tên lên trên" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "lệnh" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "lệnh muốn chạy" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s cần một cải tổ kiểu tương tác" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "không thể đặt lấy “onto”: “%s”" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head không hợp lệ: “%s”" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "đang bỏ qua allow_rerere_autoupdate không hợp lệ: “%s”" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Không thể đọc “%s”" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "Không thể lưu “%s”" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "không thể dò tìm điểm xét duyệt HEAD" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18337,7 +17323,7 @@ msgstr "" "Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase " "--abort\"." -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18356,16 +17342,7 @@ msgstr "" "\n" "Kết quả là git không thể cải tổ lại chúng." -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "" -"kiểu rỗng không được nhận dạng '%s'; giá trị hợp lệ là \"drop\", \"keep\", " -"và \"ask\"." - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18382,7 +17359,7 @@ msgstr "" " git rebase “<nhánh>”\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18396,137 +17373,128 @@ msgstr "" " git branch --set-upstream-to=%s/<nhánh> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "lệnh thực thi trống rỗng" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "" -"sử dụng các cơ sở hòa trộn của thượng nguồn và nhánh như là cơ sở hiện tại" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "cho phép móc (hook) pre-rebase được chạy" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "hãy im lặng. ý là --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "thêm dòng Signed-off-by: cho từng lần chuyển giao" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" msgstr "chuyển cho “git am”" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "chuyển cho “git apply”" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "" "cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "tiếp tục" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "bỏ qua miếng vá hiện hành và tiếp tục" -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "bãi bỏ và lấy ra nhánh nguyên thủy" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "bãi bỏ nhưng vẫn vẫn giữ HEAD chỉ đến nó" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "sửa danh sách cần làm trong quá trình “rebase” (cải tổ) tương tác" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "dùng chiến lược áp dụng để cải tổ" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "dùng chiến lược hòa trộn để cải tổ" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "để người dùng sửa danh sách các lần chuyển giao muốn cải tổ" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(ĐÃ LẠC HẬU) hay thử tạo lại các hòa trộn thay vì bỏ qua chúng" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "xử lý các lần chuyển giao mà nó trở thành trống rỗng như thế nào" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "ngăn cấm các lần chuyển giao trống rỗng trong suốt quá trình cải tổ" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "tự động stash/stash pop trước và sau" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "cố thử cải tổ các hòa trộn thay vì bỏ qua chúng" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "dùng “merge-base --fork-point” để định nghĩa lại thượng nguồn" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "dùng chiến lược hòa trộn đã cho" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "tùy chọn" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "chuyển thao số đến chiến lược hòa trộn" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "cải tổ tất các các lần chuyển giao cho đến root" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18534,41 +17502,33 @@ msgstr "" "việc hỗ trợ rebase.useBuiltin đã bị xóa!\n" "Xem mục tin của nó trong “ git help config” để biết chi tiết." -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" "Hình như đang trong quá trình thực hiện lệnh “git-am”. Không thể rebase." -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay " "thế." -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "không thể kết hợp “--keep-base” với “--onto”" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "không thể kết hợp “--keep-base” với “--root”" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "Không có tiến trình rebase nào phải không?" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch " "sử) tương tác." -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "Không thể đọc HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18576,16 +17536,16 @@ msgstr "" "Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n" "đó đánh dấu chúng là cần xử lý sử dụng lệnh git add" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "không thể loại bỏ các thay đổi cây-làm-việc" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "không thể quay trở lại %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18606,164 +17566,173 @@ msgstr "" "và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n" "có một số thứ quý giá ở đây.\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "tùy chọn “%c” cần một giá trị bằng số" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "Không hiểu chế độ: %s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy cần --merge hay --interactive" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -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" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "Không hiểu ứng dụng chạy phía sau lệnh cải tổ: %s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec cần --exec hay --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "" +"không thể tổ hợp các tùy chọn am với các tùy chọn tương tác hay hòa trộn" + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "không thể kết hợp “--rebase-merges” với “--strategy-option”" + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "không thể kết hợp “--rebase-merges” với “--strategy”" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "thượng nguồn không hợp lệ “%s”" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "Không thể tạo lần chuyển giao gốc mới" -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "“%s”: cần chính xác một cơ sở hòa trộn với nhánh" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "“%s”: cần chính xác một cơ sở hòa trộn" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s”" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Không có tham chiếu nào như thế: %s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "Không thể autostash" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Gặp đáp ứng stash không cần: “%s”" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "Không thể tạo thư mục cho “%s”" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "Đã tạo autostash: %s\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "không thể reset --hard" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD hiện giờ tại %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng." -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "không thể phân tích cú pháp “%s”" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "không thể chuyển đến %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD đã cập nhật." -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase." -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "Móc (hook) pre-rebase từ chối rebase." -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "Thay đổi thành %s:\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "Thay đổi từ %s thành %s:\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "Không thể tách rời HEAD" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Chuyển-tiếp-nhanh %s đến %s.\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <thư-mục-git>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18793,7 +17762,7 @@ msgstr "" "Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n" "biến cấu hình “receive.denyCurrentBranch” thành “refuse”." -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18844,49 +17813,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <tham_chiếu>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "“%s” không phải là dấu thời gian hợp lệ" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "Đánh dấu các đối tượng tiếp cận được…" -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "%s chẳng chỉ đến đâu cả!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "chưa chỉ ra reflog để xóa" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "không phải một reflog: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "không reflog cho “%s”" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "định dạng tham chiếu không hợp lệ: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18894,82 +17863,82 @@ msgstr "" "git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <tên> <url>" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <tên-cũ> <tên-mới>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <tên>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <tên>" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <tên>" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<nhóm> | <máy-chủ>)…]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <tên> <nhánh>…" -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote set-url [--push] [--all] <tên>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <tên> <url-mới>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <tên> <url>" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<các tùy chọn>] <tên> <url>" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <tên> <nhánh>…" -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <tên> <nhánh>…" -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<các tùy chọn>] <tên>" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<các tùy chọn>] <tên>" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<các tùy chọn>] [<nhóm> | <máy-chủ>]…" -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "Đang cập nhật %s" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18977,98 +17946,82 @@ msgstr "" "--mirror nguy hiểm và không dùng nữa; xin hãy\n" "\t sử dụng tùy chọn --mirror=fetch hoặc --mirror=push để thay thế" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "không hiểu tham số máy bản sao (mirror): %s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "lấy về các nhánh từ máy chủ" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy về" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "hoặc không lấy về bất kỳ thẻ nào (--no-tags)" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "các nhánh để theo dõi" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "nhánh master" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "đang chỉ định một nhánh master không hợp lý với tùy chọn --mirror" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror”" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "máy chủ %s đã tồn tại rồi." -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "“%s” không phải tên máy chủ hợp lệ" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "Không thể cài đặt nhánh master “%s”" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Không thể lấy ánh xạ (map) fetch cho đặc tả tham chiếu %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "(khớp)" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "(xóa)" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "không thể đặt “%s”" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"Cấu hình %s remote.pushDefault trong:\n" -"\t%s:%d\n" -"bây giờ tên trên máy chủ không tồn tại '%s'" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "Không có máy chủ nào như vậy: “%s”" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Không thể đổi tên phần của cấu hình từ “%s” thành “%s”" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19079,17 +18032,17 @@ msgstr "" "\t%s\n" "\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết." -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "gặp lỗi khi xóa “%s”" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "gặp lỗi khi tạo “%s”" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19101,119 +18054,119 @@ msgstr[0] "" "đi;\n" "để xóa đi, sử dụng:" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "Không thể gỡ bỏ phần cấu hình “%s”" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " được theo dõi" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge không hợp lệ; không thể cải tổ về phía > 1 nhánh" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "thực hiện rebase một cách tương tác trên máy chủ %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" "thực hiện cải tổ (với các hòa trộn) một cách tương tác lên trên máy chủ %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "thực hiện rebase trên máy chủ %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " hòa trộn với máy chủ %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "hòa trộn với máy chủ %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s và với máy chủ %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "tạo" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "xóa" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "đã cập nhật" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "có-thể-chuyển-tiếp-nhanh" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "dữ liệu nội bộ đã cũ" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s ép buộc thành %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s đẩy lên thành %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s ép buộc thành %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s đẩy lên thành %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "không truy vấn các máy chủ" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* máy chủ %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " URL để lấy về: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(không có URL)" @@ -19221,181 +18174,190 @@ msgstr "(không có URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " URL để đẩy lên: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "(không yêu cầu)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "(không hiểu)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Những nhánh trên máy chủ:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "xóa refs/remotes/<tên>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "Không thể xác định được HEAD máy chủ" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "Không thể xóa bỏ %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "Không phải là tham chiếu hợp lệ: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "Không thể cài đặt %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s sẽ trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s đã trở thành không đầu (không được quản lý)!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "Đang xén bớt %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [nên xén bớt] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [đã bị xén] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "cắt máy chủ sau khi lấy về" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "Không có máy chủ nào có tên “%s”" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "thêm nhánh" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "chưa chỉ ra máy chủ nào" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "truy vấn đẩy URL thay vì lấy" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "trả về mọi URL" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, 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”" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "đẩy các “URL” bằng tay" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "thêm URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "xóa URLs" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete không hợp lý" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "Không tìm thấy URL như vậy: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "Sẽ không xóa những địa chỉ URL không-push" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "chi tiết; phải được đặt trước một lệnh-con" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Không hiểu câu lệnh con: %s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<các tùy chọn>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19403,115 +18365,115 @@ msgstr "" "Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n" "--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps." -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "" "không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối " "tượng hứa hẹn" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Đang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-" "objects." -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn" -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "đóng gói mọi thứ trong một gói đơn" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "chuyển --no-reuse-delta cho git-pack-objects" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "chuyển --no-reuse-object cho git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "không chạy git-update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "chuyển --local cho git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "ghi mục lục ánh xạ" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "chuyển --delta-islands cho git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "ngày ước tính" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "với -a, đóng gói lại các đối tượng không thể đọc được" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "kích thước cửa sổ được dùng cho nén “delta”" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "byte" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "giới hạn độ sâu tối đa của “delta”" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "giới hạn số lượng tối đa tuyến trình" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "kích thước tối đa cho từng tập tin gói" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "đừng đóng gói lại gói này" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable và -A xung khắc nhau" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "Không có gì mới để mà đóng gói." -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19530,7 +18492,7 @@ msgstr "" "CẢNH BÁO: nguyên gốc của nó cũng gặp lỗi.\n" "CẢNH BÁO: Vui lòng đổi tên chúng trong %s bằng tay:\n" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "gặp lỗi khi gỡ bỏ “%s”" @@ -19638,8 +18600,8 @@ msgstr "không thể fstat %s" msgid "unable to write object to database" msgstr "không thể ghi đối tượng vào cơ sở dữ liệu" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "không phải là tên đối tượng hợp lệ: “%s”" @@ -19658,22 +18620,22 @@ msgstr "việc sửa tập tin đối tượng gặp lỗi" msgid "new object is the same as the old one: '%s'" msgstr "đối tượng mới là giống với cái cũ: “%s”" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "không thể phân tích %s như là một lần chuyển giao" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "thẻ hòa trộn sai trong lần chuyển giao “%s”" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "thẻ hòa trộn không đúng dạng ở lần chuyển giao “%s”" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -19682,31 +18644,31 @@ msgstr "" "lần chuyển giao gốc “%s” có chứa thẻ hòa trộn “%s” cái mà bị loại bỏ; dùng " "tùy chọn --edit thay cho --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "lần chuyển giao gốc “%s” có chữ ký GPG" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "chữ ký sẽ được bỏ đi trong lần chuyển giao thay thế!" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "không thể ghi lần chuyển giao thay thế cho: “%s”" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft cho “%s” không cần thiết" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "lần chuyển giao mới là giống với cái cũ: “%s”" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19715,71 +18677,71 @@ msgstr "" "không thể chuyển đổi các graft sau đây:\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "liệt kê các refs thay thế" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "xóa tham chiếu thay thế" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "sửa đối tượng sẵn có" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "thay đổi cha mẹ của lần chuyển giao" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "chuyển đổi các tập tin graft sẵn có" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "thay thế tham chiếu nếu nó đã sẵn có" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "đừng in đẹp các nội dung cho --edit" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "dùng định dạng này" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format không thể được dùng khi không liệt kê gì" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f chỉ hợp lý khi ghi một cái thay thế" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw chỉ hợp lý với --edit" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d cần ít nhất một tham số" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "số đối số không đúng" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e cần chính các là một đối số" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-q cần ít nhất một tham số" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file không nhận đối số" -#: builtin/replace.c:617 +#: builtin/replace.c:615 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" @@ -19808,126 +18770,115 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<tree-ish>] [--] <đặc/tả/đường/dẫn>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<tree-ish>] [--] </các/đường/dẫn>…" #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "git reset --patch [<tree-ish>] [--] [<đặc/tả/đường/dẫn>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<tree-ish>] [--] [</các/đường/dẫn>…]" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "pha trộn" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "mềm" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "cứng" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "hòa trộn" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "giữ lại" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "Bạn không có HEAD nào hợp lệ." -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "Gặp lỗi khi tìm cây của HEAD." -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "Gặp lỗi khi tìm cây của %s." -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD hiện giờ tại %s" - -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Không thể thực hiện một %s reset ở giữa của quá trình hòa trộn." -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "đặt lại (reset) HEAD và bảng mục lục" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "chỉ đặt lại (reset) HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "đặt lại HEAD, bảng mục lục và cây làm việc" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "chỉ ghi lại những đường dẫn thực sự sẽ được thêm vào sau này" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ." -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ." -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khắc với --{hard,mixed,soft}" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed với các đường dẫn không còn dùng nữa; hãy thay thế bằng lệnh “git " "reset -- </các/đường/dẫn>”." -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Không thể thực hiện lệnh %s reset với các đường dẫn." -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset không được phép trên kho thuần" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N chỉ được dùng khi có --mixed" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -19941,30 +18892,35 @@ msgstr "" "Bạn có thể sử dụng để tránh việc này. Đặt reset.quiet thành true trong\n" "cài đặt config nếu bạn muốn thực hiện nó như là mặc định.\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Không thể đặt lại (reset) bảng mục lục thành điểm xét duyệt “%s”." -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Không thể ghi tập tin lưu bảng mục lục mới." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "không thể tổ hợp --exclude-promisor-objects và --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "lọc đối tượng yêu cầu --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "giá trị sparse không hợp lệ “%s”" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list không hỗ trợ hiển thị các ghi chú" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "được đánh dấu đếm là xung khắc với --objects" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "không thể tổ hợp --use-bitmap-index với lọc đối tượng" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -20123,41 +19079,37 @@ msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "những tập tin sau đây có những thay đổi nội bộ:" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "không liệt kê các tập tin đã gỡ bỏ" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "chỉ gỡ bỏ từ mục lục" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "ghi đè lên kiểm tra cập nhật" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "cho phép gỡ bỏ đệ qui" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "thoát ra với trạng thái khác không thậm chí nếu không có gì khớp" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "Không đưa ra đặc tả đường dẫn. Tôi nên loại bỏ các tập tin nào?" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: không thể gỡ bỏ %s" @@ -20407,84 +19359,15 @@ msgstr "" "hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội " "bộ" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <các-tùy-chọn>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "" -"không thể phân tích cú pháp cây làm việc này (tập tin sparse-checkout có lẽ " -"không tồn tại)" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "gặp lỗi khi tạo thư mục cho tập tin sparse-checkout" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "khởi tạo sparse-checkout trong chế độ nón" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "khởi tạo sparse-checkout" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "gặp lỗi khi mở “%s”" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "không thể thường hóa đường dẫn “%s”" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "không thể bỏ trích dẫn chuỗi kiểu C “%s”" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "không thể tải các mẫu sparse-checkout" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "đọc các mẫu từ đầu vào tiêu chuẩn" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "đặt các mẫu sparse-checkout" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "tắt sparse-checkout" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "gặp lỗi khi đọc lại thư mục làm việc" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<các tùy chọn>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<các tùy chọn>] <stash>" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -20492,27 +19375,25 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <tên-nhánh> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <lời nhắn>]\n" -" [--pathspec-from-file=<tập_tin> [--pathspec-file-nul]]\n" " [--] [<đặc/tả/đường/dẫn>…]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20520,197 +19401,187 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<ghi chú>]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <ghi chú>] [-q|--quiet] <commit>" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <lời nhắn>]\n" -" [--] [<đặc/tả/đường/dẫn>…]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "“%s” không phải là lần chuyển giao kiểu-stash (cất đi)" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "Chỉ ra quá nhiều điểm xét duyệt: %s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "Không tìm thấy các mục tạm cất (stash) nào." -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "“%s” không phải một tham chiếu hợp lệ" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "" "git stash clear với các tham số là chưa được thực hiện (không nhận đối số)" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "không thể áp dụng một stash ở giữa của quá trình hòa trộn" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "không thể tạo diff %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "không thể ghi lại cây chỉ mục" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "Đang hòa trộn %s với %s" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "Bảng mục lục đã không được bỏ stash." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "gặp lỗi đọc bảng mục lục" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "Đã xóa %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Không thể xóa bỏ mục stash" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "”%s” không phải tham chiếu đến stash" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó." -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Chưa chỉ ra tên của nhánh" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "Không thể cập nhật %s với %s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "phần chú thích cho stash" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" cần một đối số <lần chuyển giao>" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Chưa có thay đổi nào được chọn" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Bạn chưa còn có lần chuyển giao khởi tạo" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Không thể ghi lại các tập tin chưa theo dõi" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 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" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 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" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "Có lẽ bạn đã quên “git add ” phải không?" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Không có thay đổi nội bộ nào được ghi lại" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Không thể khởi tạo stash" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Không thể ghi lại trạng thái hiện hành" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "giữ nguyên bảng mục lục" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "cất đi ở chế độ miếng vá" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "chế độ im lặng" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "bao gồm các tập tin không được theo dõi trong stash" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "bao gồm các tập tin bị bỏ qua" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "không thể thực thi %s" @@ -20731,40 +19602,40 @@ msgstr "giữ và xóa bỏ mọi dòng bắt đầu bằng ký tự ghi chú" msgid "prepend comment character and space to each line" msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Cần tên tham chiếu dạng đầy đủ, nhưng lại nhận được %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote takes không nhận tham số" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "điểm neo thay thế cho các đường dẫn tương đối" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Không tìm thấy url cho đường dẫn mô-đun-con “%s” trong .gitmodules" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "Đang vào “%s”\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -20773,7 +19644,7 @@ msgstr "" "run_command trả về trạng thái khác không cho %s\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20784,19 +19655,19 @@ msgstr "" "con lồng nhau của %s\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "Chặn kết xuất của từng lệnh mô-đun-con" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "Đệ quy vào trong các mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <lệnh>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -20805,56 +19676,56 @@ msgstr "" "không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền " "sở hữu chính nó." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "cảnh báo: chế độ lệnh cập nhật được gợi ý cho mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format 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”" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<các tùy chọn>] [</đường/dẫn>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn " "“%s”" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "không thể phân giải tham chiếu HEAD bên trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "gặp lỗi khi đệ quy vào trong mô-đun-con “%s”" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "Chặn két xuất tình trạng mô-đun-con" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20862,48 +19733,48 @@ msgstr "" "Dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-" "đun-con" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "đệ quy vào trong mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name </đường/dẫn>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Url mô-đun-con đồng bộ hóa cho “%s”\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "gặp lỗi khi lấy máy chủ mặc định cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "gặp lỗi khi cập nhật cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "Chặn kết xuất cho đồng bộ url mô-đun-con" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [</đường/dẫn>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20912,7 +19783,7 @@ msgstr "" "Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn " "thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20921,207 +19792,176 @@ msgstr "" "Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại " "bỏ chúng đi" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "Đã xóa thư mục “%s”\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Không thể gỡ bỏ cây làm việc mô-đun-con “%s”\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "không thể tạo thư mục mô-đun-con rỗng “%s”" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Mô-đun-con “%s” (%s) được đăng ký cho đường dẫn “%s”\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "Gỡ bỏ cây làm việc của mô-đun-con ngay cả khi nó có thay đổi nội bộ" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "Bỏ đăng ký tất cả các trong mô-đun-con" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [</đường/dẫn>…]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Dùng “--all” nếu bạn thực sự muốn hủy khởi tạo mọi mô-đun-con" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"Một cái thay thế được tính toán từ một thay thế của siêu dự án là không hợp " -"lệ.\n" -"Để cho Git thực hiện nhân bản mà không có cái thay thế như trong trường hợp " -"này, đặt\n" -"submodule.alternateErrorStrategy thành 'info' hoặc, tương đương, nhân bản " -"bằng\n" -"'--reference-if-able' thay vì dùng '--reference'." - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "mô-đun-con “%s” không thể thêm thay thế: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Giá trị “%s” cho submodule.alternateErrorStrategy không được thừa nhận" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Giá trị “%s” cho submodule.alternateLocation không được thừa nhận" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "nhân bản mô-đun-con mới vào chỗ nào" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "tên của mô-đun-con mới" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "url nơi mà nhân bản mô-đun-con từ đó" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "chiều sâu lịch sử khi tạo bản sao" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "ép buộc tiến trình nhân bản" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "làm đầy đủ dữ liệu cho bản sao vào trong một thư mục trống rỗng" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference " -"<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--url <url>] --path " -"</đường/dẫn>" - -#: builtin/submodule--helper.c:1449 -#, c-format -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" +"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, 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" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "thư mục không trống: '%s'" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "không thể lấy thư mục mô-đun-con cho “%s”" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Chế độ cập nhật “%s” không hợp lệ cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Chế độ cập nhật “%s” không hợp lệ được cấu hình cho đường dẫn mô-đun-con “%s”" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Đường dẫn mô-đun-con “%s” chưa được khởi tạo" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "Có lẽ bạn là bạn muốn dùng \"update --init\" phải không?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Bỏ qua các mô-đun-con chưa được hòa trộn %s" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "Bỏ qua mô-đun-con “%s”" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Gặp lỗi khi nhân bản “%s”. Thử lại lịch trình" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Gặp lỗi khi nhân bản “%s” lần thứ hai nên bãi bỏ" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "đường dẫn đến cây làm việc" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "đường dẫn đến cây làm việc, chéo biên giới mô-đun-con lồng nhau" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout hoặc không làm gì cả" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" "Tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "công việc đồng thời" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "nhân bản lần đầu có nên theo khuyến nghị là nông hay không" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "đừng in tiến trình nhân bản" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -"git submodule--helper update-clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]" +"git submodule--helper update_clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "giá trị cho tham số cập nhật bị sai" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21130,50 +19970,50 @@ msgstr "" "Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu " "dự án lại không trên bất kỳ nhánh nào" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "không thể lấy thẻ quản kho cho mô-đun-con “%s”" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "đệ quy vào trong mô-đun-con" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<các tùy chọn>] [</đường/dẫn>…]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "chọn nếu nó là an toàn để ghi vào tập tin .gitmodules" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "bỏ đặt cấu hình trong tập tin .gitmodules" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <tên> [<giá trị>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <tên>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s không hỗ trợ --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "“%s” không phải là lệnh con submodule--helper hợp lệ" @@ -21428,210 +20268,206 @@ msgstr "thẻ “%s” đã tồn tại rồi" msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Đang giải nén các đối tượng" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "tạo thư mục \"%s\" gặp lỗi" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "gặp lỗi khi tạo tập tin %s" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "gặp lỗi khi xóa tập tin %s" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "gặp lỗi khi xóa thư mục %s" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "Đang kiểm thử mtime trong “%s” " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm tập tin mới" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "thông tin thống kê thư mục không thay đổi sau khi thêm thư mục mới" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "thông tin thống kê thư mục thay đổi sau khi cập nhật tập tin" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "thông tin thống kê thư mục thay đổi sau khi thêm tập tin mới vào trong thư " "mục con" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa tập tin" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "thông tin thống kê thư mục không thay đổi sau khi xóa thư mục" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " Đồng ý" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<các tùy chọn>] [--] [<tập-tin>…]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "tiếp tục làm mới ngay cả khi bảng mục lục cần được cập nhật" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "refresh: lờ đi mô-đun-con" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "không bỏ qua các tập tin mới tạo" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "để các tập tin thay thế các thư mục và “vice-versa”" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "thông báo các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "" "làm tươi mới thậm chí khi bảng mục lục chứa các mục tin chưa được hòa trộn" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "lấy lại thông tin thống kê" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "giống --refresh, nhưng bỏ qua các cài đặt “assume-unchanged”" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "đánh dấu các tập tin là \"không thay đổi\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "đánh dấu các tập tin là “chỉ-đọc”" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "xóa bít skip-worktree" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "đừng động vào các mục index-only" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" "chỉ thêm vào bảng mục lục; không thêm nội dung vào cơ sở dữ liệu đối tượng" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" "gỡ bỏ các đường dẫn được đặt tên thậm chí cả khi nó hiện diện trong thư mục " "làm việc" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "với tùy chọn --stdin: các dòng đầu vào được chấm dứt bởi ký tự null" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "đọc danh sách đường dẫn cần cập nhật từ đầu vào tiêu chuẩn" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "không thể đọc các mục từ đầu vào tiêu chuẩn vào bảng mục lục" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "phục hồi các trạng thái #2 và #3 cho các đường dẫn được liệt kê" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "chỉ cập nhật các mục tin mà nó khác biệt so với HEAD" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "bỏ qua các tập-tin thiếu trong thư-mục làm việc" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "báo cáo các thao tác ra thiết bị xuất chuẩn" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(cho “porcelains”) quên các xung đột chưa được giải quyết đã ghi" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "ghi mục lục ở định dạng này" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "bật/tắt chia cắt bảng mục lục" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "bật/tắt bộ đệm không theo vết" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "kiểm tra xem hệ thống tập tin có hỗ trợ đệm không theo dõi hay không" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "bật bộ đệm không theo vết mà không kiểm tra hệ thống tập tin" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "ghi ra mục lục ngay cả khi không được đánh cờ là có thay đổi" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "bật/tắt theo dõi hệ thống tập tin" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "đánh dấu các tập tin là hợp lệ fsmonitor" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "xóa bít hợp lệ fsmonitor" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -21639,7 +20475,7 @@ msgstr "" "core.splitIndex được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn bật chia tách mục lục" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -21647,7 +20483,7 @@ msgstr "" "core.splitIndex được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn tắt chia tách mục lục" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21655,11 +20491,11 @@ msgstr "" "core.untrackedCache được đặt là đúng; xóa bỏ hay thay đổi nó, nếu bạn thực " "sự muốn tắt bộ đệm chưa theo dõi" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Nhớ đệm không theo vết bị tắt" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -21667,29 +20503,29 @@ msgstr "" "core.untrackedCache được đặt là sai; xóa bỏ hay thay đổi nó, nếu bạn thực sự " "muốn bật bộ đệm chưa theo dõi" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Nhớ đệm không theo vết được bật cho “%s”" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor chưa được đặt; đặt nó nếu bạn thực sự muốn bật theo dõi hệ " "thống tập tin" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor được bật" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor đã được đặt; bỏ đặt nó nếu bạn thực sự muốn bật theo dõi hệ " "thống tập tin" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor bị tắt" @@ -21781,90 +20617,90 @@ msgstr "git verify-tag [-v | --verbose] [--format=<định_dạng>] <thẻ>…" msgid "print tag contents" msgstr "hiển thị nội dung của thẻ" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<các tùy chọn>] </đường/dẫn> [<commit-ish>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<các tùy chọn>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<các tùy chọn>] </đường/dẫn>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <worktree> </đường/dẫn/mới>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<các tùy chọn>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<các tùy chọn>] <worktree>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock </đường/dẫn>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "gặp lỗi khi xóa “%s”" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Gỡ bỏ cây làm việc/%s: không phải là thư mục hợp lệ" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Gỡ bỏ cây làm việc/%s: không có tập tin gitdir" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "Gỡ bỏ cây làm việc/%s: đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "báo cáo các cây làm việc đã prune" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "các cây làm việc hết hạn cũ hơn khoảng <thời gian>" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "“%s” đã có từ trước rồi" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "không thể thêm-lại cây “%s”" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21873,7 +20709,7 @@ msgstr "" "“%s” bị mất nhưng cây làm việc bị khóa;\n" "dùng “add -f -f” để ghi đè, hoặc “unlock” và “prune” hay “remove” để xóa" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21882,120 +20718,120 @@ msgstr "" "“%s” bị mất nhưng cây làm việc đã được đăng ký;\n" "dùng “add -f” để ghi đè, hoặc “prune” hay “remove” để xóa" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "không thể tạo thư mục của “%s”" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Đang chuẩn bị cây làm việc (nhánh mới “%s”)" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Đang chuẩn bị cây làm việc (đang cài đặt nhánh “%s”, trước đây tại %s)" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "tạo nhánh mới" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "tạo hay đặt lại một nhánh" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "di chuyển cây làm việc mới" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "giữ cây làm việc mới bị khóa" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "cài đặt chế độ theo dõi (xem git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo" -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "lý do khóa" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "%s không phải là cây làm việc" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "“%s” đã được khóa rồi, lý do: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "“%s” đã được khóa rồi" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "“%s” chưa bị khóa" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "“%s” là cây làm việc chính" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "không thể phác họa ra tên đích đến “%s”" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "đích “%s” đã tồn tại rồi" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22004,7 +20840,7 @@ msgstr "" "không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n" "dùng “move -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22012,38 +20848,36 @@ msgstr "" "không thể di chuyển một cây-làm-việc bị khóa;\n" "dùng “move -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "gặp lỗi khi chuyển “%s” sang “%s”" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "gặp lỗi khi chạy “git status” vào “%s”" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "" -"“%s” có chứa các tập tin đã bị sửa chữa hoặc chưa được theo dõi, hãy dùng --" -"force để xóa nó" +msgid "'%s' is dirty, use --force to delete it" +msgstr "“%s” đang bẩn, hãy dùng --force để xóa nó" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22052,7 +20886,7 @@ msgstr "" "không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n" "dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22060,7 +20894,7 @@ msgstr "" "không thể xóa bỏ một cây-làm-việc bị khóa;\n" "dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "thẩm tra gặp lỗi, không thể gỡ bỏ một cây-làm-việc: %s" @@ -22081,22 +20915,6 @@ msgstr "ghi đối tượng cây (tree) cho <tiền tố> thư mục con" msgid "only useful for debugging" msgstr "chỉ hữu ích khi cần gỡ lỗi" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Cần lệnh 'mark', nhưng lại nhận được %s" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "Cần lệnh 'to', nhưng lại nhận được %s" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "" -"tính năng ' %s ' bị cấm chỉ trong đầu vào mà không có --allow-unsafe-features" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -22210,25 +21028,25 @@ msgstr "" "bí danh “%s” thay đổi biến môi trường.\n" "Bạn có thể sử dụng “!git” trong đặt bí danh để làm việc này" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "làm trống bí danh cho %s" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "đệ quy các bí danh: %s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn" @@ -22283,26 +21101,26 @@ msgstr "CURLSSLOPT_NO_REVOKE không được hỗ trợ với cURL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Các hạn chế giao thức không được hỗ trợ với cURL < 7.19.4" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" "Không hỗ trợ ứng dụng SSL chạy phía sau “%s”. Hỗ trợ ứng dụng SSL chạy phía " "sau:" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Không thể đặt ứng dụng chạy SSL phía sau “%s”: cURL được biên dịch không có " "sự hỗ trợ ứng dụng chạy phía sau SSL" -#: http.c:1097 +#: http.c:1096 #, c-format 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" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -22313,160 +21131,149 @@ msgstr "" " hỏi cho: %s\n" " chuyển hướng: %s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "sai trích dẫn trong giá trị push-option :“%s”" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs không hợp lệ: đây có phải là một kho git?" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "" "đáp ứng từ máy phục vụ không hợp lệ; cần dịch vụ, nhưng lại nhận được gói " "flush" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "trả về của máy phục vụ không hợp lệ; nhận được %s" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "không tìm thấy kho “%s”" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "Xác thực gặp lỗi cho “%s”" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "không thể truy cập “%s”: %s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "chuyển hướng đến %s" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "không nên có EOF khi không gentle trên EOF" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "không thể tua lại dữ liệu post rpc - thử tăng http.postBuffer" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "RPC gặp lỗi; %s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "không thể xử lý đẩy cái lớn này" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "không thể giải nén yêu cầu; có lỗi khi giải nén của zlib %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "không thể giải nén yêu cầu; có lỗi ở cuối %d" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "đổ vận chuyển http không hỗ trợ khả năng nông" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "lấy về gặp lỗi." -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "không thể lấy về bằng sha1 thông qua smart http" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "lỗi giao thức: cần sha/ref, nhưng lại nhận được “%s”" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "vận chuyển http không hỗ trợ %s" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "git-http-push gặp lỗi" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: gặp lỗi khi đọc luồng dữ liệu lệnh từ git" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: không hiểu lệnh “%s” từ git" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "các_tham_số" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "lọc đối tượng" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "ngày hết hạn" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "đọc đặc tả đường dẫn từ tập tin" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "" -"với --pathspec-from-file, các phần tử đặc tả đường dẫn bị ngăn cách bởi ký " -"tự NULL" - #: ref-filter.h:101 msgid "key" msgstr "khóa" @@ -22988,170 +21795,162 @@ msgid "Common Git shell script setup code" msgstr "Mã cài đặt văn lệnh hệ vỏ Git chung" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "Khởi tạo và sửa đổi sparse-checkout" - -#: command-list.h:172 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" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "Thêm nội dung tập tin vào vùng bệ phóng" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "Hiển thị trạng thái cây làm việc" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "Xóa bỏ các khoảng trắng không cần thiết" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "Khởi tạo, cập nhật hay điều tra các mô-đun-con" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Thao tác hai hướng giữ hai kho Subversion và Git" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "Các nhánh chuyển" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "Đọc, sửa và xóa tham chiếu mềm" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ được ký bằng GPG" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "Tạo một tập tin tạm với nội dung của blob" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "Gỡ các đối tượng khỏi một kho lưu đã đóng gói" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "Đăng ký nội dung tập tin từ cây làm việc đến bảng mục lục" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "Cập nhật tên đối tượng được lưu trong một tham chiếu một cách an toàn" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "Cập nhật tập tin thông tin phụ trợ để giúp đỡ các dịch vụ dumb" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "Gửi trở lại kho lưu đến git-archive" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "Gửi trở lại các đối tượng đã đóng gói cho git-fetch-pack" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "Hiển thị một biến Git luận lý" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "Kiểm tra ký lần chuyển giao dùng GPG" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "Kiểm tra lại các tập tin kho (lưu trữ, nén) Git đã được đóng gói" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "Kiểm tra chữ ký GPG của các thẻ" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Giao diện Git trên nền web (ứng dụng web chạy trên kho Git)" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "Hiển thị các nhật ký với từng lần chuyển giao khác nhau đưa ra" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "Quản lý nhiều cây làm việc" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "Tạo một đối tượng cây từ đầu vào tiêu chuẩn stdin hiện tại" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Giao diện dòng lệnh Git và quy ước" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "Hướng dẫn Git cơ bản cho nhà phát triển" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "Git dành cho những người dùng CVS" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "Chỉnh kết xuất diff" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "Một tập hợp lệnh hữu dụng tối thiểu để dùng Git hàng ngày" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Thuật ngữ chuyên môn Git" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Các móc được sử dụng bởi Git" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "Chỉ định các tập tin không cần theo dõi" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "Định nghĩa thuộc tính mô-đun-con" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Không gian tên Git" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Bố cục kho Git" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "Chỉ định điểm xét duyệt và vùng cho Git" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "Gắn một kho chứa vào trong một cái khác" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "Hướng dẫn cách dùng Git: phần hai" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "Hướng dẫn cách dùng Git" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Tổng quan về luồng công việc khuyến nghị nên dùng với Git" @@ -23278,134 +22077,146 @@ msgstr "Đang thử hòa trộn đơn giản với $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động." -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Không thể cập nhật $ref_stash với $w_commit" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "lỗi: không hiểu tùy chọn cho “stash push”: $option" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "không hiểu tùy chọn: $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference không phải là tham chiếu hợp lệ" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "”$args” không phải tham chiếu đến stash" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "không thể làm tươi mới bảng mục lục" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index." -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Không thể ghi lại cây chỉ mục" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Đã xóa ${REV} ($s)" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Không thể xóa bỏ mục stash" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm " "việc" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" "repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-" "con" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "“$sm_path” không có lần chuyển giao nào được lấy ra" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " +"của bạn:\n" +"$sm_path\n" +"Sử dụng -f nếu bạn thực sự muốn thêm nó vào." + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "”$sm_path” đã tồn tại từ trước và không phải là một kho git hợp lệ" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23421,40 +22232,40 @@ msgstr "" "hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy " "chọn “--name”." -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" "Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”." -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Không thể lấy ra mô-đun-con “$sm_path”" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23463,7 +22274,7 @@ msgstr "" "Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong " "đường dẫn mô-đun-con “$sm_path”" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23472,7 +22283,7 @@ msgstr "" "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”; thử lấy về trực " "tiếp $sha1:" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23481,74 +22292,74 @@ msgstr "" "Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. " "Lấy về theo định hướng của lần chuyển giao đó gặp lỗi." -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con " "“$displaypath”" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src" -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst" -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -23871,10 +22682,6 @@ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Cải tổ $shortrevisions vào $shortonto (các lệnh $todocount)" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Không thể khởi tạo các lần chuyển giao ghi lại" @@ -23946,18 +22753,77 @@ msgid "Unable to determine absolute path of git directory" msgstr "Không thể dò tìm đường dẫn tuyệt đối của thư mục git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "đã đưa lên bệ phóng" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "chưa đưa lên bệ phóng" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "nhị phân" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "không có gì" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "không thay đổi" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "đã thêm %d đường dẫn\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "đã cập nhật %d đường dẫn\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "đã hoàn nguyên %d đường dẫn\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d đường dẫn đã touch (chạm)\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "Cập nhật" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "Hoàn nguyên" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "chú ý: %s giờ đã bỏ theo dõi.\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Thêm các cái chưa được theo dõi" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "Không có tập tin nào chưa được theo dõi.\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23965,7 +22831,7 @@ msgstr "" "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n" "được đánh dấu để chuyển lên bệ phóng." -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23973,7 +22839,7 @@ msgstr "" "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n" "được đánh dấu để tạm cất." -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23981,8 +22847,8 @@ msgstr "" "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n" "được đánh dấu để bỏ chuyển lên bệ phóng." -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23990,8 +22856,8 @@ msgstr "" "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n" "được đánh dấu để áp dụng." -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23999,12 +22865,16 @@ msgstr "" "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n" "được đánh dấu để loại bỏ." -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "gặp lỗi khi tập tin sửa khúc để ghi: %s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -24017,12 +22887,36 @@ msgstr "" "Để xóa bỏ dòng “%s”, xóa chúng đi.\n" "Những dòng bắt đầu bằng %s sẽ bị loại bỏ.\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Nếu miếng vá không được áp dụng sạch sẽ, bạn sẽ có một cơ hội\n" +"để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n" +"sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "gặp lỗi khi mở tập tin khúc để đọc: %s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại " +"bỏ!) [y/n]? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24037,7 +22931,7 @@ msgstr "" "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập " "tin" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24051,7 +22945,7 @@ msgstr "" "a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n" "d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24067,7 +22961,7 @@ msgstr "" "d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong " "tập tin" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24081,7 +22975,7 @@ msgstr "" "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n" "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24095,7 +22989,7 @@ msgstr "" "a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n" "d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24109,7 +23003,7 @@ msgstr "" "a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n" "d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24123,7 +23017,7 @@ msgstr "" "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n" "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24137,7 +23031,7 @@ msgstr "" "a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n" "d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24159,83 +23053,224 @@ msgstr "" "e - sửa bằng tay khúc hiện hành\n" "? - in trợ giúp\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "Vẫn áp dụng chúng cho cây làm việc? " + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "Đã không áp dụng gì cả.\n" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "bỏ qua những thứ chưa hòa trộn: %s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "Không có thay đổi nào.\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "Cập nhật miếng vá" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Xóa khỏi bệ phóng [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1428 +#, perl-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,?]? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Tạm cất khúc này [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1438 +#, perl-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,?]? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Áo dụng khúc này vào mục lục [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Loại bỏ khúc này khỏi cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Loại bỏ khúc này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Áp dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Áp dụng thay đổi chế độ cho cây làm việc [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Áp dụng việc xóa cho cây làm việc [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Áp dụng khúc này vào cây làm việc [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "Không còn khúc nào để mà nhảy đến\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "nhảy đến khúc nào (<ret> để xem thêm)? " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "nhảy đến khúc nào? " + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Số không hợp lệ: “%s”\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc.\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "Không còn khúc nào để mà tìm kiếm\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "tìm kiếm cho biểu thức chính quy? " + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" msgstr "Không thấy khúc nào khớp mẫu đã cho\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "Không có khúc kế trước\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "Không có khúc kế tiếp\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "Rất tiếc, không thể chia nhỏ khúc này\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Chi nhỏ thành %d khúc.\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "Rất tiếc, không thể sửa khúc này\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "Xem xét lại diff" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24255,19 +23290,19 @@ msgstr "" "add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các " "thay đổi đã đặt lên bệ phóng\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "thiếu --" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "không hiểu chế độ --patch: %s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "đối số không hợp lệ %s, cần --" @@ -24634,169 +23669,6 @@ msgstr "Bỏ qua %s với hậu tố sao lưu dự phòng “%s”.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " -#, c-format -#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " -#~ msgstr "Thay đổi chế độ bệ phóng [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " -#~ msgstr "Xóa khỏi bệ phóng [y,n,a,q,d%s,?]? " - -#, c-format -#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " -#~ msgstr "Đưa lên bệ phóng khúc này [y,n,a,q,d%s,?]? " - -#~ msgid "" -#~ "If the patch applies cleanly, the edited hunk will immediately be\n" -#~ "marked for staging.\n" -#~ msgstr "" -#~ "Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n" -#~ "được đánh dấu để chuyển lên bệ phóng.\n" - -#~ msgid "" -#~ "y - stage this hunk\n" -#~ "n - do not stage this hunk\n" -#~ "q - quit; do not stage this hunk or any of the remaining ones\n" -#~ "a - stage this and all the remaining hunks\n" -#~ "d - do not stage this hunk nor any of the remaining hunks\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 cũng như 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 còn lại sau này\n" -#~ "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại\n" - -#, c-format -#~ msgid "could not copy '%s' to '%s'." -#~ msgstr "không thể chép “%s” sang “%s”." - -#~ msgid "malformed ident line" -#~ msgstr "thụt đầu dòng dị hình" - -#~ msgid "corrupted author without date information" -#~ msgstr "tác giả sai hỏng không có thông tin này tháng" - -#, c-format -#~ msgid "could not parse '%.*s'" -#~ msgstr "không thể phân tích cú pháp “%.*s”" - -#, c-format -#~ msgid "could not checkout %s" -#~ msgstr "không thể lấy ra %s" - -#, c-format -#~ msgid "filename in tree entry contains backslash: '%s'" -#~ msgstr "tên tập tin trong mục tin cây có chứa ký tự gạch ngược: '%s'" - -#, c-format -#~ msgid "Use -f if you really want to add them.\n" -#~ msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n" - -#, c-format -#~ msgid "Maybe you wanted to say 'git add .'?\n" -#~ msgstr "Có lẽ ý bạn là “git add .” phải không?\n" - -#, c-format -#~ msgid "packfile is invalid: %s" -#~ msgstr "tập tin gói không hợp lệ: %s" - -#, c-format -#~ msgid "unable to open packfile for reuse: %s" -#~ msgstr "không thể mở tập tin gói để dùng lại: %s" - -#~ msgid "unable to seek in reused packfile" -#~ msgstr "không thể di chuyển vị trí đọc trong tập tin gói dùng lại" - -#~ msgid "unable to read from reused packfile" -#~ msgstr "không thể đọc từ tập tin gói dùng lại" - -#~ msgid "no HEAD?" -#~ msgstr "không HEAD?" - -#~ msgid "make committer date match author date" -#~ msgstr "làm ngày tháng chuyển giao khớp với ngày của tác giả" - -#~ msgid "ignore author date and use current date" -#~ msgstr "bỏ qua ngày tác giả và sử dụng ngày tháng hiện tại" - -#~ msgid "synonym of --reset-author-date" -#~ msgstr "đồng nghĩa với --reset-author-date" - -#~ msgid "ignore changes in whitespace" -#~ msgstr "lờ đi sự thay đổi do khoảng trắng gây ra" - -#~ msgid "preserve empty commits during rebase" -#~ msgstr "ngăn cấm các lần chuyển giao trống rỗng trong suốt quá trình cải tổ" - -#~ msgid "cannot combine --use-bitmap-index with object filtering" -#~ msgstr "không thể tổ hợp --use-bitmap-index với lọc đối tượng" - -#, sh-format -#~ msgid "" -#~ "The following path is ignored by one of your .gitignore files:\n" -#~ "$sm_path\n" -#~ "Use -f if you really want to add it." -#~ msgstr "" -#~ "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin ." -#~ "gitignore của bạn:\n" -#~ "$sm_path\n" -#~ "Sử dụng -f nếu bạn thực sự muốn thêm nó vào." - -#, c-format -#~ msgid "unable to get tree for %s" -#~ msgstr "không thể lấy cây cho %s" - -#~ msgid "Use an experimental heuristic to improve diffs" -#~ msgstr "Dùng một phỏng đoán thử nghiệm để tăng cường các diff" - -#~ msgid "git commit-graph [--object-dir <objdir>]" -#~ msgstr "git commit-graph [--object-dir <objdir>]" - -#~ msgid "git commit-graph read [--object-dir <objdir>]" -#~ msgstr "git commit-graph read [--object-dir <objdir>]" - -#, c-format -#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -#~ msgstr "" -#~ "không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”" - -#~ msgid "cannot change partial clone promisor remote" -#~ msgstr "không thể thay đổi nhân bản từng phần máy chủ promisor" - -#~ msgid "error building trees" -#~ msgstr "gặp lỗi khi xây dựng cây" - -#, c-format -#~ msgid "invalid date format '%s' in '%s'" -#~ msgstr "định dạng ngày tháng không hợp lệ “%s” trong “%s”" - -#~ msgid "writing root commit" -#~ msgstr "ghi chuyển giao gốc" - -#, c-format -#~ msgid "staged changes in the following files may be lost: %s" -#~ msgstr "" -#~ "các thay đổi đã đưa lên bệ phóng trong các tập tin sau đây có thể bị mất: " -#~ "%s" - -#~ msgid "" -#~ "--filter can only be used with the remote configured in extensions." -#~ "partialClone" -#~ msgstr "" -#~ "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions." -#~ "partialClone" - -#~ msgid "verify commit-msg hook" -#~ msgstr "thẩm tra móc (hook) commit-msg" - -#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" -#~ msgstr "không thể kết hợp “--rebase-merges” với “--strategy-option”" - -#, c-format -#~ msgid "invalid sparse value '%s'" -#~ msgstr "giá trị sparse không hợp lệ “%s”" - #~ msgid "" #~ "Fetch normally indicates which branches had a forced update, but that " #~ "check has been disabled." @@ -24867,6 +23739,9 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgstr "" #~ "không thể được tương tác mà không có stdin kết nối với một thiết bị cuối." +#~ msgid "failed to open '%s'" +#~ msgstr "gặp lỗi khi mở “%s”" + #~ msgid "failed to stat %s\n" #~ msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n" @@ -25393,6 +24268,9 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgstr "" #~ "Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác." +#~ msgid "Could not parse line %d." +#~ msgstr "Không phân tích được dòng %d." + #~ msgid "Could not open %s" #~ msgstr "Không thể mở %s" @@ -25712,6 +24590,9 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgid "no such user" #~ msgstr "không có người dùng như vậy" +#~ msgid "Missing author: %s" +#~ msgstr "Thiếu tên tác giả: %s" + #~ msgid "Testing " #~ msgstr "Đang thử" @@ -25764,6 +24645,9 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): " #~ msgid "option %s does not accept negative form" #~ msgstr "tùy chọn %s không chấp nhận dạng thức âm" +#~ msgid "unable to parse value '%s' for option %s" +#~ msgstr "không thể phân tích giá trị “%s” cho tùy chọn %s" + #~ msgid "-b and -B are mutually exclusive" #~ msgstr "-b và -B loại từ lẫn nhau." diff --git a/third_party/git/po/zh_CN.po b/third_party/git/po/zh_CN.po index 5be52589bb..c6bdb3e300 100644 --- a/third_party/git/po/zh_CN.po +++ b/third_party/git/po/zh_CN.po @@ -139,8 +139,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-11 15:38+0800\n" +"POT-Creation-Date: 2019-08-10 20:12+0800\n" +"PO-Revision-Date: 2019-08-13 21:16+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -149,704 +149,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "嗯（%s）？" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "不能读取索引" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "二进制" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "无" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "没有修改" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "更新" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "不能暂存 '%s'" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "不能写入索引" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "更新了 %d 个路径\n" -msgstr[1] "更新了 %d 个路径\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "说明：%s 现已成为未跟踪的。\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "对路径 '%s' 的 make_cache_entry 操作失败" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "还原" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "不能解析 HEAD^{tree}" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "还原了 %d 个路径\n" -msgstr[1] "还原了 %d 个路径\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "没有未跟踪的文件。\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "添加未跟踪的" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "增加了 %d 个路径\n" -msgstr[1] "增加了 %d 个路径\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "忽略未合入的：%s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "只有二进制文件被修改。\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "没有修改。\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "补丁更新" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "检视 diff" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "显示含变更的路径" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "将工作区状态添加到暂存区修改集中" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "将暂存的修改集恢复为 HEAD 版本" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "挑选数据块并有选择地更新" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "显示 HEAD 和索引的差异" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "将未跟踪文件的内容添加到暂存区修改集中" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "帮助：" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "选择一个条目" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "选择一系列条目" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "选择多个范围" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "基于唯一前缀选择条目" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "反选指定的条目" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "选择所有条目" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "（空）结束选择" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "选择一个编号条目" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "（空）不选择任何内容" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** 命令 ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "请选择" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "缓存" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "未缓存" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "路径" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "不能刷新索引" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "再见。\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "暂存该块 [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。" - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - 暂存该块\n" -"n - 不要暂存该块\n" -"q - 退出。不暂存该块及后面的全部块\n" -"a - 暂存该块和本文件中后面的全部块\n" -"d - 不暂存该块和本文件中后面的全部块\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "贮藏该块 [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。" - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 贮藏该块\n" -"n - 不要贮藏该块\n" -"q - 退出。不贮藏该块及后面的全部块\n" -"a - 贮藏该块和本文件中后面的全部块\n" -"d - 不贮藏该块和本文件中后面的全部块\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。" - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - 取消暂存该块\n" -"n - 不要取消暂存该块\n" -"q - 退出。不要取消暂存该块及后面的全部块\n" -"a - 取消暂存该块和本文件中后面的全部块\n" -"d - 不要取消暂存该块和本文件中后面的全部块\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。" - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在索引中应用该块\n" -"n - 不要在索引中应用该块\n" -"q - 退出。不要应用该块及后面的全部块\n" -"a - 应用该块和本文件中后面的全部块\n" -"d - 不要应用该块和本文件中后面的全部块\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。" - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在工作区中丢弃该块\n" -"n - 不要在工作区中丢弃该块\n" -"q - 退出。不要丢弃该块及后面的全部块\n" -"a - 丢弃该块和本文件中后面的全部块\n" -"d - 不要丢弃该块和本文件中后面的全部块\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在索引和工作区中丢弃该块\n" -"n - 不要在索引和工作区中丢弃该块\n" -"q - 退出。不要丢弃该块及后面的全部块\n" -"a - 丢弃该块和本文件中后面的全部块\n" -"d - 不要丢弃该块和本文件中后面的全部块\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在索引和工作区中应用该块\n" -"n - 不要在索引和工作区中应用该块\n" -"q - 退出。不要应用该块及后面的全部块\n" -"a - 应用该块和本文件中后面的全部块\n" -"d - 不要应用该块和本文件中后面的全部块\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在工作区中应用该块\n" -"n - 不要在工作区中应用该块\n" -"q - 退出。不要应用该块及后面的全部块\n" -"a - 应用该块和本文件中后面的全部块\n" -"d - 不要应用该块和本文件中后面的全部块\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "无法解析数据块头信息 '%.*s'" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "无法解析彩色数据块头信息 '%.*s'" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "不能解析差异信息" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "不能解析彩色差异信息" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "运行 '%s' 失败" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "interactive.diffFilter 的输出不匹配" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"预期上下文行 #%d 于\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"块不重叠：\n" -"%.*s\n" -"\t不是结尾于：\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"要删除 '%c' 开始的行，使其成为 ' ' 开始的行（上下文）。\n" -"要删除 '%c' 开始的行，删除它们。\n" -"以 %c 开始的行将被删除。\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" -"此次编辑被终止，该块不会被修改。\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "无法解析数据块头信息" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "'git apply --cached' 失败" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "选中的块不能应用到索引！" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "无论如何都要应用到工作区么？" - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "未应用。\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - 维持该块未决状态，查看下一个未决块\n" -"J - 维持该块未决状态，查看下一个块\n" -"k - 维持该块未决状态，查看上一个未决块\n" -"K - 维持该块未决状态，查看上一个块\n" -"g - 选择跳转到一个块\n" -"/ - 查找和给定正则表达式匹配的块\n" -"s - 拆分当前块为更小的块\n" -"e - 手动编辑当前块\n" -"? - 显示帮助\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "没有前一个块" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "没有下一个块" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "没有其它可供跳转的块" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "跳转到哪个块（<回车> 查看更多）？ " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "跳转到哪个块？" - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "无效数字：'%s'" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "对不起，只有 %d 个可用块。" -msgstr[1] "对不起，只有 %d 个可用块。" - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "没有其它可供查找的块" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "使用正则表达式搜索？" - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "错误的正则表达式 %s：%s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "没有和给定模式相匹配的块" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "对不起，不能拆分这个块" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "拆分为 %d 块。" - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "对不起，不能编辑这个块" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "'git apply' 失败" - -#: advice.c:115 +#: advice.c:109 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:168 +#: advice.c:162 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" -#: advice.c:170 +#: advice.c:164 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" -#: advice.c:172 +#: advice.c:166 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" -#: advice.c:174 +#: advice.c:168 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" -#: advice.c:176 +#: advice.c:170 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" -#: advice.c:178 +#: advice.c:172 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" -#: advice.c:186 +#: advice.c:180 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." @@ -854,23 +187,23 @@ msgstr "" "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:194 +#: advice.c:188 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:199 builtin/merge.c:1335 +#: advice.c:193 builtin/merge.c:1327 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: advice.c:201 +#: advice.c:195 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:202 +#: advice.c:196 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:208 +#: advice.c:202 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -992,7 +325,17 @@ msgstr "第 %d 行包含无效文件模式：%s" msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头，%d 行和 %d 行" -#: apply.c:1372 +#: apply.c:1460 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount：意外的行：%.*s" + +#: apply.c:1529 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "第 %d 行的补丁片段没有头信息：%.*s" + +#: apply.c:1551 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1003,92 +346,82 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: apply.c:1385 +#: apply.c:1564 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount：意外的行：%.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "第 %d 行的补丁片段没有头信息：%.*s" - -#: apply.c:1753 +#: apply.c:1752 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: apply.c:1755 +#: apply.c:1754 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: apply.c:1789 +#: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: apply.c:1826 +#: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: apply.c:1828 +#: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: apply.c:1831 +#: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: apply.c:1978 +#: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" -#: apply.c:2015 +#: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: apply.c:2177 +#: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c:2263 +#: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c:2267 +#: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c:2936 +#: apply.c:2925 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: apply.c:3057 +#: apply.c:3046 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" -#: apply.c:3069 +#: apply.c:3058 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: apply.c:3075 +#: apply.c:3064 #, c-format msgid "" "while searching for:\n" @@ -1097,437 +430,451 @@ msgstr "" "当查询：\n" "%.*s" -#: apply.c:3097 +#: apply.c:3086 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c:3105 +#: apply.c:3094 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c:3152 +#: apply.c:3141 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c:3163 +#: apply.c:3151 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" -#: apply.c:3171 +#: apply.c:3159 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" -#: apply.c:3189 +#: apply.c:3177 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" -#: apply.c:3202 +#: apply.c:3190 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c:3209 +#: apply.c:3196 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: apply.c:3230 +#: apply.c:3217 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: apply.c:3353 +#: apply.c:3340 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 +#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c:3413 +#: apply.c:3400 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3442 apply.c:3685 +#: apply.c:3429 apply.c:3672 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3528 apply.c:3700 +#: apply.c:3515 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: apply.c:3537 apply.c:3708 +#: apply.c:3524 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: apply.c:3572 +#: apply.c:3559 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: apply.c:3575 +#: apply.c:3562 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合并...\n" -#: apply.c:3591 apply.c:3595 +#: apply.c:3578 apply.c:3582 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3607 +#: apply.c:3594 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "无法回落到三方合并...\n" -#: apply.c:3621 +#: apply.c:3608 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3626 +#: apply.c:3613 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3652 +#: apply.c:3639 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3725 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: apply.c:3727 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3936 +#: apply.c:3923 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: apply.c:3939 +#: apply.c:3926 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: apply.c:3959 +#: apply.c:3946 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: apply.c:3964 +#: apply.c:3951 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配" -#: apply.c:3984 +#: apply.c:3971 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:3988 +#: apply.c:3975 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: apply.c:4003 +#: apply.c:3990 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c:4095 +#: apply.c:4082 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4102 +#: apply.c:4089 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" -#: apply.c:4105 +#: apply.c:4092 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" -#: apply.c:4114 +#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "对路径 '%s' 的 make_cache_entry 操作失败" + +#: apply.c:4101 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4124 +#: apply.c:4111 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4262 +#: apply.c:4249 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4296 +#: apply.c:4283 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4302 +#: apply.c:4289 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4310 +#: apply.c:4297 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4316 apply.c:4461 +#: apply.c:4303 apply.c:4448 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4359 +#: apply.c:4346 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" -#: apply.c:4363 +#: apply.c:4350 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4433 +#: apply.c:4420 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4531 +#: apply.c:4518 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4539 +#: apply.c:4526 msgid "internal error" msgstr "内部错误" -#: apply.c:4542 +#: apply.c:4529 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..." -#: apply.c:4553 +#: apply.c:4540 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4575 +#: apply.c:4562 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4579 +#: apply.c:4566 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4698 +#: apply.c:4676 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4706 +#: apply.c:4684 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4726 +#: apply.c:4704 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4883 +#: apply.c:4859 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" -#: apply.c:4910 +#: apply.c:4886 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4916 apply.c:4931 +#: apply.c:4892 apply.c:4907 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4924 +#: apply.c:4900 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后，应用了 %d 行。" msgstr[1] "修复空白错误后，应用了 %d 行。" -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4968 +#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 +#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 +#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +msgid "path" +msgstr "路径" + +#: apply.c:4944 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4971 +#: apply.c:4947 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4973 builtin/am.c:2260 +#: apply.c:4949 builtin/am.c:2217 msgid "num" msgstr "数字" -#: apply.c:4974 +#: apply.c:4950 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4977 +#: apply.c:4953 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4979 +#: apply.c:4955 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: apply.c:4983 +#: apply.c:4959 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:4985 +#: apply.c:4961 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: apply.c:4987 +#: apply.c:4963 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: apply.c:4989 +#: apply.c:4965 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:4991 +#: apply.c:4967 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:4993 +#: apply.c:4969 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:4995 +#: apply.c:4971 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:4998 +#: apply.c:4974 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: apply.c:5000 +#: apply.c:4976 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: apply.c:5002 +#: apply.c:4978 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:5007 +#: apply.c:4983 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 +#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 msgid "action" msgstr "动作" -#: apply.c:5009 +#: apply.c:4985 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5012 apply.c:5015 +#: apply.c:4988 apply.c:4991 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5018 +#: apply.c:4994 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:5020 +#: apply.c:4996 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:5022 +#: apply.c:4998 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:5024 +#: apply.c:5000 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" -#: apply.c:5027 +#: apply.c:5003 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:5030 +#: apply.c:5006 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5032 builtin/am.c:2248 +#: apply.c:5008 builtin/am.c:2205 msgid "root" msgstr "根目录" -#: apply.c:5033 +#: apply.c:5009 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<选项>] <树对象> [<路径>...]" +msgstr "git archive [<选项>] <树或提交> [<路径>...]" #: archive.c:15 msgid "git archive --list" @@ -1537,13 +884,13 @@ msgstr "git archive --list" msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" +"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]" #: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" @@ -1575,7 +922,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:458 builtin/log.c:1653 +#: archive.c:458 builtin/log.c:1580 msgid "prefix" msgstr "前缀" @@ -1583,12 +930,11 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 +#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 +#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 msgid "file" msgstr "文件" @@ -1621,7 +967,7 @@ msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "仓库" @@ -1629,7 +975,7 @@ msgstr "仓库" msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库（<仓库>）提取归档文件" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "命令" @@ -1660,66 +1006,66 @@ msgstr "未知归档格式 '%s'" msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:260 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 +#: archive-tar.c:287 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "不能读取 %s" -#: archive-tar.c:465 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" -#: archive-tar.c:468 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" -#: archive-tar.c:475 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" -#: archive-zip.c:319 +#: archive-zip.c:314 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8：%s" -#: archive-zip.c:323 +#: archive-zip.c:318 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: archive-zip.c:615 +#: archive-zip.c:609 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "对于本系统时间戳太大：%<PRIuMAX>" -#: attr.c:212 +#: attr.c:211 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" -#: attr.c:369 +#: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s：%s:%d" -#: attr.c:409 +#: attr.c:408 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1737,12 +1083,12 @@ msgstr "文件 '%s' 包含错误的引用格式：%s" msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" -#: bisect.c:745 +#: bisect.c:733 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" -#: bisect.c:770 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1751,7 +1097,7 @@ msgstr "" "合并基线 %s 是坏的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" -#: bisect.c:775 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is new.\n" @@ -1760,7 +1106,7 @@ msgstr "" "合并基线 %s 是新的。\n" "介于 %s 和 [%s] 之间的属性已经被修改。\n" -#: bisect.c:780 +#: bisect.c:768 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1769,7 +1115,7 @@ msgstr "" "合并基线 %s 是 %s。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" -#: bisect.c:788 +#: bisect.c:776 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1780,7 +1126,7 @@ msgstr "" "这种情况下 git 二分查找无法正常工作。\n" "您可能弄错了 %s 和 %s 版本？\n" -#: bisect.c:801 +#: bisect.c:789 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1791,36 +1137,36 @@ msgstr "" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" "我们仍旧继续。" -#: bisect.c:840 +#: bisect.c:822 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" -#: bisect.c:890 +#: bisect.c:865 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:966 builtin/merge.c:149 +#: bisect.c:928 builtin/merge.c:148 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" -#: bisect.c:997 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" -#: bisect.c:1019 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" -#: bisect.c:1028 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1829,7 +1175,7 @@ msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" -#: bisect.c:1057 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1839,44 +1185,44 @@ msgstr[1] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1010 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n" -#: blame.c:2700 +#: blame.c:2697 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2714 +#: blame.c:2711 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" -#: blame.c:2735 +#: blame.c:2732 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 +#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: blame.c:2762 +#: blame.c:2759 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" -#: blame.c:2773 +#: blame.c:2770 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c:2784 +#: blame.c:2781 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" @@ -2024,8 +1370,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: builtin/commit.c:791 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -2056,62 +1402,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需要这个引用：" msgstr[1] "这个包需要 %d 个引用：" -#: bundle.c:273 +#: bundle.c:272 msgid "unable to dup bundle descriptor" msgstr "无法复制 bundle 描述符" -#: bundle.c:280 +#: bundle.c:279 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" -#: bundle.c:291 +#: bundle.c:290 msgid "pack-objects died" msgstr "pack-objects 终止" -#: bundle.c:333 +#: bundle.c:332 msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:382 +#: bundle.c:381 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" -#: bundle.c:469 +#: bundle.c:468 msgid "Refusing to create empty bundle." msgstr "不能创建空包。" -#: bundle.c:479 +#: bundle.c:478 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" -#: bundle.c:504 +#: bundle.c:503 msgid "index-pack died" msgstr "index-pack 终止" -#: color.c:329 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 +#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 +#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:53 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交！" -#: commit.c:193 +#: commit.c:192 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -2131,27 +1477,27 @@ msgstr "" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" -#: commit.c:1153 +#: commit.c:1127 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: commit.c:1157 +#: commit.c:1130 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: commit.c:1160 +#: commit.c:1133 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" -#: commit.c:1163 +#: commit.c:1136 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: commit.c:1417 +#: commit.c:1390 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2161,175 +1507,165 @@ msgstr "" "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n" "设置为您项目所用的字符编码。\n" -#: commit-graph.c:122 +#: commit-graph.c:127 msgid "commit-graph file is too small" msgstr "提交图形文件太小" -#: commit-graph.c:189 +#: commit-graph.c:192 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:196 +#: commit-graph.c:199 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:203 +#: commit-graph.c:206 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" -#: commit-graph.c:226 +#: commit-graph.c:229 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "提交图形块查找表条目丢失，文件可能不完整" -#: commit-graph.c:237 +#: commit-graph.c:240 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交图形不正确的块偏移 %08x%08x" -#: commit-graph.c:280 +#: commit-graph.c:283 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交图形块 id %08x 出现了多次" -#: commit-graph.c:343 +#: commit-graph.c:347 msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" -#: commit-graph.c:353 +#: commit-graph.c:357 msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" -#: commit-graph.c:401 +#: commit-graph.c:404 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" -#: commit-graph.c:425 +#: commit-graph.c:430 msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" -#: commit-graph.c:558 commit-graph.c:618 +#: commit-graph.c:554 commit-graph.c:614 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" -#: commit-graph.c:579 +#: commit-graph.c:575 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 +#: commit-graph.c:1002 builtin/pack-objects.c:2657 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:1043 +#: commit-graph.c:1034 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:1060 +#: commit-graph.c:1051 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:1079 +#: commit-graph.c:1070 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:1098 +#: commit-graph.c:1089 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:1173 +#: commit-graph.c:1163 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 个包中查找提交图的提交" msgstr[1] "正在 %d 个包中查找提交图的提交" -#: commit-graph.c:1186 +#: commit-graph.c:1176 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:1190 +#: commit-graph.c:1180 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:1214 +#: commit-graph.c:1204 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "正在从 %d 个引用中查找提交图的提交" msgstr[1] "正在从 %d 个引用中查找提交图的提交" -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "无效的提交对象 ID：%s" - -#: commit-graph.c:1249 +#: commit-graph.c:1238 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:1264 +#: commit-graph.c:1253 msgid "Counting distinct commits in commit graph" msgstr "正在计算提交图中不同的提交" -#: commit-graph.c:1294 +#: commit-graph.c:1284 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:1340 +#: commit-graph.c:1332 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" -#: commit-graph.c:1373 midx.c:814 +#: commit-graph.c:1365 midx.c:811 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: commit-graph.c:1445 +#: commit-graph.c:1437 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步写出提交图" msgstr[1] "正在用 %d 步写出提交图" -#: commit-graph.c:1486 +#: commit-graph.c:1478 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" -#: commit-graph.c:1498 +#: commit-graph.c:1490 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" -#: commit-graph.c:1518 +#: commit-graph.c:1510 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" -#: commit-graph.c:1631 +#: commit-graph.c:1621 msgid "Scanning merged commits" msgstr "正在扫描合并提交" -#: commit-graph.c:1642 +#: commit-graph.c:1632 #, c-format msgid "unexpected duplicate commit id %s" msgstr "意外的重复提交 ID %s" -#: commit-graph.c:1665 +#: commit-graph.c:1657 msgid "Merging commit-graph" msgstr "正在合并提交图形" @@ -2342,21 +1678,21 @@ msgstr "提交图格式不能写入 %d 个提交" msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:1944 +#: commit-graph.c:1945 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" -#: commit-graph.c:1954 +#: commit-graph.c:1955 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" -#: commit-graph.c:1964 commit-graph.c:1979 +#: commit-graph.c:1965 commit-graph.c:1980 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:1971 +#: commit-graph.c:1972 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" @@ -2365,49 +1701,49 @@ msgstr "无法从提交图形中解析提交 %s" msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" -#: commit-graph.c:2003 +#: commit-graph.c:2002 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" -#: commit-graph.c:2010 +#: commit-graph.c:2009 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" -#: commit-graph.c:2020 +#: commit-graph.c:2019 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" -#: commit-graph.c:2029 +#: commit-graph.c:2028 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" -#: commit-graph.c:2042 +#: commit-graph.c:2041 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" -#: commit-graph.c:2047 +#: commit-graph.c:2046 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" -#: commit-graph.c:2051 +#: commit-graph.c:2050 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" -#: commit-graph.c:2066 +#: commit-graph.c:2065 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "提交图形中的提交 %s 的世代号是 %u != %u" -#: commit-graph.c:2072 +#: commit-graph.c:2071 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" @@ -2454,7 +1790,7 @@ msgstr "键名没有包含一个小节名称：%s" msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" -#: config.c:406 sequencer.c:2444 +#: config.c:406 sequencer.c:2463 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" @@ -2590,7 +1926,7 @@ msgstr "%s 的取值格式错误：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1518 builtin/pack-objects.c:3541 +#: config.c:1518 builtin/pack-objects.c:3410 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" @@ -2615,105 +1951,110 @@ msgstr "不能解析配置对象 '%s'" msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1743 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2097 +#: config.c:2094 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2267 +#: config.c:2264 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" -#: config.c:2312 +#: config.c:2307 +#, c-format +msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'" + +#: config.c:2333 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2358 +#: config.c:2379 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2360 +#: config.c:2381 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2441 +#: config.c:2462 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2473 +#: config.c:2494 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2502 +#: config.c:2523 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2754 config.c:3078 +#: config.c:2775 config.c:3099 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2765 +#: config.c:2786 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:2800 builtin/config.c:344 +#: config.c:2821 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" -#: config.c:2825 +#: config.c:2846 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:2838 config.c:3091 +#: config.c:2859 config.c:3112 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2849 +#: config.c:2870 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2858 config.c:3096 +#: config.c:2879 config.c:3117 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:2943 config.c:3193 +#: config.c:2964 config.c:3214 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:2977 +#: config.c:2998 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3000 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3069 +#: config.c:3090 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" -#: config.c:3236 +#: config.c:3257 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -2836,7 +2177,7 @@ msgstr "无法查找 %s（%s）" msgid "unknown port %s" msgstr "未知端口 %s" -#: connect.c:845 connect.c:1175 +#: connect.c:845 connect.c:1171 #, c-format msgid "strange hostname '%s' blocked" msgstr "已阻止奇怪的主机名 '%s'" @@ -2851,58 +2192,58 @@ msgstr "已阻止奇怪的端口号 '%s'" msgid "cannot start proxy %s" msgstr "不能启动代理 %s" -#: connect.c:928 +#: connect.c:924 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法" -#: connect.c:1123 +#: connect.c:1119 msgid "ssh variant 'simple' does not support -4" msgstr "ssh 变体 'simple' 不支持 -4" -#: connect.c:1135 +#: connect.c:1131 msgid "ssh variant 'simple' does not support -6" msgstr "ssh 变体 'simple' 不支持 -6" -#: connect.c:1152 +#: connect.c:1148 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh 变体 'simple' 不支持设置端口" -#: connect.c:1264 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路径名 '%s'" -#: connect.c:1311 +#: connect.c:1307 msgid "unable to fork" msgstr "无法 fork" -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "正在检查连通性" -#: connected.c:110 +#: connected.c:98 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:130 +#: connected.c:118 msgid "failed write to rev-list" msgstr "写入 rev-list 失败" -#: connected.c:137 +#: connected.c:125 msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" -#: convert.c:194 +#: convert.c:193 #, c-format msgid "illegal crlf_action %d" msgstr "非法的 crlf 动作 %d" -#: convert.c:207 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "%s 中的 CRLF 将被 LF 替换" -#: convert.c:209 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2911,12 +2252,12 @@ msgstr "" "%s 中的 CRLF 将被 LF 替换。<\n" "在工作区中该文件仍保持原有的换行符。" -#: convert.c:217 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "文件 %s 中的 LF 将被 CRLF 替换" -#: convert.c:219 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2925,18 +2266,17 @@ msgstr "" "%s 中的 LF 将被 CRLF 替换。\n" "在工作区中该文件仍保持原有的换行符" -#: convert.c:284 +#: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM" -#: convert.c:291 +#: convert.c:286 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." -msgstr "" -"文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。" #: convert.c:304 #, c-format @@ -2952,117 +2292,117 @@ msgstr "" "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字" "节序）作为工作区编码。" -#: convert.c:419 convert.c:490 +#: convert.c:424 convert.c:495 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" -#: convert.c:462 +#: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" -#: convert.c:668 +#: convert.c:673 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以执行外部过滤器 '%s'" -#: convert.c:688 +#: convert.c:693 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能将输入传递给外部过滤器 '%s'" -#: convert.c:695 +#: convert.c:700 #, c-format msgid "external filter '%s' failed %d" msgstr "外部过滤器 '%s' 失败码 %d" -#: convert.c:730 convert.c:733 +#: convert.c:735 convert.c:738 #, c-format msgid "read from external filter '%s' failed" msgstr "从外部过滤器 '%s' 读取失败" -#: convert.c:736 convert.c:791 +#: convert.c:741 convert.c:796 #, c-format msgid "external filter '%s' failed" msgstr "外部过滤器 '%s' 失败" -#: convert.c:839 +#: convert.c:844 msgid "unexpected filter type" msgstr "意外的过滤类型" -#: convert.c:850 +#: convert.c:855 msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" -#: convert.c:924 +#: convert.c:929 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" -#: convert.c:1223 +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" -#: convert.c:1411 convert.c:1445 +#: convert.c:1398 convert.c:1432 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" -#: convert.c:1489 +#: convert.c:1476 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" -#: date.c:138 +#: date.c:137 msgid "in the future" msgstr "在将来" -#: date.c:144 +#: date.c:143 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> 秒钟前" msgstr[1] "%<PRIuMAX> 秒钟前" -#: date.c:151 +#: date.c:150 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> 分钟前" msgstr[1] "%<PRIuMAX> 分钟前" -#: date.c:158 +#: date.c:157 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> 小时前" msgstr[1] "%<PRIuMAX> 小时前" -#: date.c:165 +#: date.c:164 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> 天前" msgstr[1] "%<PRIuMAX> 天前" -#: date.c:171 +#: date.c:170 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> 周前" msgstr[1] "%<PRIuMAX> 周前" -#: date.c:178 +#: date.c:177 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> 个月前" msgstr[1] "%<PRIuMAX> 个月前" -#: date.c:189 +#: date.c:188 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -3070,14 +2410,14 @@ msgstr[0] "%<PRIuMAX> 年" msgstr[1] "%<PRIuMAX> 年" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 +#: date.c:191 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s %<PRIuMAX> 个月前" msgstr[1] "%s %<PRIuMAX> 个月前" -#: date.c:197 date.c:202 +#: date.c:196 date.c:201 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -3113,7 +2453,7 @@ msgstr "已标记 %d 个数据岛，结束。\n" msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" -#: diffcore-rename.c:543 +#: diffcore-rename.c:544 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" @@ -3176,35 +2516,35 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:4202 +#: diff.c:4215 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" -#: diff.c:4547 +#: diff.c:4560 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4550 +#: diff.c:4563 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4628 +#: diff.c:4641 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4676 +#: diff.c:4689 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" -#: diff.c:4713 +#: diff.c:4726 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3213,195 +2553,195 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: diff.c:4798 +#: diff.c:4811 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" -#: diff.c:4822 +#: diff.c:4835 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" -#: diff.c:4836 +#: diff.c:4849 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4886 diff.c:4892 +#: diff.c:4899 diff.c:4905 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4904 +#: diff.c:4917 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" -#: diff.c:4925 +#: diff.c:4938 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" -#: diff.c:4944 +#: diff.c:4957 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " -#: diff.c:4984 +#: diff.c:4997 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" -#: diff.c:5020 diff.c:5040 +#: diff.c:5033 diff.c:5053 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" -#: diff.c:5178 +#: diff.c:5191 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" -#: diff.c:5234 +#: diff.c:5247 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" -#: diff.c:5257 +#: diff.c:5270 msgid "Diff output format options" msgstr "差异输出格式化选项" -#: diff.c:5259 diff.c:5265 +#: diff.c:5272 diff.c:5278 msgid "generate patch" msgstr "生成补丁" -#: diff.c:5262 builtin/log.c:173 +#: diff.c:5275 builtin/log.c:172 msgid "suppress diff output" msgstr "不显示差异输出" -#: diff.c:5267 diff.c:5381 diff.c:5388 +#: diff.c:5280 diff.c:5394 diff.c:5401 msgid "<n>" msgstr "<n>" -#: diff.c:5268 diff.c:5271 +#: diff.c:5281 diff.c:5284 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差异" -#: diff.c:5273 +#: diff.c:5286 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" -#: diff.c:5276 +#: diff.c:5289 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" -#: diff.c:5280 +#: diff.c:5293 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" -#: diff.c:5284 +#: diff.c:5297 msgid "machine friendly --stat" msgstr "机器友好的 --stat" -#: diff.c:5287 +#: diff.c:5300 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" -#: diff.c:5289 diff.c:5297 +#: diff.c:5302 diff.c:5310 msgid "<param1,param2>..." msgstr "<参数1,参数2>..." -#: diff.c:5290 +#: diff.c:5303 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" -#: diff.c:5294 +#: diff.c:5307 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" -#: diff.c:5298 +#: diff.c:5311 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" -#: diff.c:5302 +#: diff.c:5315 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" -#: diff.c:5305 +#: diff.c:5318 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" -#: diff.c:5308 +#: diff.c:5321 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" -#: diff.c:5311 +#: diff.c:5324 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" -#: diff.c:5313 +#: diff.c:5326 msgid "<width>[,<name-width>[,<count>]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" -#: diff.c:5314 +#: diff.c:5327 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" -#: diff.c:5316 diff.c:5319 diff.c:5322 +#: diff.c:5329 diff.c:5332 diff.c:5335 msgid "<width>" msgstr "<宽度>" -#: diff.c:5317 +#: diff.c:5330 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" -#: diff.c:5320 +#: diff.c:5333 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" -#: diff.c:5323 +#: diff.c:5336 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" -#: diff.c:5325 +#: diff.c:5338 msgid "<count>" msgstr "<次数>" -#: diff.c:5326 +#: diff.c:5339 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" -#: diff.c:5329 +#: diff.c:5342 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" -#: diff.c:5332 +#: diff.c:5345 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" -#: diff.c:5335 +#: diff.c:5348 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" -#: diff.c:5337 +#: diff.c:5350 msgid "show colored diff" msgstr "显示带颜色的差异" -#: diff.c:5338 +#: diff.c:5351 msgid "<kind>" msgstr "<类型>" -#: diff.c:5339 +#: diff.c:5352 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" -#: diff.c:5342 +#: diff.c:5355 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3409,353 +2749,334 @@ msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 +#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 msgid "<prefix>" msgstr "<前缀>" -#: diff.c:5346 +#: diff.c:5359 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" -#: diff.c:5349 +#: diff.c:5362 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" -#: diff.c:5352 +#: diff.c:5365 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" -#: diff.c:5355 +#: diff.c:5368 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" -#: diff.c:5358 +#: diff.c:5371 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" -#: diff.c:5362 diff.c:5367 diff.c:5372 +#: diff.c:5375 diff.c:5380 diff.c:5385 msgid "<char>" msgstr "<字符>" -#: diff.c:5363 +#: diff.c:5376 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" -#: diff.c:5368 +#: diff.c:5381 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" -#: diff.c:5373 +#: diff.c:5386 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" -#: diff.c:5376 +#: diff.c:5389 msgid "Diff rename options" msgstr "差异重命名选项" -#: diff.c:5377 +#: diff.c:5390 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5378 +#: diff.c:5391 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" -#: diff.c:5382 +#: diff.c:5395 msgid "detect renames" msgstr "检测重命名" -#: diff.c:5386 +#: diff.c:5399 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" -#: diff.c:5389 +#: diff.c:5402 msgid "detect copies" msgstr "检测拷贝" -#: diff.c:5393 +#: diff.c:5406 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" -#: diff.c:5395 +#: diff.c:5408 msgid "disable rename detection" msgstr "禁用重命名探测" -#: diff.c:5398 +#: diff.c:5411 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" -#: diff.c:5400 +#: diff.c:5413 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" -#: diff.c:5403 +#: diff.c:5416 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" -#: diff.c:5405 +#: diff.c:5418 msgid "Diff algorithm options" msgstr "差异算法选项" -#: diff.c:5407 +#: diff.c:5420 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" -#: diff.c:5410 +#: diff.c:5423 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" -#: diff.c:5413 +#: diff.c:5426 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" -#: diff.c:5416 +#: diff.c:5429 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" -#: diff.c:5419 +#: diff.c:5432 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" -#: diff.c:5422 +#: diff.c:5435 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" -#: diff.c:5425 +#: diff.c:5438 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" -#: diff.c:5428 +#: diff.c:5441 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" -#: diff.c:5432 +#: diff.c:5445 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" -#: diff.c:5434 +#: diff.c:5447 msgid "<algorithm>" msgstr "<算法>" -#: diff.c:5435 +#: diff.c:5448 msgid "choose a diff algorithm" msgstr "选择一个差异算法" -#: diff.c:5437 +#: diff.c:5450 msgid "<text>" msgstr "<文本>" -#: diff.c:5438 +#: diff.c:5451 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" -#: diff.c:5440 diff.c:5449 diff.c:5452 +#: diff.c:5453 diff.c:5462 diff.c:5465 msgid "<mode>" msgstr "<模式>" -#: diff.c:5441 +#: diff.c:5454 msgid "show word diff, using <mode> to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" -#: diff.c:5443 diff.c:5446 diff.c:5491 +#: diff.c:5456 diff.c:5459 diff.c:5504 msgid "<regex>" msgstr "<正则>" -#: diff.c:5444 +#: diff.c:5457 msgid "use <regex> to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" -#: diff.c:5447 +#: diff.c:5460 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" -#: diff.c:5450 +#: diff.c:5463 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" -#: diff.c:5453 +#: diff.c:5466 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" -#: diff.c:5456 +#: diff.c:5469 msgid "Other diff options" msgstr "其它差异选项" -#: diff.c:5458 +#: diff.c:5471 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" -#: diff.c:5462 +#: diff.c:5475 msgid "treat all files as text" msgstr "把所有文件当做文本处理" -#: diff.c:5464 +#: diff.c:5477 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" -#: diff.c:5466 +#: diff.c:5479 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" -#: diff.c:5468 +#: diff.c:5481 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" -#: diff.c:5470 +#: diff.c:5483 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" -#: diff.c:5472 +#: diff.c:5485 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" -#: diff.c:5474 +#: diff.c:5487 msgid "<when>" msgstr "<何时>" -#: diff.c:5475 +#: diff.c:5488 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" -#: diff.c:5478 +#: diff.c:5491 msgid "<format>" msgstr "<格式>" -#: diff.c:5479 +#: diff.c:5492 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" -#: diff.c:5483 +#: diff.c:5496 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" -#: diff.c:5486 +#: diff.c:5499 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" -#: diff.c:5488 +#: diff.c:5501 msgid "<string>" msgstr "<字符串>" -#: diff.c:5489 +#: diff.c:5502 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" -#: diff.c:5492 +#: diff.c:5505 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" -#: diff.c:5495 +#: diff.c:5508 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" -#: diff.c:5498 +#: diff.c:5511 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" -#: diff.c:5501 +#: diff.c:5514 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" -#: diff.c:5502 +#: diff.c:5515 msgid "<object-id>" msgstr "<对象 ID>" -#: diff.c:5503 +#: diff.c:5516 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" -#: diff.c:5505 +#: diff.c:5518 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5506 +#: diff.c:5519 msgid "select files by diff type" msgstr "通过差异类型选择文件" -#: diff.c:5508 +#: diff.c:5521 msgid "<file>" msgstr "<文件>" -#: diff.c:5509 +#: diff.c:5522 msgid "Output to a specific file" msgstr "输出到一个指定的文件" -#: diff.c:6164 +#: diff.c:6177 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多，略过不严格的重命名检查。" -#: diff.c:6167 +#: diff.c:6180 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多，只在修改的路径中查找拷贝。" -#: diff.c:6170 +#: diff.c:6183 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" -#: dir.c:555 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "未识别的模式：'%s'" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "未识别的反向模式：'%s'" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "禁止 cone 模式匹配" - -#: dir.c:1173 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:2144 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2479 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2603 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3407 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3452 dir.c:3457 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3486 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -3774,12 +3095,12 @@ msgstr "过滤内容" msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" -#: environment.c:149 +#: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" -#: environment.c:331 +#: environment.c:332 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" @@ -3789,269 +3110,265 @@ msgstr "不能设置 GIT_DIR 为 '%s'" msgid "too many args to run %s" msgstr "执行 %s 的参数太多" -#: fetch-pack.c:150 +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "远程未设置 URL" + +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" -#: fetch-pack.c:153 +#: fetch-pack.c:154 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" -#: fetch-pack.c:195 +#: fetch-pack.c:196 msgid "unable to write to remote" msgstr "无法写到远程" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1340 +#: fetch-pack.c:360 fetch-pack.c:1284 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" -#: fetch-pack.c:362 fetch-pack.c:1346 +#: fetch-pack.c:366 fetch-pack.c:1290 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" -#: fetch-pack.c:364 fetch-pack.c:1348 +#: fetch-pack.c:368 fetch-pack.c:1292 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" -#: fetch-pack.c:367 fetch-pack.c:1351 +#: fetch-pack.c:371 fetch-pack.c:1295 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" -#: fetch-pack.c:369 fetch-pack.c:1353 +#: fetch-pack.c:373 fetch-pack.c:1297 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" -#: fetch-pack.c:372 fetch-pack.c:1357 +#: fetch-pack.c:376 fetch-pack.c:1301 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" -#: fetch-pack.c:414 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:462 +#: fetch-pack.c:465 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:475 progress.c:323 +#: fetch-pack.c:477 progress.c:277 msgid "done" msgstr "完成" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:754 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" -#: fetch-pack.c:818 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" -#: fetch-pack.c:826 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" -#: fetch-pack.c:900 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" -#: fetch-pack.c:916 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:918 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:965 +#: fetch-pack.c:908 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 +#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 +#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 +#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 +#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 #, c-format msgid "Server supports %s" msgstr "服务器支持 %s" -#: fetch-pack.c:972 +#: fetch-pack.c:915 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:1032 +#: fetch-pack.c:975 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:1037 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:1041 +#: fetch-pack.c:984 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:1058 +#: fetch-pack.c:1001 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:1070 fetch-pack.c:1536 +#: fetch-pack.c:1013 fetch-pack.c:1462 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" -#: fetch-pack.c:1209 +#: fetch-pack.c:1151 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" -#: fetch-pack.c:1216 +#: fetch-pack.c:1157 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:1239 +#: fetch-pack.c:1184 msgid "unable to write request to remote" msgstr "无法将请求写到远程" -#: fetch-pack.c:1257 +#: fetch-pack.c:1202 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1263 +#: fetch-pack.c:1208 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" -#: fetch-pack.c:1303 +#: fetch-pack.c:1247 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" -#: fetch-pack.c:1308 +#: fetch-pack.c:1252 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" -#: fetch-pack.c:1318 +#: fetch-pack.c:1262 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1320 +#: fetch-pack.c:1264 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1362 +#: fetch-pack.c:1306 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" -#: fetch-pack.c:1409 +#: fetch-pack.c:1353 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1414 +#: fetch-pack.c:1358 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1419 +#: fetch-pack.c:1363 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" -#: fetch-pack.c:1762 +#: fetch-pack.c:1689 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1785 builtin/clone.c:689 +#: fetch-pack.c:1712 builtin/clone.c:686 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:1812 +#: fetch-pack.c:1739 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:1815 +#: fetch-pack.c:1742 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" -#: gpg-interface.c:408 +#: gpg-interface.c:321 msgid "gpg failed to sign the data" -msgstr "gpg 数据签名失败" +msgstr "gpg 无法为数据签名" -#: gpg-interface.c:434 +#: gpg-interface.c:347 msgid "could not create temporary file" msgstr "不能创建临时文件" -#: gpg-interface.c:437 +#: gpg-interface.c:350 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" -#: graph.c:98 +#: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" -"功能" - -#: grep.c:2128 +#: grep.c:2117 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" -#: grep.c:2156 +#: grep.c:2145 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" @@ -4101,7 +3418,7 @@ msgid "Low-level Commands / Interrogators" msgstr "低级命令/询问者" #: help.c:37 -msgid "Low-level Commands / Syncing Repositories" +msgid "Low-level Commands / Synching Repositories" msgstr "低级命令/同步仓库" #: help.c:38 @@ -4193,12 +3510,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<选项>]" -#: help.c:783 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" -#: help.c:787 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -4265,61 +3582,46 @@ msgstr "不允许空的姓名（对于 <%s>）" msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符：%s" -#: ident.c:436 builtin/commit.c:635 +#: ident.c:436 builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" -#: list-objects.c:127 +#: list-objects.c:129 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象" -#: list-objects.c:140 +#: list-objects.c:142 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性，但不是一个数据对象" -#: list-objects.c:375 +#: list-objects.c:378 #, c-format msgid "unable to load root tree for commit %s" msgstr "无法为提交 %s 加载根树" -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "不能访问 '%s' 中的稀疏数据对象" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "无法解析 %s 中的稀疏过滤器数据" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "不能混用多种过滤规格" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "期望 'tree:<深度>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:84 msgid "sparse:path filters support has been dropped" msgstr "sparse:path 过滤器支持已被删除" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:94 #, c-format msgid "invalid filter-spec '%s'" msgstr "无效的过滤器表达式 '%s'" -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "期望在组合后有一些东西：" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "不能混用多种过滤规格" +#: list-objects-filter-options.c:158 +msgid "cannot change partial clone promisor remote" +msgstr "无法修改部分克隆的 promisor 远程仓库" #: lockfile.c:151 #, c-format @@ -4348,110 +3650,114 @@ msgstr "不能创建 '%s.lock'：%s" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 +#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 +#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: builtin/stash.c:264 msgid "unable to write new index file" msgstr "无法写新的索引文件" -#: merge-recursive.c:356 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "（坏提交）\n" -#: merge-recursive.c:379 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" -#: merge-recursive.c:388 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" -#: merge-recursive.c:874 +#: merge-recursive.c:437 +msgid "error building trees" +msgstr "创建树出错" + +#: merge-recursive.c:863 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:899 merge-recursive.c:918 +#: merge-recursive.c:888 merge-recursive.c:907 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" -#: merge-recursive.c:908 +#: merge-recursive.c:897 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:949 builtin/cat-file.c:41 +#: merge-recursive.c:938 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:954 +#: merge-recursive.c:941 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:979 +#: merge-recursive.c:965 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败：%s" -#: merge-recursive.c:990 +#: merge-recursive.c:976 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败：%s" -#: merge-recursive.c:995 +#: merge-recursive.c:981 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:1191 +#: merge-recursive.c:1177 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" -#: merge-recursive.c:1198 +#: merge-recursive.c:1184 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s（提交不存在）" -#: merge-recursive.c:1205 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s （提交未跟随合并基线）" -#: merge-recursive.c:1213 merge-recursive.c:1225 +#: merge-recursive.c:1199 merge-recursive.c:1211 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交：" -#: merge-recursive.c:1216 merge-recursive.c:1228 +#: merge-recursive.c:1202 merge-recursive.c:1214 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" -#: merge-recursive.c:1251 +#: merge-recursive.c:1237 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s （没发现合并跟随的提交）" -#: merge-recursive.c:1255 +#: merge-recursive.c:1241 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s（非快进）" -#: merge-recursive.c:1256 +#: merge-recursive.c:1242 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案：\n" -#: merge-recursive.c:1259 +#: merge-recursive.c:1245 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4467,31 +3773,31 @@ msgstr "" "\n" "以接受此建议。\n" -#: merge-recursive.c:1268 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" -#: merge-recursive.c:1341 +#: merge-recursive.c:1327 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:1346 +#: merge-recursive.c:1332 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:1378 +#: merge-recursive.c:1364 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1402 +#: merge-recursive.c:1387 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。" -#: merge-recursive.c:1474 +#: merge-recursive.c:1459 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4500,7 +3806,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1479 +#: merge-recursive.c:1464 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4509,7 +3815,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1486 +#: merge-recursive.c:1471 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4518,7 +3824,7 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1491 +#: merge-recursive.c:1476 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4527,40 +3833,40 @@ msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1526 +#: merge-recursive.c:1511 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" -#: merge-recursive.c:1587 +#: merge-recursive.c:1601 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" -#: merge-recursive.c:1645 +#: merge-recursive.c:1659 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1676 +#: merge-recursive.c:1690 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1681 +#: merge-recursive.c:1695 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s" -#: merge-recursive.c:1708 +#: merge-recursive.c:1714 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4569,18 +3875,18 @@ msgstr "" "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1719 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1793 +#: merge-recursive.c:1828 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2035 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4590,7 +3896,7 @@ msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" -#: merge-recursive.c:2088 +#: merge-recursive.c:2067 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4599,7 +3905,7 @@ msgstr "" "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" "在：%s。" -#: merge-recursive.c:2098 +#: merge-recursive.c:2077 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4608,7 +3914,7 @@ msgstr "" "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" "径放置于此：%s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2169 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4617,59 +3923,59 @@ msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2413 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" -#: merge-recursive.c:2961 +#: merge-recursive.c:2938 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:2941 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modify" msgstr "修改" -#: merge-recursive.c:3028 +#: merge-recursive.c:3005 msgid "modified" msgstr "修改" -#: merge-recursive.c:3040 +#: merge-recursive.c:3017 msgid "content" msgstr "内容" -#: merge-recursive.c:3044 +#: merge-recursive.c:3021 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:3067 +#: merge-recursive.c:3044 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" -#: merge-recursive.c:3089 git-submodule.sh:1003 +#: merge-recursive.c:3066 git-submodule.sh:937 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:3090 +#: merge-recursive.c:3067 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3097 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:3203 +#: merge-recursive.c:3179 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4677,7 +3983,7 @@ msgid "" msgstr "" "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" -#: merge-recursive.c:3206 +#: merge-recursive.c:3182 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4686,7 +3992,7 @@ msgstr "" "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" "到 %s。" -#: merge-recursive.c:3210 +#: merge-recursive.c:3186 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4695,7 +4001,7 @@ msgstr "" "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" "动到 %5$s。" -#: merge-recursive.c:3213 +#: merge-recursive.c:3189 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4704,240 +4010,224 @@ msgstr "" "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" "建议将其移动到 %5$s。" -#: merge-recursive.c:3327 +#: merge-recursive.c:3303 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3326 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:3355 +#: merge-recursive.c:3331 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:3362 +#: merge-recursive.c:3338 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" -#: merge-recursive.c:3371 +#: merge-recursive.c:3347 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3356 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突（add/add）：合并冲突于 %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3394 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"您对下列文件的本地修改将被合并操作覆盖：\n" +" %s" + +#: merge-recursive.c:3405 msgid "Already up to date!" msgstr "已经是最新的！" -#: merge-recursive.c:3433 +#: merge-recursive.c:3414 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3537 +#: merge-recursive.c:3513 msgid "Merging:" msgstr "合并：" -#: merge-recursive.c:3550 +#: merge-recursive.c:3526 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" -#: merge-recursive.c:3600 +#: merge-recursive.c:3565 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您对下列文件的本地修改将被合并操作覆盖：\n" -" %s" - -#: merge-recursive.c:3756 +#: merge-recursive.c:3631 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 msgid "Unable to write index." msgstr "不能写入索引。" -#: midx.c:68 +#: midx.c:69 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" -#: midx.c:84 +#: midx.c:85 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" -#: midx.c:89 +#: midx.c:90 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" -#: midx.c:94 +#: midx.c:95 #, c-format msgid "hash version %u does not match" msgstr "散列版本 %u 不匹配" -#: midx.c:108 +#: midx.c:109 msgid "invalid chunk offset (too large)" msgstr "无效的块偏移（太大）" -#: midx.c:132 +#: midx.c:133 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "终止多包索引块 id 出现时间早于预期" -#: midx.c:145 +#: midx.c:146 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" -#: midx.c:147 +#: midx.c:148 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的对象 ID 扇出块" -#: midx.c:149 +#: midx.c:150 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的对象 ID 查询块" -#: midx.c:151 +#: midx.c:152 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" -#: midx.c:165 +#: midx.c:166 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" -#: midx.c:210 +#: midx.c:211 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" -#: midx.c:260 +#: midx.c:261 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" -#: midx.c:288 +#: midx.c:289 msgid "error preparing packfile from multi-pack-index" msgstr "从多包索引准备 packfile 出错" -#: midx.c:472 +#: midx.c:470 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" -#: midx.c:478 +#: midx.c:476 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" -#: midx.c:538 +#: midx.c:536 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "添加包文件到多包索引" - -#: midx.c:875 +#: midx.c:865 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "写入块到多包索引" - -#: midx.c:1052 +#: midx.c:1036 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:1108 +#: midx.c:1091 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" -#: midx.c:1123 +#: midx.c:1106 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "校验多包索引中的 OID 顺序" +#: midx.c:1110 +msgid "Verifying OID order in MIDX" +msgstr "正在校验 MIDX 中的对象 ID 顺序" -#: midx.c:1137 +#: midx.c:1119 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1157 +#: midx.c:1138 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" -#: midx.c:1164 +#: midx.c:1144 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1180 +#: midx.c:1160 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1186 +#: midx.c:1166 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1195 +#: midx.c:1175 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>" -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "正在对引用对象计数" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "正在查找和删除未引用的包文件" - -#: midx.c:1388 +#: midx.c:1350 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" -#: midx.c:1407 +#: midx.c:1369 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" -#: name-hash.c:537 +#: name-hash.c:532 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "不能创建 lazy_dir 线程：%s" -#: name-hash.c:559 +#: name-hash.c:554 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "不能创建 lazy_name 线程：%s" -#: name-hash.c:565 +#: name-hash.c:560 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "不能加入 lasy_name 线程：%s" @@ -4981,32 +4271,32 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: object.c:53 +#: object.c:54 #, c-format msgid "invalid object type \"%s\"" msgstr "无效的对象类型 \"%s\"" -#: object.c:173 +#: object.c:174 #, c-format msgid "object %s is a %s, not a %s" msgstr "对象 %s 是一个 %s，不是一个 %s" -#: object.c:233 +#: object.c:234 #, c-format msgid "object %s has unknown type id %d" msgstr "对象 %s 有未知的类型 id %d" -#: object.c:246 +#: object.c:247 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" -#: object.c:266 object.c:278 +#: object.c:267 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" -#: packfile.c:629 +#: packfile.c:648 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" @@ -5020,11 +4310,6 @@ msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "无法得到 %s 的大小" - #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -5040,7 +4325,7 @@ msgstr "%s 与 %s 不兼容" msgid "%s : incompatible with something else" msgstr "%s：和其它的不兼容" -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s 不取值" @@ -5050,41 +4335,41 @@ msgstr "%s 不取值" msgid "%s isn't available" msgstr "%s 不可用" -#: parse-options.c:217 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" -#: parse-options.c:386 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" -#: parse-options.c:420 parse-options.c:428 +#: parse-options.c:423 parse-options.c:431 #, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "你的意思是 `--%s`（有两个短线）？" +msgid "did you mean `--%s` (with two dashes ?)" +msgstr "你的意思是 `--%s`（有两个短线？）" -#: parse-options.c:857 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" -#: parse-options.c:859 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" -#: parse-options.c:861 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项：`%s'" -#: parse-options.c:885 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:904 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -5092,22 +4377,22 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:910 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:913 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:952 +#: parse-options.c:954 msgid "-NUM" msgstr "-数字" -#: parse-options.c:966 +#: parse-options.c:968 #, c-format msgid "alias of --%s" msgstr "--%s 的别名" @@ -5132,87 +4417,82 @@ msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" msgid "malformed object name '%s'" msgstr "格式错误的对象名 '%s'" -#: path.c:915 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" -#: pathspec.c:130 +#: pathspec.c:128 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" -#: pathspec.c:148 +#: pathspec.c:146 msgid "Only one 'attr:' specification is allowed." msgstr "只允许一个 'attr:' 规格。" -#: pathspec.c:151 +#: pathspec.c:149 msgid "attr spec must not be empty" msgstr "属性规格不能为空" -#: pathspec.c:194 +#: pathspec.c:192 #, c-format msgid "invalid attribute name %s" msgstr "无效的属性名 %s" -#: pathspec.c:259 +#: pathspec.c:257 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" -#: pathspec.c:266 +#: pathspec.c:264 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" -#: pathspec.c:306 +#: pathspec.c:304 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规格包含无效的神奇前缀" -#: pathspec.c:327 +#: pathspec.c:325 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" -#: pathspec.c:332 +#: pathspec.c:330 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" -#: pathspec.c:370 +#: pathspec.c:368 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" -#: pathspec.c:429 +#: pathspec.c:427 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" -#: pathspec.c:442 +#: pathspec.c:440 #, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s：'%s' 在位于 '%s' 的仓库之外" +msgid "%s: '%s' is outside repository" +msgstr "%s：'%s' 在仓库之外" -#: pathspec.c:517 +#: pathspec.c:514 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" -#: pathspec.c:527 +#: pathspec.c:524 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" -#: pathspec.c:594 +#: pathspec.c:591 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "行被错误地引用：%s" - #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "无法写 flush 包" @@ -5273,42 +4553,33 @@ msgstr "正在刷新索引" msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat：%s" -#: pretty.c:981 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "远程未设置 URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "promisor 远程名称不能以 '/' 开始：%s" - -#: range-diff.c:75 +#: range-diff.c:70 msgid "could not start `log`" msgstr "不能启动 `log`" -#: range-diff.c:77 +#: range-diff.c:72 msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:96 sequencer.c:5020 +#: range-diff.c:91 sequencer.c:5021 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" -#: range-diff.c:122 +#: range-diff.c:117 #, c-format msgid "could not parse git header '%.*s'" msgstr "无法解析 git 头 '%.*s'" -#: range-diff.c:285 +#: range-diff.c:274 msgid "failed to generate diff" msgstr "生成 diff 失败" -#: range-diff.c:518 range-diff.c:520 +#: range-diff.c:506 range-diff.c:508 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" @@ -5347,16 +4618,16 @@ msgstr "无法在索引中添加 '%s'" msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: read-cache.c:1330 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" -#: read-cache.c:1536 +#: read-cache.c:1499 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1651 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5365,7 +4636,7 @@ msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1661 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5374,160 +4645,150 @@ msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1717 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" -#: read-cache.c:1729 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" -#: read-cache.c:1759 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # -#: read-cache.c:1761 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" -#: read-cache.c:1798 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1871 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" -#: read-cache.c:1874 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" -#: read-cache.c:1877 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 +#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 +#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 +#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2124 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" -#: read-cache.c:2137 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" -#: read-cache.c:2170 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s：打开索引文件失败" -#: read-cache.c:2174 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能对打开的索引执行 stat 操作" -#: read-cache.c:2178 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引文件比预期的小" -#: read-cache.c:2182 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s：无法对索引文件执行 map 操作" -#: read-cache.c:2224 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" -#: read-cache.c:2251 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" -#: read-cache.c:2283 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" -#: read-cache.c:2330 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 +#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3142 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" -#: read-cache.c:3154 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" -#: read-cache.c:3179 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" -#: read-cache.c:3328 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 终止变基。\n" - -#: rebase-interactive.c:33 +#: rebase-interactive.c:26 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" -#: rebase-interactive.c:42 +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -5567,14 +4828,14 @@ msgstr "" "\n" "可以对这些行重新排序，将从上至下执行。\n" -#: rebase-interactive.c:63 +#: rebase-interactive.c:56 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "变基 %s 到 %s（%d 个提交）" msgstr[1] "变基 %s 到 %s（%d 个提交）" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5582,7 +4843,7 @@ msgstr "" "\n" "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5590,7 +4851,7 @@ msgstr "" "\n" "如果您在这里删除一行，对应的提交将会丢失。\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5604,7 +4865,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5614,19 +4875,22 @@ msgstr "" "然而，如果您删除全部内容，变基操作将会终止。\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "注意空提交已被注释掉" + +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 +#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "不能写入 '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 +#: rebase-interactive.c:108 #, c-format -msgid "could not write '%s'." -msgstr "不能写入 '%s'。" +msgid "could not copy '%s' to '%s'." +msgstr "不能拷贝 '%s' 至 '%s'。" -#: rebase-interactive.c:193 +#: rebase-interactive.c:173 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5635,7 +4899,7 @@ msgstr "" "警告：一些提交可能被意外丢弃。\n" "丢弃的提交（从新到旧）：\n" -#: rebase-interactive.c:200 +#: rebase-interactive.c:180 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5651,13 +4915,6 @@ msgstr "" "可选值有：ignore、warn、error。\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "不能读取 '%s'。" - #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5668,7 +4925,7 @@ msgstr "%s 没有指向一个有效的对象！" msgid "ignoring dangling symref %s" msgstr "忽略悬空符号引用 %s" -#: refs.c:669 ref-filter.c:2098 +#: refs.c:669 ref-filter.c:2092 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" @@ -5693,15 +4950,14 @@ msgstr "引用 '%s' 已经存在" msgid "unexpected object ID when writing '%s'" msgstr "写入 '%s' 时意外的对象 ID" -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 +#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 +#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "不能写入 '%s'" -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 +#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 +#: builtin/rebase.c:1003 #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" @@ -5736,37 +4992,37 @@ msgstr "拒绝更新有错误名称 '%s' 的引用" msgid "update_ref failed for ref '%s': %s" msgstr "对引用 '%s' 执行 update_ref 失败：%s" -#: refs.c:2023 +#: refs.c:2012 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "不允许对引用 '%s' 多次更新" -#: refs.c:2055 +#: refs.c:2044 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境中禁止更新引用" -#: refs.c:2151 refs.c:2181 +#: refs.c:2140 refs.c:2170 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在，无法创建 '%s'" -#: refs.c:2157 refs.c:2192 +#: refs.c:2146 refs.c:2181 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1248 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "无法删除引用 %s：%s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用：%s" @@ -5776,7 +5032,7 @@ msgstr "无法删除引用：%s" msgid "invalid refspec '%s'" msgstr "无效的引用表达式：'%s'" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1934 msgid "gone" msgstr "丢失" @@ -5795,280 +5051,280 @@ msgstr "落后 %d" msgid "ahead %d, behind %d" msgstr "领先 %d，落后 %d" -#: ref-filter.c:165 +#: ref-filter.c:162 #, c-format msgid "expected format: %%(color:<color>)" msgstr "期望的格式：%%(color:<颜色>)" -#: ref-filter.c:167 +#: ref-filter.c:164 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色：%%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:186 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:190 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:192 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) 参数：%s" -#: ref-filter.c:250 +#: ref-filter.c:247 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) 不带参数" -#: ref-filter.c:272 +#: ref-filter.c:269 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "未能识别的 %%(objectsize) 参数：%s" -#: ref-filter.c:280 +#: ref-filter.c:277 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) 不带参数" -#: ref-filter.c:292 +#: ref-filter.c:289 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) 不带参数" -#: ref-filter.c:301 +#: ref-filter.c:298 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) 不带参数" -#: ref-filter.c:323 +#: ref-filter.c:320 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) 参数：%s" -#: ref-filter.c:352 +#: ref-filter.c:349 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个正数 contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:351 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) 参数：%s" -#: ref-filter.c:369 +#: ref-filter.c:366 #, c-format msgid "positive value expected objectname:short=%s" msgstr "期望一个正数 objectname:short=%s" -#: ref-filter.c:373 +#: ref-filter.c:370 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "未能识别的 %%(objectname) 参数：%s" -#: ref-filter.c:403 +#: ref-filter.c:400 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "期望的格式：%%(align:<宽度>,<位置>)" -#: ref-filter.c:415 +#: ref-filter.c:412 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的位置：%s" -#: ref-filter.c:422 +#: ref-filter.c:419 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度：%s" -#: ref-filter.c:431 +#: ref-filter.c:428 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) 参数：%s" -#: ref-filter.c:439 +#: ref-filter.c:436 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "元素 %%(align) 需要一个正数的宽度" -#: ref-filter.c:457 +#: ref-filter.c:454 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) 参数：%s" -#: ref-filter.c:559 +#: ref-filter.c:556 #, c-format msgid "malformed field name: %.*s" msgstr "格式错误的字段名：%.*s" -#: ref-filter.c:586 +#: ref-filter.c:583 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名：%.*s" -#: ref-filter.c:590 +#: ref-filter.c:587 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据" -#: ref-filter.c:714 +#: ref-filter.c:711 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素" -#: ref-filter.c:777 +#: ref-filter.c:774 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素" -#: ref-filter.c:779 +#: ref-filter.c:776 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式：%%(then) 元素用了多次" -#: ref-filter.c:781 +#: ref-filter.c:778 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式：%%(then) 元素用在了 %%(else) 之后" -#: ref-filter.c:809 +#: ref-filter.c:806 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素" -#: ref-filter.c:811 +#: ref-filter.c:808 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素" -#: ref-filter.c:813 +#: ref-filter.c:810 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式：%%(else) 元素用了多次" -#: ref-filter.c:828 +#: ref-filter.c:825 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式：使用了 %%(end) 元素却没有它的对应元素" -#: ref-filter.c:885 +#: ref-filter.c:882 #, c-format msgid "malformed format string %s" msgstr "错误的格式化字符串 %s" -#: ref-filter.c:1488 +#: ref-filter.c:1485 #, c-format msgid "no branch, rebasing %s" msgstr "非分支，正变基 %s" -#: ref-filter.c:1491 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "非分支，正变基分离头指针 %s" -#: ref-filter.c:1494 +#: ref-filter.c:1491 #, c-format msgid "no branch, bisect started on %s" msgstr "非分支，二分查找开始于 %s" -#: ref-filter.c:1504 +#: ref-filter.c:1501 msgid "no branch" msgstr "非分支" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1537 ref-filter.c:1743 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1550 +#: ref-filter.c:1547 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:2004 +#: ref-filter.c:1998 #, c-format msgid "malformed object at '%s'" msgstr "格式错误的对象 '%s'" -#: ref-filter.c:2093 +#: ref-filter.c:2087 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2389 +#: ref-filter.c:2382 #, c-format msgid "format: %%(end) atom missing" msgstr "格式：缺少 %%(end) 元素" -#: ref-filter.c:2489 +#: ref-filter.c:2482 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "选项 `%s' 和 --merged 不兼容" -#: ref-filter.c:2492 +#: ref-filter.c:2485 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "选项 `%s' 和 --no-merged 不兼容" -#: ref-filter.c:2502 +#: ref-filter.c:2495 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: ref-filter.c:2507 +#: ref-filter.c:2500 #, c-format msgid "option `%s' must point to a commit" msgstr "选项 `%s' 必须指向一个提交" -#: remote.c:366 +#: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "配置的远程短名称不能以 '/' 开始：%s" -#: remote.c:414 +#: remote.c:410 msgid "more than one receivepack given, using the first" msgstr "提供了一个以上的 receivepack，使用第一个" -#: remote.c:422 +#: remote.c:418 msgid "more than one uploadpack given, using the first" msgstr "提供了一个以上的 uploadpack，使用第一个" -#: remote.c:612 +#: remote.c:608 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同时获取 %s 和 %s 至 %s" -#: remote.c:616 +#: remote.c:612 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %s，而非 %s" -#: remote.c:620 +#: remote.c:616 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同时跟踪 %s 和 %s" -#: remote.c:688 +#: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "模式的键 '%s' 没有 '*'" -#: remote.c:698 +#: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 没有 '*'" -#: remote.c:1004 +#: remote.c:1000 #, c-format msgid "src refspec %s does not match any" msgstr "源引用表达式 %s 没有匹配" -#: remote.c:1009 +#: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "源引用表达式 %s 匹配超过一个" @@ -6077,7 +5333,7 @@ msgstr "源引用表达式 %s 匹配超过一个" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1024 +#: remote.c:1020 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6099,7 +5355,7 @@ msgstr "" "\n" "都不行，所以我们已放弃。您必须给出完整的引用。" -#: remote.c:1044 +#: remote.c:1040 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6109,7 +5365,7 @@ msgstr "" "引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n" "'%s:refs/heads/%s' 推送么？" -#: remote.c:1049 +#: remote.c:1045 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6119,7 +5375,7 @@ msgstr "" "引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1054 +#: remote.c:1050 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6129,7 +5385,7 @@ msgstr "" "引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1059 +#: remote.c:1055 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6139,114 +5395,114 @@ msgstr "" "引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n" "'%s:refs/tags/%s' 推送么？" -#: remote.c:1095 +#: remote.c:1091 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s 无法被解析为分支" -#: remote.c:1106 +#: remote.c:1102 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "无法删除 '%s'：远程引用不存在" -#: remote.c:1118 +#: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "目标引用表达式 %s 匹配超过一个" -#: remote.c:1125 +#: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "目标引用 %s 接收超过一个源" -#: remote.c:1628 remote.c:1729 +#: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指向一个分支" -#: remote.c:1637 +#: remote.c:1633 #, c-format msgid "no such branch: '%s'" msgstr "没有此分支：'%s'" -#: remote.c:1640 +#: remote.c:1636 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" -#: remote.c:1646 +#: remote.c:1642 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: remote.c:1661 +#: remote.c:1657 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支" -#: remote.c:1673 +#: remote.c:1669 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置要推送的远程服务器" -#: remote.c:1683 +#: remote.c:1679 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用规格未包含 '%s'" -#: remote.c:1696 +#: remote.c:1692 msgid "push has no destination (push.default is 'nothing')" msgstr "推送无目标（push.default 是 'nothing'）" -#: remote.c:1718 +#: remote.c:1714 msgid "cannot resolve 'simple' push to a single destination" msgstr "无法解析 'simple' 推送至一个单独的目标" -#: remote.c:1844 +#: remote.c:1840 #, c-format msgid "couldn't find remote ref %s" msgstr "无法找到远程引用 %s" -#: remote.c:1857 +#: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本地忽略可笑的引用 '%s'" -#: remote.c:2020 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n" -#: remote.c:2024 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n" -#: remote.c:2027 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2031 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2034 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 查看详情）\n" -#: remote.c:2038 +#: remote.c:2034 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:2044 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 来发布您的本地提交）\n" -#: remote.c:2047 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6255,11 +5511,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" # 译者：注意保持前导空格 -#: remote.c:2055 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" -#: remote.c:2058 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6275,11 +5531,11 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者：注意保持前导空格 -#: remote.c:2068 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 来合并远程分支）\n" -#: remote.c:2251 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "无法解析期望的对象名 '%s'" @@ -6294,7 +5550,7 @@ msgstr "错误的替换引用名称：%s" msgid "duplicate replace ref: %s" msgstr "重复的替换引用：%s" -#: replace-object.c:82 +#: replace-object.c:73 #, c-format msgid "replace depth too high for object %s" msgstr "对象 %s 的替换层级太深" @@ -6357,8 +5613,8 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 +#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" @@ -6392,20 +5648,20 @@ msgstr "忘记 '%s' 的解决方案\n" msgid "unable to open rr-cache directory" msgstr "不能打开 rr-cache 目录" -#: revision.c:2497 +#: revision.c:2507 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2500 +#: revision.c:2510 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2708 +#: revision.c:2710 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" -#: revision.c:2712 +#: revision.c:2714 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" @@ -6427,75 +5683,75 @@ msgstr "" "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" "配置 `git config advice.ignoredHook false` 来关闭这条警告。" -#: send-pack.c:144 +#: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "读取远程解包状态时收到意外的 flush 包" -#: send-pack.c:146 +#: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "不能解析远程解包状态：%s" -#: send-pack.c:148 +#: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "远程解包失败：%s" -#: send-pack.c:309 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "为推送证书签名失败" -#: send-pack.c:423 +#: send-pack.c:420 msgid "the receiving end does not support --signed push" msgstr "接收端不支持签名推送" -#: send-pack.c:425 +#: send-pack.c:422 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未发送推送证书，因为接收端不支持签名推送" -#: send-pack.c:437 +#: send-pack.c:434 msgid "the receiving end does not support --atomic push" msgstr "接收端不支持原子推送" -#: send-pack.c:442 +#: send-pack.c:439 msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" -#: sequencer.c:191 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "无效的提交信息清理模式 '%s'" -#: sequencer.c:296 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 +#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:325 +#: sequencer.c:321 msgid "revert" msgstr "还原" -#: sequencer.c:327 +#: sequencer.c:323 msgid "cherry-pick" msgstr "拣选" -#: sequencer.c:329 -msgid "rebase" -msgstr "变基" +#: sequencer.c:325 +msgid "rebase -i" +msgstr "rebase -i" -#: sequencer.c:331 +#: sequencer.c:327 #, c-format msgid "unknown action: %d" msgstr "未知动作：%d" -#: sequencer.c:389 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6503,7 +5759,7 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: sequencer.c:392 +#: sequencer.c:388 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6512,110 +5768,115 @@ msgstr "" "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:405 sequencer.c:2901 +#: sequencer.c:401 sequencer.c:2909 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:412 +#: sequencer.c:408 #, c-format msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 +#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 +#: sequencer.c:3192 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 +#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 +#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 +#: builtin/merge.c:1112 builtin/rebase.c:567 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: sequencer.c:466 +#: sequencer.c:462 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" -#: sequencer.c:470 +#: sequencer.c:466 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c:502 +#: sequencer.c:498 #, c-format msgid "%s: fast-forward" msgstr "%s：快进" -#: sequencer.c:541 builtin/tag.c:565 +#: sequencer.c:537 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". +#. "rebase -i". #. -#: sequencer.c:635 +#: sequencer.c:632 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:652 +#: sequencer.c:649 msgid "unable to update cache tree" msgstr "不能更新缓存树" -#: sequencer.c:666 +#: sequencer.c:663 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:746 +#: sequencer.c:743 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中没有 key" -#: sequencer.c:757 +#: sequencer.c:754 #, c-format msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 +#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 +#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: sequencer.c:804 +#: sequencer.c:801 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已经给出 'GIT_AUTHOR_NAME'" -#: sequencer.c:809 +#: sequencer.c:806 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已经给出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:814 +#: sequencer.c:811 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已经给出 'GIT_AUTHOR_DATE'" -#: sequencer.c:818 +#: sequencer.c:815 #, c-format msgid "unknown variable '%s'" msgstr "未知变量 '%s'" -#: sequencer.c:823 +#: sequencer.c:820 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:825 +#: sequencer.c:822 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:827 +#: sequencer.c:824 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:876 +#: sequencer.c:884 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "'%2$s' 中无效的日期格式 '%1$s'" + +#: sequencer.c:901 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6644,11 +5905,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1148 +#: sequencer.c:995 +msgid "writing root commit" +msgstr "写根提交" + +#: sequencer.c:1216 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" -#: sequencer.c:1154 +#: sequencer.c:1223 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6672,7 +5937,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1167 +#: sequencer.c:1236 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6695,325 +5960,326 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1209 +#: sequencer.c:1278 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: sequencer.c:1211 +#: sequencer.c:1280 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: sequencer.c:1257 +#: sequencer.c:1326 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后，不能解析 HEAD" -#: sequencer.c:1259 +#: sequencer.c:1328 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: sequencer.c:1263 +#: sequencer.c:1332 msgid " (root-commit)" msgstr "（根提交）" -#: sequencer.c:1284 +#: sequencer.c:1353 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1286 +#: sequencer.c:1355 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交！" -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 +#: sequencer.c:1359 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1342 sequencer.c:1968 +#: sequencer.c:1411 sequencer.c:2004 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 +#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: sequencer.c:1386 sequencer.c:1447 +#: sequencer.c:1438 sequencer.c:1499 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 +#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 +#: builtin/merge.c:903 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1474 +#: sequencer.c:1526 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1479 +#: sequencer.c:1531 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1562 sequencer.c:1673 +#: sequencer.c:1605 sequencer.c:1715 #, c-format msgid "unknown command: %d" msgstr "未知命令：%d" -#: sequencer.c:1620 sequencer.c:1645 +#: sequencer.c:1662 sequencer.c:1687 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:1630 +#: sequencer.c:1672 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1632 sequencer.c:3212 +#: sequencer.c:1674 sequencer.c:3219 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1634 +#: sequencer.c:1676 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:1640 +#: sequencer.c:1682 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明：" -#: sequencer.c:1655 +#: sequencer.c:1697 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:1662 +#: sequencer.c:1704 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d：" -#: sequencer.c:1668 +#: sequencer.c:1710 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过：" -#: sequencer.c:1756 +#: sequencer.c:1798 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:1763 +#: sequencer.c:1805 msgid "cannot fixup root commit" msgstr "不能修复根提交" -#: sequencer.c:1782 +#: sequencer.c:1824 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:1790 sequencer.c:1798 +#: sequencer.c:1832 sequencer.c:1840 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:1804 +#: sequencer.c:1846 #, c-format msgid "cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 +#: sequencer.c:1865 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1888 +#: sequencer.c:1930 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:1943 +#: sequencer.c:1985 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:1944 +#: sequencer.c:1986 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "丢弃 %s %s -- 补丁内容已在上游\n" - -#: sequencer.c:2018 +#: sequencer.c:2045 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:2025 +#: sequencer.c:2052 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:2102 +#: sequencer.c:2128 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数：'%s'" -#: sequencer.c:2111 +#: sequencer.c:2137 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" -#: sequencer.c:2142 +#: sequencer.c:2174 #, c-format -msgid "could not parse '%s'" -msgstr "无法解析 '%s'" +msgid "could not parse '%.*s'" +msgstr "无法解析 '%.*s'" -#: sequencer.c:2203 +#: sequencer.c:2228 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d：%.*s" -#: sequencer.c:2214 +#: sequencer.c:2239 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:2298 +#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: builtin/rebase.c:204 builtin/rebase.c:229 +#, c-format +msgid "could not read '%s'." +msgstr "不能读取 '%s'。" + +#: sequencer.c:2323 msgid "cancelling a cherry picking in progress" msgstr "正在取消一个进行中的拣选" -#: sequencer.c:2305 +#: sequencer.c:2330 msgid "cancelling a revert in progress" msgstr "正在取消一个进行中的还原" -#: sequencer.c:2349 +#: sequencer.c:2364 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:2351 +#: sequencer.c:2366 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单：'%s'" -#: sequencer.c:2356 +#: sequencer.c:2371 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:2367 +#: sequencer.c:2382 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:2369 +#: sequencer.c:2384 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:2447 +#: sequencer.c:2466 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:2540 +#: sequencer.c:2553 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2556 +#: sequencer.c:2569 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单：'%s'" -#: sequencer.c:2644 sequencer.c:4361 +#: sequencer.c:2652 sequencer.c:4351 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2660 +#: sequencer.c:2668 msgid "revert is already in progress" msgstr "一个还原操作已在进行" -#: sequencer.c:2662 +#: sequencer.c:2670 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2665 +#: sequencer.c:2673 msgid "cherry-pick is already in progress" msgstr "拣选操作已在进行" -#: sequencer.c:2667 +#: sequencer.c:2675 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2681 +#: sequencer.c:2689 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:2696 +#: sequencer.c:2704 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:2756 sequencer.c:4099 +#: sequencer.c:2764 sequencer.c:4103 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:2758 sequencer.c:2769 +#: sequencer.c:2766 sequencer.c:2777 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2760 sequencer.c:2804 +#: sequencer.c:2768 sequencer.c:2812 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:2790 builtin/grep.c:724 +#: sequencer.c:2798 builtin/grep.c:734 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:2792 +#: sequencer.c:2800 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s'：%s" -#: sequencer.c:2793 +#: sequencer.c:2801 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:2799 +#: sequencer.c:2807 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:2810 +#: sequencer.c:2818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！" -#: sequencer.c:2851 +#: sequencer.c:2859 msgid "no revert in progress" msgstr "没有正在进行的还原" -#: sequencer.c:2859 +#: sequencer.c:2867 msgid "no cherry-pick in progress" msgstr "没有正在进行的拣选" -#: sequencer.c:2869 +#: sequencer.c:2877 msgid "failed to skip the commit" msgstr "无法跳过这个提交" -#: sequencer.c:2876 +#: sequencer.c:2884 msgid "there is nothing to skip" msgstr "没有要跳过的" -#: sequencer.c:2879 +#: sequencer.c:2887 #, c-format msgid "" "have you committed already?\n" @@ -7022,21 +6288,21 @@ msgstr "" "您已经提交了么？\n" "试试 \"git %s --continue\"" -#: sequencer.c:3003 sequencer.c:4011 +#: sequencer.c:3011 sequencer.c:4015 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:3042 sequencer.c:3991 +#: sequencer.c:3049 sequencer.c:3995 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:3059 +#: sequencer.c:3066 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "无法拷贝 '%s' 至 '%s'" -#: sequencer.c:3067 +#: sequencer.c:3074 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7055,23 +6321,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3077 +#: sequencer.c:3084 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能应用 %s... %.*s" -#: sequencer.c:3084 +#: sequencer.c:3091 #, c-format msgid "Could not merge %.*s" msgstr "不能合并 %.*s" -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 +#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" +#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 +#: builtin/rebase.c:1953 builtin/rebase.c:2008 +msgid "could not read index" +msgstr "不能读取索引" + # 译者：注意保持前导空格 -#: sequencer.c:3129 +#: sequencer.c:3136 #, c-format msgid "" "execution failed: %s\n" @@ -7086,11 +6357,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3135 +#: sequencer.c:3142 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:3141 +#: sequencer.c:3148 #, c-format msgid "" "execution succeeded: %s\n" @@ -7107,72 +6378,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3202 +#: sequencer.c:3209 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称：'%.*s'" -#: sequencer.c:3256 +#: sequencer.c:3263 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3261 +#: sequencer.c:3268 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 +#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树。" -#: sequencer.c:3344 +#: sequencer.c:3324 builtin/rebase.c:873 +msgid "could not write index" +msgstr "不能写入索引" + +#: sequencer.c:3351 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3375 +#: sequencer.c:3379 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3397 +#: sequencer.c:3401 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3406 +#: sequencer.c:3410 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并：'%.*s'" -#: sequencer.c:3418 +#: sequencer.c:3422 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3434 +#: sequencer.c:3437 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:3594 +#: sequencer.c:3590 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:3610 +#: sequencer.c:3606 msgid "merge: Unable to write new index file" msgstr "合并：无法写入新索引文件" -#: sequencer.c:3679 builtin/rebase.c:737 +#: sequencer.c:3675 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "已应用 autostash。\n" -#: sequencer.c:3691 +#: sequencer.c:3687 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7183,26 +6458,31 @@ msgstr "" "您的修改安全地保存在贮藏区中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3755 +#: sequencer.c:3751 +#, c-format +msgid "could not checkout %s" +msgstr "不能检出 %s" + +#: sequencer.c:3765 #, c-format msgid "%s: not a valid OID" msgstr "%s：不是一个有效的对象 ID" -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:3775 +#: sequencer.c:3785 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3777 +#: sequencer.c:3787 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3785 +#: sequencer.c:3795 #, c-format msgid "" "Could not execute the todo command\n" @@ -7222,48 +6502,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3869 +#: sequencer.c:3877 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:3940 +#: sequencer.c:3958 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:3999 +#: sequencer.c:4003 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:4004 +#: sequencer.c:4008 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:4018 +#: sequencer.c:4022 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:4111 +#: sequencer.c:4115 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基：您有未暂存的变更。" -#: sequencer.c:4120 +#: sequencer.c:4124 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:4122 +#: sequencer.c:4126 #, c-format msgid "invalid file: '%s'" msgstr "无效文件：'%s'" -#: sequencer.c:4124 +#: sequencer.c:4128 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容：'%s'" -#: sequencer.c:4127 +#: sequencer.c:4131 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7272,59 +6552,68 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:4163 sequencer.c:4202 +#: sequencer.c:4167 sequencer.c:4205 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件：'%s'" -#: sequencer.c:4217 +#: sequencer.c:4220 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:4224 +#: sequencer.c:4227 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4338 +#: sequencer.c:4328 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能拣选一个%s" -#: sequencer.c:4342 +#: sequencer.c:4332 #, c-format msgid "%s: bad revision" msgstr "%s：错误的版本" -#: sequencer.c:4377 +#: sequencer.c:4367 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:4846 +#: sequencer.c:4810 msgid "make_script: unhandled options" msgstr "make_script：有未能处理的选项" -#: sequencer.c:4849 +#: sequencer.c:4813 msgid "make_script: error preparing revisions" msgstr "make_script：准备版本时错误" +#: sequencer.c:4971 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" +"或者您可以用 'git rebase --abort' 终止变基。\n" + #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:5119 +#: sequencer.c:5114 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5213 +#: sequencer.c:5197 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" -#: setup.c:124 +#: setup.c:123 #, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s' 在位于 '%s' 的仓库之外" +msgid "'%s' is outside repository" +msgstr "'%s' 在仓库之外" -#: setup.c:175 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7333,7 +6622,7 @@ msgstr "" "%s：工作区中无此路径。\n" "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" -#: setup.c:188 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7344,12 +6633,12 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:254 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "选项 '%s' 必须在其他非选项参数之前" -#: setup.c:273 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7360,92 +6649,92 @@ msgstr "" "使用 '--' 来分隔版本和路径，例如：\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:409 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" -#: setup.c:413 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:559 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d，却得到 %d" -#: setup.c:567 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "发现未知的仓库扩展：" -#: setup.c:586 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:588 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大，无法作为 .git 文件：'%s'" -#: setup.c:590 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:592 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式：%s" -#: setup.c:594 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径：%s" -#: setup.c:596 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "不是一个 git 仓库：%s" -#: setup.c:695 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:709 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "不是一个 git 仓库：'%s'" -#: setup.c:738 setup.c:740 setup.c:771 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:870 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "获取 '%*s%s%s' 状态（stat）失败" -#: setup.c:1108 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1117 setup.c:1123 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1128 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一个 git 仓库（或者任何父目录）：%s" -#: setup.c:1134 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7454,7 +6743,7 @@ msgstr "" "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n" "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1245 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7463,282 +6752,282 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1289 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" -#: setup.c:1304 +#: setup.c:1279 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1309 +#: setup.c:1284 msgid "setsid failed" msgstr "setsid 失败" -#: sha1-file.c:452 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" -#: sha1-file.c:503 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" -#: sha1-file.c:575 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" -#: sha1-file.c:582 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: sha1-file.c:625 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: sha1-file.c:643 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: sha1-file.c:650 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: sha1-file.c:685 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: sha1-file.c:711 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: sha1-file.c:717 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: sha1-file.c:723 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: sha1-file.c:731 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: sha1-file.c:791 +#: sha1-file.c:792 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行：%s" -#: sha1-file.c:943 +#: sha1-file.c:944 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>" -#: sha1-file.c:964 +#: sha1-file.c:969 msgid "mmap failed" msgstr "mmap 失败" -#: sha1-file.c:1128 +#: sha1-file.c:1133 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: sha1-file.c:1263 sha1-file.c:2443 +#: sha1-file.c:1257 sha1-file.c:2396 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: sha1-file.c:1265 sha1-file.c:2447 +#: sha1-file.c:1259 sha1-file.c:2400 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: sha1-file.c:1307 +#: sha1-file.c:1301 msgid "invalid object type" msgstr "无效的对象类型" -#: sha1-file.c:1391 +#: sha1-file.c:1385 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: sha1-file.c:1394 +#: sha1-file.c:1388 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: sha1-file.c:1400 +#: sha1-file.c:1394 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: sha1-file.c:1403 +#: sha1-file.c:1397 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: sha1-file.c:1629 +#: sha1-file.c:1588 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: sha1-file.c:1633 +#: sha1-file.c:1592 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: sha1-file.c:1637 +#: sha1-file.c:1596 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1641 +#: sha1-file.c:1600 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" -#: sha1-file.c:1746 +#: sha1-file.c:1703 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: sha1-file.c:1753 +#: sha1-file.c:1710 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: sha1-file.c:1760 +#: sha1-file.c:1717 msgid "file write error" msgstr "文件写错误" -#: sha1-file.c:1780 +#: sha1-file.c:1736 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: sha1-file.c:1845 +#: sha1-file.c:1801 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" -#: sha1-file.c:1847 +#: sha1-file.c:1803 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: sha1-file.c:1871 +#: sha1-file.c:1827 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: sha1-file.c:1877 +#: sha1-file.c:1833 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" -#: sha1-file.c:1881 +#: sha1-file.c:1837 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" -#: sha1-file.c:1885 +#: sha1-file.c:1841 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: sha1-file.c:1895 builtin/pack-objects.c:1054 +#: sha1-file.c:1851 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: sha1-file.c:1972 +#: sha1-file.c:1926 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: sha1-file.c:2011 +#: sha1-file.c:1966 msgid "corrupt commit" msgstr "损坏的提交" -#: sha1-file.c:2019 +#: sha1-file.c:1974 msgid "corrupt tag" msgstr "损坏的标签" -#: sha1-file.c:2119 +#: sha1-file.c:2073 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: sha1-file.c:2122 +#: sha1-file.c:2076 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: sha1-file.c:2195 sha1-file.c:2205 +#: sha1-file.c:2149 sha1-file.c:2158 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" -#: sha1-file.c:2211 +#: sha1-file.c:2164 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" -#: sha1-file.c:2235 +#: sha1-file.c:2188 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: sha1-file.c:2237 +#: sha1-file.c:2190 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: sha1-file.c:2264 builtin/index-pack.c:155 +#: sha1-file.c:2217 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: sha1-file.c:2454 sha1-file.c:2507 +#: sha1-file.c:2407 sha1-file.c:2459 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" -#: sha1-file.c:2478 +#: sha1-file.c:2431 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: sha1-file.c:2483 +#: sha1-file.c:2436 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: sha1-file.c:2489 +#: sha1-file.c:2442 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: sha1-file.c:2500 +#: sha1-file.c:2453 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" -#: sha1-name.c:486 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "短 SHA1 %s 存在歧义" -#: sha1-name.c:497 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "候选者有：" -#: sha1-name.c:796 +#: sha1-name.c:800 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -7759,110 +7048,44 @@ msgstr "" "引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n" "false\" 命令关闭本消息通知。" -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "'%.*s' 的日志仅能回到 %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "'%.*s' 的日志仅有 %d 个条目" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"路径 '%s' 存在，而 '%s' 不存在\n" -"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "路径 '%s' 不在 '%.*s' 中" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"路径 '%s' 在索引中，但不在暂存区 %d 中\n" -"提示：您的意思是 ':%d:%s'？" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"路径 '%s' 在索引中，但 '%s' 不在\n" -"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "路径 '%s' 在磁盘上，但不在索引里" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "不能在工作区之外使用相对路径语法" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "无效的对象名 '%.*s'。" - #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 +#: strbuf.c:821 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 +#: strbuf.c:823 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 +#: strbuf.c:831 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 +#: strbuf.c:833 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 +#: strbuf.c:840 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 +#: strbuf.c:842 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 +#: strbuf.c:848 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7870,18 +7093,13 @@ msgstr[0] "%u 字节" msgstr[1] "%u 字节" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 +#: strbuf.c:850 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 字节/秒" msgstr[1] "%u 字节/秒" -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "不能编辑 '%s'" - #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "无法修改未合并的 .gitmodules，先解决合并冲突" @@ -7910,139 +7128,62 @@ msgstr "位于未检出的子模组 '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路径规格 '%s' 在子模组 '%.*s' 中" -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "坏的 --ignore-submodules 参数：%s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。" - #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交" -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "处理子模组 '%s' 失败" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "正在推送子模组 '%s'\n" - -#: submodule.c:1161 -#, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "无法推送子模组 '%s'\n" - -#: submodule.c:1453 +#: submodule.c:1481 #, c-format -msgid "Fetching submodule %s%s\n" -msgstr "正在获取子模组 %s%s\n" +msgid "Could not access submodule '%s'" +msgstr "无法访问子模组 '%s'" -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "无法访问子模组 '%s'\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"获取子模组时的错误：\n" -"%s" - -#: submodule.c:1662 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "无法将 '%s' 识别为一个 git 仓库" -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败" - -#: submodule.c:1800 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中启动 'git status'" -#: submodule.c:1813 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中执行 'git status'" -#: submodule.c:1828 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "无法递归进子模组路径 '%s'" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "无法重置子模组索引" - -#: submodule.c:1918 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" -#: submodule.c:1970 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模组 '%s' 无法被更新。" -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中" - -#: submodule.c:2059 +#: submodule.c:2007 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2019 submodule.c:2074 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "禁止移动 '%s' 到现存 git 目录中" - -#: submodule.c:2082 +#: submodule.c:2026 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8053,35 +7194,40 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:2209 +#: submodule.c:2109 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "无法递归进子模组路径 '%s'" + +#: submodule.c:2153 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:2248 +#: submodule.c:2192 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" -#: submodule-config.c:236 +#: submodule-config.c:232 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "忽略可疑的子模组名称：%s" -#: submodule-config.c:303 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "submodule.fetchjobs 不允许为负值" -#: submodule-config.c:401 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "忽略可能被解析为命令行选项的 '%s'：%s" -#: submodule-config.c:498 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "%s 的值无效" -#: submodule-config.c:765 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 条目 %s" @@ -8097,7 +7243,7 @@ msgstr "执行 trailer 命令 '%s' 失败" msgid "unknown value '%s' for key '%s'" msgstr "键 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:539 trailer.c:544 builtin/remote.c:295 #, c-format msgid "more than one %s" msgstr "多于一个 %s" @@ -8116,7 +7262,7 @@ msgstr "不能读取输入文件 '%s'" msgid "could not read from stdin" msgstr "不能自标准输入读取" -#: trailer.c:1011 wrapper.c:665 +#: trailer.c:1011 wrapper.c:701 #, c-format msgid "could not stat %s" msgstr "不能对 %s 调用 stat" @@ -8145,54 +7291,54 @@ msgstr "不能重命名临时文件为 %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n" -#: transport.c:145 +#: transport.c:142 #, c-format msgid "could not read bundle '%s'" msgstr "无法读取 bundle '%s'" -#: transport.c:214 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "传输：无效的深度选项 '%s'" -#: transport.c:266 +#: transport.c:259 msgid "see protocol.version in 'git help config' for more details" msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" -#: transport.c:267 +#: transport.c:260 msgid "server options require protocol version 2 or later" msgstr "服务端选项需要版本 2 协议或更高" -#: transport.c:632 +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 配置" -#: transport.c:705 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "协议 v2 的支持尚未实现" -#: transport.c:831 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "配置 '%s' 的取值未知：%s" -#: transport.c:897 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" -#: transport.c:949 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "不再支持 git-over-rsync" -#: transport.c:1044 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n" -#: transport.c:1048 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -8219,136 +7365,131 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:1056 +#: transport.c:1052 msgid "Aborting." msgstr "正在终止。" -#: transport.c:1201 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" -#: transport.c:1345 transport-helper.c:657 +#: transport.c:1340 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "协议不支持该操作" -#: transport-helper.c:61 transport-helper.c:90 +#: transport-helper.c:51 transport-helper.c:80 msgid "full write to remote helper failed" msgstr "完整写入远程助手失败" -#: transport-helper.c:144 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "无法为 '%s' 找到远程助手" -#: transport-helper.c:160 transport-helper.c:571 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "无法复制助手输出文件句柄" -#: transport-helper.c:211 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git" -#: transport-helper.c:217 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "远程助手需要实现 refspec 能力" -#: transport-helper.c:284 transport-helper.c:425 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s 意外地说：'%s'" -#: transport-helper.c:414 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s 也锁定了 %s" -#: transport-helper.c:493 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "不能执行 fast-import" -#: transport-helper.c:516 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "执行 fast-import 出错" -#: transport-helper.c:545 transport-helper.c:1134 +#: transport-helper.c:533 transport-helper.c:1105 #, c-format msgid "could not read ref %s" msgstr "无法读取引用 %s" -#: transport-helper.c:590 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "连接时未知的响应：%s" -#: transport-helper.c:612 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "协议不支持设置远程服务路径" -#: transport-helper.c:614 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c:660 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "不能连接到子服务 %s" -#: transport-helper.c:736 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "预期 ok/error，助手说 '%s'" -#: transport-helper.c:789 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "助手报告 %s 的意外状态" -#: transport-helper.c:850 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "助手 %s 不支持 dry-run" -#: transport-helper.c:853 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "助手 %s 不支持 --signed" -#: transport-helper.c:856 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "助手 %s 不支持 --signed=if-asked" -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "助手 %s 不支持 --atomic" - -#: transport-helper.c:867 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "助手 %s 不支持 'push-option'" -#: transport-helper.c:965 +#: transport-helper.c:945 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支持 push，需要引用表达式" -#: transport-helper.c:970 +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'force'" msgstr "助手 %s 不支持 'force'" -#: transport-helper.c:1017 +#: transport-helper.c:997 msgid "couldn't run fast-export" msgstr "无法执行 fast-export" -#: transport-helper.c:1022 +#: transport-helper.c:1002 msgid "error while running fast-export" msgstr "执行 fast-export 时出错" -#: transport-helper.c:1047 +#: transport-helper.c:1027 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8357,67 +7498,67 @@ msgstr "" "没有共同的引用并且也没有指定，什么也不会做。\n" "可能您应该指定一个分支如 'master'。\n" -#: transport-helper.c:1120 +#: transport-helper.c:1091 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式错误的响应：%s" -#: transport-helper.c:1272 +#: transport-helper.c:1244 #, c-format msgid "read(%s) failed" msgstr "读取（%s）失败" -#: transport-helper.c:1299 +#: transport-helper.c:1271 #, c-format msgid "write(%s) failed" msgstr "写（%s）失败" -#: transport-helper.c:1348 +#: transport-helper.c:1320 #, c-format msgid "%s thread failed" msgstr "%s 线程失败" -#: transport-helper.c:1352 +#: transport-helper.c:1324 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 线程等待失败：%s" -#: transport-helper.c:1371 transport-helper.c:1375 +#: transport-helper.c:1343 transport-helper.c:1347 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能启动线程来拷贝数据：%s" -#: transport-helper.c:1412 +#: transport-helper.c:1384 #, c-format msgid "%s process failed to wait" msgstr "%s 进程等待失败" -#: transport-helper.c:1416 +#: transport-helper.c:1388 #, c-format msgid "%s process failed" msgstr "%s 进程失败" -#: transport-helper.c:1434 transport-helper.c:1443 +#: transport-helper.c:1406 transport-helper.c:1415 msgid "can't start thread for copying data" msgstr "不能启动线程来拷贝数据" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "太短的树对象" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "树对象中的条目模式错误" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "树对象条目中空的文件名" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "太短的树文件" -#: unpack-trees.c:110 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8426,7 +7567,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s请在切换分支前提交或贮藏您的修改。" -#: unpack-trees.c:112 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -8435,7 +7576,7 @@ msgstr "" "您对下列文件的本地修改将被检出操作覆盖：\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8444,7 +7585,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s请在合并前提交或贮藏您的修改。" -#: unpack-trees.c:117 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -8453,7 +7594,7 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8462,7 +7603,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s请在 %s 之前提交或贮藏您的修改。" -#: unpack-trees.c:122 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -8471,7 +7612,7 @@ msgstr "" "您对下列文件的本地修改将被 %s 覆盖：\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -8480,7 +7621,7 @@ msgstr "" "更新如下目录将会丢失其中未跟踪的文件：\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8489,7 +7630,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s请在切换分支之前移动或删除。" -#: unpack-trees.c:133 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -8498,7 +7639,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8507,7 +7648,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:138 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -8516,7 +7657,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8525,7 +7666,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:143 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -8534,7 +7675,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8544,7 +7685,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s请在切换分支前移动或删除。" -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -8554,7 +7695,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8563,7 +7704,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s请在合并前移动或删除。" -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -8572,7 +7713,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8581,7 +7722,7 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s请在 %s 前移动或删除。" -#: unpack-trees.c:161 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -8590,12 +7731,12 @@ msgstr "" "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "条目 '%s' 和 '%s' 重叠。无法合并。" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -8604,7 +7745,7 @@ msgstr "" "无法更新稀疏检出：如下条目不是最新：\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -8614,7 +7755,7 @@ msgstr "" "工作区中下列文件将被稀疏检出更新所覆盖：\n" "%s" -#: unpack-trees.c:176 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -8624,7 +7765,7 @@ msgstr "" "工作区中下列文件将被稀疏检出更新所删除：\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -8633,16 +7774,16 @@ msgstr "" "无法更新子模组：\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "正在终止\n" -#: unpack-trees.c:317 +#: unpack-trees.c:318 msgid "Updating files" msgstr "正在更新文件" -#: unpack-trees.c:349 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -8651,10 +7792,6 @@ msgstr "" "以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n" "并且碰撞组中只有一个文件存在工作区中：\n" -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "正在更新索引标志" - #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "无效的 URL 方案名称或丢失 '://' 后缀" @@ -8684,51 +7821,47 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" -#: walker.c:170 -msgid "Fetching objects" -msgstr "正在获取对象" - -#: worktree.c:259 builtin/am.c:2099 +#: worktree.c:258 builtin/am.c:2095 #, c-format msgid "failed to read '%s'" msgstr "读取 '%s' 失败" -#: worktree.c:305 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:316 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:328 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:334 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件，错误码 %d" -#: worktree.c:342 +#: worktree.c:341 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" -#: wrapper.c:186 wrapper.c:356 +#: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "无法打开 '%s' 进行读写" -#: wrapper.c:387 wrapper.c:588 +#: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "不能访问 '%s'" -#: wrapper.c:596 +#: wrapper.c:632 msgid "unable to get current working directory" msgstr "不能获取当前工作目录" @@ -9083,95 +8216,85 @@ msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）" # 译者：注意保持前导空格 #: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）" - -# 译者：注意保持前导空格 -#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）" -#: wt-status.c:1449 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "还原操作正在行中。" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者：注意保持前导空格 -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " （解决冲突并执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1461 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " （执行 \"git revert --continue\" 以继续）" # 译者：注意保持前导空格 -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " （所有冲突已解决：执行 \"git revert --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " （使用 \"git revert --skip\" 跳过此补丁）" - -# 译者：注意保持前导空格 -#: wt-status.c:1468 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）" -#: wt-status.c:1478 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1482 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者：注意保持前导空格 -#: wt-status.c:1485 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:1694 +#: wt-status.c:1690 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1701 +#: wt-status.c:1697 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中；至 " -#: wt-status.c:1703 +#: wt-status.c:1699 msgid "rebase in progress; onto " msgstr "变基操作正在进行中；至 " -#: wt-status.c:1713 +#: wt-status.c:1709 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1730 +#: wt-status.c:1726 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1731 +#: wt-status.c:1727 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1745 +#: wt-status.c:1741 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1747 +#: wt-status.c:1743 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1751 +#: wt-status.c:1747 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9181,230 +8304,221 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n" "但您需要小心不要忘了添加新文件（参见 'git help status'）。" -#: wt-status.c:1757 +#: wt-status.c:1753 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1759 +#: wt-status.c:1755 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1765 +#: wt-status.c:1761 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1770 +#: wt-status.c:1766 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1773 +#: wt-status.c:1769 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1776 +#: wt-status.c:1772 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1779 +#: wt-status.c:1775 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1782 +#: wt-status.c:1778 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1781 wt-status.c:1786 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1788 +#: wt-status.c:1784 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1792 +#: wt-status.c:1788 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1905 +#: wt-status.c:1901 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:1909 +#: wt-status.c:1905 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" -#: wt-status.c:1940 +#: wt-status.c:1936 msgid "different" msgstr "不同" # 译者：注意保持句尾空格 -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1938 wt-status.c:1946 msgid "behind " msgstr "落后 " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1941 wt-status.c:1944 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2466 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s：您有未暂存的变更。" -#: wt-status.c:2476 +#: wt-status.c:2472 msgid "additionally, your index contains uncommitted changes." msgstr "另外，您的索引中包含未提交的变更。" -#: wt-status.c:2478 +#: wt-status.c:2474 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的变更。" -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "删除 '%s' 失败" - -#: builtin/add.c:26 +#: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <路径规格>..." -#: builtin/add.c:88 +#: builtin/add.c:84 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:93 builtin/commit.c:288 +#: builtin/add.c:89 builtin/commit.c:288 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:103 +#: builtin/add.c:99 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:174 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:266 builtin/rev-parse.c:899 +#: builtin/add.c:234 builtin/rev-parse.c:896 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:277 +#: builtin/add.c:245 #, c-format msgid "Could not open '%s' for writing." msgstr "无法为写入打开 '%s'。" -#: builtin/add.c:281 +#: builtin/add.c:249 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:284 +#: builtin/add.c:252 msgid "editing patch failed" msgstr "编辑补丁失败" -#: builtin/add.c:287 +#: builtin/add.c:255 #, c-format msgid "Could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/add.c:289 +#: builtin/add.c:257 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:294 +#: builtin/add.c:262 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:302 +#: builtin/add.c:270 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "演习" -#: builtin/add.c:325 +#: builtin/add.c:293 msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 +#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 msgid "select hunks interactively" msgstr "交互式挑选数据块" -#: builtin/add.c:327 +#: builtin/add.c:295 msgid "edit current diff and apply" msgstr "编辑当前差异并应用" -#: builtin/add.c:328 +#: builtin/add.c:296 msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" -#: builtin/add.c:329 +#: builtin/add.c:297 msgid "update tracked files" msgstr "更新已跟踪的文件" -#: builtin/add.c:330 +#: builtin/add.c:298 msgid "renormalize EOL of tracked files (implies -u)" msgstr "对已跟踪文件（暗含 -u）重新归一换行符" -#: builtin/add.c:331 +#: builtin/add.c:299 msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:332 +#: builtin/add.c:300 msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:335 +#: builtin/add.c:303 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" -#: builtin/add.c:337 +#: builtin/add.c:305 msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" -#: builtin/add.c:338 +#: builtin/add.c:306 msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:339 +#: builtin/add.c:307 msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" -#: builtin/add.c:343 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "创建一个嵌入式仓库时给予警告" -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "`git stash -p` 的后端" - -#: builtin/add.c:363 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9421,8 +8535,9 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n" -"内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n" +"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并" +"且不知道该如何获取它。\n" +"如果您要添加一个子模组，使用：\n" "\n" "\tgit submodule add <url> %s\n" "\n" @@ -9432,170 +8547,146 @@ msgstr "" "\n" "参见 \"git help submodule\" 获取更多信息。" -#: builtin/add.c:391 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"如果您确实要添加它们，使用 -f 参数。\n" -"运行下面的命令来关闭本消息\n" -"\"git config advice.addIgnoredFile false\"" +#: builtin/add.c:372 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:419 +#: builtin/add.c:379 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file 与 --edit 不兼容" - -#: builtin/add.c:476 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:479 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:483 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file 与路径表达式参数不兼容" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul 需要 --pathspec-from-file" - -#: builtin/add.c:512 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"也许您想要执行 'git add .'？\n" -"运行下面的命令来关闭本消息\n" -"\"git config advice.addEmptyPathspec false\"" +#: builtin/add.c:446 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "也许您想要执行 'git add .'？\n" -#: builtin/am.c:352 +#: builtin/am.c:348 msgid "could not parse author script" msgstr "不能解析作者脚本" -#: builtin/am.c:436 +#: builtin/am.c:432 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:478 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/am.c:516 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:542 +#: builtin/am.c:538 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:730 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:795 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:843 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:848 builtin/am.c:860 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:855 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:948 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "创建目录 '%s' 失败" -#: builtin/am.c:958 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "拆分补丁失败。" -#: builtin/am.c:1089 +#: builtin/am.c:1084 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "无法写入索引文件" + +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" -#: builtin/am.c:1090 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" -#: builtin/am.c:1091 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" -#: builtin/am.c:1174 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" -#: builtin/am.c:1202 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "补丁为空。" -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "在提交 %s 中缺失作者行" - -#: builtin/am.c:1270 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" -#: builtin/am.c:1489 +#: builtin/am.c:1299 +#, c-format +msgid "unable to parse commit %s" +msgstr "不能解析提交 %s" + +#: builtin/am.c:1496 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1491 +#: builtin/am.c:1498 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." -#: builtin/am.c:1510 +#: builtin/am.c:1517 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9603,24 +8694,24 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1516 +#: builtin/am.c:1523 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1542 +#: builtin/am.c:1549 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1574 +#: builtin/am.c:1581 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1628 builtin/am.c:1632 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" -#: builtin/am.c:1643 +#: builtin/am.c:1650 msgid "Commit Body is:" msgstr "提交内容为：" @@ -9629,39 +8720,35 @@ msgstr "提交内容为：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1660 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "无法写入索引文件" - -#: builtin/am.c:1704 +#: builtin/am.c:1710 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" -#: builtin/am.c:1744 builtin/am.c:1812 +#: builtin/am.c:1750 builtin/am.c:1818 #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" -#: builtin/am.c:1761 +#: builtin/am.c:1767 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1767 +#: builtin/am.c:1773 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" +#: builtin/am.c:1777 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" -#: builtin/am.c:1815 +#: builtin/am.c:1821 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9671,7 +8758,7 @@ msgstr "" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1822 +#: builtin/am.c:1828 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9682,169 +8769,159 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 +#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:1981 +#: builtin/am.c:1987 msgid "failed to clean index" msgstr "清空索引失败" -#: builtin/am.c:2025 +#: builtin/am.c:2031 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2132 +#: builtin/am.c:2128 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值：%s" -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "无效的 --show-current-patch 值：%s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容" - -#: builtin/am.c:2207 +#: builtin/am.c:2164 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2208 +#: builtin/am.c:2165 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2214 +#: builtin/am.c:2171 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2216 +#: builtin/am.c:2173 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2218 +#: builtin/am.c:2175 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 +#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:296 builtin/stash.c:806 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2221 +#: builtin/am.c:2178 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2224 +#: builtin/am.c:2181 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" -#: builtin/am.c:2226 +#: builtin/am.c:2183 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2228 +#: builtin/am.c:2185 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2230 +#: builtin/am.c:2187 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2232 +#: builtin/am.c:2189 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2235 +#: builtin/am.c:2192 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" -#: builtin/am.c:2238 +#: builtin/am.c:2195 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 +#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2224 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 +#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 +#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 +#: parse-options.h:141 parse-options.h:162 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2264 +#: builtin/am.c:2221 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2270 +#: builtin/am.c:2227 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2272 +#: builtin/am.c:2229 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2275 +#: builtin/am.c:2232 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2278 +#: builtin/am.c:2235 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2281 +#: builtin/am.c:2238 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2284 +#: builtin/am.c:2241 msgid "abort the patching operation but keep HEAD where it is." msgstr "终止补丁操作但保持 HEAD 不变。" -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "显示正在应用的补丁" +#: builtin/am.c:2244 +msgid "show the patch being applied." +msgstr "显示正在应用的补丁。" -#: builtin/am.c:2293 +#: builtin/am.c:2248 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2295 +#: builtin/am.c:2250 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 +#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 +#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2301 +#: builtin/am.c:2256 msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" -#: builtin/am.c:2319 +#: builtin/am.c:2274 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -9852,16 +8929,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2326 +#: builtin/am.c:2281 msgid "failed to read the index" msgstr "读取索引失败" -#: builtin/am.c:2341 +#: builtin/am.c:2296 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" -#: builtin/am.c:2365 +#: builtin/am.c:2320 #, c-format msgid "" "Stray %s directory found.\n" @@ -9870,11 +8947,11 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2371 +#: builtin/am.c:2326 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: builtin/am.c:2381 +#: builtin/am.c:2336 msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" @@ -9996,33 +9073,33 @@ msgstr "我们没有在二分查找。\n" msgid "'%s' is not a valid commit" msgstr "'%s' 不是一个有效的提交" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:215 #, c-format msgid "Bad bisect_write argument: %s" msgstr "坏的 bisect_write 参数：%s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "无法获取版本 '%s' 的对象 ID" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:232 #, c-format msgid "couldn't open the file '%s'" msgstr "无法打开文件 '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:285 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10031,7 +9108,7 @@ msgstr "" "您需要给我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:289 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10042,7 +9119,7 @@ msgstr "" "然后需要提供我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一个 %s 提交的情况下二分查找" @@ -10052,22 +9129,22 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:329 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:376 msgid "no terms defined" msgstr "未定义术语" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:379 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:389 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10076,262 +9153,266 @@ msgstr "" "命令 'git bisect terms' 的参数 %s 无效。\n" "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:478 +#: builtin/bisect--helper.c:475 #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" -#: builtin/bisect--helper.c:482 +#: builtin/bisect--helper.c:479 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起来不是一个有效的版本" -#: builtin/bisect--helper.c:514 +#: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" -#: builtin/bisect--helper.c:529 +#: builtin/bisect--helper.c:526 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" msgstr "不会在做了 cg-seek 的树上做二分查找" -#: builtin/bisect--helper.c:553 +#: builtin/bisect--helper.c:550 msgid "bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" -#: builtin/bisect--helper.c:577 +#: builtin/bisect--helper.c:574 #, c-format msgid "invalid ref: '%s'" msgstr "无效的引用：'%s'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:630 msgid "perform 'git bisect next'" msgstr "执行 'git bisect next'" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:632 msgid "write the terms to .git/BISECT_TERMS" msgstr "将术语写入 .git/BISECT_TERMS" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:634 msgid "cleanup the bisection state" msgstr "清除二分查找状态" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:636 msgid "check for expected revs" msgstr "检查预期的版本" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:638 msgid "reset the bisection state" msgstr "清除二分查找状态" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:640 msgid "write out the bisection state in BISECT_LOG" msgstr "将二分查找的状态写入 BISECT_LOG" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:642 msgid "check and set terms in a bisection state" msgstr "在一个二分查找状态中检查和设置术语" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:644 msgid "check whether bad or good terms exist" msgstr "检查坏的或好的术语是否存在" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:646 msgid "print out the bisect terms" msgstr "打印二分查找术语" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:648 msgid "start the bisect session" msgstr "启动二分查找过程" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:650 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非检出当前提交" -#: builtin/bisect--helper.c:655 +#: builtin/bisect--helper.c:652 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 无日志" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:669 msgid "--write-terms requires two arguments" msgstr "--write-terms 需要两个参数" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:673 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state 不带参数" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:680 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 无需参数或者需要一个提交" -#: builtin/bisect--helper.c:688 +#: builtin/bisect--helper.c:684 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write 需要 4 或 5 个参数" -#: builtin/bisect--helper.c:694 +#: builtin/bisect--helper.c:690 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms 需要 3 个参数" -#: builtin/bisect--helper.c:700 +#: builtin/bisect--helper.c:696 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 个参数" -#: builtin/bisect--helper.c:706 +#: builtin/bisect--helper.c:702 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 个参数" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "期望一个颜色：%s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "必须以一个颜色结尾" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "设置 blame.coloring 中的无效取值" -#: builtin/blame.c:822 +#: builtin/blame.c:823 #, c-format msgid "cannot find revision %s to ignore" msgstr "不能找到要忽略的版本 %s" -#: builtin/blame.c:844 +#: builtin/blame.c:845 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:845 +#: builtin/blame.c:846 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:846 +#: builtin/blame.c:847 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:847 +#: builtin/blame.c:848 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:848 +#: builtin/blame.c:849 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:849 +#: builtin/blame.c:850 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:850 +#: builtin/blame.c:851 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:851 +#: builtin/blame.c:852 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:852 +#: builtin/blame.c:853 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:853 +#: builtin/blame.c:854 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:854 +#: builtin/blame.c:855 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:855 +#: builtin/blame.c:856 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:856 +#: builtin/blame.c:857 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" -#: builtin/blame.c:857 +#: builtin/blame.c:858 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:858 +#: builtin/blame.c:859 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:859 +#: builtin/blame.c:860 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:860 builtin/log.c:1702 +#: builtin/blame.c:861 builtin/log.c:1629 msgid "rev" msgstr "版本" -#: builtin/blame.c:860 +#: builtin/blame.c:861 msgid "Ignore <rev> when blaming" msgstr "在执行 blame 操作时忽略 <版本>" -#: builtin/blame.c:861 +#: builtin/blame.c:862 msgid "Ignore revisions from <file>" msgstr "忽略来自 <文件> 中的版本" -#: builtin/blame.c:862 +#: builtin/blame.c:863 msgid "color redundant metadata from previous line differently" msgstr "使用颜色间隔输出与前一行不同的重复元信息" -#: builtin/blame.c:863 +#: builtin/blame.c:864 msgid "color lines by age" msgstr "依据时间着色" -#: builtin/blame.c:864 +#: builtin/blame.c:871 +msgid "Use an experimental heuristic to improve diffs" +msgstr "使用一个试验性的启发式算法改进差异显示" + +#: builtin/blame.c:873 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:865 +#: builtin/blame.c:874 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:866 +#: builtin/blame.c:875 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:876 builtin/blame.c:877 msgid "score" msgstr "得分" -#: builtin/blame.c:867 +#: builtin/blame.c:876 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:868 +#: builtin/blame.c:877 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:869 +#: builtin/blame.c:878 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" -#: builtin/blame.c:921 +#: builtin/blame.c:929 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" @@ -10343,18 +9424,18 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:980 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c:1079 +#: builtin/blame.c:1087 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" -#: builtin/blame.c:1125 +#: builtin/blame.c:1133 msgid "Blaming lines" msgstr "追踪代码行" @@ -10565,7 +9646,7 @@ msgstr "设置跟踪模式（参见 git-pull(1)）" msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:626 builtin/rebase.c:513 +#: builtin/branch.c:626 builtin/rebase.c:485 msgid "upstream" msgstr "上游" @@ -10574,7 +9655,7 @@ msgid "change the upstream info" msgstr "改变上游信息" #: builtin/branch.c:627 -msgid "unset the upstream info" +msgid "Unset the upstream info" msgstr "取消上游信息的设置" #: builtin/branch.c:628 @@ -10676,7 +9757,7 @@ msgstr "排序和过滤属于大小写不敏感" msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c:684 builtin/clone.c:785 +#: builtin/branch.c:684 builtin/clone.c:761 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" @@ -10762,65 +9843,20 @@ msgid "" msgstr "" "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<选项>] <文件>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <文件> [<引用名>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <文件> [<引用名>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "不显示进度表" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "显示进度表" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "在对象写入阶段显示进度表" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "当进度表显示时类似于 --all-progress" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "需要一个仓库来创建包。" - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "不显示 bundle 细节" - -#: builtin/bundle.c:119 +#: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:58 +msgid "Need a repository to create a bundle." +msgstr "需要一个仓库来创建包。" + +#: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "需要一个仓库来解包。" -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "冗长输出；必须置于子命令之前" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "未知子命令：%s" - -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:594 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10828,7 +9864,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:595 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10836,71 +9872,71 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:617 +#: builtin/cat-file.c:616 msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:634 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:635 msgid "show object type" msgstr "显示对象类型" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:636 msgid "show object size" msgstr "显示对象大小" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:638 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:639 msgid "pretty-print object's content" msgstr "美观地打印对象的内容" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:641 msgid "for blob objects, run textconv on object's content" msgstr "对于数据对象，对其内容做文本转换" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:643 msgid "for blob objects, run filters on object's content" msgstr "对于数据对象，对其内容做过滤" -#: builtin/cat-file.c:645 git-submodule.sh:1002 +#: builtin/cat-file.c:644 git-submodule.sh:936 msgid "blob" msgstr "数据对象" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:645 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:647 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:648 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:650 msgid "show info and content of objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息和内容" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:654 msgid "show info about objects fed from the standard input" msgstr "显示从标准输入提供的对象的信息" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:658 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:660 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check 参数显示所有对象" -#: builtin/cat-file.c:663 +#: builtin/cat-file.c:662 msgid "do not order --batch-all-objects output" msgstr "不要对 --batch-all-objects 的输出排序" @@ -10928,8 +9964,8 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 +#: builtin/worktree.c:507 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -10941,27 +9977,27 @@ msgstr "显示未匹配的输入路径" msgid "ignore index when checking" msgstr "检查时忽略索引" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:160 msgid "cannot specify pathnames with --stdin" msgstr "不能同时指定路径及 --stdin 参数" -#: builtin/check-ignore.c:166 +#: builtin/check-ignore.c:163 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 参数共用才有意义" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c:165 msgid "no path specified" msgstr "未指定路径" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:169 msgid "--quiet is only valid with a single pathname" msgstr "参数 --quiet 只在提供一个路径名时有效" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:171 msgid "cannot have both --quiet and --verbose" msgstr "不能同时提供 --quiet 和 --verbose 参数" -#: builtin/check-ignore.c:177 +#: builtin/check-ignore.c:174 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" @@ -11019,9 +10055,9 @@ msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 +#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/worktree.c:680 msgid "string" msgstr "字符串" @@ -11049,98 +10085,98 @@ msgstr "git switch [<选项>] [<分支>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<选项>] [--source=<分支>] <文件>..." -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:172 builtin/checkout.c:211 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:177 builtin/checkout.c:216 +#: builtin/checkout.c:174 builtin/checkout.c:213 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:193 +#: builtin/checkout.c:190 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" -#: builtin/checkout.c:243 +#: builtin/checkout.c:240 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" -#: builtin/checkout.c:261 +#: builtin/checkout.c:258 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" -#: builtin/checkout.c:277 +#: builtin/checkout.c:274 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:377 +#: builtin/checkout.c:374 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c:382 +#: builtin/checkout.c:379 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "从 %2$s 更新了 %1$d 个路径" msgstr[1] "从 %2$s 更新了 %1$d 个路径" -#: builtin/checkout.c:389 +#: builtin/checkout.c:386 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "从索引区更新了 %d 个路径" msgstr[1] "从索引区更新了 %d 个路径" -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 +#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 +#: builtin/checkout.c:419 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" -#: builtin/checkout.c:425 builtin/checkout.c:428 +#: builtin/checkout.c:422 builtin/checkout.c:425 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:432 +#: builtin/checkout.c:429 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:436 +#: builtin/checkout.c:433 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" -#: builtin/checkout.c:440 +#: builtin/checkout.c:437 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" -#: builtin/checkout.c:445 builtin/checkout.c:450 +#: builtin/checkout.c:442 builtin/checkout.c:447 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:509 builtin/checkout.c:516 +#: builtin/checkout.c:506 builtin/checkout.c:513 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 +#: builtin/checkout.c:679 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:734 +#: builtin/checkout.c:729 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11149,51 +10185,56 @@ msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" -#: builtin/checkout.c:837 +#: builtin/checkout.c:736 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "下列文件暂存的修改可能会丢失：%s" + +#: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" -#: builtin/checkout.c:879 +#: builtin/checkout.c:875 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:883 builtin/clone.c:717 +#: builtin/checkout.c:879 builtin/clone.c:714 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:887 +#: builtin/checkout.c:883 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:886 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:890 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:896 builtin/checkout.c:1320 +#: builtin/checkout.c:892 builtin/checkout.c:1289 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:898 +#: builtin/checkout.c:894 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 -#: builtin/checkout.c:949 +#: builtin/checkout.c:945 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:955 +#: builtin/checkout.c:951 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11214,7 +10255,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:974 +#: builtin/checkout.c:970 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11241,19 +10282,28 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1005 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1009 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1053 builtin/checkout.c:1315 +#: builtin/checkout.c:1049 builtin/checkout.c:1284 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1176 +msgid "only one reference expected" +msgstr "预期只有一个引用" + +#: builtin/checkout.c:1193 +#, c-format +msgid "only one reference expected, %d given." +msgstr "应只有一个引用，却给出了 %d 个" + +#: builtin/checkout.c:1230 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11262,70 +10312,37 @@ msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"如果您想要检出一个远程跟踪分支，例如在 'origin' 上的，您可以使用分支\n" -"全名和 --track 选项：\n" -"\n" -" git checkout --track origin/<名称>\n" -"\n" -"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" -"名称，可以在配置中设置 checkout.defaultRemote=origin。" - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "只期望一个引用" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "应只有一个引用，却给出了 %d 个" - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 +#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" -#: builtin/checkout.c:1287 builtin/checkout.c:1649 +#: builtin/checkout.c:1256 builtin/checkout.c:1618 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:1334 +#: builtin/checkout.c:1303 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" -#: builtin/checkout.c:1336 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" -#: builtin/checkout.c:1337 builtin/checkout.c:1345 +#: builtin/checkout.c:1306 builtin/checkout.c:1314 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" -#: builtin/checkout.c:1340 +#: builtin/checkout.c:1309 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1325 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11333,7 +10350,7 @@ msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1360 +#: builtin/checkout.c:1329 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11341,7 +10358,7 @@ msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1333 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11349,7 +10366,7 @@ msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1368 +#: builtin/checkout.c:1337 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11357,7 +10374,7 @@ msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1341 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11365,211 +10382,230 @@ msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1345 msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" -#: builtin/checkout.c:1383 +#: builtin/checkout.c:1352 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 +#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 +#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 +#: builtin/checkout.c:1378 builtin/checkout.c:1383 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1380 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不带 <起始点>" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1388 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1426 +#: builtin/checkout.c:1395 msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 +#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "强制显示进度报告" -#: builtin/checkout.c:1469 +#: builtin/checkout.c:1438 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 msgid "style" msgstr "风格" -#: builtin/checkout.c:1471 +#: builtin/checkout.c:1440 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1483 builtin/worktree.c:496 +#: builtin/checkout.c:1452 builtin/worktree.c:504 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1453 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1486 +#: builtin/checkout.c:1455 msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1488 +#: builtin/checkout.c:1457 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1490 builtin/merge.c:289 +#: builtin/checkout.c:1459 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1462 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1475 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1509 +#: builtin/checkout.c:1478 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1513 +#: builtin/checkout.c:1482 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1565 +#: builtin/checkout.c:1533 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1568 +#: builtin/checkout.c:1536 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1605 +#: builtin/checkout.c:1573 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1610 +#: builtin/checkout.c:1578 msgid "missing branch name; try -b" msgstr "缺少分支名，尝试 -b" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1611 #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" -#: builtin/checkout.c:1658 +#: builtin/checkout.c:1623 +msgid "you must specify path(s) to restore" +msgstr "您必须指定一个要恢复的路径" + +#: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1638 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" -#: builtin/checkout.c:1669 +#: builtin/checkout.c:1642 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file 与 --detach 不兼容" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file 与 --patch 不兼容" - -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1646 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "您必须指定一个要恢复的路径" +#: builtin/checkout.c:1666 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"'%s' 匹配了一个以上的远程跟踪分支。\n" +"我们发现 %d 个远程仓库具有同名分支。所以我们转而尝试将这个参数解析为\n" +"路径，但是也失败了！\n" +"\n" +"如果您想要检出一个远程跟踪分支，例如在远程仓库 'origin' 上的，您可以\n" +"使用分支全名和 --track 选项：\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"如果您总是喜欢使用模糊的简短分支名 <name>，而不喜欢如 'origin' 的远程\n" +"仓库名，可以在配置中设置 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 +#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1724 +#: builtin/checkout.c:1692 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1726 +#: builtin/checkout.c:1694 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1727 +#: builtin/checkout.c:1695 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1729 +#: builtin/checkout.c:1697 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" -#: builtin/checkout.c:1730 +#: builtin/checkout.c:1698 msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" -#: builtin/checkout.c:1775 +#: builtin/checkout.c:1734 msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" -#: builtin/checkout.c:1777 +#: builtin/checkout.c:1736 msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1738 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜测 'git switch <无此分支>'" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1740 msgid "throw away local modifications" msgstr "丢弃本地修改" -#: builtin/checkout.c:1813 +#: builtin/checkout.c:1772 msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" -#: builtin/checkout.c:1815 +#: builtin/checkout.c:1774 msgid "restore the index" msgstr "恢复索引" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1776 msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1778 msgid "ignore unmerged entries" msgstr "忽略未合并条目" -#: builtin/checkout.c:1820 +#: builtin/checkout.c:1779 msgid "use overlay mode" msgstr "使用叠加模式" @@ -11609,7 +10645,7 @@ msgstr "删除 %s 失败" msgid "could not lstat %s\n" msgstr "不能对 %s 调用 lstat\n" -#: builtin/clean.c:301 git-add--interactive.perl:595 +#: builtin/clean.c:300 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11622,7 +10658,7 @@ msgstr "" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" -#: builtin/clean.c:305 git-add--interactive.perl:604 +#: builtin/clean.c:304 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11643,33 +10679,38 @@ msgstr "" "* - 选择所有选项\n" " - （空）结束选择\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:520 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:663 +#: builtin/clean.c:662 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " -#: builtin/clean.c:700 +#: builtin/clean.c:699 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" -#: builtin/clean.c:721 +#: builtin/clean.c:720 msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:761 #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" -#: builtin/clean.c:795 +#: builtin/clean.c:786 git-add--interactive.perl:1763 +#, c-format +msgid "Bye.\n" +msgstr "再见。\n" + +#: builtin/clean.c:794 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11687,70 +10728,78 @@ msgstr "" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" -#: builtin/clean.c:831 +#: builtin/clean.c:821 git-add--interactive.perl:1849 +msgid "*** Commands ***" +msgstr "*** 命令 ***" + +#: builtin/clean.c:822 git-add--interactive.perl:1846 +msgid "What now" +msgstr "请选择" + +#: builtin/clean.c:830 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" -#: builtin/clean.c:847 +#: builtin/clean.c:846 msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" -#: builtin/clean.c:909 +#: builtin/clean.c:908 msgid "do not print names of files removed" msgstr "不打印删除文件的名称" -#: builtin/clean.c:911 +#: builtin/clean.c:910 msgid "force" msgstr "强制" -#: builtin/clean.c:912 +#: builtin/clean.c:911 msgid "interactive cleaning" msgstr "交互式清除" -#: builtin/clean.c:914 +#: builtin/clean.c:913 msgid "remove whole directories" msgstr "删除整个目录" -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" -#: builtin/clean.c:916 +#: builtin/clean.c:915 msgid "add <pattern> to ignore rules" msgstr "添加 <模式> 到忽略规则" -#: builtin/clean.c:917 +#: builtin/clean.c:916 msgid "remove ignored files, too" msgstr "也删除忽略的文件" -#: builtin/clean.c:919 +#: builtin/clean.c:918 msgid "remove only ignored files" msgstr "只删除忽略的文件" -#: builtin/clean.c:937 +#: builtin/clean.c:936 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:941 +#: builtin/clean.c:940 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:944 +#: builtin/clean.c:943 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" -#: builtin/clone.c:45 +#: builtin/clone.c:46 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" @@ -11798,18 +10847,18 @@ msgstr "模板目录" msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 +#: builtin/pack-objects.c:3314 builtin/repack.c:319 msgid "name" msgstr "名称" @@ -11825,8 +10874,8 @@ msgstr "检出 <分支> 而不是远程 HEAD" msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 +#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 +#: builtin/pull.c:226 msgid "depth" msgstr "深度" @@ -11834,7 +10883,7 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 msgid "time" msgstr "时间" @@ -11842,17 +10891,16 @@ msgstr "时间" msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 +#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 +#: builtin/rebase.c:1395 msgid "revision" msgstr "版本" -#: builtin/clone.c:130 builtin/fetch.c:173 +#: builtin/clone.c:130 builtin/fetch.c:157 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" @@ -11880,23 +10928,23 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 msgid "option to transmit" msgstr "传输选项" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 +#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 +#: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 +#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 +#: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" @@ -11904,11 +10952,7 @@ msgstr "只使用 IPv6 地址" msgid "any cloned submodules will use their remote-tracking branch" msgstr "任何克隆的子模组将使用它们的远程跟踪分支" -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "初始化稀疏检出文件，只包含根目录文件" - -#: builtin/clone.c:287 +#: builtin/clone.c:285 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11916,42 +10960,47 @@ msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" -#: builtin/clone.c:340 +#: builtin/clone.c:338 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" -#: builtin/clone.c:430 +#: builtin/clone.c:428 #, c-format msgid "failed to start iterator over '%s'" msgstr "无法在 '%s' 上启动迭代器" -#: builtin/clone.c:460 +#: builtin/clone.c:453 +#, c-format +msgid "failed to unlink '%s'" +msgstr "删除 '%s' 失败" + +#: builtin/clone.c:458 #, c-format msgid "failed to create link '%s'" msgstr "创建链接 '%s' 失败" -#: builtin/clone.c:464 +#: builtin/clone.c:462 #, c-format msgid "failed to copy file to '%s'" msgstr "拷贝文件至 '%s' 失败" -#: builtin/clone.c:469 +#: builtin/clone.c:467 #, c-format msgid "failed to iterate over '%s'" msgstr "无法在 '%s' 上迭代" -#: builtin/clone.c:494 +#: builtin/clone.c:492 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:508 +#: builtin/clone.c:506 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11961,134 +11010,130 @@ msgstr "" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git restore --source=HEAD :/' 重试\n" -#: builtin/clone.c:585 +#: builtin/clone.c:583 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:705 +#: builtin/clone.c:702 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "无法初始化稀疏检出" - -#: builtin/clone.c:776 +#: builtin/clone.c:752 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:807 +#: builtin/clone.c:783 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:862 +#: builtin/clone.c:833 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c:925 +#: builtin/clone.c:896 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:927 +#: builtin/clone.c:898 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:965 builtin/receive-pack.c:1950 +#: builtin/clone.c:938 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:969 +#: builtin/clone.c:942 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:982 +#: builtin/clone.c:955 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:985 +#: builtin/clone.c:958 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:998 +#: builtin/clone.c:971 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:1004 builtin/fetch.c:1796 +#: builtin/clone.c:977 builtin/fetch.c:1660 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:1014 +#: builtin/clone.c:987 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:1024 +#: builtin/clone.c:997 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 +#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 +#: builtin/worktree.c:303 builtin/worktree.c:335 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:1044 +#: builtin/clone.c:1017 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:1064 +#: builtin/clone.c:1037 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:1066 +#: builtin/clone.c:1039 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:1090 +#: builtin/clone.c:1063 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: builtin/clone.c:1154 +#: builtin/clone.c:1124 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1156 +#: builtin/clone.c:1126 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1158 +#: builtin/clone.c:1128 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1160 +#: builtin/clone.c:1130 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" -#: builtin/clone.c:1163 +#: builtin/clone.c:1133 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" -#: builtin/clone.c:1168 +#: builtin/clone.c:1138 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1243 builtin/clone.c:1251 +#: builtin/clone.c:1215 builtin/clone.c:1223 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1254 +#: builtin/clone.c:1226 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -12137,7 +11182,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -12165,13 +11210,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交对象 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 +#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 #: builtin/tag.c:412 msgid "message" msgstr "说明" -#: builtin/commit-tree.c:115 builtin/commit.c:1501 +#: builtin/commit-tree.c:115 builtin/commit.c:1500 msgid "commit message" msgstr "提交说明" @@ -12179,8 +11224,8 @@ msgstr "提交说明" msgid "read commit log message from file" msgstr "从文件中读取提交说明" -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/pull.c:194 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交签名" @@ -12252,102 +11297,94 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 树对象失败" -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file 和 -a 在一起没有意义" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "参数 --include/--only 不跟路径没有意义。" - -#: builtin/commit.c:376 +#: builtin/commit.c:356 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:385 +#: builtin/commit.c:362 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:400 +#: builtin/commit.c:376 msgid "unable to update temporary index" msgstr "无法更新临时索引" -#: builtin/commit.c:402 +#: builtin/commit.c:378 msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 +#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:479 +#: builtin/commit.c:455 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:481 +#: builtin/commit.c:457 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:489 +#: builtin/commit.c:465 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:508 +#: builtin/commit.c:484 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:606 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" -#: builtin/commit.c:608 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式错误的作者信息" -#: builtin/commit.c:627 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "格式错误的 --author 参数" -#: builtin/commit.c:680 +#: builtin/commit.c:656 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 +#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:730 builtin/shortlog.c:319 +#: builtin/commit.c:706 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:732 +#: builtin/commit.c:708 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:736 +#: builtin/commit.c:712 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:767 builtin/commit.c:783 +#: builtin/commit.c:743 builtin/commit.c:759 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:774 +#: builtin/commit.c:750 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:834 +#: builtin/commit.c:810 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:853 +#: builtin/commit.c:829 #, c-format msgid "" "\n" @@ -12361,7 +11398,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:858 +#: builtin/commit.c:834 #, c-format msgid "" "\n" @@ -12375,7 +11412,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:871 +#: builtin/commit.c:847 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12384,7 +11421,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:879 +#: builtin/commit.c:855 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12395,320 +11432,324 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:896 +#: builtin/commit.c:872 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:904 +#: builtin/commit.c:880 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:911 +#: builtin/commit.c:887 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:929 +#: builtin/commit.c:905 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:997 +#: builtin/commit.c:972 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:1011 builtin/tag.c:275 +#: builtin/commit.c:986 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1055 +#: builtin/commit.c:1030 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" -#: builtin/commit.c:1069 +#: builtin/commit.c:1044 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1087 builtin/commit.c:1327 +#: builtin/commit.c:1062 builtin/commit.c:1304 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1127 +#: builtin/commit.c:1102 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1171 +#: builtin/commit.c:1146 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1180 +#: builtin/commit.c:1155 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1183 +#: builtin/commit.c:1158 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1185 +#: builtin/commit.c:1160 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1188 +#: builtin/commit.c:1163 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1198 +#: builtin/commit.c:1173 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1200 +#: builtin/commit.c:1175 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1208 +#: builtin/commit.c:1183 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1225 +#: builtin/commit.c:1200 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1231 +#: builtin/commit.c:1202 +msgid "No paths with --include/--only does not make sense." +msgstr "参数 --include/--only 不跟路径没有意义。" + +#: builtin/commit.c:1208 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1362 builtin/commit.c:1524 +#: builtin/commit.c:1339 builtin/commit.c:1523 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1364 builtin/commit.c:1526 +#: builtin/commit.c:1341 builtin/commit.c:1525 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1366 +#: builtin/commit.c:1343 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1368 builtin/commit.c:1528 +#: builtin/commit.c:1345 builtin/commit.c:1527 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1370 +#: builtin/commit.c:1347 msgid "version" msgstr "版本" -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 +#: builtin/worktree.c:651 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1373 builtin/commit.c:1532 +#: builtin/commit.c:1350 builtin/commit.c:1531 msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1376 builtin/commit.c:1535 +#: builtin/commit.c:1353 builtin/commit.c:1534 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 +#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 +#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 msgid "mode" msgstr "模式" -#: builtin/commit.c:1379 builtin/commit.c:1538 +#: builtin/commit.c:1356 builtin/commit.c:1537 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1383 +#: builtin/commit.c:1360 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" -#: builtin/commit.c:1385 parse-options.h:192 +#: builtin/commit.c:1362 parse-options.h:179 msgid "when" msgstr "何时" -#: builtin/commit.c:1386 +#: builtin/commit.c:1363 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1388 +#: builtin/commit.c:1365 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1389 +#: builtin/commit.c:1366 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1391 +#: builtin/commit.c:1368 msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" -#: builtin/commit.c:1411 +#: builtin/commit.c:1388 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1494 +#: builtin/commit.c:1493 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1495 +#: builtin/commit.c:1494 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1497 +#: builtin/commit.c:1496 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 +#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "author" msgstr "作者" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1500 builtin/gc.c:538 +#: builtin/commit.c:1499 builtin/gc.c:539 msgid "date" msgstr "日期" -#: builtin/commit.c:1500 +#: builtin/commit.c:1499 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 +#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 msgid "commit" msgstr "提交" -#: builtin/commit.c:1502 +#: builtin/commit.c:1501 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1503 +#: builtin/commit.c:1502 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1504 +#: builtin/commit.c:1503 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1505 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1506 +#: builtin/commit.c:1505 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 +#: builtin/pull.c:163 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1508 +#: builtin/commit.c:1507 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1509 +#: builtin/commit.c:1508 msgid "force edit of commit" msgstr "强制编辑提交" -#: builtin/commit.c:1511 +#: builtin/commit.c:1510 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1516 +#: builtin/commit.c:1515 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1517 +#: builtin/commit.c:1516 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1519 +#: builtin/commit.c:1518 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1520 +#: builtin/commit.c:1519 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1521 +#: builtin/commit.c:1520 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1522 +#: builtin/commit.c:1521 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1523 +#: builtin/commit.c:1522 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1536 +#: builtin/commit.c:1535 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1544 +#: builtin/commit.c:1541 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1546 +#: builtin/commit.c:1543 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1619 +#: builtin/commit.c:1616 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1626 +#: builtin/commit.c:1623 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1645 +#: builtin/commit.c:1642 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1652 +#: builtin/commit.c:1649 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1657 +#: builtin/commit.c:1654 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1691 +#: builtin/commit.c:1688 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12717,74 +11758,73 @@ msgstr "" "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n" "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--" -"[no-]progress]" +#: builtin/commit-graph.c:11 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <对象目录>]" -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <对象目录>]" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" +msgstr "git commit-graph verify [--object-dir <对象目录>] [--shallow]" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "无法找到和 %s 匹配的对象目录" +"reachable|--stdin-packs|--stdin-commits] <split options>" +msgstr "git commit-graph write [--object-dir <对象目录>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] <split options>" -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 +#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 +#: builtin/log.c:1584 msgid "dir" msgstr "目录" -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 +#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 msgid "The object directory to store the graph" msgstr "保存图形的对象目录" -#: builtin/commit-graph.c:71 +#: builtin/commit-graph.c:57 msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交图形被拆分，只验证头一个文件" -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 #, c-format msgid "Could not open commit-graph '%s'" msgstr "无法打开提交图形 '%s'" -#: builtin/commit-graph.c:128 +#: builtin/commit-graph.c:164 msgid "start walk at all refs" msgstr "开始遍历所有引用" -#: builtin/commit-graph.c:130 +#: builtin/commit-graph.c:166 msgid "scan pack-indexes listed by stdin for commits" msgstr "从标准输入中的包索引文件列表中扫描提交" -#: builtin/commit-graph.c:132 +#: builtin/commit-graph.c:168 msgid "start walk at commits listed by stdin" msgstr "从标准输入中的提交开始扫描" -#: builtin/commit-graph.c:134 +#: builtin/commit-graph.c:170 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 文件中已有所有提交" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:172 msgid "allow writing an incremental commit-graph file" msgstr "允许写一个增量提交图形文件" -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 +#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本拆分提交图形中的最大提交数" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:176 msgid "maximum ratio between two levels of a split commit-graph" msgstr "一个拆分提交图形的两个级别之间的最大比率" -#: builtin/commit-graph.c:159 +#: builtin/commit-graph.c:191 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" @@ -12792,209 +11832,205 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "git config [<options>]" msgstr "git config [<选项>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:103 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "未能识别的 --type 参数，%s" -#: builtin/config.c:116 +#: builtin/config.c:115 msgid "only one type at a time" msgstr "一次只能一个类型" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "Config file location" msgstr "配置文件位置" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use global config file" msgstr "使用全局配置文件" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use system config file" msgstr "使用系统级配置文件" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "use repository config file" msgstr "使用仓库级配置文件" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "use per-worktree config file" msgstr "使用工作区级别的配置文件" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "use given config file" msgstr "使用指定的配置文件" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "blob-id" msgstr "数据对象 ID" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "Action" msgstr "操作" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value: name [value-regex]" msgstr "获取值：name [value-regex]" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "get all values: key [value-regex]" msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "get values for regexp: name-regex [value-regex]" msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "replace all matching variables: name value [value_regex]" msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "add a new variable: name value" msgstr "添加一个新的变量：name value" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a variable: name [value-regex]" msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "remove all matches: name [value-regex]" msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "remove a section: name" msgstr "删除一个小节：name" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "list all" msgstr "列出所有" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "open an editor" msgstr "打开一个编辑器" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "find the color configured: slot [default]" msgstr "获得配置的颜色：配置 [默认]" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置：配置 [stdout-is-tty]" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "Type" msgstr "类型" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:147 builtin/env--helper.c:38 msgid "value is given this type" msgstr "取值为该类型" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is decimal number" msgstr "值是十进制数" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "value is an expiry date" msgstr "值是一个到期日期" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "Other" msgstr "其它" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "terminate values with NUL byte" msgstr "终止值是 NUL 字节" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "show variable names only" msgstr "只显示变量名" -#: builtin/config.c:157 +#: builtin/config.c:156 msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" -#: builtin/config.c:158 +#: builtin/config.c:157 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）" - -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:158 builtin/env--helper.c:40 msgid "value" msgstr "取值" -#: builtin/config.c:160 +#: builtin/config.c:158 msgid "with --get, use default value when missing entry" msgstr "使用 --get 参数，当缺少设置时使用默认值" -#: builtin/config.c:174 +#: builtin/config.c:172 #, c-format msgid "wrong number of arguments, should be %d" msgstr "错误的参数个数，应该为 %d 个" -#: builtin/config.c:176 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "错误的参数个数，应该为从 %d 个到 %d 个" -#: builtin/config.c:324 +#: builtin/config.c:308 #, c-format msgid "invalid key pattern: %s" msgstr "无效键名模式：%s" -#: builtin/config.c:360 +#: builtin/config.c:344 #, c-format msgid "failed to format default config value: %s" msgstr "格式化默认配置值失败：%s" -#: builtin/config.c:417 +#: builtin/config.c:401 #, c-format msgid "cannot parse color '%s'" msgstr "无法解析颜色 '%s'" -#: builtin/config.c:459 +#: builtin/config.c:443 msgid "unable to parse default color value" msgstr "无法解析默认颜色值" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:496 builtin/config.c:742 msgid "not in a git directory" msgstr "不在 git 仓库中" -#: builtin/config.c:515 +#: builtin/config.c:499 msgid "writing to stdin is not supported" msgstr "不支持写到标准输入" -#: builtin/config.c:518 +#: builtin/config.c:502 msgid "writing config blobs is not supported" msgstr "不支持写到配置数据对象" -#: builtin/config.c:603 +#: builtin/config.c:587 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13009,23 +12045,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:611 msgid "only one config file at a time" msgstr "一次只能有一个配置文件" -#: builtin/config.c:632 +#: builtin/config.c:616 msgid "--local can only be used inside a git repository" msgstr "--local 只能在一个仓库内使用" -#: builtin/config.c:635 +#: builtin/config.c:619 msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在一个仓库内使用" -#: builtin/config.c:655 +#: builtin/config.c:638 msgid "$HOME not set" msgstr "$HOME 未设置" -#: builtin/config.c:679 +#: builtin/config.c:658 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13034,51 +12070,51 @@ msgstr "" "不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n" "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" -#: builtin/config.c:714 +#: builtin/config.c:688 msgid "--get-color and variable type are incoherent" msgstr "--get-color 和变量类型不兼容" -#: builtin/config.c:719 +#: builtin/config.c:693 msgid "only one action at a time" msgstr "一次只能有一个动作" -#: builtin/config.c:732 +#: builtin/config.c:706 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 仅适用于 --list 或 --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:712 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:744 +#: builtin/config.c:718 msgid "--default is only applicable to --get" msgstr "--default 仅适用于 --get" -#: builtin/config.c:757 +#: builtin/config.c:731 #, c-format msgid "unable to read config file '%s'" msgstr "无法读取配置文件 '%s'" -#: builtin/config.c:760 +#: builtin/config.c:734 msgid "error processing config file(s)" msgstr "处理配置文件出错" -#: builtin/config.c:770 +#: builtin/config.c:744 msgid "editing stdin is not supported" msgstr "不支持编辑标准输入" -#: builtin/config.c:772 +#: builtin/config.c:746 msgid "editing blobs is not supported" msgstr "不支持编辑数据对象" -#: builtin/config.c:786 +#: builtin/config.c:760 #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" -#: builtin/config.c:799 +#: builtin/config.c:773 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13087,7 +12123,7 @@ msgstr "" "无法用一个值覆盖多个值\n" " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:847 builtin/config.c:858 #, c-format msgid "no such section: %s" msgstr "无此小节：%s" @@ -13100,57 +12136,57 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" -#: builtin/describe.c:26 +#: builtin/describe.c:27 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<选项>] [<提交号>...]" -#: builtin/describe.c:27 +#: builtin/describe.c:28 msgid "git describe [<options>] --dirty" msgstr "git describe [<选项>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "头" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "轻量级的" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "附注的" -#: builtin/describe.c:275 +#: builtin/describe.c:273 #, c-format msgid "annotated tag %s not available" msgstr "附注标签 %s 无效" -#: builtin/describe.c:279 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s has no embedded name" msgstr "附注标签 %s 没有嵌入名称" -#: builtin/describe.c:281 +#: builtin/describe.c:279 #, c-format msgid "tag '%s' is really '%s' here" msgstr "标签 '%s' 的确是在 '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:323 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有标签准确匹配 '%s'" -#: builtin/describe.c:327 +#: builtin/describe.c:325 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" -#: builtin/describe.c:394 +#: builtin/describe.c:379 #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" -#: builtin/describe.c:421 +#: builtin/describe.c:405 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -13159,7 +12195,7 @@ msgstr "" "没有附注标签能描述 '%s'。\n" "然而，存在未附注标签：尝试 --tags。" -#: builtin/describe.c:425 +#: builtin/describe.c:409 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -13168,12 +12204,12 @@ msgstr "" "没有标签能描述 '%s'。\n" "尝试 --always，或者创建一些标签。" -#: builtin/describe.c:455 +#: builtin/describe.c:439 #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" -#: builtin/describe.c:458 +#: builtin/describe.c:442 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -13182,90 +12218,90 @@ msgstr "" "发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" -#: builtin/describe.c:526 +#: builtin/describe.c:510 #, c-format msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c:529 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" -#: builtin/describe.c:537 +#: builtin/describe.c:521 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是数据对象" -#: builtin/describe.c:551 +#: builtin/describe.c:535 msgid "find the tag that comes after the commit" msgstr "寻找该提交之后的标签" -#: builtin/describe.c:552 +#: builtin/describe.c:536 msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" -#: builtin/describe.c:553 +#: builtin/describe.c:537 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:554 +#: builtin/describe.c:538 msgid "use any tag, even unannotated" msgstr "使用任意标签，即使未附带注释" -#: builtin/describe.c:555 +#: builtin/describe.c:539 msgid "always use long format" msgstr "始终使用长提交号格式" -#: builtin/describe.c:556 +#: builtin/describe.c:540 msgid "only follow first parent" msgstr "只跟随第一个父提交" -#: builtin/describe.c:559 +#: builtin/describe.c:543 msgid "only output exact matches" msgstr "只输出精确匹配" -#: builtin/describe.c:561 +#: builtin/describe.c:545 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个标签（默认：10）" -#: builtin/describe.c:563 +#: builtin/describe.c:547 msgid "only consider tags matching <pattern>" msgstr "只考虑匹配 <模式> 的标签" -#: builtin/describe.c:565 +#: builtin/describe.c:549 msgid "do not consider tags matching <pattern>" msgstr "不考虑匹配 <模式> 的标签" -#: builtin/describe.c:567 builtin/name-rev.c:535 +#: builtin/describe.c:551 builtin/name-rev.c:422 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" -#: builtin/describe.c:568 builtin/describe.c:571 +#: builtin/describe.c:552 builtin/describe.c:555 msgid "mark" msgstr "标记" -#: builtin/describe.c:569 +#: builtin/describe.c:553 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" -#: builtin/describe.c:572 +#: builtin/describe.c:556 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" -#: builtin/describe.c:590 +#: builtin/describe.c:574 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 不兼容" -#: builtin/describe.c:619 +#: builtin/describe.c:603 msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" -#: builtin/describe.c:670 +#: builtin/describe.c:654 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 与提交号不兼容" -#: builtin/describe.c:672 +#: builtin/describe.c:656 msgid "--broken is incompatible with commit-ishes" msgstr "--broken 与提交号不兼容" @@ -13302,27 +12338,27 @@ msgstr "无法处理的对象 '%s'。" msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" -#: builtin/difftool.c:260 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "失败：%d" -#: builtin/difftool.c:302 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/difftool.c:304 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "无法读取符号链接文件 %s" -#: builtin/difftool.c:312 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13330,83 +12366,83 @@ msgstr "" "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--" "cc'）。" -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "工作区文件被留了下来。" -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "工具" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c:717 +#: builtin/difftool.c:709 msgid "passed to `diff`" msgstr "传递给 `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:724 msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作区或者 --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:731 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff 和 --no-index 不兼容" -#: builtin/difftool.c:742 +#: builtin/difftool.c:734 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui、--tool 和 --extcmd 互斥" -#: builtin/difftool.c:750 +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" @@ -13442,273 +12478,245 @@ msgstr "选项 `--default' 和 `type=ulong` 期望一个无符号长整型，不 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。" - -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c:1124 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:1154 +#: builtin/fast-export.c:1126 msgid "select handling of signed tags" msgstr "选择如何处理签名标签" -#: builtin/fast-export.c:1157 +#: builtin/fast-export.c:1129 msgid "select handling of tags that tag filtered objects" msgstr "选择当标签指向被过滤对象时该标签的处理方式" -#: builtin/fast-export.c:1160 +#: builtin/fast-export.c:1132 msgid "select handling of commit messages in an alternate encoding" msgstr "选择使用备用编码处理提交说明" -#: builtin/fast-export.c:1163 +#: builtin/fast-export.c:1135 msgid "Dump marks to this file" msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:1165 +#: builtin/fast-export.c:1137 msgid "Import marks from this file" msgstr "从这个文件导入标记" -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "从该文件导入标记（如果存在的话）" - -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c:1139 msgid "Fake a tagger when tags lack one" msgstr "当标签缺少标记者字段时，假装提供一个" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c:1141 msgid "Output full tree for each commit" msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:1175 +#: builtin/fast-export.c:1143 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c:1144 msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1177 builtin/log.c:1705 +#: builtin/fast-export.c:1145 builtin/log.c:1632 msgid "refspec" msgstr "引用规格" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1146 msgid "Apply refspec to exported refs" msgstr "对导出的引用应用引用规格" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c:1147 msgid "anonymize output" msgstr "匿名输出" -#: builtin/fast-export.c:1181 +#: builtin/fast-export.c:1149 msgid "Reference parents which are not in fast-export stream by object id" msgstr "引用父对象 ID 不在 fast-export 流中" -#: builtin/fast-export.c:1183 +#: builtin/fast-export.c:1151 msgid "Show original object ids of blobs/commits" msgstr "显示数据对象/提交的原始对象 ID" -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "对带有标记 ID 的标签做标记" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists" - -#: builtin/fetch.c:34 +#: builtin/fetch.c:30 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:31 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:32 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:33 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel 不能为负数" - -#: builtin/fetch.c:139 builtin/pull.c:184 +#: builtin/fetch.c:125 builtin/pull.c:203 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "为 git pull/fetch 设置上游" - -#: builtin/fetch.c:143 builtin/pull.c:187 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:145 builtin/pull.c:190 +#: builtin/fetch.c:129 builtin/pull.c:209 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" -#: builtin/fetch.c:146 +#: builtin/fetch.c:130 msgid "force overwrite of local reference" msgstr "强制覆盖本地引用" -#: builtin/fetch.c:148 +#: builtin/fetch.c:132 msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:150 builtin/pull.c:194 +#: builtin/fetch.c:134 builtin/pull.c:213 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" -#: builtin/fetch.c:152 +#: builtin/fetch.c:136 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" -#: builtin/fetch.c:154 +#: builtin/fetch.c:138 msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:156 builtin/pull.c:197 +#: builtin/fetch.c:140 builtin/pull.c:216 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" -#: builtin/fetch.c:158 +#: builtin/fetch.c:142 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 +#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:160 +#: builtin/fetch.c:144 msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:164 builtin/pull.c:205 +#: builtin/fetch.c:148 builtin/pull.c:224 msgid "keep downloaded pack" msgstr "保持下载包" -#: builtin/fetch.c:166 +#: builtin/fetch.c:150 msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 +#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" -#: builtin/fetch.c:171 +#: builtin/fetch.c:155 msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c:177 builtin/pull.c:211 +#: builtin/fetch.c:161 builtin/pull.c:230 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" -#: builtin/fetch.c:180 +#: builtin/fetch.c:164 msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:183 +#: builtin/fetch.c:167 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" -#: builtin/fetch.c:187 builtin/pull.c:214 +#: builtin/fetch.c:171 builtin/pull.c:233 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:188 builtin/pull.c:216 +#: builtin/fetch.c:172 builtin/pull.c:235 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:189 builtin/pull.c:217 +#: builtin/fetch.c:173 builtin/pull.c:236 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:196 +#: builtin/fetch.c:180 msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" -#: builtin/fetch.c:199 +#: builtin/fetch.c:183 msgid "run 'gc --auto' after fetching" msgstr "获取后执行 'gc --auto'" -#: builtin/fetch.c:201 builtin/pull.c:226 +#: builtin/fetch.c:185 builtin/pull.c:245 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上检查强制更新" -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "抓取后写提交图" - -#: builtin/fetch.c:513 +#: builtin/fetch.c:491 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:653 +#: builtin/fetch.c:630 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "配置变量 fetch.output 包含无效值 %s" -#: builtin/fetch.c:751 +#: builtin/fetch.c:728 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:755 +#: builtin/fetch.c:732 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 +#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:769 +#: builtin/fetch.c:746 msgid "can't fetch in current branch" msgstr "当前分支下不能执行获取操作" -#: builtin/fetch.c:779 +#: builtin/fetch.c:756 msgid "[tag update]" msgstr "[标签更新]" -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 +#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 +#: builtin/fetch.c:828 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:784 +#: builtin/fetch.c:761 msgid "would clobber existing tag" msgstr "会破坏现有的标签" -#: builtin/fetch.c:806 +#: builtin/fetch.c:783 msgid "[new tag]" msgstr "[新标签]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:786 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:812 +#: builtin/fetch.c:789 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:851 +#: builtin/fetch.c:828 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:856 +#: builtin/fetch.c:833 msgid "non-fast-forward" msgstr "非快进" -#: builtin/fetch.c:877 +#: builtin/fetch.c:854 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13718,7 +12726,7 @@ msgstr "" "要重新启用，请使用 '--show-forced-updates' 选项或运行\n" "'git config fetch.showForcedUpdates true'。" -#: builtin/fetch.c:881 +#: builtin/fetch.c:858 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13729,22 +12737,22 @@ msgstr "" "花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n" "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n" -#: builtin/fetch.c:920 +#: builtin/fetch.c:888 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必需的对象\n" -#: builtin/fetch.c:941 +#: builtin/fetch.c:909 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆不允许被更新" -#: builtin/fetch.c:1026 builtin/fetch.c:1164 +#: builtin/fetch.c:1000 builtin/fetch.c:1131 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1011 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13754,123 +12762,100 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1101 #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:1135 +#: builtin/fetch.c:1102 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为悬空状态）" -#: builtin/fetch.c:1167 +#: builtin/fetch.c:1134 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:1168 builtin/remote.c:1112 +#: builtin/fetch.c:1135 builtin/remote.c:1036 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:1191 +#: builtin/fetch.c:1158 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非纯仓库的当前分支 %s" -#: builtin/fetch.c:1210 +#: builtin/fetch.c:1177 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:1213 +#: builtin/fetch.c:1180 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "检测到多分支，和 --set-upstream 不兼容" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "没有为一个远程跟踪分支设置上游" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "没有为一个远程标签设置上游" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "未知的分支类型" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"未发现源分支。\n" -"您需要使用 --set-upstream 选项指定一个分支。" - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 +#: builtin/fetch.c:1484 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 +#: builtin/fetch.c:1486 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "无法获取 '%s'（退出码：%d）\n" +#: builtin/fetch.c:1532 +msgid "" +"--filter can only be used with the remote configured in extensions." +"partialClone" +msgstr "只可以将 --filter 用于在 extensions.partialClone 中配置的远程仓库" -#: builtin/fetch.c:1693 +#: builtin/fetch.c:1556 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。" -#: builtin/fetch.c:1730 +#: builtin/fetch.c:1593 msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1644 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1782 +#: builtin/fetch.c:1646 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1651 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1789 +#: builtin/fetch.c:1653 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" -#: builtin/fetch.c:1805 +#: builtin/fetch.c:1669 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1671 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1816 +#: builtin/fetch.c:1680 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1823 +#: builtin/fetch.c:1687 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c:1841 +#: builtin/fetch.c:1703 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13881,23 +12866,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:678 msgid "text" msgstr "文本" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:680 msgid "file to read from" msgstr "从文件中读取" @@ -13961,32 +12946,32 @@ msgstr "只打印包含该提交的引用" msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 +#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 +#: builtin/fsck.c:120 builtin/fsck.c:136 #, c-format msgid "error in %s %s: %s" msgstr "%s %s 错误：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 +#: builtin/fsck.c:131 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:143 builtin/fsck.c:146 +#: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" msgstr "来自 %7s %s 的损坏的链接" -#: builtin/fsck.c:155 +#: builtin/fsck.c:168 msgid "wrong object type in link" msgstr "链接中错误的对象类型" -#: builtin/fsck.c:171 +#: builtin/fsck.c:184 #, c-format msgid "" "broken link from %7s %s\n" @@ -13995,216 +12980,216 @@ msgstr "" "损坏的链接来自于 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:282 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "缺失 %s %s" -#: builtin/fsck.c:309 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "不可达 %s %s" -#: builtin/fsck.c:329 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "悬空 %s %s" -#: builtin/fsck.c:339 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "不能创建 lost-found" -#: builtin/fsck.c:350 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:367 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "正在检查 %s" -#: builtin/fsck.c:405 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在检查连通性（%d 个对象）" -#: builtin/fsck.c:424 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "正在检查 %s %s" -#: builtin/fsck.c:429 +#: builtin/fsck.c:438 msgid "broken links" msgstr "损坏的链接" -#: builtin/fsck.c:438 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:446 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "标记 %s %s (%s) 于 %s" -#: builtin/fsck.c:475 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：对象损坏或丢失" -#: builtin/fsck.c:500 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：无效的引用日志条目 %s" -#: builtin/fsck.c:514 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "正在检查引用日志 %s->%s" -#: builtin/fsck.c:548 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：无效的 sha1 指针 %s" -#: builtin/fsck.c:555 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s：不是一个提交" -#: builtin/fsck.c:609 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "注意：无默认引用" -#: builtin/fsck.c:624 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：对象损坏或丢失：%s" -#: builtin/fsck.c:637 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析对象：%s" -#: builtin/fsck.c:657 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件：%s" -#: builtin/fsck.c:672 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "正在检查对象目录" -#: builtin/fsck.c:675 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c:690 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c:695 builtin/index-pack.c:843 +#: builtin/fsck.c:705 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/fsck.c:702 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西（%s）" -#: builtin/fsck.c:708 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分离头指针的指向不存在" -#: builtin/fsck.c:712 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" -#: builtin/fsck.c:724 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "正在检查缓存树" -#: builtin/fsck.c:729 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中无效的 sha1 指针" -#: builtin/fsck.c:738 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" -#: builtin/fsck.c:769 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:775 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:776 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c:777 +#: builtin/fsck.c:789 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:778 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:779 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:780 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" -#: builtin/fsck.c:781 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:782 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:783 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:785 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c:786 builtin/prune.c:132 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:787 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:846 builtin/index-pack.c:225 +#: builtin/fsck.c:859 builtin/index-pack.c:225 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c:874 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s：对象缺失" -#: builtin/fsck.c:885 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" -#: builtin/gc.c:35 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<选项>]" @@ -14218,17 +13203,17 @@ msgstr "对 %s 调用 fstat 失败：%s" msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14242,64 +13227,64 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:541 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" -#: builtin/gc.c:542 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:545 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:548 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，对所有其它包文件重新打包" -#: builtin/gc.c:565 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "解析 gc.logexpiry 的值 %s 失败" -#: builtin/gc.c:576 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失败" -#: builtin/gc.c:596 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:598 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:599 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:639 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）" -#: builtin/gc.c:694 +#: builtin/gc.c:695 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" -#: builtin/grep.c:30 +#: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" @@ -14317,259 +13302,259 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 +#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 +#: builtin/pack-objects.c:2728 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 +#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:633 +#: builtin/grep.c:648 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:704 +#: builtin/grep.c:714 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:803 +#: builtin/grep.c:813 msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:805 +#: builtin/grep.c:815 msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:807 +#: builtin/grep.c:817 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:809 +#: builtin/grep.c:819 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" -#: builtin/grep.c:811 +#: builtin/grep.c:821 msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" -#: builtin/grep.c:814 +#: builtin/grep.c:824 msgid "show non-matching lines" msgstr "显示未匹配的行" -#: builtin/grep.c:816 +#: builtin/grep.c:826 msgid "case insensitive matching" msgstr "不区分大小写匹配" -#: builtin/grep.c:818 +#: builtin/grep.c:828 msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" -#: builtin/grep.c:820 +#: builtin/grep.c:830 msgid "process binary files as text" msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:822 +#: builtin/grep.c:832 msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:825 +#: builtin/grep.c:835 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" -#: builtin/grep.c:827 +#: builtin/grep.c:837 msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" -#: builtin/grep.c:829 +#: builtin/grep.c:839 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:833 +#: builtin/grep.c:843 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:836 +#: builtin/grep.c:846 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:839 +#: builtin/grep.c:849 msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:842 +#: builtin/grep.c:852 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:845 +#: builtin/grep.c:855 msgid "show line numbers" msgstr "显示行号" -#: builtin/grep.c:846 +#: builtin/grep.c:856 msgid "show column number of first match" msgstr "显示第一个匹配的列号" -#: builtin/grep.c:847 +#: builtin/grep.c:857 msgid "don't show filenames" msgstr "不显示文件名" -#: builtin/grep.c:848 +#: builtin/grep.c:858 msgid "show filenames" msgstr "显示文件名" -#: builtin/grep.c:850 +#: builtin/grep.c:860 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:852 +#: builtin/grep.c:862 msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:854 +#: builtin/grep.c:864 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:857 +#: builtin/grep.c:867 msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" -#: builtin/grep.c:859 +#: builtin/grep.c:869 msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:862 +#: builtin/grep.c:872 msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" -#: builtin/grep.c:864 +#: builtin/grep.c:874 msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:865 +#: builtin/grep.c:875 msgid "highlight matches" msgstr "高亮显示匹配项" -#: builtin/grep.c:867 +#: builtin/grep.c:877 msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:869 +#: builtin/grep.c:879 msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:872 +#: builtin/grep.c:882 msgid "show <n> context lines before and after matches" msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:875 +#: builtin/grep.c:885 msgid "show <n> context lines before matches" msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:877 +#: builtin/grep.c:887 msgid "show <n> context lines after matches" msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:879 +#: builtin/grep.c:889 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" -#: builtin/grep.c:880 +#: builtin/grep.c:890 msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" -#: builtin/grep.c:883 +#: builtin/grep.c:893 msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:885 +#: builtin/grep.c:895 msgid "show the surrounding function" msgstr "显示所在函数的前后内容" -#: builtin/grep.c:888 +#: builtin/grep.c:898 msgid "read patterns from file" msgstr "从文件读取模式" -#: builtin/grep.c:890 +#: builtin/grep.c:900 msgid "match <pattern>" msgstr "匹配 <模式>" -#: builtin/grep.c:892 +#: builtin/grep.c:902 msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:904 +#: builtin/grep.c:914 msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:906 +#: builtin/grep.c:916 msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" -#: builtin/grep.c:908 +#: builtin/grep.c:918 msgid "show parse tree for grep expression" msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "pager" msgstr "分页" -#: builtin/grep.c:912 +#: builtin/grep.c:922 msgid "show matching files in the pager" msgstr "分页显示匹配的文件" -#: builtin/grep.c:916 +#: builtin/grep.c:926 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:983 +#: builtin/grep.c:990 msgid "no pattern given" msgstr "未提供匹配模式" -#: builtin/grep.c:1019 +#: builtin/grep.c:1026 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" -#: builtin/grep.c:1027 +#: builtin/grep.c:1034 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "--untracked 不支持和 --recurse-submodules 共用" - -#: builtin/grep.c:1061 +#: builtin/grep.c:1065 msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416 msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" -#: builtin/grep.c:1101 +#: builtin/grep.c:1094 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:1127 +#: builtin/grep.c:1117 +msgid "option not supported with --recurse-submodules" +msgstr "选项不支持和 --recurse-submodules 共用" + +#: builtin/grep.c:1123 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能与 --no-index 同时使用" -#: builtin/grep.c:1133 +#: builtin/grep.c:1129 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" -#: builtin/grep.c:1141 +#: builtin/grep.c:1137 msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" @@ -14753,11 +13738,11 @@ msgstr "输入上的读错误" msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许值" @@ -14813,191 +13798,191 @@ msgstr[1] "包文件过早结束，缺少 %<PRIuMAX> 字节" msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 +#: builtin/index-pack.c:803 builtin/index-pack.c:812 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:801 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:809 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:823 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:826 builtin/index-pack.c:845 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:847 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:919 builtin/index-pack.c:950 msgid "failed to apply delta" msgstr "应用 delta 失败" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1152 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1157 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1160 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1172 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1195 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1246 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1252 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1268 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1292 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" -#: builtin/index-pack.c:1392 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1406 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c:1463 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1597 +#: builtin/index-pack.c:1593 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1599 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1643 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" -#: builtin/index-pack.c:1654 +#: builtin/index-pack.c:1650 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1693 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 +#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 +#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1781 +#: builtin/index-pack.c:1777 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1783 +#: builtin/index-pack.c:1779 msgid "--stdin requires a git repository" msgstr "--stdin 需要一个 git 仓库" -#: builtin/index-pack.c:1789 +#: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" @@ -15178,126 +14163,121 @@ msgstr "--trailer 和 --only-input 同时使用没有意义" msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" -#: builtin/log.c:56 +#: builtin/log.c:55 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" -#: builtin/log.c:57 +#: builtin/log.c:56 msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c:110 +#: builtin/log.c:109 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" -#: builtin/log.c:174 +#: builtin/log.c:173 msgid "show source" msgstr "显示源" -#: builtin/log.c:175 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:177 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "只修饰与 <模式> 匹配的引用" -#: builtin/log.c:179 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "不修饰和 <模式> 匹配的引用" -#: builtin/log.c:180 +#: builtin/log.c:179 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:183 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行，从 1 开始" -#: builtin/log.c:281 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:535 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:550 builtin/log.c:645 +#: builtin/log.c:549 builtin/log.c:643 #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:670 +#: builtin/log.c:668 #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s：从描述生成附函的模式无效" - -#: builtin/log.c:821 +#: builtin/log.c:791 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:936 +#: builtin/log.c:908 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:952 +#: builtin/log.c:924 #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:969 +#: builtin/log.c:941 msgid "need exactly one range" msgstr "只需要一个范围" -#: builtin/log.c:979 +#: builtin/log.c:951 msgid "not a range" msgstr "不是一个范围" -#: builtin/log.c:1143 +#: builtin/log.c:1074 msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" -#: builtin/log.c:1149 +#: builtin/log.c:1080 msgid "failed to create cover-letter file" msgstr "无法创建附函文件" -#: builtin/log.c:1228 +#: builtin/log.c:1159 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1255 +#: builtin/log.c:1186 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1313 +#: builtin/log.c:1244 msgid "two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "无法将 '%s' 解析为一个有效引用" -#: builtin/log.c:1439 +#: builtin/log.c:1370 msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" -#: builtin/log.c:1443 +#: builtin/log.c:1374 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15307,275 +14287,267 @@ msgstr "" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1463 +#: builtin/log.c:1394 msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1474 +#: builtin/log.c:1405 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1478 +#: builtin/log.c:1409 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1531 +#: builtin/log.c:1462 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1583 +#: builtin/log.c:1514 msgid "failed to infer range-diff ranges" msgstr "无法推断 range-diff 范围" -#: builtin/log.c:1629 +#: builtin/log.c:1559 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1632 +#: builtin/log.c:1562 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1636 +#: builtin/log.c:1566 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1638 +#: builtin/log.c:1568 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1640 +#: builtin/log.c:1570 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1641 +#: builtin/log.c:1571 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1642 +#: builtin/log.c:1572 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1644 +#: builtin/log.c:1574 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1646 +#: builtin/log.c:1576 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1648 +#: builtin/log.c:1578 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "从分支描述获取附函的模式" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "基于一个分支描述生成部分附函" - -#: builtin/log.c:1654 +#: builtin/log.c:1581 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1657 +#: builtin/log.c:1584 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1660 +#: builtin/log.c:1587 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1663 +#: builtin/log.c:1590 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1665 +#: builtin/log.c:1592 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1667 +#: builtin/log.c:1594 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1669 +#: builtin/log.c:1596 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1671 +#: builtin/log.c:1598 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1672 +#: builtin/log.c:1599 msgid "header" msgstr "header" -#: builtin/log.c:1673 +#: builtin/log.c:1600 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1674 builtin/log.c:1676 +#: builtin/log.c:1601 builtin/log.c:1603 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1674 +#: builtin/log.c:1601 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1676 +#: builtin/log.c:1603 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1678 +#: builtin/log.c:1605 msgid "ident" msgstr "标识" -#: builtin/log.c:1679 +#: builtin/log.c:1606 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" -#: builtin/log.c:1681 +#: builtin/log.c:1608 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1682 +#: builtin/log.c:1609 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1683 builtin/log.c:1686 +#: builtin/log.c:1610 builtin/log.c:1613 msgid "boundary" msgstr "边界" -#: builtin/log.c:1684 +#: builtin/log.c:1611 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1687 +#: builtin/log.c:1614 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1691 +#: builtin/log.c:1618 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1693 +#: builtin/log.c:1620 msgid "signature" msgstr "签名" -#: builtin/log.c:1694 +#: builtin/log.c:1621 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1695 +#: builtin/log.c:1622 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1696 +#: builtin/log.c:1623 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1698 +#: builtin/log.c:1625 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1699 +#: builtin/log.c:1626 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1701 +#: builtin/log.c:1628 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1703 +#: builtin/log.c:1630 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <rev> 的差异" -#: builtin/log.c:1706 +#: builtin/log.c:1633 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <refspec> 的差异" -#: builtin/log.c:1708 +#: builtin/log.c:1635 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1792 +#: builtin/log.c:1710 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" -#: builtin/log.c:1807 +#: builtin/log.c:1725 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1809 +#: builtin/log.c:1727 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1817 +#: builtin/log.c:1735 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1819 +#: builtin/log.c:1737 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1821 +#: builtin/log.c:1739 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1854 +#: builtin/log.c:1771 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1958 +#: builtin/log.c:1860 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1962 +#: builtin/log.c:1864 msgid "Interdiff:" msgstr "版本间差异：" -#: builtin/log.c:1963 +#: builtin/log.c:1865 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" -#: builtin/log.c:1969 +#: builtin/log.c:1871 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:1973 +#: builtin/log.c:1875 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1981 +#: builtin/log.c:1883 msgid "Range-diff:" msgstr "范围差异：" -#: builtin/log.c:1982 +#: builtin/log.c:1884 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" -#: builtin/log.c:1993 +#: builtin/log.c:1895 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:2029 +#: builtin/log.c:1931 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:2073 +#: builtin/log.c:1975 msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:2132 +#: builtin/log.c:2034 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2186 +#: builtin/log.c:2088 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15675,11 +14647,11 @@ msgstr "如果任何 <文件> 都不在索引区，视为错误" #: builtin/ls-files.c:576 msgid "tree-ish" -msgstr "树对象" +msgstr "树或提交" #: builtin/ls-files.c:577 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "假装自从 <树对象> 之后删除的路径仍然存在" +msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" #: builtin/ls-files.c:579 msgid "show debugging data" @@ -15699,7 +14671,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不打印远程 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 msgid "exec" msgstr "exec" @@ -15733,7 +14705,7 @@ msgstr "除了显示指向的对象外，显示指向的引用名" #: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" +msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" #: builtin/ls-tree.c:128 msgid "only show trees" @@ -15784,150 +14756,150 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:119 +#: builtin/merge.c:118 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:142 +#: builtin/merge.c:141 #, c-format msgid "option `%s' requires a value" msgstr "选项 `%s' 需要一个值" -#: builtin/merge.c:188 +#: builtin/merge.c:187 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:189 +#: builtin/merge.c:188 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:194 +#: builtin/merge.c:193 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" -#: builtin/merge.c:245 builtin/pull.c:132 +#: builtin/merge.c:244 builtin/pull.c:151 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:248 builtin/pull.c:135 +#: builtin/merge.c:247 builtin/pull.c:154 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:249 builtin/pull.c:138 +#: builtin/merge.c:248 builtin/pull.c:157 msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" -#: builtin/merge.c:251 builtin/pull.c:141 +#: builtin/merge.c:250 builtin/pull.c:160 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" -#: builtin/merge.c:254 builtin/pull.c:147 +#: builtin/merge.c:253 builtin/pull.c:166 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:256 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:169 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" -#: builtin/merge.c:258 builtin/pull.c:153 +#: builtin/merge.c:257 builtin/pull.c:172 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:260 +#: builtin/merge.c:259 msgid "allow fast-forward (default)" msgstr "允许快进（默认）" -#: builtin/merge.c:262 builtin/pull.c:160 +#: builtin/merge.c:261 builtin/pull.c:179 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:266 builtin/pull.c:163 +#: builtin/merge.c:265 builtin/pull.c:182 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 +#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:268 builtin/pull.c:168 +#: builtin/merge.c:267 builtin/pull.c:187 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:269 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:190 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:269 builtin/pull.c:191 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:272 +#: builtin/merge.c:271 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" -#: builtin/merge.c:279 +#: builtin/merge.c:278 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" # -#: builtin/merge.c:281 +#: builtin/merge.c:280 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作区" -#: builtin/merge.c:283 +#: builtin/merge.c:282 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c:285 builtin/pull.c:179 +#: builtin/merge.c:284 builtin/pull.c:198 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" +#: builtin/merge.c:290 +msgid "verify commit-msg hook" +msgstr "校验 commit-msg 钩子" -#: builtin/merge.c:308 +#: builtin/merge.c:307 msgid "could not run stash." msgstr "不能运行贮藏。" -#: builtin/merge.c:313 +#: builtin/merge.c:312 msgid "stash failed" msgstr "贮藏失败" -#: builtin/merge.c:318 +#: builtin/merge.c:317 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" -#: builtin/merge.c:340 builtin/merge.c:357 +#: builtin/merge.c:339 builtin/merge.c:356 msgid "read-tree failed" msgstr "读取树失败" # 译者：注意保持前导空格 -#: builtin/merge.c:387 +#: builtin/merge.c:386 msgid " (nothing to squash)" msgstr " （无可压缩）" -#: builtin/merge.c:398 +#: builtin/merge.c:397 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:448 +#: builtin/merge.c:447 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:499 +#: builtin/merge.c:498 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:586 +#: builtin/merge.c:585 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" @@ -15977,72 +14949,72 @@ msgid "" "the commit.\n" msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n" -#: builtin/merge.c:865 +#: builtin/merge.c:853 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:880 +#: builtin/merge.c:872 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:941 +#: builtin/merge.c:933 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:980 +#: builtin/merge.c:972 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:982 +#: builtin/merge.c:974 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:984 +#: builtin/merge.c:976 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:989 +#: builtin/merge.c:981 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1046 +#: builtin/merge.c:1038 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1149 +#: builtin/merge.c:1141 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" -#: builtin/merge.c:1183 +#: builtin/merge.c:1175 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1286 +#: builtin/merge.c:1278 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1290 +#: builtin/merge.c:1282 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1299 +#: builtin/merge.c:1291 msgid "--quit expects no arguments" msgstr "--quit 不带参数" -#: builtin/merge.c:1312 +#: builtin/merge.c:1304 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1316 +#: builtin/merge.c:1308 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1332 +#: builtin/merge.c:1324 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16050,7 +15022,7 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1339 +#: builtin/merge.c:1331 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16058,96 +15030,96 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1342 +#: builtin/merge.c:1334 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1356 +#: builtin/merge.c:1348 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 和 --no-ff 组合使用。" -#: builtin/merge.c:1358 +#: builtin/merge.c:1350 msgid "You cannot combine --squash with --commit." msgstr "您不能将 --squash 和 --commit 组合使用。" -#: builtin/merge.c:1374 +#: builtin/merge.c:1366 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1391 +#: builtin/merge.c:1383 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1393 +#: builtin/merge.c:1385 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1398 +#: builtin/merge.c:1390 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1400 +#: builtin/merge.c:1392 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1481 +#: builtin/merge.c:1471 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1490 +#: builtin/merge.c:1480 msgid "Already up to date." msgstr "已经是最新的。" -#: builtin/merge.c:1500 +#: builtin/merge.c:1490 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1542 +#: builtin/merge.c:1532 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1539 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1574 +#: builtin/merge.c:1564 msgid "Already up to date. Yeeah!" msgstr "已经是最新的。耶！" -#: builtin/merge.c:1580 +#: builtin/merge.c:1570 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1603 builtin/merge.c:1668 +#: builtin/merge.c:1593 builtin/merge.c:1658 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1607 +#: builtin/merge.c:1597 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1659 +#: builtin/merge.c:1649 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1661 +#: builtin/merge.c:1651 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1670 +#: builtin/merge.c:1660 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1672 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -16232,33 +15204,33 @@ msgstr "不要警告冲突" msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c:46 #, c-format msgid "unknown option %s" msgstr "未知选项 %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c:52 #, c-format msgid "could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c:56 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 #, c-format msgid "could not resolve ref '%s'" msgstr "无法解析引用 '%s'" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c:78 #, c-format msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" @@ -16281,31 +15253,31 @@ msgstr "允许创建一个以上的树" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" +"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" +"batch-size=<size>)" msgstr "" -"git multi-pack-index [<选项>] (write|verify|expire|repack --batch-size=<大小" -">)" +"git multi-pack-index [--object-dir=<目录>] (write|verify|expire|repack --" +"batch-size=<大小>)" -#: builtin/multi-pack-index.c:26 +#: builtin/multi-pack-index.c:23 msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成对包文件和包索引的对象目录" -#: builtin/multi-pack-index.c:29 +#: builtin/multi-pack-index.c:25 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "太多参数" -#: builtin/multi-pack-index.c:60 +#: builtin/multi-pack-index.c:52 msgid "--batch-size option is only for 'repack' subcommand" msgstr "--batch-size 选项仅用于 'repack' 子命令" -#: builtin/multi-pack-index.c:69 +#: builtin/multi-pack-index.c:61 #, c-format msgid "unrecognized subcommand: %s" msgstr "未识别的子命令：%s" @@ -16397,52 +15369,52 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:352 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <提交>..." -#: builtin/name-rev.c:466 +#: builtin/name-rev.c:353 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:354 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c:411 msgid "print only names (no SHA-1)" msgstr "只打印名称（无 SHA-1）" -#: builtin/name-rev.c:525 +#: builtin/name-rev.c:412 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c:527 +#: builtin/name-rev.c:414 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:529 +#: builtin/name-rev.c:416 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相匹配的引用" -#: builtin/name-rev.c:531 +#: builtin/name-rev.c:418 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:532 +#: builtin/name-rev.c:419 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:533 +#: builtin/name-rev.c:420 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" -#: builtin/name-rev.c:539 +#: builtin/name-rev.c:426 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" @@ -16829,7 +15801,7 @@ msgstr "尝试删除不存在的注解不是一个错误" msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "不删除，只显示" @@ -16845,7 +15817,7 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1034 builtin/stash.c:1643 +#: builtin/notes.c:1034 builtin/stash.c:1598 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令：%s" @@ -16860,101 +15832,124 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:430 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c:441 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c:572 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c:783 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 个对象，预期 %<PRIu32> 个" -#: builtin/pack-objects.c:972 +#: builtin/pack-objects.c:794 +#, c-format +msgid "packfile is invalid: %s" +msgstr "无效的包文件：%s" + +#: builtin/pack-objects.c:798 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "无法为重用打开包文件：%s" + +#: builtin/pack-objects.c:802 +msgid "unable to seek in reused packfile" +msgstr "无法在重用的包文件中查找" + +#: builtin/pack-objects.c:813 +msgid "unable to read from reused packfile" +msgstr "无法读取索引文件" + +#: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:985 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/pack-objects.c:1099 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c:1297 +#: builtin/pack-objects.c:1166 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" -#: builtin/pack-objects.c:1724 +#: builtin/pack-objects.c:1597 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c:1733 +#: builtin/pack-objects.c:1606 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c:2004 +#: builtin/pack-objects.c:1875 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c:2149 +#: builtin/pack-objects.c:2005 +#, c-format +msgid "unable to get size of %s" +msgstr "不能得到 %s 的大小" + +#: builtin/pack-objects.c:2020 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 +#: builtin/pack-objects.c:2116 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2259 +#: builtin/pack-objects.c:2130 msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" -#: builtin/pack-objects.c:2574 +#: builtin/pack-objects.c:2456 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c:2713 +#: builtin/pack-objects.c:2588 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2675 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2681 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -#: builtin/pack-objects.c:2888 +#: builtin/pack-objects.c:2762 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16963,7 +15958,7 @@ msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:2894 +#: builtin/pack-objects.c:2768 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16972,233 +15967,245 @@ msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:2866 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c:3082 +#: builtin/pack-objects.c:2956 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3041 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3133 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3136 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3161 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c:3341 +#: builtin/pack-objects.c:3214 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3218 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:3383 +#: builtin/pack-objects.c:3248 +msgid "do not show progress meter" +msgstr "不显示进度表" + +#: builtin/pack-objects.c:3250 +msgid "show progress meter" +msgstr "显示进度表" + +#: builtin/pack-objects.c:3252 +msgid "show progress meter during object writing phase" +msgstr "在对象写入阶段显示进度表" + +#: builtin/pack-objects.c:3255 +msgid "similar to --all-progress when progress meter is shown" +msgstr "当进度表显示时类似于 --all-progress" + +#: builtin/pack-objects.c:3256 msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c:3384 +#: builtin/pack-objects.c:3257 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:3387 +#: builtin/pack-objects.c:3260 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:3389 +#: builtin/pack-objects.c:3262 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:3391 +#: builtin/pack-objects.c:3264 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3266 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:3395 +#: builtin/pack-objects.c:3268 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:3397 +#: builtin/pack-objects.c:3270 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:3399 +#: builtin/pack-objects.c:3272 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3401 +#: builtin/pack-objects.c:3274 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:3403 +#: builtin/pack-objects.c:3276 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:3405 +#: builtin/pack-objects.c:3278 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3280 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3282 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3284 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3287 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3290 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3293 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3296 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3298 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3300 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:3429 +#: builtin/pack-objects.c:3302 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:3431 +#: builtin/pack-objects.c:3304 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:3434 +#: builtin/pack-objects.c:3307 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可达性算法" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3309 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:3438 +#: builtin/pack-objects.c:3311 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:3440 +#: builtin/pack-objects.c:3313 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:3442 +#: builtin/pack-objects.c:3315 msgid "ignore this pack" msgstr "忽略该 pack" -#: builtin/pack-objects.c:3444 +#: builtin/pack-objects.c:3317 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3319 msgid "do not hide commits by grafts" msgstr "显示被移植隐藏的提交" -#: builtin/pack-objects.c:3448 +#: builtin/pack-objects.c:3321 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3323 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:3454 +#: builtin/pack-objects.c:3327 msgid "write a bitmap index if possible" msgstr "如果可能，写 bitmap 索引" -#: builtin/pack-objects.c:3458 +#: builtin/pack-objects.c:3331 msgid "handling for missing objects" msgstr "处理丢失的对象" -#: builtin/pack-objects.c:3461 +#: builtin/pack-objects.c:3334 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor 包文件中的对象" -#: builtin/pack-objects.c:3463 +#: builtin/pack-objects.c:3336 msgid "respect islands during delta compression" msgstr "在增量压缩时参考数据岛" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3361 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量链深度 %d 太深了，强制为 %d" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3366 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3420 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 来构建传输用的包文件" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3422 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包文件大小是 1 MiB" -#: builtin/pack-objects.c:3558 +#: builtin/pack-objects.c:3427 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" -#: builtin/pack-objects.c:3561 +#: builtin/pack-objects.c:3430 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" -#: builtin/pack-objects.c:3567 +#: builtin/pack-objects.c:3436 msgid "cannot use --filter without --stdout" msgstr "不能在没有 --stdout 的情况下使用 --filter" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3497 msgid "Enumerating objects" msgstr "枚举对象" -#: builtin/pack-objects.c:3657 +#: builtin/pack-objects.c:3527 #, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" -msgstr "" -"总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 " -"%<PRIu32>" +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "总共 %<PRIu32> （差异 %<PRIu32>），复用 %<PRIu32> （差异 %<PRIu32>）" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -17240,70 +16247,70 @@ msgstr "限制遍历 promisor 包以外的对象" msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品仓库中执行清理操作" -#: builtin/pull.c:45 builtin/pull.c:47 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: builtin/pull.c:67 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c:122 +#: builtin/pull.c:141 msgid "control for recursive fetching of submodules" msgstr "控制子模组的递归获取" -#: builtin/pull.c:126 +#: builtin/pull.c:145 msgid "Options related to merging" msgstr "和合并相关的选项" -#: builtin/pull.c:129 +#: builtin/pull.c:148 msgid "incorporate changes by rebasing rather than merging" msgstr "使用变基操作取代合并操作以合入修改" -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 +#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/pull.c:166 +#: builtin/pull.c:185 msgid "automatically stash/stash pop before and after rebase" msgstr "变基操作前后执行自动贮藏和弹出贮藏" -#: builtin/pull.c:182 +#: builtin/pull.c:201 msgid "Options related to fetching" msgstr "和获取相关的参数" -#: builtin/pull.c:192 +#: builtin/pull.c:211 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/pull.c:200 +#: builtin/pull.c:219 msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" -#: builtin/pull.c:300 +#: builtin/pull.c:316 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值无效：%s" -#: builtin/pull.c:426 +#: builtin/pull.c:433 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获取到的引用中没有变基操作的候选。" -#: builtin/pull.c:428 +#: builtin/pull.c:435 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获取到的引用中没有合并操作的候选。" -#: builtin/pull.c:429 +#: builtin/pull.c:436 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" -#: builtin/pull.c:432 +#: builtin/pull.c:439 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17313,42 +16320,42 @@ msgstr "" "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n" "分支默认的远程仓库，您必须在命令行中指定一个分支名。" -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 +#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当前不在一个分支上。" -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 +#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您要变基到哪一个分支。" -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 +#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您要合并哪一个分支。" -#: builtin/pull.c:442 builtin/pull.c:457 +#: builtin/pull.c:449 builtin/pull.c:464 msgid "See git-pull(1) for details." msgstr "详见 git-pull(1)。" -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 +#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 +#: builtin/rebase.c:1332 git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 +#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 +#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当前分支没有跟踪信息。" -#: builtin/pull.c:461 git-parse-remote.sh:95 +#: builtin/pull.c:468 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要为此分支创建跟踪信息，您可以执行：" -#: builtin/pull.c:466 +#: builtin/pull.c:473 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17357,32 +16364,32 @@ msgstr "" "您的配置中指定要合并远程的引用 '%s'，\n" "但是没有获取到这个引用。" -#: builtin/pull.c:576 +#: builtin/pull.c:581 #, c-format msgid "unable to access commit %s" msgstr "无法访问提交 %s" -#: builtin/pull.c:857 +#: builtin/pull.c:861 msgid "ignoring --verify-signatures for rebase" msgstr "为变基操作忽略 --verify-signatures" -#: builtin/pull.c:912 +#: builtin/pull.c:916 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" -#: builtin/pull.c:920 +#: builtin/pull.c:924 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支，变更添加至索引。" -#: builtin/pull.c:924 +#: builtin/pull.c:928 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:925 +#: builtin/pull.c:929 msgid "please commit or stash them." msgstr "请提交或贮藏它们。" -#: builtin/pull.c:950 +#: builtin/pull.c:954 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17392,7 +16399,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:956 +#: builtin/pull.c:960 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17409,15 +16416,15 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:971 +#: builtin/pull.c:975 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:975 +#: builtin/pull.c:979 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/pull.c:982 +#: builtin/pull.c:986 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地子模组中有修改，无法变基" @@ -17425,15 +16432,15 @@ msgstr "本地子模组中有修改，无法变基" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "标签后面未提供 <标签> 参数" -#: builtin/push.c:122 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" -#: builtin/push.c:168 +#: builtin/push.c:167 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -17441,7 +16448,7 @@ msgstr "" "\n" "为了永久地选择任一选项，参见 'git help config' 中的 push.default。" -#: builtin/push.c:171 +#: builtin/push.c:170 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -17465,7 +16472,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:185 #, c-format msgid "" "You are not currently on a branch.\n" @@ -17479,7 +16486,7 @@ msgstr "" "\n" " git push %s HEAD:<远程分支名字>\n" -#: builtin/push.c:200 +#: builtin/push.c:199 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -17492,12 +16499,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:207 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:211 +#: builtin/push.c:210 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17507,12 +16514,12 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -#: builtin/push.c:270 +#: builtin/push.c:269 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:277 +#: builtin/push.c:276 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17523,7 +16530,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:283 +#: builtin/push.c:282 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17534,7 +16541,7 @@ msgstr "" "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:289 +#: builtin/push.c:288 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17547,11 +16554,11 @@ msgstr "" "（如 'git pull ...'）。\n" "详见 'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:296 +#: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒绝，因为该标签在远程已经存在。" -#: builtin/push.c:299 +#: builtin/push.c:298 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -17560,140 +16567,140 @@ msgstr "" "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" "也不能更新远程引用让其指向一个非提交对象。\n" -#: builtin/push.c:360 +#: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:367 +#: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失败" -#: builtin/push.c:542 +#: builtin/push.c:398 +#, c-format +msgid "bad repository '%s'" +msgstr "坏的仓库 '%s'" + +#: builtin/push.c:399 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"没有配置推送目标。\n" +"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n" +"\n" +" git remote add <名称> <地址>\n" +"\n" +"然后使用该远程仓库名执行推送\n" +"\n" +" git push <名称>\n" + +#: builtin/push.c:554 msgid "repository" msgstr "仓库" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "镜像所有引用" -#: builtin/push.c:546 +#: builtin/push.c:558 msgid "delete refs" msgstr "删除引用" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送标签（不能使用 --all or --mirror）" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:562 builtin/send-pack.c:167 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:552 builtin/send-pack.c:181 +#: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:553 builtin/send-pack.c:182 +#: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "要求引用旧的取值为设定值" -#: builtin/push.c:556 +#: builtin/push.c:568 msgid "control recursive pushing of submodules" msgstr "控制子模组的递归推送" -#: builtin/push.c:558 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" msgstr "使用精简打包" -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "接收包程序" -#: builtin/push.c:561 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" -#: builtin/push.c:564 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "清除本地删除的引用" -#: builtin/push.c:566 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "绕过 pre-push 钩子" -#: builtin/push.c:567 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "推送缺失但有关的标签" -#: builtin/push.c:570 builtin/send-pack.c:169 +#: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "用 GPG 为推送签名" -#: builtin/push.c:572 builtin/send-pack.c:176 +#: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "需要远端支持原子事务" -#: builtin/push.c:590 +#: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:592 +#: builtin/push.c:604 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "坏的仓库 '%s'" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"没有配置推送目标。\n" -"或通过命令行指定 URL，或用下面命令配置一个远程仓库\n" -"\n" -" git remote add <名称> <地址>\n" -"\n" -"然后使用该远程仓库名执行推送\n" -"\n" -" git push <名称>\n" - -#: builtin/push.c:628 +#: builtin/push.c:607 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:630 +#: builtin/push.c:609 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用规格同时使用" -#: builtin/push.c:634 +#: builtin/push.c:613 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:636 +#: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用规格同时使用" -#: builtin/push.c:639 +#: builtin/push.c:618 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:643 +#: builtin/push.c:637 msgid "push options must not have new line characters" msgstr "推送选项不能有换行符" @@ -17709,32 +16716,24 @@ msgstr "git range-diff [<选项>] <old-tip>...<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:23 msgid "use simple diff colors" msgstr "使用简单差异颜色" -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "注解" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "传递给 'git log'" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "没有在范围中使用 ..：'%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "单个参数格式必须是对称范围（即包含...）" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "需要两个提交范围" @@ -17816,17 +16815,12 @@ msgstr "调试 unpack-trees" msgid "suppress feedback messages" msgstr "抑制反馈信息" -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "您需要先解决当前索引的冲突" - #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " +"[<branch>]" msgstr "" -"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<" -"上游> [<分支>]]" +"git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]" #: builtin/rebase.c:34 msgid "" @@ -17838,207 +16832,216 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 #, c-format msgid "unusable todo list: '%s'" msgstr "不可用的待办列表：'%s'" -#: builtin/rebase.c:292 +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "不能写入 '%s'。" + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "没有 HEAD？" + +#: builtin/rebase.c:279 #, c-format msgid "could not create temporary %s" msgstr "无法创建临时的 %s" -#: builtin/rebase.c:298 +#: builtin/rebase.c:285 msgid "could not mark as interactive" msgstr "无法标记为交互式" -#: builtin/rebase.c:352 +#: builtin/rebase.c:343 msgid "could not generate todo list" msgstr "无法生成待办列表" -#: builtin/rebase.c:391 +#: builtin/rebase.c:382 msgid "a base commit must be provided with --upstream or --onto" msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" -#: builtin/rebase.c:461 +#: builtin/rebase.c:437 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<选项>]" -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "（已弃用）保留空提交" +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "保持空提交" -#: builtin/rebase.c:478 builtin/revert.c:128 +#: builtin/rebase.c:451 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "允许提交说明为空" -#: builtin/rebase.c:480 +#: builtin/rebase.c:452 msgid "rebase merge commits" msgstr "对合并提交变基" -#: builtin/rebase.c:482 +#: builtin/rebase.c:454 msgid "keep original branch points of cousins" msgstr "保持兄弟提交的原始分支点" -#: builtin/rebase.c:484 +#: builtin/rebase.c:456 msgid "move commits that begin with squash!/fixup!" msgstr "移动以 squash!/fixup! 开头的提交" -#: builtin/rebase.c:485 +#: builtin/rebase.c:457 msgid "sign commits" msgstr "签名提交" -#: builtin/rebase.c:487 builtin/rebase.c:1490 +#: builtin/rebase.c:459 builtin/rebase.c:1403 msgid "display a diffstat of what changed upstream" msgstr "显示上游变化的差异统计" -#: builtin/rebase.c:489 +#: builtin/rebase.c:461 msgid "continue rebase" msgstr "继续变基" -#: builtin/rebase.c:491 +#: builtin/rebase.c:463 msgid "skip commit" msgstr "跳过提交" -#: builtin/rebase.c:492 +#: builtin/rebase.c:464 msgid "edit the todo list" msgstr "变基待办列表" -#: builtin/rebase.c:494 +#: builtin/rebase.c:466 msgid "show the current patch" msgstr "显示当前补丁" -#: builtin/rebase.c:497 +#: builtin/rebase.c:469 msgid "shorten commit ids in the todo list" msgstr "缩短待办列表中的提交号" -#: builtin/rebase.c:499 +#: builtin/rebase.c:471 msgid "expand commit ids in the todo list" msgstr "扩展待办列表中的提交号" -#: builtin/rebase.c:501 +#: builtin/rebase.c:473 msgid "check the todo list" msgstr "检查待办列表" -#: builtin/rebase.c:503 +#: builtin/rebase.c:475 msgid "rearrange fixup/squash lines" msgstr "重新排列 fixup/squash 行" -#: builtin/rebase.c:505 +#: builtin/rebase.c:477 msgid "insert exec commands in todo list" msgstr "在待办列表中插入 exec 执行命令" -#: builtin/rebase.c:506 +#: builtin/rebase.c:478 msgid "onto" msgstr "onto" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:509 +#: builtin/rebase.c:481 msgid "restrict revision" msgstr "限制版本" -#: builtin/rebase.c:511 +#: builtin/rebase.c:483 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:512 +#: builtin/rebase.c:484 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:514 +#: builtin/rebase.c:486 msgid "the upstream commit" msgstr "上游提交" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:516 +#: builtin/rebase.c:488 msgid "head name" msgstr "head 名称" -#: builtin/rebase.c:521 +#: builtin/rebase.c:493 msgid "rebase strategy" msgstr "变基策略" -#: builtin/rebase.c:522 +#: builtin/rebase.c:494 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:523 +#: builtin/rebase.c:495 msgid "strategy options" msgstr "策略选项" -#: builtin/rebase.c:524 +#: builtin/rebase.c:496 msgid "switch-to" msgstr "切换到" -#: builtin/rebase.c:525 +#: builtin/rebase.c:497 msgid "the branch or commit to checkout" msgstr "要检出的分支或提交" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:526 +#: builtin/rebase.c:498 msgid "onto name" msgstr "onto name" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:527 +#: builtin/rebase.c:499 msgid "the command to run" msgstr "要执行的命令" -#: builtin/rebase.c:530 builtin/rebase.c:1584 +#: builtin/rebase.c:502 builtin/rebase.c:1486 msgid "automatically re-schedule any `exec` that fails" msgstr "自动重新安排任何失败的 `exec`" -#: builtin/rebase.c:546 +#: builtin/rebase.c:518 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果" -#: builtin/rebase.c:562 +#: builtin/rebase.c:534 #, c-format msgid "%s requires an interactive rebase" msgstr "%s 需要交互式变基" -#: builtin/rebase.c:612 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "无法获取 'onto'：'%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "无效的原始 head：'%s'" -#: builtin/rebase.c:652 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略无效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c:728 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/rebase.c:746 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "不能存储 %s" -#: builtin/rebase.c:853 +#: builtin/rebase.c:827 msgid "could not determine HEAD revision" msgstr "不能确定 HEAD 版本" -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18051,7 +17054,7 @@ msgstr "" "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。" -#: builtin/rebase.c:1058 +#: builtin/rebase.c:1031 #, c-format msgid "" "\n" @@ -18069,14 +17072,7 @@ msgstr "" "\n" "因此 git 无法对其变基。" -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。" - -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1318 #, c-format msgid "" "%s\n" @@ -18093,7 +17089,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1334 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18106,136 +17102,128 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1364 msgid "exec commands cannot contain newlines" msgstr "exec 命令不能包含换行符" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1368 msgid "empty exec command" msgstr "空的 exec 命令" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1396 msgid "rebase onto given branch instead of upstream" msgstr "变基到给定的分支而非上游" -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "使用上游和分支的合并基线做为当前基线" - -#: builtin/rebase.c:1485 +#: builtin/rebase.c:1398 msgid "allow pre-rebase hook to run" msgstr "允许执行 pre-rebase 钩子" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1400 msgid "be quiet. implies --no-stat" msgstr "安静。暗示 --no-stat" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1406 msgid "do not show diffstat of what changed upstream" msgstr "不显示上游变化的差异统计" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1409 msgid "add a Signed-off-by: line to each commit" msgstr "为每一个提交添加一个 Signed-off-by: 签名" -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 msgid "passed to 'git am'" -msgstr "传递给 'git am" +msgstr "传递给 'git am'" -#: builtin/rebase.c:1506 builtin/rebase.c:1508 +#: builtin/rebase.c:1419 builtin/rebase.c:1421 msgid "passed to 'git apply'" msgstr "传递给 'git apply'" -#: builtin/rebase.c:1510 builtin/rebase.c:1513 +#: builtin/rebase.c:1423 builtin/rebase.c:1426 msgid "cherry-pick all commits, even if unchanged" msgstr "拣选所有提交，即使未修改" -#: builtin/rebase.c:1515 +#: builtin/rebase.c:1428 msgid "continue" msgstr "继续" -#: builtin/rebase.c:1518 +#: builtin/rebase.c:1431 msgid "skip current patch and continue" msgstr "跳过当前补丁并继续" # 译者：注意保持前导空格 -#: builtin/rebase.c:1520 +#: builtin/rebase.c:1433 msgid "abort and check out the original branch" msgstr "终止并检出原有分支" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1436 msgid "abort but keep HEAD where it is" msgstr "终止但保持 HEAD 不变" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1437 msgid "edit the todo list during an interactive rebase" msgstr "在交互式变基中编辑待办列表" -#: builtin/rebase.c:1527 +#: builtin/rebase.c:1440 msgid "show the patch file being applied or merged" msgstr "显示正在应用或合并的补丁文件" -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "使用应用策略进行变基" - -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1443 msgid "use merging strategies to rebase" msgstr "使用合并策略进行变基" -#: builtin/rebase.c:1538 +#: builtin/rebase.c:1447 msgid "let the user edit the list of commits to rebase" msgstr "让用户编辑要变基的提交列表" -#: builtin/rebase.c:1542 +#: builtin/rebase.c:1451 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "（已弃用）尝试重建合并提交而非忽略它们" -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "如何处理成为空提交的提交" +#: builtin/rebase.c:1455 +msgid "preserve empty commits during rebase" +msgstr "变基时保留空提交" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1457 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1463 msgid "automatically stash/stash pop before and after" msgstr "在操作前后执行自动贮藏和弹出贮藏" -#: builtin/rebase.c:1562 +#: builtin/rebase.c:1465 msgid "add exec lines after each commit of the editable list" msgstr "可编辑列表的每一个提交下面增加一行 exec" -#: builtin/rebase.c:1566 +#: builtin/rebase.c:1469 msgid "allow rebasing commits with empty messages" msgstr "允许针对空提交说明的提交变基" -#: builtin/rebase.c:1570 +#: builtin/rebase.c:1472 msgid "try to rebase merges instead of skipping them" msgstr "尝试对合并提交变基而不是忽略它们" -#: builtin/rebase.c:1573 +#: builtin/rebase.c:1475 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 来优化上游" -#: builtin/rebase.c:1575 +#: builtin/rebase.c:1477 msgid "use the given merge strategy" msgstr "使用给定的合并策略" -#: builtin/rebase.c:1577 builtin/revert.c:115 +#: builtin/rebase.c:1479 builtin/revert.c:115 msgid "option" msgstr "选项" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1480 msgid "pass the argument through to the merge strategy" msgstr "将参数传递给合并策略" -#: builtin/rebase.c:1581 +#: builtin/rebase.c:1483 msgid "rebase all reachable commits up to the root(s)" msgstr "将所有可达的提交变基到根提交" -#: builtin/rebase.c:1598 +#: builtin/rebase.c:1500 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18243,36 +17231,28 @@ msgstr "" "对 rebase.useBuiltin 的支持已被删除！\n" "详见 'git help config' 中的条目。" -#: builtin/rebase.c:1604 +#: builtin/rebase.c:1506 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起来 'git-am' 正在执行中。无法变基。" -#: builtin/rebase.c:1645 +#: builtin/rebase.c:1547 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "不能将 '--keep-base' 和 '--onto' 组合使用" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "不能将 '--keep-base' 和 '--root' 组合使用" - -#: builtin/rebase.c:1656 +#: builtin/rebase.c:1551 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: builtin/rebase.c:1660 +#: builtin/rebase.c:1555 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c:1683 +#: builtin/rebase.c:1578 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: builtin/rebase.c:1695 +#: builtin/rebase.c:1590 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18280,16 +17260,16 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:1609 msgid "could not discard worktree changes" msgstr "无法丢弃工作区变更" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1628 #, c-format msgid "could not move back to %s" msgstr "无法移回 %s" -#: builtin/rebase.c:1778 +#: builtin/rebase.c:1673 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18308,164 +17288,172 @@ msgstr "" "\t%s\n" "然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1694 msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数字值" -#: builtin/rebase.c:1847 +#: builtin/rebase.c:1735 #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1869 +#: builtin/rebase.c:1757 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "不能组合使用应用选项和合并选项" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "未知的变基后端：%s" - -#: builtin/rebase.c:1937 +#: builtin/rebase.c:1797 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1957 +#: builtin/rebase.c:1809 +msgid "cannot combine am options with either interactive or merge options" +msgstr "不能将 am 选项与交互或合并选项同时使用" + +#: builtin/rebase.c:1828 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" -#: builtin/rebase.c:1961 +#: builtin/rebase.c:1832 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" -#: builtin/rebase.c:1985 +#: builtin/rebase.c:1838 +msgid "cannot combine '--rebase-merges' with '--strategy-option'" +msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用" + +#: builtin/rebase.c:1841 +msgid "cannot combine '--rebase-merges' with '--strategy'" +msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用" + +#: builtin/rebase.c:1865 #, c-format msgid "invalid upstream '%s'" msgstr "无效的上游 '%s'" -#: builtin/rebase.c:1991 +#: builtin/rebase.c:1871 msgid "Could not create new root commit" msgstr "不能创建新的根提交" -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "'%s'：只需要与分支的一个合并基线" - -#: builtin/rebase.c:2020 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一个合并基线" -#: builtin/rebase.c:2028 +#: builtin/rebase.c:1896 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "没有指向一个有效的提交 '%s'" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:1921 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "致命错误：无此分支/提交 '%s'" -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用：%s" -#: builtin/rebase.c:2073 +#: builtin/rebase.c:1940 msgid "Could not resolve HEAD to a revision" msgstr "无法将 HEAD 解析为一个版本" -#: builtin/rebase.c:2111 +#: builtin/rebase.c:1981 msgid "Cannot autostash" msgstr "无法 autostash" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:1984 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 响应：'%s'" -#: builtin/rebase.c:2120 +#: builtin/rebase.c:1990 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: builtin/rebase.c:2123 +#: builtin/rebase.c:1993 #, c-format msgid "Created autostash: %s\n" msgstr "创建了 autostash：%s\n" -#: builtin/rebase.c:2126 +#: builtin/rebase.c:1996 msgid "could not reset --hard" msgstr "无法 reset --hard" -#: builtin/rebase.c:2135 +#: builtin/rebase.c:1997 builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD 现在位于 %s" + +#: builtin/rebase.c:2013 msgid "Please commit or stash them." msgstr "请提交或贮藏修改。" -#: builtin/rebase.c:2169 +#: builtin/rebase.c:2040 +#, c-format +msgid "could not parse '%s'" +msgstr "无法解析 '%s'" + +#: builtin/rebase.c:2053 #, c-format msgid "could not switch to %s" msgstr "无法切换到 %s" -#: builtin/rebase.c:2180 +#: builtin/rebase.c:2064 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:2182 +#: builtin/rebase.c:2066 #, c-format msgid "Current branch %s is up to date.\n" msgstr "当前分支 %s 是最新的。\n" -#: builtin/rebase.c:2190 +#: builtin/rebase.c:2074 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，强制变基。" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2076 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "当前分支 %s 是最新的，强制变基。\n" -#: builtin/rebase.c:2200 +#: builtin/rebase.c:2084 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 钩子拒绝了变基操作。" -#: builtin/rebase.c:2207 +#: builtin/rebase.c:2091 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的变更：\n" -#: builtin/rebase.c:2210 +#: builtin/rebase.c:2094 #, c-format msgid "Changes from %s to %s:\n" msgstr "从 %s 到 %s 的变更：\n" -#: builtin/rebase.c:2235 +#: builtin/rebase.c:2119 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，回退头指针以便在其上重放您的工作...\n" -#: builtin/rebase.c:2244 +#: builtin/rebase.c:2128 msgid "Could not detach HEAD" msgstr "无法分离头指针" -#: builtin/rebase.c:2253 +#: builtin/rebase.c:2137 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快进 %s 到 %s。\n" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" -#: builtin/receive-pack.c:821 +#: builtin/receive-pack.c:832 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18491,7 +17479,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:852 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18540,49 +17528,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <引用>" -#: builtin/reflog.c:568 builtin/reflog.c:573 +#: builtin/reflog.c:567 builtin/reflog.c:572 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一个有效的时间戳" -#: builtin/reflog.c:606 +#: builtin/reflog.c:605 #, c-format msgid "Marking reachable objects..." msgstr "正在标记可达对象..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" msgstr "%s 指向不存在！" -#: builtin/reflog.c:696 +#: builtin/reflog.c:695 msgid "no reflog specified to delete" msgstr "未指定要删除的引用日志" -#: builtin/reflog.c:705 +#: builtin/reflog.c:704 #, c-format msgid "not a reflog: %s" msgstr "不是一个引用日志：%s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:709 #, c-format msgid "no reflog for '%s'" msgstr "没有 '%s' 的引用日志" -#: builtin/reflog.c:756 +#: builtin/reflog.c:755 #, c-format msgid "invalid ref format: %s" msgstr "无效的引用格式：%s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:17 +#: builtin/remote.c:16 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:18 +#: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18590,81 +17578,81 @@ msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <名称> <地址>" -#: builtin/remote.c:19 builtin/remote.c:39 +#: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" msgstr "git remote rename <旧名称> <新名称>" -#: builtin/remote.c:20 builtin/remote.c:44 +#: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" msgstr "git remote remove <名称>" -#: builtin/remote.c:21 builtin/remote.c:49 +#: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)" -#: builtin/remote.c:22 +#: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <名称>" -#: builtin/remote.c:23 +#: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <名称>" -#: builtin/remote.c:24 +#: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" -#: builtin/remote.c:25 +#: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <名称> <分支>..." -#: builtin/remote.c:26 builtin/remote.c:75 +#: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <名称>" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <名称> <新的地址>" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <名称> <地址>" -#: builtin/remote.c:34 +#: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <名称> <地址>" -#: builtin/remote.c:54 +#: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <名称> <分支>..." -#: builtin/remote.c:55 +#: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <名称> <分支>..." -#: builtin/remote.c:60 +#: builtin/remote.c:59 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <名称>" -#: builtin/remote.c:65 +#: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <名称>" -#: builtin/remote.c:70 +#: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." -#: builtin/remote.c:99 +#: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "更新 %s 中" -#: builtin/remote.c:131 +#: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18672,98 +17660,82 @@ msgstr "" "--mirror 选项危险且过时，请使用 --mirror=fetch\n" "\t 或 --mirror=push" -#: builtin/remote.c:148 +#: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜像参数：%s" -#: builtin/remote.c:164 +#: builtin/remote.c:163 msgid "fetch the remote branches" msgstr "抓取远程的分支" -#: builtin/remote.c:166 +#: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "抓取时导入所有的标签和关联对象" -#: builtin/remote.c:169 +#: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或不抓取任何标签（--no-tags）" -#: builtin/remote.c:171 +#: builtin/remote.c:170 msgid "branch(es) to track" msgstr "跟踪的分支" -#: builtin/remote.c:172 +#: builtin/remote.c:171 msgid "master branch" msgstr "主线分支" -#: builtin/remote.c:174 +#: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推送或抓取的镜像" -#: builtin/remote.c:186 +#: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" -#: builtin/remote.c:188 +#: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:194 builtin/remote.c:636 #, c-format msgid "remote %s already exists." msgstr "远程 %s 已经存在。" -#: builtin/remote.c:199 builtin/remote.c:700 +#: builtin/remote.c:198 builtin/remote.c:640 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" -#: builtin/remote.c:239 +#: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" msgstr "无法设置 master '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "无法得到引用规格 %s 的获取列表" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" msgstr "（匹配）" -#: builtin/remote.c:465 +#: builtin/remote.c:455 msgid "(delete)" msgstr "（删除）" -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "不能设置 '%s'" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"配置（%s）remote.pushDefault 位于：\n" -"\t%s:%d\n" -"现在在为不存在的远程名 '%s' 命名" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 #, c-format msgid "No such remote: '%s'" msgstr "没有此远程仓库：'%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重命名配置小节 '%s' 到 '%s'" -#: builtin/remote.c:726 +#: builtin/remote.c:666 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18774,17 +17746,17 @@ msgstr "" "\t%s\n" "\t如果必要请手动更新配置。" -#: builtin/remote.c:766 +#: builtin/remote.c:702 #, c-format msgid "deleting '%s' failed" msgstr "删除 '%s' 失败" -#: builtin/remote.c:800 +#: builtin/remote.c:736 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" -#: builtin/remote.c:876 +#: builtin/remote.c:802 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18794,118 +17766,118 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" -#: builtin/remote.c:890 +#: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除配置小节 '%s'" -#: builtin/remote.c:993 +#: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次获取将存储于 remotes/%s）" -#: builtin/remote.c:996 +#: builtin/remote.c:920 msgid " tracked" msgstr " 已跟踪" -#: builtin/remote.c:998 +#: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时（使用 'git remote prune' 来移除）" -#: builtin/remote.c:1000 +#: builtin/remote.c:924 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" -#: builtin/remote.c:1050 +#: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" msgstr "交互式变基到远程 %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "交互式变基（含合并提交）到远程 %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" msgstr "变基到远程 %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:983 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s 合并" -#: builtin/remote.c:1062 +#: builtin/remote.c:986 #, c-format msgid "merges with remote %s" msgstr "与远程 %s 合并" -#: builtin/remote.c:1065 +#: builtin/remote.c:989 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以及和远程 %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1032 msgid "create" msgstr "创建" -#: builtin/remote.c:1111 +#: builtin/remote.c:1035 msgid "delete" msgstr "删除" -#: builtin/remote.c:1115 +#: builtin/remote.c:1039 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1118 +#: builtin/remote.c:1042 msgid "fast-forwardable" msgstr "可快进" -#: builtin/remote.c:1121 +#: builtin/remote.c:1045 msgid "local out of date" msgstr "本地已过时" -#: builtin/remote.c:1128 +#: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推送至 %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推送至 %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1062 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1130 msgid "do not query remotes" msgstr "不查询远程" -#: builtin/remote.c:1233 +#: builtin/remote.c:1157 #, c-format msgid "* remote %s" msgstr "* 远程 %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" msgstr " 获取地址：%s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" msgstr "(无 URL)" @@ -18913,32 +17885,32 @@ msgstr "(无 URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" msgstr " 推送地址：%s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1253 +#: builtin/remote.c:1177 msgid "(not queried)" msgstr "（未查询）" -#: builtin/remote.c:1255 +#: builtin/remote.c:1179 msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1259 +#: builtin/remote.c:1183 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1195 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -18946,155 +17918,164 @@ msgstr[0] " 远程分支：%s" msgstr[1] " 远程分支：%s" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" msgstr "（状态未查询）" -#: builtin/remote.c:1283 +#: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' 配置的本地分支：" msgstr[1] " 为 'git pull' 配置的本地分支：" -#: builtin/remote.c:1291 +#: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜像" -#: builtin/remote.c:1297 +#: builtin/remote.c:1221 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' 配置的本地引用%s：" msgstr[1] " 为 'git push' 配置的本地引用%s：" -#: builtin/remote.c:1318 +#: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根据远程设置 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1320 +#: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" msgstr "删除 refs/remotes/<名称>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" msgstr "无法确定远程 HEAD" -#: builtin/remote.c:1337 +#: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" -#: builtin/remote.c:1347 +#: builtin/remote.c:1271 #, c-format msgid "Could not delete %s" msgstr "无法删除 %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1279 #, c-format msgid "Not a valid ref: %s" msgstr "不是一个有效引用：%s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1281 #, c-format msgid "Could not setup %s" msgstr "不能设置 %s" # 译者：注意保持前导空格 -#: builtin/remote.c:1375 +#: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" msgstr " %s 将成为悬空状态！" # 译者：注意保持前导空格 -#: builtin/remote.c:1376 +#: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" msgstr " %s 已成为悬空状态！" -#: builtin/remote.c:1386 +#: builtin/remote.c:1310 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1311 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" msgstr " * [将删除] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" msgstr " * [已删除] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1375 msgid "prune remotes after fetching" msgstr "抓取后清除远程" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format msgid "No such remote '%s'" msgstr "没有此远程 '%s'" -#: builtin/remote.c:1530 +#: builtin/remote.c:1454 msgid "add branch" msgstr "添加分支" -#: builtin/remote.c:1537 +#: builtin/remote.c:1461 msgid "no remote specified" msgstr "未指定远程" -#: builtin/remote.c:1554 +#: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" msgstr "查询推送 URL 地址，而非获取 URL 地址" -#: builtin/remote.c:1556 +#: builtin/remote.c:1480 msgid "return all URLs" msgstr "返回所有 URL 地址" -#: builtin/remote.c:1584 +#: builtin/remote.c:1508 #, c-format msgid "no URLs configured for remote '%s'" msgstr "没有给远程仓库 '%s' 设定 URL" -#: builtin/remote.c:1610 +#: builtin/remote.c:1534 msgid "manipulate push URLs" msgstr "操作推送 URLS" -#: builtin/remote.c:1612 +#: builtin/remote.c:1536 msgid "add URL" msgstr "添加 URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1538 msgid "delete URLs" msgstr "删除 URLS" -#: builtin/remote.c:1621 +#: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" msgstr "--add --delete 无意义" -#: builtin/remote.c:1660 +#: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" msgstr "无效的旧 URL 匹配模版：%s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1592 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" msgstr "将不会删除所有非推送 URL 地址" -#: builtin/repack.c:23 +#: builtin/remote.c:1610 +msgid "be verbose; must be placed before a subcommand" +msgstr "冗长输出；必须置于子命令之前" + +#: builtin/remote.c:1641 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子命令：%s" + +#: builtin/repack.c:22 msgid "git repack [<options>]" msgstr "git repack [<选项>]" -#: builtin/repack.c:28 +#: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19102,111 +18083,111 @@ msgstr "" "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n" "或禁用 pack.writebitmaps 配置。" -#: builtin/repack.c:191 +#: builtin/repack.c:190 msgid "could not start pack-objects to repack promisor objects" msgstr "无法开始 pack-objects 来重新打包 promisor 对象" -#: builtin/repack.c:230 builtin/repack.c:416 +#: builtin/repack.c:229 builtin/repack.c:408 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。" -#: builtin/repack.c:254 +#: builtin/repack.c:246 msgid "could not finish pack-objects to repack promisor objects" msgstr "无法完成 pack-objects 来重新打包 promisor 对象" -#: builtin/repack.c:292 +#: builtin/repack.c:284 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件中" -#: builtin/repack.c:294 +#: builtin/repack.c:286 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，并将不可达的对象设为松散对象" -#: builtin/repack.c:297 +#: builtin/repack.c:289 msgid "remove redundant packs, and run git-prune-packed" msgstr "删除多余的包，运行 git-prune-packed" -#: builtin/repack.c:299 +#: builtin/repack.c:291 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-delta" -#: builtin/repack.c:301 +#: builtin/repack.c:293 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --no-reuse-object" -#: builtin/repack.c:303 +#: builtin/repack.c:295 msgid "do not run git-update-server-info" msgstr "不运行 git-update-server-info" -#: builtin/repack.c:306 +#: builtin/repack.c:298 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --local" -#: builtin/repack.c:308 +#: builtin/repack.c:300 msgid "write bitmap index" msgstr "写 bitmap 索引" -#: builtin/repack.c:310 +#: builtin/repack.c:302 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 传递参数 --delta-islands" -#: builtin/repack.c:311 +#: builtin/repack.c:303 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:312 +#: builtin/repack.c:304 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要将早于给定时间的对象过期" -#: builtin/repack.c:314 +#: builtin/repack.c:306 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新对不可达对象打包" -#: builtin/repack.c:316 +#: builtin/repack.c:308 msgid "size of the window used for delta compression" msgstr "用于增量压缩的窗口值" -#: builtin/repack.c:317 builtin/repack.c:323 +#: builtin/repack.c:309 builtin/repack.c:315 msgid "bytes" msgstr "字节" -#: builtin/repack.c:318 +#: builtin/repack.c:310 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制内存大小而非条目数" -#: builtin/repack.c:320 +#: builtin/repack.c:312 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:322 +#: builtin/repack.c:314 msgid "limits the maximum number of threads" msgstr "限制最大线程数" -#: builtin/repack.c:324 +#: builtin/repack.c:316 msgid "maximum size of each packfile" msgstr "每个包文件的最大尺寸" -#: builtin/repack.c:326 +#: builtin/repack.c:318 msgid "repack objects in packs marked with .keep" msgstr "对标记为 .keep 的包中的对象重新打包" -#: builtin/repack.c:328 +#: builtin/repack.c:320 msgid "do not repack this pack" msgstr "不要对该包文件重新打包" -#: builtin/repack.c:338 +#: builtin/repack.c:330 msgid "cannot delete packs in a precious-objects repo" msgstr "不能删除珍品仓库中的打包文件" -#: builtin/repack.c:342 +#: builtin/repack.c:334 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不兼容" -#: builtin/repack.c:425 +#: builtin/repack.c:417 msgid "Nothing new to pack." msgstr "没有新的要打包。" -#: builtin/repack.c:486 +#: builtin/repack.c:478 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -19222,7 +18203,7 @@ msgstr "" "警告：并且尝试重命名改回原有文件名的操作也失败。\n" "警告：请手动将 %s 下的这些文件重命名：\n" -#: builtin/repack.c:534 +#: builtin/repack.c:526 #, c-format msgid "failed to remove '%s'" msgstr "删除 '%s' 失败" @@ -19330,8 +18311,8 @@ msgstr "无法对 %s 执行 fstat" msgid "unable to write object to database" msgstr "无法向数据库写入对象" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" @@ -19350,53 +18331,53 @@ msgstr "编辑对象文件失败" msgid "new object is the same as the old one: '%s'" msgstr "新对象和旧对象相同：'%s'" -#: builtin/replace.c:384 +#: builtin/replace.c:383 #, c-format msgid "could not parse %s as a commit" msgstr "无法将 %s 解析为一个提交" -#: builtin/replace.c:416 +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有损坏的合并标签" -#: builtin/replace.c:418 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有格式错误的合并标签" -#: builtin/replace.c:430 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:469 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "原始提交 '%s' 中有一个 gpg 签名" -#: builtin/replace.c:470 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "在替换的提交中签名将被移除！" -#: builtin/replace.c:480 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能为 '%s' 写替换提交" -#: builtin/replace.c:488 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "对 '%s' 移植没有必要" -#: builtin/replace.c:492 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "新提交和旧的一样：'%s'" -#: builtin/replace.c:527 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19405,71 +18386,71 @@ msgstr "" "不能转换下列移植：\n" "%s" -#: builtin/replace.c:548 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:549 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:550 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "编辑现存的对象" -#: builtin/replace.c:551 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "修改一个提交的父提交" -#: builtin/replace.c:552 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "转换现存的移植文件" -#: builtin/replace.c:553 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:555 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "不要为 --edit 操作美观显示内容" -#: builtin/replace.c:556 +#: builtin/replace.c:554 msgid "use this format" msgstr "使用此格式" -#: builtin/replace.c:569 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "不列出时不能使用 --format" -#: builtin/replace.c:577 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "只有写一个替换时 -f 才有意义" -#: builtin/replace.c:581 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw 只有和 --edit 共用才有意义" -#: builtin/replace.c:587 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d 需要至少一个参数" -#: builtin/replace.c:593 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "错误的参数个数" -#: builtin/replace.c:599 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e 需要且仅需要一个参数" -#: builtin/replace.c:605 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g 需要至少一个参数" -#: builtin/replace.c:611 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file 不带参数" -#: builtin/replace.c:617 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" @@ -19496,126 +18477,116 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..." +msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgstr "git reset [-q] [<树或提交>] [--] <路径>..." #: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "mixed" msgstr "混杂" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "soft" msgstr "软性" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "hard" msgstr "硬性" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "merge" msgstr "合并" -#: builtin/reset.c:41 +#: builtin/reset.c:40 msgid "keep" msgstr "保持" -#: builtin/reset.c:82 +#: builtin/reset.c:81 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:84 +#: builtin/reset.c:83 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:90 +#: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD 现在位于 %s" - # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:194 +#: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "安静模式，只报告错误" -#: builtin/reset.c:296 +#: builtin/reset.c:295 msgid "reset HEAD and index" msgstr "重置 HEAD 和索引" -#: builtin/reset.c:297 +#: builtin/reset.c:296 msgid "reset only HEAD" msgstr "只重置 HEAD" -#: builtin/reset.c:299 builtin/reset.c:301 +#: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:303 +#: builtin/reset.c:302 msgid "reset HEAD but keep local changes" msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:309 +#: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "将删除的路径标记为稍后添加" -#: builtin/reset.c:343 +#: builtin/reset.c:326 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "无法将 '%s' 解析为一个有效的版本。" -#: builtin/reset.c:351 +#: builtin/reset.c:334 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "无法将 '%s' 解析为一个有效的树对象。" -#: builtin/reset.c:360 +#: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:370 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:372 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:387 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对纯仓库进行%s重置" -#: builtin/reset.c:391 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同时使用" -#: builtin/reset.c:412 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "重置后取消暂存的变更：" -#: builtin/reset.c:415 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -19627,30 +18598,35 @@ msgstr "" "重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" -#: builtin/reset.c:425 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:429 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:412 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:473 msgid "object filtering requires --objects" msgstr "对象过滤需要 --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:476 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "无效的稀疏值 '%s'" + +#: builtin/rev-list.c:527 msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "标记计数和 --objects 不兼容" +#: builtin/rev-list.c:530 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -19810,40 +18786,36 @@ msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改：" msgstr[1] "如下文件有本地修改：" -#: builtin/rm.c:243 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "不列出删除的文件" -#: builtin/rm.c:244 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "只从索引区删除" -#: builtin/rm.c:245 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "忽略文件更新状态检查" -#: builtin/rm.c:246 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "允许递归删除" -#: builtin/rm.c:248 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "即使没有匹配，也以零状态退出" -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "没有提供路径规格。我应该删除哪些文件？" - -#: builtin/rm.c:305 +#: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" -#: builtin/rm.c:323 +#: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:362 +#: builtin/rm.c:346 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" @@ -20089,82 +19061,15 @@ msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <选项>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "无法为稀疏检出文件创建目录" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "无法设置 extensions.worktreeConfig" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "初始化稀疏检出为 cone 模式" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "初始化稀疏检出" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "无法打开 '%s'" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "无法规范化路径 %s" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <模式>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "无法为 C 语言风格的字符串 '%s' 去引号" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "无法加载现存的稀疏检出模式" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "从标准输入读取模式" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "设置稀疏检出模式" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "禁用稀疏检出" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "刷新工作目录时出错" - -#: builtin/stash.c:22 builtin/stash.c:38 +#: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<选项>]" -#: builtin/stash.c:23 builtin/stash.c:43 +#: builtin/stash.c:23 builtin/stash.c:42 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<选项>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:48 +#: builtin/stash.c:24 builtin/stash.c:47 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -20172,27 +19077,25 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:63 +#: builtin/stash.c:26 builtin/stash.c:62 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:68 +#: builtin/stash.c:27 builtin/stash.c:67 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 +#: builtin/stash.c:28 builtin/stash.c:77 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<路径规格>...]]" -#: builtin/stash.c:32 builtin/stash.c:85 +#: builtin/stash.c:31 builtin/stash.c:84 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -20200,196 +19103,186 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<消息>]" -#: builtin/stash.c:53 +#: builtin/stash.c:52 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:58 +#: builtin/stash.c:57 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:73 +#: builtin/stash.c:72 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" -" [--] [<路径规格>...]]" - -#: builtin/stash.c:128 +#: builtin/stash.c:127 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' 不像是一个贮藏提交" -#: builtin/stash.c:148 +#: builtin/stash.c:147 #, c-format msgid "Too many revisions specified:%s" msgstr "指定了太多的版本：%s" -#: builtin/stash.c:162 git-legacy-stash.sh:549 +#: builtin/stash.c:161 git-legacy-stash.sh:548 msgid "No stash entries found." msgstr "未发现贮藏条目。" -#: builtin/stash.c:176 +#: builtin/stash.c:175 #, c-format msgid "%s is not a valid reference" msgstr "%s 不是一个有效的引用名" -#: builtin/stash.c:225 git-legacy-stash.sh:75 +#: builtin/stash.c:224 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支持参数" -#: builtin/stash.c:404 +#: builtin/stash.c:403 msgid "cannot apply a stash in the middle of a merge" msgstr "无法在合并过程应用贮藏" -#: builtin/stash.c:415 +#: builtin/stash.c:414 #, c-format msgid "could not generate diff %s^!." msgstr "无法生成差异 %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:421 msgid "conflicts in index.Try without --index." msgstr "索引中有冲突。尝试不用 --index。" -#: builtin/stash.c:428 +#: builtin/stash.c:427 msgid "could not save index tree" msgstr "不能保存索引树" -#: builtin/stash.c:437 +#: builtin/stash.c:434 msgid "could not restore untracked files from stash" msgstr "无法从贮藏条目中恢复未跟踪文件" -#: builtin/stash.c:451 +#: builtin/stash.c:448 #, c-format msgid "Merging %s with %s" msgstr "正在合并 %s 和 %s" -#: builtin/stash.c:461 git-legacy-stash.sh:681 +#: builtin/stash.c:458 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "索引未从贮藏中恢复。" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:516 builtin/stash.c:615 msgid "attempt to recreate the index" msgstr "尝试重建索引" -#: builtin/stash.c:555 +#: builtin/stash.c:549 #, c-format msgid "Dropped %s (%s)" msgstr "丢弃了 %s（%s）" -#: builtin/stash.c:558 +#: builtin/stash.c:552 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：无法丢弃贮藏条目" -#: builtin/stash.c:583 +#: builtin/stash.c:577 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一个贮藏引用" -#: builtin/stash.c:633 git-legacy-stash.sh:695 +#: builtin/stash.c:627 git-legacy-stash.sh:694 msgid "The stash entry is kept in case you need it again." msgstr "贮藏条目被保留以备您再次需要。" -#: builtin/stash.c:656 git-legacy-stash.sh:713 +#: builtin/stash.c:650 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:790 builtin/stash.c:827 #, c-format msgid "Cannot update %s with %s" msgstr "无法用 %2$s 更新 %1$s" -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 +#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 msgid "stash message" msgstr "贮藏说明" -#: builtin/stash.c:824 +#: builtin/stash.c:818 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一个 <提交> 参数" -#: builtin/stash.c:1049 git-legacy-stash.sh:218 +#: builtin/stash.c:1040 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "没有选择变更" -#: builtin/stash.c:1149 git-legacy-stash.sh:150 +#: builtin/stash.c:1136 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1176 git-legacy-stash.sh:165 +#: builtin/stash.c:1163 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "无法保存当前索引状态" -#: builtin/stash.c:1185 git-legacy-stash.sh:180 +#: builtin/stash.c:1172 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "无法保存未跟踪文件" -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 +#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "无法保存当前工作区状态" -#: builtin/stash.c:1233 git-legacy-stash.sh:234 +#: builtin/stash.c:1220 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "不能记录工作区状态" -#: builtin/stash.c:1282 git-legacy-stash.sh:338 +#: builtin/stash.c:1269 git-legacy-stash.sh:337 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1298 +#: builtin/stash.c:1285 msgid "Did you forget to 'git add'?" msgstr "您是否忘了执行 'git add'？" -#: builtin/stash.c:1313 git-legacy-stash.sh:346 +#: builtin/stash.c:1300 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "没有要保存的本地修改" -#: builtin/stash.c:1320 git-legacy-stash.sh:351 +#: builtin/stash.c:1307 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "无法初始化贮藏" -#: builtin/stash.c:1335 git-legacy-stash.sh:355 +#: builtin/stash.c:1322 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "无法保存当前状态" -#: builtin/stash.c:1340 +#: builtin/stash.c:1327 #, c-format msgid "Saved working directory and index state %s" msgstr "保存工作目录和索引状态 %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:385 +#: builtin/stash.c:1417 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "无法删除工作区变更" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1452 builtin/stash.c:1488 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1454 builtin/stash.c:1490 msgid "stash in patch mode" msgstr "以补丁模式贮藏" -#: builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:1455 builtin/stash.c:1491 msgid "quiet mode" msgstr "静默模式" -#: builtin/stash.c:1474 builtin/stash.c:1539 +#: builtin/stash.c:1457 builtin/stash.c:1493 msgid "include untracked files in stash" msgstr "贮藏中包含未跟踪文件" -#: builtin/stash.c:1476 builtin/stash.c:1541 +#: builtin/stash.c:1459 builtin/stash.c:1495 msgid "include ignore files" msgstr "包含忽略的文件" -#: builtin/stash.c:1600 +#: builtin/stash.c:1555 #, c-format msgid "could not exec %s" msgstr "不能执行 %s" @@ -20410,40 +19303,40 @@ msgstr "跳过和移除所有的注释行" msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称，却得到 %s" -#: builtin/submodule--helper.c:64 +#: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote 不带参数" -#: builtin/submodule--helper.c:102 +#: builtin/submodule--helper.c:100 #, c-format msgid "cannot strip one component off url '%s'" msgstr "无法从 url '%s' 剥离一个组件" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记（anchor）" -#: builtin/submodule--helper.c:415 +#: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 +#: builtin/submodule--helper.c:651 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url" -#: builtin/submodule--helper.c:524 +#: builtin/submodule--helper.c:522 #, c-format msgid "Entering '%s'\n" msgstr "进入 '%s'\n" -#: builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -20452,7 +19345,7 @@ msgstr "" "对 %s 执行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:549 +#: builtin/submodule--helper.c:547 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -20462,119 +19355,119 @@ msgstr "" "在递归 %s 的子模组执行 run_command 时返回非零值。\n" "." -#: builtin/submodule--helper.c:565 +#: builtin/submodule--helper.c:563 msgid "Suppress output of entering each submodule command" msgstr "阻止进入每一个子模组命令的输出" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 msgid "Recurse into nested submodules" msgstr "递归进入嵌套子模组中" -#: builtin/submodule--helper.c:572 +#: builtin/submodule--helper.c:570 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:597 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:665 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "无法为子模组 '%s' 注册 url" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:669 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:679 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建议子模组 '%s' 使用命令更新模式\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:686 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "无法为子模组 '%s' 注册更新模式" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:708 msgid "Suppress output for initializing a submodule" msgstr "阻止子模组初始化的输出" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:713 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<选项>] [<路径>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:824 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "无法解析子模组 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "递归子模组 '%s' 失败" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 msgid "Suppress submodule status output" msgstr "阻止子模组状态输出" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:876 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:877 msgid "recurse into nested submodules" msgstr "递归进入嵌套子模组中" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:882 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:906 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:970 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "为 '%s' 同步子模组 url\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:976 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "无法为子模组路径 '%s' 注册 url" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:990 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "无法得到子模组 '%s' 的默认远程关联" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1001 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "无法为子模组 '%s' 更新远程关联" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1048 msgid "Suppress output of synchronizing submodule url" msgstr "阻止子模组 url 同步的输出" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1055 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1109 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20583,257 +19476,230 @@ msgstr "" "子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm " "-rf' 命令）" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1121 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1129 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目录 '%s'\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1131 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "无法移除子模组工作区 '%s'\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1142 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能创建空的子模组目录 %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1158 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1187 msgid "Remove submodule working trees even if they contain local changes" msgstr "删除子模组工作区，即使包含本地修改" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1188 msgid "Unregister all submodules" msgstr "将所有子模组取消注册" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1193 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1207 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'" -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"从一个父项目的备用仓库中计算出的备用仓库无效。\n" -"此场景下，设置 submodule.alternateErrorStrategy 为 'info'，以允许\n" -"Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n" -"'--reference' 来克隆。" - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模组 '%s' 不能添加仓库备选：%s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1341 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1348 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1371 msgid "where the new submodule will be cloned to" msgstr "新的子模组将要克隆的路径" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1374 msgid "name of the new submodule" msgstr "新子模组的名称" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1377 msgid "url where to clone the submodule from" msgstr "克隆子模组的 url 地址" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1385 msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 msgid "force cloning progress" msgstr "强制显示克隆进度" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "不允许克隆到一个非空目录" - -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1393 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " -"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒绝在另一个子模组的 git dir 中创建/使用 '%s'" +"[--name <名字>] [--depth <深度>] --url <url> --path <路径>" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1424 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "无法克隆 '%s' 到子模组路径 '%s'" -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "目录非空：'%s'" - -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1438 #, c-format msgid "could not get submodule directory for '%s'" msgstr "无法得到 '%s' 的子模组目录" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1474 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模组 '%2$s' 的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1478 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "为子模组 '%2$s' 配置的更新模式 '%1$s' 无效" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:1571 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模组 '%s' 尚未初始化" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:1575 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想要执行 'update --init'？" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:1605 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未合并的子模组 %s" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:1634 #, c-format msgid "Skipping submodule '%s'" msgstr "略过子模组 '%s'" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:1778 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划重试" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:1789 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败，退出" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:1854 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径，递归嵌套子模组" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:1858 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:1864 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:1867 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:1869 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:1870 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]" +#: builtin/submodule--helper.c:1877 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:1938 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2061 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "无法获得子模组 '%s' 的仓库句柄" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2094 msgid "recurse into submodules" msgstr "在子模组中递归" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2100 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "检查写入 .gitmodules 文件是否安全" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2159 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 文件中的设置" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2164 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名称> [<值>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2165 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名称>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "请确认 .gitmodules 文件在工作区里" -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:2297 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -21086,218 +19952,214 @@ msgstr "标签 '%s' 已存在" msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'（曾为 %s）\n" -#: builtin/unpack-objects.c:502 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "展开对象中" -#: builtin/update-index.c:84 +#: builtin/update-index.c:83 #, c-format msgid "failed to create directory %s" msgstr "创建目录 %s 失败" -#: builtin/update-index.c:100 +#: builtin/update-index.c:99 #, c-format msgid "failed to create file %s" msgstr "创建文件 %s 失败" -#: builtin/update-index.c:108 +#: builtin/update-index.c:107 #, c-format msgid "failed to delete file %s" msgstr "删除文件 %s 失败" -#: builtin/update-index.c:115 builtin/update-index.c:221 +#: builtin/update-index.c:114 builtin/update-index.c:220 #, c-format msgid "failed to delete directory %s" msgstr "删除目录 %s 失败" -#: builtin/update-index.c:140 +#: builtin/update-index.c:139 #, c-format msgid "Testing mtime in '%s' " msgstr "在 '%s' 中测试 mtime " -#: builtin/update-index.c:154 +#: builtin/update-index.c:153 msgid "directory stat info does not change after adding a new file" msgstr "添加一个新文件后，目录的状态信息未改变" -#: builtin/update-index.c:167 +#: builtin/update-index.c:166 msgid "directory stat info does not change after adding a new directory" msgstr "添加一个新目录后，目录的状态信息未改变" -#: builtin/update-index.c:180 +#: builtin/update-index.c:179 msgid "directory stat info changes after updating a file" msgstr "更新一个文件后，目录的状态信息被修改" -#: builtin/update-index.c:191 +#: builtin/update-index.c:190 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在子目录中添加文件后，目录的状态信息被修改" -#: builtin/update-index.c:202 +#: builtin/update-index.c:201 msgid "directory stat info does not change after deleting a file" msgstr "删除一个文件后，目录的状态信息未改变" -#: builtin/update-index.c:215 +#: builtin/update-index.c:214 msgid "directory stat info does not change after deleting a directory" msgstr "删除一个目录后，目录的状态信息未改变" -#: builtin/update-index.c:222 +#: builtin/update-index.c:221 msgid " OK" msgstr " OK" -#: builtin/update-index.c:591 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:974 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:977 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "刷新：忽略子模组" -#: builtin/update-index.c:980 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:982 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:984 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:986 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:989 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:993 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:997 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<对象>,<路径>" -#: builtin/update-index.c:998 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "不要触碰仅索引条目" - -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:1047 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "以这种格式写入索引区" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "启用或禁用索引拆分" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "启用/禁用对未跟踪文件的缓存" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "测试文件系统是否支持未跟踪文件缓存" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "无需检测文件系统，启用对未跟踪文件的缓存" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "即使没有被标记为已更改，也要写出索引" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "启用或禁用文件系统监控" -#: builtin/update-index.c:1067 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "标记文件为 fsmonitor 有效" -#: builtin/update-index.c:1070 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" -#: builtin/update-index.c:1173 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" "core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -21305,11 +20167,11 @@ msgstr "" "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修" "改它。" -#: builtin/update-index.c:1198 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "缓存未跟踪文件被禁用" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -21317,25 +20179,25 @@ msgstr "" "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或" "修改它。" -#: builtin/update-index.c:1210 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "缓存未跟踪文件在 '%s' 启用" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项" -#: builtin/update-index.c:1222 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor 被启用" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项" -#: builtin/update-index.c:1229 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor 被禁用" @@ -21427,90 +20289,90 @@ msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..." msgid "print tag contents" msgstr "打印标签内容" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<选项>] <路径> [<提交>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<选项>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<选项>] <路径>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <工作区> <新路径>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<选项>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<选项>] <工作区>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:60 builtin/worktree.c:891 +#: builtin/worktree.c:61 builtin/worktree.c:899 #, c-format msgid "failed to delete '%s'" msgstr "删除 '%s' 失败" -#: builtin/worktree.c:79 +#: builtin/worktree.c:80 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "删除工作区/%s：不是一个有效的目录" -#: builtin/worktree.c:85 +#: builtin/worktree.c:86 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "删除 worktrees/%s：gitdir 文件不存在" -#: builtin/worktree.c:90 builtin/worktree.c:99 +#: builtin/worktree.c:91 builtin/worktree.c:100 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)" -#: builtin/worktree.c:109 +#: builtin/worktree.c:110 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "删除工作树/%s：读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）" -#: builtin/worktree.c:117 +#: builtin/worktree.c:118 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "删除 worktrees/%s：无效的 gitdir 文件" -#: builtin/worktree.c:126 +#: builtin/worktree.c:127 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "删除 worktrees/%s：gitdir 文件的指向不存在" -#: builtin/worktree.c:165 +#: builtin/worktree.c:166 msgid "report pruned working trees" msgstr "报告清除的工作区" -#: builtin/worktree.c:167 +#: builtin/worktree.c:168 msgid "expire working trees older than <time>" msgstr "将早于 <时间> 的工作区过期" -#: builtin/worktree.c:234 +#: builtin/worktree.c:235 #, c-format msgid "'%s' already exists" msgstr "'%s' 已经存在" -#: builtin/worktree.c:244 +#: builtin/worktree.c:252 #, c-format msgid "unable to re-add worktree '%s'" msgstr "无法再次添加工作区 '%s'" -#: builtin/worktree.c:249 +#: builtin/worktree.c:257 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21519,7 +20381,7 @@ msgstr "" "'%s' 是一个丢失但锁定的工作区，使用\n" "'add -f -f' 覆盖，或 'unlock' 和 'prune' 或 'remove' 清除" -#: builtin/worktree.c:251 +#: builtin/worktree.c:259 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21528,120 +20390,120 @@ msgstr "" "'%s' 是一个丢失但已经注册的工作区，使用\n" "'add -f' 覆盖，或 'prune' 或 'remove' 清除" -#: builtin/worktree.c:301 +#: builtin/worktree.c:309 #, c-format msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:440 builtin/worktree.c:446 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区（新分支 '%s'）" -#: builtin/worktree.c:434 +#: builtin/worktree.c:442 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区（重置分支 '%s'，之前为 %s）" -#: builtin/worktree.c:443 +#: builtin/worktree.c:451 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区（检出 '%s'）" -#: builtin/worktree.c:449 +#: builtin/worktree.c:457 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区（分离头指针 %s）" -#: builtin/worktree.c:490 +#: builtin/worktree.c:498 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>，即使已经被检出到其它工作区" -#: builtin/worktree.c:493 +#: builtin/worktree.c:501 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:495 +#: builtin/worktree.c:503 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:497 +#: builtin/worktree.c:505 msgid "populate the new working tree" msgstr "生成新的工作区" -#: builtin/worktree.c:498 +#: builtin/worktree.c:506 msgid "keep the new working tree locked" msgstr "锁定新工作区" -#: builtin/worktree.c:501 +#: builtin/worktree.c:509 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模式（参见 git-branch(1)）" -#: builtin/worktree.c:504 +#: builtin/worktree.c:512 msgid "try to match the new branch name with a remote-tracking branch" msgstr "尝试为新分支名匹配一个远程跟踪分支" -#: builtin/worktree.c:512 +#: builtin/worktree.c:520 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:573 +#: builtin/worktree.c:581 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在创建新分支时使用选项 --[no-]track " -#: builtin/worktree.c:673 +#: builtin/worktree.c:681 msgid "reason for locking" msgstr "锁定原因" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 +#: builtin/worktree.c:927 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:695 builtin/worktree.c:728 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:692 +#: builtin/worktree.c:700 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定，原因：%s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:702 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:722 +#: builtin/worktree.c:730 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/worktree.c:763 +#: builtin/worktree.c:771 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移动或删除包含子模组的工作区" -#: builtin/worktree.c:771 +#: builtin/worktree.c:779 msgid "force move even if worktree is dirty or locked" msgstr "强制移动，即使工作区是脏的或已锁定" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:802 builtin/worktree.c:929 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" -#: builtin/worktree.c:799 +#: builtin/worktree.c:807 #, c-format msgid "could not figure out destination name from '%s'" msgstr "无法从 '%s' 算出目标名称" -#: builtin/worktree.c:805 +#: builtin/worktree.c:813 #, c-format msgid "target '%s' already exists" msgstr "目标 '%s' 已存在" -#: builtin/worktree.c:813 +#: builtin/worktree.c:821 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21650,7 +20512,7 @@ msgstr "" "无法移动一个锁定的工作区，锁定原因：%s\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:815 +#: builtin/worktree.c:823 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21658,36 +20520,36 @@ msgstr "" "无法移动一个锁定的工作区，\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:818 +#: builtin/worktree.c:826 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验证失败，无法移动工作区：%s" -#: builtin/worktree.c:823 +#: builtin/worktree.c:831 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移动 '%s' 到 '%s' 失败" -#: builtin/worktree.c:871 +#: builtin/worktree.c:879 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中执行 'git status' 失败" -#: builtin/worktree.c:875 +#: builtin/worktree.c:883 #, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除" +msgid "'%s' is dirty, use --force to delete it" +msgstr "'%s' 是脏的，使用 --force 删除" -#: builtin/worktree.c:880 +#: builtin/worktree.c:888 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d" -#: builtin/worktree.c:903 +#: builtin/worktree.c:911 msgid "force removal even if worktree is dirty or locked" msgstr "强制删除，即使工作区是脏的或已锁定" -#: builtin/worktree.c:926 +#: builtin/worktree.c:934 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21696,7 +20558,7 @@ msgstr "" "无法删除一个锁定的工作区，锁定原因：%s\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:928 +#: builtin/worktree.c:936 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21704,7 +20566,7 @@ msgstr "" "无法删除一个锁定的工作区，\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:931 +#: builtin/worktree.c:939 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验证失败，无法删除工作区：%s" @@ -21725,21 +20587,6 @@ msgstr "将 <前缀> 子目录内容写到一个树对象" msgid "only useful for debugging" msgstr "只对调试有用" -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "预期 'mark' 命令，得到 %s" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "预期 'to' 命令，得到 %s" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" - #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21851,25 +20698,25 @@ msgstr "" "别名 '%s' 修改环境变量。您可以使用在别名中\n" "使用 '!git'" -#: git.c:376 +#: git.c:377 #, c-format msgid "empty alias for %s" msgstr "%s 的空别名" -#: git.c:379 +#: git.c:380 #, c-format msgid "recursive alias: %s" msgstr "递归的别名：%s" -#: git.c:459 +#: git.c:460 msgid "write failure on standard output" msgstr "在标准输出写入失败" -#: git.c:461 +#: git.c:462 msgid "unknown write failure on standard output" msgstr "到标准输出的未知写入错误" -#: git.c:463 +#: git.c:464 msgid "close failed on standard output" msgstr "标准输出关闭失败" @@ -21923,22 +20770,22 @@ msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "不支持协议限制，因为 cURL < 7.19.4" -#: http.c:1086 +#: http.c:1085 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端：" -#: http.c:1093 +#: http.c:1092 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构建" -#: http.c:1097 +#: http.c:1096 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "无法将 SSL 后端设置为 '%s'：已经设置" -#: http.c:1966 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21949,156 +20796,147 @@ msgstr "" " 请求：%s\n" " 重定向：%s" -#: remote-curl.c:166 +#: remote-curl.c:157 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "在 push-option 取值中无效的引号：'%s'" -#: remote-curl.c:263 +#: remote-curl.c:254 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs 无效：这是一个 git 仓库么？" -#: remote-curl.c:364 +#: remote-curl.c:355 msgid "invalid server response; expected service, got flush packet" msgstr "无效的服务端响应。预期服务，得到 flush 包" -#: remote-curl.c:395 +#: remote-curl.c:386 #, c-format msgid "invalid server response; got '%s'" msgstr "无效的服务端响应，得到 '%s'" -#: remote-curl.c:455 +#: remote-curl.c:446 #, c-format msgid "repository '%s' not found" msgstr "仓库 '%s' 未找到" -#: remote-curl.c:459 +#: remote-curl.c:450 #, c-format msgid "Authentication failed for '%s'" msgstr "'%s' 鉴权失败" -#: remote-curl.c:463 +#: remote-curl.c:454 #, c-format msgid "unable to access '%s': %s" msgstr "无法访问 '%s'：%s" -#: remote-curl.c:469 +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "重定向到 %s" -#: remote-curl.c:593 +#: remote-curl.c:584 msgid "shouldn't have EOF when not gentle on EOF" msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符" -#: remote-curl.c:673 +#: remote-curl.c:664 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" -#: remote-curl.c:733 +#: remote-curl.c:724 #, c-format msgid "RPC failed; %s" msgstr "RPC 失败。%s" -#: remote-curl.c:773 +#: remote-curl.c:764 msgid "cannot handle pushes this big" msgstr "不能处理这么大的推送" -#: remote-curl.c:888 +#: remote-curl.c:879 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "不能压缩请求，zlib 压缩错误 %d" -#: remote-curl.c:892 +#: remote-curl.c:883 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "不能压缩请求，zlib 结束错误 %d" -#: remote-curl.c:1023 +#: remote-curl.c:1014 msgid "dumb http transport does not support shallow capabilities" msgstr "哑 http 传输不支持 shalllow 能力" -#: remote-curl.c:1038 +#: remote-curl.c:1028 msgid "fetch failed." msgstr "获取失败。" -#: remote-curl.c:1086 +#: remote-curl.c:1076 msgid "cannot fetch by sha1 over smart http" msgstr "无法通过智能 HTTP 获取 sha1" -#: remote-curl.c:1130 remote-curl.c:1136 +#: remote-curl.c:1120 remote-curl.c:1126 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "协议错误：期望 sha/ref，却得到 '%s'" -#: remote-curl.c:1148 remote-curl.c:1263 +#: remote-curl.c:1138 remote-curl.c:1252 #, c-format msgid "http transport does not support %s" msgstr "http 传输协议不支持 %s" -#: remote-curl.c:1184 +#: remote-curl.c:1174 msgid "git-http-push failed" msgstr "git-http-push 失败" -#: remote-curl.c:1369 +#: remote-curl.c:1360 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl：用法：git remote-curl <远程> [<url>]" -#: remote-curl.c:1401 +#: remote-curl.c:1392 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl：错误读取来自 git 的命令流" -#: remote-curl.c:1408 +#: remote-curl.c:1399 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl：尝试没有本地仓库下获取" -#: remote-curl.c:1448 +#: remote-curl.c:1439 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的来自 git 的命令 '%s'" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:61 msgid "args" msgstr "参数" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "对象过滤" -#: parse-options.h:183 +#: parse-options.h:170 msgid "expiry-date" msgstr "到期时间" -#: parse-options.h:197 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:309 +#: parse-options.h:305 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:311 +#: parse-options.h:307 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:317 +#: parse-options.h:313 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" -#: parse-options.h:336 +#: parse-options.h:332 msgid "how to strip spaces and #comments from message" msgstr "设置如何删除提交说明里的空格和#注释" -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "从文件读取路径表达式" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔" - #: ref-filter.h:101 msgid "key" msgstr "key" @@ -22605,170 +21443,162 @@ msgid "Common Git shell script setup code" msgstr "常用的 Git shell 脚本设置代码" #: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "初始化及修改稀疏检出" - -#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "贮藏脏工作区中的修改" -#: command-list.h:173 +#: command-list.h:172 msgid "Add file contents to the staging area" msgstr "将文件内容添加到索引" -#: command-list.h:174 +#: command-list.h:173 msgid "Show the working tree status" msgstr "显示工作区状态" -#: command-list.h:175 +#: command-list.h:174 msgid "Remove unnecessary whitespace" msgstr "删除不必要的空白字符" -#: command-list.h:176 +#: command-list.h:175 msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或检查子模组" -#: command-list.h:177 +#: command-list.h:176 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subersion 仓库和 Git 之间的双向操作" -#: command-list.h:178 +#: command-list.h:177 msgid "Switch branches" msgstr "切换分支" -#: command-list.h:179 +#: command-list.h:178 msgid "Read, modify and delete symbolic refs" msgstr "读取、修改和删除符号引用" -#: command-list.h:180 +#: command-list.h:179 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象" -#: command-list.h:181 +#: command-list.h:180 msgid "Creates a temporary file with a blob's contents" msgstr "用 blob 数据对象的内容创建一个临时文件" -#: command-list.h:182 +#: command-list.h:181 msgid "Unpack objects from a packed archive" msgstr "从打包文件中解压缩对象" -#: command-list.h:183 +#: command-list.h:182 msgid "Register file contents in the working tree to the index" msgstr "将工作区的文件内容注册到索引" -#: command-list.h:184 +#: command-list.h:183 msgid "Update the object name stored in a ref safely" msgstr "安全地更新存储于引用中的对象名称" -#: command-list.h:185 +#: command-list.h:184 msgid "Update auxiliary info file to help dumb servers" msgstr "更新辅助信息文件以帮助哑协议服务" -#: command-list.h:186 +#: command-list.h:185 msgid "Send archive back to git-archive" msgstr "将存档发送回 git-archive" -#: command-list.h:187 +#: command-list.h:186 msgid "Send objects packed back to git-fetch-pack" msgstr "将对象压缩包发送回 git-fetch-pack" -#: command-list.h:188 +#: command-list.h:187 msgid "Show a Git logical variable" msgstr "显示一个Git逻辑变量" -#: command-list.h:189 +#: command-list.h:188 msgid "Check the GPG signature of commits" msgstr "检查 GPG 提交签名" -#: command-list.h:190 +#: command-list.h:189 msgid "Validate packed Git archive files" msgstr "校验打包的Git存仓文件" -#: command-list.h:191 +#: command-list.h:190 msgid "Check the GPG signature of tags" msgstr "检查标签的 GPG 签名" -#: command-list.h:192 +#: command-list.h:191 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web 界面（Git 仓库的 web 前端）" -#: command-list.h:193 +#: command-list.h:192 msgid "Show logs with difference each commit introduces" msgstr "显示每一个提交引入的差异日志" -#: command-list.h:194 +#: command-list.h:193 msgid "Manage multiple working trees" msgstr "管理多个工作区" -#: command-list.h:195 +#: command-list.h:194 msgid "Create a tree object from the current index" msgstr "从当前索引创建一个树对象" -#: command-list.h:196 +#: command-list.h:195 msgid "Defining attributes per path" msgstr "定义路径的属性" -#: command-list.h:197 +#: command-list.h:196 msgid "Git command-line interface and conventions" msgstr "Git 命令行界面和约定" -#: command-list.h:198 +#: command-list.h:197 msgid "A Git core tutorial for developers" msgstr "面向开发人员的 Git 核心教程" -#: command-list.h:199 +#: command-list.h:198 msgid "Git for CVS users" msgstr "适合 CVS 用户的 Git 帮助" -#: command-list.h:200 +#: command-list.h:199 msgid "Tweaking diff output" msgstr "调整差异输出" -#: command-list.h:201 +#: command-list.h:200 msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一组有用的最小命令集合" -#: command-list.h:202 +#: command-list.h:201 msgid "A Git Glossary" msgstr "Git 词汇表" -#: command-list.h:203 +#: command-list.h:202 msgid "Hooks used by Git" msgstr "Git 使用的钩子" -#: command-list.h:204 +#: command-list.h:203 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" -#: command-list.h:205 +#: command-list.h:204 msgid "Defining submodule properties" msgstr "定义子模组属性" -#: command-list.h:206 +#: command-list.h:205 msgid "Git namespaces" msgstr "Git 名字空间" -#: command-list.h:207 +#: command-list.h:206 msgid "Git Repository Layout" msgstr "Git 仓库布局" -#: command-list.h:208 +#: command-list.h:207 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "将一个仓库安装到另外一个仓库中" - -#: command-list.h:210 +#: command-list.h:208 msgid "A tutorial introduction to Git: part two" msgstr "一个 Git 教程：第二部分" -#: command-list.h:211 +#: command-list.h:209 msgid "A tutorial introduction to Git" msgstr "一个 Git 教程" -#: command-list.h:212 +#: command-list.h:210 msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" @@ -22894,128 +21724,139 @@ msgstr "尝试和 $pretty_name 的简单合并" msgid "Simple merge did not work, trying automatic merge." msgstr "简单合并未生效，尝试自动合并。" -#: git-legacy-stash.sh:221 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "无法删除临时索引（不应发生）" -#: git-legacy-stash.sh:272 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "无法用 $w_commit 更新 $ref_stash" -#: git-legacy-stash.sh:324 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "错误：'stash push' 的未知选项：$option" -#: git-legacy-stash.sh:356 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "保存工作目录和索引状态 $stash_msg" -#: git-legacy-stash.sh:536 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" -#: git-legacy-stash.sh:556 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-legacy-stash.sh:571 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference 不是一个有效的引用" -#: git-legacy-stash.sh:599 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是贮藏式提交" -#: git-legacy-stash.sh:610 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个贮藏引用" -#: git-legacy-stash.sh:618 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-legacy-stash.sh:622 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程应用贮藏" -#: git-legacy-stash.sh:630 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-legacy-stash.sh:632 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-legacy-stash.sh:641 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "无法从贮藏条目中恢复未跟踪文件" -#: git-legacy-stash.sh:666 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "无法将修改的文件取消暂存" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-legacy-stash.sh:705 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：无法丢弃贮藏条目" -#: git-legacy-stash.sh:792 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:203 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:213 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:232 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:235 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" -#: git-submodule.sh:242 +#: git-submodule.sh:239 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' 没有检出的提交" -#: git-submodule.sh:273 +#: git-submodule.sh:245 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"以下路径被您的一个 .gitignore 文件所忽略：\n" +"$sm_path\n" +"如果您确实想添加它，使用 -f 参数。" + +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:275 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:283 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库：" -#: git-submodule.sh:285 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23030,51 +21871,51 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" "或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。" -#: git-submodule.sh:291 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:303 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:308 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:317 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:590 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:600 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:605 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" -#: git-submodule.sh:623 +#: git-submodule.sh:606 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1：" -#: git-submodule.sh:629 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23082,74 +21923,74 @@ msgid "" msgstr "" "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:636 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath'：检出 '$sha1'" -#: git-submodule.sh:641 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:642 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath'：变基至 '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:648 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'" -#: git-submodule.sh:653 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:654 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:685 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:896 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:948 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:968 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:971 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:974 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" @@ -23460,10 +22301,6 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" msgstr[1] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）" -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "注意空提交已被注释掉" - #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "不能对重写提交进行初始化" @@ -23526,56 +22363,122 @@ msgid "Unable to determine absolute path of git directory" msgstr "不能确定 git 目录的绝对路径" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 +#: git-add--interactive.perl:210 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:211 +msgid "staged" +msgstr "缓存" + +#: git-add--interactive.perl:211 +msgid "unstaged" +msgstr "未缓存" + +#: git-add--interactive.perl:267 git-add--interactive.perl:292 +msgid "binary" +msgstr "二进制" + +#: git-add--interactive.perl:276 git-add--interactive.perl:330 +msgid "nothing" +msgstr "无" + +#: git-add--interactive.perl:312 git-add--interactive.perl:327 +msgid "unchanged" +msgstr "没有修改" + +#: git-add--interactive.perl:623 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "增加了 %d 个路径\n" +msgstr[1] "增加了 %d 个路径\n" + +#: git-add--interactive.perl:626 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "更新了 %d 个路径\n" +msgstr[1] "更新了 %d 个路径\n" + +#: git-add--interactive.perl:629 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "还原了 %d 个路径\n" +msgstr[1] "还原了 %d 个路径\n" + +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "触碰了 %d 个路径\n" msgstr[1] "触碰了 %d 个路径\n" -#: git-add--interactive.perl:1053 +#: git-add--interactive.perl:641 +msgid "Update" +msgstr "更新" + +#: git-add--interactive.perl:653 +msgid "Revert" +msgstr "还原" + +#: git-add--interactive.perl:676 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "说明：%s 现已成为未跟踪的。\n" + +#: git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "添加未跟踪的" + +#: git-add--interactive.perl:693 +msgid "No untracked files.\n" +msgstr "没有未跟踪的文件。\n" + +#: git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。" -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl:1054 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl:1057 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。" -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 +#: git-add--interactive.perl:1075 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。" -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 +#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 +#: git-add--interactive.perl:1072 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。" -#: git-add--interactive.perl:1111 +#: git-add--interactive.perl:1109 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "为写入打开块编辑文件失败：%s" -#: git-add--interactive.perl:1118 +#: git-add--interactive.perl:1110 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" + +#: git-add--interactive.perl:1116 #, perl-format msgid "" "---\n" @@ -23588,12 +22491,33 @@ msgstr "" "要删除 '%s' 开始的行，删除它们。\n" "以 %s 开始的行将被删除。\n" -#: git-add--interactive.perl:1140 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1124 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n" +"此次编辑被终止，该块不会被修改。\n" + +#: git-add--interactive.perl:1138 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "无法读取块编辑文件：%s" -#: git-add--interactive.perl:1248 +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1237 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " + +#: git-add--interactive.perl:1246 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23607,7 +22531,7 @@ msgstr "" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1254 +#: git-add--interactive.perl:1252 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23621,7 +22545,7 @@ msgstr "" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块" -#: git-add--interactive.perl:1260 +#: git-add--interactive.perl:1258 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23635,7 +22559,7 @@ msgstr "" "a - 不暂存该块和本文件中后面的全部块\n" "d - 不要不暂存该块和本文件中后面的全部块" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1264 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23649,7 +22573,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 +#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23663,7 +22587,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1278 +#: git-add--interactive.perl:1276 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23677,7 +22601,7 @@ msgstr "" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块" -#: git-add--interactive.perl:1284 +#: git-add--interactive.perl:1282 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23691,7 +22615,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1296 +#: git-add--interactive.perl:1294 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23705,7 +22629,7 @@ msgstr "" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块" -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1309 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23727,85 +22651,226 @@ msgstr "" "e - 手动编辑当前块\n" "? - 显示帮助\n" -#: git-add--interactive.perl:1342 +#: git-add--interactive.perl:1340 msgid "The selected hunks do not apply to the index!\n" msgstr "选中的块不能应用到索引！\n" -#: git-add--interactive.perl:1357 +#: git-add--interactive.perl:1341 +msgid "Apply them to the worktree anyway? " +msgstr "无论如何都要应用到工作区么？" + +#: git-add--interactive.perl:1344 +msgid "Nothing was applied.\n" +msgstr "未应用。\n" + +#: git-add--interactive.perl:1355 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未合入的：%s\n" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1364 +msgid "Only binary files changed.\n" +msgstr "只有二进制文件被修改。\n" + +#: git-add--interactive.perl:1366 +msgid "No changes.\n" +msgstr "没有修改。\n" + +#: git-add--interactive.perl:1374 +msgid "Patch update" +msgstr "补丁更新" + +#: git-add--interactive.perl:1426 +#, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1427 +#, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1428 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "暂存该块 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1431 +#, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1432 +#, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1433 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "贮藏该块 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1436 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1437 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1438 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1441 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1442 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1443 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1451 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1452 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1453 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1456 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1457 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1458 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1466 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1469 +#: git-add--interactive.perl:1467 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1470 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1570 +#: git-add--interactive.perl:1568 msgid "No other hunks to goto\n" msgstr "没有其它可供跳转的块\n" -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1575 +msgid "go to which hunk (<ret> to see more)? " +msgstr "跳转到哪个块（<回车> 查看更多）？ " + +#: git-add--interactive.perl:1577 +msgid "go to which hunk? " +msgstr "跳转到哪个块？" + +#: git-add--interactive.perl:1586 #, perl-format msgid "Invalid number: '%s'\n" msgstr "无效数字：'%s'\n" -#: git-add--interactive.perl:1593 +#: git-add--interactive.perl:1591 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "对不起，只有 %d 个可用块。\n" msgstr[1] "对不起，只有 %d 个可用块。\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 msgid "No other hunks to search\n" msgstr "没有其它可供查找的块\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1621 +msgid "search for regex? " +msgstr "使用正则表达式搜索？" + +#: git-add--interactive.perl:1634 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "错误的正则表达式 %s：%s\n" -#: git-add--interactive.perl:1646 +#: git-add--interactive.perl:1644 msgid "No hunk matches the given pattern\n" -msgstr "没有和给定模式相匹配的块\n" +msgstr "没有和给定模式相匹配的快\n" -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 +#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 msgid "No previous hunk\n" msgstr "没有前一个块\n" -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 +#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 msgid "No next hunk\n" msgstr "没有下一个块\n" -#: git-add--interactive.perl:1692 +#: git-add--interactive.perl:1690 msgid "Sorry, cannot split this hunk\n" msgstr "对不起，不能拆分这个块\n" -#: git-add--interactive.perl:1698 +#: git-add--interactive.perl:1696 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "拆分为 %d 块。\n" msgstr[1] "拆分为 %d 块。\n" -#: git-add--interactive.perl:1708 +#: git-add--interactive.perl:1706 msgid "Sorry, cannot edit this hunk\n" msgstr "对不起，不能编辑这个块\n" +#: git-add--interactive.perl:1752 +msgid "Review diff" +msgstr "检视 diff" + #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 +#: git-add--interactive.perl:1771 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23822,19 +22887,19 @@ msgstr "" "diff - 显示 HEAD 和索引间差异\n" "add untracked - 添加未跟踪文件的内容至暂存列表\n" -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 +#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 +#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 +#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 +#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 msgid "missing --" msgstr "缺失 --" -#: git-add--interactive.perl:1821 +#: git-add--interactive.perl:1819 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 +#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 #, perl-format msgid "invalid argument %s, expecting --" msgstr "无效的参数 %s，期望是 --" diff --git a/third_party/git/po/zh_TW.po b/third_party/git/po/zh_TW.po deleted file mode 100644 index 5efe4966f7..0000000000 --- a/third_party/git/po/zh_TW.po +++ /dev/null @@ -1,24120 +0,0 @@ -# Chinese (traditional) translations for Git package -# Git 套裝軟體的繁體中文翻譯。 -# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> -# Copyright (C) 2019,2020 Yi-Jyun Pan <pan93412@gmail.com> -# This file is distributed under the same license as the Git package. -# Contributors (CN): -# - Fangyi Zhou <me AT fangyi.io> -# - Jiang Xin <worldhello.net AT gmail.com> -# - Lian Cheng <rhythm.mail AT gmail.com> -# - Ray Chen <oldsharp AT gmail.com> -# - Riku <lu.riku AT gmail.com> -# - Thynson <lanxingcan AT gmail.com> -# - ws3389 <willsmith3389 AT gmail.com> -# - Wang Sheng <wangsheng2008love AT 163.com> -# - 依云 <lilydjwg AT gmail.com> -# - Yichao Yu <yyc1992 AT gmail.com> -# - Zhuang Ya <zhuangya AT me.com> -# -# Git glossary for Chinese translators -# -# English | Chinese -# ---------------------------------+-------------------------------------- -# 3-way merge | 三方合併 -# abbreviate | 簡寫（的 SHA-1 值） -# alternate object database | 備用物件庫 -# amend | 修補 -# ancestor | 祖先，祖先提交 -# annotated tag | 附註標籤 -# bare repository | 純版本庫 -# bisect | 二分尋找 -# blob object | 資料物件 -# branch | 分支 -# bundle | 包 -# bypass | 繞過 -# cache | 索引（的別稱） -# chain | （提交）鏈 -# changeset | 變更集 -# checkout | 簽出 -# checksum | 校驗，校驗和 -# cherry-picking | 揀選 -# clean | 乾淨（的工作區） -# clone | 複製 -# commit | 提交 -# commit message | 提交說明 -# commit object | 提交物件 -# commit-ish (also committish) | 提交號 -# conflict | 衝突 -# core Git | 核心 Git 工具 -# cover letter | 附函 -# DAG | 有向無環圖 -# dangling object | 懸空物件 -# detached HEAD | 分離開頭指標 -# directory | 目錄 -# dirty | 髒（的工作區） -# dumb HTTP protocol | 啞 HTTP 協定 -# evil merge | 壞合併（合併引入了父提交沒有的修改） -# fast-forward | 快轉 -# fetch | 取得 -# file system | 檔案系統 -# fork | 衍生 -# Git archive | 版本庫（對於 arch 使用者） -# gitfile | gitfile（版本庫連結檔案） -# grafts | （提交）移植 -# hash | 雜湊值 -# HEAD | HEAD（開頭指標，亦即目前分支） -# head | 頭、分支 -# head ref | 分支 -# header | 標頭訊息 -# hook | 掛鉤 -# hunk | 修補檔片段 -# index | 索引 -# index entry | 索引條目 -# loose object | 鬆散物件 -# loose refs | 鬆散引用 -# master | master（預設分支名） -# merge | 合併 -# object | 物件 -# object database | 物件庫 -# object identifier | 物件識別元 -# object name | 物件名稱 -# object type | 物件類型 -# octopus | 章魚式合併（兩分支以上的合併） -# origin | origin（預設的遠端名稱） -# pack | 包 -# pack index | 包索引 -# packfile | 包檔案 -# parent | 父提交 -# patch | 修補檔 -# pathspec | 路徑規格 -# pattern | 模式 -# pickaxe | 挖掘 -# plumbing | 管件（Git 底層核心指令的別稱） -# porcelain | 瓷件（Git 上層封裝指令的別稱） -# precious-objects repo | 珍品版本庫 -# prune | 清除 -# pull | 拉，拉取 -# push | 推，推送 -# reachable | 可以取得 -# rebase | 重定基底 -# ref | 引用 -# reflog | 引用日誌 -# refspec | 引用規格 -# remote | 遠端，遠端版本庫 -# remote-tracking branch | 遠端追蹤分支 -# replay | 重放 -# repo | 版本庫 -# repository | 版本庫 -# resolve | （衝突）解決 -# revert | 還原提交 -# revision | 版本 -# rewind | 還原 (Fuzzy) -# SCM | 原始碼管理（工具） -# SHA-1 | SHA-1（安全雜湊演算法1） -# shallow repository | 淺（複製）版本庫 -# signed tag | 簽名標籤 -# smart HTTP protocol | 智慧 HTTP 協定 -# squash | 壓縮 -# stage | n. 暫存區（即索引）; v. 暫存 -# stash | n. 儲藏區; v. 儲藏 -# submodule | 子模組 -# symref | 符號引用 -# tag | n. 標籤; v. 打標籤 -# tag object | 標籤物件 -# tagger | 打標籤者 -# topic branch | 主題分支 -# track | 追蹤 -# trailer | 尾部署名 -# tree | 樹（工作區或樹狀物件） -# tree object | 樹狀物件 -# tree-ish (also treeish) | 樹狀物件（或可以解析為一樹狀物件） -# unmerged index | 未合併索引 -# unpack | 解包 -# unreachable object | 無法取得物件 -# unstage | 取消暫存 -# upstream | 上游 -# upstream branch | 上游分支 -# working tree | 工作區 -# -msgid "" -msgstr "" -"Project-Id-Version: Git\n" -"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-03-11 15:26+0800\n" -"PO-Revision-Date: 2020-03-15 01:48+0800\n" -"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" -"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n" -"Language: zh_TW\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" -"zhconvert.org\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.3\n" - -#: add-interactive.c:368 -#, c-format -msgid "Huh (%s)?" -msgstr "嗯（%s）？" - -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 -#: builtin/rebase.c:2086 builtin/rebase.c:2130 -msgid "could not read index" -msgstr "不能讀取索引" - -#: add-interactive.c:576 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 -msgid "binary" -msgstr "二進位" - -#: add-interactive.c:634 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 -msgid "nothing" -msgstr "無" - -#: add-interactive.c:635 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 -msgid "unchanged" -msgstr "沒有修改" - -#: add-interactive.c:672 git-add--interactive.perl:643 -msgid "Update" -msgstr "更新" - -#: add-interactive.c:689 add-interactive.c:877 -#, c-format -msgid "could not stage '%s'" -msgstr "不能暫存 '%s'" - -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 -#: builtin/rebase.c:899 -msgid "could not write index" -msgstr "不能寫入索引" - -#: add-interactive.c:698 git-add--interactive.perl:628 -#, c-format, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "更新了 %d 個路徑\n" - -#: add-interactive.c:716 git-add--interactive.perl:678 -#, c-format, perl-format -msgid "note: %s is untracked now.\n" -msgstr "說明：%s 現已成為未追蹤的。\n" - -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 -#: builtin/reset.c:144 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗" - -#: add-interactive.c:751 git-add--interactive.perl:655 -msgid "Revert" -msgstr "還原" - -#: add-interactive.c:767 -msgid "Could not parse HEAD^{tree}" -msgstr "不能解析 HEAD^{樹}" - -#: add-interactive.c:805 git-add--interactive.perl:631 -#, c-format, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "還原了 %d 個路徑\n" - -#: add-interactive.c:856 git-add--interactive.perl:695 -#, c-format -msgid "No untracked files.\n" -msgstr "沒有未追蹤的檔案。\n" - -#: add-interactive.c:860 git-add--interactive.perl:689 -msgid "Add untracked" -msgstr "新增未追蹤的" - -#: add-interactive.c:887 git-add--interactive.perl:625 -#, c-format, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "增加了 %d 個路徑\n" - -#: add-interactive.c:917 -#, c-format -msgid "ignoring unmerged: %s" -msgstr "忽略未合併：%s" - -#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 -#, c-format -msgid "Only binary files changed.\n" -msgstr "只有二進位檔案被修改。\n" - -#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 -#, c-format -msgid "No changes.\n" -msgstr "沒有修改。\n" - -#: add-interactive.c:935 git-add--interactive.perl:1376 -msgid "Patch update" -msgstr "修補檔更新" - -#: add-interactive.c:974 git-add--interactive.perl:1754 -msgid "Review diff" -msgstr "檢視 diff" - -#: add-interactive.c:1002 -msgid "show paths with changes" -msgstr "顯示有變更的路徑" - -#: add-interactive.c:1004 -msgid "add working tree state to the staged set of changes" -msgstr "加入工作區狀態至暫存列表" - -#: add-interactive.c:1006 -msgid "revert staged set of changes back to the HEAD version" -msgstr "還原修改的暫存集至 HEAD 版本" - -#: add-interactive.c:1008 -msgid "pick hunks and update selectively" -msgstr "挑選區塊並選擇性更新" - -#: add-interactive.c:1010 -msgid "view diff between HEAD and index" -msgstr "檢視 HEAD 及索引之間的差異" - -#: add-interactive.c:1012 -msgid "add contents of untracked files to the staged set of changes" -msgstr "加入未追蹤檔案的內容至暫存列表" - -#: add-interactive.c:1020 add-interactive.c:1069 -msgid "Prompt help:" -msgstr "提示說明：" - -#: add-interactive.c:1022 -msgid "select a single item" -msgstr "選擇單一項目" - -#: add-interactive.c:1024 -msgid "select a range of items" -msgstr "選擇項目範圍" - -#: add-interactive.c:1026 -msgid "select multiple ranges" -msgstr "選擇多個範圍" - -#: add-interactive.c:1028 add-interactive.c:1073 -msgid "select item based on unique prefix" -msgstr "基於唯一前綴選擇項目" - -#: add-interactive.c:1030 -msgid "unselect specified items" -msgstr "取消選擇指定項目" - -#: add-interactive.c:1032 -msgid "choose all items" -msgstr "選擇所有項目" - -#: add-interactive.c:1034 -msgid "(empty) finish selecting" -msgstr "（空）完成選取" - -#: add-interactive.c:1071 -msgid "select a numbered item" -msgstr "選擇編號過的項目" - -#: add-interactive.c:1075 -msgid "(empty) select nothing" -msgstr "（空）全不選取" - -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 -msgid "*** Commands ***" -msgstr "*** 指令 ***" - -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 -msgid "What now" -msgstr "請選擇" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "staged" -msgstr "快取" - -#: add-interactive.c:1136 git-add--interactive.perl:213 -msgid "unstaged" -msgstr "未快取" - -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 -msgid "path" -msgstr "路徑" - -#: add-interactive.c:1143 -msgid "could not refresh index" -msgstr "無法重新整理索引" - -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 -#, c-format -msgid "Bye.\n" -msgstr "再見。\n" - -#: add-patch.c:33 git-add--interactive.perl:1428 -#, c-format, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "暫存模式變更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:34 git-add--interactive.perl:1429 -#, c-format, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:35 git-add--interactive.perl:1430 -#, c-format, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " - -#: add-patch.c:37 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"staging." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" - -#: add-patch.c:40 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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 - 暫存此區塊\n" -"n - 不要暫存此區塊\n" -"q - 離開。不暫存此區塊及後面的全部區塊\n" -"a - 暫存此區塊和本檔案中後面的全部區塊\n" -"d - 不暫存此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:54 git-add--interactive.perl:1433 -#, c-format, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:55 git-add--interactive.perl:1434 -#, c-format, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:56 git-add--interactive.perl:1435 -#, c-format, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " - -#: add-patch.c:58 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"stashing." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" - -#: add-patch.c:61 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 儲藏此區塊\n" -"n - 不要儲藏此區塊\n" -"q - 離開。不儲藏此區塊及後面的全部區塊\n" -"a - 儲藏此區塊和本檔案中後面的全部區塊\n" -"d - 不儲藏此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:77 git-add--interactive.perl:1438 -#, c-format, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:78 git-add--interactive.perl:1439 -#, c-format, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:79 git-add--interactive.perl:1440 -#, c-format, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " - -#: add-patch.c:81 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"unstaging." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" - -#: add-patch.c:84 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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 - 不暫存此區塊\n" -"n - 不要不暫存此區塊\n" -"q - 離開。不要不暫存此區塊及後面的全部區塊\n" -"a - 不暫存此區塊和本檔案中後面的全部區塊\n" -"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:99 git-add--interactive.perl:1443 -#, c-format, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? " - -#: add-patch.c:100 git-add--interactive.perl:1444 -#, c-format, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? " - -#: add-patch.c:101 git-add--interactive.perl:1445 -#, c-format, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " - -#: add-patch.c:103 add-patch.c:168 add-patch.c:211 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"applying." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" - -#: add-patch.c:106 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在索引中套用此區塊\n" -"n - 不要在索引中套用此區塊\n" -"q - 離開。不要套用此區塊及後面的全部區塊\n" -"a - 套用此區塊和本檔案中後面的全部區塊\n" -"d - 不要套用此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:121 git-add--interactive.perl:1448 -#: git-add--interactive.perl:1463 -#, c-format, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:122 git-add--interactive.perl:1449 -#: git-add--interactive.perl:1464 -#, c-format, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? " - -#: add-patch.c:123 git-add--interactive.perl:1450 -#: git-add--interactive.perl:1465 -#, c-format, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " - -#: add-patch.c:125 add-patch.c:147 add-patch.c:190 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be marked for " -"discarding." -msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。" - -#: add-patch.c:128 add-patch.c:193 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在工作區中捨棄此區塊\n" -"n - 不要在工作區中捨棄此區塊\n" -"q - 離開。不要捨棄此區塊及後面的全部區塊\n" -"a - 捨棄此區塊和本檔案中後面的全部區塊\n" -"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 -#, c-format, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " - -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 -#, c-format, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? " - -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 -#, c-format, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " - -#: add-patch.c:150 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在索引和工作區中捨棄此區塊\n" -"n - 不要在索引和工作區中捨棄此區塊\n" -"q - 離開。不要捨棄此區塊及後面的全部區塊\n" -"a - 捨棄此區塊和本檔案中後面的全部區塊\n" -"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 -#, c-format, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? " - -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 -#, c-format, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? " - -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 -#, c-format, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? " - -#: add-patch.c:171 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在索引和工作區中套用此區塊\n" -"n - 不要在索引和工作區中套用此區塊\n" -"q - 離開。不要套用此區塊及後面的全部區塊\n" -"a - 套用此區塊和本檔案中後面的全部區塊\n" -"d - 不要套用此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:214 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file\n" -msgstr "" -"y - 在工作區中套用此區塊\n" -"n - 不要在工作區中套用此區塊\n" -"q - 離開。不要套用此區塊及後面的全部區塊\n" -"a - 套用此區塊和本檔案中後面的全部區塊\n" -"d - 不要套用此區塊和本檔案中後面的全部區塊\n" - -#: add-patch.c:318 -#, c-format -msgid "could not parse hunk header '%.*s'" -msgstr "無法解析區塊標頭 '%.*s'" - -#: add-patch.c:337 add-patch.c:341 -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "無法解析上色過的區塊標頭 '%.*s'" - -#: add-patch.c:395 -msgid "could not parse diff" -msgstr "無法解析差異 (diff)" - -#: add-patch.c:414 -msgid "could not parse colored diff" -msgstr "無法解析上色過的差異 (diff)" - -#: add-patch.c:428 -#, c-format -msgid "failed to run '%s'" -msgstr "無法執行 '%s'" - -#: add-patch.c:587 -msgid "mismatched output from interactive.diffFilter" -msgstr "interactive.diffFilter 的輸出不符" - -#: add-patch.c:588 -msgid "" -"Your filter must maintain a one-to-one correspondence\n" -"between its input and output lines." -msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。" - -#: add-patch.c:761 -#, c-format -msgid "" -"expected context line #%d in\n" -"%.*s" -msgstr "" -"應有上下文行 #%d 於\n" -"%.*s" - -#: add-patch.c:776 -#, c-format -msgid "" -"hunks do not overlap:\n" -"%.*s\n" -"\tdoes not end with:\n" -"%.*s" -msgstr "" -"區塊未重疊：\n" -"%.*s\n" -"\t不以下述結尾：\n" -"%.*s" - -#: add-patch.c:1052 git-add--interactive.perl:1112 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" - -#: add-patch.c:1056 -#, c-format -msgid "" -"---\n" -"To remove '%c' lines, make them ' ' lines (context).\n" -"To remove '%c' lines, delete them.\n" -"Lines starting with %c will be removed.\n" -msgstr "" -"---\n" -"要刪除 '%c' 開始的行，使其成為 ' ' 開始的行（上下文）。\n" -"要刪除 '%c' 開始的行，刪除它們。\n" -"以 %c 開始的行將被刪除。\n" - -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1070 git-add--interactive.perl:1126 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n" -"此次編輯被終止，此區塊不會被修改。\n" - -#: add-patch.c:1103 -msgid "could not parse hunk header" -msgstr "無法解析區塊標頭" - -#: add-patch.c:1148 -msgid "'git apply --cached' failed" -msgstr "「git apply --cached」失敗" - -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c:1218 git-add--interactive.perl:1239 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? " - -#: add-patch.c:1261 -msgid "The selected hunks do not apply to the index!" -msgstr "選取的區塊不會套用進索引！" - -#: add-patch.c:1262 git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "無論如何都要套用到工作區嗎？" - -#: add-patch.c:1269 git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "未套用。\n" - -#: add-patch.c:1326 -msgid "" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n" -"J - 維持此區塊未決狀態，檢視下一個區塊\n" -"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n" -"K - 維持此區塊未決狀態，檢視上一個區塊\n" -"g - 選擇要跳轉至的區塊\n" -"/ - 尋找符合提供之正規表示式的區塊\n" -"s - 分割目前區塊為更小的區塊\n" -"e - 手動編輯目前區塊\n" -"? - 顯示說明\n" - -#: add-patch.c:1447 add-patch.c:1457 -msgid "No previous hunk" -msgstr "沒有上一個區塊" - -#: add-patch.c:1452 add-patch.c:1462 -msgid "No next hunk" -msgstr "沒有下一個區塊" - -#: add-patch.c:1468 -msgid "No other hunks to goto" -msgstr "沒有其它可供跳轉的區塊" - -#: add-patch.c:1479 git-add--interactive.perl:1577 -msgid "go to which hunk (<ret> to see more)? " -msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ " - -#: add-patch.c:1480 git-add--interactive.perl:1579 -msgid "go to which hunk? " -msgstr "跳轉到哪個區塊？" - -#: add-patch.c:1491 -#, c-format -msgid "Invalid number: '%s'" -msgstr "無效數字：'%s'" - -#: add-patch.c:1496 -#, c-format -msgid "Sorry, only %d hunk available." -msgid_plural "Sorry, only %d hunks available." -msgstr[0] "對不起，只有 %d 個可用區塊。" - -#: add-patch.c:1505 -msgid "No other hunks to search" -msgstr "沒有其它可供尋找的區塊" - -#: add-patch.c:1511 git-add--interactive.perl:1623 -msgid "search for regex? " -msgstr "使用正規表示式搜尋？" - -#: add-patch.c:1526 -#, c-format -msgid "Malformed search regexp %s: %s" -msgstr "錯誤的正規表示式 %s：%s" - -#: add-patch.c:1543 -msgid "No hunk matches the given pattern" -msgstr "沒有和提供模式相符合的區塊" - -#: add-patch.c:1550 -msgid "Sorry, cannot split this hunk" -msgstr "對不起，不能分割這個區塊" - -#: add-patch.c:1554 -#, c-format -msgid "Split into %d hunks." -msgstr "分割為 %d 塊。" - -#: add-patch.c:1558 -msgid "Sorry, cannot edit this hunk" -msgstr "對不起，不能編輯這個區塊" - -#: add-patch.c:1609 -msgid "'git apply' failed" -msgstr "'git apply' 失敗" - -#: advice.c:115 -#, c-format -msgid "%shint: %.*s%s\n" -msgstr "%s提示：%.*s%s\n" - -#: advice.c:168 -msgid "Cherry-picking is not possible because you have unmerged files." -msgstr "無法揀選，因為您有未合併的檔案。" - -#: advice.c:170 -msgid "Committing is not possible because you have unmerged files." -msgstr "無法提交，因為您有未合併的檔案。" - -#: advice.c:172 -msgid "Merging is not possible because you have unmerged files." -msgstr "無法合併，因為您有未合併的檔案。" - -#: advice.c:174 -msgid "Pulling is not possible because you have unmerged files." -msgstr "無法拉取，因為您有未合併的檔案。" - -#: advice.c:176 -msgid "Reverting is not possible because you have unmerged files." -msgstr "無法還原提交，因為您有未合併的檔案。" - -#: advice.c:178 -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "無法 %s，因為您有未合併的檔案。" - -#: advice.c:186 -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 <檔案>' 指令標記\n" -"解決方案並提交。" - -#: advice.c:194 -msgid "Exiting because of an unresolved conflict." -msgstr "因為存在未解決的衝突而離開。" - -#: advice.c:199 builtin/merge.c:1335 -msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" - -#: advice.c:201 -msgid "Please, commit your changes before merging." -msgstr "請在合併前先提交您的修改。" - -#: advice.c:202 -msgid "Exiting because of unfinished merge." -msgstr "因為存在未完成的合併而離開。" - -#: advice.c:208 -#, c-format -msgid "" -"Note: switching to '%s'.\n" -"\n" -"You are in 'detached HEAD' state. You can look around, make experimental\n" -"changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by switching back to a branch.\n" -"\n" -"If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -c with the switch command. Example:\n" -"\n" -" git switch -c <new-branch-name>\n" -"\n" -"Or undo this operation with:\n" -"\n" -" git switch -\n" -"\n" -"Turn off this advice by setting config variable advice.detachedHead to " -"false\n" -"\n" -msgstr "" -"注意：正在切換到 '%s'。\n" -"\n" -"您正處於分離開頭指標狀態。您可以檢視、做實驗性的修改及提交，並且您可以在切" -"換\n" -"回一個分支時，捨棄在此狀態下所做的提交而不對分支造成影響。\n" -"\n" -"如果您想要透過建立分支來保留在此狀態下所做的提交，您可以透過在 switch 指令\n" -"中新增參數 -c 來實現（現在或稍後）。例如：\n" -"\n" -" git switch -c <新分支名>\n" -"\n" -"或者復原此動作：\n" -"\n" -" git switch -\n" -"\n" -"透過將設定變數 advice.detachedHead 設定為 false 來關閉此建議\n" -"\n" - -#: alias.c:50 -msgid "cmdline ends with \\" -msgstr "指令列以 \\ 結尾" - -#: alias.c:51 -msgid "unclosed quote" -msgstr "未閉合的引號" - -#: apply.c:69 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "未能識別的空白字元選項 '%s'" - -#: apply.c:85 -#, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "未能識別的空白字元忽略選項 '%s'" - -#: apply.c:135 -msgid "--reject and --3way cannot be used together." -msgstr "--reject 和 --3way 不能同時使用。" - -#: apply.c:137 -msgid "--cached and --3way cannot be used together." -msgstr "--cached 和 --3way 不能同時使用。" - -#: apply.c:140 -msgid "--3way outside a repository" -msgstr "--3way 在版本庫之外" - -#: apply.c:151 -msgid "--index outside a repository" -msgstr "--index 在版本庫之外" - -#: apply.c:154 -msgid "--cached outside a repository" -msgstr "--cached 在版本庫之外" - -#: apply.c:801 -#, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "無法準備時間戳正規表示式 %s" - -#: apply.c:810 -#, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec 返回 %d，輸入為：%s" - -#: apply.c:884 -#, c-format -msgid "unable to find filename in patch at line %d" -msgstr "不能在修補檔的第 %d 行找到檔案名" - -#: apply.c:922 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s" - -#: apply.c:928 -#, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致" - -#: apply.c:929 -#, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致" - -#: apply.c:934 -#, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null" - -#: apply.c:963 -#, c-format -msgid "invalid mode on line %d: %s" -msgstr "第 %d 行包含無效檔案模式：%s" - -#: apply.c:1282 -#, c-format -msgid "inconsistent header lines %d and %d" -msgstr "不一致的檔案頭，%d 行和 %d 行" - -#: apply.c:1372 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）" - -#: apply.c:1385 -#, c-format -msgid "git diff header lacks filename information (line %d)" -msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）" - -#: apply.c:1481 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount：意外的行：%.*s" - -#: apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "第 %d 行的修補檔片段沒有標頭訊息：%.*s" - -#: apply.c:1753 -msgid "new file depends on old contents" -msgstr "新檔案依賴舊內容" - -#: apply.c:1755 -msgid "deleted file still has contents" -msgstr "刪除的檔案仍有內容" - -#: apply.c:1789 -#, c-format -msgid "corrupt patch at line %d" -msgstr "修補檔在第 %d 行發現損壞" - -#: apply.c:1826 -#, c-format -msgid "new file %s depends on old contents" -msgstr "新檔案 %s 依賴舊內容" - -#: apply.c:1828 -#, c-format -msgid "deleted file %s still has contents" -msgstr "刪除的檔案 %s 仍有內容" - -#: apply.c:1831 -#, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** 警告：檔案 %s 成為空檔案但並未刪除" - -#: apply.c:1978 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "二進位修補檔在第 %d 行損壞：%.*s" - -#: apply.c:2015 -#, c-format -msgid "unrecognized binary patch at line %d" -msgstr "未能識別的二進位修補檔位於第 %d 行" - -#: apply.c:2177 -#, c-format -msgid "patch with only garbage at line %d" -msgstr "修補檔案的第 %d 行只有垃圾資料" - -#: apply.c:2263 -#, c-format -msgid "unable to read symlink %s" -msgstr "無法讀取符號連結 %s" - -#: apply.c:2267 -#, c-format -msgid "unable to open or read %s" -msgstr "不能開啟或讀取 %s" - -#: apply.c:2936 -#, c-format -msgid "invalid start of line: '%c'" -msgstr "無效的行首字元：'%c'" - -#: apply.c:3057 -#, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）" - -#: apply.c:3069 -#, c-format -msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔片段" - -#: apply.c:3075 -#, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"當查詢：\n" -"%.*s" - -#: apply.c:3097 -#, c-format -msgid "missing binary patch data for '%s'" -msgstr "缺少 '%s' 的二進位修補檔資料" - -#: apply.c:3105 -#, c-format -msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔" - -#: apply.c:3152 -#, c-format -msgid "cannot apply binary patch to '%s' without full index line" -msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔" - -#: apply.c:3163 -#, c-format -msgid "" -"the patch applies to '%s' (%s), which does not match the current contents." -msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。" - -#: apply.c:3171 -#, c-format -msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案" - -#: apply.c:3189 -#, c-format -msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s" - -#: apply.c:3202 -#, c-format -msgid "binary patch does not apply to '%s'" -msgstr "二進位修補檔未套用到 '%s'" - -#: apply.c:3209 -#, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）" - -#: apply.c:3230 -#, c-format -msgid "patch failed: %s:%ld" -msgstr "打修補檔失敗：%s:%ld" - -#: apply.c:3353 -#, c-format -msgid "cannot checkout %s" -msgstr "不能簽出 %s" - -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 -#, c-format -msgid "failed to read %s" -msgstr "無法讀取 %s" - -#: apply.c:3413 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "讀取位於符號連結中的 '%s'" - -#: apply.c:3442 apply.c:3685 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "路徑 %s 已經被重新命名/刪除" - -#: apply.c:3528 apply.c:3700 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s：不存在於索引中" - -#: apply.c:3537 apply.c:3708 -#, c-format -msgid "%s: does not match index" -msgstr "%s：和索引不符合" - -#: apply.c:3572 -msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "版本庫缺乏必要的資料物件以進行三方合併。" - -#: apply.c:3575 -#, c-format -msgid "Falling back to three-way merge...\n" -msgstr "回落到三方合併...\n" - -#: apply.c:3591 apply.c:3595 -#, c-format -msgid "cannot read the current contents of '%s'" -msgstr "無法讀取 '%s' 的目前內容" - -#: apply.c:3607 -#, c-format -msgid "Failed to fall back on three-way merge...\n" -msgstr "無法回落到三方合併...\n" - -#: apply.c:3621 -#, c-format -msgid "Applied patch to '%s' with conflicts.\n" -msgstr "套用修補檔到 '%s' 存在衝突。\n" - -#: apply.c:3626 -#, c-format -msgid "Applied patch to '%s' cleanly.\n" -msgstr "成功套用修補檔到 '%s'。\n" - -#: apply.c:3652 -msgid "removal patch leaves file contents" -msgstr "移除修補檔仍留下了檔案內容" - -#: apply.c:3725 -#, c-format -msgid "%s: wrong type" -msgstr "%s：錯誤類型" - -#: apply.c:3727 -#, c-format -msgid "%s has type %o, expected %o" -msgstr "%s 的類型是 %o，應為 %o" - -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 -#, c-format -msgid "invalid path '%s'" -msgstr "無效路徑 '%s'" - -#: apply.c:3936 -#, c-format -msgid "%s: already exists in index" -msgstr "%s：已經存在於索引中" - -#: apply.c:3939 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s：已經存在於工作區中" - -#: apply.c:3959 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o)" -msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" - -#: apply.c:3964 -#, c-format -msgid "new mode (%o) of %s does not match old mode (%o) of %s" -msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合" - -#: apply.c:3984 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "受影響的檔案 '%s' 位於符號連結中" - -#: apply.c:3988 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s：修補檔未套用" - -#: apply.c:4003 -#, c-format -msgid "Checking patch %s..." -msgstr "正在檢查修補檔 %s..." - -#: apply.c:4095 -#, c-format -msgid "sha1 information is lacking or useless for submodule %s" -msgstr "子模組 %s 的 sha1 訊息缺少或無效" - -#: apply.c:4102 -#, c-format -msgid "mode change for %s, which is not in current HEAD" -msgstr "%s 的模式變更，但它不在目前 HEAD 中" - -#: apply.c:4105 -#, c-format -msgid "sha1 information is lacking or useless (%s)." -msgstr "sha1 訊息缺少或無效（%s）。" - -#: apply.c:4114 -#, c-format -msgid "could not add %s to temporary index" -msgstr "不能在暫時索引中新增 %s" - -#: apply.c:4124 -#, c-format -msgid "could not write temporary index to %s" -msgstr "不能把暫時索引寫入到 %s" - -#: apply.c:4262 -#, c-format -msgid "unable to remove %s from index" -msgstr "不能從索引中移除 %s" - -#: apply.c:4296 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "子模組 %s 損壞的修補檔" - -#: apply.c:4302 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "不能對建立檔案 '%s' 呼叫 stat" - -#: apply.c:4310 -#, c-format -msgid "unable to create backing store for newly created file %s" -msgstr "不能為建立檔案 %s 建立後端儲存" - -#: apply.c:4316 apply.c:4461 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "無法為 %s 新增快取條目" - -#: apply.c:4359 -#, c-format -msgid "failed to write to '%s'" -msgstr "寫入 '%s' 失敗" - -#: apply.c:4363 -#, c-format -msgid "closing file '%s'" -msgstr "關閉檔案 '%s'" - -#: apply.c:4433 -#, c-format -msgid "unable to write file '%s' mode %o" -msgstr "不能寫入檔案 '%s' 權限 %o" - -#: apply.c:4531 -#, c-format -msgid "Applied patch %s cleanly." -msgstr "成功套用修補檔 %s。" - -#: apply.c:4539 -msgid "internal error" -msgstr "內部錯誤" - -#: apply.c:4542 -#, c-format -msgid "Applying patch %%s with %d reject..." -msgid_plural "Applying patch %%s with %d rejects..." -msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." - -#: apply.c:4553 -#, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "截短 .rej 檔案名為 %.*s.rej" - -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 -#, c-format -msgid "cannot open %s" -msgstr "不能開啟 %s" - -#: apply.c:4575 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "第 #%d 個片段成功應用。" - -#: apply.c:4579 -#, c-format -msgid "Rejected hunk #%d." -msgstr "拒絕第 #%d 個片段。" - -#: apply.c:4698 -#, c-format -msgid "Skipped patch '%s'." -msgstr "略過修補檔 '%s'。" - -#: apply.c:4706 -msgid "unrecognized input" -msgstr "未能識別的輸入" - -#: apply.c:4726 -msgid "unable to read index file" -msgstr "無法讀取索引檔案" - -#: apply.c:4883 -#, c-format -msgid "can't open patch '%s': %s" -msgstr "不能開啟修補檔 '%s'：%s" - -#: apply.c:4910 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "抑制下仍有 %d 個空白字元誤用" - -#: apply.c:4916 apply.c:4931 -#, c-format -msgid "%d line adds whitespace errors." -msgid_plural "%d lines add whitespace errors." -msgstr[0] "%d 行新增了空白字元誤用。" - -#: apply.c:4924 -#, c-format -msgid "%d line applied after fixing whitespace errors." -msgid_plural "%d lines applied after fixing whitespace errors." -msgstr[0] "修復空白錯誤後，應用了 %d 行。" - -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 -msgid "Unable to write new index file" -msgstr "無法寫入新索引檔案" - -#: apply.c:4968 -msgid "don't apply changes matching the given path" -msgstr "不要應用與給出路徑向符合的變更" - -#: apply.c:4971 -msgid "apply changes matching the given path" -msgstr "應用與給出路徑向符合的變更" - -#: apply.c:4973 builtin/am.c:2260 -msgid "num" -msgstr "數字" - -#: apply.c:4974 -msgid "remove <num> leading slashes from traditional diff paths" -msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" - -#: apply.c:4977 -msgid "ignore additions made by the patch" -msgstr "忽略修補檔中的新增的檔案" - -#: apply.c:4979 -msgid "instead of applying the patch, output diffstat for the input" -msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" - -#: apply.c:4983 -msgid "show number of added and deleted lines in decimal notation" -msgstr "以十進位數顯示新增和刪除的行數" - -#: apply.c:4985 -msgid "instead of applying the patch, output a summary for the input" -msgstr "不套用修補檔，而是顯示輸入的概要" - -#: apply.c:4987 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "不套用修補檔，而是檢視修補檔是否可應用" - -#: apply.c:4989 -msgid "make sure the patch is applicable to the current index" -msgstr "確認修補檔可以套用到目前索引" - -#: apply.c:4991 -msgid "mark new files with `git add --intent-to-add`" -msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" - -#: apply.c:4993 -msgid "apply a patch without touching the working tree" -msgstr "套用修補檔而不修改工作區" - -#: apply.c:4995 -msgid "accept a patch that touches outside the working area" -msgstr "接受修改工作區之外檔案的修補檔" - -#: apply.c:4998 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" - -#: apply.c:5000 -msgid "attempt three-way merge if a patch does not apply" -msgstr "如果一個修補檔不能應用則嘗試三方合併" - -#: apply.c:5002 -msgid "build a temporary index based on embedded index information" -msgstr "建立一個暫時索引基於嵌入的索引訊息" - -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 -msgid "paths are separated with NUL character" -msgstr "路徑以 NUL 字元分隔" - -#: apply.c:5007 -msgid "ensure at least <n> lines of context match" -msgstr "確保至少符合 <n> 行上下文" - -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 -#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 -msgid "action" -msgstr "動作" - -#: apply.c:5009 -msgid "detect new or modified lines that have whitespace errors" -msgstr "檢查新增和修改的行中間的空白字元濫用" - -#: apply.c:5012 apply.c:5015 -msgid "ignore changes in whitespace when finding context" -msgstr "尋找上下文時忽略空白字元的變更" - -#: apply.c:5018 -msgid "apply the patch in reverse" -msgstr "反向套用修補檔" - -#: apply.c:5020 -msgid "don't expect at least one line of context" -msgstr "無需至少一行上下文" - -#: apply.c:5022 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中" - -#: apply.c:5024 -msgid "allow overlapping hunks" -msgstr "允許重疊的修補檔片段" - -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 -msgid "be verbose" -msgstr "詳細輸出" - -#: apply.c:5027 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "允許不正確的檔案末尾換行符號" - -#: apply.c:5030 -msgid "do not trust the line counts in the hunk headers" -msgstr "不信任修補檔片段的標頭訊息中的行號" - -#: apply.c:5032 builtin/am.c:2248 -msgid "root" -msgstr "根目錄" - -#: apply.c:5033 -msgid "prepend <root> to all filenames" -msgstr "為所有檔案名前新增 <根目錄>" - -#: archive.c:14 -msgid "git archive [<options>] <tree-ish> [<path>...]" -msgstr "git archive [<選項>] <樹或提交> [<路徑>...]" - -#: archive.c:15 -msgid "git archive --list" -msgstr "git archive --list" - -#: archive.c:16 -msgid "" -"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -msgstr "" -"git archive --remote <版本庫> [--exec <指令>] [<選項>] <樹或提交> [<路徑>...]" - -#: archive.c:17 -msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "git archive --remote <版本庫> [--exec <指令>] --list" - -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "路徑規格 '%s' 未符合任何檔案" - -#: archive.c:396 -#, c-format -msgid "no such ref: %.*s" -msgstr "無此引用：%.*s" - -#: archive.c:401 -#, c-format -msgid "not a valid object name: %s" -msgstr "不是一個有效的物件名：%s" - -#: archive.c:414 -#, c-format -msgid "not a tree object: %s" -msgstr "不是一個樹狀物件：%s" - -#: archive.c:426 -msgid "current working directory is untracked" -msgstr "目前工作目錄未被追蹤" - -#: archive.c:457 -msgid "fmt" -msgstr "格式" - -#: archive.c:457 -msgid "archive format" -msgstr "歸檔格式" - -#: archive.c:458 builtin/log.c:1653 -msgid "prefix" -msgstr "前綴" - -#: archive.c:459 -msgid "prepend prefix to each pathname in the archive" -msgstr "為歸檔中每個路徑名加上前綴" - -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 -msgid "file" -msgstr "檔案" - -#: archive.c:461 builtin/archive.c:90 -msgid "write the archive to this file" -msgstr "歸檔寫入此檔案" - -#: archive.c:463 -msgid "read .gitattributes in working directory" -msgstr "讀取工作區中的 .gitattributes" - -#: archive.c:464 -msgid "report archived files on stderr" -msgstr "在標準錯誤上報告歸檔檔案" - -#: archive.c:465 -msgid "store only" -msgstr "只儲存" - -#: archive.c:466 -msgid "compress faster" -msgstr "壓縮速度更快" - -#: archive.c:474 -msgid "compress better" -msgstr "壓縮效果更好" - -#: archive.c:477 -msgid "list supported archive formats" -msgstr "列出支援的歸檔格式" - -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 -msgid "repo" -msgstr "版本庫" - -#: archive.c:480 builtin/archive.c:92 -msgid "retrieve the archive from remote repository <repo>" -msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" - -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 -#: builtin/notes.c:498 -msgid "command" -msgstr "指令" - -#: archive.c:482 builtin/archive.c:94 -msgid "path to the remote git-upload-archive command" -msgstr "遠端 git-upload-archive 指令的路徑" - -#: archive.c:489 -msgid "Unexpected option --remote" -msgstr "未知參數 --remote" - -#: archive.c:491 -msgid "Option --exec can only be used together with --remote" -msgstr "選項 --exec 只能和 --remote 同時使用" - -#: archive.c:493 -msgid "Unexpected option --output" -msgstr "未知參數 --output" - -#: archive.c:515 -#, c-format -msgid "Unknown archive format '%s'" -msgstr "未知歸檔格式 '%s'" - -#: archive.c:522 -#, c-format -msgid "Argument not supported for format '%s': -%d" -msgstr "參數不支援此格式 '%s'：-%d" - -#: archive-tar.c:125 archive-zip.c:351 -#, c-format -msgid "cannot stream blob %s" -msgstr "不能開啟資料物件 %s" - -#: archive-tar.c:266 archive-zip.c:369 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "不支援的檔案模式：0%o (SHA1: %s)" - -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "不能讀取 %s" - -#: archive-tar.c:465 -#, c-format -msgid "unable to start '%s' filter" -msgstr "無法啟動 '%s' 過濾器" - -#: archive-tar.c:468 -msgid "unable to redirect descriptor" -msgstr "無法重定向描述符" - -#: archive-tar.c:475 -#, c-format -msgid "'%s' filter reported error" -msgstr "'%s' 過濾器報告了錯誤" - -#: archive-zip.c:319 -#, c-format -msgid "path is not valid UTF-8: %s" -msgstr "路徑不是有效的 UTF-8：%s" - -#: archive-zip.c:323 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "路徑太長（%d 字元，SHA1：%s）：%s" - -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 -#, c-format -msgid "deflate error (%d)" -msgstr "壓縮錯誤 (%d)" - -#: archive-zip.c:615 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "對於本系統時間戳太大：%<PRIuMAX>" - -#: attr.c:212 -#, c-format -msgid "%.*s is not a valid attribute name" -msgstr "%.*s 不是一個有效的屬性名" - -#: attr.c:369 -#, c-format -msgid "%s not allowed: %s:%d" -msgstr "不允許 %s：%s:%d" - -#: attr.c:409 -msgid "" -"Negative patterns are ignored in git attributes\n" -"Use '\\!' for literal leading exclamation." -msgstr "" -"反向模式在 git attributes 中被忽略\n" -"當字串確實要以驚嘆號開始時，使用 '\\!'。" - -#: bisect.c:468 -#, c-format -msgid "Badly quoted content in file '%s': %s" -msgstr "檔案 '%s' 包含錯誤的引用格式：%s" - -#: bisect.c:678 -#, c-format -msgid "We cannot bisect more!\n" -msgstr "我們無法進行更多的二分尋找！\n" - -#: bisect.c:745 -#, c-format -msgid "Not a valid commit name %s" -msgstr "不是一個有效的提交名 %s" - -#: bisect.c:770 -#, c-format -msgid "" -"The merge base %s is bad.\n" -"This means the bug has been fixed between %s and [%s].\n" -msgstr "" -"合併基礎 %s 是壞的。\n" -"這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n" - -#: bisect.c:775 -#, c-format -msgid "" -"The merge base %s is new.\n" -"The property has changed between %s and [%s].\n" -msgstr "" -"合併基礎 %s 是新的。\n" -"介於 %s 和 [%s] 之間的屬性已經被修改。\n" - -#: bisect.c:780 -#, c-format -msgid "" -"The merge base %s is %s.\n" -"This means the first '%s' commit is between %s and [%s].\n" -msgstr "" -"合併基礎 %s 是 %s。\n" -"這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n" - -#: bisect.c:788 -#, c-format -msgid "" -"Some %s revs are not ancestors of the %s rev.\n" -"git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" -msgstr "" -"一些 %s 版本不是 %s 版本的祖先。\n" -"這種情況下 git 二分尋找無法正常工作。\n" -"您可能弄錯了 %s 和 %s 版本？\n" - -#: bisect.c:801 -#, c-format -msgid "" -"the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" -"We continue anyway." -msgstr "" -"介於 %s 和 [%s] 的合併基礎一定被忽略了。\n" -"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" -"我們仍舊繼續。" - -#: bisect.c:840 -#, c-format -msgid "Bisecting: a merge base must be tested\n" -msgstr "二分尋找中：合併基礎必須是經過測試的\n" - -#: bisect.c:890 -#, c-format -msgid "a %s revision is needed" -msgstr "需要一個 %s 版本" - -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 -#, c-format -msgid "could not create file '%s'" -msgstr "不能建立檔案 '%s'" - -#: bisect.c:966 builtin/merge.c:149 -#, c-format -msgid "could not read file '%s'" -msgstr "不能讀取檔案 '%s'" - -#: bisect.c:997 -msgid "reading bisect refs failed" -msgstr "讀取二分尋找引用失敗" - -#: bisect.c:1019 -#, c-format -msgid "%s was both %s and %s\n" -msgstr "%s 同時為 %s 和 %s\n" - -#: bisect.c:1028 -#, c-format -msgid "" -"No testable commit found.\n" -"Maybe you started with bad path parameters?\n" -msgstr "" -"沒有發現可測試的提交。\n" -"可能您在執行時使用了錯誤的路徑參數？\n" - -#: bisect.c:1057 -#, c-format -msgid "(roughly %d step)" -msgid_plural "(roughly %d steps)" -msgstr[0] "（大概 %d 步）" - -#. TRANSLATORS: the last %s will be replaced with "(roughly %d -#. steps)" translation. -#. -#: bisect.c:1063 -#, c-format -msgid "Bisecting: %d revision left to test after this %s\n" -msgid_plural "Bisecting: %d revisions left to test after this %s\n" -msgstr[0] "二分尋找中：在此之後，還剩 %d 個版本待測試 %s\n" - -#: blame.c:2700 -msgid "--contents and --reverse do not blend well." -msgstr "--contents 和 --reverse 不能混用。" - -#: blame.c:2714 -msgid "cannot use --contents with final commit object name" -msgstr "不能將 --contents 和最終的提交物件名共用" - -#: blame.c:2735 -msgid "--reverse and --first-parent together require specified latest commit" -msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" - -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 -#: builtin/shortlog.c:192 -msgid "revision walk setup failed" -msgstr "版本遍歷設定失敗" - -#: blame.c:2762 -msgid "" -"--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍" - -#: blame.c:2773 -#, c-format -msgid "no such path %s in %s" -msgstr "在 %2$s 中無此路徑 %1$s" - -#: blame.c:2784 -#, c-format -msgid "cannot read blob %s for path %s" -msgstr "不能為路徑 %2$s 讀取資料物件 %1$s" - -#: branch.c:53 -#, c-format -msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." -msgstr "" -"\n" -"在修復錯誤後，您可以嘗試修改遠端追蹤分支，透過執行指令\n" -"\"git branch --set-upstream-to=%s%s%s\" 。" - -#: branch.c:67 -#, c-format -msgid "Not setting branch %s as its own upstream." -msgstr "未設定分支 %s 作為它自己的上游。" - -#: branch.c:93 -#, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。" - -#: branch.c:94 -#, c-format -msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。" - -#: branch.c:98 -#, c-format -msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。" - -#: branch.c:99 -#, c-format -msgid "Branch '%s' set up to track local branch '%s'." -msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。" - -#: branch.c:104 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s' by rebasing." -msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。" - -#: branch.c:105 -#, c-format -msgid "Branch '%s' set up to track remote ref '%s'." -msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。" - -#: branch.c:109 -#, c-format -msgid "Branch '%s' set up to track local ref '%s' by rebasing." -msgstr "分支 '%s' 設定為使用重定基底來追蹤本機引用 '%s'。" - -#: branch.c:110 -#, c-format -msgid "Branch '%s' set up to track local ref '%s'." -msgstr "分支 '%s' 設定為追蹤本機引用 '%s'。" - -#: branch.c:119 -msgid "Unable to write upstream branch configuration" -msgstr "無法寫入上游分支設定" - -#: branch.c:156 -#, c-format -msgid "Not tracking: ambiguous information for ref %s" -msgstr "未追蹤：引用 %s 有歧義" - -#: branch.c:189 -#, c-format -msgid "'%s' is not a valid branch name." -msgstr "'%s' 不是一個有效的分支名稱。" - -#: branch.c:208 -#, c-format -msgid "A branch named '%s' already exists." -msgstr "一個分支名 '%s' 已經存在。" - -#: branch.c:213 -msgid "Cannot force update the current branch." -msgstr "無法強制更新目前分支。" - -#: branch.c:233 -#, c-format -msgid "Cannot setup tracking information; starting point '%s' is not a branch." -msgstr "無法設定追蹤訊息；起始點 '%s' 不是一個分支。" - -#: branch.c:235 -#, c-format -msgid "the requested upstream branch '%s' does not exist" -msgstr "請求的上游分支 '%s' 不存在" - -#: branch.c:237 -msgid "" -"\n" -"If you are planning on basing your work on an upstream\n" -"branch that already exists at the remote, you may need to\n" -"run \"git fetch\" to retrieve it.\n" -"\n" -"If you are planning to push out a new local branch that\n" -"will track its remote counterpart, you may want to use\n" -"\"git push -u\" to set the upstream config as you push." -msgstr "" -"\n" -"如果您正計劃基於遠端一個現存的上游分支開始你的工作，\n" -"您可能需要執行 \"git fetch\" 來取得分支。\n" -"\n" -"如果您正計劃推送一個能與對應遠端分支建立追蹤的新的本機分支，\n" -"您可能需要使用 \"git push -u\" 推送分支並設定和上游的關聯。" - -#: branch.c:281 -#, c-format -msgid "Not a valid object name: '%s'." -msgstr "不是一個有效的物件名：'%s'。" - -#: branch.c:301 -#, c-format -msgid "Ambiguous object name: '%s'." -msgstr "歧義的物件名：'%s'。" - -#: branch.c:306 -#, c-format -msgid "Not a valid branch point: '%s'." -msgstr "無效的分支點：'%s'。" - -#: branch.c:364 -#, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "'%s' 已經簽出到 '%s'" - -#: branch.c:387 -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "工作區 %s 的 HEAD 指向沒有被更新" - -#: bundle.c:36 -#, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' 不像是一個 v2 版本的包檔案" - -#: bundle.c:64 -#, c-format -msgid "unrecognized header: %s%s (%d)" -msgstr "未能識別的包頭：%s%s (%d)" - -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 -#: builtin/commit.c:815 -#, c-format -msgid "could not open '%s'" -msgstr "不能開啟 '%s'" - -#: bundle.c:143 -msgid "Repository lacks these prerequisite commits:" -msgstr "版本庫中缺少這些必備的提交：" - -#: bundle.c:146 -msgid "need a repository to verify a bundle" -msgstr "需要版本庫驗證一個包" - -#: bundle.c:197 -#, c-format -msgid "The bundle contains this ref:" -msgid_plural "The bundle contains these %d refs:" -msgstr[0] "這個包中含有這 %d 個引用：" - -#: bundle.c:204 -msgid "The bundle records a complete history." -msgstr "這個包記錄一個完整歷史。" - -#: bundle.c:206 -#, c-format -msgid "The bundle requires this ref:" -msgid_plural "The bundle requires these %d refs:" -msgstr[0] "這個包需要這 %d 個引用：" - -#: bundle.c:273 -msgid "unable to dup bundle descriptor" -msgstr "無法複製 bundle 描述符" - -#: bundle.c:280 -msgid "Could not spawn pack-objects" -msgstr "不能生成 pack-objects 進程" - -#: bundle.c:291 -msgid "pack-objects died" -msgstr "pack-objects 終止" - -#: bundle.c:333 -msgid "rev-list died" -msgstr "rev-list 終止" - -#: bundle.c:382 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" -msgstr "引用 '%s' 被 rev-list 選項排除" - -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 -#, c-format -msgid "unrecognized argument: %s" -msgstr "未能識別的參數：%s" - -#: bundle.c:469 -msgid "Refusing to create empty bundle." -msgstr "不能建立空包。" - -#: bundle.c:479 -#, c-format -msgid "cannot create '%s'" -msgstr "不能建立 '%s'" - -#: bundle.c:504 -msgid "index-pack died" -msgstr "index-pack 終止" - -#: color.c:329 -#, c-format -msgid "invalid color value: %.*s" -msgstr "無效的顏色值：%.*s" - -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 -#, c-format -msgid "could not parse %s" -msgstr "不能解析 %s" - -#: commit.c:53 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s 不是一個提交！" - -#: commit.c:193 -msgid "" -"Support for <GIT_DIR>/info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" -"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n" -"未來的Git版本中被移除。\n" -"\n" -"請使用 \"git replace --convert-graft-file\" 將\n" -"grafts 轉換為取代引用。\n" -"\n" -"設定 \"git config advice.graftFileDeprecated false\"\n" -"可關閉本消息" - -#: commit.c:1153 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" - -#: commit.c:1157 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" - -#: commit.c:1160 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "提交 %s 沒有 GPG 簽名。" - -#: commit.c:1163 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" - -#: commit.c:1417 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" -"警告：提交說明不符合 UTF-8 字元編碼。\n" -"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n" -"設定為您項目所用的字元編碼。\n" - -#: commit-graph.c:122 -msgid "commit-graph file is too small" -msgstr "提交圖形檔案太小" - -#: commit-graph.c:189 -#, c-format -msgid "commit-graph signature %X does not match signature %X" -msgstr "提交圖形簽名 %X 和簽名 %X 不符合" - -#: commit-graph.c:196 -#, c-format -msgid "commit-graph version %X does not match version %X" -msgstr "提交圖形版本 %X 和版本 %X 不符合" - -#: commit-graph.c:203 -#, c-format -msgid "commit-graph hash version %X does not match version %X" -msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" - -#: commit-graph.c:226 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整" - -#: commit-graph.c:237 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "提交圖形不正確的區塊位移 %08x%08x" - -#: commit-graph.c:280 -#, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "提交圖形區塊 id %08x 出現了多次" - -#: commit-graph.c:343 -msgid "commit-graph has no base graphs chunk" -msgstr "提交圖形沒有基礎圖形區塊" - -#: commit-graph.c:353 -msgid "commit-graph chain does not match" -msgstr "提交圖形鏈不符合" - -#: commit-graph.c:401 -#, c-format -msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" - -#: commit-graph.c:425 -msgid "unable to find all commit-graph files" -msgstr "無法找到所有提交圖形檔案" - -#: commit-graph.c:558 commit-graph.c:618 -msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "無效的提交位置。提交圖形可能已損壞" - -#: commit-graph.c:579 -#, c-format -msgid "could not find commit %s" -msgstr "無法找到提交 %s" - -#: commit-graph.c:852 builtin/am.c:1292 -#, c-format -msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" - -#: commit-graph.c:1011 builtin/pack-objects.c:2782 -#, c-format -msgid "unable to get type of object %s" -msgstr "無法獲得物件 %s 類型" - -#: commit-graph.c:1043 -msgid "Loading known commits in commit graph" -msgstr "正在載入提交圖中的已知提交" - -#: commit-graph.c:1060 -msgid "Expanding reachable commits in commit graph" -msgstr "正在擴展提交圖中的可以取得提交" - -#: commit-graph.c:1079 -msgid "Clearing commit marks in commit graph" -msgstr "正在清除提交圖中的提交標記" - -#: commit-graph.c:1098 -msgid "Computing commit graph generation numbers" -msgstr "正在計算提交圖世代數字" - -#: commit-graph.c:1173 -#, c-format -msgid "Finding commits for commit graph in %d pack" -msgid_plural "Finding commits for commit graph in %d packs" -msgstr[0] "正在 %d 個包中尋找提交圖的提交" - -#: commit-graph.c:1186 -#, c-format -msgid "error adding pack %s" -msgstr "新增包 %s 發生錯誤" - -#: commit-graph.c:1190 -#, c-format -msgid "error opening index for %s" -msgstr "為 %s 開啟索引發生錯誤" - -#: commit-graph.c:1214 -#, c-format -msgid "Finding commits for commit graph from %d ref" -msgid_plural "Finding commits for commit graph from %d refs" -msgstr[0] "正在從 %d 個引用中尋找提交圖的提交" - -#: commit-graph.c:1234 -#, c-format -msgid "invalid commit object id: %s" -msgstr "無效的提交物件 ID：%s" - -#: commit-graph.c:1249 -msgid "Finding commits for commit graph among packed objects" -msgstr "正在打包物件中尋找提交圖的提交" - -#: commit-graph.c:1264 -msgid "Counting distinct commits in commit graph" -msgstr "正在計算提交圖中不同的提交" - -#: commit-graph.c:1294 -msgid "Finding extra edges in commit graph" -msgstr "正在尋找提交圖中額外的邊" - -#: commit-graph.c:1340 -msgid "failed to write correct number of base graph ids" -msgstr "無法寫入正確數量的基礎圖形 ID" - -#: commit-graph.c:1373 midx.c:814 -#, c-format -msgid "unable to create leading directories of %s" -msgstr "不能為 %s 建立先導目錄" - -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 -#, c-format -msgid "unable to create '%s'" -msgstr "不能建立 '%s'" - -#: commit-graph.c:1445 -#, c-format -msgid "Writing out commit graph in %d pass" -msgid_plural "Writing out commit graph in %d passes" -msgstr[0] "正在用 %d 步寫出提交圖" - -#: commit-graph.c:1486 -msgid "unable to open commit-graph chain file" -msgstr "無法開啟提交圖形鏈檔案" - -#: commit-graph.c:1498 -msgid "failed to rename base commit-graph file" -msgstr "無法重新命名基礎提交圖形檔案" - -#: commit-graph.c:1518 -msgid "failed to rename temporary commit-graph file" -msgstr "無法重新命名暫時提交圖形檔案" - -#: commit-graph.c:1631 -msgid "Scanning merged commits" -msgstr "正在掃描合併提交" - -#: commit-graph.c:1642 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "意外的重複提交 ID %s" - -#: commit-graph.c:1665 -msgid "Merging commit-graph" -msgstr "正在合併提交圖形" - -#: commit-graph.c:1844 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "提交圖格式不能寫入 %d 個提交" - -#: commit-graph.c:1855 -msgid "too many commits to write graph" -msgstr "提交太多不能畫圖" - -#: commit-graph.c:1944 -msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" - -#: commit-graph.c:1954 -#, c-format -msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" - -#: commit-graph.c:1964 commit-graph.c:1979 -#, c-format -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" - -#: commit-graph.c:1971 -#, c-format -msgid "failed to parse commit %s from commit-graph" -msgstr "無法從提交圖形中解析提交 %s" - -#: commit-graph.c:1989 -msgid "Verifying commits in commit graph" -msgstr "正在驗證提交圖中的提交" - -#: commit-graph.c:2003 -#, c-format -msgid "failed to parse commit %s from object database for commit-graph" -msgstr "無法從提交圖形的物件庫中解析提交 %s" - -#: commit-graph.c:2010 -#, c-format -msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" - -#: commit-graph.c:2020 -#, c-format -msgid "commit-graph parent list for commit %s is too long" -msgstr "提交 %s 的提交圖形父提交列表太長了" - -#: commit-graph.c:2029 -#, c-format -msgid "commit-graph parent for %s is %s != %s" -msgstr "%s 的提交圖形父提交是 %s != %s" - -#: commit-graph.c:2042 -#, c-format -msgid "commit-graph parent list for commit %s terminates early" -msgstr "提交 %s 的提交圖形父提交列表過早終止" - -#: commit-graph.c:2047 -#, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" - -#: commit-graph.c:2051 -#, c-format -msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" - -#: commit-graph.c:2066 -#, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "提交圖形中的提交 %s 的世代號是 %u != %u" - -#: commit-graph.c:2072 -#, c-format -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" - -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "記憶體耗盡" - -#: config.c:124 -#, c-format -msgid "" -"exceeded maximum include depth (%d) while including\n" -"\t%s\n" -"from\n" -"\t%s\n" -"This might be due to circular includes." -msgstr "" -"超過了最大包含深度（%1$d），當從\n" -"\t%3$s\n" -"包含\n" -"\t%2$s\n" -"這可能是因為循環包含。" - -#: config.c:140 -#, c-format -msgid "could not expand include path '%s'" -msgstr "無法擴展包含路徑 '%s'" - -#: config.c:151 -msgid "relative config includes must come from files" -msgstr "相對路徑的設定檔案引用必須來自於檔案" - -#: config.c:197 -msgid "relative config include conditionals must come from files" -msgstr "相對路徑的設定檔案條件引用必須來自於檔案" - -#: config.c:376 -#, c-format -msgid "key does not contain a section: %s" -msgstr "鍵名沒有包含一個小節名稱：%s" - -#: config.c:382 -#, c-format -msgid "key does not contain variable name: %s" -msgstr "鍵名沒有包含變數名：%s" - -#: config.c:406 sequencer.c:2444 -#, c-format -msgid "invalid key: %s" -msgstr "無效鍵名：%s" - -#: config.c:412 -#, c-format -msgid "invalid key (newline): %s" -msgstr "無效鍵名（有換行符號）：%s" - -#: config.c:448 config.c:460 -#, c-format -msgid "bogus config parameter: %s" -msgstr "偽設定參數：%s" - -#: config.c:495 -#, c-format -msgid "bogus format in %s" -msgstr "%s 中格式錯誤" - -#: config.c:821 -#, c-format -msgid "bad config line %d in blob %s" -msgstr "資料物件 %2$s 中錯誤的設定行 %1$d" - -#: config.c:825 -#, c-format -msgid "bad config line %d in file %s" -msgstr "檔案 %2$s 中錯誤的設定行 %1$d" - -#: config.c:829 -#, c-format -msgid "bad config line %d in standard input" -msgstr "標準輸入中錯誤的設定行 %d" - -#: config.c:833 -#, c-format -msgid "bad config line %d in submodule-blob %s" -msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d" - -#: config.c:837 -#, c-format -msgid "bad config line %d in command line %s" -msgstr "指令列 %2$s 中錯誤的設定行 %1$d" - -#: config.c:841 -#, c-format -msgid "bad config line %d in %s" -msgstr "在 %2$s 中錯誤的設定行 %1$d" - -#: config.c:978 -msgid "out of range" -msgstr "超出範圍" - -#: config.c:978 -msgid "invalid unit" -msgstr "無效的單位" - -#: config.c:979 -#, c-format -msgid "bad numeric config value '%s' for '%s': %s" -msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s" - -#: config.c:998 -#, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1001 -#, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1004 -#, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s" - -#: config.c:1007 -#, c-format -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1010 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1013 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1108 -#, c-format -msgid "failed to expand user dir in: '%s'" -msgstr "無法擴展使用者目錄：'%s'" - -#: config.c:1117 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳" - -#: config.c:1208 -#, c-format -msgid "abbrev length out of range: %d" -msgstr "縮寫長度超出範圍：%d" - -#: config.c:1222 config.c:1233 -#, c-format -msgid "bad zlib compression level %d" -msgstr "錯誤的 zlib 壓縮級別 %d" - -#: config.c:1325 -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 應該是一個字元" - -#: config.c:1358 -#, c-format -msgid "invalid mode for object creation: %s" -msgstr "無效的物件建立模式：%s" - -#: config.c:1430 -#, c-format -msgid "malformed value for %s" -msgstr "%s 的取值格式錯誤" - -#: config.c:1456 -#, c-format -msgid "malformed value for %s: %s" -msgstr "%s 的取值格式錯誤：%s" - -#: config.c:1457 -msgid "must be one of nothing, matching, simple, upstream or current" -msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" - -#: config.c:1518 builtin/pack-objects.c:3541 -#, c-format -msgid "bad pack compression level %d" -msgstr "錯誤的打包壓縮級別 %d" - -#: config.c:1639 -#, c-format -msgid "unable to load config blob object '%s'" -msgstr "無法從資料物件 '%s' 載入設定" - -#: config.c:1642 -#, c-format -msgid "reference '%s' does not point to a blob" -msgstr "引用 '%s' 沒有指向一個資料物件" - -#: config.c:1659 -#, c-format -msgid "unable to resolve config blob '%s'" -msgstr "不能解析設定物件 '%s'" - -#: config.c:1689 -#, c-format -msgid "failed to parse %s" -msgstr "解析 %s 失敗" - -#: config.c:1743 -msgid "unable to parse command-line config" -msgstr "無法解析指令列中的設定" - -#: config.c:2097 -msgid "unknown error occurred while reading the configuration files" -msgstr "在讀取設定檔案時遇到未知錯誤" - -#: config.c:2267 -#, c-format -msgid "Invalid %s: '%s'" -msgstr "無效 %s：'%s'" - -#: config.c:2312 -#, c-format -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" - -#: config.c:2358 -#, c-format -msgid "unable to parse '%s' from command-line config" -msgstr "無法解析指令列設定中的 '%s'" - -#: config.c:2360 -#, c-format -msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" - -#: config.c:2441 -#, c-format -msgid "invalid section name '%s'" -msgstr "無效的小節名稱 '%s'" - -#: config.c:2473 -#, c-format -msgid "%s has multiple values" -msgstr "%s 有多個取值" - -#: config.c:2502 -#, c-format -msgid "failed to write new configuration file %s" -msgstr "寫入新的設定檔案 %s 失敗" - -#: config.c:2754 config.c:3078 -#, c-format -msgid "could not lock config file %s" -msgstr "不能鎖定設定檔案 %s" - -#: config.c:2765 -#, c-format -msgid "opening %s" -msgstr "開啟 %s" - -#: config.c:2800 builtin/config.c:344 -#, c-format -msgid "invalid pattern: %s" -msgstr "無效模式：%s" - -#: config.c:2825 -#, c-format -msgid "invalid config file %s" -msgstr "無效的設定檔案 %s" - -#: config.c:2838 config.c:3091 -#, c-format -msgid "fstat on %s failed" -msgstr "對 %s 呼叫 fstat 失敗" - -#: config.c:2849 -#, c-format -msgid "unable to mmap '%s'" -msgstr "不能 mmap '%s'" - -#: config.c:2858 config.c:3096 -#, c-format -msgid "chmod on %s failed" -msgstr "對 %s 呼叫 chmod 失敗" - -#: config.c:2943 config.c:3193 -#, c-format -msgid "could not write config file %s" -msgstr "不能寫入設定檔案 %s" - -#: config.c:2977 -#, c-format -msgid "could not set '%s' to '%s'" -msgstr "不能設定 '%s' 為 '%s'" - -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 -#, c-format -msgid "could not unset '%s'" -msgstr "不能取消設定 '%s'" - -#: config.c:3069 -#, c-format -msgid "invalid section name: %s" -msgstr "無效的小節名稱：%s" - -#: config.c:3236 -#, c-format -msgid "missing value for '%s'" -msgstr "%s 的取值缺少" - -#: connect.c:61 -msgid "the remote end hung up upon initial contact" -msgstr "遠端在初始連線時即掛斷" - -#: connect.c:63 -msgid "" -"Could not read from remote repository.\n" -"\n" -"Please make sure you have the correct access rights\n" -"and the repository exists." -msgstr "" -"無法讀取遠端版本庫。\n" -"\n" -"請確認您有正確的存取權限並且版本庫存在。" - -#: connect.c:81 -#, c-format -msgid "server doesn't support '%s'" -msgstr "伺服器不支援 '%s'" - -#: connect.c:103 -#, c-format -msgid "server doesn't support feature '%s'" -msgstr "伺服器不支援特性 '%s'" - -#: connect.c:114 -msgid "expected flush after capabilities" -msgstr "在能力之後應為一個 flush 包" - -#: connect.c:233 -#, c-format -msgid "ignoring capabilities after first line '%s'" -msgstr "忽略第一行 '%s' 之後的能力欄位" - -#: connect.c:252 -msgid "protocol error: unexpected capabilities^{}" -msgstr "協定錯誤：意外的 capabilities^{}" - -#: connect.c:273 -#, c-format -msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'" - -#: connect.c:275 -msgid "repository on the other end cannot be shallow" -msgstr "另一端的版本庫不能是淺複製版本庫" - -#: connect.c:313 -msgid "invalid packet" -msgstr "無效封包" - -#: connect.c:333 -#, c-format -msgid "protocol error: unexpected '%s'" -msgstr "協定錯誤：意外的 '%s'" - -#: connect.c:441 -#, c-format -msgid "invalid ls-refs response: %s" -msgstr "無效的 ls-refs 回應：%s" - -#: connect.c:445 -msgid "expected flush after ref listing" -msgstr "在引用列表之後應該有一個 flush 包" - -#: connect.c:544 -#, c-format -msgid "protocol '%s' is not supported" -msgstr "不支援 '%s' 協定" - -#: connect.c:595 -msgid "unable to set SO_KEEPALIVE on socket" -msgstr "無法為 socket 設定 SO_KEEPALIVE" - -#: connect.c:635 connect.c:698 -#, c-format -msgid "Looking up %s ... " -msgstr "尋找 %s ..." - -#: connect.c:639 -#, c-format -msgid "unable to look up %s (port %s) (%s)" -msgstr "無法尋找 %s（埠 %s）（%s）" - -#. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 -#, c-format -msgid "" -"done.\n" -"Connecting to %s (port %s) ... " -msgstr "" -"完成。\n" -"連線到 %s（埠 %s）... " - -#: connect.c:665 connect.c:742 -#, c-format -msgid "" -"unable to connect to %s:\n" -"%s" -msgstr "" -"無法連線到 %s：\n" -"%s" - -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 -msgid "done." -msgstr "完成。" - -#: connect.c:702 -#, c-format -msgid "unable to look up %s (%s)" -msgstr "無法尋找 %s（%s）" - -#: connect.c:708 -#, c-format -msgid "unknown port %s" -msgstr "未知埠 %s" - -#: connect.c:845 connect.c:1175 -#, c-format -msgid "strange hostname '%s' blocked" -msgstr "已阻止奇怪的主機名稱 '%s'" - -#: connect.c:847 -#, c-format -msgid "strange port '%s' blocked" -msgstr "已阻止奇怪的埠號 '%s'" - -#: connect.c:857 -#, c-format -msgid "cannot start proxy %s" -msgstr "不能啟動代理 %s" - -#: connect.c:928 -msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法" - -#: connect.c:1123 -msgid "ssh variant 'simple' does not support -4" -msgstr "ssh 變體 'simple' 不支援 -4" - -#: connect.c:1135 -msgid "ssh variant 'simple' does not support -6" -msgstr "ssh 變體 'simple' 不支援 -6" - -#: connect.c:1152 -msgid "ssh variant 'simple' does not support setting port" -msgstr "ssh 變體 'simple' 不支援設定埠" - -#: connect.c:1264 -#, c-format -msgid "strange pathname '%s' blocked" -msgstr "已阻止奇怪的路徑名 '%s'" - -#: connect.c:1311 -msgid "unable to fork" -msgstr "無法 fork" - -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 -msgid "Checking connectivity" -msgstr "正在檢查連通性" - -#: connected.c:110 -msgid "Could not run 'git rev-list'" -msgstr "不能執行 'git rev-list'" - -#: connected.c:130 -msgid "failed write to rev-list" -msgstr "寫入 rev-list 失敗" - -#: connected.c:137 -msgid "failed to close rev-list's stdin" -msgstr "關閉 rev-list 的標準輸入失敗" - -#: convert.c:194 -#, c-format -msgid "illegal crlf_action %d" -msgstr "非法的 crlf 動作 %d" - -#: convert.c:207 -#, c-format -msgid "CRLF would be replaced by LF in %s" -msgstr "%s 中的 CRLF 將被 LF 取代" - -#: convert.c:209 -#, c-format -msgid "" -"CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 CRLF 將被 LF 取代。<\n" -"在工作區中該檔案仍保持原有的換行符號。" - -#: convert.c:217 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "檔案 %s 中的 LF 將被 CRLF 取代" - -#: convert.c:219 -#, c-format -msgid "" -"LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 LF 將被 CRLF 取代。\n" -"在工作區中該檔案仍保持原有的換行符號" - -#: convert.c:284 -#, c-format -msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM" - -#: convert.c:291 -#, c-format -msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." -msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。" - -#: convert.c:304 -#, c-format -msgid "BOM is required in '%s' if encoded as %s" -msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM" - -#: convert.c:306 -#, c-format -msgid "" -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" -"%sLE (depending on the byte order) as working-tree-encoding." -msgstr "" -"檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於" -"字節序）作為工作區編碼。" - -#: convert.c:419 convert.c:490 -#, c-format -msgid "failed to encode '%s' from %s to %s" -msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" - -#: convert.c:462 -#, c-format -msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致" - -#: convert.c:668 -#, c-format -msgid "cannot fork to run external filter '%s'" -msgstr "不能 fork 以執行外部過濾器 '%s'" - -#: convert.c:688 -#, c-format -msgid "cannot feed the input to external filter '%s'" -msgstr "不能將輸入傳遞給外部過濾器 '%s'" - -#: convert.c:695 -#, c-format -msgid "external filter '%s' failed %d" -msgstr "外部過濾器 '%s' 失敗碼 %d" - -#: convert.c:730 convert.c:733 -#, c-format -msgid "read from external filter '%s' failed" -msgstr "從外部過濾器 '%s' 讀取失敗" - -#: convert.c:736 convert.c:791 -#, c-format -msgid "external filter '%s' failed" -msgstr "外部過濾器 '%s' 失敗" - -#: convert.c:839 -msgid "unexpected filter type" -msgstr "意外的過濾類型" - -#: convert.c:850 -msgid "path name too long for external filter" -msgstr "外部過濾器的路徑名太長" - -#: convert.c:924 -#, c-format -msgid "" -"external filter '%s' is not available anymore although not all paths have " -"been filtered" -msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" - -#: convert.c:1223 -msgid "true/false are no valid working-tree-encodings" -msgstr "true/false 不是有效的工作區編碼" - -#: convert.c:1411 convert.c:1445 -#, c-format -msgid "%s: clean filter '%s' failed" -msgstr "%s：clean 過濾器 '%s' 失敗" - -#: convert.c:1489 -#, c-format -msgid "%s: smudge filter %s failed" -msgstr "%s：smudge 過濾器 %s 失敗" - -#: date.c:138 -msgid "in the future" -msgstr "在將來" - -#: date.c:144 -#, c-format -msgid "%<PRIuMAX> second ago" -msgid_plural "%<PRIuMAX> seconds ago" -msgstr[0] "%<PRIuMAX> 秒鐘前" - -#: date.c:151 -#, c-format -msgid "%<PRIuMAX> minute ago" -msgid_plural "%<PRIuMAX> minutes ago" -msgstr[0] "%<PRIuMAX> 分鐘前" - -#: date.c:158 -#, c-format -msgid "%<PRIuMAX> hour ago" -msgid_plural "%<PRIuMAX> hours ago" -msgstr[0] "%<PRIuMAX> 小時前" - -#: date.c:165 -#, c-format -msgid "%<PRIuMAX> day ago" -msgid_plural "%<PRIuMAX> days ago" -msgstr[0] "%<PRIuMAX> 天前" - -#: date.c:171 -#, c-format -msgid "%<PRIuMAX> week ago" -msgid_plural "%<PRIuMAX> weeks ago" -msgstr[0] "%<PRIuMAX> 周前" - -#: date.c:178 -#, c-format -msgid "%<PRIuMAX> month ago" -msgid_plural "%<PRIuMAX> months ago" -msgstr[0] "%<PRIuMAX> 個月前" - -#: date.c:189 -#, c-format -msgid "%<PRIuMAX> year" -msgid_plural "%<PRIuMAX> years" -msgstr[0] "%<PRIuMAX> 年" - -#. TRANSLATORS: "%s" is "<n> years" -#: date.c:192 -#, c-format -msgid "%s, %<PRIuMAX> month ago" -msgid_plural "%s, %<PRIuMAX> months ago" -msgstr[0] "%s %<PRIuMAX> 個月前" - -#: date.c:197 date.c:202 -#, c-format -msgid "%<PRIuMAX> year ago" -msgid_plural "%<PRIuMAX> years ago" -msgstr[0] "%<PRIuMAX> 年前" - -#: delta-islands.c:272 -msgid "Propagating island marks" -msgstr "正在傳播資料島標記" - -#: delta-islands.c:290 -#, c-format -msgid "bad tree object %s" -msgstr "壞的樹狀物件 %s" - -#: delta-islands.c:334 -#, c-format -msgid "failed to load island regex for '%s': %s" -msgstr "未能載入 '%s' 的資料島正規表示式：%s" - -#: delta-islands.c:390 -#, c-format -msgid "island regex from config has too many capture groups (max=%d)" -msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多 %d 個）" - -#: delta-islands.c:467 -#, c-format -msgid "Marked %d islands, done.\n" -msgstr "已標記 %d 個資料島，結束。\n" - -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "讀取排序檔案 '%s' 失敗" - -#: diffcore-rename.c:543 -msgid "Performing inexact rename detection" -msgstr "正在進行非精確的重新命名偵測" - -#: diff-no-index.c:238 -msgid "git diff --no-index [<options>] <path> <path>" -msgstr "git diff --no-index [<選項>] <路徑> <路徑>" - -#: diff-no-index.c:263 -msgid "" -"Not a git repository. Use --no-index to compare two paths outside a working " -"tree" -msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑" - -# 譯者：請維持前導空格 -#: diff.c:155 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n" - -# 譯者：請維持前導空格 -#: diff.c:160 -#, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr " 未知的 dirstat 參數 '%s'\n" - -#: diff.c:296 -msgid "" -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " -"'dimmed-zebra', 'plain'" -msgstr "" -"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " -"'plain'" - -#: diff.c:324 -#, c-format -msgid "" -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" -msgstr "" -"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" -"space-at-eol'、'ignore-all-space'、'allow-indentation-change'" - -#: diff.c:332 -msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other " -"whitespace modes" -msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用" - -#: diff.c:405 -#, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" - -#: diff.c:465 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" -"發現設定變數 'diff.dirstat' 中的錯誤：\n" -"%s" - -#: diff.c:4202 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "外部 diff 離開，停止在 %s" - -#: diff.c:4547 -msgid "--name-only, --name-status, --check and -s are mutually exclusive" -msgstr "--name-only、--name-status、--check 和 -s 是互斥的" - -#: diff.c:4550 -msgid "-G, -S and --find-object are mutually exclusive" -msgstr "-G、-S 和 --find-object 是互斥的" - -#: diff.c:4628 -msgid "--follow requires exactly one pathspec" -msgstr "--follow 明確要求只跟一個路徑規格" - -#: diff.c:4676 -#, c-format -msgid "invalid --stat value: %s" -msgstr "無效的 --stat 值：%s" - -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:197 parse-options.c:201 -#, c-format -msgid "%s expects a numerical value" -msgstr "%s 期望一個數字值" - -#: diff.c:4713 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" -"無法解析 --dirstat/-X 選項的參數：\n" -"%s" - -#: diff.c:4798 -#, c-format -msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" - -#: diff.c:4822 -#, c-format -msgid "unknown value after ws-error-highlight=%.*s" -msgstr "ws-error-highlight=%.*s 之後未知的值" - -#: diff.c:4836 -#, c-format -msgid "unable to resolve '%s'" -msgstr "不能解析 '%s'" - -#: diff.c:4886 diff.c:4892 -#, c-format -msgid "%s expects <n>/<m> form" -msgstr "%s 期望 <n>/<m> 格式" - -#: diff.c:4904 -#, c-format -msgid "%s expects a character, got '%s'" -msgstr "%s 期望一個字元，得到 '%s'" - -#: diff.c:4925 -#, c-format -msgid "bad --color-moved argument: %s" -msgstr "壞的 --color-moved 參數：%s" - -#: diff.c:4944 -#, c-format -msgid "invalid mode '%s' in --color-moved-ws" -msgstr "--color-moved-ws 中的無效模式 '%s' " - -#: diff.c:4984 -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" - -#: diff.c:5020 diff.c:5040 -#, c-format -msgid "invalid argument to %s" -msgstr "%s 的參數無效" - -#: diff.c:5178 -#, c-format -msgid "failed to parse --submodule option parameter: '%s'" -msgstr "無法解析 --submodule 選項的參數：'%s'" - -#: diff.c:5234 -#, c-format -msgid "bad --word-diff argument: %s" -msgstr "壞的 --word-diff 參數：%s" - -#: diff.c:5257 -msgid "Diff output format options" -msgstr "差異輸出格式化選項" - -#: diff.c:5259 diff.c:5265 -msgid "generate patch" -msgstr "生成修補檔" - -#: diff.c:5262 builtin/log.c:173 -msgid "suppress diff output" -msgstr "不顯示差異輸出" - -#: diff.c:5267 diff.c:5381 diff.c:5388 -msgid "<n>" -msgstr "<n>" - -#: diff.c:5268 diff.c:5271 -msgid "generate diffs with <n> lines context" -msgstr "生成含 <n> 行上下文的差異" - -#: diff.c:5273 -msgid "generate the diff in raw format" -msgstr "生成原始格式的差異" - -#: diff.c:5276 -msgid "synonym for '-p --raw'" -msgstr "和 '-p --raw' 同義" - -#: diff.c:5280 -msgid "synonym for '-p --stat'" -msgstr "和 '-p --stat' 同義" - -#: diff.c:5284 -msgid "machine friendly --stat" -msgstr "機器友好的 --stat" - -#: diff.c:5287 -msgid "output only the last line of --stat" -msgstr "只輸出 --stat 的最後一行" - -#: diff.c:5289 diff.c:5297 -msgid "<param1,param2>..." -msgstr "<參數1,參數2>..." - -#: diff.c:5290 -msgid "" -"output the distribution of relative amount of changes for each sub-directory" -msgstr "輸出每個子目錄相對變更的分布" - -#: diff.c:5294 -msgid "synonym for --dirstat=cumulative" -msgstr "和 --dirstat=cumulative 同義" - -#: diff.c:5298 -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同義詞" - -#: diff.c:5302 -msgid "warn if changes introduce conflict markers or whitespace errors" -msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" - -#: diff.c:5305 -msgid "condensed summary such as creations, renames and mode changes" -msgstr "精簡摘要，例如建立、重新命名和模式變更" - -#: diff.c:5308 -msgid "show only names of changed files" -msgstr "只顯示變更檔案的檔案名" - -#: diff.c:5311 -msgid "show only names and status of changed files" -msgstr "只顯示變更檔案的檔案名和狀態" - -#: diff.c:5313 -msgid "<width>[,<name-width>[,<count>]]" -msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" - -#: diff.c:5314 -msgid "generate diffstat" -msgstr "生成差異統計（diffstat）" - -#: diff.c:5316 diff.c:5319 diff.c:5322 -msgid "<width>" -msgstr "<寬度>" - -#: diff.c:5317 -msgid "generate diffstat with a given width" -msgstr "使用提供的長度生成差異統計" - -#: diff.c:5320 -msgid "generate diffstat with a given name width" -msgstr "使用提供的檔案名長度生成差異統計" - -#: diff.c:5323 -msgid "generate diffstat with a given graph width" -msgstr "使用提供的圖形長度生成差異統計" - -#: diff.c:5325 -msgid "<count>" -msgstr "<次數>" - -#: diff.c:5326 -msgid "generate diffstat with limited lines" -msgstr "生成有限行數的差異統計" - -#: diff.c:5329 -msgid "generate compact summary in diffstat" -msgstr "生成差異統計的簡潔摘要" - -#: diff.c:5332 -msgid "output a binary diff that can be applied" -msgstr "輸出一個可以應用的二進位差異" - -#: diff.c:5335 -msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "在 \"index\" 行顯示完整的前後物件名稱" - -#: diff.c:5337 -msgid "show colored diff" -msgstr "顯示帶顏色的差異" - -#: diff.c:5338 -msgid "<kind>" -msgstr "<類型>" - -#: diff.c:5339 -msgid "" -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " -"diff" -msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" - -#: diff.c:5342 -msgid "" -"do not munge pathnames and use NULs as output field terminators in --raw or " -"--numstat" -msgstr "" -"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" -"符" - -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 -msgid "<prefix>" -msgstr "<前綴>" - -#: diff.c:5346 -msgid "show the given source prefix instead of \"a/\"" -msgstr "顯示提供的源前綴取代 \"a/\"" - -#: diff.c:5349 -msgid "show the given destination prefix instead of \"b/\"" -msgstr "顯示提供的目標前綴取代 \"b/\"" - -#: diff.c:5352 -msgid "prepend an additional prefix to every line of output" -msgstr "輸出的每一行附加前綴" - -#: diff.c:5355 -msgid "do not show any source or destination prefix" -msgstr "不顯示任何源和目標前綴" - -#: diff.c:5358 -msgid "show context between diff hunks up to the specified number of lines" -msgstr "顯示指定行數的差異區塊間的上下文" - -#: diff.c:5362 diff.c:5367 diff.c:5372 -msgid "<char>" -msgstr "<字元>" - -#: diff.c:5363 -msgid "specify the character to indicate a new line instead of '+'" -msgstr "指定一個字元取代 '+' 來表示新的一行" - -#: diff.c:5368 -msgid "specify the character to indicate an old line instead of '-'" -msgstr "指定一個字元取代 '-' 來表示舊的一行" - -#: diff.c:5373 -msgid "specify the character to indicate a context instead of ' '" -msgstr "指定一個字元取代 ' ' 來表示一行上下文" - -#: diff.c:5376 -msgid "Diff rename options" -msgstr "差異重新命名選項" - -#: diff.c:5377 -msgid "<n>[/<m>]" -msgstr "<n>[/<m>]" - -#: diff.c:5378 -msgid "break complete rewrite changes into pairs of delete and create" -msgstr "將完全重寫的變更打破為成對的刪除和建立" - -#: diff.c:5382 -msgid "detect renames" -msgstr "檢測重新命名" - -#: diff.c:5386 -msgid "omit the preimage for deletes" -msgstr "省略刪除動作的差異輸出" - -#: diff.c:5389 -msgid "detect copies" -msgstr "檢測複製" - -#: diff.c:5393 -msgid "use unmodified files as source to find copies" -msgstr "使用未修改的檔案做為發現複製的源" - -#: diff.c:5395 -msgid "disable rename detection" -msgstr "禁用重新命名偵測" - -#: diff.c:5398 -msgid "use empty blobs as rename source" -msgstr "使用空的資料物件做為重新命名的源" - -#: diff.c:5400 -msgid "continue listing the history of a file beyond renames" -msgstr "繼續列出檔案重新命名以外的歷史記錄" - -#: diff.c:5403 -msgid "" -"prevent rename/copy detection if the number of rename/copy targets exceeds " -"given limit" -msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" - -#: diff.c:5405 -msgid "Diff algorithm options" -msgstr "差異演算法選項" - -#: diff.c:5407 -msgid "produce the smallest possible diff" -msgstr "生成儘可能小的差異" - -#: diff.c:5410 -msgid "ignore whitespace when comparing lines" -msgstr "行比較時忽略空白字元" - -#: diff.c:5413 -msgid "ignore changes in amount of whitespace" -msgstr "忽略空白字元的變更" - -#: diff.c:5416 -msgid "ignore changes in whitespace at EOL" -msgstr "忽略行尾的空白字元變更" - -#: diff.c:5419 -msgid "ignore carrier-return at the end of line" -msgstr "忽略行尾的Enter符（CR）" - -#: diff.c:5422 -msgid "ignore changes whose lines are all blank" -msgstr "忽略整行都是空白的變更" - -#: diff.c:5425 -msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "啟發式轉換差異邊界以便閱讀" - -#: diff.c:5428 -msgid "generate diff using the \"patience diff\" algorithm" -msgstr "使用 \"patience diff\" 演算法生成差異" - -#: diff.c:5432 -msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "使用 \"histogram diff\" 演算法生成差異" - -#: diff.c:5434 -msgid "<algorithm>" -msgstr "<演算法>" - -#: diff.c:5435 -msgid "choose a diff algorithm" -msgstr "選擇一個差異演算法" - -#: diff.c:5437 -msgid "<text>" -msgstr "<文字>" - -#: diff.c:5438 -msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "使用 \"anchored diff\" 演算法生成差異" - -#: diff.c:5440 diff.c:5449 diff.c:5452 -msgid "<mode>" -msgstr "<模式>" - -#: diff.c:5441 -msgid "show word diff, using <mode> to delimit changed words" -msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" - -#: diff.c:5443 diff.c:5446 diff.c:5491 -msgid "<regex>" -msgstr "<正則>" - -#: diff.c:5444 -msgid "use <regex> to decide what a word is" -msgstr "使用 <正規表示式> 確定何為一個詞" - -#: diff.c:5447 -msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" -msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" - -#: diff.c:5450 -msgid "moved lines of code are colored differently" -msgstr "移動的程式碼行用不同方式著色" - -#: diff.c:5453 -msgid "how white spaces are ignored in --color-moved" -msgstr "在 --color-moved 下如何忽略空白字元" - -#: diff.c:5456 -msgid "Other diff options" -msgstr "其它差異選項" - -#: diff.c:5458 -msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" - -#: diff.c:5462 -msgid "treat all files as text" -msgstr "把所有檔案當做文字處理" - -#: diff.c:5464 -msgid "swap two inputs, reverse the diff" -msgstr "交換兩個輸入，反轉差異" - -#: diff.c:5466 -msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "有差異時離開碼為 1，否則為 0" - -#: diff.c:5468 -msgid "disable all output of the program" -msgstr "禁用本程式的所有輸出" - -#: diff.c:5470 -msgid "allow an external diff helper to be executed" -msgstr "允許執行一個外部的差異助手" - -#: diff.c:5472 -msgid "run external text conversion filters when comparing binary files" -msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" - -#: diff.c:5474 -msgid "<when>" -msgstr "<何時>" - -#: diff.c:5475 -msgid "ignore changes to submodules in the diff generation" -msgstr "在生成差異時，忽略子模組的更改" - -#: diff.c:5478 -msgid "<format>" -msgstr "<格式>" - -#: diff.c:5479 -msgid "specify how differences in submodules are shown" -msgstr "指定子模組的差異如何顯示" - -#: diff.c:5483 -msgid "hide 'git add -N' entries from the index" -msgstr "隱藏索引中 'git add -N' 條目" - -#: diff.c:5486 -msgid "treat 'git add -N' entries as real in the index" -msgstr "將索引中 'git add -N' 條目當做真實的" - -#: diff.c:5488 -msgid "<string>" -msgstr "<字串>" - -#: diff.c:5489 -msgid "" -"look for differences that change the number of occurrences of the specified " -"string" -msgstr "尋找改變了指定字串出現次數的差異" - -#: diff.c:5492 -msgid "" -"look for differences that change the number of occurrences of the specified " -"regex" -msgstr "尋找改變指定正則符合出現次數的差異" - -#: diff.c:5495 -msgid "show all changes in the changeset with -S or -G" -msgstr "顯示使用 -S 或 -G 的變更集的所有變更" - -#: diff.c:5498 -msgid "treat <string> in -S as extended POSIX regular expression" -msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式" - -#: diff.c:5501 -msgid "control the order in which files appear in the output" -msgstr "控制輸出中的檔案顯示順序" - -#: diff.c:5502 -msgid "<object-id>" -msgstr "<物件 ID>" - -#: diff.c:5503 -msgid "" -"look for differences that change the number of occurrences of the specified " -"object" -msgstr "尋找改變指定物件出現次數的差異" - -#: diff.c:5505 -msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" -msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" - -#: diff.c:5506 -msgid "select files by diff type" -msgstr "透過差異類型選擇檔案" - -#: diff.c:5508 -msgid "<file>" -msgstr "<檔案>" - -#: diff.c:5509 -msgid "Output to a specific file" -msgstr "輸出到一個指定的檔案" - -#: diff.c:6164 -msgid "inexact rename detection was skipped due to too many files." -msgstr "因為檔案太多，略過不嚴格的重新命名檢查。" - -#: diff.c:6167 -msgid "only found copies from modified paths due to too many files." -msgstr "因為檔案太多，只在修改的路徑中尋找複製。" - -#: diff.c:6170 -#, c-format -msgid "" -"you may want to set your %s variable to at least %d and retry the command." -msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。" - -#: dir.c:555 -#, c-format -msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" - -#: dir.c:695 dir.c:724 dir.c:737 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "無法識別樣式：「%s」" - -#: dir.c:754 dir.c:768 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "無法識別反向模式：「%s」" - -#: dir.c:786 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" - -#: dir.c:796 -msgid "disabling cone pattern matching" -msgstr "停用 cone 樣式符合模式" - -#: dir.c:1173 -#, c-format -msgid "cannot use %s as an exclude file" -msgstr "不能將 %s 用作排除檔案" - -#: dir.c:2144 -#, c-format -msgid "could not open directory '%s'" -msgstr "不能開啟目錄 '%s'" - -#: dir.c:2479 -msgid "failed to get kernel name and information" -msgstr "無法獲得核心名稱和訊息" - -#: dir.c:2603 -msgid "untracked cache is disabled on this system or location" -msgstr "快取未追蹤檔案在本系統或位置中被禁用" - -#: dir.c:3407 -#, c-format -msgid "index file corrupt in repo %s" -msgstr "版本庫 %s 中的索引檔案損壞" - -#: dir.c:3452 dir.c:3457 -#, c-format -msgid "could not create directories for %s" -msgstr "不能為 %s 建立目錄" - -#: dir.c:3486 -#, c-format -msgid "could not migrate git directory from '%s' to '%s'" -msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" - -#: editor.c:73 -#, c-format -msgid "hint: Waiting for your editor to close the file...%c" -msgstr "提示：等待您的編輯器關閉檔案...%c" - -#: entry.c:178 -msgid "Filtering content" -msgstr "過濾內容" - -#: entry.c:476 -#, c-format -msgid "could not stat file '%s'" -msgstr "不能對檔案 '%s' 呼叫 stat" - -#: environment.c:149 -#, c-format -msgid "bad git namespace path \"%s\"" -msgstr "錯誤的 git 名字空間路徑 \"%s\"" - -#: environment.c:331 -#, c-format -msgid "could not set GIT_DIR to '%s'" -msgstr "不能設定 GIT_DIR 為 '%s'" - -#: exec-cmd.c:363 -#, c-format -msgid "too many args to run %s" -msgstr "執行 %s 的參數太多" - -#: fetch-pack.c:150 -msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack：應為 shallow 列表" - -#: fetch-pack.c:153 -msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" - -#: fetch-pack.c:164 -msgid "git fetch-pack: expected ACK/NAK, got a flush packet" -msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包" - -#: fetch-pack.c:184 -#, c-format -msgid "git fetch-pack: expected ACK/NAK, got '%s'" -msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'" - -#: fetch-pack.c:195 -msgid "unable to write to remote" -msgstr "無法寫到遠端" - -#: fetch-pack.c:257 -msgid "--stateless-rpc requires multi_ack_detailed" -msgstr "--stateless-rpc 需要 multi_ack_detailed" - -#: fetch-pack.c:356 fetch-pack.c:1340 -#, c-format -msgid "invalid shallow line: %s" -msgstr "無效的 shallow 訊息：%s" - -#: fetch-pack.c:362 fetch-pack.c:1346 -#, c-format -msgid "invalid unshallow line: %s" -msgstr "無效的 unshallow 訊息：%s" - -#: fetch-pack.c:364 fetch-pack.c:1348 -#, c-format -msgid "object not found: %s" -msgstr "物件未找到：%s" - -#: fetch-pack.c:367 fetch-pack.c:1351 -#, c-format -msgid "error in object: %s" -msgstr "物件中發生錯誤：%s" - -#: fetch-pack.c:369 fetch-pack.c:1353 -#, c-format -msgid "no shallow found: %s" -msgstr "未發現 shallow：%s" - -#: fetch-pack.c:372 fetch-pack.c:1357 -#, c-format -msgid "expected shallow/unshallow, got %s" -msgstr "應為 shallow/unshallow，卻得到 %s" - -#: fetch-pack.c:414 -#, c-format -msgid "got %s %d %s" -msgstr "得到 %s %d %s" - -#: fetch-pack.c:431 -#, c-format -msgid "invalid commit %s" -msgstr "無效提交 %s" - -#: fetch-pack.c:462 -msgid "giving up" -msgstr "放棄" - -#: fetch-pack.c:475 progress.c:323 -msgid "done" -msgstr "完成" - -#: fetch-pack.c:487 -#, c-format -msgid "got %s (%d) %s" -msgstr "得到 %s (%d) %s" - -#: fetch-pack.c:533 -#, c-format -msgid "Marking %s as complete" -msgstr "標記 %s 為完成" - -#: fetch-pack.c:754 -#, c-format -msgid "already have %s (%s)" -msgstr "已經有 %s（%s）" - -#: fetch-pack.c:818 -msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack：無法衍生 sideband 多路輸出" - -#: fetch-pack.c:826 -msgid "protocol error: bad pack header" -msgstr "協定錯誤：壞的包頭" - -#: fetch-pack.c:900 -#, c-format -msgid "fetch-pack: unable to fork off %s" -msgstr "fetch-pack：無法衍生進程 %s" - -#: fetch-pack.c:916 -#, c-format -msgid "%s failed" -msgstr "%s 失敗" - -#: fetch-pack.c:918 -msgid "error in sideband demultiplexer" -msgstr "sideband 多路輸出發生錯誤" - -#: fetch-pack.c:965 -#, c-format -msgid "Server version is %.*s" -msgstr "伺服器版本 %.*s" - -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 -#, c-format -msgid "Server supports %s" -msgstr "伺服器支援 %s" - -#: fetch-pack.c:972 -msgid "Server does not support shallow clients" -msgstr "伺服器不支援 shalllow 用戶端" - -#: fetch-pack.c:1032 -msgid "Server does not support --shallow-since" -msgstr "伺服器不支援 --shallow-since" - -#: fetch-pack.c:1037 -msgid "Server does not support --shallow-exclude" -msgstr "伺服器不支援 --shallow-exclude" - -#: fetch-pack.c:1041 -msgid "Server does not support --deepen" -msgstr "伺服器不支援 --deepen" - -#: fetch-pack.c:1058 -msgid "no common commits" -msgstr "沒有共同的提交" - -#: fetch-pack.c:1070 fetch-pack.c:1536 -msgid "git fetch-pack: fetch failed." -msgstr "git fetch-pack：取得失敗。" - -#: fetch-pack.c:1209 -msgid "Server does not support shallow requests" -msgstr "伺服器不支援 shalllow 請求" - -#: fetch-pack.c:1216 -msgid "Server supports filter" -msgstr "伺服器支援 filter" - -#: fetch-pack.c:1239 -msgid "unable to write request to remote" -msgstr "無法將請求寫到遠端" - -#: fetch-pack.c:1257 -#, c-format -msgid "error reading section header '%s'" -msgstr "讀取節標題 '%s' 發生錯誤" - -#: fetch-pack.c:1263 -#, c-format -msgid "expected '%s', received '%s'" -msgstr "預期 '%s'，得到 '%s'" - -#: fetch-pack.c:1303 -#, c-format -msgid "unexpected acknowledgment line: '%s'" -msgstr "意外的確認行：'%s'" - -#: fetch-pack.c:1308 -#, c-format -msgid "error processing acks: %d" -msgstr "處理 ack 發生錯誤：%d" - -#: fetch-pack.c:1318 -msgid "expected packfile to be sent after 'ready'" -msgstr "預期在 'ready' 之後傳送 packfile" - -#: fetch-pack.c:1320 -msgid "expected no other sections to be sent after no 'ready'" -msgstr "在沒有 'ready' 不應該傳送其它小節" - -#: fetch-pack.c:1362 -#, c-format -msgid "error processing shallow info: %d" -msgstr "處理淺複製訊息發生錯誤：%d" - -#: fetch-pack.c:1409 -#, c-format -msgid "expected wanted-ref, got '%s'" -msgstr "預期 wanted-ref，得到 '%s'" - -#: fetch-pack.c:1414 -#, c-format -msgid "unexpected wanted-ref: '%s'" -msgstr "意外的 wanted-ref：'%s'" - -#: fetch-pack.c:1419 -#, c-format -msgid "error processing wanted refs: %d" -msgstr "處理要取得的引用發生錯誤：%d" - -#: fetch-pack.c:1762 -msgid "no matching remote head" -msgstr "沒有符合的遠端分支" - -#: fetch-pack.c:1785 builtin/clone.c:689 -msgid "remote did not send all necessary objects" -msgstr "遠端沒有傳送所有必需的物件" - -#: fetch-pack.c:1812 -#, c-format -msgid "no such remote ref %s" -msgstr "沒有這樣的遠端引用 %s" - -#: fetch-pack.c:1815 -#, c-format -msgid "Server does not allow request for unadvertised object %s" -msgstr "伺服器不允許請求未公開的物件 %s" - -#: gpg-interface.c:408 -msgid "gpg failed to sign the data" -msgstr "gpg 無法為資料簽名" - -#: gpg-interface.c:434 -msgid "could not create temporary file" -msgstr "不能建立暫存檔" - -#: gpg-interface.c:437 -#, c-format -msgid "failed writing detached signature to '%s'" -msgstr "無法將分離式簽名寫入 '%s'" - -#: graph.c:98 -#, c-format -msgid "ignore invalid color '%.*s' in log.graphColors" -msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'" - -#: grep.c:668 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" -"功能" - -#: grep.c:2128 -#, c-format -msgid "'%s': unable to read %s" -msgstr "'%s'：無法讀取 %s" - -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 -#: builtin/rm.c:135 -#, c-format -msgid "failed to stat '%s'" -msgstr "對 '%s' 呼叫 stat 失敗" - -#: grep.c:2156 -#, c-format -msgid "'%s': short read" -msgstr "'%s'：讀取不完整" - -#: help.c:23 -msgid "start a working area (see also: git help tutorial)" -msgstr "開始一個工作區（參見：git help tutorial）" - -#: help.c:24 -msgid "work on the current change (see also: git help everyday)" -msgstr "在目前變更上工作（參見：git help everyday）" - -#: help.c:25 -msgid "examine the history and state (see also: git help revisions)" -msgstr "檢查歷史和狀態（參見：git help revisions）" - -#: help.c:26 -msgid "grow, mark and tweak your common history" -msgstr "擴展、標記和調校您的歷史記錄" - -#: help.c:27 -msgid "collaborate (see also: git help workflows)" -msgstr "協同（參見：git help workflows）" - -#: help.c:31 -msgid "Main Porcelain Commands" -msgstr "主要的上層指令" - -#: help.c:32 -msgid "Ancillary Commands / Manipulators" -msgstr "輔助指令/動作者" - -#: help.c:33 -msgid "Ancillary Commands / Interrogators" -msgstr "輔助指令/詢問者" - -#: help.c:34 -msgid "Interacting with Others" -msgstr "與其它系統互動" - -#: help.c:35 -msgid "Low-level Commands / Manipulators" -msgstr "低級指令/動作者" - -#: help.c:36 -msgid "Low-level Commands / Interrogators" -msgstr "低級指令/詢問者" - -#: help.c:37 -msgid "Low-level Commands / Syncing Repositories" -msgstr "低級指令 / 同步版本庫" - -#: help.c:38 -msgid "Low-level Commands / Internal Helpers" -msgstr "低級指令/內部助手" - -#: help.c:298 -#, c-format -msgid "available git commands in '%s'" -msgstr "在 '%s' 下可用的 git 指令" - -#: help.c:305 -msgid "git commands available from elsewhere on your $PATH" -msgstr "在 $PATH 路徑中的其他地方可用的 git 指令" - -#: help.c:314 -msgid "These are common Git commands used in various situations:" -msgstr "這些是各種場合常見的 Git 指令：" - -#: help.c:363 git.c:98 -#, c-format -msgid "unsupported command listing type '%s'" -msgstr "不支援的指令列表類型 '%s'" - -#: help.c:403 -msgid "The common Git guides are:" -msgstr "最常用的 Git 嚮導有：" - -#: help.c:512 -msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "執行 'git help <command>' 來檢視特定子指令" - -#: help.c:517 -msgid "External commands" -msgstr "外部指令" - -#: help.c:532 -msgid "Command aliases" -msgstr "指令別名" - -#: help.c:596 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" -"'%s' 像是一個 git 指令，但卻無法執行。\n" -"可能是 git-%s 受損？" - -#: help.c:655 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "唉呀，您的系統中未發現 Git 指令。" - -#: help.c:677 -#, c-format -msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。" - -#: help.c:682 -#, c-format -msgid "Continuing under the assumption that you meant '%s'." -msgstr "假定你想要的是 '%s' 並繼續。" - -#: help.c:687 -#, c-format -msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。" - -#: help.c:695 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。" - -#: help.c:699 -msgid "" -"\n" -"The most similar command is" -msgid_plural "" -"\n" -"The most similar commands are" -msgstr[0] "" -"\n" -"最類似的指令有" - -#: help.c:714 -msgid "git version [<options>]" -msgstr "git version [<選項>]" - -#: help.c:783 -#, c-format -msgid "%s: %s - %s" -msgstr "%s：%s - %s" - -#: help.c:787 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -"\n" -"您指的是這個嗎？" - -#: ident.c:349 -msgid "" -"\n" -"*** Please tell me who you are.\n" -"\n" -"Run\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"to set your account's default identity.\n" -"Omit --global to set the identity only in this repository.\n" -"\n" -msgstr "" -"\n" -"*** 請告訴我你是誰。\n" -"\n" -"執行\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"來設定您帳號的預設身份標記。\n" -"如果僅在本版本庫設定身份標記，則省略 --global 參數。\n" - -#: ident.c:379 -msgid "no email was given and auto-detection is disabled" -msgstr "未提供信件位址且自動偵測被禁用" - -#: ident.c:384 -#, c-format -msgid "unable to auto-detect email address (got '%s')" -msgstr "無法自動偵測信件位址（得到 '%s'）" - -#: ident.c:401 -msgid "no name was given and auto-detection is disabled" -msgstr "未提供姓名且自動偵測被禁用" - -#: ident.c:407 -#, c-format -msgid "unable to auto-detect name (got '%s')" -msgstr "無法自動偵測姓名（得到 '%s'）" - -#: ident.c:415 -#, c-format -msgid "empty ident name (for <%s>) not allowed" -msgstr "不允許空的姓名（對於 <%s>）" - -#: ident.c:421 -#, c-format -msgid "name consists only of disallowed characters: %s" -msgstr "姓名中僅包含禁用字元：%s" - -#: ident.c:436 builtin/commit.c:635 -#, c-format -msgid "invalid date format: %s" -msgstr "無效的日期格式：%s" - -#: list-objects.c:127 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件" - -#: list-objects.c:140 -#, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件" - -#: list-objects.c:375 -#, c-format -msgid "unable to load root tree for commit %s" -msgstr "無法為提交 %s 載入根樹" - -#: list-objects-filter.c:492 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "不能存取 '%s' 中的稀疏資料物件" - -#: list-objects-filter.c:495 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "無法解析 %s 中的稀疏過濾器資料" - -#: list-objects-filter-options.c:58 -msgid "expected 'tree:<depth>'" -msgstr "期望 'tree:<深度>'" - -#: list-objects-filter-options.c:73 -msgid "sparse:path filters support has been dropped" -msgstr "sparse:path 過濾器支援已被刪除" - -#: list-objects-filter-options.c:86 -#, c-format -msgid "invalid filter-spec '%s'" -msgstr "無效的過濾器表達式 '%s'" - -#: list-objects-filter-options.c:102 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'" - -#: list-objects-filter-options.c:144 -msgid "expected something after combine:" -msgstr "期望在組合後有一些東西：" - -#: list-objects-filter-options.c:226 -msgid "multiple filter-specs cannot be combined" -msgstr "不能混用多種過濾規格" - -#: lockfile.c:151 -#, c-format -msgid "" -"Unable to create '%s.lock': %s.\n" -"\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." -msgstr "" -"無法建立 '%s.lock'：%s。\n" -"\n" -"似乎另外一個 git 進程在這個版本庫中執行，例如：'git commit' 指令打\n" -"開了一個編輯器。請確認所有進程都已經關閉然後重試。如果仍然報錯，\n" -"可能之前有一個 git 進程在這個版本庫中異常離開：\n" -"手動刪除這個檔案再繼續。" - -#: lockfile.c:159 -#, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "不能建立 '%s.lock'：%s" - -#: merge.c:41 -msgid "failed to read the cache" -msgstr "讀取快取失敗" - -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 -#: builtin/stash.c:265 -msgid "unable to write new index file" -msgstr "無法寫新的索引檔案" - -#: merge-recursive.c:356 -msgid "(bad commit)\n" -msgstr "（壞提交）\n" - -#: merge-recursive.c:379 -#, c-format -msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" - -#: merge-recursive.c:388 -#, c-format -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" - -#: merge-recursive.c:874 -#, c-format -msgid "failed to create path '%s'%s" -msgstr "建立路徑 '%s'%s 失敗" - -#: merge-recursive.c:885 -#, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "刪除 %s 以便為子目錄留出空間\n" - -#: merge-recursive.c:899 merge-recursive.c:918 -msgid ": perhaps a D/F conflict?" -msgstr "：可能是一個目錄/檔案衝突？" - -#: merge-recursive.c:908 -#, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" - -#: merge-recursive.c:949 builtin/cat-file.c:41 -#, c-format -msgid "cannot read object %s '%s'" -msgstr "不能讀取物件 %s '%s'" - -#: merge-recursive.c:954 -#, c-format -msgid "blob expected for %s '%s'" -msgstr "%s '%s' 應為資料物件" - -#: merge-recursive.c:979 -#, c-format -msgid "failed to open '%s': %s" -msgstr "開啟 '%s' 失敗：%s" - -#: merge-recursive.c:990 -#, c-format -msgid "failed to symlink '%s': %s" -msgstr "建立符號連結 '%s' 失敗：%s" - -#: merge-recursive.c:995 -#, c-format -msgid "do not know what to do with %06o %s '%s'" -msgstr "不知道如何處理 %06o %s '%s'" - -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "無法合併子模組 %s （沒有簽出）" - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "無法合併子模組 %s（提交不存在）" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" - -#: merge-recursive.c:1213 merge-recursive.c:1225 -#, c-format -msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "子模組 %s 快轉到如下提交：" - -#: merge-recursive.c:1216 merge-recursive.c:1228 -#, c-format -msgid "Fast-forwarding submodule %s" -msgstr "快轉子模組 %s" - -#: merge-recursive.c:1251 -#, c-format -msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" - -#: merge-recursive.c:1255 -#, c-format -msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "無法合併子模組 %s（非快轉）" - -#: merge-recursive.c:1256 -msgid "Found a possible merge resolution for the submodule:\n" -msgstr "找到子模組的一個可能的合併方案：\n" - -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"如果這個正確，將其新增到索引，例如使用指令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"以接受此建議。\n" - -#: merge-recursive.c:1268 -#, c-format -msgid "Failed to merge submodule %s (multiple merges found)" -msgstr "無法合併子模組 %s （發現多個合併）" - -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "無法執行內部合併" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "不能新增 %s 至物件庫" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "自動合併 %s" - -#: merge-recursive.c:1402 -#, c-format -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" - -#: merge-recursive.c:1474 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本被保留。" - -#: merge-recursive.c:1479 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本被保留。" - -#: merge-recursive.c:1486 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本保留在 %8$s 中。" - -#: merge-recursive.c:1491 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree at %s." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本保留在 %9$s 中。" - -#: merge-recursive.c:1526 -msgid "rename" -msgstr "重新命名" - -#: merge-recursive.c:1526 -msgid "renamed" -msgstr "重新命名" - -#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 -#, c-format -msgid "Refusing to lose dirty file at %s" -msgstr "拒絕遺失髒檔案 '%s'" - -#: merge-recursive.c:1587 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" - -#: merge-recursive.c:1645 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" -msgstr "" -"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" - -#: merge-recursive.c:1676 -#, c-format -msgid "%s is a directory in %s adding as %s instead" -msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" - -#: merge-recursive.c:1681 -#, c-format -msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" - -#: merge-recursive.c:1708 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" -msgstr "" -"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" -"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" - -#: merge-recursive.c:1713 -msgid " (left unresolved)" -msgstr "（留下未解決）" - -#: merge-recursive.c:1793 -#, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "" -"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " -"%4$s->%5$s" - -#: merge-recursive.c:2056 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to place %s because " -"directory %s was renamed to multiple other directories, with no destination " -"getting a majority of the files." -msgstr "" -"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" -"多個其它目錄，沒有目錄包含大部分檔案。" - -#: merge-recursive.c:2088 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" -"放在：%s。" - -#: merge-recursive.c:2098 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" -"些路徑放置於此：%s" - -#: merge-recursive.c:2190 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" -">%s in %s" -msgstr "" -"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" -"命名目錄 %4$s->%5$s" - -#: merge-recursive.c:2435 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" - -#: merge-recursive.c:2961 -#, c-format -msgid "cannot read object %s" -msgstr "不能讀取物件 %s" - -#: merge-recursive.c:2964 -#, c-format -msgid "object %s is not a blob" -msgstr "物件 %s 不是一個資料物件" - -#: merge-recursive.c:3028 -msgid "modify" -msgstr "修改" - -#: merge-recursive.c:3028 -msgid "modified" -msgstr "修改" - -#: merge-recursive.c:3040 -msgid "content" -msgstr "內容" - -#: merge-recursive.c:3044 -msgid "add/add" -msgstr "新增/新增" - -#: merge-recursive.c:3067 -#, c-format -msgid "Skipped %s (merged same as existing)" -msgstr "略過 %s（已經做過相同合併）" - -#: merge-recursive.c:3089 git-submodule.sh:1003 -msgid "submodule" -msgstr "子模組" - -#: merge-recursive.c:3090 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "衝突（%s）：合併衝突於 %s" - -#: merge-recursive.c:3120 -#, c-format -msgid "Adding as %s instead" -msgstr "而是以 %s 為名新增" - -#: merge-recursive.c:3203 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" - -#: merge-recursive.c:3206 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" -"動到 %s。" - -#: merge-recursive.c:3210 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" -"其移動到 %5$s。" - -#: merge-recursive.c:3213 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " -"中，建議將其移動到 %5$s。" - -#: merge-recursive.c:3327 -#, c-format -msgid "Removing %s" -msgstr "刪除 %s" - -#: merge-recursive.c:3350 -msgid "file/directory" -msgstr "檔案/目錄" - -#: merge-recursive.c:3355 -msgid "directory/file" -msgstr "目錄/檔案" - -#: merge-recursive.c:3362 -#, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s" - -#: merge-recursive.c:3371 -#, c-format -msgid "Adding %s" -msgstr "新增 %s" - -#: merge-recursive.c:3380 -#, c-format -msgid "CONFLICT (add/add): Merge conflict in %s" -msgstr "衝突（add/add）：合併衝突於 %s" - -#: merge-recursive.c:3424 -msgid "Already up to date!" -msgstr "已經是最新的！" - -#: merge-recursive.c:3433 -#, c-format -msgid "merging of trees %s and %s failed" -msgstr "無法合併樹 %s 和 %s" - -#: merge-recursive.c:3537 -msgid "Merging:" -msgstr "合併：" - -#: merge-recursive.c:3550 -#, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "發現 %u 個共同祖先：" - -#: merge-recursive.c:3600 -msgid "merge returned no commit" -msgstr "合併未返回提交" - -#: merge-recursive.c:3659 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -" %s" - -#: merge-recursive.c:3756 -#, c-format -msgid "Could not parse object '%s'" -msgstr "不能解析物件 '%s'" - -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 -msgid "Unable to write index." -msgstr "不能寫入索引。" - -#: midx.c:68 -#, c-format -msgid "multi-pack-index file %s is too small" -msgstr "多包索引檔案 %s 太小" - -#: midx.c:84 -#, c-format -msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合" - -#: midx.c:89 -#, c-format -msgid "multi-pack-index version %d not recognized" -msgstr "multi-pack-index 版本 %d 不能被識別" - -#: midx.c:94 -#, c-format -msgid "hash version %u does not match" -msgstr "散列版本 %u 不符合" - -#: midx.c:108 -msgid "invalid chunk offset (too large)" -msgstr "無效的區塊位移（太大）" - -#: midx.c:132 -msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "終止多包索引區塊 id 出現時間早於預期" - -#: midx.c:145 -msgid "multi-pack-index missing required pack-name chunk" -msgstr "多包索引缺少必需的包名塊" - -#: midx.c:147 -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的物件 ID 扇出塊" - -#: midx.c:149 -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的物件 ID 查詢塊" - -#: midx.c:151 -msgid "multi-pack-index missing required object offsets chunk" -msgstr "多包索引缺少必需的物件位移塊" - -#: midx.c:165 -#, c-format -msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "多包索引包名無序：'%s' 在 '%s' 之前" - -#: midx.c:210 -#, c-format -msgid "bad pack-int-id: %u (%u total packs)" -msgstr "錯的 pack-int-id：%u（共有 %u 個包）" - -#: midx.c:260 -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "多包索引儲存一個64位位移，但是 off_t 太小" - -#: midx.c:288 -msgid "error preparing packfile from multi-pack-index" -msgstr "從多包索引準備 packfile 時發生錯誤" - -#: midx.c:472 -#, c-format -msgid "failed to add packfile '%s'" -msgstr "新增 packfile '%s' 失敗" - -#: midx.c:478 -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "開啟包索引 '%s' 失敗" - -#: midx.c:538 -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "在 packfile 中定位物件 %d 失敗" - -#: midx.c:842 -msgid "Adding packfiles to multi-pack-index" -msgstr "正在新增 packfile 至多包索引" - -#: midx.c:875 -#, c-format -msgid "did not see pack-file %s to drop" -msgstr "沒有看到要捨棄的包檔案 %s" - -#: midx.c:973 -msgid "Writing chunks to multi-pack-index" -msgstr "寫入區塊至多包索引" - -#: midx.c:1052 -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "清理位於 %s 的多包索引失敗" - -#: midx.c:1108 -msgid "Looking for referenced packfiles" -msgstr "正在尋找引用的 packfile" - -#: midx.c:1123 -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" - -#: midx.c:1128 -msgid "Verifying OID order in multi-pack-index" -msgstr "正在驗證多包索引中的物件 ID 順序" - -#: midx.c:1137 -#, c-format -msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" - -#: midx.c:1157 -msgid "Sorting objects by packfile" -msgstr "透過 packfile 為物件排序" - -#: midx.c:1164 -msgid "Verifying object offsets" -msgstr "正在驗證物件位移" - -#: midx.c:1180 -#, c-format -msgid "failed to load pack entry for oid[%d] = %s" -msgstr "為 oid[%d] = %s 載入包條目失敗" - -#: midx.c:1186 -#, c-format -msgid "failed to load pack-index for packfile %s" -msgstr "為 packfile %s 載入包索引失敗" - -#: midx.c:1195 -#, c-format -msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" -msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" - -#: midx.c:1220 -msgid "Counting referenced objects" -msgstr "正在計算引用物件" - -#: midx.c:1230 -msgid "Finding and deleting unreferenced packfiles" -msgstr "正在尋找並刪除沒有參考的 packfile" - -#: midx.c:1388 -msgid "could not start pack-objects" -msgstr "不能開始 pack-objects" - -#: midx.c:1407 -msgid "could not finish pack-objects" -msgstr "不能結束 pack-objects" - -#: name-hash.c:537 -#, c-format -msgid "unable to create lazy_dir thread: %s" -msgstr "不能建立 lazy_dir 執行緒：%s" - -#: name-hash.c:559 -#, c-format -msgid "unable to create lazy_name thread: %s" -msgstr "不能建立 lazy_name 執行緒：%s" - -#: name-hash.c:565 -#, c-format -msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lasy_name 執行緒：%s" - -#: notes-merge.c:277 -#, c-format -msgid "" -"You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " -"commit/abort the previous merge before you start a new notes merge." -msgstr "" -"您的前一次備註合併尚未結束（存在 %s）。\n" -"在開始一個新的備註合併之前，請使用 'git notes merge --commit' 或者 'git " -"notes merge --abort' 來提交/終止前一次合併。" - -#: notes-merge.c:284 -#, c-format -msgid "You have not concluded your notes merge (%s exists)." -msgstr "您尚未結束備註合併（存在 %s）。" - -#: notes-utils.c:46 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "不能提交未初始化/未引用的註解樹" - -#: notes-utils.c:105 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "壞的 notes.rewriteMode 值：'%s'" - -#: notes-utils.c:115 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解" - -#. TRANSLATORS: The first %s is the name of -#. the environment variable, the second %s is -#. its value. -#. -#: notes-utils.c:145 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "壞的 %s 值：'%s'" - -#: object.c:53 -#, c-format -msgid "invalid object type \"%s\"" -msgstr "無效的物件類型 \"%s\"" - -#: object.c:173 -#, c-format -msgid "object %s is a %s, not a %s" -msgstr "物件 %s 是一個 %s，不是一個 %s" - -#: object.c:233 -#, c-format -msgid "object %s has unknown type id %d" -msgstr "物件 %s 有未知的類型 id %d" - -#: object.c:246 -#, c-format -msgid "unable to parse object: %s" -msgstr "不能解析物件：%s" - -#: object.c:266 object.c:278 -#, c-format -msgid "hash mismatch %s" -msgstr "雜湊值與 %s 不符合" - -#: packfile.c:629 -msgid "offset before end of packfile (broken .idx?)" -msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" - -#: packfile.c:1899 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" - -#: packfile.c:1903 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" - -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 -#, c-format -msgid "unable to get size of %s" -msgstr "不能得到 %s 的大小" - -#: parse-options.c:38 -#, c-format -msgid "%s requires a value" -msgstr "%s 需要一個值" - -#: parse-options.c:73 -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s 與 %s 不相容" - -#: parse-options.c:78 -#, c-format -msgid "%s : incompatible with something else" -msgstr "%s：和其它的不相容" - -#: parse-options.c:92 parse-options.c:96 parse-options.c:317 -#, c-format -msgid "%s takes no value" -msgstr "%s 不取值" - -#: parse-options.c:94 -#, c-format -msgid "%s isn't available" -msgstr "%s 不可用" - -#: parse-options.c:217 -#, c-format -msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" - -#: parse-options.c:386 -#, c-format -msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" - -#: parse-options.c:420 parse-options.c:428 -#, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "你的意思是 `--%s`（有兩個短線）嗎？" - -#: parse-options.c:857 -#, c-format -msgid "unknown option `%s'" -msgstr "未知選項 `%s'" - -#: parse-options.c:859 -#, c-format -msgid "unknown switch `%c'" -msgstr "未知開關 `%c'" - -#: parse-options.c:861 -#, c-format -msgid "unknown non-ascii option in string: `%s'" -msgstr "字串中未知的非 ascii 字元選項：`%s'" - -#: parse-options.c:885 -msgid "..." -msgstr "..." - -#: parse-options.c:904 -#, c-format -msgid "usage: %s" -msgstr "用法：%s" - -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation. -#. -#: parse-options.c:910 -#, c-format -msgid " or: %s" -msgstr " 或：%s" - -# 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: parse-options.c:913 -#, c-format -msgid " %s" -msgstr " %s" - -#: parse-options.c:952 -msgid "-NUM" -msgstr "-數字" - -#: parse-options.c:966 -#, c-format -msgid "alias of --%s" -msgstr "--%s 的別名" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "選項 `%s' 期望一個數字值" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "格式錯誤的到期時間：'%s'" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "格式錯誤的物件名 '%s'" - -#: path.c:915 -#, c-format -msgid "Could not make %s writable by group" -msgstr "不能設定 %s 為組可寫" - -#: pathspec.c:130 -msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元" - -#: pathspec.c:148 -msgid "Only one 'attr:' specification is allowed." -msgstr "只允許一個 'attr:' 規格。" - -#: pathspec.c:151 -msgid "attr spec must not be empty" -msgstr "屬性規格不能為空" - -#: pathspec.c:194 -#, c-format -msgid "invalid attribute name %s" -msgstr "無效的屬性名 %s" - -#: pathspec.c:259 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容" - -#: pathspec.c:266 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容" - -#: pathspec.c:306 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "路徑規格包含無效的神奇前綴" - -#: pathspec.c:327 -#, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'" - -#: pathspec.c:332 -#, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'" - -#: pathspec.c:370 -#, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'" - -#: pathspec.c:429 -#, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "%s：'literal' 和 'glob' 不相容" - -#: pathspec.c:442 -#, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s：'%s' 在位於 '%s' 的版本庫之外" - -#: pathspec.c:517 -#, c-format -msgid "'%s' (mnemonic: '%c')" -msgstr "'%s'（助記符：'%c'）" - -#: pathspec.c:527 -#, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s：路徑規格神奇前綴不被此指令支援：%s" - -#: pathspec.c:594 -#, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "路徑規格 '%s' 位於符號連結中" - -#: pathspec.c:639 -#, c-format -msgid "line is badly quoted: %s" -msgstr "某行不應該被括號括住：%s" - -#: pkt-line.c:92 -msgid "unable to write flush packet" -msgstr "無法寫 flush 包" - -#: pkt-line.c:99 -msgid "unable to write delim packet" -msgstr "無法寫 delim 包" - -#: pkt-line.c:106 -msgid "flush packet write failed" -msgstr "flush 包寫錯誤" - -#: pkt-line.c:146 pkt-line.c:232 -msgid "protocol error: impossibly long line" -msgstr "協定錯誤：不可能的長行" - -#: pkt-line.c:162 pkt-line.c:164 -msgid "packet write with format failed" -msgstr "格式化包寫入錯誤" - -#: pkt-line.c:196 -msgid "packet write failed - data exceeds max packet size" -msgstr "寫封包失敗：資料超過了包的最大長度" - -#: pkt-line.c:203 pkt-line.c:210 -msgid "packet write failed" -msgstr "封包寫入失敗" - -#: pkt-line.c:295 -msgid "read error" -msgstr "讀取錯誤" - -#: pkt-line.c:303 -msgid "the remote end hung up unexpectedly" -msgstr "遠端意外掛斷了" - -#: pkt-line.c:331 -#, c-format -msgid "protocol error: bad line length character: %.4s" -msgstr "協定錯誤：錯誤的行長度字串：%.4s" - -#: pkt-line.c:341 pkt-line.c:346 -#, c-format -msgid "protocol error: bad line length %d" -msgstr "協定錯誤：錯誤的行長度 %d" - -#: pkt-line.c:362 -#, c-format -msgid "remote error: %s" -msgstr "遠端錯誤：%s" - -#: preload-index.c:119 -msgid "Refreshing index" -msgstr "正在重新整理索引" - -#: preload-index.c:138 -#, c-format -msgid "unable to create threaded lstat: %s" -msgstr "無法建立執行緒 lstat：%s" - -#: pretty.c:981 -msgid "unable to parse --pretty format" -msgstr "不能解析 --pretty 格式" - -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "遠端未設定 URL" - -#: promisor-remote.c:58 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "promisor 遠端名稱不能以 '/' 開始：%s" - -#: range-diff.c:75 -msgid "could not start `log`" -msgstr "不能啟動 `log`" - -#: range-diff.c:77 -msgid "could not read `log` output" -msgstr "不能讀取 `log` 的輸出" - -#: range-diff.c:96 sequencer.c:5020 -#, c-format -msgid "could not parse commit '%s'" -msgstr "不能解析提交 '%s'" - -#: range-diff.c:122 -#, c-format -msgid "could not parse git header '%.*s'" -msgstr "無法解析 git 頭 '%.*s'" - -#: range-diff.c:285 -msgid "failed to generate diff" -msgstr "生成 diff 失敗" - -#: range-diff.c:518 range-diff.c:520 -#, c-format -msgid "could not parse log for '%s'" -msgstr "不能解析 '%s' 的日誌" - -#: read-cache.c:680 -#, c-format -msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" - -#: read-cache.c:696 -msgid "cannot create an empty blob in the object database" -msgstr "不能在物件資料庫中建立空的資料物件" - -#: read-cache.c:718 -#, c-format -msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" - -#: read-cache.c:723 -#, c-format -msgid "'%s' does not have a commit checked out" -msgstr "'%s' 沒有簽出一個提交" - -#: read-cache.c:775 -#, c-format -msgid "unable to index file '%s'" -msgstr "無法索引檔案 '%s'" - -#: read-cache.c:794 -#, c-format -msgid "unable to add '%s' to index" -msgstr "無法在索引中新增 '%s'" - -#: read-cache.c:805 -#, c-format -msgid "unable to stat '%s'" -msgstr "無法對 %s 執行 stat" - -#: read-cache.c:1330 -#, c-format -msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' 看起來既是檔案又是目錄" - -#: read-cache.c:1536 -msgid "Refresh index" -msgstr "重新整理索引" - -#: read-cache.c:1651 -#, c-format -msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"設定了 index.version，但是取值無效。\n" -"使用版本 %i" - -#: read-cache.c:1661 -#, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"設定了 GIT_INDEX_VERSION，但是取值無效。\n" -"使用版本 %i" - -#: read-cache.c:1717 -#, c-format -msgid "bad signature 0x%08x" -msgstr "壞的簽名 0x%08x" - -#: read-cache.c:1720 -#, c-format -msgid "bad index version %d" -msgstr "壞的索引版本 %d" - -#: read-cache.c:1729 -msgid "bad index file sha1 signature" -msgstr "壞的索引檔案 sha1 簽名" - -#: read-cache.c:1759 -#, c-format -msgid "index uses %.4s extension, which we do not understand" -msgstr "索引使用不被支援的 %.4s 擴展" - -# -#: read-cache.c:1761 -#, c-format -msgid "ignoring %.4s extension" -msgstr "忽略 %.4s 擴展" - -#: read-cache.c:1798 -#, c-format -msgid "unknown index entry format 0x%08x" -msgstr "未知的索引條目格式 0x%08x" - -#: read-cache.c:1814 -#, c-format -msgid "malformed name field in the index, near path '%s'" -msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" - -#: read-cache.c:1871 -msgid "unordered stage entries in index" -msgstr "索引中有未排序的暫存條目" - -#: read-cache.c:1874 -#, c-format -msgid "multiple stage entries for merged file '%s'" -msgstr "合併檔案 '%s' 有多個暫存條目" - -#: read-cache.c:1877 -#, c-format -msgid "unordered stage entries for '%s'" -msgstr "'%s' 的未排序暫存條目" - -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 -#: builtin/submodule--helper.c:332 -msgid "index file corrupt" -msgstr "索引檔案損壞" - -#: read-cache.c:2124 -#, c-format -msgid "unable to create load_cache_entries thread: %s" -msgstr "無法建立 load_cache_entries 執行緒：%s" - -#: read-cache.c:2137 -#, c-format -msgid "unable to join load_cache_entries thread: %s" -msgstr "無法加入 load_cache_entries 執行緒：%s" - -#: read-cache.c:2170 -#, c-format -msgid "%s: index file open failed" -msgstr "%s：開啟索引檔案失敗" - -#: read-cache.c:2174 -#, c-format -msgid "%s: cannot stat the open index" -msgstr "%s：不能對開啟的索引執行 stat 動作" - -#: read-cache.c:2178 -#, c-format -msgid "%s: index file smaller than expected" -msgstr "%s：索引檔案比預期的小" - -#: read-cache.c:2182 -#, c-format -msgid "%s: unable to map index file" -msgstr "%s：無法對索引檔案執行 map 動作" - -#: read-cache.c:2224 -#, c-format -msgid "unable to create load_index_extensions thread: %s" -msgstr "無法建立 load_index_extensions 執行緒：%s" - -#: read-cache.c:2251 -#, c-format -msgid "unable to join load_index_extensions thread: %s" -msgstr "無法加入 load_index_extensions 執行緒：%s" - -#: read-cache.c:2283 -#, c-format -msgid "could not freshen shared index '%s'" -msgstr "無法重新整理共享索引 '%s'" - -#: read-cache.c:2330 -#, c-format -msgid "broken index, expect %s in %s, got %s" -msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" - -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 -#, c-format -msgid "could not close '%s'" -msgstr "不能關閉 '%s'" - -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 -#, c-format -msgid "could not stat '%s'" -msgstr "不能對 '%s' 呼叫 stat" - -#: read-cache.c:3142 -#, c-format -msgid "unable to open git dir: %s" -msgstr "不能開啟 git 目錄：%s" - -#: read-cache.c:3154 -#, c-format -msgid "unable to unlink: %s" -msgstr "無法刪除：%s" - -#: read-cache.c:3179 -#, c-format -msgid "cannot fix permission bits on '%s'" -msgstr "不能修復 '%s' 的權限位" - -#: read-cache.c:3328 -#, c-format -msgid "%s: cannot drop to stage #0" -msgstr "%s：不能落到暫存區 #0" - -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 終止重定基底。\n" - -#: rebase-interactive.c:33 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。" - -#: rebase-interactive.c:42 -msgid "" -"\n" -"Commands:\n" -"p, pick <commit> = use commit\n" -"r, reword <commit> = use commit, but edit the commit message\n" -"e, edit <commit> = use commit, but stop for amending\n" -"s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <command> = run command (the rest of the line) using shell\n" -"b, break = stop here (continue rebase later with 'git rebase --continue')\n" -"d, drop <commit> = remove commit\n" -"l, label <label> = label current HEAD with a name\n" -"t, reset <label> = reset HEAD to a label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" -"\n" -"These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "" -"\n" -"指令:\n" -"p, pick <提交> = 使用提交\n" -"r, reword <提交> = 使用提交，但修改提交說明\n" -"e, edit <提交> = 使用提交，進入 shell 以便進行提交修補\n" -"s, squash <提交> = 使用提交，但融合到前一個提交\n" -"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n" -"x, exec <指令> = 使用 shell 執行指令（此行剩餘部分）\n" -"b, break = 在此處停止（使用 'git rebase --continue' 繼續重定基底）\n" -"d, drop <提交> = 刪除提交\n" -"l, label <label> = 為目前 HEAD 打上標記\n" -"t, reset <label> = 重設 HEAD 到該標記\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" -". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n" -". -c <提交> 可以編輯提交說明。\n" -"\n" -"可以對這些行重新排序，將從上至下執行。\n" - -#: rebase-interactive.c:63 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "重定基底 %s 到 %s（%d 個提交）" - -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 -msgid "" -"\n" -"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "" -"\n" -"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n" - -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 -msgid "" -"\n" -"If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "" -"\n" -"如果您在這裡刪除一行，對應的提交將會遺失。\n" - -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" -"\n" -"您正在修改進行中的互動式重定基底待辦列表。若要在編輯結束後繼續重定基底，\n" -"請執行：\n" -" git rebase --continue\n" -"\n" - -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 -msgid "" -"\n" -"However, if you remove everything, the rebase will be aborted.\n" -"\n" -msgstr "" -"\n" -"然而，如果您刪除全部內容，重定基底動作將會終止。\n" -"\n" - -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 -#, c-format -msgid "could not write '%s'" -msgstr "不能寫入 '%s'" - -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 -#: builtin/rebase.c:234 -#, c-format -msgid "could not write '%s'." -msgstr "不能寫入 '%s'。" - -#: rebase-interactive.c:193 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"警告：一些提交可能被意外捨棄。\n" -"捨棄的提交（從新到舊）：\n" - -#: rebase-interactive.c:200 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"為避免這條訊息，使用 \"drop\" 指令顯式地刪除一個提交。\n" -"\n" -"使用 'git config rebase.missingCommitsCheck' 來修改警告級別。\n" -"可選值有：ignore、warn、error。\n" -"\n" - -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 -#: builtin/rebase.c:246 -#, c-format -msgid "could not read '%s'." -msgstr "不能讀取 '%s'。" - -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "%s 沒有指向一個有效的物件！" - -#: refs.c:667 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "忽略懸空符號引用 %s" - -#: refs.c:669 ref-filter.c:2098 -#, c-format -msgid "ignoring broken ref %s" -msgstr "忽略損壞的引用 %s" - -#: refs.c:804 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "無法為寫入開啟 '%s'：%s" - -#: refs.c:814 refs.c:865 -#, c-format -msgid "could not read ref '%s'" -msgstr "無法讀取引用 '%s'" - -#: refs.c:820 -#, c-format -msgid "ref '%s' already exists" -msgstr "引用 '%s' 已經存在" - -#: refs.c:825 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "寫入 '%s' 時意外的物件 ID" - -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 -#: wrapper.c:620 -#, c-format -msgid "could not write to '%s'" -msgstr "不能寫入 '%s'" - -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 -#: builtin/rebase.c:1029 -#, c-format -msgid "could not open '%s' for writing" -msgstr "無法開啟 '%s' 進行寫入" - -#: refs.c:867 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "刪除 '%s' 時意外的物件 ID" - -#: refs.c:998 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "引用 %s 的日誌在 %s 之後有缺口" - -#: refs.c:1004 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "引用 %s 的日誌意外終止於 %s " - -#: refs.c:1063 -#, c-format -msgid "log for %s is empty" -msgstr "%s 的日誌為空" - -#: refs.c:1155 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "拒絕更新有錯誤名稱 '%s' 的引用" - -#: refs.c:1231 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "對引用 '%s' 執行 update_ref 失敗：%s" - -#: refs.c:2023 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "不允許對引用 '%s' 多次更新" - -#: refs.c:2055 -msgid "ref updates forbidden inside quarantine environment" -msgstr "在隔離環境中禁止更新引用" - -#: refs.c:2151 refs.c:2181 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' 已存在，無法建立 '%s'" - -#: refs.c:2157 refs.c:2192 -#, c-format -msgid "cannot process '%s' and '%s' at the same time" -msgstr "無法同時處理 '%s' 和 '%s'" - -#: refs/files-backend.c:1233 -#, c-format -msgid "could not remove reference %s" -msgstr "無法刪除引用 %s" - -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "無法刪除引用 %s：%s" - -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 -#, c-format -msgid "could not delete references: %s" -msgstr "無法刪除引用：%s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "無效的引用表達式：'%s'" - -#: ref-filter.c:42 wt-status.c:1938 -msgid "gone" -msgstr "遺失" - -#: ref-filter.c:43 -#, c-format -msgid "ahead %d" -msgstr "領先 %d" - -#: ref-filter.c:44 -#, c-format -msgid "behind %d" -msgstr "落後 %d" - -#: ref-filter.c:45 -#, c-format -msgid "ahead %d, behind %d" -msgstr "領先 %d，落後 %d" - -#: ref-filter.c:165 -#, c-format -msgid "expected format: %%(color:<color>)" -msgstr "期望的格式：%%(color:<顏色>)" - -#: ref-filter.c:167 -#, c-format -msgid "unrecognized color: %%(color:%s)" -msgstr "未能識別的顏色：%%(color:%s)" - -#: ref-filter.c:189 -#, c-format -msgid "Integer value expected refname:lstrip=%s" -msgstr "期望整數值 refname:lstrip=%s" - -#: ref-filter.c:193 -#, c-format -msgid "Integer value expected refname:rstrip=%s" -msgstr "期望整數值 refname:rstrip=%s" - -#: ref-filter.c:195 -#, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "未能識別的 %%(%s) 參數：%s" - -#: ref-filter.c:250 -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) 不帶參數" - -#: ref-filter.c:272 -#, c-format -msgid "unrecognized %%(objectsize) argument: %s" -msgstr "未能識別的 %%(objectsize) 參數：%s" - -#: ref-filter.c:280 -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) 不帶參數" - -#: ref-filter.c:292 -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) 不帶參數" - -#: ref-filter.c:301 -#, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) 不帶參數" - -#: ref-filter.c:323 -#, c-format -msgid "unknown %%(trailers) argument: %s" -msgstr "未知的 %%(trailers) 參數：%s" - -#: ref-filter.c:352 -#, c-format -msgid "positive value expected contents:lines=%s" -msgstr "期望一個正數 contents:lines=%s" - -#: ref-filter.c:354 -#, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "未能識別的 %%(contents) 參數：%s" - -#: ref-filter.c:369 -#, c-format -msgid "positive value expected objectname:short=%s" -msgstr "期望一個正數 objectname:short=%s" - -#: ref-filter.c:373 -#, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "未能識別的 %%(objectname) 參數：%s" - -#: ref-filter.c:403 -#, c-format -msgid "expected format: %%(align:<width>,<position>)" -msgstr "期望的格式：%%(align:<寬度>,<位置>)" - -#: ref-filter.c:415 -#, c-format -msgid "unrecognized position:%s" -msgstr "未能識別的位置：%s" - -#: ref-filter.c:422 -#, c-format -msgid "unrecognized width:%s" -msgstr "未能識別的寬度：%s" - -#: ref-filter.c:431 -#, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "未能識別的 %%(align) 參數：%s" - -#: ref-filter.c:439 -#, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "元素 %%(align) 需要一個正數的寬度" - -#: ref-filter.c:457 -#, c-format -msgid "unrecognized %%(if) argument: %s" -msgstr "未能識別的 %%(if) 參數：%s" - -#: ref-filter.c:559 -#, c-format -msgid "malformed field name: %.*s" -msgstr "格式錯誤的欄位名：%.*s" - -#: ref-filter.c:586 -#, c-format -msgid "unknown field name: %.*s" -msgstr "未知的欄位名：%.*s" - -#: ref-filter.c:590 -#, c-format -msgid "" -"not a git repository, but the field '%.*s' requires access to object data" -msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" - -#: ref-filter.c:714 -#, c-format -msgid "format: %%(if) atom used without a %%(then) atom" -msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素" - -#: ref-filter.c:777 -#, c-format -msgid "format: %%(then) atom used without an %%(if) atom" -msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" - -#: ref-filter.c:779 -#, c-format -msgid "format: %%(then) atom used more than once" -msgstr "格式：%%(then) 元素用了多次" - -#: ref-filter.c:781 -#, c-format -msgid "format: %%(then) atom used after %%(else)" -msgstr "格式：%%(then) 元素用在了 %%(else) 之後" - -#: ref-filter.c:809 -#, c-format -msgid "format: %%(else) atom used without an %%(if) atom" -msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素" - -#: ref-filter.c:811 -#, c-format -msgid "format: %%(else) atom used without a %%(then) atom" -msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" - -#: ref-filter.c:813 -#, c-format -msgid "format: %%(else) atom used more than once" -msgstr "格式：%%(else) 元素用了多次" - -#: ref-filter.c:828 -#, c-format -msgid "format: %%(end) atom used without corresponding atom" -msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素" - -#: ref-filter.c:885 -#, c-format -msgid "malformed format string %s" -msgstr "錯誤的格式化字串 %s" - -#: ref-filter.c:1488 -#, c-format -msgid "no branch, rebasing %s" -msgstr "非分支，正重定基底 %s" - -#: ref-filter.c:1491 -#, c-format -msgid "no branch, rebasing detached HEAD %s" -msgstr "非分支，正重定基底分離開頭指標 %s" - -#: ref-filter.c:1494 -#, c-format -msgid "no branch, bisect started on %s" -msgstr "非分支，二分尋找開始於 %s" - -#: ref-filter.c:1504 -msgid "no branch" -msgstr "非分支" - -#: ref-filter.c:1540 ref-filter.c:1749 -#, c-format -msgid "missing object %s for %s" -msgstr "缺少 %2$s 的物件 %1$s" - -#: ref-filter.c:1550 -#, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s" - -#: ref-filter.c:2004 -#, c-format -msgid "malformed object at '%s'" -msgstr "格式錯誤的物件 '%s'" - -#: ref-filter.c:2093 -#, c-format -msgid "ignoring ref with broken name %s" -msgstr "忽略帶有錯誤名稱 %s 的引用" - -#: ref-filter.c:2389 -#, c-format -msgid "format: %%(end) atom missing" -msgstr "格式：缺少 %%(end) 元素" - -#: ref-filter.c:2489 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "選項 `%s' 和 --merged 不相容" - -#: ref-filter.c:2492 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "選項 `%s' 和 --no-merged 不相容" - -#: ref-filter.c:2502 -#, c-format -msgid "malformed object name %s" -msgstr "格式錯誤的物件名 %s" - -#: ref-filter.c:2507 -#, c-format -msgid "option `%s' must point to a commit" -msgstr "選項 `%s' 必須指向一個提交" - -#: remote.c:366 -#, c-format -msgid "config remote shorthand cannot begin with '/': %s" -msgstr "設定的遠端短名稱不能以 '/' 開始：%s" - -#: remote.c:414 -msgid "more than one receivepack given, using the first" -msgstr "提供了一個以上的 receivepack，使用第一個" - -#: remote.c:422 -msgid "more than one uploadpack given, using the first" -msgstr "提供了一個以上的 uploadpack，使用第一個" - -#: remote.c:612 -#, c-format -msgid "Cannot fetch both %s and %s to %s" -msgstr "不能同時取得 %s 和 %s 至 %s" - -#: remote.c:616 -#, c-format -msgid "%s usually tracks %s, not %s" -msgstr "%s 通常追蹤 %s，而非 %s" - -#: remote.c:620 -#, c-format -msgid "%s tracks both %s and %s" -msgstr "%s 同時追蹤 %s 和 %s" - -#: remote.c:688 -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "模式的鍵 '%s' 沒有 '*'" - -#: remote.c:698 -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "模式的值 '%s' 沒有 '*'" - -#: remote.c:1004 -#, c-format -msgid "src refspec %s does not match any" -msgstr "源引用表達式 %s 沒有符合" - -#: remote.c:1009 -#, c-format -msgid "src refspec %s matches more than one" -msgstr "源引用表達式 %s 符合超過一個" - -#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push -#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is -#. the <src>. -#. -#: remote.c:1024 -#, c-format -msgid "" -"The destination you provided is not a full refname (i.e.,\n" -"starting with \"refs/\"). We tried to guess what you meant by:\n" -"\n" -"- Looking for a ref that matches '%s' on the remote side.\n" -"- Checking if the <src> being pushed ('%s')\n" -" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" -" refs/{heads,tags}/ prefix on the remote side.\n" -"\n" -"Neither worked, so we gave up. You must fully qualify the ref." -msgstr "" -"您提供的目標不是一個完整的引用名稱（即以 \"refs/\" 開頭）。我們\n" -"試著猜測您的想法：\n" -"\n" -"- 在遠端查詢和 '%s' 符合的引用。\n" -"- 檢查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n" -" 引用。如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n" -"\n" -"都不行，所以我們已放棄。您必須給出完整的引用。" - -#: remote.c:1044 -#, c-format -msgid "" -"The <src> part of the refspec is a commit object.\n" -"Did you mean to create a new branch by pushing to\n" -"'%s:refs/heads/%s'?" -msgstr "" -"引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n" -"'%s:refs/heads/%s' 推送嗎？" - -#: remote.c:1049 -#, c-format -msgid "" -"The <src> part of the refspec is a tag object.\n" -"Did you mean to create a new tag by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n" -"'%s:refs/tags/%s' 推送嗎？" - -#: remote.c:1054 -#, c-format -msgid "" -"The <src> part of the refspec is a tree object.\n" -"Did you mean to tag a new tree by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n" -"'%s:refs/tags/%s' 推送嗎？" - -#: remote.c:1059 -#, c-format -msgid "" -"The <src> part of the refspec is a blob object.\n" -"Did you mean to tag a new blob by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n" -"'%s:refs/tags/%s' 推送嗎？" - -#: remote.c:1095 -#, c-format -msgid "%s cannot be resolved to branch" -msgstr "%s 無法被解析為分支" - -#: remote.c:1106 -#, c-format -msgid "unable to delete '%s': remote ref does not exist" -msgstr "無法刪除 '%s'：遠端引用不存在" - -#: remote.c:1118 -#, c-format -msgid "dst refspec %s matches more than one" -msgstr "目標引用表達式 %s 符合超過一個" - -#: remote.c:1125 -#, c-format -msgid "dst ref %s receives from more than one src" -msgstr "目標引用 %s 接收超過一個源" - -#: remote.c:1628 remote.c:1729 -msgid "HEAD does not point to a branch" -msgstr "HEAD 沒有指向一個分支" - -#: remote.c:1637 -#, c-format -msgid "no such branch: '%s'" -msgstr "沒有此分支：'%s'" - -#: remote.c:1640 -#, c-format -msgid "no upstream configured for branch '%s'" -msgstr "尚未給分支 '%s' 設定上游" - -#: remote.c:1646 -#, c-format -msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支" - -#: remote.c:1661 -#, c-format -msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支" - -#: remote.c:1673 -#, c-format -msgid "branch '%s' has no remote for pushing" -msgstr "分支 '%s' 沒有設定要推送的遠端伺服器" - -#: remote.c:1683 -#, c-format -msgid "push refspecs for '%s' do not include '%s'" -msgstr "向 '%s' 推送引用規格未包含 '%s'" - -#: remote.c:1696 -msgid "push has no destination (push.default is 'nothing')" -msgstr "推送無目標（push.default 是 'nothing'）" - -#: remote.c:1718 -msgid "cannot resolve 'simple' push to a single destination" -msgstr "無法解析 'simple' 推送至一個單獨的目標" - -#: remote.c:1844 -#, c-format -msgid "couldn't find remote ref %s" -msgstr "無法找到遠端引用 %s" - -#: remote.c:1857 -#, c-format -msgid "* Ignoring funny ref '%s' locally" -msgstr "* 在本機忽略可笑的引用 '%s'" - -#: remote.c:2020 -#, c-format -msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n" - -#: remote.c:2024 -msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n" - -#: remote.c:2027 -#, c-format -msgid "Your branch is up to date with '%s'.\n" -msgstr "您的分支與上游分支 '%s' 一致。\n" - -#: remote.c:2031 -#, c-format -msgid "Your branch and '%s' refer to different commits.\n" -msgstr "您的分支和 '%s' 指向不同的提交。\n" - -#: remote.c:2034 -#, c-format -msgid " (use \"%s\" for details)\n" -msgstr " （使用 \"%s\" 檢視詳情）\n" - -#: remote.c:2038 -#, c-format -msgid "Your branch is ahead of '%s' by %d commit.\n" -msgid_plural "Your branch is ahead of '%s' by %d commits.\n" -msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n" - -#: remote.c:2044 -msgid " (use \"git push\" to publish your local commits)\n" -msgstr " （使用 \"git push\" 來發布您的本機提交）\n" - -#: remote.c:2047 -#, c-format -msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "" -"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n" - -# 譯者：請維持前導空格 -#: remote.c:2055 -msgid " (use \"git pull\" to update your local branch)\n" -msgstr " （使用 \"git pull\" 來更新您的本機分支）\n" - -#: remote.c:2058 -#, c-format -msgid "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commit each, respectively.\n" -msgid_plural "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commits each, respectively.\n" -msgstr[0] "" -"您的分支和 '%s' 出現了偏離，\n" -"並且分別有 %d 和 %d 處不同的提交。\n" - -# 譯者：請維持前導空格 -#: remote.c:2068 -msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " （使用 \"git pull\" 來合併遠端分支）\n" - -#: remote.c:2251 -#, c-format -msgid "cannot parse expected object name '%s'" -msgstr "無法解析期望的物件名 '%s'" - -#: replace-object.c:21 -#, c-format -msgid "bad replace ref name: %s" -msgstr "錯誤的取代引用名稱：%s" - -#: replace-object.c:30 -#, c-format -msgid "duplicate replace ref: %s" -msgstr "重複的取代引用：%s" - -#: replace-object.c:82 -#, c-format -msgid "replace depth too high for object %s" -msgstr "物件 %s 的取代層級太深" - -#: rerere.c:217 rerere.c:226 rerere.c:229 -msgid "corrupt MERGE_RR" -msgstr "損壞的 MERGE_RR" - -#: rerere.c:264 rerere.c:269 -msgid "unable to write rerere record" -msgstr "無法寫入 rerere 記錄" - -#: rerere.c:495 -#, c-format -msgid "there were errors while writing '%s' (%s)" -msgstr "寫入 '%s' (%s) 時發生錯誤" - -#: rerere.c:498 -#, c-format -msgid "failed to flush '%s'" -msgstr "重新整理 '%s' 失敗" - -#: rerere.c:503 rerere.c:1039 -#, c-format -msgid "could not parse conflict hunks in '%s'" -msgstr "不能解析 '%s' 中的衝突塊" - -#: rerere.c:684 -#, c-format -msgid "failed utime() on '%s'" -msgstr "在 '%s' 上呼叫 utime() 失敗" - -#: rerere.c:694 -#, c-format -msgid "writing '%s' failed" -msgstr "寫入 '%s' 失敗" - -#: rerere.c:714 -#, c-format -msgid "Staged '%s' using previous resolution." -msgstr "使用之前的解決方案暫存 '%s'。" - -#: rerere.c:753 -#, c-format -msgid "Recorded resolution for '%s'." -msgstr "已記錄 '%s' 的解決方案。" - -#: rerere.c:788 -#, c-format -msgid "Resolved '%s' using previous resolution." -msgstr "使用之前的解決方案解決 '%s'。" - -#: rerere.c:803 -#, c-format -msgid "cannot unlink stray '%s'" -msgstr "不能刪除 stray '%s'" - -#: rerere.c:807 -#, c-format -msgid "Recorded preimage for '%s'" -msgstr "為 '%s' 記錄 preimage" - -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 -#, c-format -msgid "could not create directory '%s'" -msgstr "不能建立目錄 '%s'" - -#: rerere.c:1057 -#, c-format -msgid "failed to update conflicted state in '%s'" -msgstr "更新 '%s' 中的衝突狀態失敗" - -#: rerere.c:1068 rerere.c:1075 -#, c-format -msgid "no remembered resolution for '%s'" -msgstr "沒有為 '%s' 記憶的解決方案" - -#: rerere.c:1077 -#, c-format -msgid "cannot unlink '%s'" -msgstr "不能刪除 '%s'" - -#: rerere.c:1087 -#, c-format -msgid "Updated preimage for '%s'" -msgstr "已為 '%s' 更新 preimage" - -#: rerere.c:1096 -#, c-format -msgid "Forgot resolution for '%s'\n" -msgstr "忘記 '%s' 的解決方案\n" - -#: rerere.c:1199 -msgid "unable to open rr-cache directory" -msgstr "不能開啟 rr-cache 目錄" - -#: revision.c:2497 -msgid "your current branch appears to be broken" -msgstr "您的目前分支好像被損壞" - -#: revision.c:2500 -#, c-format -msgid "your current branch '%s' does not have any commits yet" -msgstr "您的目前分支 '%s' 尚無任何提交" - -#: revision.c:2708 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent 與 --bisect 不相容" - -#: revision.c:2712 -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" - -#: run-command.c:763 -msgid "open /dev/null failed" -msgstr "不能開啟 /dev/null" - -#: run-command.c:1269 -#, c-format -msgid "cannot create async thread: %s" -msgstr "不能建立 async 執行緒：%s" - -#: run-command.c:1333 -#, c-format -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 "" -"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" -"設定 `git config advice.ignoredHook false` 來關閉這條警告。" - -#: send-pack.c:144 -msgid "unexpected flush packet while reading remote unpack status" -msgstr "讀取遠端解包狀態時收到意外的 flush 包" - -#: send-pack.c:146 -#, c-format -msgid "unable to parse remote unpack status: %s" -msgstr "不能解析遠端解包狀態：%s" - -#: send-pack.c:148 -#, c-format -msgid "remote unpack failed: %s" -msgstr "遠端解包失敗：%s" - -#: send-pack.c:309 -msgid "failed to sign the push certificate" -msgstr "為推送證書籤名失敗" - -#: send-pack.c:423 -msgid "the receiving end does not support --signed push" -msgstr "接收端不支援簽名推送" - -#: send-pack.c:425 -msgid "" -"not sending a push certificate since the receiving end does not support --" -"signed push" -msgstr "未傳送推送證書，因為接收端不支援簽名推送" - -#: send-pack.c:437 -msgid "the receiving end does not support --atomic push" -msgstr "接收端不支援原子推送" - -#: send-pack.c:442 -msgid "the receiving end does not support push options" -msgstr "接收端不支援推送選項" - -#: sequencer.c:191 -#, c-format -msgid "invalid commit message cleanup mode '%s'" -msgstr "無效的提交訊息清理模式 '%s'" - -#: sequencer.c:296 -#, c-format -msgid "could not delete '%s'" -msgstr "無法刪除 '%s'" - -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 -#, c-format -msgid "could not remove '%s'" -msgstr "無法刪除 '%s'" - -#: sequencer.c:325 -msgid "revert" -msgstr "還原" - -#: sequencer.c:327 -msgid "cherry-pick" -msgstr "揀選" - -#: sequencer.c:329 -msgid "rebase" -msgstr "rebase" - -#: sequencer.c:331 -#, c-format -msgid "unknown action: %d" -msgstr "未知動作：%d" - -#: sequencer.c:389 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'" -msgstr "" -"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" -"指令標記修正後的檔案" - -#: sequencer.c:392 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'\n" -"and commit the result with 'git commit'" -msgstr "" -"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" -"對修正後的檔案做標記，然後用 'git commit' 提交" - -#: sequencer.c:405 sequencer.c:2901 -#, c-format -msgid "could not lock '%s'" -msgstr "不能鎖定 '%s'" - -#: sequencer.c:412 -#, c-format -msgid "could not write eol to '%s'" -msgstr "不能將換行符號寫入 '%s'" - -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 -#: sequencer.c:3185 -#, c-format -msgid "failed to finalize '%s'" -msgstr "無法完成 '%s'" - -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 -#: builtin/rebase.c:593 -#, c-format -msgid "could not read '%s'" -msgstr "不能讀取 '%s'" - -#: sequencer.c:466 -#, c-format -msgid "your local changes would be overwritten by %s." -msgstr "您的本機修改將被%s覆蓋。" - -#: sequencer.c:470 -msgid "commit your changes or stash them to proceed." -msgstr "提交您的修改或儲藏後再繼續。" - -#: sequencer.c:502 -#, c-format -msgid "%s: fast-forward" -msgstr "%s：快轉" - -#: sequencer.c:541 builtin/tag.c:565 -#, c-format -msgid "Invalid cleanup mode %s" -msgstr "無效的清理模式 %s" - -#. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". -#. -#: sequencer.c:635 -#, c-format -msgid "%s: Unable to write new index file" -msgstr "%s：無法寫入新索引檔案" - -#: sequencer.c:652 -msgid "unable to update cache tree" -msgstr "不能更新快取樹" - -#: sequencer.c:666 -msgid "could not resolve HEAD commit" -msgstr "不能解析 HEAD 提交" - -#: sequencer.c:746 -#, c-format -msgid "no key present in '%.*s'" -msgstr "在 '%.*s' 中沒有 key" - -#: sequencer.c:757 -#, c-format -msgid "unable to dequote value of '%s'" -msgstr "無法為 '%s' 的值去引號" - -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 -#, c-format -msgid "could not open '%s' for reading" -msgstr "無法開啟 '%s' 進行讀取" - -#: sequencer.c:804 -msgid "'GIT_AUTHOR_NAME' already given" -msgstr "已經給出 'GIT_AUTHOR_NAME'" - -#: sequencer.c:809 -msgid "'GIT_AUTHOR_EMAIL' already given" -msgstr "已經給出 'GIT_AUTHOR_EMAIL'" - -#: sequencer.c:814 -msgid "'GIT_AUTHOR_DATE' already given" -msgstr "已經給出 'GIT_AUTHOR_DATE'" - -#: sequencer.c:818 -#, c-format -msgid "unknown variable '%s'" -msgstr "未知變數 '%s'" - -#: sequencer.c:823 -msgid "missing 'GIT_AUTHOR_NAME'" -msgstr "缺少 'GIT_AUTHOR_NAME'" - -#: sequencer.c:825 -msgid "missing 'GIT_AUTHOR_EMAIL'" -msgstr "缺少 'GIT_AUTHOR_EMAIL'" - -#: sequencer.c:827 -msgid "missing 'GIT_AUTHOR_DATE'" -msgstr "缺少 'GIT_AUTHOR_DATE'" - -#: sequencer.c:876 -#, c-format -msgid "" -"you have staged changes in your working tree\n" -"If these changes are meant to be squashed into the previous commit, run:\n" -"\n" -" git commit --amend %s\n" -"\n" -"If they are meant to go into a new commit, run:\n" -"\n" -" git commit %s\n" -"\n" -"In both cases, once you're done, continue with:\n" -"\n" -" git rebase --continue\n" -msgstr "" -"您的工作區中存在已暫存的修改\n" -"如果這些修改需要被併入前一個提交，執行：\n" -"\n" -" git commit --amend %s\n" -"\n" -"如果這些修改要形成一個新提交，執行：\n" -"\n" -" git commit %s\n" -"\n" -"無論哪種情況，當您完成提交，繼續執行：\n" -"\n" -" git rebase --continue\n" - -#: sequencer.c:1148 -msgid "'prepare-commit-msg' hook failed" -msgstr "'prepare-commit-msg' 掛鉤失敗" - -#: sequencer.c:1154 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n" -"與否。您可以對其進行設定以免再出現本提示訊息。執行如下指令在編輯器\n" -"中編輯您的設定檔案：\n" -"\n" -" git config --global --edit\n" -"\n" -"設定完畢後，您可以用下面的指令來修正本次提交所使用的使用者身份：\n" -"\n" -" git commit --amend --reset-author\n" - -#: sequencer.c:1167 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n" -"與否。您可以對其進行設定以免再出現本提示訊息：\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"設定完畢後，您可以用下面的指令來修正本次提交所使用的使用者身份：\n" -"\n" -" git commit --amend --reset-author\n" - -#: sequencer.c:1209 -msgid "couldn't look up newly created commit" -msgstr "無法找到新建立的提交" - -#: sequencer.c:1211 -msgid "could not parse newly created commit" -msgstr "不能解析新建立的提交" - -#: sequencer.c:1257 -msgid "unable to resolve HEAD after creating commit" -msgstr "建立提交後，不能解析 HEAD" - -#: sequencer.c:1259 -msgid "detached HEAD" -msgstr "分離開頭指標" - -# 譯者：中文字串拼接，可刪除前導空格 -#: sequencer.c:1263 -msgid " (root-commit)" -msgstr " (根提交)" - -#: sequencer.c:1284 -msgid "could not parse HEAD" -msgstr "不能解析 HEAD" - -#: sequencer.c:1286 -#, c-format -msgid "HEAD %s is not a commit!" -msgstr "HEAD %s 不是一個提交！" - -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 -msgid "could not parse HEAD commit" -msgstr "不能解析 HEAD 提交" - -#: sequencer.c:1342 sequencer.c:1968 -msgid "unable to parse commit author" -msgstr "不能解析提交作者" - -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree 無法寫入樹狀物件" - -#: sequencer.c:1386 sequencer.c:1447 -#, c-format -msgid "unable to read commit message from '%s'" -msgstr "不能從 '%s' 讀取提交說明" - -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 -#: builtin/merge.c:911 -msgid "failed to write commit object" -msgstr "寫提交物件失敗" - -#: sequencer.c:1474 -#, c-format -msgid "could not parse commit %s" -msgstr "不能解析提交 %s" - -#: sequencer.c:1479 -#, c-format -msgid "could not parse parent commit %s" -msgstr "不能解析父提交 %s" - -#: sequencer.c:1562 sequencer.c:1673 -#, c-format -msgid "unknown command: %d" -msgstr "未知指令：%d" - -#: sequencer.c:1620 sequencer.c:1645 -#, c-format -msgid "This is a combination of %d commits." -msgstr "這是一個 %d 個提交的組合。" - -#: sequencer.c:1630 -msgid "need a HEAD to fixup" -msgstr "需要一個 HEAD 來修復" - -#: sequencer.c:1632 sequencer.c:3212 -msgid "could not read HEAD" -msgstr "不能讀取 HEAD" - -#: sequencer.c:1634 -msgid "could not read HEAD's commit message" -msgstr "不能讀取 HEAD 的提交說明" - -#: sequencer.c:1640 -#, c-format -msgid "cannot write '%s'" -msgstr "不能寫 '%s'" - -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 -msgid "This is the 1st commit message:" -msgstr "這是第一個提交說明：" - -#: sequencer.c:1655 -#, c-format -msgid "could not read commit message of %s" -msgstr "不能讀取 %s 的提交說明" - -#: sequencer.c:1662 -#, c-format -msgid "This is the commit message #%d:" -msgstr "這是提交說明 #%d：" - -#: sequencer.c:1668 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "提交說明 #%d 將被跳過：" - -#: sequencer.c:1756 -msgid "your index file is unmerged." -msgstr "您的索引檔案未完成合併。" - -#: sequencer.c:1763 -msgid "cannot fixup root commit" -msgstr "不能修復根提交" - -#: sequencer.c:1782 -#, c-format -msgid "commit %s is a merge but no -m option was given." -msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" - -#: sequencer.c:1790 sequencer.c:1798 -#, c-format -msgid "commit %s does not have parent %d" -msgstr "提交 %s 沒有第 %d 個父提交" - -#: sequencer.c:1804 -#, c-format -msgid "cannot get commit message for %s" -msgstr "不能得到 %s 的提交說明" - -#. TRANSLATORS: The first %s will be a "todo" command like -#. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1823 -#, c-format -msgid "%s: cannot parse parent commit %s" -msgstr "%s：不能解析父提交 %s" - -#: sequencer.c:1888 -#, c-format -msgid "could not rename '%s' to '%s'" -msgstr "不能將 '%s' 重新命名為 '%s'" - -#: sequencer.c:1943 -#, c-format -msgid "could not revert %s... %s" -msgstr "不能還原 %s... %s" - -#: sequencer.c:1944 -#, c-format -msgid "could not apply %s... %s" -msgstr "不能應用 %s... %s" - -#: sequencer.c:1961 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n" - -#: sequencer.c:2018 -#, c-format -msgid "git %s: failed to read the index" -msgstr "git %s：無法讀取索引" - -#: sequencer.c:2025 -#, c-format -msgid "git %s: failed to refresh the index" -msgstr "git %s：無法重新整理索引" - -#: sequencer.c:2102 -#, c-format -msgid "%s does not accept arguments: '%s'" -msgstr "%s 不接受參數：'%s'" - -#: sequencer.c:2111 -#, c-format -msgid "missing arguments for %s" -msgstr "缺少 %s 的參數" - -#: sequencer.c:2142 -#, c-format -msgid "could not parse '%s'" -msgstr "無法解析 '%s'" - -#: sequencer.c:2203 -#, c-format -msgid "invalid line %d: %.*s" -msgstr "無效行 %d：%.*s" - -#: sequencer.c:2214 -#, c-format -msgid "cannot '%s' without a previous commit" -msgstr "沒有父提交的情況下不能 '%s'" - -#: sequencer.c:2298 -msgid "cancelling a cherry picking in progress" -msgstr "正在取消一個進行中的揀選" - -#: sequencer.c:2305 -msgid "cancelling a revert in progress" -msgstr "正在取消一個進行中的還原" - -#: sequencer.c:2349 -msgid "please fix this using 'git rebase --edit-todo'." -msgstr "請用 'git rebase --edit-todo' 來修改。" - -#: sequencer.c:2351 -#, c-format -msgid "unusable instruction sheet: '%s'" -msgstr "不可用的指令清單：'%s'" - -#: sequencer.c:2356 -msgid "no commits parsed." -msgstr "沒有解析提交。" - -#: sequencer.c:2367 -msgid "cannot cherry-pick during a revert." -msgstr "不能在還原提交中執行揀選。" - -#: sequencer.c:2369 -msgid "cannot revert during a cherry-pick." -msgstr "不能在揀選中執行還原提交。" - -#: sequencer.c:2447 -#, c-format -msgid "invalid value for %s: %s" -msgstr "%s 的值無效：%s" - -#: sequencer.c:2540 -msgid "unusable squash-onto" -msgstr "不可用的 squash-onto" - -#: sequencer.c:2556 -#, c-format -msgid "malformed options sheet: '%s'" -msgstr "格式錯誤的選項清單：'%s'" - -#: sequencer.c:2644 sequencer.c:4361 -msgid "empty commit set passed" -msgstr "提供了空的提交集" - -#: sequencer.c:2660 -msgid "revert is already in progress" -msgstr "一個還原動作已在進行" - -#: sequencer.c:2662 -#, c-format -msgid "try \"git revert (--continue | %s--abort | --quit)\"" -msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" - -#: sequencer.c:2665 -msgid "cherry-pick is already in progress" -msgstr "揀選動作已在進行" - -#: sequencer.c:2667 -#, c-format -msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" -msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" - -#: sequencer.c:2681 -#, c-format -msgid "could not create sequencer directory '%s'" -msgstr "不能建立序列目錄 '%s'" - -#: sequencer.c:2696 -msgid "could not lock HEAD" -msgstr "不能鎖定 HEAD" - -#: sequencer.c:2756 sequencer.c:4099 -msgid "no cherry-pick or revert in progress" -msgstr "揀選或還原動作並未進行" - -#: sequencer.c:2758 sequencer.c:2769 -msgid "cannot resolve HEAD" -msgstr "不能解析 HEAD" - -#: sequencer.c:2760 sequencer.c:2804 -msgid "cannot abort from a branch yet to be born" -msgstr "不能從尚未建立的分支終止" - -#: sequencer.c:2790 builtin/grep.c:724 -#, c-format -msgid "cannot open '%s'" -msgstr "不能開啟 '%s'" - -#: sequencer.c:2792 -#, c-format -msgid "cannot read '%s': %s" -msgstr "不能讀取 '%s'：%s" - -#: sequencer.c:2793 -msgid "unexpected end of file" -msgstr "意外的檔案結束" - -#: sequencer.c:2799 -#, c-format -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" - -#: sequencer.c:2810 -msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" - -#: sequencer.c:2851 -msgid "no revert in progress" -msgstr "沒有正在進行的還原" - -#: sequencer.c:2859 -msgid "no cherry-pick in progress" -msgstr "沒有正在進行的揀選" - -#: sequencer.c:2869 -msgid "failed to skip the commit" -msgstr "無法跳過這個提交" - -#: sequencer.c:2876 -msgid "there is nothing to skip" -msgstr "沒有要跳過的" - -#: sequencer.c:2879 -#, c-format -msgid "" -"have you committed already?\n" -"try \"git %s --continue\"" -msgstr "" -"您已經提交了嗎？\n" -"試試 \"git %s --continue\"" - -#: sequencer.c:3003 sequencer.c:4011 -#, c-format -msgid "could not update %s" -msgstr "不能更新 %s" - -#: sequencer.c:3042 sequencer.c:3991 -msgid "cannot read HEAD" -msgstr "不能讀取 HEAD" - -#: sequencer.c:3059 -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "無法複製 '%s' 至 '%s'" - -#: sequencer.c:3067 -#, c-format -msgid "" -"You can amend the commit now, with\n" -"\n" -" git commit --amend %s\n" -"\n" -"Once you are satisfied with your changes, run\n" -"\n" -" git rebase --continue\n" -msgstr "" -"您現在可以修補這個提交，使用\n" -"\n" -" git commit --amend %s\n" -"\n" -"當您對變更感到滿意，執行\n" -"\n" -" git rebase --continue\n" - -#: sequencer.c:3077 -#, c-format -msgid "Could not apply %s... %.*s" -msgstr "不能應用 %s... %.*s" - -#: sequencer.c:3084 -#, c-format -msgid "Could not merge %.*s" -msgstr "不能合併 %.*s" - -#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 -#, c-format -msgid "could not copy '%s' to '%s'" -msgstr "不能複製 '%s' 至 '%s'" - -# 譯者：請維持前導空格 -#: sequencer.c:3129 -#, c-format -msgid "" -"execution failed: %s\n" -"%sYou can fix the problem, and then run\n" -"\n" -" git rebase --continue\n" -"\n" -msgstr "" -"執行失敗：%s\n" -"%s您可以改正該問題，然後執行\n" -"\n" -" git rebase --continue\n" -"\n" - -#: sequencer.c:3135 -msgid "and made changes to the index and/or the working tree\n" -msgstr "並且修改索引和/或工作區\n" - -#: sequencer.c:3141 -#, c-format -msgid "" -"execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" -"Commit or stash your changes, and then run\n" -"\n" -" git rebase --continue\n" -"\n" -msgstr "" -"執行成功：%s\n" -"但是在索引和/或工作區中存在變更\n" -"提交或儲藏修改，然後執行\n" -"\n" -" git rebase --continue\n" -"\n" - -#: sequencer.c:3202 -#, c-format -msgid "illegal label name: '%.*s'" -msgstr "非法的標籤名稱：'%.*s'" - -#: sequencer.c:3256 -msgid "writing fake root commit" -msgstr "寫偽根提交" - -#: sequencer.c:3261 -msgid "writing squash-onto" -msgstr "寫入 squash-onto" - -#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 -#, c-format -msgid "failed to find tree of %s" -msgstr "無法找到 %s 指向的樹。" - -#: sequencer.c:3344 -#, c-format -msgid "could not resolve '%s'" -msgstr "無法解析 '%s'" - -#: sequencer.c:3375 -msgid "cannot merge without a current revision" -msgstr "沒有目前版本不能合併" - -#: sequencer.c:3397 -#, c-format -msgid "unable to parse '%.*s'" -msgstr "無法解析 '%.*s'" - -#: sequencer.c:3406 -#, c-format -msgid "nothing to merge: '%.*s'" -msgstr "無可用合併：'%.*s'" - -#: sequencer.c:3418 -msgid "octopus merge cannot be executed on top of a [new root]" -msgstr "章魚合並不能在一個新的根提交上執行" - -#: sequencer.c:3434 -#, c-format -msgid "could not get commit message of '%s'" -msgstr "不能取得 '%s' 的提交說明" - -#: sequencer.c:3594 -#, c-format -msgid "could not even attempt to merge '%.*s'" -msgstr "甚至不能嘗試合併 '%.*s'" - -#: sequencer.c:3610 -msgid "merge: Unable to write new index file" -msgstr "合併：無法寫入新索引檔案" - -#: sequencer.c:3679 builtin/rebase.c:737 -#, c-format -msgid "Applied autostash.\n" -msgstr "已應用 autostash。\n" - -#: sequencer.c:3691 -#, c-format -msgid "cannot store %s" -msgstr "不能儲存 %s" - -#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 -#, c-format -msgid "" -"Applying autostash resulted in conflicts.\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "" -"應用 autostash 導致衝突。\n" -"您的修改安全地儲存在儲藏區中。\n" -"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" - -#: sequencer.c:3755 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s：不是一個有效的物件 ID" - -#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 -msgid "could not detach HEAD" -msgstr "不能分離開頭指標" - -#: sequencer.c:3775 -#, c-format -msgid "Stopped at HEAD\n" -msgstr "停止在 HEAD\n" - -#: sequencer.c:3777 -#, c-format -msgid "Stopped at %s\n" -msgstr "停止在 %s\n" - -#: sequencer.c:3785 -#, c-format -msgid "" -"Could not execute the todo command\n" -"\n" -" %.*s\n" -"It has been rescheduled; To edit the command before continuing, please\n" -"edit the todo list first:\n" -"\n" -" git rebase --edit-todo\n" -" git rebase --continue\n" -msgstr "" -"無法執行待辦指令\n" -"\n" -" %.*s\n" -"已被重新安排，在繼續之前編輯指令，請先編輯待辦列表：\n" -"\n" -" git rebase --edit-todo\n" -" git rebase --continue\n" - -#: sequencer.c:3869 -#, c-format -msgid "Stopped at %s... %.*s\n" -msgstr "停止在 %s... %.*s\n" - -#: sequencer.c:3940 -#, c-format -msgid "unknown command %d" -msgstr "未知指令 %d" - -#: sequencer.c:3999 -msgid "could not read orig-head" -msgstr "不能讀取 orig-head" - -#: sequencer.c:4004 -msgid "could not read 'onto'" -msgstr "不能讀取 'onto'" - -#: sequencer.c:4018 -#, c-format -msgid "could not update HEAD to %s" -msgstr "不能更新 HEAD 為 %s" - -#: sequencer.c:4111 -msgid "cannot rebase: You have unstaged changes." -msgstr "不能重定基底：您有未暫存的變更。" - -#: sequencer.c:4120 -msgid "cannot amend non-existing commit" -msgstr "不能修補不存在的提交" - -#: sequencer.c:4122 -#, c-format -msgid "invalid file: '%s'" -msgstr "無效檔案：'%s'" - -#: sequencer.c:4124 -#, c-format -msgid "invalid contents: '%s'" -msgstr "無效內容：'%s'" - -#: sequencer.c:4127 -msgid "" -"\n" -"You have uncommitted changes in your working tree. Please, commit them\n" -"first and then run 'git rebase --continue' again." -msgstr "" -"\n" -"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" - -#: sequencer.c:4163 sequencer.c:4202 -#, c-format -msgid "could not write file: '%s'" -msgstr "不能寫入檔案：'%s'" - -#: sequencer.c:4217 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "不能刪除 CHERRY_PICK_HEAD" - -#: sequencer.c:4224 -msgid "could not commit staged changes." -msgstr "不能提交暫存的修改。" - -#: sequencer.c:4338 -#, c-format -msgid "%s: can't cherry-pick a %s" -msgstr "%s：不能揀選一個%s" - -#: sequencer.c:4342 -#, c-format -msgid "%s: bad revision" -msgstr "%s：錯誤的版本" - -#: sequencer.c:4377 -msgid "can't revert as initial commit" -msgstr "不能作為初始提交還原提交" - -#: sequencer.c:4846 -msgid "make_script: unhandled options" -msgstr "make_script：有未能處理的選項" - -#: sequencer.c:4849 -msgid "make_script: error preparing revisions" -msgstr "make_script：準備版本時錯誤" - -#: sequencer.c:5083 sequencer.c:5100 -msgid "nothing to do" -msgstr "無事可做" - -#: sequencer.c:5119 -msgid "could not skip unnecessary pick commands" -msgstr "無法跳過不必要的揀選" - -#: sequencer.c:5213 -msgid "the script was already rearranged." -msgstr "腳本已經重新編排。" - -#: setup.c:124 -#, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s' 在位於 '%s' 的版本庫之外" - -#: setup.c:175 -#, c-format -msgid "" -"%s: no such path in the working tree.\n" -"Use 'git <command> -- <path>...' to specify paths that do not exist locally." -msgstr "" -"%s：工作區中無此路徑。\n" -"使用指令 'git <指令> -- <路徑>...' 來指定本機不存在的路徑。" - -#: setup.c:188 -#, c-format -msgid "" -"ambiguous argument '%s': unknown revision or path not in the working tree.\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git <command> [<revision>...] -- [<file>...]'" -msgstr "" -"有歧義的參數 '%s'：未知的版本或路徑不存在於工作區中。\n" -"使用 '--' 來分隔版本和路徑，例如：\n" -"'git <指令> [<版本>...] -- [<檔案>...]'" - -#: setup.c:254 -#, c-format -msgid "option '%s' must come before non-option arguments" -msgstr "選項 '%s' 必須在其他非選項參數之前" - -#: setup.c:273 -#, c-format -msgid "" -"ambiguous argument '%s': both revision and filename\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git <command> [<revision>...] -- [<file>...]'" -msgstr "" -"有歧義的參數 '%s'：可同時是版本和檔案\n" -"使用 '--' 來分隔版本和路徑，例如：\n" -"'git <指令> [<版本>...] -- [<檔案>...]'" - -#: setup.c:409 -msgid "unable to set up work tree using invalid config" -msgstr "無法使用無效設定來建立工作區" - -#: setup.c:413 -msgid "this operation must be run in a work tree" -msgstr "該動作必須在一個工作區中執行" - -#: setup.c:559 -#, c-format -msgid "Expected git repo version <= %d, found %d" -msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" - -#: setup.c:567 -msgid "unknown repository extensions found:" -msgstr "發現未知的版本庫擴展：" - -#: setup.c:586 -#, c-format -msgid "error opening '%s'" -msgstr "開啟 '%s' 發生錯誤" - -#: setup.c:588 -#, c-format -msgid "too large to be a .git file: '%s'" -msgstr "檔案太大，無法作為 .git 檔案：'%s'" - -#: setup.c:590 -#, c-format -msgid "error reading %s" -msgstr "讀取 %s 發生錯誤" - -#: setup.c:592 -#, c-format -msgid "invalid gitfile format: %s" -msgstr "無效的 gitfile 格式：%s" - -#: setup.c:594 -#, c-format -msgid "no path in gitfile: %s" -msgstr "在 gitfile 中沒有路徑：%s" - -#: setup.c:596 -#, c-format -msgid "not a git repository: %s" -msgstr "不是一個 git 版本庫：%s" - -#: setup.c:695 -#, c-format -msgid "'$%s' too big" -msgstr "'$%s' 太大" - -#: setup.c:709 -#, c-format -msgid "not a git repository: '%s'" -msgstr "不是一個 git 版本庫：'%s'" - -#: setup.c:738 setup.c:740 setup.c:771 -#, c-format -msgid "cannot chdir to '%s'" -msgstr "不能切換目錄到 '%s'" - -#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 -msgid "cannot come back to cwd" -msgstr "無法返回目前工作目錄" - -#: setup.c:870 -#, c-format -msgid "failed to stat '%*s%s%s'" -msgstr "取得 '%*s%s%s' 狀態（stat）失敗" - -#: setup.c:1108 -msgid "Unable to read current working directory" -msgstr "不能讀取目前工作目錄" - -#: setup.c:1117 setup.c:1123 -#, c-format -msgid "cannot change to '%s'" -msgstr "不能切換到 '%s'" - -#: setup.c:1128 -#, c-format -msgid "not a git repository (or any of the parent directories): %s" -msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" - -#: setup.c:1134 -#, c-format -msgid "" -"not a git repository (or any parent up to mount point %s)\n" -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." -msgstr "" -"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" -"停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" - -#: setup.c:1245 -#, c-format -msgid "" -"problem with core.sharedRepository filemode value (0%.3o).\n" -"The owner of files must always have read and write permissions." -msgstr "" -"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" -"檔案所有者必須始終擁有讀寫權限。" - -#: setup.c:1289 -msgid "open /dev/null or dup failed" -msgstr "不能開啟或者複製 /dev/null" - -#: setup.c:1304 -msgid "fork failed" -msgstr "fork 失敗" - -#: setup.c:1309 -msgid "setsid failed" -msgstr "setsid 失敗" - -#: sha1-file.c:452 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" - -#: sha1-file.c:503 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "無法規範化備用物件路徑：%s" - -#: sha1-file.c:575 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s：忽略備用物件庫，嵌套太深" - -#: sha1-file.c:582 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "無法規範化物件目錄: %s" - -#: sha1-file.c:625 -msgid "unable to fdopen alternates lockfile" -msgstr "無法 fdopen 取代鎖檔案" - -#: sha1-file.c:643 -msgid "unable to read alternates file" -msgstr "無法讀取替代檔案" - -#: sha1-file.c:650 -msgid "unable to move new alternates file into place" -msgstr "無法將新的替代檔案移動到位" - -#: sha1-file.c:685 -#, c-format -msgid "path '%s' does not exist" -msgstr "路徑 '%s' 不存在" - -#: sha1-file.c:711 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。" - -#: sha1-file.c:717 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "參考版本庫 '%s' 不是一個本機版本庫。" - -#: sha1-file.c:723 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "參考版本庫 '%s' 是一個淺複製" - -#: sha1-file.c:731 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "參考版本庫 '%s' 已被移植" - -#: sha1-file.c:791 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "解析備用引用時無效的行：%s" - -#: sha1-file.c:943 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" - -#: sha1-file.c:964 -msgid "mmap failed" -msgstr "mmap 失敗" - -#: sha1-file.c:1128 -#, c-format -msgid "object file %s is empty" -msgstr "物件檔案 %s 為空" - -#: sha1-file.c:1263 sha1-file.c:2443 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "損壞的鬆散物件 '%s'" - -#: sha1-file.c:1265 sha1-file.c:2447 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "鬆散物件 '%s' 後面有垃圾資料" - -#: sha1-file.c:1307 -msgid "invalid object type" -msgstr "無效的物件類型" - -#: sha1-file.c:1391 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息" - -#: sha1-file.c:1394 -#, c-format -msgid "unable to unpack %s header" -msgstr "無法解開 %s 頭部" - -#: sha1-file.c:1400 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息" - -#: sha1-file.c:1403 -#, c-format -msgid "unable to parse %s header" -msgstr "無法解析 %s 頭部" - -#: sha1-file.c:1629 -#, c-format -msgid "failed to read object %s" -msgstr "讀取物件 %s 失敗" - -#: sha1-file.c:1633 -#, c-format -msgid "replacement %s not found for %s" -msgstr "找不到 %2$s 的替代 %1$s" - -#: sha1-file.c:1637 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "鬆散物件 %s（儲存在 %s）已損壞" - -#: sha1-file.c:1641 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "打包物件 %s（儲存在 %s）已損壞" - -#: sha1-file.c:1746 -#, c-format -msgid "unable to write file %s" -msgstr "無法寫檔案 %s" - -#: sha1-file.c:1753 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "無法為 '%s' 設定權限" - -#: sha1-file.c:1760 -msgid "file write error" -msgstr "檔案寫錯誤" - -#: sha1-file.c:1780 -msgid "error when closing loose object file" -msgstr "關閉鬆散物件檔案時發生錯誤" - -#: sha1-file.c:1845 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" - -#: sha1-file.c:1847 -msgid "unable to create temporary file" -msgstr "無法建立暫存檔" - -#: sha1-file.c:1871 -msgid "unable to write loose object file" -msgstr "不能寫鬆散物件檔案" - -#: sha1-file.c:1877 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "不能壓縮新物件 %s（%d）" - -#: sha1-file.c:1881 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" - -#: sha1-file.c:1885 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "被 %s 的不穩定物件源資料搞糊塗了" - -#: sha1-file.c:1895 builtin/pack-objects.c:1054 -#, c-format -msgid "failed utime() on %s" -msgstr "在 %s 上呼叫 utime() 失敗" - -#: sha1-file.c:1972 -#, c-format -msgid "cannot read object for %s" -msgstr "不能讀取物件 %s" - -#: sha1-file.c:2011 -msgid "corrupt commit" -msgstr "損壞的提交" - -#: sha1-file.c:2019 -msgid "corrupt tag" -msgstr "損壞的標籤" - -#: sha1-file.c:2119 -#, c-format -msgid "read error while indexing %s" -msgstr "索引 %s 時讀取錯誤" - -#: sha1-file.c:2122 -#, c-format -msgid "short read while indexing %s" -msgstr "索引 %s 時讀入不完整" - -#: sha1-file.c:2195 sha1-file.c:2205 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s：插入資料庫失敗" - -#: sha1-file.c:2211 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s：不支援的檔案類型" - -#: sha1-file.c:2235 -#, c-format -msgid "%s is not a valid object" -msgstr "%s 不是一個有效的物件" - -#: sha1-file.c:2237 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s 不是一個有效的 '%s' 物件" - -#: sha1-file.c:2264 builtin/index-pack.c:155 -#, c-format -msgid "unable to open %s" -msgstr "不能開啟 %s" - -#: sha1-file.c:2454 sha1-file.c:2507 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "%s 的雜湊值不符合（預期 %s）" - -#: sha1-file.c:2478 -#, c-format -msgid "unable to mmap %s" -msgstr "不能 mmap %s" - -#: sha1-file.c:2483 -#, c-format -msgid "unable to unpack header of %s" -msgstr "無法解壓縮 %s 的頭部" - -#: sha1-file.c:2489 -#, c-format -msgid "unable to parse header of %s" -msgstr "無法解析 %s 的頭部" - -#: sha1-file.c:2500 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "無法解壓縮 %s 的內容" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "短 SHA1 %s 存在歧義" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "候選者有：" - -#: sha1-name.c:796 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git 通常不會建立一個以40個十六進位字元結尾的引用，因為當您只提供40\n" -"個十六進位字元時將被忽略。這些引用可能被錯誤地建立。例如：\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"當 \"$br\" 某種原因空白時，一個40位十六進位的引用將被建立。請檢查這些\n" -"引用，可能需要刪除它們。執行 \"git config advice.objectNameWarning\n" -"false\" 指令關閉本消息通知。" - -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "'%.*s' 的日誌只能回到 %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "'%.*s' 的日誌只有 %d 個項目" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"'%s' 路徑存在，但不是 '%s'\n" -"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "'%s' 路徑不存在於 '%.*s'" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"'%s' 路徑在索引，但不在 %d 暫存區\n" -"提示：你在說 ':%d:%s' 嗎？" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"'%s' 路徑在索引，但不是 '%s'\n" -"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "磁碟上存在 '%s' 路徑，但不在索引中" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "相對路徑與法不能用在工作區外" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "'%.*s' 物件名稱無效。" - -#. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:837 -#, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u GiB" - -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:839 -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u GiB/s" - -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:847 -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u MiB" - -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:849 -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u MiB/s" - -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:856 -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u KiB" - -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:858 -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u KiB/s" - -#. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:864 -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u 位元組" - -#. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:866 -#, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u 位元組/秒" - -#: strbuf.c:1164 -#, c-format -msgid "could not edit '%s'" -msgstr "無法編輯 '%s'" - -#: submodule.c:114 submodule.c:143 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "無法修改未合併的 .gitmodules，先解決合併衝突" - -#: submodule.c:118 submodule.c:147 -#, c-format -msgid "Could not find section in .gitmodules where path=%s" -msgstr "無法在 .gitmodules 中找到 path=%s 的小節" - -#: submodule.c:154 -#, c-format -msgid "Could not remove .gitmodules entry for %s" -msgstr "無法移除 %s 的 .gitmodules 條目" - -#: submodule.c:165 -msgid "staging updated .gitmodules failed" -msgstr "將更新後 .gitmodules 新增暫存區失敗" - -#: submodule.c:327 -#, c-format -msgid "in unpopulated submodule '%s'" -msgstr "位於未簽出的子模組 '%s'" - -#: submodule.c:358 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" - -#: submodule.c:434 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "無效 --ignore-submodules 參數：%s" - -#: submodule.c:815 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。跳過。" - -#: submodule.c:910 -#, c-format -msgid "submodule entry '%s' (%s) is a %s, not a commit" -msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" - -#: submodule.c:995 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令" - -#: submodule.c:1118 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "處理 '%s' 子模組失敗" - -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "無法將 HEAD 解析為有效引用。" - -#: submodule.c:1158 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "正在推送 '%s' 子模組\n" - -#: submodule.c:1161 -#, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "無法推送 '%s' 子模組\n" - -#: submodule.c:1453 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "正在抓取 %s%s 子模組\n" - -#: submodule.c:1483 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "無法存取子模組 '%s'\n" - -#: submodule.c:1637 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"抓取子模組時發生錯誤：\n" -"%s" - -#: submodule.c:1662 -#, c-format -msgid "'%s' not recognized as a git repository" -msgstr "無法將 '%s' 識別為一個 git 版本庫" - -#: submodule.c:1679 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" - -#: submodule.c:1720 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" - -#: submodule.c:1800 -#, c-format -msgid "could not start 'git status' in submodule '%s'" -msgstr "無法在子模組 '%s' 中啟動 'git status'" - -#: submodule.c:1813 -#, c-format -msgid "could not run 'git status' in submodule '%s'" -msgstr "無法在子模組 '%s' 中執行 'git status'" - -#: submodule.c:1828 -#, c-format -msgid "Could not unset core.worktree setting in submodule '%s'" -msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" - -#: submodule.c:1855 submodule.c:2165 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "無法遞迴子模組路徑 '%s'" - -#: submodule.c:1876 -msgid "could not reset submodule index" -msgstr "無法重設子模組的索引" - -#: submodule.c:1918 -#, c-format -msgid "submodule '%s' has dirty index" -msgstr "子模組 '%s' 中有髒索引" - -#: submodule.c:1970 -#, c-format -msgid "Submodule '%s' could not be updated." -msgstr "子模組 '%s' 無法被更新。" - -#: submodule.c:2038 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" - -#: submodule.c:2059 -#, c-format -msgid "" -"relocate_gitdir for submodule '%s' with more than one worktree not supported" -msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" - -#: submodule.c:2071 submodule.c:2130 -#, c-format -msgid "could not lookup name for submodule '%s'" -msgstr "不能查詢子模組 '%s' 的名稱" - -#: submodule.c:2075 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "拒絕移動「%s」至現存 git 目錄" - -#: submodule.c:2082 -#, c-format -msgid "" -"Migrating git directory of '%s%s' from\n" -"'%s' to\n" -"'%s'\n" -msgstr "" -"將 '%s%s' 的 git 目錄從\n" -"'%s' 遷移至\n" -"'%s'\n" - -#: submodule.c:2209 -msgid "could not start ls-files in .." -msgstr "無法在 .. 中啟動 ls-files" - -#: submodule.c:2248 -#, c-format -msgid "ls-tree returned unexpected return code %d" -msgstr "ls-tree 返回未知返回值 %d" - -#: submodule-config.c:236 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "忽略可疑的子模組名稱：%s" - -#: submodule-config.c:303 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "submodule.fetchjobs 不允許為負值" - -#: submodule-config.c:401 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "忽略可能被解析為指令列選項的 '%s'：%s" - -#: submodule-config.c:498 -#, c-format -msgid "invalid value for %s" -msgstr "%s 的值無效" - -#: submodule-config.c:765 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "不能更新 .gitmodules 條目 %s" - -#: trailer.c:238 -#, c-format -msgid "running trailer command '%s' failed" -msgstr "執行 trailer 指令 '%s' 失敗" - -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 -#, c-format -msgid "unknown value '%s' for key '%s'" -msgstr "鍵 '%2$s' 的未知取值 '%1$s'" - -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 -#, c-format -msgid "more than one %s" -msgstr "多於一個 %s" - -#: trailer.c:730 -#, c-format -msgid "empty trailer token in trailer '%.*s'" -msgstr "簽名 '%.*s' 的鍵為空" - -#: trailer.c:750 -#, c-format -msgid "could not read input file '%s'" -msgstr "不能讀取輸入檔案 '%s'" - -#: trailer.c:753 -msgid "could not read from stdin" -msgstr "不能自標準輸入讀取" - -#: trailer.c:1011 wrapper.c:665 -#, c-format -msgid "could not stat %s" -msgstr "不能對 %s 呼叫 stat" - -#: trailer.c:1013 -#, c-format -msgid "file %s is not a regular file" -msgstr "檔案 %s 不是一個正規檔案" - -#: trailer.c:1015 -#, c-format -msgid "file %s is not writable by user" -msgstr "檔案 %s 使用者不可寫" - -#: trailer.c:1027 -msgid "could not open temporary file" -msgstr "不能開啟暫存檔" - -#: trailer.c:1067 -#, c-format -msgid "could not rename temporary file to %s" -msgstr "不能重新命名暫存檔為 %s" - -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n" - -#: transport.c:145 -#, c-format -msgid "could not read bundle '%s'" -msgstr "無法讀取 bundle '%s'" - -#: transport.c:214 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "傳輸：無效的深度選項 '%s'" - -#: transport.c:266 -msgid "see protocol.version in 'git help config' for more details" -msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息" - -#: transport.c:267 -msgid "server options require protocol version 2 or later" -msgstr "服務端選項需要版本 2 協定或更高" - -#: transport.c:632 -msgid "could not parse transport.color.* config" -msgstr "不能解析 transport.color.* 設定" - -#: transport.c:705 -msgid "support for protocol v2 not implemented yet" -msgstr "協定 v2 的支援尚未實現" - -#: transport.c:831 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "設定 '%s' 的取值未知：%s" - -#: transport.c:897 -#, c-format -msgid "transport '%s' not allowed" -msgstr "傳輸 '%s' 不允許" - -#: transport.c:949 -msgid "git-over-rsync is no longer supported" -msgstr "不再支援 git-over-rsync" - -#: transport.c:1044 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n" - -#: transport.c:1048 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" -msgstr "" -"\n" -"請嘗試\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"或者進入到子目錄執行\n" -"\n" -"\tgit push\n" -"\n" -"以推送至遠端。\n" -"\n" - -#: transport.c:1056 -msgid "Aborting." -msgstr "正在終止。" - -#: transport.c:1201 -msgid "failed to push all needed submodules" -msgstr "不能推送全部需要的子模組" - -#: transport.c:1345 transport-helper.c:657 -msgid "operation not supported by protocol" -msgstr "協定不支援該動作" - -#: transport-helper.c:61 transport-helper.c:90 -msgid "full write to remote helper failed" -msgstr "完整寫入遠端助手失敗" - -#: transport-helper.c:144 -#, c-format -msgid "unable to find remote helper for '%s'" -msgstr "無法為 '%s' 找到遠端助手" - -#: transport-helper.c:160 transport-helper.c:571 -msgid "can't dup helper output fd" -msgstr "無法複製助手輸出檔案句柄" - -#: transport-helper.c:211 -#, c-format -msgid "" -"unknown mandatory capability %s; this remote helper probably needs newer " -"version of Git" -msgstr "未知的強制能力 %s，該遠端助手可能需要新版本的Git" - -#: transport-helper.c:217 -msgid "this remote helper should implement refspec capability" -msgstr "遠端助手需要實現 refspec 能力" - -#: transport-helper.c:284 transport-helper.c:425 -#, c-format -msgid "%s unexpectedly said: '%s'" -msgstr "%s 意外地說：'%s'" - -#: transport-helper.c:414 -#, c-format -msgid "%s also locked %s" -msgstr "%s 也鎖定了 %s" - -#: transport-helper.c:493 -msgid "couldn't run fast-import" -msgstr "不能執行 fast-import" - -#: transport-helper.c:516 -msgid "error while running fast-import" -msgstr "執行 fast-import 發生錯誤" - -#: transport-helper.c:545 transport-helper.c:1134 -#, c-format -msgid "could not read ref %s" -msgstr "無法讀取引用 %s" - -#: transport-helper.c:590 -#, c-format -msgid "unknown response to connect: %s" -msgstr "連線時未知的回應：%s" - -#: transport-helper.c:612 -msgid "setting remote service path not supported by protocol" -msgstr "協定不支援設定遠端服務路徑" - -#: transport-helper.c:614 -msgid "invalid remote service path" -msgstr "無效的遠端服務路徑" - -#: transport-helper.c:660 -#, c-format -msgid "can't connect to subservice %s" -msgstr "不能連線到子服務 %s" - -#: transport-helper.c:736 -#, c-format -msgid "expected ok/error, helper said '%s'" -msgstr "預期 ok/error，助手說 '%s'" - -#: transport-helper.c:789 -#, c-format -msgid "helper reported unexpected status of %s" -msgstr "助手報告 %s 的意外狀態" - -#: transport-helper.c:850 -#, c-format -msgid "helper %s does not support dry-run" -msgstr "助手 %s 不支援 dry-run" - -#: transport-helper.c:853 -#, c-format -msgid "helper %s does not support --signed" -msgstr "助手 %s 不支援 --signed" - -#: transport-helper.c:856 -#, c-format -msgid "helper %s does not support --signed=if-asked" -msgstr "助手 %s 不支援 --signed=if-asked" - -#: transport-helper.c:861 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "助手 %s 不支援 --atomic" - -#: transport-helper.c:867 -#, c-format -msgid "helper %s does not support 'push-option'" -msgstr "助手 %s 不支援 'push-option'" - -#: transport-helper.c:965 -msgid "remote-helper doesn't support push; refspec needed" -msgstr "remote-heper 不支援 push，需要引用表達式" - -#: transport-helper.c:970 -#, c-format -msgid "helper %s does not support 'force'" -msgstr "助手 %s 不支援 'force'" - -#: transport-helper.c:1017 -msgid "couldn't run fast-export" -msgstr "無法執行 fast-export" - -#: transport-helper.c:1022 -msgid "error while running fast-export" -msgstr "執行 fast-export 時發生錯誤" - -#: transport-helper.c:1047 -#, c-format -msgid "" -"No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" -msgstr "" -"沒有共同的引用並且也沒有指定，什麼也不會做。\n" -"可能您應該指定一個分支如 'master'。\n" - -#: transport-helper.c:1120 -#, c-format -msgid "malformed response in ref list: %s" -msgstr "引用列表中格式錯誤的回應：%s" - -#: transport-helper.c:1272 -#, c-format -msgid "read(%s) failed" -msgstr "讀取（%s）失敗" - -#: transport-helper.c:1299 -#, c-format -msgid "write(%s) failed" -msgstr "寫（%s）失敗" - -#: transport-helper.c:1348 -#, c-format -msgid "%s thread failed" -msgstr "%s 執行緒失敗" - -#: transport-helper.c:1352 -#, c-format -msgid "%s thread failed to join: %s" -msgstr "%s 執行緒等待失敗：%s" - -#: transport-helper.c:1371 transport-helper.c:1375 -#, c-format -msgid "can't start thread for copying data: %s" -msgstr "不能啟動執行緒來複製資料：%s" - -#: transport-helper.c:1412 -#, c-format -msgid "%s process failed to wait" -msgstr "%s 進程等待失敗" - -#: transport-helper.c:1416 -#, c-format -msgid "%s process failed" -msgstr "%s 進程失敗" - -#: transport-helper.c:1434 transport-helper.c:1443 -msgid "can't start thread for copying data" -msgstr "不能啟動執行緒來複製資料" - -#: tree-walk.c:32 -msgid "too-short tree object" -msgstr "太短的樹狀物件" - -#: tree-walk.c:38 -msgid "malformed mode in tree entry" -msgstr "樹狀物件中的條目模式錯誤" - -#: tree-walk.c:42 -msgid "empty filename in tree entry" -msgstr "樹狀物件條目中空的檔案名" - -#: tree-walk.c:117 -msgid "too-short tree file" -msgstr "太短的樹檔案" - -#: unpack-trees.c:110 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you switch branches." -msgstr "" -"您對下列檔案的本機修改將被簽出動作覆蓋：\n" -"%%s請在切換分支前提交或儲藏您的修改。" - -#: unpack-trees.c:112 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%s" -msgstr "" -"您對下列檔案的本機修改將被簽出動作覆蓋：\n" -"%%s" - -#: unpack-trees.c:115 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you merge." -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -"%%s請在合併前提交或儲藏您的修改。" - -#: unpack-trees.c:117 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%s" -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -"%%s" - -#: unpack-trees.c:120 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%sPlease commit your changes or stash them before you %s." -msgstr "" -"您對下列檔案的本機修改將被 %s 覆蓋：\n" -"%%s請在 %s 之前提交或儲藏您的修改。" - -#: unpack-trees.c:122 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%s" -msgstr "" -"您對下列檔案的本機修改將被 %s 覆蓋：\n" -"%%s" - -#: unpack-trees.c:127 -#, c-format -msgid "" -"Updating the following directories would lose untracked files in them:\n" -"%s" -msgstr "" -"更新如下目錄將會遺失其中未追蹤的檔案：\n" -"%s" - -#: unpack-trees.c:131 -#, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you switch branches." -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" -"%%s請在切換分支之前移動或刪除。" - -#: unpack-trees.c:133 -#, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" -"%%s" - -#: unpack-trees.c:136 -#, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" -"%%s請在合併前移動或刪除。" - -#: unpack-trees.c:138 -#, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" -"%%s" - -#: unpack-trees.c:141 -#, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you %s." -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" -"%%s請在 %s 前移動或刪除。" - -#: unpack-trees.c:143 -#, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" -"%%s" - -#: unpack-trees.c:149 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%sPlease move or remove them before you switch branches." -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" -"%%s請在切換分支前移動或刪除。" - -#: unpack-trees.c:151 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" -"%%s" - -#: unpack-trees.c:154 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" -"%%s請在合併前移動或刪除。" - -#: unpack-trees.c:156 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" -"%%s" - -#: unpack-trees.c:159 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you %s." -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" -"%%s請在 %s 前移動或刪除。" - -#: unpack-trees.c:161 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" -"%%s" - -#: unpack-trees.c:169 -#, c-format -msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "條目 '%s' 和 '%s' 重疊。無法合併。" - -#: unpack-trees.c:172 -#, c-format -msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" -"%s" -msgstr "" -"無法更新稀疏簽出：如下條目不是最新：\n" -"%s" - -#: unpack-trees.c:174 -#, c-format -msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" -"%s" -msgstr "" -"工作區中下列檔案將被稀疏簽出更新所覆蓋：\n" -"%s" - -#: unpack-trees.c:176 -#, c-format -msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" -"%s" -msgstr "" -"工作區中下列檔案將被稀疏簽出更新所刪除：\n" -"%s" - -#: unpack-trees.c:178 -#, c-format -msgid "" -"Cannot update submodule:\n" -"%s" -msgstr "" -"無法更新子模組：\n" -"%s" - -#: unpack-trees.c:255 -#, c-format -msgid "Aborting\n" -msgstr "正在終止\n" - -#: unpack-trees.c:317 -msgid "Updating files" -msgstr "正在更新檔案" - -#: unpack-trees.c:349 -msgid "" -"the following paths have collided (e.g. case-sensitive paths\n" -"on a case-insensitive filesystem) and only one from the same\n" -"colliding group is in the working tree:\n" -msgstr "" -"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" -"並且碰撞組中只有一個檔案存在工作區中：\n" - -#: unpack-trees.c:1445 -msgid "Updating index flags" -msgstr "正在更新索引旗標" - -#: urlmatch.c:163 -msgid "invalid URL scheme name or missing '://' suffix" -msgstr "無效的 URL 方案名稱或遺失 '://' 後綴" - -#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 -#, c-format -msgid "invalid %XX escape sequence" -msgstr "無效的 %XX 轉義序列" - -#: urlmatch.c:215 -msgid "missing host and scheme is not 'file:'" -msgstr "缺少主機名稱且 URL 方案不是 'file:'" - -#: urlmatch.c:232 -msgid "a 'file:' URL may not have a port number" -msgstr "一個 'file:' URL 不應該包含埠號" - -#: urlmatch.c:247 -msgid "invalid characters in host name" -msgstr "主機名稱中包含無效的字元" - -#: urlmatch.c:292 urlmatch.c:303 -msgid "invalid port number" -msgstr "無效的埠號" - -#: urlmatch.c:371 -msgid "invalid '..' path segment" -msgstr "無效的 '..' 路徑片段" - -#: walker.c:170 -msgid "Fetching objects" -msgstr "正在抓取物件" - -#: worktree.c:259 builtin/am.c:2099 -#, c-format -msgid "failed to read '%s'" -msgstr "讀取 '%s' 失敗" - -#: worktree.c:305 -#, c-format -msgid "'%s' at main working tree is not the repository directory" -msgstr "在主工作區的 '%s' 不是版本庫目錄" - -#: worktree.c:316 -#, c-format -msgid "'%s' file does not contain absolute path to the working tree location" -msgstr "檔案 '%s' 不包含工作區的絕對路徑" - -#: worktree.c:328 -#, c-format -msgid "'%s' does not exist" -msgstr "'%s' 不存在" - -#: worktree.c:334 -#, c-format -msgid "'%s' is not a .git file, error code %d" -msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" - -#: worktree.c:342 -#, c-format -msgid "'%s' does not point back to '%s'" -msgstr "'%s' 沒有指回到 '%s'" - -#: wrapper.c:186 wrapper.c:356 -#, c-format -msgid "could not open '%s' for reading and writing" -msgstr "無法開啟 '%s' 進行讀寫" - -#: wrapper.c:387 wrapper.c:588 -#, c-format -msgid "unable to access '%s'" -msgstr "不能存取 '%s'" - -#: wrapper.c:596 -msgid "unable to get current working directory" -msgstr "不能取得目前工作目錄" - -#: wt-status.c:158 -msgid "Unmerged paths:" -msgstr "未合併的路徑：" - -# 譯者：請維持前導空格 -#: wt-status.c:187 wt-status.c:219 -msgid " (use \"git restore --staged <file>...\" to unstage)" -msgstr " （使用 \"git restore --staged <檔案>...\" 以取消暫存）" - -# 譯者：請維持前導空格 -#: wt-status.c:190 wt-status.c:222 -#, c-format -msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" -msgstr " （使用 \"git restore --source=%s --staged <檔案>...\" 以取消暫存）" - -# 譯者：請維持前導空格 -#: wt-status.c:193 wt-status.c:225 -msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " （使用 \"git rm --cached <檔案>...\" 以取消暫存）" - -# 譯者：請維持前導空格 -#: wt-status.c:197 -msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " （使用 \"git add <檔案>...\" 標記解決方案）" - -# 譯者：請維持前導空格 -#: wt-status.c:199 wt-status.c:203 -msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" - -# 譯者：請維持前導空格 -#: wt-status.c:201 -msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" - -#: wt-status.c:211 wt-status.c:1074 -msgid "Changes to be committed:" -msgstr "要提交的變更：" - -#: wt-status.c:234 wt-status.c:1083 -msgid "Changes not staged for commit:" -msgstr "尚未暫存以備提交的變更：" - -# 譯者：請維持前導空格 -#: wt-status.c:238 -msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " （使用 \"git add <檔案>...\" 更新要提交的內容）" - -# 譯者：請維持前導空格 -#: wt-status.c:240 -msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " （使用 \"git add/rm <檔案>...\" 更新要提交的內容）" - -# 譯者：請維持前導空格 -#: wt-status.c:241 -msgid "" -" (use \"git restore <file>...\" to discard changes in working directory)" -msgstr " （使用 \"git restore <檔案>...\" 捨棄工作區的改動）" - -# 譯者：請維持前導空格 -#: wt-status.c:243 -msgid " (commit or discard the untracked or modified content in submodules)" -msgstr " （提交或捨棄子模組中未追蹤或修改的內容）" - -# 譯者：請維持前導空格 -#: wt-status.c:254 -#, c-format -msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " （使用 \"git %s <檔案>...\" 以包含要提交的內容）" - -#: wt-status.c:268 -msgid "both deleted:" -msgstr "雙方刪除：" - -#: wt-status.c:270 -msgid "added by us:" -msgstr "由我們新增：" - -#: wt-status.c:272 -msgid "deleted by them:" -msgstr "由他們刪除：" - -#: wt-status.c:274 -msgid "added by them:" -msgstr "由他們新增：" - -#: wt-status.c:276 -msgid "deleted by us:" -msgstr "由我們刪除：" - -#: wt-status.c:278 -msgid "both added:" -msgstr "雙方新增：" - -#: wt-status.c:280 -msgid "both modified:" -msgstr "雙方修改：" - -#: wt-status.c:290 -msgid "new file:" -msgstr "新檔案：" - -#: wt-status.c:292 -msgid "copied:" -msgstr "複製：" - -#: wt-status.c:294 -msgid "deleted:" -msgstr "刪除：" - -#: wt-status.c:296 -msgid "modified:" -msgstr "修改：" - -#: wt-status.c:298 -msgid "renamed:" -msgstr "重新命名：" - -#: wt-status.c:300 -msgid "typechange:" -msgstr "類型變更：" - -#: wt-status.c:302 -msgid "unknown:" -msgstr "未知：" - -#: wt-status.c:304 -msgid "unmerged:" -msgstr "未合併：" - -# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:384 -msgid "new commits, " -msgstr "新提交, " - -# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:386 -msgid "modified content, " -msgstr "修改的內容, " - -# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:388 -msgid "untracked content, " -msgstr "未追蹤的內容, " - -#: wt-status.c:906 -#, c-format -msgid "Your stash currently has %d entry" -msgid_plural "Your stash currently has %d entries" -msgstr[0] "您的儲藏區目前有 %d 條紀錄" - -#: wt-status.c:938 -msgid "Submodules changed but not updated:" -msgstr "子模組已修改但尚未更新：" - -#: wt-status.c:940 -msgid "Submodule changes to be committed:" -msgstr "要提交的子模組變更：" - -#: wt-status.c:1022 -msgid "" -"Do not modify or remove the line above.\n" -"Everything below it will be ignored." -msgstr "" -"不要改動或刪除上面的一行。\n" -"其下所有內容都將被忽略。" - -#: wt-status.c:1114 -#, c-format -msgid "" -"\n" -"It took %.2f seconds to compute the branch ahead/behind values.\n" -"You can use '--no-ahead-behind' to avoid this.\n" -msgstr "" -"\n" -"花了 %.2f 秒才計算出分支的領先/落後範圍。\n" -"為避免，您可以使用 '--no-ahead-behind'。\n" - -#: wt-status.c:1144 -msgid "You have unmerged paths." -msgstr "您有尚未合併的路徑。" - -# 譯者：請維持前導空格 -#: wt-status.c:1147 -msgid " (fix conflicts and run \"git commit\")" -msgstr " （解決衝突並執行 \"git commit\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1149 -msgid " (use \"git merge --abort\" to abort the merge)" -msgstr " （使用 \"git merge --abort\" 終止合併）" - -#: wt-status.c:1153 -msgid "All conflicts fixed but you are still merging." -msgstr "所有衝突已解決但您仍處於合併中。" - -# 譯者：請維持前導空格 -#: wt-status.c:1156 -msgid " (use \"git commit\" to conclude merge)" -msgstr " （使用 \"git commit\" 結束合併）" - -#: wt-status.c:1165 -msgid "You are in the middle of an am session." -msgstr "您正處於 am 動作過程中。" - -#: wt-status.c:1168 -msgid "The current patch is empty." -msgstr "目前的修補檔為空。" - -# 譯者：請維持前導空格 -#: wt-status.c:1172 -msgid " (fix conflicts and then run \"git am --continue\")" -msgstr " （解決衝突，然後執行 \"git am --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1174 -msgid " (use \"git am --skip\" to skip this patch)" -msgstr " （使用 \"git am --skip\" 跳過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1176 -msgid " (use \"git am --abort\" to restore the original branch)" -msgstr " （使用 \"git am --abort\" 復原原有分支）" - -#: wt-status.c:1309 -msgid "git-rebase-todo is missing." -msgstr "git-rebase-todo 遺失。" - -#: wt-status.c:1311 -msgid "No commands done." -msgstr "沒有指令被執行。" - -#: wt-status.c:1314 -#, c-format -msgid "Last command done (%d command done):" -msgid_plural "Last commands done (%d commands done):" -msgstr[0] "最後一條指令已完成（%d 條指令被執行）：" - -#: wt-status.c:1325 -#, c-format -msgid " (see more in file %s)" -msgstr " （更多參見檔案 %s）" - -#: wt-status.c:1330 -msgid "No commands remaining." -msgstr "未剩下任何指令。" - -#: wt-status.c:1333 -#, c-format -msgid "Next command to do (%d remaining command):" -msgid_plural "Next commands to do (%d remaining commands):" -msgstr[0] "接下來要執行的指令（剩餘 %d 條指令）：" - -# 譯者：請維持前導空格 -#: wt-status.c:1341 -msgid " (use \"git rebase --edit-todo\" to view and edit)" -msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" - -#: wt-status.c:1353 -#, c-format -msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" - -#: wt-status.c:1358 -msgid "You are currently rebasing." -msgstr "您在執行重定基底動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1371 -msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1373 -msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " （使用 \"git rebase --skip\" 跳過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1375 -msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）" - -# 譯者：請維持前導空格 -#: wt-status.c:1382 -msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" - -#: wt-status.c:1386 -#, c-format -msgid "" -"You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。" - -#: wt-status.c:1391 -msgid "You are currently splitting a commit during a rebase." -msgstr "您在執行重定基底動作時分割提交。" - -# 譯者：請維持前導空格 -#: wt-status.c:1394 -msgid " (Once your working directory is clean, run \"git rebase --continue\")" -msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" - -#: wt-status.c:1398 -#, c-format -msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。" - -#: wt-status.c:1403 -msgid "You are currently editing a commit during a rebase." -msgstr "您在執行重定基底動作時編輯提交。" - -# 譯者：請維持前導空格 -#: wt-status.c:1406 -msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " （使用 \"git commit --amend\" 修補目前提交）" - -# 譯者：請維持前導空格 -#: wt-status.c:1408 -msgid "" -" (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" - -#: wt-status.c:1419 -msgid "Cherry-pick currently in progress." -msgstr "揀選動作正在進行中。" - -#: wt-status.c:1422 -#, c-format -msgid "You are currently cherry-picking commit %s." -msgstr "您在執行揀選提交 %s 的動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1429 -msgid " (fix conflicts and run \"git cherry-pick --continue\")" -msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1432 -msgid " (run \"git cherry-pick --continue\" to continue)" -msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" - -# 譯者：請維持前導空格 -#: wt-status.c:1435 -msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1437 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " （使用 \"git cherry-pick --skip\" 跳過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1439 -msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" -msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" - -#: wt-status.c:1449 -msgid "Revert currently in progress." -msgstr "還原動作正在行中。" - -#: wt-status.c:1452 -#, c-format -msgid "You are currently reverting commit %s." -msgstr "您在執行反轉提交 %s 的動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1458 -msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " （解決衝突並執行 \"git revert --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1461 -msgid " (run \"git revert --continue\" to continue)" -msgstr " （執行 \"git revert --continue\" 以繼續）" - -# 譯者：請維持前導空格 -#: wt-status.c:1464 -msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1466 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " （使用 \"git revert --skip\" 跳過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1468 -msgid " (use \"git revert --abort\" to cancel the revert operation)" -msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" - -#: wt-status.c:1478 -#, c-format -msgid "You are currently bisecting, started from branch '%s'." -msgstr "您在執行從分支 '%s' 開始的二分尋找動作。" - -#: wt-status.c:1482 -msgid "You are currently bisecting." -msgstr "您在執行二分尋找動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1485 -msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " （使用 \"git bisect reset\" 簽出原有分支）" - -#: wt-status.c:1694 -msgid "On branch " -msgstr "位於分支 " - -#: wt-status.c:1701 -msgid "interactive rebase in progress; onto " -msgstr "互動式重定基底動作正在進行中；至 " - -#: wt-status.c:1703 -msgid "rebase in progress; onto " -msgstr "重定基底動作正在進行中；至 " - -#: wt-status.c:1713 -msgid "Not currently on any branch." -msgstr "目前不在任何分支上。" - -#: wt-status.c:1730 -msgid "Initial commit" -msgstr "初始提交" - -#: wt-status.c:1731 -msgid "No commits yet" -msgstr "尚無提交" - -#: wt-status.c:1745 -msgid "Untracked files" -msgstr "未追蹤的檔案" - -#: wt-status.c:1747 -msgid "Ignored files" -msgstr "忽略的檔案" - -#: wt-status.c:1751 -#, c-format -msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." -msgstr "" -"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" -"但您需要小心不要忘了新增新檔案（參見 'git help status'）。" - -#: wt-status.c:1757 -#, c-format -msgid "Untracked files not listed%s" -msgstr "未追蹤的檔案沒有列出%s" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1759 -msgid " (use -u option to show untracked files)" -msgstr "（使用 -u 參數顯示未追蹤的檔案）" - -#: wt-status.c:1765 -msgid "No changes" -msgstr "沒有修改" - -#: wt-status.c:1770 -#, c-format -msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" - -#: wt-status.c:1773 -#, c-format -msgid "no changes added to commit\n" -msgstr "修改尚未加入提交\n" - -#: wt-status.c:1776 -#, c-format -msgid "" -"nothing added to commit but untracked files present (use \"git add\" to " -"track)\n" -msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n" - -#: wt-status.c:1779 -#, c-format -msgid "nothing added to commit but untracked files present\n" -msgstr "提交為空，但是存在尚未追蹤的檔案\n" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1782 -#, c-format -msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n" - -#: wt-status.c:1785 wt-status.c:1790 -#, c-format -msgid "nothing to commit\n" -msgstr "無檔案要提交\n" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1788 -#, c-format -msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1792 -#, c-format -msgid "nothing to commit, working tree clean\n" -msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" - -#: wt-status.c:1905 -msgid "No commits yet on " -msgstr "尚無提交在 " - -#: wt-status.c:1909 -msgid "HEAD (no branch)" -msgstr "HEAD（非分支）" - -#: wt-status.c:1940 -msgid "different" -msgstr "不同" - -# 譯者：請維持句尾空格 -#: wt-status.c:1942 wt-status.c:1950 -msgid "behind " -msgstr "落後 " - -#: wt-status.c:1945 wt-status.c:1948 -msgid "ahead " -msgstr "領先 " - -#. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 -#, c-format -msgid "cannot %s: You have unstaged changes." -msgstr "不能%s：您有未暫存的變更。" - -#: wt-status.c:2476 -msgid "additionally, your index contains uncommitted changes." -msgstr "另外，您的索引中包含未提交的變更。" - -#: wt-status.c:2478 -#, c-format -msgid "cannot %s: Your index contains uncommitted changes." -msgstr "不能%s：您的索引中包含未提交的變更。" - -#: compat/precompose_utf8.c:58 builtin/clone.c:455 -#, c-format -msgid "failed to unlink '%s'" -msgstr "刪除 '%s' 失敗" - -#: builtin/add.c:26 -msgid "git add [<options>] [--] <pathspec>..." -msgstr "git add [<選項>] [--] <路徑規格>..." - -#: builtin/add.c:88 -#, c-format -msgid "unexpected diff status %c" -msgstr "意外的差異狀態 %c" - -#: builtin/add.c:93 builtin/commit.c:288 -msgid "updating files failed" -msgstr "更新檔案失敗" - -#: builtin/add.c:103 -#, c-format -msgid "remove '%s'\n" -msgstr "刪除 '%s'\n" - -#: builtin/add.c:178 -msgid "Unstaged changes after refreshing the index:" -msgstr "重新整理索引之後尚未被暫存的變更：" - -#: builtin/add.c:266 builtin/rev-parse.c:899 -msgid "Could not read the index" -msgstr "不能讀取索引" - -#: builtin/add.c:277 -#, c-format -msgid "Could not open '%s' for writing." -msgstr "無法為寫入開啟 '%s'。" - -#: builtin/add.c:281 -msgid "Could not write patch" -msgstr "不能生成修補檔" - -#: builtin/add.c:284 -msgid "editing patch failed" -msgstr "編輯修補檔失敗" - -#: builtin/add.c:287 -#, c-format -msgid "Could not stat '%s'" -msgstr "不能對 '%s' 呼叫 stat" - -#: builtin/add.c:289 -msgid "Empty patch. Aborted." -msgstr "空修補檔。異常終止。" - -#: builtin/add.c:294 -#, c-format -msgid "Could not apply '%s'" -msgstr "不能應用 '%s'" - -#: builtin/add.c:302 -msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" - -#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 -msgid "dry run" -msgstr "測試執行" - -#: builtin/add.c:325 -msgid "interactive picking" -msgstr "互動式揀選" - -#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 -msgid "select hunks interactively" -msgstr "互動式挑選資料區塊" - -#: builtin/add.c:327 -msgid "edit current diff and apply" -msgstr "編輯目前差異並應用" - -#: builtin/add.c:328 -msgid "allow adding otherwise ignored files" -msgstr "允許新增忽略的檔案" - -#: builtin/add.c:329 -msgid "update tracked files" -msgstr "更新已追蹤的檔案" - -#: builtin/add.c:330 -msgid "renormalize EOL of tracked files (implies -u)" -msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" - -#: builtin/add.c:331 -msgid "record only the fact that the path will be added later" -msgstr "只記錄，該路徑稍後再新增" - -#: builtin/add.c:332 -msgid "add changes from all tracked and untracked files" -msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" - -#: builtin/add.c:335 -msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" - -#: builtin/add.c:337 -msgid "don't add, only refresh the index" -msgstr "不新增，只重新整理索引" - -#: builtin/add.c:338 -msgid "just skip files which cannot be added because of errors" -msgstr "跳過因發生錯誤不能新增的檔案" - -#: builtin/add.c:339 -msgid "check if - even missing - files are ignored in dry run" -msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" - -#: builtin/add.c:341 builtin/update-index.c:1004 -msgid "override the executable bit of the listed files" -msgstr "覆蓋列表裡檔案的可執行位" - -#: builtin/add.c:343 -msgid "warn when adding an embedded repository" -msgstr "建立一個嵌入式版本庫時給予警告" - -#: builtin/add.c:345 -msgid "backend for `git stash -p`" -msgstr "`git stash -p` 的後端" - -#: builtin/add.c:363 -#, c-format -msgid "" -"You've added another git repository inside your current repository.\n" -"Clones of the outer repository will not contain the contents of\n" -"the embedded repository and will not know how to obtain it.\n" -"If you meant to add a submodule, use:\n" -"\n" -"\tgit submodule add <url> %s\n" -"\n" -"If you added this path by mistake, you can remove it from the\n" -"index with:\n" -"\n" -"\tgit rm --cached %s\n" -"\n" -"See \"git help submodule\" for more information." -msgstr "" -"您在目前版本庫中新增了另外一個 Git 版本庫。複製外層的版本庫將不包含嵌入版本庫" -"的內容，並且不知道該如何取得它。\n" -"如果您要新增一個子模組，使用：\n" -"\n" -"\tgit submodule add <url> %s\n" -"\n" -"如果您不小心新增了這個路徑，可以用下面的指令將其從索引中刪除：\n" -"\n" -"\tgit rm --cached %s\n" -"\n" -"參見 \"git help submodule\" 取得更多訊息。" - -#: builtin/add.c:391 -#, c-format -msgid "adding embedded git repository: %s" -msgstr "正在新增嵌入式 git 版本庫：%s" - -#: builtin/add.c:410 -msgid "" -"Use -f if you really want to add them.\n" -"Turn this message off by running\n" -"\"git config advice.addIgnoredFile false\"" -msgstr "" -"如果您真的想加入，請使用 -f。\n" -"如要關閉此訊息，請執行\n" -"\"git config advice.addIgnoredFile false\"" - -#: builtin/add.c:419 -msgid "adding files failed" -msgstr "新增檔案失敗" - -#: builtin/add.c:447 builtin/commit.c:348 -msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "--pathspec-from-file 與 --interactive/--patch 不相容" - -#: builtin/add.c:464 -msgid "--pathspec-from-file is incompatible with --edit" -msgstr "--pathspec-from-file 與 --edit 不相容" - -#: builtin/add.c:476 -msgid "-A and -u are mutually incompatible" -msgstr "-A 和 -u 選項互斥" - -#: builtin/add.c:479 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" - -#: builtin/add.c:483 -#, c-format -msgid "--chmod param '%s' must be either -x or +x" -msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" - -#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 -#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 -msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" - -#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 -#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 -msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "--pathspec-file-nul 需要 --pathspec-from-file" - -#: builtin/add.c:512 -#, c-format -msgid "Nothing specified, nothing added.\n" -msgstr "沒有指定檔案，也沒有檔案被新增。\n" - -#: builtin/add.c:514 -msgid "" -"Maybe you wanted to say 'git add .'?\n" -"Turn this message off by running\n" -"\"git config advice.addEmptyPathspec false\"" -msgstr "" -"可能你要做的是 'git add .'？\n" -"如要關閉此訊息，請執行\n" -"\"git config advice.addEmptyPathspec false\"" - -#: builtin/am.c:352 -msgid "could not parse author script" -msgstr "不能解析作者腳本" - -#: builtin/am.c:436 -#, c-format -msgid "'%s' was deleted by the applypatch-msg hook" -msgstr "'%s' 被 applypatch-msg 掛鉤刪除" - -#: builtin/am.c:478 -#, c-format -msgid "Malformed input line: '%s'." -msgstr "非法的輸入行：'%s'。" - -#: builtin/am.c:516 -#, c-format -msgid "Failed to copy notes from '%s' to '%s'" -msgstr "從 '%s' 複製註解到 '%s' 時失敗" - -#: builtin/am.c:542 -msgid "fseek failed" -msgstr "fseek 失敗" - -#: builtin/am.c:730 -#, c-format -msgid "could not parse patch '%s'" -msgstr "無法解析修補檔 '%s'" - -#: builtin/am.c:795 -msgid "Only one StGIT patch series can be applied at once" -msgstr "一次只能有一個 StGIT 修補檔佇列被應用" - -#: builtin/am.c:843 -msgid "invalid timestamp" -msgstr "無效的時間戳" - -#: builtin/am.c:848 builtin/am.c:860 -msgid "invalid Date line" -msgstr "無效的日期行" - -#: builtin/am.c:855 -msgid "invalid timezone offset" -msgstr "無效的時區位移值" - -#: builtin/am.c:948 -msgid "Patch format detection failed." -msgstr "修補檔格式偵測失敗。" - -#: builtin/am.c:953 builtin/clone.c:409 -#, c-format -msgid "failed to create directory '%s'" -msgstr "建立目錄 '%s' 失敗" - -#: builtin/am.c:958 -msgid "Failed to split patches." -msgstr "分割修補檔失敗。" - -#: builtin/am.c:1089 -#, c-format -msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "當您解決這一問題，執行 \"%s --continue\"。" - -#: builtin/am.c:1090 -#, c-format -msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "如果您想要跳過這一修補檔，則執行 \"%s --skip\"。" - -#: builtin/am.c:1091 -#, c-format -msgid "To restore the original branch and stop patching, run \"%s --abort\"." -msgstr "若要復原至原始分支並停止修補檔動作，執行 \"%s --abort\"。" - -#: builtin/am.c:1174 -msgid "Patch sent with format=flowed; space at the end of lines might be lost." -msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" - -#: builtin/am.c:1202 -msgid "Patch is empty." -msgstr "修補檔為空。" - -#: builtin/am.c:1267 -#, c-format -msgid "missing author line in commit %s" -msgstr "在提交 %s 中缺少作者行" - -#: builtin/am.c:1270 -#, c-format -msgid "invalid ident line: %.*s" -msgstr "無效的身份標記：%.*s" - -#: builtin/am.c:1489 -msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "版本庫缺乏必要的資料物件以進行三方合併。" - -#: builtin/am.c:1491 -msgid "Using index info to reconstruct a base tree..." -msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." - -#: builtin/am.c:1510 -msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." -msgstr "" -"您是否曾手動編輯過您的修補檔？\n" -"無法套用修補檔到索引中的資料物件上。" - -#: builtin/am.c:1516 -msgid "Falling back to patching base and 3-way merge..." -msgstr "回落到基礎版本上打修補檔及進行三方合併..." - -#: builtin/am.c:1542 -msgid "Failed to merge in the changes." -msgstr "無法合併變更。" - -#: builtin/am.c:1574 -msgid "applying to an empty history" -msgstr "正套用到一個空歷史上" - -#: builtin/am.c:1621 builtin/am.c:1625 -#, c-format -msgid "cannot resume: %s does not exist." -msgstr "無法繼續：%s 不存在。" - -#: builtin/am.c:1643 -msgid "Commit Body is:" -msgstr "提交內容為：" - -# 譯者：請維持句尾空格 -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] -#. in your translation. The program will only accept English -#. input at this point. -#. -#: builtin/am.c:1653 -#, c-format -msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/應用所有[a]：" - -#: builtin/am.c:1700 builtin/commit.c:398 -msgid "unable to write index file" -msgstr "無法寫入索引檔案" - -#: builtin/am.c:1704 -#, c-format -msgid "Dirty index: cannot apply patches (dirty: %s)" -msgstr "髒索引：不能套用修補檔（髒檔案：%s）" - -#: builtin/am.c:1744 builtin/am.c:1812 -#, c-format -msgid "Applying: %.*s" -msgstr "應用：%.*s" - -#: builtin/am.c:1761 -msgid "No changes -- Patch already applied." -msgstr "沒有變更 —— 修補檔已經應用過。" - -#: builtin/am.c:1767 -#, c-format -msgid "Patch failed at %s %.*s" -msgstr "打修補檔失敗於 %s %.*s" - -#: builtin/am.c:1771 -msgid "Use 'git am --show-current-patch=diff' to see the failed patch" -msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" - -#: builtin/am.c:1815 -msgid "" -"No changes - did you forget to use 'git add'?\n" -"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" -"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" -"您也許想要跳過這個修補檔。" - -#: builtin/am.c:1822 -msgid "" -"You still have unmerged paths in your index.\n" -"You should 'git add' each file with resolved conflicts to mark them as " -"such.\n" -"You might run `git rm` on a file to accept \"deleted by them\" for it." -msgstr "" -"在您的索引中仍存在未合併的路徑。\n" -"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" -"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" - -#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 -#: builtin/reset.c:354 -#, c-format -msgid "Could not parse object '%s'." -msgstr "不能解析物件 '%s'。" - -#: builtin/am.c:1981 -msgid "failed to clean index" -msgstr "清空索引失敗" - -#: builtin/am.c:2025 -msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" -msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD" - -#: builtin/am.c:2132 -#, c-format -msgid "Invalid value for --patch-format: %s" -msgstr "無效的 --patch-format 值：%s" - -#: builtin/am.c:2172 -#, c-format -msgid "Invalid value for --show-current-patch: %s" -msgstr "無效的 --show-current-patch 值：%s" - -#: builtin/am.c:2176 -#, c-format -msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" - -#: builtin/am.c:2207 -msgid "git am [<options>] [(<mbox> | <Maildir>)...]" -msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" - -#: builtin/am.c:2208 -msgid "git am [<options>] (--continue | --skip | --abort)" -msgstr "git am [<選項>] (--continue | --skip | --abort)" - -#: builtin/am.c:2214 -msgid "run interactively" -msgstr "以互動式方式執行" - -#: builtin/am.c:2216 -msgid "historical option -- no-op" -msgstr "老的參數 —— 無作用" - -#: builtin/am.c:2218 -msgid "allow fall back on 3way merging if needed" -msgstr "如果必要，允許使用三方合併。" - -#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:812 -msgid "be quiet" -msgstr "靜默模式" - -#: builtin/am.c:2221 -msgid "add a Signed-off-by line to the commit message" -msgstr "在提交說明中新增一個 Signed-off-by 簽名" - -#: builtin/am.c:2224 -msgid "recode into utf8 (default)" -msgstr "使用 utf8 字元集（預設）" - -#: builtin/am.c:2226 -msgid "pass -k flag to git-mailinfo" -msgstr "向 git-mailinfo 傳遞 -k 參數" - -#: builtin/am.c:2228 -msgid "pass -b flag to git-mailinfo" -msgstr "向 git-mailinfo 傳遞 -b 參數" - -#: builtin/am.c:2230 -msgid "pass -m flag to git-mailinfo" -msgstr "向 git-mailinfo 傳遞 -m 參數" - -#: builtin/am.c:2232 -msgid "pass --keep-cr flag to git-mailsplit for mbox format" -msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" - -#: builtin/am.c:2235 -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" - -#: builtin/am.c:2238 -msgid "strip everything before a scissors line" -msgstr "捨棄裁切線前的所有內容" - -#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 -#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 -#: builtin/am.c:2267 -msgid "pass it through git-apply" -msgstr "傳遞給 git-apply" - -#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 -#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 -#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 -#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:154 parse-options.h:175 parse-options.h:316 -msgid "n" -msgstr "n" - -#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 -msgid "format" -msgstr "格式" - -#: builtin/am.c:2264 -msgid "format the patch(es) are in" -msgstr "修補檔的格式" - -#: builtin/am.c:2270 -msgid "override error message when patch failure occurs" -msgstr "打修補檔失敗時顯示的錯誤訊息" - -#: builtin/am.c:2272 -msgid "continue applying patches after resolving a conflict" -msgstr "衝突解決後繼續套用修補檔" - -#: builtin/am.c:2275 -msgid "synonyms for --continue" -msgstr "和 --continue 同義" - -#: builtin/am.c:2278 -msgid "skip the current patch" -msgstr "跳過目前修補檔" - -#: builtin/am.c:2281 -msgid "restore the original branch and abort the patching operation." -msgstr "復原原始分支並終止打修補檔動作。" - -#: builtin/am.c:2284 -msgid "abort the patching operation but keep HEAD where it is." -msgstr "終止修補檔動作但保持 HEAD 不變。" - -#: builtin/am.c:2288 -msgid "show the patch being applied" -msgstr "顯示正在套用的修補檔" - -#: builtin/am.c:2293 -msgid "lie about committer date" -msgstr "將作者日期作為提交日期" - -#: builtin/am.c:2295 -msgid "use current timestamp for author date" -msgstr "用目前時間作為作者日期" - -#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 -#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 -#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 -msgid "key-id" -msgstr "key-id" - -#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 -msgid "GPG-sign commits" -msgstr "使用 GPG 簽名提交" - -#: builtin/am.c:2301 -msgid "(internal use for git-rebase)" -msgstr "（內部使用，用於 git-rebase）" - -#: builtin/am.c:2319 -msgid "" -"The -b/--binary option has been a no-op for long time, and\n" -"it will be removed. Please do not use it anymore." -msgstr "" -"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" -"請不要再使用它了。" - -#: builtin/am.c:2326 -msgid "failed to read the index" -msgstr "讀取索引失敗" - -#: builtin/am.c:2341 -#, c-format -msgid "previous rebase directory %s still exists but mbox given." -msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" - -#: builtin/am.c:2365 -#, c-format -msgid "" -"Stray %s directory found.\n" -"Use \"git am --abort\" to remove it." -msgstr "" -"發現了錯誤的 %s 目錄。\n" -"使用 \"git am --abort\" 刪除它。" - -#: builtin/am.c:2371 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "解決動作未進行，我們不會繼續。" - -#: builtin/am.c:2381 -msgid "interactive mode requires patches on the command line" -msgstr "互動式模式需要指令列上提供修補檔" - -#: builtin/apply.c:8 -msgid "git apply [<options>] [<patch>...]" -msgstr "git apply [<選項>] [<修補檔>...]" - -#: builtin/archive.c:17 -#, c-format -msgid "could not create archive file '%s'" -msgstr "不能建立歸檔檔案 '%s'" - -#: builtin/archive.c:20 -msgid "could not redirect output" -msgstr "不能重定向輸出" - -#: builtin/archive.c:37 -msgid "git archive: Remote with no URL" -msgstr "git archive：未提供遠端 URL" - -#: builtin/archive.c:61 -msgid "git archive: expected ACK/NAK, got a flush packet" -msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包" - -#: builtin/archive.c:64 -#, c-format -msgid "git archive: NACK %s" -msgstr "git archive：NACK %s" - -#: builtin/archive.c:65 -msgid "git archive: protocol error" -msgstr "git archive：協定錯誤" - -#: builtin/archive.c:69 -msgid "git archive: expected a flush" -msgstr "git archive：應有一個 flush 包" - -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "git bisect--helper --next-all [--no-checkout]" - -#: builtin/bisect--helper.c:23 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "git bisect--helper --write-terms <壞-術語> <好-術語>" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<提交>]" - -#: builtin/bisect--helper.c:26 -msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-write [--no-log] <狀態> <版本> <好-術語> <壞-術語" -">" - -#: builtin/bisect--helper.c:27 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>" - -#: builtin/bisect--helper.c:28 -msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]" - -#: builtin/bisect--helper.c:29 -msgid "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" -msgstr "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" - -#: builtin/bisect--helper.c:30 -msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" -msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<術語> --term-{new,bad}" -"=<術語>][--no-checkout] [<壞> [<好>...]] [--] [<路徑>...]" - -#: builtin/bisect--helper.c:86 -#, c-format -msgid "'%s' is not a valid term" -msgstr "'%s' 不是一個有效的術語" - -#: builtin/bisect--helper.c:90 -#, c-format -msgid "can't use the builtin command '%s' as a term" -msgstr "不能使用內建指令 '%s' 作為術語" - -#: builtin/bisect--helper.c:100 -#, c-format -msgid "can't change the meaning of the term '%s'" -msgstr "不能修改術語 '%s' 的含義" - -#: builtin/bisect--helper.c:111 -msgid "please use two different terms" -msgstr "請使用兩個不同的術語" - -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "不能開啟檔案 BISECT_TERMS" - -#: builtin/bisect--helper.c:155 -#, c-format -msgid "We are not bisecting.\n" -msgstr "我們沒有在二分尋找。\n" - -#: builtin/bisect--helper.c:163 -#, c-format -msgid "'%s' is not a valid commit" -msgstr "'%s' 不是一個有效的提交" - -#: builtin/bisect--helper.c:172 -#, c-format -msgid "" -"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." -msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" - -#: builtin/bisect--helper.c:216 -#, c-format -msgid "Bad bisect_write argument: %s" -msgstr "壞的 bisect_write 參數：%s" - -#: builtin/bisect--helper.c:221 -#, c-format -msgid "couldn't get the oid of the rev '%s'" -msgstr "無法取得版本 '%s' 的物件 ID" - -#: builtin/bisect--helper.c:233 -#, c-format -msgid "couldn't open the file '%s'" -msgstr "無法開啟檔案 '%s'" - -#: builtin/bisect--helper.c:259 -#, c-format -msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "無效的指令：您目前正處於一個 %s/%s 二分尋找中" - -#: builtin/bisect--helper.c:286 -#, c-format -msgid "" -"You 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 "" -"您需要給我至少一個 %s 和一個 %s 版本。\n" -"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" - -#: builtin/bisect--helper.c:290 -#, c-format -msgid "" -"You need to start by \"git bisect start\".\n" -"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" -"然後需要提供我至少一個 %s 和一個 %s 版本。\n" -"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" - -#: builtin/bisect--helper.c:310 -#, c-format -msgid "bisecting only with a %s commit" -msgstr "在只有一個 %s 提交的情況下二分尋找" - -# 譯者：請維持句尾空格 -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#. -#: builtin/bisect--helper.c:318 -msgid "Are you sure [Y/n]? " -msgstr "您確認嗎[Y/n]？ " - -#: builtin/bisect--helper.c:379 -msgid "no terms defined" -msgstr "未定義術語" - -#: builtin/bisect--helper.c:382 -#, c-format -msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" -msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n" - -#: builtin/bisect--helper.c:392 -#, c-format -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" -"支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" - -#: builtin/bisect--helper.c:478 -#, c-format -msgid "unrecognized option: '%s'" -msgstr "未識別的選項：'%s'" - -#: builtin/bisect--helper.c:482 -#, c-format -msgid "'%s' does not appear to be a valid revision" -msgstr "'%s' 看起來不是一個有效的版本" - -#: builtin/bisect--helper.c:514 -msgid "bad HEAD - I need a HEAD" -msgstr "壞的 HEAD - 我需要一個 HEAD" - -#: builtin/bisect--helper.c:529 -#, c-format -msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." -msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" - -#: builtin/bisect--helper.c:550 -msgid "won't bisect on cg-seek'ed tree" -msgstr "不會在做了 cg-seek 的樹上做二分尋找" - -#: builtin/bisect--helper.c:553 -msgid "bad HEAD - strange symbolic ref" -msgstr "壞的 HEAD - 奇怪的符號引用" - -#: builtin/bisect--helper.c:577 -#, c-format -msgid "invalid ref: '%s'" -msgstr "無效的引用：'%s'" - -#: builtin/bisect--helper.c:633 -msgid "perform 'git bisect next'" -msgstr "執行 'git bisect next'" - -#: builtin/bisect--helper.c:635 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "將術語寫入 .git/BISECT_TERMS" - -#: builtin/bisect--helper.c:637 -msgid "cleanup the bisection state" -msgstr "清除二分尋找狀態" - -#: builtin/bisect--helper.c:639 -msgid "check for expected revs" -msgstr "檢查預期的版本" - -#: builtin/bisect--helper.c:641 -msgid "reset the bisection state" -msgstr "清除二分尋找狀態" - -#: builtin/bisect--helper.c:643 -msgid "write out the bisection state in BISECT_LOG" -msgstr "將二分尋找的狀態寫入 BISECT_LOG" - -#: builtin/bisect--helper.c:645 -msgid "check and set terms in a bisection state" -msgstr "在一個二分尋找狀態中檢查和設定術語" - -#: builtin/bisect--helper.c:647 -msgid "check whether bad or good terms exist" -msgstr "檢查壞的或好的術語是否存在" - -#: builtin/bisect--helper.c:649 -msgid "print out the bisect terms" -msgstr "列印二分尋找術語" - -#: builtin/bisect--helper.c:651 -msgid "start the bisect session" -msgstr "啟動二分尋找過程" - -#: builtin/bisect--helper.c:653 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "更新 BISECT_HEAD 而非簽出目前提交" - -#: builtin/bisect--helper.c:655 -msgid "no log for BISECT_WRITE" -msgstr "BISECT_WRITE 無日誌" - -#: builtin/bisect--helper.c:673 -msgid "--write-terms requires two arguments" -msgstr "--write-terms 需要兩個參數" - -#: builtin/bisect--helper.c:677 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state 不帶參數" - -#: builtin/bisect--helper.c:684 -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset 無需參數或者需要一個提交" - -#: builtin/bisect--helper.c:688 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write 需要 4 或 5 個參數" - -#: builtin/bisect--helper.c:694 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "--check-and-set-terms 需要 3 個參數" - -#: builtin/bisect--helper.c:700 -msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "--bisect-next-check 需要 2 或 3 個參數" - -#: builtin/bisect--helper.c:706 -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms 需要 0 或 1 個參數" - -#: builtin/blame.c:31 -msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" -msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>" - -#: builtin/blame.c:36 -msgid "<rev-opts> are documented in git-rev-list(1)" -msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中" - -#: builtin/blame.c:409 -#, c-format -msgid "expecting a color: %s" -msgstr "期望一個顏色：%s" - -#: builtin/blame.c:416 -msgid "must end with a color" -msgstr "必須以一個顏色結尾" - -#: builtin/blame.c:729 -#, c-format -msgid "invalid color '%s' in color.blame.repeatedLines" -msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'" - -#: builtin/blame.c:747 -msgid "invalid value for blame.coloring" -msgstr "設定 blame.coloring 中的無效取值" - -#: builtin/blame.c:822 -#, c-format -msgid "cannot find revision %s to ignore" -msgstr "不能找到要忽略的版本 %s" - -#: builtin/blame.c:844 -msgid "Show blame entries as we find them, incrementally" -msgstr "增量式地顯示發現的 blame 條目" - -#: builtin/blame.c:845 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "邊界提交顯示空的 SHA-1（預設：關閉）" - -#: builtin/blame.c:846 -msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "不把根提交作為邊界（預設：關閉）" - -#: builtin/blame.c:847 -msgid "Show work cost statistics" -msgstr "顯示指令消耗統計" - -#: builtin/blame.c:848 -msgid "Force progress reporting" -msgstr "強制進度顯示" - -#: builtin/blame.c:849 -msgid "Show output score for blame entries" -msgstr "顯示判斷 blame 條目位移的得分診斷訊息" - -#: builtin/blame.c:850 -msgid "Show original filename (Default: auto)" -msgstr "顯示原始檔案名（預設：自動）" - -#: builtin/blame.c:851 -msgid "Show original linenumber (Default: off)" -msgstr "顯示原始的行號（預設：關閉）" - -#: builtin/blame.c:852 -msgid "Show in a format designed for machine consumption" -msgstr "顯示為一個適合機器讀取的格式" - -#: builtin/blame.c:853 -msgid "Show porcelain format with per-line commit information" -msgstr "為每一行顯示機器適用的提交訊息" - -#: builtin/blame.c:854 -msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "使用和 git-annotate 相同的輸出模式（預設：關閉）" - -#: builtin/blame.c:855 -msgid "Show raw timestamp (Default: off)" -msgstr "顯示原始時間戳（預設：關閉）" - -#: builtin/blame.c:856 -msgid "Show long commit SHA1 (Default: off)" -msgstr "顯示長的 SHA1 提交號（預設：關閉）" - -#: builtin/blame.c:857 -msgid "Suppress author name and timestamp (Default: off)" -msgstr "隱藏作者名字和時間戳（預設：關閉）" - -#: builtin/blame.c:858 -msgid "Show author email instead of name (Default: off)" -msgstr "顯示作者的信箱而不是名字（預設：關閉）" - -#: builtin/blame.c:859 -msgid "Ignore whitespace differences" -msgstr "忽略空白差異" - -#: builtin/blame.c:860 builtin/log.c:1702 -msgid "rev" -msgstr "版本" - -#: builtin/blame.c:860 -msgid "Ignore <rev> when blaming" -msgstr "在執行 blame 動作時忽略 <版本>" - -#: builtin/blame.c:861 -msgid "Ignore revisions from <file>" -msgstr "忽略來自 <檔案> 中的版本" - -#: builtin/blame.c:862 -msgid "color redundant metadata from previous line differently" -msgstr "使用顏色間隔輸出與前一行不同的重複元訊息" - -#: builtin/blame.c:863 -msgid "color lines by age" -msgstr "依據時間著色" - -#: builtin/blame.c:864 -msgid "Spend extra cycles to find better match" -msgstr "花費額外的循環來找到更好的符合" - -#: builtin/blame.c:865 -msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list" - -#: builtin/blame.c:866 -msgid "Use <file>'s contents as the final image" -msgstr "使用 <檔案> 的內容作為最終的圖片" - -#: builtin/blame.c:867 builtin/blame.c:868 -msgid "score" -msgstr "得分" - -#: builtin/blame.c:867 -msgid "Find line copies within and across files" -msgstr "找到檔案內及跨檔案的行複製" - -#: builtin/blame.c:868 -msgid "Find line movements within and across files" -msgstr "找到檔案內及跨檔案的行移動" - -#: builtin/blame.c:869 -msgid "n,m" -msgstr "n,m" - -#: builtin/blame.c:869 -msgid "Process only line range n,m, counting from 1" -msgstr "只處理行範圍在 n 和 m 之間的，從 1 開始" - -#: builtin/blame.c:921 -msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用" - -#. TRANSLATORS: This string is used to tell us the -#. maximum display width for a relative timestamp in -#. "git blame" output. For C locale, "4 years, 11 -#. months ago", which takes 22 places, is the longest -#. among various forms of relative timestamps, but -#. your language may need more or fewer display -#. columns. -#. -#: builtin/blame.c:972 -msgid "4 years, 11 months ago" -msgstr "4 年 11 個月前" - -#: builtin/blame.c:1079 -#, c-format -msgid "file %s has only %lu line" -msgid_plural "file %s has only %lu lines" -msgstr[0] "檔案 %s 只有 %lu 行" - -#: builtin/blame.c:1125 -msgid "Blaming lines" -msgstr "追蹤程式碼行" - -#: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<選項>] [-r | -a] [--merged | --no-merged]" - -#: builtin/branch.c:30 -msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" -msgstr "git branch [<選項>] [-l] [-f] <分支名> [<起始點>]" - -#: builtin/branch.c:31 -msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." -msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..." - -#: builtin/branch.c:32 -msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" -msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>" - -#: builtin/branch.c:33 -msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" -msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>" - -#: builtin/branch.c:34 -msgid "git branch [<options>] [-r | -a] [--points-at]" -msgstr "git branch [<選項>] [-r | -a] [--points-at]" - -#: builtin/branch.c:35 -msgid "git branch [<options>] [-r | -a] [--format]" -msgstr "git branch [<選項>] [-r | -a] [--format]" - -# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c:154 -#, c-format -msgid "" -"deleting branch '%s' that has been merged to\n" -" '%s', but not yet merged to HEAD." -msgstr "" -"將要刪除的分支 '%s' 已經被合併到\n" -" '%s'，但未合併到 HEAD。" - -# 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c:158 -#, c-format -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' 。" - -#: builtin/branch.c:172 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "無法查詢 '%s' 指向的提交物件" - -#: builtin/branch.c:176 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"分支 '%s' 沒有完全合併。\n" -"如果您確認要刪除它，執行 'git branch -D %s'。" - -#: builtin/branch.c:189 -msgid "Update of config-file failed" -msgstr "更新設定檔案失敗" - -#: builtin/branch.c:220 -msgid "cannot use -a with -d" -msgstr "不能將 -a 和 -d 同時使用" - -#: builtin/branch.c:226 -msgid "Couldn't look up commit object for HEAD" -msgstr "無法查詢 HEAD 指向的提交物件" - -#: builtin/branch.c:240 -#, c-format -msgid "Cannot delete branch '%s' checked out at '%s'" -msgstr "無法刪除簽出於 '%2$s' 的分支 '%1$s'。" - -#: builtin/branch.c:255 -#, c-format -msgid "remote-tracking branch '%s' not found." -msgstr "未能找到遠端追蹤分支 '%s'。" - -#: builtin/branch.c:256 -#, c-format -msgid "branch '%s' not found." -msgstr "分支 '%s' 未發現。" - -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "無法刪除遠端追蹤分支 '%s'" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "無法刪除分支 '%s'" - -#: builtin/branch.c:279 -#, c-format -msgid "Deleted remote-tracking branch %s (was %s).\n" -msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n" - -#: builtin/branch.c:280 -#, c-format -msgid "Deleted branch %s (was %s).\n" -msgstr "已刪除分支 %s（曾為 %s）。\n" - -#: builtin/branch.c:429 builtin/tag.c:61 -msgid "unable to parse format string" -msgstr "不能解析格式化字串" - -#: builtin/branch.c:460 -msgid "could not resolve HEAD" -msgstr "不能解析 HEAD 提交" - -#: builtin/branch.c:466 -#, c-format -msgid "HEAD (%s) points outside of refs/heads/" -msgstr "HEAD (%s) 指向 refs/heads/ 之外" - -#: builtin/branch.c:481 -#, c-format -msgid "Branch %s is being rebased at %s" -msgstr "分支 %s 正被重定基底到 %s" - -#: builtin/branch.c:485 -#, c-format -msgid "Branch %s is being bisected at %s" -msgstr "分支 %s 正被二分尋找於 %s" - -#: builtin/branch.c:502 -msgid "cannot copy the current branch while not on any." -msgstr "無法複製目前分支因為不處於任何分支上。" - -#: builtin/branch.c:504 -msgid "cannot rename the current branch while not on any." -msgstr "無法重新命名目前分支因為不處於任何分支上。" - -#: builtin/branch.c:515 -#, c-format -msgid "Invalid branch name: '%s'" -msgstr "無效的分支名：'%s'" - -#: builtin/branch.c:542 -msgid "Branch rename failed" -msgstr "分支重新命名失敗" - -#: builtin/branch.c:544 -msgid "Branch copy failed" -msgstr "分支複製失敗" - -#: builtin/branch.c:548 -#, c-format -msgid "Created a copy of a misnamed branch '%s'" -msgstr "已為錯誤命名的分支 '%s' 建立了一個副本" - -#: builtin/branch.c:551 -#, c-format -msgid "Renamed a misnamed branch '%s' away" -msgstr "已將錯誤命名的分支 '%s' 重新命名" - -#: builtin/branch.c:557 -#, c-format -msgid "Branch renamed to %s, but HEAD is not updated!" -msgstr "分支重新命名為 %s，但 HEAD 沒有更新！" - -#: builtin/branch.c:566 -msgid "Branch is renamed, but update of config-file failed" -msgstr "分支被重新命名，但更新設定檔案失敗" - -#: builtin/branch.c:568 -msgid "Branch is copied, but update of config-file failed" -msgstr "分支已複製，但更新設定檔案失敗" - -#: builtin/branch.c:584 -#, c-format -msgid "" -"Please edit the description for the branch\n" -" %s\n" -"Lines starting with '%c' will be stripped.\n" -msgstr "" -"請編輯分支的描述\n" -" %s\n" -"以 '%c' 開頭的行將被過濾。\n" - -#: builtin/branch.c:618 -msgid "Generic options" -msgstr "通用選項" - -#: builtin/branch.c:620 -msgid "show hash and subject, give twice for upstream branch" -msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支" - -#: builtin/branch.c:621 -msgid "suppress informational messages" -msgstr "不顯示訊息" - -#: builtin/branch.c:622 -msgid "set up tracking mode (see git-pull(1))" -msgstr "設定追蹤模式（參見 git-pull(1)）" - -#: builtin/branch.c:624 -msgid "do not use" -msgstr "不要使用" - -#: builtin/branch.c:626 builtin/rebase.c:513 -msgid "upstream" -msgstr "上游" - -#: builtin/branch.c:626 -msgid "change the upstream info" -msgstr "改變上游訊息" - -#: builtin/branch.c:627 -msgid "unset the upstream info" -msgstr "取消上游資訊設定" - -#: builtin/branch.c:628 -msgid "use colored output" -msgstr "使用彩色輸出" - -#: builtin/branch.c:629 -msgid "act on remote-tracking branches" -msgstr "作用於遠端追蹤分支" - -#: builtin/branch.c:631 builtin/branch.c:633 -msgid "print only branches that contain the commit" -msgstr "只列印包含該提交的分支" - -#: builtin/branch.c:632 builtin/branch.c:634 -msgid "print only branches that don't contain the commit" -msgstr "只列印不包含該提交的分支" - -#: builtin/branch.c:637 -msgid "Specific git-branch actions:" -msgstr "具體的 git-branch 動作：" - -#: builtin/branch.c:638 -msgid "list both remote-tracking and local branches" -msgstr "列出遠端追蹤及本機分支" - -#: builtin/branch.c:640 -msgid "delete fully merged branch" -msgstr "刪除完全合併的分支" - -#: builtin/branch.c:641 -msgid "delete branch (even if not merged)" -msgstr "刪除分支（即使沒有合併）" - -#: builtin/branch.c:642 -msgid "move/rename a branch and its reflog" -msgstr "移動/重新命名一個分支，以及它的引用日誌" - -#: builtin/branch.c:643 -msgid "move/rename a branch, even if target exists" -msgstr "移動/重新命名一個分支，即使目標已存在" - -#: builtin/branch.c:644 -msgid "copy a branch and its reflog" -msgstr "複製一個分支和它的引用日誌" - -#: builtin/branch.c:645 -msgid "copy a branch, even if target exists" -msgstr "複製一個分支，即使目標已存在" - -#: builtin/branch.c:646 -msgid "list branch names" -msgstr "列出分支名" - -#: builtin/branch.c:647 -msgid "show current branch name" -msgstr "顯示目前分支名" - -#: builtin/branch.c:648 -msgid "create the branch's reflog" -msgstr "建立分支的引用日誌" - -#: builtin/branch.c:650 -msgid "edit the description for the branch" -msgstr "標記分支的描述" - -#: builtin/branch.c:651 -msgid "force creation, move/rename, deletion" -msgstr "強制建立、移動/重新命名、刪除" - -#: builtin/branch.c:652 -msgid "print only branches that are merged" -msgstr "只列印已經合併的分支" - -#: builtin/branch.c:653 -msgid "print only branches that are not merged" -msgstr "只列印尚未合併的分支" - -#: builtin/branch.c:654 -msgid "list branches in columns" -msgstr "以列的方式顯示分支" - -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 -#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:433 -msgid "object" -msgstr "物件" - -#: builtin/branch.c:658 -msgid "print only branches of the object" -msgstr "只列印指向該物件的分支" - -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 -msgid "sorting and filtering are case insensitive" -msgstr "排序和過濾屬於大小寫不敏感" - -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 -#: builtin/verify-tag.c:38 -msgid "format to use for the output" -msgstr "輸出格式" - -#: builtin/branch.c:684 builtin/clone.c:785 -msgid "HEAD not found below refs/heads!" -msgstr "HEAD 沒有位於 /refs/heads 之下！" - -#: builtin/branch.c:708 -msgid "--column and --verbose are incompatible" -msgstr "--column 和 --verbose 不相容" - -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 -msgid "branch name required" -msgstr "必須提供分支名" - -#: builtin/branch.c:753 -msgid "Cannot give description to detached HEAD" -msgstr "不能向分離開頭指標提供描述" - -#: builtin/branch.c:758 -msgid "cannot edit description of more than one branch" -msgstr "不能為一個以上的分支編輯描述" - -#: builtin/branch.c:765 -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "分支 '%s' 尚無提交。" - -#: builtin/branch.c:768 -#, c-format -msgid "No branch named '%s'." -msgstr "沒有分支 '%s'。" - -#: builtin/branch.c:783 -msgid "too many branches for a copy operation" -msgstr "為複製動作提供了太多的分支名" - -#: builtin/branch.c:792 -msgid "too many arguments for a rename operation" -msgstr "為重新命名動作提供了太多的參數" - -#: builtin/branch.c:797 -msgid "too many arguments to set new upstream" -msgstr "為設定新上游提供了太多的參數" - -#: builtin/branch.c:801 -#, c-format -msgid "" -"could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。" - -#: builtin/branch.c:804 builtin/branch.c:827 -#, c-format -msgid "no such branch '%s'" -msgstr "沒有此分支 '%s'" - -#: builtin/branch.c:808 -#, c-format -msgid "branch '%s' does not exist" -msgstr "分支 '%s' 不存在" - -#: builtin/branch.c:821 -msgid "too many arguments to unset upstream" -msgstr "為取消上游設定動作提供了太多的參數" - -#: builtin/branch.c:825 -msgid "could not unset upstream of HEAD when it does not point to any branch." -msgstr "無法取消 HEAD 的上游設定因為它沒有指向一個分支" - -#: builtin/branch.c:831 -#, c-format -msgid "Branch '%s' has no upstream information" -msgstr "分支 '%s' 沒有上游訊息" - -#: builtin/branch.c:841 -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" -"您是否想要使用：-a|-r --list <模式>？" - -#: builtin/branch.c:845 -msgid "" -"the '--set-upstream' option is no longer supported. Please use '--track' or " -"'--set-upstream-to' instead." -msgstr "" -"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。" - -#: builtin/bundle.c:15 builtin/bundle.c:23 -msgid "git bundle create [<options>] <file> <git-rev-list args>" -msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>" - -#: builtin/bundle.c:16 builtin/bundle.c:28 -msgid "git bundle verify [<options>] <file>" -msgstr "git bundle verify [<選項>] <檔案>" - -#: builtin/bundle.c:17 builtin/bundle.c:33 -msgid "git bundle list-heads <file> [<refname>...]" -msgstr "git bundle list-heads <檔案> [<參考名稱>...]" - -#: builtin/bundle.c:18 builtin/bundle.c:38 -msgid "git bundle unbundle <file> [<refname>...]" -msgstr "git bundle unbundle <檔案> [<參考名稱>...]" - -#: builtin/bundle.c:66 builtin/pack-objects.c:3375 -msgid "do not show progress meter" -msgstr "不顯示進度表" - -#: builtin/bundle.c:68 builtin/pack-objects.c:3377 -msgid "show progress meter" -msgstr "顯示進度表" - -#: builtin/bundle.c:70 builtin/pack-objects.c:3379 -msgid "show progress meter during object writing phase" -msgstr "在物件寫入階段顯示進度表" - -#: builtin/bundle.c:73 builtin/pack-objects.c:3382 -msgid "similar to --all-progress when progress meter is shown" -msgstr "當進度表顯示時類似於 --all-progress" - -#: builtin/bundle.c:93 -msgid "Need a repository to create a bundle." -msgstr "需要一個版本庫來建立包。" - -#: builtin/bundle.c:104 -msgid "do not show bundle details" -msgstr "不顯示包 (bundle) 詳細資訊" - -#: builtin/bundle.c:119 -#, c-format -msgid "%s is okay\n" -msgstr "%s 可以\n" - -#: builtin/bundle.c:160 -msgid "Need a repository to unbundle." -msgstr "需要一個版本庫來解包。" - -#: builtin/bundle.c:168 builtin/remote.c:1686 -msgid "be verbose; must be placed before a subcommand" -msgstr "詳細輸出；必須置於子指令之前" - -#: builtin/bundle.c:190 builtin/remote.c:1717 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "未知子指令：%s" - -#: builtin/cat-file.c:595 -msgid "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | <type> | --textconv | --filters) [--path=<path>] <object>" -msgstr "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" -"p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>" - -#: builtin/cat-file.c:596 -msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" -msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" - -#: builtin/cat-file.c:617 -msgid "only one batch option may be specified" -msgstr "只能指定一個批次處理選項" - -#: builtin/cat-file.c:635 -msgid "<type> can be one of: blob, tree, commit, tag" -msgstr "<類型> 可以是其中之一：blob、tree、commit、tag" - -#: builtin/cat-file.c:636 -msgid "show object type" -msgstr "顯示物件類型" - -#: builtin/cat-file.c:637 -msgid "show object size" -msgstr "顯示物件大小" - -#: builtin/cat-file.c:639 -msgid "exit with zero when there's no error" -msgstr "當沒有錯誤時離開並返回零" - -#: builtin/cat-file.c:640 -msgid "pretty-print object's content" -msgstr "美觀地列印物件的內容" - -#: builtin/cat-file.c:642 -msgid "for blob objects, run textconv on object's content" -msgstr "對於資料物件，對其內容做文字轉換" - -#: builtin/cat-file.c:644 -msgid "for blob objects, run filters on object's content" -msgstr "對於資料物件，對其內容做過濾" - -#: builtin/cat-file.c:645 git-submodule.sh:1002 -msgid "blob" -msgstr "資料物件" - -#: builtin/cat-file.c:646 -msgid "use a specific path for --textconv/--filters" -msgstr "對於 --textconv/--filters 使用一個特定的路徑" - -#: builtin/cat-file.c:648 -msgid "allow -s and -t to work with broken/corrupt objects" -msgstr "允許 -s 和 -t 對損壞的物件生效" - -#: builtin/cat-file.c:649 -msgid "buffer --batch output" -msgstr "緩衝 --batch 的輸出" - -#: builtin/cat-file.c:651 -msgid "show info and content of objects fed from the standard input" -msgstr "顯示從標準輸入提供的物件的訊息和內容" - -#: builtin/cat-file.c:655 -msgid "show info about objects fed from the standard input" -msgstr "顯示從標準輸入提供的物件的訊息" - -#: builtin/cat-file.c:659 -msgid "follow in-tree symlinks (used with --batch or --batch-check)" -msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）" - -#: builtin/cat-file.c:661 -msgid "show all objects with --batch or --batch-check" -msgstr "使用 --batch 或 --batch-check 參數顯示所有物件" - -#: builtin/cat-file.c:663 -msgid "do not order --batch-all-objects output" -msgstr "不要對 --batch-all-objects 的輸出排序" - -#: builtin/check-attr.c:13 -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..." - -#: builtin/check-attr.c:14 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]" - -#: builtin/check-attr.c:21 -msgid "report all attributes set on file" -msgstr "報告設定在檔案上的所有屬性" - -#: builtin/check-attr.c:22 -msgid "use .gitattributes only from the index" -msgstr "只使用索引中的 .gitattributes" - -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102 -msgid "read file names from stdin" -msgstr "從標準輸入讀出檔案名" - -#: builtin/check-attr.c:25 builtin/check-ignore.c:27 -msgid "terminate input and output records by a NUL character" -msgstr "輸入和輸出的紀錄使用 NUL 字元終結" - -#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 -#: builtin/worktree.c:499 -msgid "suppress progress reporting" -msgstr "不顯示進度報告" - -#: builtin/check-ignore.c:29 -msgid "show non-matching input paths" -msgstr "顯示未符合的輸入路徑" - -#: builtin/check-ignore.c:31 -msgid "ignore index when checking" -msgstr "檢查時忽略索引" - -#: builtin/check-ignore.c:163 -msgid "cannot specify pathnames with --stdin" -msgstr "不能同時指定路徑及 --stdin 參數" - -#: builtin/check-ignore.c:166 -msgid "-z only makes sense with --stdin" -msgstr "-z 需要和 --stdin 參數共用才有意義" - -#: builtin/check-ignore.c:168 -msgid "no path specified" -msgstr "未指定路徑" - -#: builtin/check-ignore.c:172 -msgid "--quiet is only valid with a single pathname" -msgstr "參數 --quiet 只在提供一個路徑名時有效" - -#: builtin/check-ignore.c:174 -msgid "cannot have both --quiet and --verbose" -msgstr "不能同時提供 --quiet 和 --verbose 參數" - -#: builtin/check-ignore.c:177 -msgid "--non-matching is only valid with --verbose" -msgstr "--non-matching 選項只在使用 --verbose 時有效" - -#: builtin/check-mailmap.c:9 -msgid "git check-mailmap [<options>] <contact>..." -msgstr "git check-mailmap [<選項>] <聯繫位址>..." - -#: builtin/check-mailmap.c:14 -msgid "also read contacts from stdin" -msgstr "還從標準輸入讀取聯繫位址" - -#: builtin/check-mailmap.c:25 -#, c-format -msgid "unable to parse contact: %s" -msgstr "不能解析聯繫位址：%s" - -#: builtin/check-mailmap.c:48 -msgid "no contacts specified" -msgstr "未指定聯繫位址" - -#: builtin/checkout-index.c:131 -msgid "git checkout-index [<options>] [--] [<file>...]" -msgstr "git checkout-index [<選項>] [--] [<檔案>...]" - -#: builtin/checkout-index.c:148 -msgid "stage should be between 1 and 3 or all" -msgstr "索引值應該取值 1 到 3 或者 all" - -#: builtin/checkout-index.c:164 -msgid "check out all files in the index" -msgstr "簽出索引區的所有檔案" - -#: builtin/checkout-index.c:165 -msgid "force overwrite of existing files" -msgstr "強制覆蓋現有的檔案" - -#: builtin/checkout-index.c:167 -msgid "no warning for existing files and files not in index" -msgstr "存在或不在索引中的檔案都沒有警告" - -#: builtin/checkout-index.c:169 -msgid "don't checkout new files" -msgstr "不簽出新檔案" - -#: builtin/checkout-index.c:171 -msgid "update stat information in the index file" -msgstr "更新索引中檔案的狀態訊息" - -#: builtin/checkout-index.c:175 -msgid "read list of paths from the standard input" -msgstr "從標準輸入讀取路徑列表" - -#: builtin/checkout-index.c:177 -msgid "write the content to temporary files" -msgstr "將內容寫入暫存檔" - -#: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:672 -msgid "string" -msgstr "字串" - -#: builtin/checkout-index.c:179 -msgid "when creating files, prepend <string>" -msgstr "在建立檔案時，在前面加上 <字串>" - -#: builtin/checkout-index.c:181 -msgid "copy out the files from named stage" -msgstr "從指定暫存區中拷出檔案" - -#: builtin/checkout.c:31 -msgid "git checkout [<options>] <branch>" -msgstr "git checkout [<選項>] <分支>" - -#: builtin/checkout.c:32 -msgid "git checkout [<options>] [<branch>] -- <file>..." -msgstr "git checkout [<選項>] [<分支>] -- <檔案>..." - -#: builtin/checkout.c:37 -msgid "git switch [<options>] [<branch>]" -msgstr "git switch [<選項>] [<分支>]" - -#: builtin/checkout.c:42 -msgid "git restore [<options>] [--source=<branch>] <file>..." -msgstr "git restore [<選項>] [--source=<分支>] <檔案>..." - -#: builtin/checkout.c:175 builtin/checkout.c:214 -#, c-format -msgid "path '%s' does not have our version" -msgstr "路徑 '%s' 沒有我們的版本" - -#: builtin/checkout.c:177 builtin/checkout.c:216 -#, c-format -msgid "path '%s' does not have their version" -msgstr "路徑 '%s' 沒有他們的版本" - -#: builtin/checkout.c:193 -#, c-format -msgid "path '%s' does not have all necessary versions" -msgstr "路徑 '%s' 沒有全部必需的版本" - -#: builtin/checkout.c:243 -#, c-format -msgid "path '%s' does not have necessary versions" -msgstr "路徑 '%s' 沒有必需的版本" - -#: builtin/checkout.c:261 -#, c-format -msgid "path '%s': cannot merge" -msgstr "path '%s'：無法合併" - -#: builtin/checkout.c:277 -#, c-format -msgid "Unable to add merge result for '%s'" -msgstr "無法為 '%s' 新增合併結果" - -#: builtin/checkout.c:377 -#, c-format -msgid "Recreated %d merge conflict" -msgid_plural "Recreated %d merge conflicts" -msgstr[0] "重新建立了 %d 個合併衝突" - -#: builtin/checkout.c:382 -#, c-format -msgid "Updated %d path from %s" -msgid_plural "Updated %d paths from %s" -msgstr[0] "從 %2$s 更新了 %1$d 個路徑" - -#: builtin/checkout.c:389 -#, c-format -msgid "Updated %d path from the index" -msgid_plural "Updated %d paths from the index" -msgstr[0] "從索引區更新了 %d 個路徑" - -#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 -#: builtin/checkout.c:422 -#, c-format -msgid "'%s' cannot be used with updating paths" -msgstr "'%s' 不能在更新路徑時使用" - -#: builtin/checkout.c:425 builtin/checkout.c:428 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "'%s' 不能和 %s 同時使用" - -#: builtin/checkout.c:432 -#, c-format -msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "不能同時更新路徑並切換到分支'%s'。" - -#: builtin/checkout.c:436 -#, c-format -msgid "neither '%s' or '%s' is specified" -msgstr "'%s' 或 '%s' 都沒有指定" - -#: builtin/checkout.c:440 -#, c-format -msgid "'%s' must be used when '%s' is not specified" -msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" - -#: builtin/checkout.c:445 builtin/checkout.c:450 -#, c-format -msgid "'%s' or '%s' cannot be used with %s" -msgstr "'%s' 或 '%s' 不能和 %s 一起使用" - -#: builtin/checkout.c:509 builtin/checkout.c:516 -#, c-format -msgid "path '%s' is unmerged" -msgstr "路徑 '%s' 未合併" - -#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 -msgid "you need to resolve your current index first" -msgstr "您需要先解決目前索引的衝突" - -#: builtin/checkout.c:734 -#, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"不能繼續，下列檔案有暫存的修改：\n" -"%s" - -#: builtin/checkout.c:837 -#, c-format -msgid "Can not do reflog for '%s': %s\n" -msgstr "不能對 '%s' 執行 reflog 動作：%s\n" - -#: builtin/checkout.c:879 -msgid "HEAD is now at" -msgstr "HEAD 目前位於" - -#: builtin/checkout.c:883 builtin/clone.c:717 -msgid "unable to update HEAD" -msgstr "不能更新 HEAD" - -#: builtin/checkout.c:887 -#, c-format -msgid "Reset branch '%s'\n" -msgstr "重設分支 '%s'\n" - -#: builtin/checkout.c:890 -#, c-format -msgid "Already on '%s'\n" -msgstr "已經位於 '%s'\n" - -#: builtin/checkout.c:894 -#, c-format -msgid "Switched to and reset branch '%s'\n" -msgstr "切換並重設分支 '%s'\n" - -#: builtin/checkout.c:896 builtin/checkout.c:1320 -#, c-format -msgid "Switched to a new branch '%s'\n" -msgstr "切換到一個新分支 '%s'\n" - -#: builtin/checkout.c:898 -#, c-format -msgid "Switched to branch '%s'\n" -msgstr "切換到分支 '%s'\n" - -# 譯者：請維持前導空格 -#: builtin/checkout.c:949 -#, c-format -msgid " ... and %d more.\n" -msgstr " ... 及其它 %d 個。\n" - -#: builtin/checkout.c:955 -#, c-format -msgid "" -"Warning: you are leaving %d commit behind, not connected to\n" -"any of your branches:\n" -"\n" -"%s\n" -msgid_plural "" -"Warning: you are leaving %d commits behind, not connected to\n" -"any of your branches:\n" -"\n" -"%s\n" -msgstr[0] "" -"警告：您正丟下 %d 個提交，未和任何分支關聯：\n" -"\n" -"%s\n" - -#: builtin/checkout.c:974 -#, c-format -msgid "" -"If you want to keep it by creating a new branch, this may be a good time\n" -"to do so with:\n" -"\n" -" git branch <new-branch-name> %s\n" -"\n" -msgid_plural "" -"If you want to keep them by creating a new branch, this may be a good time\n" -"to do so with:\n" -"\n" -" git branch <new-branch-name> %s\n" -"\n" -msgstr[0] "" -"如果您想要透過建立新分支儲存它，這可能是一個好時候。\n" -"如下動作：\n" -"\n" -" git branch <新分支名> %s\n" -"\n" - -#: builtin/checkout.c:1009 -msgid "internal error in revision walk" -msgstr "在版本遍歷時遇到內部錯誤" - -#: builtin/checkout.c:1013 -msgid "Previous HEAD position was" -msgstr "之前的 HEAD 位置是" - -#: builtin/checkout.c:1053 builtin/checkout.c:1315 -msgid "You are on a branch yet to be born" -msgstr "您位於一個尚未初始化的分支" - -#: builtin/checkout.c:1128 -#, c-format -msgid "" -"'%s' could be both a local file and a tracking branch.\n" -"Please use -- (and optionally --no-guess) to disambiguate" -msgstr "" -"'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" -"請使用 --（和可選的 --no-guess）來消除歧義" - -#: builtin/checkout.c:1135 -msgid "" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n" -"使用 --track 選項寫出全名：\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" -"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" - -#: builtin/checkout.c:1145 -#, c-format -msgid "'%s' matched multiple (%d) remote tracking branches" -msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" - -#: builtin/checkout.c:1211 -msgid "only one reference expected" -msgstr "預期只有一個引用" - -#: builtin/checkout.c:1228 -#, c-format -msgid "only one reference expected, %d given." -msgstr "應只有一個引用，卻給出了 %d 個" - -#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 -#, c-format -msgid "invalid reference: %s" -msgstr "無效引用：%s" - -#: builtin/checkout.c:1287 builtin/checkout.c:1649 -#, c-format -msgid "reference is not a tree: %s" -msgstr "引用不是一個樹：%s" - -#: builtin/checkout.c:1334 -#, c-format -msgid "a branch is expected, got tag '%s'" -msgstr "期望一個分支，得到標籤 '%s'" - -#: builtin/checkout.c:1336 -#, c-format -msgid "a branch is expected, got remote branch '%s'" -msgstr "期望一個分支，得到遠端分支 '%s'" - -#: builtin/checkout.c:1337 builtin/checkout.c:1345 -#, c-format -msgid "a branch is expected, got '%s'" -msgstr "期望一個分支，得到 '%s'" - -#: builtin/checkout.c:1340 -#, c-format -msgid "a branch is expected, got commit '%s'" -msgstr "期望一個分支，得到提交 '%s'" - -#: builtin/checkout.c:1356 -msgid "" -"cannot switch branch while merging\n" -"Consider \"git merge --quit\" or \"git worktree add\"." -msgstr "" -"不能在合併時切換分支\n" -"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" - -#: builtin/checkout.c:1360 -msgid "" -"cannot switch branch in the middle of an am session\n" -"Consider \"git am --quit\" or \"git worktree add\"." -msgstr "" -"不能在 am 工作階段期間切換分支\n" -"考慮使用 \"git am --quit\" 或 \"git worktree add\"。" - -#: builtin/checkout.c:1364 -msgid "" -"cannot switch branch while rebasing\n" -"Consider \"git rebase --quit\" or \"git worktree add\"." -msgstr "" -"不能在重定基底時切換分支\n" -"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" - -#: builtin/checkout.c:1368 -msgid "" -"cannot switch branch while cherry-picking\n" -"Consider \"git cherry-pick --quit\" or \"git worktree add\"." -msgstr "" -"不能在揀選時切換分支\n" -"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" - -#: builtin/checkout.c:1372 -msgid "" -"cannot switch branch while reverting\n" -"Consider \"git revert --quit\" or \"git worktree add\"." -msgstr "" -"不能在還原時切換分支\n" -"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" - -#: builtin/checkout.c:1376 -msgid "you are switching branch while bisecting" -msgstr "您在執行二分尋找時切換分支" - -#: builtin/checkout.c:1383 -msgid "paths cannot be used with switching branches" -msgstr "路徑不能和切換分支同時使用" - -#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 -#, c-format -msgid "'%s' cannot be used with switching branches" -msgstr "'%s' 不能和切換分支同時使用" - -#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 -#: builtin/checkout.c:1409 builtin/checkout.c:1414 -#, c-format -msgid "'%s' cannot be used with '%s'" -msgstr "'%s' 不能和 '%s' 同時使用" - -#: builtin/checkout.c:1411 -#, c-format -msgid "'%s' cannot take <start-point>" -msgstr "'%s' 不帶 <起始點>" - -#: builtin/checkout.c:1419 -#, c-format -msgid "Cannot switch branch to a non-commit '%s'" -msgstr "不能切換分支到一個非提交 '%s'" - -#: builtin/checkout.c:1426 -msgid "missing branch or commit argument" -msgstr "缺少分支或提交參數" - -#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 -#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 -#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "強制顯示進度報告" - -#: builtin/checkout.c:1469 -msgid "perform a 3-way merge with the new branch" -msgstr "和新的分支執行三方合併" - -#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 -msgid "style" -msgstr "風格" - -#: builtin/checkout.c:1471 -msgid "conflict style (merge or diff3)" -msgstr "衝突輸出風格（merge 或 diff3）" - -#: builtin/checkout.c:1483 builtin/worktree.c:496 -msgid "detach HEAD at named commit" -msgstr "HEAD 從指定的提交分離" - -#: builtin/checkout.c:1484 -msgid "set upstream info for new branch" -msgstr "為新的分支設定上游訊息" - -#: builtin/checkout.c:1486 -msgid "force checkout (throw away local modifications)" -msgstr "強制簽出（捨棄本機修改）" - -#: builtin/checkout.c:1488 -msgid "new-branch" -msgstr "新分支" - -#: builtin/checkout.c:1488 -msgid "new unparented branch" -msgstr "新的沒有父提交的分支" - -#: builtin/checkout.c:1490 builtin/merge.c:289 -msgid "update ignored files (default)" -msgstr "更新忽略的檔案（預設）" - -#: builtin/checkout.c:1493 -msgid "do not check if another worktree is holding the given ref" -msgstr "不檢查指定的引用是否被其他工作區所占用" - -#: builtin/checkout.c:1506 -msgid "checkout our version for unmerged files" -msgstr "對尚未合併的檔案簽出我們的版本" - -#: builtin/checkout.c:1509 -msgid "checkout their version for unmerged files" -msgstr "對尚未合併的檔案簽出他們的版本" - -#: builtin/checkout.c:1513 -msgid "do not limit pathspecs to sparse entries only" -msgstr "對路徑不做稀疏簽出的限制" - -#: builtin/checkout.c:1565 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b、-B 和 --orphan 是互斥的" - -#: builtin/checkout.c:1568 -msgid "-p and --overlay are mutually exclusive" -msgstr "-p 和 --overlay 互斥" - -#: builtin/checkout.c:1605 -msgid "--track needs a branch name" -msgstr "--track 需要一個分支名" - -#: builtin/checkout.c:1610 -msgid "missing branch name; try -b" -msgstr "缺少分支名，嘗試 -b" - -#: builtin/checkout.c:1642 -#, c-format -msgid "could not resolve %s" -msgstr "無法解析 %s" - -#: builtin/checkout.c:1658 -msgid "invalid path specification" -msgstr "無效的路徑規格" - -#: builtin/checkout.c:1665 -#, c-format -msgid "'%s' is not a commit and a branch '%s' cannot be created from it" -msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" - -#: builtin/checkout.c:1669 -#, c-format -msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout：--detach 不能接收路徑參數 '%s'" - -#: builtin/checkout.c:1678 -msgid "--pathspec-from-file is incompatible with --detach" -msgstr "--pathspec-from-file 與 --detach 不相容" - -#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 -msgid "--pathspec-from-file is incompatible with --patch" -msgstr "--pathspec-from-file 與 --patch 不相容" - -#: builtin/checkout.c:1692 -msgid "" -"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" -"checking out of the index." -msgstr "" -"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。" - -#: builtin/checkout.c:1697 -msgid "you must specify path(s) to restore" -msgstr "您必須指定一個要復原的路徑" - -#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 -#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 -msgid "branch" -msgstr "分支" - -#: builtin/checkout.c:1724 -msgid "create and checkout a new branch" -msgstr "建立並簽出一個新的分支" - -#: builtin/checkout.c:1726 -msgid "create/reset and checkout a branch" -msgstr "建立/重設並簽出一個分支" - -#: builtin/checkout.c:1727 -msgid "create reflog for new branch" -msgstr "為新的分支建立引用日誌" - -#: builtin/checkout.c:1729 -msgid "second guess 'git checkout <no-such-branch>' (default)" -msgstr "二次猜測 'git checkout <無此分支>'（預設）" - -#: builtin/checkout.c:1730 -msgid "use overlay mode (default)" -msgstr "使用疊加模式（預設）" - -#: builtin/checkout.c:1775 -msgid "create and switch to a new branch" -msgstr "建立並切換一個新分支" - -#: builtin/checkout.c:1777 -msgid "create/reset and switch to a branch" -msgstr "建立/重設並切換一個分支" - -#: builtin/checkout.c:1779 -msgid "second guess 'git switch <no-such-branch>'" -msgstr "二次猜測 'git switch <無此分支>'" - -#: builtin/checkout.c:1781 -msgid "throw away local modifications" -msgstr "捨棄本機修改" - -#: builtin/checkout.c:1813 -msgid "which tree-ish to checkout from" -msgstr "要簽出哪一個樹" - -#: builtin/checkout.c:1815 -msgid "restore the index" -msgstr "復原索引" - -#: builtin/checkout.c:1817 -msgid "restore the working tree (default)" -msgstr "復原工作區（預設）" - -#: builtin/checkout.c:1819 -msgid "ignore unmerged entries" -msgstr "忽略未合併條目" - -#: builtin/checkout.c:1820 -msgid "use overlay mode" -msgstr "使用疊加模式" - -#: builtin/clean.c:28 -msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..." - -#: builtin/clean.c:32 -#, c-format -msgid "Removing %s\n" -msgstr "正刪除 %s\n" - -#: builtin/clean.c:33 -#, c-format -msgid "Would remove %s\n" -msgstr "將刪除 %s\n" - -#: builtin/clean.c:34 -#, c-format -msgid "Skipping repository %s\n" -msgstr "忽略版本庫 %s\n" - -#: builtin/clean.c:35 -#, c-format -msgid "Would skip repository %s\n" -msgstr "將忽略版本庫 %s\n" - -#: builtin/clean.c:36 -#, c-format -msgid "failed to remove %s" -msgstr "刪除 %s 失敗" - -#: builtin/clean.c:37 -#, c-format -msgid "could not lstat %s\n" -msgstr "不能對 %s 呼叫 lstat\n" - -#: builtin/clean.c:301 git-add--interactive.perl:595 -#, c-format -msgid "" -"Prompt help:\n" -"1 - select a numbered item\n" -"foo - select item based on unique prefix\n" -" - (empty) select nothing\n" -msgstr "" -"協助：\n" -"1 - 透過編號選擇一個選項\n" -"foo - 透過唯一前綴選擇一個選項\n" -" - （空）什麼也不選擇\n" - -#: builtin/clean.c:305 git-add--interactive.perl:604 -#, c-format -msgid "" -"Prompt help:\n" -"1 - select a single item\n" -"3-5 - select a range of items\n" -"2-3,6-9 - select multiple ranges\n" -"foo - select item based on unique prefix\n" -"-... - unselect specified items\n" -"* - choose all items\n" -" - (empty) finish selecting\n" -msgstr "" -"協助：\n" -"1 - 選擇一個選項\n" -"3-5 - 選擇一個範圍內的所有選項\n" -"2-3,6-9 - 選擇多個範圍內的所有選項\n" -"foo - 透過唯一前綴選擇一個選項\n" -"-... - 反選特定的選項\n" -"* - 選擇所有選項\n" -" - （空）結束選擇\n" - -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 -#, c-format, perl-format -msgid "Huh (%s)?\n" -msgstr "嗯（%s）？\n" - -#: builtin/clean.c:663 -#, c-format -msgid "Input ignore patterns>> " -msgstr "輸入範本以排除條目>> " - -#: builtin/clean.c:700 -#, c-format -msgid "WARNING: Cannot find items matched by: %s" -msgstr "警告：無法找到和 %s 符合的條目" - -#: builtin/clean.c:721 -msgid "Select items to delete" -msgstr "選擇要刪除的條目" - -#. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 -#, c-format -msgid "Remove %s [y/N]? " -msgstr "刪除 %s [y/N]？" - -#: builtin/clean.c:795 -msgid "" -"clean - start cleaning\n" -"filter by pattern - exclude items from deletion\n" -"select by numbers - select items to be deleted by numbers\n" -"ask each - confirm each deletion (like \"rm -i\")\n" -"quit - stop cleaning\n" -"help - this screen\n" -"? - help for prompt selection" -msgstr "" -"clean - 開始清理\n" -"filter by pattern - 透過範本排除要刪除的條目\n" -"select by numbers - 透過數字選擇要刪除的條目\n" -"ask each - 針對刪除逐一詢問（就像 \"rm -i\"）\n" -"quit - 停止刪除並離開\n" -"help - 顯示本協助\n" -"? - 顯示如何在提示符下選擇的協助" - -#: builtin/clean.c:831 -msgid "Would remove the following item:" -msgid_plural "Would remove the following items:" -msgstr[0] "將刪除如下條目：" - -#: builtin/clean.c:847 -msgid "No more files to clean, exiting." -msgstr "沒有要清理的檔案，離開。" - -#: builtin/clean.c:909 -msgid "do not print names of files removed" -msgstr "不列印刪除檔案的名稱" - -#: builtin/clean.c:911 -msgid "force" -msgstr "強制" - -#: builtin/clean.c:912 -msgid "interactive cleaning" -msgstr "互動式清除" - -#: builtin/clean.c:914 -msgid "remove whole directories" -msgstr "刪除整個目錄" - -#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 -#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 -#: builtin/show-ref.c:179 -msgid "pattern" -msgstr "模式" - -#: builtin/clean.c:916 -msgid "add <pattern> to ignore rules" -msgstr "新增 <模式> 到忽略規則" - -#: builtin/clean.c:917 -msgid "remove ignored files, too" -msgstr "也刪除忽略的檔案" - -#: builtin/clean.c:919 -msgid "remove only ignored files" -msgstr "只刪除忽略的檔案" - -#: builtin/clean.c:937 -msgid "-x and -X cannot be used together" -msgstr "-x 和 -X 不能同時使用" - -#: builtin/clean.c:941 -msgid "" -"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " -"clean" -msgstr "" -"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" - -#: builtin/clean.c:944 -msgid "" -"clean.requireForce defaults to true and neither -i, -n, nor -f given; " -"refusing to clean" -msgstr "" -"clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" - -#: builtin/clone.c:45 -msgid "git clone [<options>] [--] <repo> [<dir>]" -msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]" - -#: builtin/clone.c:93 -msgid "don't create a checkout" -msgstr "不建立一個簽出" - -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 -msgid "create a bare repository" -msgstr "建立一個純版本庫" - -#: builtin/clone.c:98 -msgid "create a mirror repository (implies bare)" -msgstr "建立一個鏡像版本庫（也是純版本庫）" - -#: builtin/clone.c:100 -msgid "to clone from a local repository" -msgstr "從本機版本庫複製" - -#: builtin/clone.c:102 -msgid "don't use local hardlinks, always copy" -msgstr "不使用本機硬連結，始終複製" - -#: builtin/clone.c:104 -msgid "setup as shared repository" -msgstr "設定為共享版本庫" - -#: builtin/clone.c:107 -msgid "pathspec" -msgstr "路徑規格" - -#: builtin/clone.c:107 -msgid "initialize submodules in the clone" -msgstr "在複製時初始化子模組" - -#: builtin/clone.c:110 -msgid "number of submodules cloned in parallel" -msgstr "並發複製的子模組的數量" - -#: builtin/clone.c:111 builtin/init-db.c:486 -msgid "template-directory" -msgstr "範本目錄" - -#: builtin/clone.c:112 builtin/init-db.c:487 -msgid "directory from which templates will be used" -msgstr "範本目錄將被使用" - -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 -msgid "reference repository" -msgstr "參考版本庫" - -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 -msgid "use --reference only while cloning" -msgstr "僅在複製時參考 --reference 指向的本機版本庫" - -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3441 builtin/repack.c:327 -msgid "name" -msgstr "名稱" - -#: builtin/clone.c:120 -msgid "use <name> instead of 'origin' to track upstream" -msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" - -#: builtin/clone.c:122 -msgid "checkout <branch> instead of the remote's HEAD" -msgstr "簽出 <分支> 而不是遠端 HEAD" - -#: builtin/clone.c:124 -msgid "path to git-upload-pack on the remote" -msgstr "遠端 git-upload-pack 路徑" - -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 -#: builtin/pull.c:207 -msgid "depth" -msgstr "深度" - -#: builtin/clone.c:126 -msgid "create a shallow clone of that depth" -msgstr "建立一個指定深度的淺複製" - -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 -msgid "time" -msgstr "時間" - -#: builtin/clone.c:128 -msgid "create a shallow clone since a specific time" -msgstr "從一個特定時間建立一個淺複製" - -#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1480 -msgid "revision" -msgstr "版本" - -#: builtin/clone.c:130 builtin/fetch.c:173 -msgid "deepen history of shallow clone, excluding rev" -msgstr "深化淺複製的歷史，除了特定版本" - -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 -msgid "clone only one branch, HEAD or --branch" -msgstr "只複製一個分支、HEAD 或 --branch" - -#: builtin/clone.c:134 -msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "不要複製任何標籤，並且後續取得動作也不下載它們" - -#: builtin/clone.c:136 -msgid "any cloned submodules will be shallow" -msgstr "子模組將以淺下載模式複製" - -#: builtin/clone.c:137 builtin/init-db.c:495 -msgid "gitdir" -msgstr "git目錄" - -#: builtin/clone.c:138 builtin/init-db.c:496 -msgid "separate git dir from working tree" -msgstr "git目錄和工作區分離" - -#: builtin/clone.c:139 -msgid "key=value" -msgstr "key=value" - -#: builtin/clone.c:140 -msgid "set config inside the new repository" -msgstr "在新版本庫中設定設定訊息" - -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:172 -msgid "server-specific" -msgstr "server-specific" - -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 -#: builtin/push.c:573 builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "傳輸選項" - -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 -#: builtin/push.c:574 -msgid "use IPv4 addresses only" -msgstr "只使用 IPv4 位址" - -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 -#: builtin/push.c:576 -msgid "use IPv6 addresses only" -msgstr "只使用 IPv6 位址" - -#: builtin/clone.c:149 -msgid "any cloned submodules will use their remote-tracking branch" -msgstr "任何複製的子模組將使用它們的遠端追蹤分支" - -#: builtin/clone.c:151 -msgid "initialize sparse-checkout file to include only files at root" -msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" - -#: builtin/clone.c:287 -msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -msgstr "" -"無法猜到目錄名。\n" -"請在指令列指定一個目錄" - -#: builtin/clone.c:340 -#, c-format -msgid "info: Could not add alternate for '%s': %s\n" -msgstr "info: 不能為 '%s' 新增一個備用：%s\n" - -#: builtin/clone.c:413 -#, c-format -msgid "%s exists and is not a directory" -msgstr "%s 存在且不是一個目錄" - -#: builtin/clone.c:430 -#, c-format -msgid "failed to start iterator over '%s'" -msgstr "無法在 '%s' 上啟動疊代器" - -#: builtin/clone.c:460 -#, c-format -msgid "failed to create link '%s'" -msgstr "建立連結 '%s' 失敗" - -#: builtin/clone.c:464 -#, c-format -msgid "failed to copy file to '%s'" -msgstr "複製檔案至 '%s' 失敗" - -#: builtin/clone.c:469 -#, c-format -msgid "failed to iterate over '%s'" -msgstr "無法在 '%s' 上疊代" - -#: builtin/clone.c:494 -#, c-format -msgid "done.\n" -msgstr "完成。\n" - -#: builtin/clone.c:508 -msgid "" -"Clone succeeded, but checkout failed.\n" -"You can inspect what was checked out with 'git status'\n" -"and retry with 'git restore --source=HEAD :/'\n" -msgstr "" -"複製成功，但是簽出失敗。\n" -"您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" -"'git restore --source=HEAD :/' 重試\n" - -#: builtin/clone.c:585 -#, c-format -msgid "Could not find remote branch %s to clone." -msgstr "不能發現要複製的遠端分支 %s。" - -#: builtin/clone.c:705 -#, c-format -msgid "unable to update %s" -msgstr "不能更新 %s" - -#: builtin/clone.c:753 -msgid "failed to initialize sparse-checkout" -msgstr "無法初始化稀疏簽出" - -#: builtin/clone.c:776 -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" - -#: builtin/clone.c:807 -msgid "unable to checkout working tree" -msgstr "不能簽出工作區" - -#: builtin/clone.c:862 -msgid "unable to write parameters to config file" -msgstr "無法將參數寫入設定檔案" - -#: builtin/clone.c:925 -msgid "cannot repack to clean up" -msgstr "無法執行 repack 來清理" - -#: builtin/clone.c:927 -msgid "cannot unlink temporary alternates file" -msgstr "無法刪除暫時的 alternates 檔案" - -#: builtin/clone.c:965 builtin/receive-pack.c:1950 -msgid "Too many arguments." -msgstr "太多參數。" - -#: builtin/clone.c:969 -msgid "You must specify a repository to clone." -msgstr "您必須指定一個版本庫來複製。" - -#: builtin/clone.c:982 -#, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "--bare 和 --origin %s 選項不相容。" - -#: builtin/clone.c:985 -msgid "--bare and --separate-git-dir are incompatible." -msgstr "--bare 和 --separate-git-dir 選項不相容。" - -#: builtin/clone.c:998 -#, c-format -msgid "repository '%s' does not exist" -msgstr "版本庫 '%s' 不存在" - -#: builtin/clone.c:1004 builtin/fetch.c:1796 -#, c-format -msgid "depth %s is not a positive number" -msgstr "深度 %s 不是一個正數" - -#: builtin/clone.c:1014 -#, c-format -msgid "destination path '%s' already exists and is not an empty directory." -msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。" - -#: builtin/clone.c:1024 -#, c-format -msgid "working tree '%s' already exists." -msgstr "工作區 '%s' 已經存在。" - -#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "不能為 '%s' 建立先導目錄" - -#: builtin/clone.c:1044 -#, c-format -msgid "could not create work tree dir '%s'" -msgstr "不能建立工作區目錄 '%s'" - -#: builtin/clone.c:1064 -#, c-format -msgid "Cloning into bare repository '%s'...\n" -msgstr "複製到純版本庫 '%s'...\n" - -#: builtin/clone.c:1066 -#, c-format -msgid "Cloning into '%s'...\n" -msgstr "正複製到 '%s'...\n" - -#: builtin/clone.c:1090 -msgid "" -"clone --recursive is not compatible with both --reference and --reference-if-" -"able" -msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容" - -#: builtin/clone.c:1154 -msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。" - -#: builtin/clone.c:1156 -msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。" - -#: builtin/clone.c:1158 -msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。" - -#: builtin/clone.c:1160 -msgid "--filter is ignored in local clones; use file:// instead." -msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。" - -#: builtin/clone.c:1163 -msgid "source repository is shallow, ignoring --local" -msgstr "源版本庫是淺複製，忽略 --local" - -#: builtin/clone.c:1168 -msgid "--local is ignored" -msgstr "--local 被忽略" - -#: builtin/clone.c:1243 builtin/clone.c:1251 -#, c-format -msgid "Remote branch %s not found in upstream %s" -msgstr "遠端分支 %s 在上游 %s 未發現" - -#: builtin/clone.c:1254 -msgid "You appear to have cloned an empty repository." -msgstr "您似乎複製了一個空版本庫。" - -#: builtin/column.c:10 -msgid "git column [<options>]" -msgstr "git column [<選項>]" - -#: builtin/column.c:27 -msgid "lookup config vars" -msgstr "尋找設定變數" - -#: builtin/column.c:28 builtin/column.c:29 -msgid "layout to use" -msgstr "要使用的配置" - -#: builtin/column.c:30 -msgid "Maximum width" -msgstr "最大寬度" - -#: builtin/column.c:31 -msgid "Padding space on left border" -msgstr "左邊框的填充空間" - -#: builtin/column.c:32 -msgid "Padding space on right border" -msgstr "右邊框的填充空間" - -#: builtin/column.c:33 -msgid "Padding space between columns" -msgstr "兩列之間的填充空間" - -#: builtin/column.c:51 -msgid "--command must be the first argument" -msgstr "--command 必須是第一個參數" - -#: builtin/commit-tree.c:18 -msgid "" -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " -"<file>)...] <tree>" -msgstr "" -"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <檔案" -">)...] <樹>" - -#: builtin/commit-tree.c:31 -#, c-format -msgid "duplicate parent %s ignored" -msgstr "忽略重複的父提交 %s" - -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 -#, c-format -msgid "not a valid object name %s" -msgstr "不是一個有效的物件名 %s" - -#: builtin/commit-tree.c:93 -#, c-format -msgid "git commit-tree: failed to open '%s'" -msgstr "git commit-tree：無法開啟 '%s'" - -#: builtin/commit-tree.c:96 -#, c-format -msgid "git commit-tree: failed to read '%s'" -msgstr "git commit-tree：無法讀取 '%s'" - -#: builtin/commit-tree.c:98 -#, c-format -msgid "git commit-tree: failed to close '%s'" -msgstr "git commit-tree：無法關閉 '%s'" - -#: builtin/commit-tree.c:111 -msgid "parent" -msgstr "父提交" - -#: builtin/commit-tree.c:112 -msgid "id of a parent commit object" -msgstr "父提交物件 ID" - -#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 -#: builtin/tag.c:412 -msgid "message" -msgstr "說明" - -#: builtin/commit-tree.c:115 builtin/commit.c:1501 -msgid "commit message" -msgstr "提交說明" - -#: builtin/commit-tree.c:118 -msgid "read commit log message from file" -msgstr "從檔案中讀取提交說明" - -#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 -#: builtin/pull.c:175 builtin/revert.c:118 -msgid "GPG sign commit" -msgstr "GPG 提交簽名" - -#: builtin/commit-tree.c:133 -msgid "must give exactly one tree" -msgstr "必須精確地提供一個樹" - -#: builtin/commit-tree.c:140 -msgid "git commit-tree: failed to read" -msgstr "git commit-tree：讀取失敗" - -#: builtin/commit.c:41 -msgid "git commit [<options>] [--] <pathspec>..." -msgstr "git commit [<選項>] [--] <路徑規格>..." - -#: builtin/commit.c:46 -msgid "git status [<options>] [--] <pathspec>..." -msgstr "git status [<選項>] [--] <路徑規格>..." - -#: builtin/commit.c:51 -msgid "" -"You asked to amend the most recent commit, but doing so would make\n" -"it empty. You can repeat your command with --allow-empty, or you can\n" -"remove the commit entirely with \"git reset HEAD^\".\n" -msgstr "" -"您要修補最近的提交，但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n" -"--allow-empty 選項，或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n" - -#: builtin/commit.c:56 -msgid "" -"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" -"If you wish to commit it anyway, use:\n" -"\n" -" git commit --allow-empty\n" -"\n" -msgstr "" -"之前的揀選動作現在是一個空提交，可能是由衝突解決導致的。如果您無論如何\n" -"也要提交，使用指令：\n" -"\n" -" git commit --allow-empty\n" -"\n" - -#: builtin/commit.c:63 -msgid "Otherwise, please use 'git cherry-pick --skip'\n" -msgstr "否則，請使用 'git cherry-pick --skip'\n" - -#: builtin/commit.c:66 -msgid "" -"and then use:\n" -"\n" -" git cherry-pick --continue\n" -"\n" -"to resume cherry-picking the remaining commits.\n" -"If you wish to skip this commit, use:\n" -"\n" -" git cherry-pick --skip\n" -"\n" -msgstr "" -"然後使用：\n" -"\n" -" git cherry-pick --continue\n" -"\n" -"來繼續揀選剩餘提交。如果您想跳過此提交，使用：\n" -"\n" -" git cherry-pick --skip\n" -"\n" - -#: builtin/commit.c:315 -msgid "failed to unpack HEAD tree object" -msgstr "解包 HEAD 樹狀物件失敗" - -#: builtin/commit.c:351 -msgid "--pathspec-from-file with -a does not make sense" -msgstr "--pathspec-from-file 和 -a 同時使用沒有意義" - -#: builtin/commit.c:364 -msgid "No paths with --include/--only does not make sense." -msgstr "參數 --include/--only 不跟路徑沒有意義。" - -#: builtin/commit.c:376 -msgid "unable to create temporary index" -msgstr "不能建立暫時索引" - -#: builtin/commit.c:385 -msgid "interactive add failed" -msgstr "互動式新增失敗" - -#: builtin/commit.c:400 -msgid "unable to update temporary index" -msgstr "無法更新暫時索引" - -#: builtin/commit.c:402 -msgid "Failed to update main cache tree" -msgstr "不能更新樹的主快取" - -#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 -msgid "unable to write new_index file" -msgstr "無法寫 new_index 檔案" - -#: builtin/commit.c:479 -msgid "cannot do a partial commit during a merge." -msgstr "在合併過程中不能做部分提交。" - -#: builtin/commit.c:481 -msgid "cannot do a partial commit during a cherry-pick." -msgstr "在揀選過程中不能做部分提交。" - -#: builtin/commit.c:489 -msgid "cannot read the index" -msgstr "無法讀取索引" - -#: builtin/commit.c:508 -msgid "unable to write temporary index file" -msgstr "無法寫暫時索引檔案" - -#: builtin/commit.c:606 -#, c-format -msgid "commit '%s' lacks author header" -msgstr "提交 '%s' 缺少作者訊息" - -#: builtin/commit.c:608 -#, c-format -msgid "commit '%s' has malformed author line" -msgstr "提交 '%s' 有格式錯誤的作者訊息" - -#: builtin/commit.c:627 -msgid "malformed --author parameter" -msgstr "格式錯誤的 --author 參數" - -#: builtin/commit.c:680 -msgid "" -"unable to select a comment character that is not used\n" -"in the current commit message" -msgstr "無法選擇一個未被目前提交說明使用的備註字元" - -#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 -#, c-format -msgid "could not lookup commit %s" -msgstr "不能查詢提交 %s" - -#: builtin/commit.c:730 builtin/shortlog.c:319 -#, c-format -msgid "(reading log message from standard input)\n" -msgstr "（正從標準輸入中讀取日誌訊息）\n" - -#: builtin/commit.c:732 -msgid "could not read log from standard input" -msgstr "不能從標準輸入中讀取日誌訊息" - -#: builtin/commit.c:736 -#, c-format -msgid "could not read log file '%s'" -msgstr "不能讀取日誌檔案 '%s'" - -#: builtin/commit.c:767 builtin/commit.c:783 -msgid "could not read SQUASH_MSG" -msgstr "不能讀取 SQUASH_MSG" - -#: builtin/commit.c:774 -msgid "could not read MERGE_MSG" -msgstr "不能讀取 MERGE_MSG" - -#: builtin/commit.c:834 -msgid "could not write commit template" -msgstr "不能寫提交範本" - -#: builtin/commit.c:853 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" -msgstr "" -"\n" -"似乎您正在做一個合併提交。如果不對，請刪除檔案\n" -"\t%s\n" -"然後重試。\n" - -#: builtin/commit.c:858 -#, c-format -msgid "" -"\n" -"It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" -"and try again.\n" -msgstr "" -"\n" -"似乎您正在做一個揀選提交。如果不對，請刪除檔案\n" -"\t%s\n" -"然後重試。\n" - -#: builtin/commit.c:871 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -"請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略，而一個空的提交\n" -"說明將會終止提交。\n" - -#: builtin/commit.c:879 -#, c-format -msgid "" -"Please enter the commit message for your changes. Lines starting\n" -"with '%c' will be kept; you may remove them yourself if you want to.\n" -"An empty message aborts the commit.\n" -msgstr "" -"請為您的變更輸入提交說明。以 '%c' 開始的行將被保留，如果您原意\n" -"也可以刪除它們。一個空的提交說明將會終止提交。\n" - -# 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:896 -#, c-format -msgid "%sAuthor: %.*s <%.*s>" -msgstr "%s作者： %.*s <%.*s>" - -# 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:904 -#, c-format -msgid "%sDate: %s" -msgstr "%s日期： %s" - -# 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:911 -#, c-format -msgid "%sCommitter: %.*s <%.*s>" -msgstr "%s提交者：%.*s <%.*s>" - -#: builtin/commit.c:929 -msgid "Cannot read index" -msgstr "無法讀取索引" - -#: builtin/commit.c:997 -msgid "Error building trees" -msgstr "無法建立樹狀物件" - -#: builtin/commit.c:1011 builtin/tag.c:275 -#, c-format -msgid "Please supply the message using either -m or -F option.\n" -msgstr "請使用 -m 或 -F 選項提供提交說明。\n" - -#: builtin/commit.c:1055 -#, c-format -msgid "--author '%s' is not 'Name <email>' and matches no existing author" -msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" - -#: builtin/commit.c:1069 -#, c-format -msgid "Invalid ignored mode '%s'" -msgstr "無效的忽略模式 '%s'" - -#: builtin/commit.c:1087 builtin/commit.c:1327 -#, c-format -msgid "Invalid untracked files mode '%s'" -msgstr "無效的未追蹤檔案參數 '%s'" - -#: builtin/commit.c:1127 -msgid "--long and -z are incompatible" -msgstr "--long 和 -z 選項不相容" - -#: builtin/commit.c:1171 -msgid "Using both --reset-author and --author does not make sense" -msgstr "同時使用 --reset-author 和 --author 沒有意義" - -#: builtin/commit.c:1180 -msgid "You have nothing to amend." -msgstr "您沒有可修補的提交。" - -#: builtin/commit.c:1183 -msgid "You are in the middle of a merge -- cannot amend." -msgstr "您正處於一個合併過程中 -- 無法修補提交。" - -#: builtin/commit.c:1185 -msgid "You are in the middle of a cherry-pick -- cannot amend." -msgstr "您正處於一個揀選過程中 -- 無法修補提交。" - -#: builtin/commit.c:1188 -msgid "Options --squash and --fixup cannot be used together" -msgstr "選項 --squash 和 --fixup 不能同時使用" - -#: builtin/commit.c:1198 -msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "只能用一個 -c/-C/-F/--fixup 選項。" - -#: builtin/commit.c:1200 -msgid "Option -m cannot be combined with -c/-C/-F." -msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" - -#: builtin/commit.c:1208 -msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" - -#: builtin/commit.c:1225 -msgid "Only one of --include/--only/--all/--interactive/--patch can be used." -msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" - -#: builtin/commit.c:1231 -#, c-format -msgid "paths '%s ...' with -a does not make sense" -msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" - -#: builtin/commit.c:1362 builtin/commit.c:1524 -msgid "show status concisely" -msgstr "以簡潔的格式顯示狀態" - -#: builtin/commit.c:1364 builtin/commit.c:1526 -msgid "show branch information" -msgstr "顯示分支訊息" - -#: builtin/commit.c:1366 -msgid "show stash information" -msgstr "顯示儲藏區訊息" - -#: builtin/commit.c:1368 builtin/commit.c:1528 -msgid "compute full ahead/behind values" -msgstr "計算完整的領先/落後值" - -#: builtin/commit.c:1370 -msgid "version" -msgstr "版本" - -#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 -#: builtin/worktree.c:643 -msgid "machine-readable output" -msgstr "機器可讀的輸出" - -#: builtin/commit.c:1373 builtin/commit.c:1532 -msgid "show status in long format (default)" -msgstr "以長格式顯示狀態（預設）" - -#: builtin/commit.c:1376 builtin/commit.c:1535 -msgid "terminate entries with NUL" -msgstr "條目以 NUL 字元結尾" - -#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 -#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 -msgid "mode" -msgstr "模式" - -#: builtin/commit.c:1379 builtin/commit.c:1538 -msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設：all）" - -#: builtin/commit.c:1383 -msgid "" -"show ignored files, optional modes: traditional, matching, no. (Default: " -"traditional)" -msgstr "" -"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設：traditional）" - -#: builtin/commit.c:1385 parse-options.h:192 -msgid "when" -msgstr "何時" - -#: builtin/commit.c:1386 -msgid "" -"ignore changes to submodules, optional when: all, dirty, untracked. " -"(Default: all)" -msgstr "" -"忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設：all）" - -#: builtin/commit.c:1388 -msgid "list untracked files in columns" -msgstr "以列的方式顯示未追蹤的檔案" - -#: builtin/commit.c:1389 -msgid "do not detect renames" -msgstr "不檢測重新命名" - -#: builtin/commit.c:1391 -msgid "detect renames, optionally set similarity index" -msgstr "檢測重新命名，可以設定索引相似度" - -#: builtin/commit.c:1411 -msgid "Unsupported combination of ignored and untracked-files arguments" -msgstr "不支援已忽略和未追蹤檔案參數的組合" - -#: builtin/commit.c:1494 -msgid "suppress summary after successful commit" -msgstr "提交成功後不顯示概述訊息" - -#: builtin/commit.c:1495 -msgid "show diff in commit message template" -msgstr "在提交說明範本裡顯示差異" - -#: builtin/commit.c:1497 -msgid "Commit message options" -msgstr "提交說明選項" - -#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 -msgid "read message from file" -msgstr "從檔案中讀取提交說明" - -#: builtin/commit.c:1499 -msgid "author" -msgstr "作者" - -#: builtin/commit.c:1499 -msgid "override author for commit" -msgstr "提交時覆蓋作者" - -#: builtin/commit.c:1500 builtin/gc.c:538 -msgid "date" -msgstr "日期" - -#: builtin/commit.c:1500 -msgid "override date for commit" -msgstr "提交時覆蓋日期" - -#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 -#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 -msgid "commit" -msgstr "提交" - -#: builtin/commit.c:1502 -msgid "reuse and edit message from specified commit" -msgstr "重用並編輯指定提交的提交說明" - -#: builtin/commit.c:1503 -msgid "reuse message from specified commit" -msgstr "重用指定提交的提交說明" - -#: builtin/commit.c:1504 -msgid "use autosquash formatted message to fixup specified commit" -msgstr "使用 autosquash 格式的提交說明用以修正指定的提交" - -#: builtin/commit.c:1505 -msgid "use autosquash formatted message to squash specified commit" -msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" - -#: builtin/commit.c:1506 -msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" - -#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 -#: builtin/pull.c:144 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "新增 Signed-off-by: 簽名" - -#: builtin/commit.c:1508 -msgid "use specified template file" -msgstr "使用指定的範本檔案" - -#: builtin/commit.c:1509 -msgid "force edit of commit" -msgstr "強制編輯提交" - -#: builtin/commit.c:1511 -msgid "include status in commit message template" -msgstr "在提交說明範本裡包含狀態訊息" - -#: builtin/commit.c:1516 -msgid "Commit contents options" -msgstr "提交內容選項" - -#: builtin/commit.c:1517 -msgid "commit all changed files" -msgstr "提交所有改動的檔案" - -#: builtin/commit.c:1518 -msgid "add specified files to index for commit" -msgstr "新增指定的檔案到索引區等待提交" - -#: builtin/commit.c:1519 -msgid "interactively add files" -msgstr "互動式新增檔案" - -#: builtin/commit.c:1520 -msgid "interactively add changes" -msgstr "互動式新增變更" - -#: builtin/commit.c:1521 -msgid "commit only specified files" -msgstr "只提交指定的檔案" - -#: builtin/commit.c:1522 -msgid "bypass pre-commit and commit-msg hooks" -msgstr "繞過 pre-commit 和 commit-msg 掛鉤" - -#: builtin/commit.c:1523 -msgid "show what would be committed" -msgstr "顯示將要提交的內容" - -#: builtin/commit.c:1536 -msgid "amend previous commit" -msgstr "修改先前的提交" - -#: builtin/commit.c:1537 -msgid "bypass post-rewrite hook" -msgstr "繞過 post-rewrite 掛鉤" - -#: builtin/commit.c:1544 -msgid "ok to record an empty change" -msgstr "允許一個空提交" - -#: builtin/commit.c:1546 -msgid "ok to record a change with an empty message" -msgstr "允許空的提交說明" - -#: builtin/commit.c:1619 -#, c-format -msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "損壞的 MERGE_HEAD 檔案（%s）" - -#: builtin/commit.c:1626 -msgid "could not read MERGE_MODE" -msgstr "不能讀取 MERGE_MODE" - -#: builtin/commit.c:1645 -#, c-format -msgid "could not read commit message: %s" -msgstr "不能讀取提交說明：%s" - -#: builtin/commit.c:1652 -#, c-format -msgid "Aborting commit due to empty commit message.\n" -msgstr "終止提交因為提交說明為空。\n" - -#: builtin/commit.c:1657 -#, c-format -msgid "Aborting commit; you did not edit the message.\n" -msgstr "終止提交；您未更改來自範本的提交說明。\n" - -#: builtin/commit.c:1691 -msgid "" -"repository has been updated, but unable to write\n" -"new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git restore --staged :/\" to recover." -msgstr "" -"版本庫已更新，但無法寫 new_index 檔案。檢查是否磁碟已滿或\n" -"磁碟配額已耗盡，然後執行 \"git restore --staged :/\" 復原。" - -#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 -msgid "" -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -msgstr "" -"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--" -"[no-]progress]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -msgstr "" -"git commit-graph write [--object-dir <物件目錄>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" - -#: builtin/commit-graph.c:52 -#, c-format -msgid "could not find object directory matching %s" -msgstr "找不到符合 %s 的物件目錄" - -#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 -#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 -msgid "dir" -msgstr "目錄" - -#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 -#: builtin/commit-graph.c:211 -msgid "The object directory to store the graph" -msgstr "儲存圖形的物件目錄" - -#: builtin/commit-graph.c:71 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "如果提交圖形被分割，只驗證頭一個檔案" - -#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "無法開啟提交圖形 '%s'" - -#: builtin/commit-graph.c:128 -msgid "start walk at all refs" -msgstr "開始遍歷所有引用" - -#: builtin/commit-graph.c:130 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "從標準輸入中的包索引檔案列表中掃描提交" - -#: builtin/commit-graph.c:132 -msgid "start walk at commits listed by stdin" -msgstr "從標準輸入中的提交開始掃描" - -#: builtin/commit-graph.c:134 -msgid "include all commits already in the commit-graph file" -msgstr "包含 commit-graph 檔案中已有所有提交" - -#: builtin/commit-graph.c:137 -msgid "allow writing an incremental commit-graph file" -msgstr "允許寫一個增量提交圖形檔案" - -#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 -msgid "maximum number of commits in a non-base split commit-graph" -msgstr "在非基本分割提交圖形中的最大提交數" - -#: builtin/commit-graph.c:141 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "一個分割提交圖形的兩個級別之間的最大比率" - -#: builtin/commit-graph.c:159 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" - -#: builtin/config.c:11 -msgid "git config [<options>]" -msgstr "git config [<選項>]" - -#: builtin/config.c:104 builtin/env--helper.c:23 -#, c-format -msgid "unrecognized --type argument, %s" -msgstr "未能識別的 --type 參數，%s" - -#: builtin/config.c:116 -msgid "only one type at a time" -msgstr "一次只能一個類型" - -#: builtin/config.c:125 -msgid "Config file location" -msgstr "設定檔案位置" - -#: builtin/config.c:126 -msgid "use global config file" -msgstr "使用全域設定檔案" - -#: builtin/config.c:127 -msgid "use system config file" -msgstr "使用系統級設定檔案" - -#: builtin/config.c:128 -msgid "use repository config file" -msgstr "使用版本庫級設定檔案" - -#: builtin/config.c:129 -msgid "use per-worktree config file" -msgstr "使用工作區級別的設定檔案" - -#: builtin/config.c:130 -msgid "use given config file" -msgstr "使用指定的設定檔案" - -#: builtin/config.c:131 -msgid "blob-id" -msgstr "資料物件 ID" - -#: builtin/config.c:131 -msgid "read config from given blob object" -msgstr "從提供的資料物件讀取設定" - -#: builtin/config.c:132 -msgid "Action" -msgstr "動作" - -#: builtin/config.c:133 -msgid "get value: name [value-regex]" -msgstr "取得值：name [value-regex]" - -#: builtin/config.c:134 -msgid "get all values: key [value-regex]" -msgstr "獲得所有的值：key [value-regex]" - -#: builtin/config.c:135 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "根據正規表示式獲得值：name-regex [value-regex]" - -#: builtin/config.c:136 -msgid "get value specific for the URL: section[.var] URL" -msgstr "獲得 URL 取值：section[.var] URL" - -#: builtin/config.c:137 -msgid "replace all matching variables: name value [value_regex]" -msgstr "取代所有符合的變數：name value [value_regex]" - -#: builtin/config.c:138 -msgid "add a new variable: name value" -msgstr "新增一個新的變數：name value" - -#: builtin/config.c:139 -msgid "remove a variable: name [value-regex]" -msgstr "刪除一個變數：name [value-regex]" - -#: builtin/config.c:140 -msgid "remove all matches: name [value-regex]" -msgstr "刪除所有符合項：name [value-regex]" - -#: builtin/config.c:141 -msgid "rename section: old-name new-name" -msgstr "重新命名小節：old-name new-name" - -#: builtin/config.c:142 -msgid "remove a section: name" -msgstr "刪除一個小節：name" - -#: builtin/config.c:143 -msgid "list all" -msgstr "全部列出" - -#: builtin/config.c:144 -msgid "open an editor" -msgstr "開啟一個編輯器" - -#: builtin/config.c:145 -msgid "find the color configured: slot [default]" -msgstr "獲得設定的顏色：設定 [預設]" - -#: builtin/config.c:146 -msgid "find the color setting: slot [stdout-is-tty]" -msgstr "獲得顏色設定：設定 [stdout-is-tty]" - -#: builtin/config.c:147 -msgid "Type" -msgstr "類型" - -#: builtin/config.c:148 builtin/env--helper.c:38 -msgid "value is given this type" -msgstr "取值為該類型" - -#: builtin/config.c:149 -msgid "value is \"true\" or \"false\"" -msgstr "值是 \"true\" 或 \"false\"" - -#: builtin/config.c:150 -msgid "value is decimal number" -msgstr "值是十進位數" - -#: builtin/config.c:151 -msgid "value is --bool or --int" -msgstr "值是 --bool or --int" - -#: builtin/config.c:152 -msgid "value is a path (file or directory name)" -msgstr "值是一個路徑（檔案或目錄名）" - -#: builtin/config.c:153 -msgid "value is an expiry date" -msgstr "值是一個到期日期" - -#: builtin/config.c:154 -msgid "Other" -msgstr "其它" - -#: builtin/config.c:155 -msgid "terminate values with NUL byte" -msgstr "終止值是 NUL 位元組" - -#: builtin/config.c:156 -msgid "show variable names only" -msgstr "只顯示變數名" - -#: builtin/config.c:157 -msgid "respect include directives on lookup" -msgstr "查詢時參照 include 指令遞迴尋找" - -#: builtin/config.c:158 -msgid "show origin of config (file, standard input, blob, command line)" -msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）" - -#: builtin/config.c:159 -msgid "show scope of config (worktree, local, global, system, command)" -msgstr "" -"顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指" -"令 command)" - -#: builtin/config.c:160 builtin/env--helper.c:40 -msgid "value" -msgstr "取值" - -#: builtin/config.c:160 -msgid "with --get, use default value when missing entry" -msgstr "使用 --get 但未指定參數時所使用的預設值" - -#: builtin/config.c:174 -#, c-format -msgid "wrong number of arguments, should be %d" -msgstr "錯誤的參數個數，應該為 %d 個" - -#: builtin/config.c:176 -#, c-format -msgid "wrong number of arguments, should be from %d to %d" -msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" - -#: builtin/config.c:324 -#, c-format -msgid "invalid key pattern: %s" -msgstr "無效鍵名模式：%s" - -#: builtin/config.c:360 -#, c-format -msgid "failed to format default config value: %s" -msgstr "格式化預設設定值失敗：%s" - -#: builtin/config.c:417 -#, c-format -msgid "cannot parse color '%s'" -msgstr "無法解析顏色 '%s'" - -#: builtin/config.c:459 -msgid "unable to parse default color value" -msgstr "無法解析預設顏色值" - -#: builtin/config.c:512 builtin/config.c:768 -msgid "not in a git directory" -msgstr "不在 git 版本庫中" - -#: builtin/config.c:515 -msgid "writing to stdin is not supported" -msgstr "不支援寫到標準輸入" - -#: builtin/config.c:518 -msgid "writing config blobs is not supported" -msgstr "不支援寫到設定資料物件" - -#: builtin/config.c:603 -#, c-format -msgid "" -"# This is Git's per-user configuration file.\n" -"[user]\n" -"# Please adapt and uncomment the following lines:\n" -"#\tname = %s\n" -"#\temail = %s\n" -msgstr "" -"# This is Git's per-user configuration file.\n" -"[user]\n" -"# Please adapt and uncomment the following lines:\n" -"#\tname = %s\n" -"#\temail = %s\n" - -#: builtin/config.c:627 -msgid "only one config file at a time" -msgstr "一次只能有一個設定檔案" - -#: builtin/config.c:632 -msgid "--local can only be used inside a git repository" -msgstr "--local 只能在一個版本庫內使用" - -#: builtin/config.c:635 -msgid "--blob can only be used inside a git repository" -msgstr "--blob 只能在一個版本庫內使用" - -#: builtin/config.c:655 -msgid "$HOME not set" -msgstr "$HOME 未設定" - -#: builtin/config.c:679 -msgid "" -"--worktree cannot be used with multiple working trees unless the config\n" -"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" -"section in \"git help worktree\" for details" -msgstr "" -"不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴展。\n" -"詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" - -#: builtin/config.c:714 -msgid "--get-color and variable type are incoherent" -msgstr "--get-color 和變數類型不相容" - -#: builtin/config.c:719 -msgid "only one action at a time" -msgstr "一次只能有一個動作" - -#: builtin/config.c:732 -msgid "--name-only is only applicable to --list or --get-regexp" -msgstr "--name-only 僅適用於 --list 或 --get-regexp" - -#: builtin/config.c:738 -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:744 -msgid "--default is only applicable to --get" -msgstr "--default 僅適用於 --get" - -#: builtin/config.c:757 -#, c-format -msgid "unable to read config file '%s'" -msgstr "無法讀取設定檔案 '%s'" - -#: builtin/config.c:760 -msgid "error processing config file(s)" -msgstr "處理設定檔案發生錯誤" - -#: builtin/config.c:770 -msgid "editing stdin is not supported" -msgstr "不支援編輯標準輸入" - -#: builtin/config.c:772 -msgid "editing blobs is not supported" -msgstr "不支援編輯資料物件" - -#: builtin/config.c:786 -#, c-format -msgid "cannot create configuration file %s" -msgstr "不能建立設定檔案 %s" - -#: builtin/config.c:799 -#, c-format -msgid "" -"cannot overwrite multiple values with a single value\n" -" Use a regexp, --add or --replace-all to change %s." -msgstr "" -"無法用一個值覆蓋多個值\n" -" 使用一個正規表示式、--add 或 --replace-all 來修改 %s。" - -#: builtin/config.c:873 builtin/config.c:884 -#, c-format -msgid "no such section: %s" -msgstr "無此小節：%s" - -#: builtin/count-objects.c:90 -msgid "git count-objects [-v] [-H | --human-readable]" -msgstr "git count-objects [-v] [-H | --human-readable]" - -#: builtin/count-objects.c:100 -msgid "print sizes in human readable format" -msgstr "以使用者可讀的格式顯示大小" - -#: builtin/describe.c:26 -msgid "git describe [<options>] [<commit-ish>...]" -msgstr "git describe [<選項>] [<提交號>...]" - -#: builtin/describe.c:27 -msgid "git describe [<options>] --dirty" -msgstr "git describe [<選項>] --dirty" - -#: builtin/describe.c:62 -msgid "head" -msgstr "頭" - -#: builtin/describe.c:62 -msgid "lightweight" -msgstr "輕量級的" - -#: builtin/describe.c:62 -msgid "annotated" -msgstr "附註的" - -#: builtin/describe.c:275 -#, c-format -msgid "annotated tag %s not available" -msgstr "附註標籤 %s 無效" - -#: builtin/describe.c:279 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "附註標籤 %s 沒有嵌入名稱" - -#: builtin/describe.c:281 -#, c-format -msgid "tag '%s' is really '%s' here" -msgstr "標籤 '%s' 的確是在 '%s'" - -#: builtin/describe.c:325 -#, c-format -msgid "no tag exactly matches '%s'" -msgstr "沒有標籤準確符合 '%s'" - -#: builtin/describe.c:327 -#, c-format -msgid "No exact match on refs or tags, searching to describe\n" -msgstr "沒有精確符合到引用或標籤，繼續搜尋進行描述\n" - -#: builtin/describe.c:394 -#, c-format -msgid "finished search at %s\n" -msgstr "完成搜尋 %s\n" - -#: builtin/describe.c:421 -#, c-format -msgid "" -"No annotated tags can describe '%s'.\n" -"However, there were unannotated tags: try --tags." -msgstr "" -"沒有附註標籤能描述 '%s'。\n" -"然而，存在未附註標籤：嘗試 --tags。" - -#: builtin/describe.c:425 -#, c-format -msgid "" -"No tags can describe '%s'.\n" -"Try --always, or create some tags." -msgstr "" -"沒有標籤能描述 '%s'。\n" -"嘗試 --always，或者建立一些標籤。" - -#: builtin/describe.c:455 -#, c-format -msgid "traversed %lu commits\n" -msgstr "已遍歷 %lu 個提交\n" - -#: builtin/describe.c:458 -#, c-format -msgid "" -"more than %i tags found; listed %i most recent\n" -"gave up search at %s\n" -msgstr "" -"發現多於 %i 個標籤，列出最近的 %i 個\n" -"在 %s 放棄搜尋\n" - -#: builtin/describe.c:526 -#, c-format -msgid "describe %s\n" -msgstr "描述 %s\n" - -#: builtin/describe.c:529 -#, c-format -msgid "Not a valid object name %s" -msgstr "不是一個有效的物件名 %s" - -#: builtin/describe.c:537 -#, c-format -msgid "%s is neither a commit nor blob" -msgstr "%s 既不是提交也不是資料物件" - -#: builtin/describe.c:551 -msgid "find the tag that comes after the commit" -msgstr "尋找該提交之後的標籤" - -#: builtin/describe.c:552 -msgid "debug search strategy on stderr" -msgstr "在標準錯誤上除錯搜尋策略" - -#: builtin/describe.c:553 -msgid "use any ref" -msgstr "使用任意引用" - -#: builtin/describe.c:554 -msgid "use any tag, even unannotated" -msgstr "使用任意標籤，即使未附帶備註" - -#: builtin/describe.c:555 -msgid "always use long format" -msgstr "始終使用長提交號格式" - -#: builtin/describe.c:556 -msgid "only follow first parent" -msgstr "只跟隨第一個父提交" - -#: builtin/describe.c:559 -msgid "only output exact matches" -msgstr "只輸出精確符合" - -#: builtin/describe.c:561 -msgid "consider <n> most recent tags (default: 10)" -msgstr "考慮最近 <n> 個標籤（預設：10）" - -#: builtin/describe.c:563 -msgid "only consider tags matching <pattern>" -msgstr "只考慮符合 <模式> 的標籤" - -#: builtin/describe.c:565 -msgid "do not consider tags matching <pattern>" -msgstr "不考慮符合 <模式> 的標籤" - -#: builtin/describe.c:567 builtin/name-rev.c:535 -msgid "show abbreviated commit object as fallback" -msgstr "顯示簡寫的提交號作為後備" - -#: builtin/describe.c:568 builtin/describe.c:571 -msgid "mark" -msgstr "標記" - -#: builtin/describe.c:569 -msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "對於髒工作區，追加 <標記>（預設：\"-dirty\"）" - -#: builtin/describe.c:572 -msgid "append <mark> on broken working tree (default: \"-broken\")" -msgstr "對於損壞的工作區，追加 <標記>（預設：\"-broken\"）" - -#: builtin/describe.c:590 -msgid "--long is incompatible with --abbrev=0" -msgstr "--long 與 --abbrev=0 不相容" - -#: builtin/describe.c:619 -msgid "No names found, cannot describe anything." -msgstr "沒有發現名稱，無法描述任何東西。" - -#: builtin/describe.c:670 -msgid "--dirty is incompatible with commit-ishes" -msgstr "--dirty 與提交號不相容" - -#: builtin/describe.c:672 -msgid "--broken is incompatible with commit-ishes" -msgstr "--broken 與提交號不相容" - -#: builtin/diff.c:84 -#, c-format -msgid "'%s': not a regular file or symlink" -msgstr "'%s'：不是一個正規檔案或符號連結" - -#: builtin/diff.c:235 -#, c-format -msgid "invalid option: %s" -msgstr "無效選項：%s" - -#: builtin/diff.c:350 -msgid "Not a git repository" -msgstr "不是一個 git 版本庫" - -#: builtin/diff.c:394 -#, c-format -msgid "invalid object '%s' given." -msgstr "提供了無效物件 '%s'。" - -#: builtin/diff.c:403 -#, c-format -msgid "more than two blobs given: '%s'" -msgstr "提供了超過兩個資料物件：'%s'" - -#: builtin/diff.c:408 -#, c-format -msgid "unhandled object '%s' given." -msgstr "無法處理的物件 '%s'。" - -#: builtin/difftool.c:30 -msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" -msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]" - -#: builtin/difftool.c:260 -#, c-format -msgid "failed: %d" -msgstr "失敗：%d" - -#: builtin/difftool.c:302 -#, c-format -msgid "could not read symlink %s" -msgstr "無法讀取符號連結 %s" - -#: builtin/difftool.c:304 -#, c-format -msgid "could not read symlink file %s" -msgstr "無法讀取符號連結檔案 %s" - -#: builtin/difftool.c:312 -#, c-format -msgid "could not read object %s for symlink %s" -msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s" - -#: builtin/difftool.c:413 -msgid "" -"combined diff formats('-c' and '--cc') are not supported in\n" -"directory diff mode('-d' and '--dir-diff')." -msgstr "" -"不支援在目錄比較模式（'-d' 和 '--dir-diff'）中採用組合差異格式（'-c' 和 '--" -"cc'）。" - -#: builtin/difftool.c:634 -#, c-format -msgid "both files modified: '%s' and '%s'." -msgstr "兩個檔案都被修改：'%s' 和 '%s'。" - -#: builtin/difftool.c:636 -msgid "working tree file has been left." -msgstr "工作區檔案被留了下來。" - -#: builtin/difftool.c:647 -#, c-format -msgid "temporary files exist in '%s'." -msgstr "暫存檔存在於 '%s'。" - -#: builtin/difftool.c:648 -msgid "you may want to cleanup or recover these." -msgstr "您可能想要清理或者復原它們。" - -#: builtin/difftool.c:697 -msgid "use `diff.guitool` instead of `diff.tool`" -msgstr "使用 `diff.guitool` 代替 `diff.tool`" - -#: builtin/difftool.c:699 -msgid "perform a full-directory diff" -msgstr "執行一個全目錄差異比較" - -#: builtin/difftool.c:701 -msgid "do not prompt before launching a diff tool" -msgstr "啟動差異比較工具之前不提示" - -#: builtin/difftool.c:706 -msgid "use symlinks in dir-diff mode" -msgstr "在 dir-diff 模式中使用符號連結" - -#: builtin/difftool.c:707 -msgid "tool" -msgstr "工具" - -#: builtin/difftool.c:708 -msgid "use the specified diff tool" -msgstr "使用指定的差異比較工具" - -#: builtin/difftool.c:710 -msgid "print a list of diff tools that may be used with `--tool`" -msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" - -#: builtin/difftool.c:713 -msgid "" -"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " -"code" -msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開" - -#: builtin/difftool.c:716 -msgid "specify a custom command for viewing diffs" -msgstr "指定一個用於檢視差異的自訂指令" - -#: builtin/difftool.c:717 -msgid "passed to `diff`" -msgstr "傳遞給 `diff`" - -#: builtin/difftool.c:732 -msgid "difftool requires worktree or --no-index" -msgstr "difftool 要求工作區或者 --no-index" - -#: builtin/difftool.c:739 -msgid "--dir-diff is incompatible with --no-index" -msgstr "--dir-diff 和 --no-index 不相容" - -#: builtin/difftool.c:742 -msgid "--gui, --tool and --extcmd are mutually exclusive" -msgstr "--gui、--tool 和 --extcmd 互斥" - -#: builtin/difftool.c:750 -msgid "no <tool> given for --tool=<tool>" -msgstr "沒有為 --tool=<工具> 參數提供 <工具>" - -#: builtin/difftool.c:757 -msgid "no <cmd> given for --extcmd=<cmd>" -msgstr "沒有為 --extcmd=<指令> 參數提供 <指令>" - -#: builtin/env--helper.c:6 -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>" - -#: builtin/env--helper.c:37 builtin/hash-object.c:98 -msgid "type" -msgstr "類型" - -#: builtin/env--helper.c:41 -msgid "default for git_env_*(...) to fall back on" -msgstr "git_env_*(...) 的預設值" - -#: builtin/env--helper.c:43 -msgid "be quiet only use git_env_*() value as exit code" -msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼" - -#: builtin/env--helper.c:62 -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "選項 `--default' 和 `type=bool` 期望一個布林值，不是 `%s`" - -#: builtin/env--helper.c:77 -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" -msgstr "選項 `--default' 和 `type=ulong` 期望一個無符號長整型，不是 `%s`" - -#: builtin/fast-export.c:29 -msgid "git fast-export [rev-list-opts]" -msgstr "git fast-export [rev-list-opts]" - -#: builtin/fast-export.c:853 -msgid "Error: Cannot export nested tags unless --mark-tags is specified." -msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。" - -#: builtin/fast-export.c:1152 -msgid "show progress after <n> objects" -msgstr "在 <n> 個物件之後顯示進度" - -#: builtin/fast-export.c:1154 -msgid "select handling of signed tags" -msgstr "選擇如何處理簽名標籤" - -#: builtin/fast-export.c:1157 -msgid "select handling of tags that tag filtered objects" -msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式" - -#: builtin/fast-export.c:1160 -msgid "select handling of commit messages in an alternate encoding" -msgstr "選擇使用備用編碼處理提交說明" - -#: builtin/fast-export.c:1163 -msgid "Dump marks to this file" -msgstr "把標記儲存到這個檔案" - -#: builtin/fast-export.c:1165 -msgid "Import marks from this file" -msgstr "從這個檔案匯入標記" - -#: builtin/fast-export.c:1169 -msgid "Import marks from this file if it exists" -msgstr "從該檔案匯入標記（如果存在的話）" - -#: builtin/fast-export.c:1171 -msgid "Fake a tagger when tags lack one" -msgstr "當標籤缺少標記者欄位時，假裝提供一個" - -#: builtin/fast-export.c:1173 -msgid "Output full tree for each commit" -msgstr "每次提交都輸出整個樹" - -#: builtin/fast-export.c:1175 -msgid "Use the done feature to terminate the stream" -msgstr "使用 done 功能來終止流" - -#: builtin/fast-export.c:1176 -msgid "Skip output of blob data" -msgstr "跳過資料物件的輸出" - -#: builtin/fast-export.c:1177 builtin/log.c:1705 -msgid "refspec" -msgstr "引用規格" - -#: builtin/fast-export.c:1178 -msgid "Apply refspec to exported refs" -msgstr "對匯出的引用應用引用規格" - -#: builtin/fast-export.c:1179 -msgid "anonymize output" -msgstr "匿名輸出" - -#: builtin/fast-export.c:1181 -msgid "Reference parents which are not in fast-export stream by object id" -msgstr "引用父物件 ID 不在 fast-export 流中" - -#: builtin/fast-export.c:1183 -msgid "Show original object ids of blobs/commits" -msgstr "顯示資料物件/提交的原始物件 ID" - -#: builtin/fast-export.c:1185 -msgid "Label tags with mark ids" -msgstr "對帶有標記 ID 的標籤做標記" - -#: builtin/fast-export.c:1220 -msgid "Cannot pass both --import-marks and --import-marks-if-exists" -msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists" - -#: builtin/fetch.c:34 -msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]" - -#: builtin/fetch.c:35 -msgid "git fetch [<options>] <group>" -msgstr "git fetch [<選項>] <組>" - -#: builtin/fetch.c:36 -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]" - -#: builtin/fetch.c:37 -msgid "git fetch --all [<options>]" -msgstr "git fetch --all [<選項>]" - -#: builtin/fetch.c:116 -msgid "fetch.parallel cannot be negative" -msgstr "fetch.parallel 不能為負數" - -#: builtin/fetch.c:139 builtin/pull.c:184 -msgid "fetch from all remotes" -msgstr "從所有的遠端抓取" - -#: builtin/fetch.c:141 builtin/pull.c:228 -msgid "set upstream for git pull/fetch" -msgstr "為 git pull/fetch 設定上游" - -#: builtin/fetch.c:143 builtin/pull.c:187 -msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" - -#: builtin/fetch.c:145 builtin/pull.c:190 -msgid "path to upload pack on remote end" -msgstr "上傳包到遠端的路徑" - -#: builtin/fetch.c:146 -msgid "force overwrite of local reference" -msgstr "強制覆蓋本機引用" - -#: builtin/fetch.c:148 -msgid "fetch from multiple remotes" -msgstr "從多個遠端抓取" - -#: builtin/fetch.c:150 builtin/pull.c:194 -msgid "fetch all tags and associated objects" -msgstr "抓取所有的標籤和關聯物件" - -#: builtin/fetch.c:152 -msgid "do not fetch all tags (--no-tags)" -msgstr "不抓取任何標籤(--no-tags)" - -#: builtin/fetch.c:154 -msgid "number of submodules fetched in parallel" -msgstr "子模組取得的並發數" - -#: builtin/fetch.c:156 builtin/pull.c:197 -msgid "prune remote-tracking branches no longer on remote" -msgstr "清除遠端已經不存在的分支的追蹤分支" - -#: builtin/fetch.c:158 -msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" - -# 譯者：可選值，不能翻譯 -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 -msgid "on-demand" -msgstr "on-demand" - -#: builtin/fetch.c:160 -msgid "control recursive fetching of submodules" -msgstr "控制子模組的遞迴抓取" - -#: builtin/fetch.c:164 builtin/pull.c:205 -msgid "keep downloaded pack" -msgstr "保持下載包" - -#: builtin/fetch.c:166 -msgid "allow updating of HEAD ref" -msgstr "允許更新 HEAD 引用" - -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 -msgid "deepen history of shallow clone" -msgstr "深化淺複製的歷史" - -#: builtin/fetch.c:171 -msgid "deepen history of shallow repository based on time" -msgstr "基於時間來深化淺複製的歷史" - -#: builtin/fetch.c:177 builtin/pull.c:211 -msgid "convert to a complete repository" -msgstr "轉換為一個完整的版本庫" - -#: builtin/fetch.c:180 -msgid "prepend this to submodule path output" -msgstr "在子模組路徑輸出的前面加上此目錄" - -#: builtin/fetch.c:183 -msgid "" -"default for recursive fetching of submodules (lower priority than config " -"files)" -msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" - -#: builtin/fetch.c:187 builtin/pull.c:214 -msgid "accept refs that update .git/shallow" -msgstr "接受更新 .git/shallow 的引用" - -#: builtin/fetch.c:188 builtin/pull.c:216 -msgid "refmap" -msgstr "引用映射" - -#: builtin/fetch.c:189 builtin/pull.c:217 -msgid "specify fetch refmap" -msgstr "指定取得動作的引用映射" - -#: builtin/fetch.c:196 -msgid "report that we have only objects reachable from this object" -msgstr "報告我們只擁有從該物件開始可以取得的物件" - -#: builtin/fetch.c:199 -msgid "run 'gc --auto' after fetching" -msgstr "取得後執行 'gc --auto'" - -#: builtin/fetch.c:201 builtin/pull.c:226 -msgid "check for forced-updates on all updated branches" -msgstr "在所有更新分支上檢查強制更新" - -#: builtin/fetch.c:203 -msgid "write the commit-graph after fetching" -msgstr "抓取後寫入分支圖" - -#: builtin/fetch.c:513 -msgid "Couldn't find remote ref HEAD" -msgstr "無法發現遠端 HEAD 引用" - -#: builtin/fetch.c:653 -#, c-format -msgid "configuration fetch.output contains invalid value %s" -msgstr "設定變數 fetch.output 包含無效值 %s" - -#: builtin/fetch.c:751 -#, c-format -msgid "object %s not found" -msgstr "物件 %s 未發現" - -#: builtin/fetch.c:755 -msgid "[up to date]" -msgstr "[最新]" - -#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 -msgid "[rejected]" -msgstr "[已拒絕]" - -#: builtin/fetch.c:769 -msgid "can't fetch in current branch" -msgstr "目前分支下不能執行取得動作" - -#: builtin/fetch.c:779 -msgid "[tag update]" -msgstr "[標籤更新]" - -#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 -#: builtin/fetch.c:851 -msgid "unable to update local ref" -msgstr "不能更新本機引用" - -#: builtin/fetch.c:784 -msgid "would clobber existing tag" -msgstr "會破壞現有的標籤" - -#: builtin/fetch.c:806 -msgid "[new tag]" -msgstr "[新標籤]" - -#: builtin/fetch.c:809 -msgid "[new branch]" -msgstr "[新分支]" - -#: builtin/fetch.c:812 -msgid "[new ref]" -msgstr "[新引用]" - -#: builtin/fetch.c:851 -msgid "forced update" -msgstr "強制更新" - -#: builtin/fetch.c:856 -msgid "non-fast-forward" -msgstr "非快轉" - -#: builtin/fetch.c:877 -msgid "" -"Fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'." -msgstr "" -"取得動作通常顯示哪些分支發生了強制更新，但該檢查已被禁用。\n" -"要重新啟用，請使用 '--show-forced-updates' 選項或執行\n" -"'git config fetch.showForcedUpdates true'。" - -#: builtin/fetch.c:881 -#, c-format -msgid "" -"It took %.2f seconds to check forced updates. You can use\n" -"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " -"false'\n" -" to avoid this check.\n" -msgstr "" -"花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n" -"或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n" - -#: builtin/fetch.c:920 -#, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s 未傳送所有必需的物件\n" - -#: builtin/fetch.c:941 -#, c-format -msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "拒絕 %s 因為淺複製不允許被更新" - -#: builtin/fetch.c:1026 builtin/fetch.c:1164 -#, c-format -msgid "From %.*s\n" -msgstr "來自 %.*s\n" - -#: builtin/fetch.c:1037 -#, c-format -msgid "" -"some local refs could not be updated; try running\n" -" 'git remote prune %s' to remove any old, conflicting branches" -msgstr "" -"一些本機引用不能被更新；嘗試執行\n" -" 'git remote prune %s' 來刪除舊的、有衝突的分支" - -# 譯者：請維持前導空格 -#: builtin/fetch.c:1134 -#, c-format -msgid " (%s will become dangling)" -msgstr " （%s 將成為懸空狀態）" - -# 譯者：請維持前導空格 -#: builtin/fetch.c:1135 -#, c-format -msgid " (%s has become dangling)" -msgstr " （%s 已成為懸空狀態）" - -#: builtin/fetch.c:1167 -msgid "[deleted]" -msgstr "[已刪除]" - -#: builtin/fetch.c:1168 builtin/remote.c:1112 -msgid "(none)" -msgstr "（無）" - -#: builtin/fetch.c:1191 -#, c-format -msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "拒絕取得到非純版本庫的目前分支 %s" - -#: builtin/fetch.c:1210 -#, c-format -msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的" - -#: builtin/fetch.c:1213 -#, c-format -msgid "Option \"%s\" is ignored for %s\n" -msgstr "選項 \"%s\" 為 %s 所忽略\n" - -#: builtin/fetch.c:1421 -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "檢測到多分支，和 --set-upstream 不相容" - -#: builtin/fetch.c:1436 -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "沒有為一個遠端追蹤分支設定上游" - -#: builtin/fetch.c:1438 -msgid "not setting upstream for a remote tag" -msgstr "沒有為一個遠端標籤設定上游" - -#: builtin/fetch.c:1440 -msgid "unknown branch type" -msgstr "未知的分支類型" - -#: builtin/fetch.c:1442 -msgid "" -"no source branch found.\n" -"you need to specify exactly one branch with the --set-upstream option." -msgstr "" -"未發現源分支。\n" -"您需要使用 --set-upstream 選項指定一個分支。" - -#: builtin/fetch.c:1568 builtin/fetch.c:1631 -#, c-format -msgid "Fetching %s\n" -msgstr "正在取得 %s\n" - -#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 -#, c-format -msgid "Could not fetch %s" -msgstr "不能取得 %s" - -#: builtin/fetch.c:1590 -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "無法取得 '%s'（離開碼：%d）\n" - -#: builtin/fetch.c:1693 -msgid "" -"No remote repository specified. Please, specify either a URL or a\n" -"remote name from which new revisions should be fetched." -msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定，用以取得新提交。" - -#: builtin/fetch.c:1730 -msgid "You need to specify a tag name." -msgstr "您需要指定一個標籤名稱。" - -#: builtin/fetch.c:1780 -msgid "Negative depth in --deepen is not supported" -msgstr "--deepen 不支援負數深度" - -#: builtin/fetch.c:1782 -msgid "--deepen and --depth are mutually exclusive" -msgstr "--deepen 和 --depth 是互斥的" - -#: builtin/fetch.c:1787 -msgid "--depth and --unshallow cannot be used together" -msgstr "--depth 和 --unshallow 不能同時使用" - -#: builtin/fetch.c:1789 -msgid "--unshallow on a complete repository does not make sense" -msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" - -#: builtin/fetch.c:1805 -msgid "fetch --all does not take a repository argument" -msgstr "fetch --all 不能帶一個版本庫參數" - -#: builtin/fetch.c:1807 -msgid "fetch --all does not make sense with refspecs" -msgstr "fetch --all 帶引用規格沒有任何意義" - -#: builtin/fetch.c:1816 -#, c-format -msgid "No such remote or remote group: %s" -msgstr "沒有這樣的遠端或遠端組：%s" - -#: builtin/fetch.c:1823 -msgid "Fetching a group and specifying refspecs does not make sense" -msgstr "取得組並指定引用規格沒有意義" - -#: builtin/fetch.c:1841 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialclone" -msgstr "只可以將 --filter 用於在 extensions.partialClone 中設定的遠端版本庫" - -#: builtin/fmt-merge-msg.c:18 -msgid "" -"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" -msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案>]" - -#: builtin/fmt-merge-msg.c:671 -msgid "populate log with at most <n> entries from shortlog" -msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明" - -#: builtin/fmt-merge-msg.c:674 -msgid "alias for --log (deprecated)" -msgstr "參數 --log 的別名（已棄用）" - -#: builtin/fmt-merge-msg.c:677 -msgid "text" -msgstr "文字" - -#: builtin/fmt-merge-msg.c:678 -msgid "use <text> as start of message" -msgstr "使用 <文字> 作為提交說明的開始" - -#: builtin/fmt-merge-msg.c:679 -msgid "file to read from" -msgstr "從檔案中讀取" - -#: builtin/for-each-ref.c:10 -msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git for-each-ref [<選項>] [<模式>]" - -#: builtin/for-each-ref.c:11 -msgid "git for-each-ref [--points-at <object>]" -msgstr "git for-each-ref [--points-at <物件>]" - -#: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<提交>]]" - -#: builtin/for-each-ref.c:13 -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" - -#: builtin/for-each-ref.c:28 -msgid "quote placeholders suitably for shells" -msgstr "引用占位符適用於 shells" - -#: builtin/for-each-ref.c:30 -msgid "quote placeholders suitably for perl" -msgstr "引用占位符適用於 perl" - -#: builtin/for-each-ref.c:32 -msgid "quote placeholders suitably for python" -msgstr "引用占位符適用於 python" - -#: builtin/for-each-ref.c:34 -msgid "quote placeholders suitably for Tcl" -msgstr "引用占位符適用於 Tcl" - -#: builtin/for-each-ref.c:37 -msgid "show only <n> matched refs" -msgstr "只顯示 <n> 個符合的引用" - -#: builtin/for-each-ref.c:39 builtin/tag.c:439 -msgid "respect format colors" -msgstr "遵照格式中的顏色輸出" - -#: builtin/for-each-ref.c:42 -msgid "print only refs which points at the given object" -msgstr "只列印指向提供物件的引用" - -#: builtin/for-each-ref.c:44 -msgid "print only refs that are merged" -msgstr "只列印已經合併的引用" - -#: builtin/for-each-ref.c:45 -msgid "print only refs that are not merged" -msgstr "只列印沒有合併的引用" - -#: builtin/for-each-ref.c:46 -msgid "print only refs which contain the commit" -msgstr "只列印包含該提交的引用" - -#: builtin/for-each-ref.c:47 -msgid "print only refs which don't contain the commit" -msgstr "只列印不包含該提交的引用" - -#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 -msgid "unknown" -msgstr "未知" - -#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:100 builtin/fsck.c:120 -#, c-format -msgid "error in %s %s: %s" -msgstr "%s %s 錯誤：%s" - -#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:114 -#, c-format -msgid "warning in %s %s: %s" -msgstr "%s %s 警告：%s" - -#: builtin/fsck.c:143 builtin/fsck.c:146 -#, c-format -msgid "broken link from %7s %s" -msgstr "來自 %7s %s 的損壞的連結" - -#: builtin/fsck.c:155 -msgid "wrong object type in link" -msgstr "連結中錯誤的物件類型" - -#: builtin/fsck.c:171 -#, c-format -msgid "" -"broken link from %7s %s\n" -" to %7s %s" -msgstr "" -"損壞的連結來自於 %7s %s\n" -" 到 %7s %s" - -#: builtin/fsck.c:282 -#, c-format -msgid "missing %s %s" -msgstr "缺少 %s %s" - -#: builtin/fsck.c:309 -#, c-format -msgid "unreachable %s %s" -msgstr "無法取得 %s %s" - -#: builtin/fsck.c:329 -#, c-format -msgid "dangling %s %s" -msgstr "懸空 %s %s" - -#: builtin/fsck.c:339 -msgid "could not create lost-found" -msgstr "不能建立 lost-found" - -#: builtin/fsck.c:350 -#, c-format -msgid "could not finish '%s'" -msgstr "不能完成 '%s'" - -#: builtin/fsck.c:367 -#, c-format -msgid "Checking %s" -msgstr "正在檢查 %s" - -#: builtin/fsck.c:405 -#, c-format -msgid "Checking connectivity (%d objects)" -msgstr "正在檢查連通性（%d 個物件）" - -#: builtin/fsck.c:424 -#, c-format -msgid "Checking %s %s" -msgstr "正在檢查 %s %s" - -#: builtin/fsck.c:429 -msgid "broken links" -msgstr "損壞的連結" - -#: builtin/fsck.c:438 -#, c-format -msgid "root %s" -msgstr "根 %s" - -#: builtin/fsck.c:446 -#, c-format -msgid "tagged %s %s (%s) in %s" -msgstr "標記 %s %s (%s) 於 %s" - -#: builtin/fsck.c:475 -#, c-format -msgid "%s: object corrupt or missing" -msgstr "%s：物件損壞或遺失" - -#: builtin/fsck.c:500 -#, c-format -msgid "%s: invalid reflog entry %s" -msgstr "%s：無效的引用日誌條目 %s" - -#: builtin/fsck.c:514 -#, c-format -msgid "Checking reflog %s->%s" -msgstr "正在檢查引用日誌 %s->%s" - -#: builtin/fsck.c:548 -#, c-format -msgid "%s: invalid sha1 pointer %s" -msgstr "%s：無效的 sha1 指標 %s" - -#: builtin/fsck.c:555 -#, c-format -msgid "%s: not a commit" -msgstr "%s：不是一個提交" - -#: builtin/fsck.c:609 -msgid "notice: No default references" -msgstr "注意：無預設引用" - -#: builtin/fsck.c:624 -#, c-format -msgid "%s: object corrupt or missing: %s" -msgstr "%s：物件損壞或遺失：%s" - -#: builtin/fsck.c:637 -#, c-format -msgid "%s: object could not be parsed: %s" -msgstr "%s：不能解析物件：%s" - -#: builtin/fsck.c:657 -#, c-format -msgid "bad sha1 file: %s" -msgstr "壞的 sha1 檔案：%s" - -#: builtin/fsck.c:672 -msgid "Checking object directory" -msgstr "正在檢查物件目錄" - -#: builtin/fsck.c:675 -msgid "Checking object directories" -msgstr "正在檢查物件目錄" - -#: builtin/fsck.c:690 -#, c-format -msgid "Checking %s link" -msgstr "正在檢查 %s 連結" - -#: builtin/fsck.c:695 builtin/index-pack.c:843 -#, c-format -msgid "invalid %s" -msgstr "無效的 %s" - -#: builtin/fsck.c:702 -#, c-format -msgid "%s points to something strange (%s)" -msgstr "%s 指向奇怪的東西（%s）" - -#: builtin/fsck.c:708 -#, c-format -msgid "%s: detached HEAD points at nothing" -msgstr "%s：分離開頭指標的指向不存在" - -#: builtin/fsck.c:712 -#, c-format -msgid "notice: %s points to an unborn branch (%s)" -msgstr "注意：%s 指向一個尚未誕生的分支（%s）" - -#: builtin/fsck.c:724 -msgid "Checking cache tree" -msgstr "正在檢查快取樹" - -#: builtin/fsck.c:729 -#, c-format -msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "%s：cache-tree 中無效的 sha1 指標" - -#: builtin/fsck.c:738 -msgid "non-tree in cache-tree" -msgstr "cache-tree 中非樹狀物件" - -#: builtin/fsck.c:769 -msgid "git fsck [<options>] [<object>...]" -msgstr "git fsck [<選項>] [<物件>...]" - -#: builtin/fsck.c:775 -msgid "show unreachable objects" -msgstr "顯示無法取得的物件" - -#: builtin/fsck.c:776 -msgid "show dangling objects" -msgstr "顯示懸空的物件" - -#: builtin/fsck.c:777 -msgid "report tags" -msgstr "報告標籤" - -#: builtin/fsck.c:778 -msgid "report root nodes" -msgstr "報告根節點" - -#: builtin/fsck.c:779 -msgid "make index objects head nodes" -msgstr "將索引亦作為檢查的頭節點" - -#: builtin/fsck.c:780 -msgid "make reflogs head nodes (default)" -msgstr "將引用日誌作為檢查的頭節點（預設）" - -#: builtin/fsck.c:781 -msgid "also consider packs and alternate objects" -msgstr "也考慮包和備用物件" - -#: builtin/fsck.c:782 -msgid "check only connectivity" -msgstr "僅檢查連通性" - -#: builtin/fsck.c:783 -msgid "enable more strict checking" -msgstr "啟用更嚴格的檢查" - -#: builtin/fsck.c:785 -msgid "write dangling objects in .git/lost-found" -msgstr "將懸空物件寫入 .git/lost-found 中" - -#: builtin/fsck.c:786 builtin/prune.c:132 -msgid "show progress" -msgstr "顯示進度" - -#: builtin/fsck.c:787 -msgid "show verbose names for reachable objects" -msgstr "顯示可以取得物件的詳細名稱" - -#: builtin/fsck.c:846 builtin/index-pack.c:225 -msgid "Checking objects" -msgstr "正在檢查物件" - -#: builtin/fsck.c:874 -#, c-format -msgid "%s: object missing" -msgstr "%s：物件缺少" - -#: builtin/fsck.c:885 -#, c-format -msgid "invalid parameter: expected sha1, got '%s'" -msgstr "無效的參數：期望 sha1，得到 '%s'" - -#: builtin/gc.c:35 -msgid "git gc [<options>]" -msgstr "git gc [<選項>]" - -#: builtin/gc.c:90 -#, c-format -msgid "Failed to fstat %s: %s" -msgstr "對 %s 呼叫 fstat 失敗：%s" - -#: builtin/gc.c:126 -#, c-format -msgid "failed to parse '%s' value '%s'" -msgstr "無法解析 '%s' 值 '%s'" - -#: builtin/gc.c:475 builtin/init-db.c:55 -#, c-format -msgid "cannot stat '%s'" -msgstr "不能對 '%s' 呼叫 stat" - -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 -#, c-format -msgid "cannot read '%s'" -msgstr "不能讀取 '%s'" - -#: builtin/gc.c:491 -#, c-format -msgid "" -"The last gc run reported the following. Please correct the root cause\n" -"and remove %s.\n" -"Automatic cleanup will not be performed until the file is removed.\n" -"\n" -"%s" -msgstr "" -"最後一次 gc 動作報告如下訊息。請檢查原因並刪除 %s。\n" -"在該檔案被刪除之前，自動清理將不會執行。\n" -"\n" -"%s" - -#: builtin/gc.c:539 -msgid "prune unreferenced objects" -msgstr "清除未引用的物件" - -#: builtin/gc.c:541 -msgid "be more thorough (increased runtime)" -msgstr "更徹底（增加執行時間）" - -#: builtin/gc.c:542 -msgid "enable auto-gc mode" -msgstr "啟用自動垃圾回收模式" - -#: builtin/gc.c:545 -msgid "force running gc even if there may be another gc running" -msgstr "強制執行 gc 即使另外一個 gc 正在執行" - -#: builtin/gc.c:548 -msgid "repack all other packs except the largest pack" -msgstr "除了最大的包之外，對所有其它包檔案重新打包" - -#: builtin/gc.c:565 -#, c-format -msgid "failed to parse gc.logexpiry value %s" -msgstr "解析 gc.logexpiry 的值 %s 失敗" - -#: builtin/gc.c:576 -#, c-format -msgid "failed to parse prune expiry value %s" -msgstr "解析清除期限值 %s 失敗" - -#: builtin/gc.c:596 -#, c-format -msgid "Auto packing the repository in background for optimum performance.\n" -msgstr "自動在後台執行版本庫打包以求最佳性能。\n" - -#: builtin/gc.c:598 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "自動打包版本庫以求最佳性能。\n" - -#: builtin/gc.c:599 -#, c-format -msgid "See \"git help gc\" for manual housekeeping.\n" -msgstr "手動維護參見 \"git help gc\"。\n" - -#: builtin/gc.c:639 -#, c-format -msgid "" -"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" -msgstr "gc 已在「%s」機器 pid %<PRIuMAX> 執行（如果不是，使用 --force）" - -#: builtin/gc.c:694 -msgid "" -"There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "有太多無法取得的鬆散物件，執行 'git prune' 刪除它們。" - -#: builtin/grep.c:30 -msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]" - -#: builtin/grep.c:225 -#, c-format -msgid "grep: failed to create thread: %s" -msgstr "grep：無法建立執行緒：%s" - -#: builtin/grep.c:279 -#, c-format -msgid "invalid number of threads specified (%d) for %s" -msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" - -#. TRANSLATORS: %s is the configuration -#. variable for tweaking threads, currently -#. grep.threads -#. -#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 -#: builtin/pack-objects.c:2854 -#, c-format -msgid "no threads support, ignoring %s" -msgstr "沒有執行緒支援，忽略 %s" - -#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 -#, c-format -msgid "unable to read tree (%s)" -msgstr "無法讀取樹（%s）" - -#: builtin/grep.c:633 -#, c-format -msgid "unable to grep from object of type %s" -msgstr "無法抓取來自於 %s 類型的物件" - -#: builtin/grep.c:704 -#, c-format -msgid "switch `%c' expects a numerical value" -msgstr "開關 `%c' 期望一個數字值" - -#: builtin/grep.c:803 -msgid "search in index instead of in the work tree" -msgstr "在索引區搜尋而不是在工作區" - -#: builtin/grep.c:805 -msgid "find in contents not managed by git" -msgstr "在未被 git 管理的內容中尋找" - -# 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c:807 -msgid "search in both tracked and untracked files" -msgstr "在追蹤和未追蹤的檔案中搜尋" - -#: builtin/grep.c:809 -msgid "ignore files specified via '.gitignore'" -msgstr "忽略 '.gitignore' 包含的檔案" - -#: builtin/grep.c:811 -msgid "recursively search in each submodule" -msgstr "在每一個子模組中遞迴搜尋" - -#: builtin/grep.c:814 -msgid "show non-matching lines" -msgstr "顯示未符合的行" - -#: builtin/grep.c:816 -msgid "case insensitive matching" -msgstr "不區分大小寫符合" - -#: builtin/grep.c:818 -msgid "match patterns only at word boundaries" -msgstr "只在單詞邊界符合模式" - -#: builtin/grep.c:820 -msgid "process binary files as text" -msgstr "把二進位檔案當做文字處理" - -#: builtin/grep.c:822 -msgid "don't match patterns in binary files" -msgstr "不在二進位檔案中符合模式" - -#: builtin/grep.c:825 -msgid "process binary files with textconv filters" -msgstr "用 textconv 過濾器處理二進位檔案" - -#: builtin/grep.c:827 -msgid "search in subdirectories (default)" -msgstr "在子目錄中尋找（預設）" - -#: builtin/grep.c:829 -msgid "descend at most <depth> levels" -msgstr "最多以指定的深度向下尋找" - -#: builtin/grep.c:833 -msgid "use extended POSIX regular expressions" -msgstr "使用擴展的 POSIX 正規表示式" - -#: builtin/grep.c:836 -msgid "use basic POSIX regular expressions (default)" -msgstr "使用基本的 POSIX 正規表示式（預設）" - -#: builtin/grep.c:839 -msgid "interpret patterns as fixed strings" -msgstr "把模式解析為固定的字串" - -#: builtin/grep.c:842 -msgid "use Perl-compatible regular expressions" -msgstr "使用 Perl 相容的正規表示式" - -#: builtin/grep.c:845 -msgid "show line numbers" -msgstr "顯示行號" - -#: builtin/grep.c:846 -msgid "show column number of first match" -msgstr "顯示第一個符合的列號" - -#: builtin/grep.c:847 -msgid "don't show filenames" -msgstr "不顯示檔案名" - -#: builtin/grep.c:848 -msgid "show filenames" -msgstr "顯示檔案名" - -#: builtin/grep.c:850 -msgid "show filenames relative to top directory" -msgstr "顯示相對於頂級目錄的檔案名" - -#: builtin/grep.c:852 -msgid "show only filenames instead of matching lines" -msgstr "只顯示檔案名而不顯示符合的行" - -#: builtin/grep.c:854 -msgid "synonym for --files-with-matches" -msgstr "和 --files-with-matches 同義" - -#: builtin/grep.c:857 -msgid "show only the names of files without match" -msgstr "只顯示未符合的檔案名" - -#: builtin/grep.c:859 -msgid "print NUL after filenames" -msgstr "在檔案名後輸出 NUL 字元" - -#: builtin/grep.c:862 -msgid "show only matching parts of a line" -msgstr "只顯示行中的符合的部分" - -#: builtin/grep.c:864 -msgid "show the number of matches instead of matching lines" -msgstr "顯示總符合行數，而不顯示符合的行" - -#: builtin/grep.c:865 -msgid "highlight matches" -msgstr "高亮顯示符合項" - -#: builtin/grep.c:867 -msgid "print empty line between matches from different files" -msgstr "在不同檔案的符合項之間列印空行" - -#: builtin/grep.c:869 -msgid "show filename only once above matches from same file" -msgstr "只在同一檔案的符合項的上面顯示一次檔案名" - -#: builtin/grep.c:872 -msgid "show <n> context lines before and after matches" -msgstr "顯示符合項前後的 <n> 行上下文" - -#: builtin/grep.c:875 -msgid "show <n> context lines before matches" -msgstr "顯示符合項前 <n> 行上下文" - -#: builtin/grep.c:877 -msgid "show <n> context lines after matches" -msgstr "顯示符合項後 <n> 行上下文" - -#: builtin/grep.c:879 -msgid "use <n> worker threads" -msgstr "使用 <n> 個工作執行緒" - -#: builtin/grep.c:880 -msgid "shortcut for -C NUM" -msgstr "快捷鍵 -C 數字" - -#: builtin/grep.c:883 -msgid "show a line with the function name before matches" -msgstr "在符合的前面顯示一行函數名" - -#: builtin/grep.c:885 -msgid "show the surrounding function" -msgstr "顯示所在函數的前後內容" - -#: builtin/grep.c:888 -msgid "read patterns from file" -msgstr "從檔案讀取模式" - -#: builtin/grep.c:890 -msgid "match <pattern>" -msgstr "符合 <模式>" - -#: builtin/grep.c:892 -msgid "combine patterns specified with -e" -msgstr "組合用 -e 參數設定的模式" - -#: builtin/grep.c:904 -msgid "indicate hit with exit status without output" -msgstr "不輸出，而用離開碼標記命中狀態" - -#: builtin/grep.c:906 -msgid "show only matches from files that match all patterns" -msgstr "只顯示符合所有模式的檔案中的符合" - -#: builtin/grep.c:908 -msgid "show parse tree for grep expression" -msgstr "顯示 grep 表達式的解析樹" - -#: builtin/grep.c:912 -msgid "pager" -msgstr "分頁" - -#: builtin/grep.c:912 -msgid "show matching files in the pager" -msgstr "分頁顯示符合的檔案" - -#: builtin/grep.c:916 -msgid "allow calling of grep(1) (ignored by this build)" -msgstr "允許呼叫 grep(1)（本次構建忽略）" - -#: builtin/grep.c:983 -msgid "no pattern given" -msgstr "未提供符合模式" - -#: builtin/grep.c:1019 -msgid "--no-index or --untracked cannot be used with revs" -msgstr "--no-index 或 --untracked 不能和版本同時使用" - -#: builtin/grep.c:1027 -#, c-format -msgid "unable to resolve revision: %s" -msgstr "不能解析版本：%s" - -#: builtin/grep.c:1057 -msgid "--untracked not supported with --recurse-submodules" -msgstr "--untracked 不支援與 --recurse-submodules 一起使用" - -#: builtin/grep.c:1061 -msgid "invalid option combination, ignoring --threads" -msgstr "無效的選項組合，忽略 --threads" - -#: builtin/grep.c:1064 builtin/pack-objects.c:3547 -msgid "no threads support, ignoring --threads" -msgstr "沒有執行緒支援，忽略 --threads" - -#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 -#, c-format -msgid "invalid number of threads specified (%d)" -msgstr "指定的執行緒數無效（%d）" - -#: builtin/grep.c:1101 -msgid "--open-files-in-pager only works on the worktree" -msgstr "--open-files-in-pager 僅用於工作區" - -#: builtin/grep.c:1127 -msgid "--cached or --untracked cannot be used with --no-index" -msgstr "--cached 或 --untracked 不能與 --no-index 同時使用" - -#: builtin/grep.c:1133 -msgid "--[no-]exclude-standard cannot be used for tracked contents" -msgstr "--[no-]exclude-standard 不能用於已追蹤內容" - -#: builtin/grep.c:1141 -msgid "both --cached and trees are given" -msgstr "同時給出了 --cached 和樹狀物件" - -#: builtin/hash-object.c:85 -msgid "" -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " -"[--] <file>..." -msgstr "" -"git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] " -"[--] <檔案>..." - -#: builtin/hash-object.c:86 -msgid "git hash-object --stdin-paths" -msgstr "git hash-object --stdin-paths" - -#: builtin/hash-object.c:98 -msgid "object type" -msgstr "物件類型" - -#: builtin/hash-object.c:99 -msgid "write the object into the object database" -msgstr "將物件寫入物件資料庫" - -#: builtin/hash-object.c:101 -msgid "read the object from stdin" -msgstr "從標準輸入讀取物件" - -#: builtin/hash-object.c:103 -msgid "store file as is without filters" -msgstr "原樣儲存檔案不使用過濾器" - -#: builtin/hash-object.c:104 -msgid "" -"just hash any random garbage to create corrupt objects for debugging Git" -msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便除錯 Git" - -#: builtin/hash-object.c:105 -msgid "process file as it were from this path" -msgstr "處理檔案並假設其來自於此路徑" - -#: builtin/help.c:46 -msgid "print all available commands" -msgstr "列印所有可用的指令" - -#: builtin/help.c:47 -msgid "exclude guides" -msgstr "排除嚮導" - -#: builtin/help.c:48 -msgid "print list of useful guides" -msgstr "顯示有用的指南列表" - -#: builtin/help.c:49 -msgid "print all configuration variable names" -msgstr "列印所有設定變數名稱" - -#: builtin/help.c:51 -msgid "show man page" -msgstr "顯示 man 手冊" - -#: builtin/help.c:52 -msgid "show manual in web browser" -msgstr "在 web 瀏覽器中顯示手冊" - -#: builtin/help.c:54 -msgid "show info page" -msgstr "顯示 info 手冊" - -#: builtin/help.c:56 -msgid "print command description" -msgstr "列印指令描述" - -#: builtin/help.c:61 -msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" -msgstr "git help [--all] [--guides] [--man | --web | --info] [<指令>]" - -#: builtin/help.c:77 -#, c-format -msgid "unrecognized help format '%s'" -msgstr "未能識別的協助格式 '%s'" - -#: builtin/help.c:104 -msgid "Failed to start emacsclient." -msgstr "無法啟動 emacsclient。" - -#: builtin/help.c:117 -msgid "Failed to parse emacsclient version." -msgstr "無法解析 emacsclient 版本。" - -#: builtin/help.c:125 -#, c-format -msgid "emacsclient version '%d' too old (< 22)." -msgstr "emacsclient 版本 '%d' 太老（< 22）。" - -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 -#, c-format -msgid "failed to exec '%s'" -msgstr "執行 '%s' 失敗" - -#: builtin/help.c:221 -#, c-format -msgid "" -"'%s': path for unsupported man viewer.\n" -"Please consider using 'man.<tool>.cmd' instead." -msgstr "" -"'%s'：不支援的 man 手冊檢視器的路徑。\n" -"請使用 'man.<工具>.cmd'。" - -#: builtin/help.c:233 -#, c-format -msgid "" -"'%s': cmd for supported man viewer.\n" -"Please consider using 'man.<tool>.path' instead." -msgstr "" -"'%s': 支援的 man 手冊檢視器指令。\n" -"請使用 'man.<工具>.path'。" - -#: builtin/help.c:350 -#, c-format -msgid "'%s': unknown man viewer." -msgstr "'%s'：未知的 man 檢視器。" - -#: builtin/help.c:367 -msgid "no man viewer handled the request" -msgstr "沒有 man 檢視器處理此請求" - -#: builtin/help.c:375 -msgid "no info viewer handled the request" -msgstr "沒有 info 檢視器處理此請求" - -#: builtin/help.c:434 builtin/help.c:445 git.c:336 -#, c-format -msgid "'%s' is aliased to '%s'" -msgstr "'%s' 是 '%s' 的別名" - -#: builtin/help.c:448 git.c:365 -#, c-format -msgid "bad alias.%s string: %s" -msgstr "壞的 alias.%s 字串：%s" - -#: builtin/help.c:477 builtin/help.c:507 -#, c-format -msgid "usage: %s%s" -msgstr "用法：%s%s" - -#: builtin/help.c:491 -msgid "'git help config' for more information" -msgstr "'git help config' 取得更多訊息" - -#: builtin/index-pack.c:185 -#, c-format -msgid "object type mismatch at %s" -msgstr "%s 的物件類型不符合" - -#: builtin/index-pack.c:205 -#, c-format -msgid "did not receive expected object %s" -msgstr "未能取得預期的物件 %s" - -#: builtin/index-pack.c:208 -#, c-format -msgid "object %s: expected type %s, found %s" -msgstr "物件 %s：應為類型 %s，卻是 %s" - -#: builtin/index-pack.c:258 -#, c-format -msgid "cannot fill %d byte" -msgid_plural "cannot fill %d bytes" -msgstr[0] "無法填充 %d 位元組" - -#: builtin/index-pack.c:268 -msgid "early EOF" -msgstr "過早的檔案結束符（EOF）" - -#: builtin/index-pack.c:269 -msgid "read error on input" -msgstr "輸入上的讀錯誤" - -#: builtin/index-pack.c:281 -msgid "used more bytes than were available" -msgstr "用掉了超過可用的位元組" - -#: builtin/index-pack.c:288 builtin/pack-objects.c:606 -msgid "pack too large for current definition of off_t" -msgstr "包太大超過了目前 off_t 的定義" - -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 -msgid "pack exceeds maximum allowed size" -msgstr "包超過了最大允許值" - -#: builtin/index-pack.c:312 -#, c-format -msgid "cannot open packfile '%s'" -msgstr "無法開啟 packfile '%s'" - -#: builtin/index-pack.c:326 -msgid "pack signature mismatch" -msgstr "包簽名不符合" - -#: builtin/index-pack.c:328 -#, c-format -msgid "pack version %<PRIu32> unsupported" -msgstr "不支援包版本 %<PRIu32>" - -#: builtin/index-pack.c:346 -#, c-format -msgid "pack has bad object at offset %<PRIuMAX>: %s" -msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s" - -#: builtin/index-pack.c:466 -#, c-format -msgid "inflate returned %d" -msgstr "解壓縮返回 %d" - -#: builtin/index-pack.c:515 -msgid "offset value overflow for delta base object" -msgstr "位移值覆蓋了 delta 基準物件" - -#: builtin/index-pack.c:523 -msgid "delta base offset is out of bound" -msgstr "delta 基準位移越界" - -#: builtin/index-pack.c:531 -#, c-format -msgid "unknown object type %d" -msgstr "未知物件類型 %d" - -#: builtin/index-pack.c:562 -msgid "cannot pread pack file" -msgstr "無法讀取包檔案" - -#: builtin/index-pack.c:564 -#, c-format -msgid "premature end of pack file, %<PRIuMAX> byte missing" -msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" -msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" - -#: builtin/index-pack.c:590 -msgid "serious inflate inconsistency" -msgstr "解壓縮嚴重的不一致" - -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 -#, c-format -msgid "SHA1 COLLISION FOUND WITH %s !" -msgstr "發現 %s 出現 SHA1 衝突！" - -#: builtin/index-pack.c:738 builtin/pack-objects.c:158 -#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 -#, c-format -msgid "unable to read %s" -msgstr "不能讀 %s" - -#: builtin/index-pack.c:802 -#, c-format -msgid "cannot read existing object info %s" -msgstr "不能讀取現存物件訊息 %s" - -#: builtin/index-pack.c:810 -#, c-format -msgid "cannot read existing object %s" -msgstr "不能讀取現存物件 %s" - -#: builtin/index-pack.c:824 -#, c-format -msgid "invalid blob object %s" -msgstr "無效的資料物件 %s" - -#: builtin/index-pack.c:827 builtin/index-pack.c:846 -msgid "fsck error in packed object" -msgstr "對打包物件 fsck 檢查發生錯誤" - -#: builtin/index-pack.c:848 -#, c-format -msgid "Not all child objects of %s are reachable" -msgstr "%s 的所有子物件並非都可以取得" - -#: builtin/index-pack.c:920 builtin/index-pack.c:951 -msgid "failed to apply delta" -msgstr "應用 delta 失敗" - -#: builtin/index-pack.c:1121 -msgid "Receiving objects" -msgstr "接收物件中" - -#: builtin/index-pack.c:1121 -msgid "Indexing objects" -msgstr "索引物件中" - -#: builtin/index-pack.c:1155 -msgid "pack is corrupted (SHA1 mismatch)" -msgstr "包衝突（SHA1 不符合）" - -#: builtin/index-pack.c:1160 -msgid "cannot fstat packfile" -msgstr "不能對 packfile 呼叫 fstat" - -#: builtin/index-pack.c:1163 -msgid "pack has junk at the end" -msgstr "包的結尾有垃圾資料" - -#: builtin/index-pack.c:1175 -msgid "confusion beyond insanity in parse_pack_objects()" -msgstr "parse_pack_objects() 中遇到不可理喻的問題" - -#: builtin/index-pack.c:1198 -msgid "Resolving deltas" -msgstr "處理 delta 中" - -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 -#, c-format -msgid "unable to create thread: %s" -msgstr "不能建立執行緒：%s" - -#: builtin/index-pack.c:1249 -msgid "confusion beyond insanity" -msgstr "不可理喻" - -#: builtin/index-pack.c:1255 -#, c-format -msgid "completed with %d local object" -msgid_plural "completed with %d local objects" -msgstr[0] "完成 %d 個本機物件" - -#: builtin/index-pack.c:1267 -#, c-format -msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" - -#: builtin/index-pack.c:1271 -#, c-format -msgid "pack has %d unresolved delta" -msgid_plural "pack has %d unresolved deltas" -msgstr[0] "包有 %d 個未解決的 delta" - -#: builtin/index-pack.c:1295 -#, c-format -msgid "unable to deflate appended object (%d)" -msgstr "不能壓縮附加物件（%d）" - -#: builtin/index-pack.c:1392 -#, c-format -msgid "local object %s is corrupt" -msgstr "本機物件 %s 已損壞" - -#: builtin/index-pack.c:1406 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "packfile 名稱 '%s' 沒有以 '.pack' 結尾" - -#: builtin/index-pack.c:1431 -#, c-format -msgid "cannot write %s file '%s'" -msgstr "無法寫入 %s 檔案 '%s'" - -#: builtin/index-pack.c:1439 -#, c-format -msgid "cannot close written %s file '%s'" -msgstr "無法關閉已寫入的 %s 檔案 '%s'" - -#: builtin/index-pack.c:1463 -msgid "error while closing pack file" -msgstr "關閉包檔案時發生錯誤" - -#: builtin/index-pack.c:1477 -msgid "cannot store pack file" -msgstr "無法儲存包檔案" - -#: builtin/index-pack.c:1485 -msgid "cannot store index file" -msgstr "無法儲存索引檔案" - -#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 -#, c-format -msgid "bad pack.indexversion=%<PRIu32>" -msgstr "壞的 pack.indexversion=%<PRIu32>" - -#: builtin/index-pack.c:1597 -#, c-format -msgid "Cannot open existing pack file '%s'" -msgstr "無法開啟現存包檔案 '%s'" - -#: builtin/index-pack.c:1599 -#, c-format -msgid "Cannot open existing pack idx file for '%s'" -msgstr "無法為 %s 開啟包索引檔案" - -#: builtin/index-pack.c:1647 -#, c-format -msgid "non delta: %d object" -msgid_plural "non delta: %d objects" -msgstr[0] "非 delta：%d 個物件" - -#: builtin/index-pack.c:1654 -#, c-format -msgid "chain length = %d: %lu object" -msgid_plural "chain length = %d: %lu objects" -msgstr[0] "鏈長 = %d: %lu 物件" - -#: builtin/index-pack.c:1693 -msgid "Cannot come back to cwd" -msgstr "無法返回目前工作目錄" - -#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 -#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 -#, c-format -msgid "bad %s" -msgstr "錯誤選項 %s" - -#: builtin/index-pack.c:1781 -msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin 不能和 --stdin 同時使用" - -#: builtin/index-pack.c:1783 -msgid "--stdin requires a git repository" -msgstr "--stdin 需要一個 git 版本庫" - -#: builtin/index-pack.c:1789 -msgid "--verify with no packfile name given" -msgstr "--verify 沒有提供 packfile 名稱參數" - -#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 -msgid "fsck error in pack objects" -msgstr "在打包物件中 fsck 檢查發生錯誤" - -#: builtin/init-db.c:61 -#, c-format -msgid "cannot stat template '%s'" -msgstr "不能對範本 '%s' 呼叫 stat" - -#: builtin/init-db.c:66 -#, c-format -msgid "cannot opendir '%s'" -msgstr "不能開啟目錄 '%s'" - -#: builtin/init-db.c:78 -#, c-format -msgid "cannot readlink '%s'" -msgstr "不能讀取連結 '%s'" - -#: builtin/init-db.c:80 -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "不能自 '%s' 到 '%s' 建立符號連結" - -#: builtin/init-db.c:86 -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "不能複製 '%s' 至 '%s'" - -#: builtin/init-db.c:90 -#, c-format -msgid "ignoring template %s" -msgstr "忽略範本 %s" - -#: builtin/init-db.c:121 -#, c-format -msgid "templates not found in %s" -msgstr "沒有在 %s 中找到範本" - -#: builtin/init-db.c:136 -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "沒有從 '%s' 複製範本：%s" - -#: builtin/init-db.c:334 -#, c-format -msgid "unable to handle file type %d" -msgstr "不能處理 %d 類型的檔案" - -#: builtin/init-db.c:337 -#, c-format -msgid "unable to move %s to %s" -msgstr "不能移動 %s 至 %s" - -#: builtin/init-db.c:354 builtin/init-db.c:357 -#, c-format -msgid "%s already exists" -msgstr "%s 已經存在" - -#: builtin/init-db.c:413 -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n" - -#: builtin/init-db.c:414 -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n" - -#: builtin/init-db.c:418 -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "已初始化空的共享 Git 版本庫於 %s%s\n" - -#: builtin/init-db.c:419 -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "已初始化空的 Git 版本庫於 %s%s\n" - -#: builtin/init-db.c:468 -msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" -"shared[=<permissions>]] [<directory>]" -msgstr "" -"git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] " -"[<目錄>]" - -#: builtin/init-db.c:491 -msgid "permissions" -msgstr "權限" - -#: builtin/init-db.c:492 -msgid "specify that the git repository is to be shared amongst several users" -msgstr "指定 git 版本庫是多個使用者之間共享的" - -#: builtin/init-db.c:529 builtin/init-db.c:534 -#, c-format -msgid "cannot mkdir %s" -msgstr "不能建立目錄 %s" - -#: builtin/init-db.c:538 -#, c-format -msgid "cannot chdir to %s" -msgstr "不能切換目錄到 %s" - -#: builtin/init-db.c:559 -#, c-format -msgid "" -"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" -"dir=<directory>)" -msgstr "不允許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）" - -#: builtin/init-db.c:587 -#, c-format -msgid "Cannot access work tree '%s'" -msgstr "不能存取工作區 '%s'" - -#: builtin/interpret-trailers.c:16 -msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<token>[(=|:)<value>])...] [<file>...]" -msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <鍵>[(=|:)<值" -">])...] [<檔案>...]" - -#: builtin/interpret-trailers.c:95 -msgid "edit files in place" -msgstr "在原位編輯檔案" - -#: builtin/interpret-trailers.c:96 -msgid "trim empty trailers" -msgstr "刪除空的尾部署名" - -#: builtin/interpret-trailers.c:99 -msgid "where to place the new trailer" -msgstr "在哪裡放置新的尾部署名" - -#: builtin/interpret-trailers.c:101 -msgid "action if trailer already exists" -msgstr "當尾部署名已經存在時所採取的動作" - -#: builtin/interpret-trailers.c:103 -msgid "action if trailer is missing" -msgstr "當尾部署名缺少時所採取的動作" - -#: builtin/interpret-trailers.c:105 -msgid "output only the trailers" -msgstr "只輸出尾部署名" - -#: builtin/interpret-trailers.c:106 -msgid "do not apply config rules" -msgstr "不要應用設定規則" - -#: builtin/interpret-trailers.c:107 -msgid "join whitespace-continued values" -msgstr "連線空白折行的值" - -#: builtin/interpret-trailers.c:108 -msgid "set parsing options" -msgstr "設定解析選項" - -#: builtin/interpret-trailers.c:110 -msgid "do not treat --- specially" -msgstr "不要對 --- 特殊處理" - -#: builtin/interpret-trailers.c:111 -msgid "trailer" -msgstr "尾部署名" - -#: builtin/interpret-trailers.c:112 -msgid "trailer(s) to add" -msgstr "要新增的尾部署名" - -#: builtin/interpret-trailers.c:123 -msgid "--trailer with --only-input does not make sense" -msgstr "--trailer 和 --only-input 同時使用沒有意義" - -#: builtin/interpret-trailers.c:133 -msgid "no input file given for in-place editing" -msgstr "沒有給出要原位編輯的檔案" - -#: builtin/log.c:56 -msgid "git log [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]" - -#: builtin/log.c:57 -msgid "git show [<options>] <object>..." -msgstr "git show [<選項>] <物件>..." - -#: builtin/log.c:110 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "無效的 --decorate 選項：%s" - -#: builtin/log.c:174 -msgid "show source" -msgstr "顯示源" - -#: builtin/log.c:175 -msgid "Use mail map file" -msgstr "使用信件映射檔案" - -#: builtin/log.c:177 -msgid "only decorate refs that match <pattern>" -msgstr "只修飾與 <模式> 符合的引用" - -#: builtin/log.c:179 -msgid "do not decorate refs that match <pattern>" -msgstr "不修飾和 <模式> 符合的引用" - -#: builtin/log.c:180 -msgid "decorate options" -msgstr "修飾選項" - -#: builtin/log.c:183 -msgid "Process line range n,m in file, counting from 1" -msgstr "處理檔案中第 n 到 m 之間的行，從 1 開始" - -#: builtin/log.c:281 -#, c-format -msgid "Final output: %d %s\n" -msgstr "最終輸出：%d %s\n" - -#: builtin/log.c:535 -#, c-format -msgid "git show %s: bad file" -msgstr "git show %s: 損壞的檔案" - -#: builtin/log.c:550 builtin/log.c:645 -#, c-format -msgid "could not read object %s" -msgstr "不能讀取物件 %s" - -#: builtin/log.c:670 -#, c-format -msgid "unknown type: %d" -msgstr "未知類型：%d" - -#: builtin/log.c:814 -#, c-format -msgid "%s: invalid cover from description mode" -msgstr "%s：從描述產生附函的模式無效" - -#: builtin/log.c:821 -msgid "format.headers without value" -msgstr "format.headers 沒有值" - -#: builtin/log.c:936 -msgid "name of output directory is too long" -msgstr "輸出目錄名太長" - -#: builtin/log.c:952 -#, c-format -msgid "cannot open patch file %s" -msgstr "無法開啟修補檔案 %s" - -#: builtin/log.c:969 -msgid "need exactly one range" -msgstr "只需要一個範圍" - -#: builtin/log.c:979 -msgid "not a range" -msgstr "不是一個範圍" - -#: builtin/log.c:1143 -msgid "cover letter needs email format" -msgstr "附函需要信件位址格式" - -#: builtin/log.c:1149 -msgid "failed to create cover-letter file" -msgstr "無法建立附函檔案" - -#: builtin/log.c:1228 -#, c-format -msgid "insane in-reply-to: %s" -msgstr "不正常的 in-reply-to：%s" - -#: builtin/log.c:1255 -msgid "git format-patch [<options>] [<since> | <revision-range>]" -msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" - -#: builtin/log.c:1313 -msgid "two output directories?" -msgstr "兩個輸出目錄？" - -#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 -#, c-format -msgid "unknown commit %s" -msgstr "未知提交 %s" - -#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 -#: builtin/replace.c:210 -#, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "無法將 '%s' 解析為一個有效引用" - -#: builtin/log.c:1439 -msgid "could not find exact merge base" -msgstr "不能找到準確的合併基礎" - -#: builtin/log.c:1443 -msgid "" -"failed to get upstream, if you want to record base commit automatically,\n" -"please use git branch --set-upstream-to to track a remote branch.\n" -"Or you could specify base commit by --base=<base-commit-id> manually" -msgstr "" -"無法得到上游位址，如果你想自動記錄基礎提交，請使用指令\n" -"git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" -"參數 --base=<基礎提交> 手動指定一個基礎提交" - -#: builtin/log.c:1463 -msgid "failed to find exact merge base" -msgstr "無法找到準確的合併基礎" - -#: builtin/log.c:1474 -msgid "base commit should be the ancestor of revision list" -msgstr "基礎提交應該是版本列表的祖先" - -#: builtin/log.c:1478 -msgid "base commit shouldn't be in revision list" -msgstr "基礎提交不應該出現在版本列表中" - -#: builtin/log.c:1531 -msgid "cannot get patch id" -msgstr "無法得到修補檔 id" - -#: builtin/log.c:1583 -msgid "failed to infer range-diff ranges" -msgstr "無法推斷 range-diff 範圍" - -#: builtin/log.c:1629 -msgid "use [PATCH n/m] even with a single patch" -msgstr "使用 [PATCH n/m]，即使只有一個修補檔" - -#: builtin/log.c:1632 -msgid "use [PATCH] even with multiple patches" -msgstr "使用 [PATCH]，即使有多個修補檔" - -#: builtin/log.c:1636 -msgid "print patches to standard out" -msgstr "列印修補檔到標準輸出" - -#: builtin/log.c:1638 -msgid "generate a cover letter" -msgstr "生成一封附函" - -#: builtin/log.c:1640 -msgid "use simple number sequence for output file names" -msgstr "使用簡單的數字序列作為輸出檔案名" - -#: builtin/log.c:1641 -msgid "sfx" -msgstr "後綴" - -#: builtin/log.c:1642 -msgid "use <sfx> instead of '.patch'" -msgstr "使用 <後綴> 代替 '.patch'" - -#: builtin/log.c:1644 -msgid "start numbering patches at <n> instead of 1" -msgstr "修補檔以 <n> 開始編號，而不是1" - -#: builtin/log.c:1646 -msgid "mark the series as Nth re-roll" -msgstr "標記修補檔系列是第幾次重製" - -#: builtin/log.c:1648 -msgid "Use [RFC PATCH] instead of [PATCH]" -msgstr "使用 [RFC PATCH] 代替 [PATCH]" - -#: builtin/log.c:1651 -msgid "cover-from-description-mode" -msgstr "從描述產生附函的模式" - -#: builtin/log.c:1652 -msgid "generate parts of a cover letter based on a branch's description" -msgstr "基於分支描述產生部分附函" - -#: builtin/log.c:1654 -msgid "Use [<prefix>] instead of [PATCH]" -msgstr "使用 [<前綴>] 代替 [PATCH]" - -#: builtin/log.c:1657 -msgid "store resulting files in <dir>" -msgstr "把結果檔案儲存在 <目錄>" - -#: builtin/log.c:1660 -msgid "don't strip/add [PATCH]" -msgstr "不刪除/新增 [PATCH]" - -#: builtin/log.c:1663 -msgid "don't output binary diffs" -msgstr "不輸出二進位差異" - -#: builtin/log.c:1665 -msgid "output all-zero hash in From header" -msgstr "在 From 標頭訊息中輸出全為零的雜湊值" - -#: builtin/log.c:1667 -msgid "don't include a patch matching a commit upstream" -msgstr "不包含已在上游提交中的修補檔" - -#: builtin/log.c:1669 -msgid "show patch format instead of default (patch + stat)" -msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" - -#: builtin/log.c:1671 -msgid "Messaging" -msgstr "信件傳送" - -#: builtin/log.c:1672 -msgid "header" -msgstr "header" - -#: builtin/log.c:1673 -msgid "add email header" -msgstr "新增信件頭" - -#: builtin/log.c:1674 builtin/log.c:1676 -msgid "email" -msgstr "信件位址" - -#: builtin/log.c:1674 -msgid "add To: header" -msgstr "新增收件人" - -#: builtin/log.c:1676 -msgid "add Cc: header" -msgstr "新增抄送" - -#: builtin/log.c:1678 -msgid "ident" -msgstr "標記" - -#: builtin/log.c:1679 -msgid "set From address to <ident> (or committer ident if absent)" -msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" - -#: builtin/log.c:1681 -msgid "message-id" -msgstr "信件標記" - -#: builtin/log.c:1682 -msgid "make first mail a reply to <message-id>" -msgstr "使第一封信件作為對 <信件標記> 的回覆" - -#: builtin/log.c:1683 builtin/log.c:1686 -msgid "boundary" -msgstr "邊界" - -#: builtin/log.c:1684 -msgid "attach the patch" -msgstr "附件方式新增修補檔" - -#: builtin/log.c:1687 -msgid "inline the patch" -msgstr "內聯顯示修補檔" - -#: builtin/log.c:1691 -msgid "enable message threading, styles: shallow, deep" -msgstr "啟用信件線索，風格：淺，深" - -#: builtin/log.c:1693 -msgid "signature" -msgstr "簽名" - -#: builtin/log.c:1694 -msgid "add a signature" -msgstr "新增一個簽名" - -#: builtin/log.c:1695 -msgid "base-commit" -msgstr "基礎提交" - -#: builtin/log.c:1696 -msgid "add prerequisite tree info to the patch series" -msgstr "為修補檔列表新增前置樹訊息" - -#: builtin/log.c:1698 -msgid "add a signature from a file" -msgstr "從檔案新增一個簽名" - -#: builtin/log.c:1699 -msgid "don't print the patch filenames" -msgstr "不要列印修補檔檔案名" - -#: builtin/log.c:1701 -msgid "show progress while generating patches" -msgstr "在生成修補檔時顯示進度" - -#: builtin/log.c:1703 -msgid "show changes against <rev> in cover letter or single patch" -msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" - -#: builtin/log.c:1706 -msgid "show changes against <refspec> in cover letter or single patch" -msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" - -#: builtin/log.c:1708 -msgid "percentage by which creation is weighted" -msgstr "建立權重的百分比" - -#: builtin/log.c:1792 -#, c-format -msgid "invalid ident line: %s" -msgstr "包含無效的身份標記：%s" - -#: builtin/log.c:1807 -msgid "-n and -k are mutually exclusive" -msgstr "-n 和 -k 互斥" - -#: builtin/log.c:1809 -msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "--subject-prefix/--rfc 和 -k 互斥" - -#: builtin/log.c:1817 -msgid "--name-only does not make sense" -msgstr "--name-only 無意義" - -#: builtin/log.c:1819 -msgid "--name-status does not make sense" -msgstr "--name-status 無意義" - -#: builtin/log.c:1821 -msgid "--check does not make sense" -msgstr "--check 無意義" - -#: builtin/log.c:1854 -msgid "standard output, or directory, which one?" -msgstr "標準輸出或目錄，哪一個？" - -#: builtin/log.c:1958 -msgid "--interdiff requires --cover-letter or single patch" -msgstr "--interdiff 需要 --cover-letter 或單一修補檔" - -#: builtin/log.c:1962 -msgid "Interdiff:" -msgstr "版本間差異：" - -#: builtin/log.c:1963 -#, c-format -msgid "Interdiff against v%d:" -msgstr "對 v%d 的版本差異：" - -#: builtin/log.c:1969 -msgid "--creation-factor requires --range-diff" -msgstr "--creation-factor 需要 --range-diff" - -#: builtin/log.c:1973 -msgid "--range-diff requires --cover-letter or single patch" -msgstr "--range-diff 需要 --cover-letter 或單一修補檔" - -#: builtin/log.c:1981 -msgid "Range-diff:" -msgstr "範圍差異：" - -#: builtin/log.c:1982 -#, c-format -msgid "Range-diff against v%d:" -msgstr "對 v%d 的範圍差異：" - -#: builtin/log.c:1993 -#, c-format -msgid "unable to read signature file '%s'" -msgstr "無法讀取簽名檔案 '%s'" - -#: builtin/log.c:2029 -msgid "Generating patches" -msgstr "生成修補檔" - -#: builtin/log.c:2073 -msgid "failed to create output files" -msgstr "無法建立輸出檔案" - -#: builtin/log.c:2132 -msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" - -#: builtin/log.c:2186 -#, c-format -msgid "" -"Could not find a tracked remote branch, please specify <upstream> manually.\n" -msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n" - -#: builtin/ls-files.c:470 -msgid "git ls-files [<options>] [<file>...]" -msgstr "git ls-files [<選項>] [<檔案>...]" - -#: builtin/ls-files.c:526 -msgid "identify the file status with tags" -msgstr "用標籤標記檔案的狀態" - -#: builtin/ls-files.c:528 -msgid "use lowercase letters for 'assume unchanged' files" -msgstr "使用小寫字母表示 '假設未改變的' 檔案" - -#: builtin/ls-files.c:530 -msgid "use lowercase letters for 'fsmonitor clean' files" -msgstr "使用小寫字母表示 'fsmonitor clean' 檔案" - -#: builtin/ls-files.c:532 -msgid "show cached files in the output (default)" -msgstr "顯示快取的檔案（預設）" - -#: builtin/ls-files.c:534 -msgid "show deleted files in the output" -msgstr "顯示已刪除的檔案" - -#: builtin/ls-files.c:536 -msgid "show modified files in the output" -msgstr "顯示已修改的檔案" - -#: builtin/ls-files.c:538 -msgid "show other files in the output" -msgstr "顯示其它檔案" - -#: builtin/ls-files.c:540 -msgid "show ignored files in the output" -msgstr "顯示忽略的檔案" - -#: builtin/ls-files.c:543 -msgid "show staged contents' object name in the output" -msgstr "顯示暫存區內容的物件名稱" - -#: builtin/ls-files.c:545 -msgid "show files on the filesystem that need to be removed" -msgstr "顯示檔案系統需要刪除的檔案" - -#: builtin/ls-files.c:547 -msgid "show 'other' directories' names only" -msgstr "只顯示「其他」目錄的名稱" - -#: builtin/ls-files.c:549 -msgid "show line endings of files" -msgstr "顯示檔案換行符號格式" - -#: builtin/ls-files.c:551 -msgid "don't show empty directories" -msgstr "不顯示空目錄" - -#: builtin/ls-files.c:554 -msgid "show unmerged files in the output" -msgstr "顯示未合併的檔案" - -#: builtin/ls-files.c:556 -msgid "show resolve-undo information" -msgstr "顯示 resolve-undo 訊息" - -#: builtin/ls-files.c:558 -msgid "skip files matching pattern" -msgstr "符合排除檔案的模式" - -#: builtin/ls-files.c:561 -msgid "exclude patterns are read from <file>" -msgstr "從 <檔案> 中讀取排除模式" - -#: builtin/ls-files.c:564 -msgid "read additional per-directory exclude patterns in <file>" -msgstr "從 <檔案> 讀取額外的每個目錄的排除模式" - -#: builtin/ls-files.c:566 -msgid "add the standard git exclusions" -msgstr "新增標準的 git 排除" - -#: builtin/ls-files.c:570 -msgid "make the output relative to the project top directory" -msgstr "顯示相對於頂級目錄的檔案名" - -#: builtin/ls-files.c:573 -msgid "recurse through submodules" -msgstr "在子模組中遞迴" - -#: builtin/ls-files.c:575 -msgid "if any <file> is not in the index, treat this as an error" -msgstr "如果任何 <檔案> 都不在索引區，視為錯誤" - -#: builtin/ls-files.c:576 -msgid "tree-ish" -msgstr "樹或提交" - -#: builtin/ls-files.c:577 -msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在" - -#: builtin/ls-files.c:579 -msgid "show debugging data" -msgstr "顯示除錯資料" - -#: builtin/ls-remote.c:9 -msgid "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<repository> [<refs>...]]" -msgstr "" -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [<版本庫> [<引用>...]]" - -#: builtin/ls-remote.c:59 -msgid "do not print remote URL" -msgstr "不列印遠端 URL" - -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 -msgid "exec" -msgstr "exec" - -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 -msgid "path of git-upload-pack on the remote host" -msgstr "遠端主機上的 git-upload-pack 路徑" - -#: builtin/ls-remote.c:65 -msgid "limit to tags" -msgstr "僅限於標籤" - -#: builtin/ls-remote.c:66 -msgid "limit to heads" -msgstr "僅限於分支" - -#: builtin/ls-remote.c:67 -msgid "do not show peeled tags" -msgstr "不顯示已解析的標籤" - -#: builtin/ls-remote.c:69 -msgid "take url.<base>.insteadOf into account" -msgstr "參考 url.<base>.insteadOf 設定" - -#: builtin/ls-remote.c:72 -msgid "exit with exit code 2 if no matching refs are found" -msgstr "若未找到符合的引用則以離開碼2離開" - -#: builtin/ls-remote.c:75 -msgid "show underlying ref in addition to the object pointed by it" -msgstr "除了顯示指向的物件外，顯示指向的引用名" - -#: builtin/ls-tree.c:30 -msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]" - -#: builtin/ls-tree.c:128 -msgid "only show trees" -msgstr "只顯示樹" - -#: builtin/ls-tree.c:130 -msgid "recurse into subtrees" -msgstr "遞迴到子樹" - -#: builtin/ls-tree.c:132 -msgid "show trees when recursing" -msgstr "當遞迴時顯示樹" - -#: builtin/ls-tree.c:135 -msgid "terminate entries with NUL byte" -msgstr "條目以 NUL 字元終止" - -#: builtin/ls-tree.c:136 -msgid "include object size" -msgstr "包括物件大小" - -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 -msgid "list only filenames" -msgstr "只列出檔案名" - -#: builtin/ls-tree.c:143 -msgid "use full path names" -msgstr "使用檔案的全路徑" - -#: builtin/ls-tree.c:145 -msgid "list entire tree; not just current directory (implies --full-name)" -msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）" - -#: builtin/mailsplit.c:241 -#, c-format -msgid "empty mbox: '%s'" -msgstr "空的 mbox：'%s'" - -#: builtin/merge.c:55 -msgid "git merge [<options>] [<commit>...]" -msgstr "git merge [<選項>] [<提交>...]" - -#: builtin/merge.c:56 -msgid "git merge --abort" -msgstr "git merge --abort" - -#: builtin/merge.c:57 -msgid "git merge --continue" -msgstr "git merge --continue" - -#: builtin/merge.c:119 -msgid "switch `m' requires a value" -msgstr "開關 `m' 需要一個值" - -#: builtin/merge.c:142 -#, c-format -msgid "option `%s' requires a value" -msgstr "選項 `%s' 需要一個值" - -#: builtin/merge.c:188 -#, c-format -msgid "Could not find merge strategy '%s'.\n" -msgstr "不能找到合併策略 '%s'。\n" - -#: builtin/merge.c:189 -#, c-format -msgid "Available strategies are:" -msgstr "可用的策略有：" - -#: builtin/merge.c:194 -#, c-format -msgid "Available custom strategies are:" -msgstr "可用的自訂策略有：" - -#: builtin/merge.c:245 builtin/pull.c:132 -msgid "do not show a diffstat at the end of the merge" -msgstr "在合併的最後不顯示差異統計" - -#: builtin/merge.c:248 builtin/pull.c:135 -msgid "show a diffstat at the end of the merge" -msgstr "在合併的最後顯示差異統計" - -#: builtin/merge.c:249 builtin/pull.c:138 -msgid "(synonym to --stat)" -msgstr "（和 --stat 同義）" - -#: builtin/merge.c:251 builtin/pull.c:141 -msgid "add (at most <n>) entries from shortlog to merge commit message" -msgstr "在合併提交訊息中新增（最多 <n> 條）精簡提交記錄" - -#: builtin/merge.c:254 builtin/pull.c:147 -msgid "create a single commit instead of doing a merge" -msgstr "建立一個單獨的提交而不是做一次合併" - -#: builtin/merge.c:256 builtin/pull.c:150 -msgid "perform a commit if the merge succeeds (default)" -msgstr "如果合併成功，執行一次提交（預設）" - -#: builtin/merge.c:258 builtin/pull.c:153 -msgid "edit message before committing" -msgstr "在提交前編輯提交說明" - -#: builtin/merge.c:260 -msgid "allow fast-forward (default)" -msgstr "允許快轉（預設）" - -#: builtin/merge.c:262 builtin/pull.c:160 -msgid "abort if fast-forward is not possible" -msgstr "如果不能快轉就放棄合併" - -#: builtin/merge.c:266 builtin/pull.c:163 -msgid "verify that the named commit has a valid GPG signature" -msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" - -#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 -#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 -msgid "strategy" -msgstr "策略" - -#: builtin/merge.c:268 builtin/pull.c:168 -msgid "merge strategy to use" -msgstr "要使用的合併策略" - -#: builtin/merge.c:269 builtin/pull.c:171 -msgid "option=value" -msgstr "option=value" - -#: builtin/merge.c:270 builtin/pull.c:172 -msgid "option for selected merge strategy" -msgstr "所選的合併策略的選項" - -#: builtin/merge.c:272 -msgid "merge commit message (for a non-fast-forward merge)" -msgstr "合併的提交說明（針對非快轉式合併）" - -#: builtin/merge.c:279 -msgid "abort the current in-progress merge" -msgstr "放棄目前正在進行的合併" - -# -#: builtin/merge.c:281 -msgid "--abort but leave index and working tree alone" -msgstr "--abort，但是保留索引和工作區" - -#: builtin/merge.c:283 -msgid "continue the current in-progress merge" -msgstr "繼續目前正在進行的合併" - -#: builtin/merge.c:285 builtin/pull.c:179 -msgid "allow merging unrelated histories" -msgstr "允許合並不相關的歷史" - -#: builtin/merge.c:291 -msgid "bypass pre-merge-commit and commit-msg hooks" -msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" - -#: builtin/merge.c:308 -msgid "could not run stash." -msgstr "不能執行儲藏。" - -#: builtin/merge.c:313 -msgid "stash failed" -msgstr "儲藏失敗" - -#: builtin/merge.c:318 -#, c-format -msgid "not a valid object: %s" -msgstr "不是一個有效物件：%s" - -#: builtin/merge.c:340 builtin/merge.c:357 -msgid "read-tree failed" -msgstr "讀取樹失敗" - -# 譯者：請維持前導空格 -#: builtin/merge.c:387 -msgid " (nothing to squash)" -msgstr " （無可壓縮）" - -#: builtin/merge.c:398 -#, c-format -msgid "Squash commit -- not updating HEAD\n" -msgstr "壓縮提交 -- 未更新 HEAD\n" - -#: builtin/merge.c:448 -#, c-format -msgid "No merge message -- not updating HEAD\n" -msgstr "無合併訊息 -- 未更新 HEAD\n" - -#: builtin/merge.c:499 -#, c-format -msgid "'%s' does not point to a commit" -msgstr "'%s' 沒有指向一個提交" - -#: builtin/merge.c:586 -#, c-format -msgid "Bad branch.%s.mergeoptions string: %s" -msgstr "壞的 branch.%s.mergeoptions 字串：%s" - -#: builtin/merge.c:708 -msgid "Not handling anything other than two heads merge." -msgstr "未處理兩個頭合併之外的任何動作。" - -#: builtin/merge.c:722 -#, c-format -msgid "Unknown option for merge-recursive: -X%s" -msgstr "merge-recursive 的未知選項：-X%s" - -#: builtin/merge.c:737 -#, c-format -msgid "unable to write %s" -msgstr "不能寫 %s" - -#: builtin/merge.c:789 -#, c-format -msgid "Could not read from '%s'" -msgstr "不能從 '%s' 讀取" - -#: builtin/merge.c:798 -#, c-format -msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" - -#: builtin/merge.c:804 -msgid "" -"Please enter a commit message to explain why this merge is necessary,\n" -"especially if it merges an updated upstream into a topic branch.\n" -"\n" -msgstr "" -"請輸入一個提交訊息以解釋此合併的必要性，尤其是將一個更新後的上游分支\n" -"合併到主題分支。\n" -"\n" - -#: builtin/merge.c:809 -msgid "An empty message aborts the commit.\n" -msgstr "空的提交說明會終止提交。\n" - -#: builtin/merge.c:812 -#, c-format -msgid "" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" -msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" - -#: builtin/merge.c:865 -msgid "Empty commit message." -msgstr "空提交訊息。" - -#: builtin/merge.c:880 -#, c-format -msgid "Wonderful.\n" -msgstr "太棒了。\n" - -#: builtin/merge.c:941 -#, c-format -msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" - -#: builtin/merge.c:980 -msgid "No current branch." -msgstr "沒有目前分支。" - -#: builtin/merge.c:982 -msgid "No remote for the current branch." -msgstr "目前分支沒有對應的遠端版本庫。" - -#: builtin/merge.c:984 -msgid "No default upstream defined for the current branch." -msgstr "目前分支沒有定義預設的上游分支。" - -#: builtin/merge.c:989 -#, c-format -msgid "No remote-tracking branch for %s from %s" -msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" - -#: builtin/merge.c:1046 -#, c-format -msgid "Bad value '%s' in environment '%s'" -msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" - -#: builtin/merge.c:1149 -#, c-format -msgid "not something we can merge in %s: %s" -msgstr "不能在 %s 中合併：%s" - -#: builtin/merge.c:1183 -msgid "not something we can merge" -msgstr "不能合併" - -#: builtin/merge.c:1286 -msgid "--abort expects no arguments" -msgstr "--abort 不帶參數" - -#: builtin/merge.c:1290 -msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" - -#: builtin/merge.c:1299 -msgid "--quit expects no arguments" -msgstr "--quit 不帶參數" - -#: builtin/merge.c:1312 -msgid "--continue expects no arguments" -msgstr "--continue 不帶參數" - -#: builtin/merge.c:1316 -msgid "There is no merge in progress (MERGE_HEAD missing)." -msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" - -#: builtin/merge.c:1332 -msgid "" -"You have not concluded your merge (MERGE_HEAD exists).\n" -"Please, commit your changes before you merge." -msgstr "" -"您尚未結束您的合併（存在 MERGE_HEAD）。\n" -"請在合併前先提交您的修改。" - -#: builtin/merge.c:1339 -msgid "" -"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" -"Please, commit your changes before you merge." -msgstr "" -"您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" -"請在合併前先提交您的修改。" - -#: builtin/merge.c:1342 -msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" - -#: builtin/merge.c:1356 -msgid "You cannot combine --squash with --no-ff." -msgstr "您不能將 --squash 和 --no-ff 組合使用。" - -#: builtin/merge.c:1358 -msgid "You cannot combine --squash with --commit." -msgstr "您不能將 --squash 和 --commit 組合使用。" - -#: builtin/merge.c:1374 -msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" - -#: builtin/merge.c:1391 -msgid "Squash commit into empty head not supported yet" -msgstr "尚不支援到空分支的壓縮提交" - -#: builtin/merge.c:1393 -msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "到空分支的非快轉式提交沒有意義" - -#: builtin/merge.c:1398 -#, c-format -msgid "%s - not something we can merge" -msgstr "%s - 不能被合併" - -#: builtin/merge.c:1400 -msgid "Can merge only exactly one commit into empty head" -msgstr "只能將一個提交合並到空分支上" - -#: builtin/merge.c:1481 -msgid "refusing to merge unrelated histories" -msgstr "拒絕合併無關的歷史" - -#: builtin/merge.c:1490 -msgid "Already up to date." -msgstr "已經是最新的。" - -#: builtin/merge.c:1500 -#, c-format -msgid "Updating %s..%s\n" -msgstr "更新 %s..%s\n" - -#: builtin/merge.c:1542 -#, c-format -msgid "Trying really trivial in-index merge...\n" -msgstr "嘗試非常小的索引內合併...\n" - -#: builtin/merge.c:1549 -#, c-format -msgid "Nope.\n" -msgstr "無。\n" - -#: builtin/merge.c:1574 -msgid "Already up to date. Yeeah!" -msgstr "已經是最新的。耶！" - -#: builtin/merge.c:1580 -msgid "Not possible to fast-forward, aborting." -msgstr "無法快轉，終止。" - -#: builtin/merge.c:1603 builtin/merge.c:1668 -#, c-format -msgid "Rewinding the tree to pristine...\n" -msgstr "將樹回滾至原始狀態...\n" - -#: builtin/merge.c:1607 -#, c-format -msgid "Trying merge strategy %s...\n" -msgstr "嘗試合併策略 %s...\n" - -#: builtin/merge.c:1659 -#, c-format -msgid "No merge strategy handled the merge.\n" -msgstr "沒有合併策略處理此合併。\n" - -#: builtin/merge.c:1661 -#, c-format -msgid "Merge with strategy %s failed.\n" -msgstr "使用策略 %s 合併失敗。\n" - -#: builtin/merge.c:1670 -#, c-format -msgid "Using the %s to prepare resolving by hand.\n" -msgstr "使用 %s 以準備手動解決。\n" - -#: builtin/merge.c:1682 -#, c-format -msgid "Automatic merge went well; stopped before committing as requested\n" -msgstr "自動合併進展順利，按要求在提交前停止\n" - -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <提交> <提交>..." - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <提交>..." - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <提交>..." - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <提交> <提交>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <引用> [<提交>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "輸出所有共同的祖先" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "尋找一個多路合併的祖先提交" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "顯示不能被其他存取到的版本" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "第一個是其他的祖先提交嗎？" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" -"git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文" -"件> <檔案2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "將結果傳送到標準輸出" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "使用基於 diff3 的合併" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "如果衝突，使用我們的版本" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "如果衝突，使用他們的版本" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "如果衝突，使用聯合版本" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "如果衝突，使用指定長度的標記" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "不要警告衝突" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "為 檔案1/初始檔案/檔案2 設定標籤" - -#: builtin/merge-recursive.c:47 -#, c-format -msgid "unknown option %s" -msgstr "未知選項 %s" - -#: builtin/merge-recursive.c:53 -#, c-format -msgid "could not parse object '%s'" -msgstr "不能解析物件 '%s'" - -#: builtin/merge-recursive.c:57 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。" - -#: builtin/merge-recursive.c:65 -msgid "not handling anything other than two heads merge." -msgstr "不能處理兩個頭合併之外的任何動作。" - -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "無法解析引用 '%s'" - -#: builtin/merge-recursive.c:82 -#, c-format -msgid "Merging %s with %s\n" -msgstr "合併 %s 和 %s\n" - -#: builtin/mktree.c:66 -msgid "git mktree [-z] [--missing] [--batch]" -msgstr "git mktree [-z] [--missing] [--batch]" - -#: builtin/mktree.c:154 -msgid "input is NUL terminated" -msgstr "輸入以 NUL 字元終止" - -#: builtin/mktree.c:155 builtin/write-tree.c:26 -msgid "allow missing objects" -msgstr "允許遺失的物件" - -#: builtin/mktree.c:156 -msgid "allow creation of more than one tree" -msgstr "允許建立一個以上的樹" - -#: builtin/multi-pack-index.c:9 -msgid "" -"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" -"size=<size>)" -msgstr "" -"git multi-pack-index [<選項>] (write|verify|expire|repack --batch-size=<大小" -">)" - -#: builtin/multi-pack-index.c:26 -msgid "object directory containing set of packfile and pack-index pairs" -msgstr "包含成對 packfile 和包索引的物件目錄" - -#: builtin/multi-pack-index.c:29 -msgid "" -"during repack, collect pack-files of smaller size into a batch that is " -"larger than this size" -msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" - -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 -msgid "too many arguments" -msgstr "太多參數" - -#: builtin/multi-pack-index.c:60 -msgid "--batch-size option is only for 'repack' subcommand" -msgstr "--batch-size 選項僅用於 'repack' 子指令" - -#: builtin/multi-pack-index.c:69 -#, c-format -msgid "unrecognized subcommand: %s" -msgstr "未識別的子指令：%s" - -#: builtin/mv.c:18 -msgid "git mv [<options>] <source>... <destination>" -msgstr "git mv [<選項>] <源>... <目標>" - -#: builtin/mv.c:83 -#, c-format -msgid "Directory %s is in index and no submodule?" -msgstr "目錄 %s 在索引中並且不是子模組？" - -#: builtin/mv.c:85 -msgid "Please stage your changes to .gitmodules or stash them to proceed" -msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" - -#: builtin/mv.c:103 -#, c-format -msgid "%.*s is in index" -msgstr "%.*s 在索引中" - -#: builtin/mv.c:125 -msgid "force move/rename even if target exists" -msgstr "強制移動/重指令，即使目標存在" - -#: builtin/mv.c:127 -msgid "skip move/rename errors" -msgstr "跳過移動/重新命名錯誤" - -#: builtin/mv.c:169 -#, c-format -msgid "destination '%s' is not a directory" -msgstr "目標 '%s' 不是一個目錄" - -#: builtin/mv.c:180 -#, c-format -msgid "Checking rename of '%s' to '%s'\n" -msgstr "檢查 '%s' 到 '%s' 的重新命名\n" - -#: builtin/mv.c:184 -msgid "bad source" -msgstr "壞的源" - -#: builtin/mv.c:187 -msgid "can not move directory into itself" -msgstr "不能將目錄移動到自身" - -#: builtin/mv.c:190 -msgid "cannot move directory over file" -msgstr "不能將目錄移動到檔案" - -#: builtin/mv.c:199 -msgid "source directory is empty" -msgstr "源目錄為空" - -#: builtin/mv.c:224 -msgid "not under version control" -msgstr "不在版本控制之下" - -#: builtin/mv.c:227 -msgid "destination exists" -msgstr "目標已存在" - -#: builtin/mv.c:235 -#, c-format -msgid "overwriting '%s'" -msgstr "覆蓋 '%s'" - -#: builtin/mv.c:238 -msgid "Cannot overwrite" -msgstr "不能覆蓋" - -#: builtin/mv.c:241 -msgid "multiple sources for the same target" -msgstr "同一目標具有多個源" - -#: builtin/mv.c:243 -msgid "destination directory does not exist" -msgstr "目標目錄不存在" - -#: builtin/mv.c:250 -#, c-format -msgid "%s, source=%s, destination=%s" -msgstr "%s，源=%s，目標=%s" - -#: builtin/mv.c:271 -#, c-format -msgid "Renaming %s to %s\n" -msgstr "重新命名 %s 至 %s\n" - -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 -#, c-format -msgid "renaming '%s' failed" -msgstr "重新命名 '%s' 失敗" - -#: builtin/name-rev.c:465 -msgid "git name-rev [<options>] <commit>..." -msgstr "git name-rev [<選項>] <提交>..." - -#: builtin/name-rev.c:466 -msgid "git name-rev [<options>] --all" -msgstr "git name-rev [<選項>] --all" - -#: builtin/name-rev.c:467 -msgid "git name-rev [<options>] --stdin" -msgstr "git name-rev [<選項>] --stdin" - -#: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" -msgstr "只列印名稱（無 SHA-1）" - -#: builtin/name-rev.c:525 -msgid "only use tags to name the commits" -msgstr "只使用標籤來命名提交" - -#: builtin/name-rev.c:527 -msgid "only use refs matching <pattern>" -msgstr "只使用和 <模式> 相符合的引用" - -#: builtin/name-rev.c:529 -msgid "ignore refs matching <pattern>" -msgstr "忽略和 <模式> 相符合的引用" - -#: builtin/name-rev.c:531 -msgid "list all commits reachable from all refs" -msgstr "列出可以從所有引用存取的提交" - -#: builtin/name-rev.c:532 -msgid "read from stdin" -msgstr "從標準輸入讀取" - -#: builtin/name-rev.c:533 -msgid "allow to print `undefined` names (default)" -msgstr "允許列印 `未定義` 的名稱（預設）" - -#: builtin/name-rev.c:539 -msgid "dereference tags in the input (internal use)" -msgstr "反向解析輸入中的標籤（內部使用）" - -#: builtin/notes.c:28 -msgid "git notes [--ref <notes-ref>] [list [<object>]]" -msgstr "git notes [--ref <註解引用>] [list [<物件>]]" - -#: builtin/notes.c:29 -msgid "" -"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " -"| (-c | -C) <object>] [<object>]" -msgstr "" -"git notes [--ref <註解引用>] add [-f] [--allow-empty] [-m <說明> | -F <檔案> " -"| (-c | -C) <物件>] [<物件>]" - -#: builtin/notes.c:30 -msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" -msgstr "git notes [--ref <註解引用>] copy [-f] <源物件> <目標物件>" - -#: builtin/notes.c:31 -msgid "" -"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " -"(-c | -C) <object>] [<object>]" -msgstr "" -"git notes [--ref <註解引用>] append [--allow-empty] [-m <說明> | -F <檔案> | " -"(-c | -C) <物件>] [<物件>]" - -#: builtin/notes.c:32 -msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" -msgstr "git notes [--ref <註解引用>] edit [--allow-empty] [<物件>]" - -#: builtin/notes.c:33 -msgid "git notes [--ref <notes-ref>] show [<object>]" -msgstr "git notes [--ref <註解引用>] show [<物件>]" - -#: builtin/notes.c:34 -msgid "" -"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" -msgstr "git notes [--ref <註解引用>] merge [-v | -q] [-s <策略> ] <註解引用>" - -#: builtin/notes.c:35 -msgid "git notes merge --commit [-v | -q]" -msgstr "git notes merge --commit [-v | -q]" - -#: builtin/notes.c:36 -msgid "git notes merge --abort [-v | -q]" -msgstr "git notes merge --abort [-v | -q]" - -#: builtin/notes.c:37 -msgid "git notes [--ref <notes-ref>] remove [<object>...]" -msgstr "git notes [--ref <註解引用>] remove [<物件>...]" - -#: builtin/notes.c:38 -msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" -msgstr "git notes [--ref <註解引用>] prune [-n] [-v]" - -#: builtin/notes.c:39 -msgid "git notes [--ref <notes-ref>] get-ref" -msgstr "git notes [--ref <註解引用>] get-ref" - -#: builtin/notes.c:44 -msgid "git notes [list [<object>]]" -msgstr "git notes [list [<物件>]]" - -#: builtin/notes.c:49 -msgid "git notes add [<options>] [<object>]" -msgstr "git notes add [<選項>] [<物件>]" - -#: builtin/notes.c:54 -msgid "git notes copy [<options>] <from-object> <to-object>" -msgstr "git notes copy [<選項>] <源物件> <目標物件>" - -#: builtin/notes.c:55 -msgid "git notes copy --stdin [<from-object> <to-object>]..." -msgstr "git notes copy --stdin [<源物件> <目標物件>]..." - -#: builtin/notes.c:60 -msgid "git notes append [<options>] [<object>]" -msgstr "git notes append [<選項>] [<物件>]" - -#: builtin/notes.c:65 -msgid "git notes edit [<object>]" -msgstr "git notes edit [<物件>]" - -#: builtin/notes.c:70 -msgid "git notes show [<object>]" -msgstr "git notes show [<物件>]" - -#: builtin/notes.c:75 -msgid "git notes merge [<options>] <notes-ref>" -msgstr "git notes merge [<選項>] <註解引用>" - -#: builtin/notes.c:76 -msgid "git notes merge --commit [<options>]" -msgstr "git notes merge --commit [<選項>]" - -#: builtin/notes.c:77 -msgid "git notes merge --abort [<options>]" -msgstr "git notes merge --abort [<選項>]" - -#: builtin/notes.c:82 -msgid "git notes remove [<object>]" -msgstr "git notes remove [<物件>]" - -#: builtin/notes.c:87 -msgid "git notes prune [<options>]" -msgstr "git notes prune [<選項>]" - -#: builtin/notes.c:92 -msgid "git notes get-ref" -msgstr "git notes get-ref" - -#: builtin/notes.c:97 -msgid "Write/edit the notes for the following object:" -msgstr "為下面的物件寫/編輯說明：" - -#: builtin/notes.c:150 -#, c-format -msgid "unable to start 'show' for object '%s'" -msgstr "不能為物件 '%s' 開始 'show'" - -#: builtin/notes.c:154 -msgid "could not read 'show' output" -msgstr "不能讀取 'show' 的輸出" - -#: builtin/notes.c:162 -#, c-format -msgid "failed to finish 'show' for object '%s'" -msgstr "無法為物件 '%s' 完成 'show'" - -#: builtin/notes.c:197 -msgid "please supply the note contents using either -m or -F option" -msgstr "請透過 -m 或 -F 選項為註解提供內容" - -#: builtin/notes.c:206 -msgid "unable to write note object" -msgstr "不能寫註解物件" - -#: builtin/notes.c:208 -#, c-format -msgid "the note contents have been left in %s" -msgstr "註解內容被留在 %s 中" - -#: builtin/notes.c:242 builtin/tag.c:532 -#, c-format -msgid "could not open or read '%s'" -msgstr "不能開啟或讀取 '%s'" - -#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 -#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 -#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 -#, c-format -msgid "failed to resolve '%s' as a valid ref." -msgstr "無法解析 '%s' 為一個有效引用。" - -#: builtin/notes.c:265 -#, c-format -msgid "failed to read object '%s'." -msgstr "讀取物件 '%s' 失敗。" - -#: builtin/notes.c:268 -#, c-format -msgid "cannot read note data from non-blob object '%s'." -msgstr "不能從非資料物件 '%s' 中讀取註解資料。" - -#: builtin/notes.c:309 -#, c-format -msgid "malformed input line: '%s'." -msgstr "格式錯誤的輸入行：'%s'。" - -#: builtin/notes.c:324 -#, c-format -msgid "failed to copy notes from '%s' to '%s'" -msgstr "從 '%s' 複製註解到 '%s' 時失敗" - -#. TRANSLATORS: the first %s will be replaced by a git -#. notes command: 'add', 'merge', 'remove', etc. -#. -#: builtin/notes.c:356 -#, c-format -msgid "refusing to %s notes in %s (outside of refs/notes/)" -msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" - -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "參數太多" - -#: builtin/notes.c:389 builtin/notes.c:678 -#, c-format -msgid "no note found for object %s." -msgstr "未發現物件 %s 的註解。" - -#: builtin/notes.c:410 builtin/notes.c:576 -msgid "note contents as a string" -msgstr "註解內容作為一個字串" - -#: builtin/notes.c:413 builtin/notes.c:579 -msgid "note contents in a file" -msgstr "註解內容到一個檔案中" - -#: builtin/notes.c:416 builtin/notes.c:582 -msgid "reuse and edit specified note object" -msgstr "重用和編輯指定的註解物件" - -#: builtin/notes.c:419 builtin/notes.c:585 -msgid "reuse specified note object" -msgstr "重用指定的註解物件" - -#: builtin/notes.c:422 builtin/notes.c:588 -msgid "allow storing empty note" -msgstr "允許儲存空白備註" - -#: builtin/notes.c:423 builtin/notes.c:496 -msgid "replace existing notes" -msgstr "取代已存在的註解" - -#: builtin/notes.c:448 -#, c-format -msgid "" -"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " -"existing notes" -msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" - -#: builtin/notes.c:463 builtin/notes.c:544 -#, c-format -msgid "Overwriting existing notes for object %s\n" -msgstr "覆蓋物件 %s 現存註解\n" - -#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 -#, c-format -msgid "Removing note for object %s\n" -msgstr "刪除物件 %s 的註解\n" - -#: builtin/notes.c:497 -msgid "read objects from stdin" -msgstr "從標準輸入讀取物件" - -#: builtin/notes.c:499 -msgid "load rewriting config for <command> (implies --stdin)" -msgstr "重新載入 <指令> 的設定（隱含 --stdin）" - -#: builtin/notes.c:517 -msgid "too few parameters" -msgstr "參數太少" - -#: builtin/notes.c:538 -#, c-format -msgid "" -"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " -"existing notes" -msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" - -#: builtin/notes.c:550 -#, c-format -msgid "missing notes on source object %s. Cannot copy." -msgstr "源物件 %s 缺少註解。不能複製。" - -#: builtin/notes.c:603 -#, c-format -msgid "" -"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" -"Please use 'git notes add -f -m/-F/-c/-C' instead.\n" -msgstr "" -"子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n" -"請換用 'git notes add -f -m/-F/-c/-C'。\n" - -#: builtin/notes.c:698 -msgid "failed to delete ref NOTES_MERGE_PARTIAL" -msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗" - -#: builtin/notes.c:700 -msgid "failed to delete ref NOTES_MERGE_REF" -msgstr "刪除引用 NOTES_MERGE_REF 失敗" - -#: builtin/notes.c:702 -msgid "failed to remove 'git notes merge' worktree" -msgstr "刪除 'git notes merge' 工作區失敗" - -#: builtin/notes.c:722 -msgid "failed to read ref NOTES_MERGE_PARTIAL" -msgstr "讀取引用 NOTES_MERGE_PARTIAL 失敗" - -#: builtin/notes.c:724 -msgid "could not find commit from NOTES_MERGE_PARTIAL." -msgstr "無法從 NOTES_MERGE_PARTIAL 中找到提交。" - -#: builtin/notes.c:726 -msgid "could not parse commit from NOTES_MERGE_PARTIAL." -msgstr "無法從 NOTES_MERGE_PARTIAL 中解析提交。" - -#: builtin/notes.c:739 -msgid "failed to resolve NOTES_MERGE_REF" -msgstr "解析 NOTES_MERGE_REF 失敗" - -#: builtin/notes.c:742 -msgid "failed to finalize notes merge" -msgstr "無法完成註解合併" - -#: builtin/notes.c:768 -#, c-format -msgid "unknown notes merge strategy %s" -msgstr "未知的註解合併策略 %s" - -#: builtin/notes.c:784 -msgid "General options" -msgstr "通用選項" - -#: builtin/notes.c:786 -msgid "Merge options" -msgstr "合併選項" - -#: builtin/notes.c:788 -msgid "" -"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" -"cat_sort_uniq)" -msgstr "使用指定的策略解決註解衝突 (manual/ours/theirs/union/cat_sort_uniq)" - -#: builtin/notes.c:790 -msgid "Committing unmerged notes" -msgstr "提交未合併的註解" - -#: builtin/notes.c:792 -msgid "finalize notes merge by committing unmerged notes" -msgstr "透過提交未合併的註解來完成註解合併" - -#: builtin/notes.c:794 -msgid "Aborting notes merge resolution" -msgstr "中止註解合併的方案" - -#: builtin/notes.c:796 -msgid "abort notes merge" -msgstr "中止註解合併" - -#: builtin/notes.c:807 -msgid "cannot mix --commit, --abort or -s/--strategy" -msgstr "不能混用 --commit、--abort 或 -s/--strategy" - -#: builtin/notes.c:812 -msgid "must specify a notes ref to merge" -msgstr "必須指定一個註解引用來合併" - -#: builtin/notes.c:836 -#, c-format -msgid "unknown -s/--strategy: %s" -msgstr "未知的 -s/--strategy：%s" - -#: builtin/notes.c:873 -#, c-format -msgid "a notes merge into %s is already in-progress at %s" -msgstr "位於 %2$s 的一個到 %1$s 中的註解合併正在執行中" - -#: builtin/notes.c:876 -#, c-format -msgid "failed to store link to current notes ref (%s)" -msgstr "無法儲存連結到目前的註解引用（%s）" - -#: builtin/notes.c:878 -#, c-format -msgid "" -"Automatic notes merge failed. Fix conflicts in %s and commit the result with " -"'git notes merge --commit', or abort the merge with 'git notes merge --" -"abort'.\n" -msgstr "" -"自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提" -"交結果，或者使用指令 'git notes merge --abort' 終止合併。\n" - -#: builtin/notes.c:897 builtin/tag.c:545 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "無法解析 '%s' 為一個有效引用。" - -#: builtin/notes.c:900 -#, c-format -msgid "Object %s has no note\n" -msgstr "物件 %s 沒有註解\n" - -#: builtin/notes.c:912 -msgid "attempt to remove non-existent note is not an error" -msgstr "嘗試刪除不存在的註解不是一個錯誤" - -#: builtin/notes.c:915 -msgid "read object names from the standard input" -msgstr "從標準輸入讀取物件名稱" - -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 -msgid "do not remove, show only" -msgstr "不刪除，只顯示" - -#: builtin/notes.c:955 -msgid "report pruned notes" -msgstr "報告清除的註解" - -#: builtin/notes.c:998 -msgid "notes-ref" -msgstr "註解引用" - -#: builtin/notes.c:999 -msgid "use notes from <notes-ref>" -msgstr "從 <註解引用> 使用註解" - -#: builtin/notes.c:1034 builtin/stash.c:1643 -#, c-format -msgid "unknown subcommand: %s" -msgstr "未知子指令：%s" - -#: builtin/pack-objects.c:52 -msgid "" -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" -msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]" - -#: builtin/pack-objects.c:53 -msgid "" -"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" -msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]" - -#: builtin/pack-objects.c:430 -#, c-format -msgid "bad packed object CRC for %s" -msgstr "%s 錯的包物件 CRC" - -#: builtin/pack-objects.c:441 -#, c-format -msgid "corrupt packed object for %s" -msgstr "%s 損壞的包物件" - -#: builtin/pack-objects.c:572 -#, c-format -msgid "recursive delta detected for object %s" -msgstr "發現物件 %s 遞迴 delta" - -#: builtin/pack-objects.c:783 -#, c-format -msgid "ordered %u objects, expected %<PRIu32>" -msgstr "排序了 %u 個物件，預期 %<PRIu32> 個" - -#: builtin/pack-objects.c:972 -msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" -msgstr "禁用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個" - -#: builtin/pack-objects.c:985 -msgid "Writing objects" -msgstr "寫入物件中" - -#: builtin/pack-objects.c:1046 builtin/update-index.c:90 -#, c-format -msgid "failed to stat %s" -msgstr "對 %s 呼叫 stat 失敗" - -#: builtin/pack-objects.c:1099 -#, c-format -msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" -msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個" - -#: builtin/pack-objects.c:1297 -msgid "disabling bitmap writing, as some objects are not being packed" -msgstr "禁用 bitmap 寫入，因為一些物件將不會被打包" - -#: builtin/pack-objects.c:1724 -#, c-format -msgid "delta base offset overflow in pack for %s" -msgstr "%s 壓縮中 delta 基準位移越界" - -#: builtin/pack-objects.c:1733 -#, c-format -msgid "delta base offset out of bound for %s" -msgstr "%s 的 delta 基準位移越界" - -#: builtin/pack-objects.c:2004 -msgid "Counting objects" -msgstr "物件計數中" - -#: builtin/pack-objects.c:2149 -#, c-format -msgid "unable to parse object header of %s" -msgstr "無法解析物件 %s 標頭訊息" - -#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 -#: builtin/pack-objects.c:2245 -#, c-format -msgid "object %s cannot be read" -msgstr "物件 %s 無法讀取" - -#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 -#, c-format -msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" -msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）" - -#: builtin/pack-objects.c:2259 -msgid "suboptimal pack - out of memory" -msgstr "次優（suboptimal）打包 - 記憶體不足" - -#: builtin/pack-objects.c:2574 -#, c-format -msgid "Delta compression using up to %d threads" -msgstr "使用 %d 個執行緒進行壓縮" - -#: builtin/pack-objects.c:2713 -#, c-format -msgid "unable to pack objects reachable from tag %s" -msgstr "無法為標籤 %s 壓縮物件" - -#: builtin/pack-objects.c:2801 -msgid "Compressing objects" -msgstr "壓縮物件中" - -#: builtin/pack-objects.c:2807 -msgid "inconsistency with delta count" -msgstr "不一致的差異計數" - -#: builtin/pack-objects.c:2888 -#, c-format -msgid "" -"expected edge object ID, got garbage:\n" -" %s" -msgstr "" -"預期邊界物件（edge object）ID，卻得到垃圾資料：\n" -" %s" - -#: builtin/pack-objects.c:2894 -#, c-format -msgid "" -"expected object ID, got garbage:\n" -" %s" -msgstr "" -"預期物件 ID，卻得到垃圾資料：\n" -" %s" - -#: builtin/pack-objects.c:2992 -msgid "invalid value for --missing" -msgstr "選項 --missing 的值無效" - -#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 -msgid "cannot open pack index" -msgstr "無法開啟包檔案索引" - -#: builtin/pack-objects.c:3082 -#, c-format -msgid "loose object at %s could not be examined" -msgstr "無法檢查 %s 處的鬆散物件" - -#: builtin/pack-objects.c:3167 -msgid "unable to force loose object" -msgstr "無法強制鬆散物件" - -#: builtin/pack-objects.c:3260 -#, c-format -msgid "not a rev '%s'" -msgstr "不是一個版本 '%s'" - -#: builtin/pack-objects.c:3263 -#, c-format -msgid "bad revision '%s'" -msgstr "壞的版本 '%s'" - -#: builtin/pack-objects.c:3288 -msgid "unable to add recent objects" -msgstr "無法新增最近的物件" - -#: builtin/pack-objects.c:3341 -#, c-format -msgid "unsupported index version %s" -msgstr "不支援的索引版本 %s" - -#: builtin/pack-objects.c:3345 -#, c-format -msgid "bad index version '%s'" -msgstr "壞的索引版本 '%s'" - -#: builtin/pack-objects.c:3383 -msgid "<version>[,<offset>]" -msgstr "<版本>[,<位移>]" - -#: builtin/pack-objects.c:3384 -msgid "write the pack index file in the specified idx format version" -msgstr "用指定的 idx 格式版本來寫包索引檔案" - -#: builtin/pack-objects.c:3387 -msgid "maximum size of each output pack file" -msgstr "每個輸出包的最大尺寸" - -#: builtin/pack-objects.c:3389 -msgid "ignore borrowed objects from alternate object store" -msgstr "忽略從備用物件儲存裡借用物件" - -#: builtin/pack-objects.c:3391 -msgid "ignore packed objects" -msgstr "忽略包物件" - -#: builtin/pack-objects.c:3393 -msgid "limit pack window by objects" -msgstr "限制打包視窗的物件數" - -#: builtin/pack-objects.c:3395 -msgid "limit pack window by memory in addition to object limit" -msgstr "除物件數量限制外設定打包視窗的記憶體限制" - -#: builtin/pack-objects.c:3397 -msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "打包允許的 delta 鏈的最大長度" - -#: builtin/pack-objects.c:3399 -msgid "reuse existing deltas" -msgstr "重用已存在的 deltas" - -#: builtin/pack-objects.c:3401 -msgid "reuse existing objects" -msgstr "重用已存在的物件" - -#: builtin/pack-objects.c:3403 -msgid "use OFS_DELTA objects" -msgstr "使用 OFS_DELTA 物件" - -#: builtin/pack-objects.c:3405 -msgid "use threads when searching for best delta matches" -msgstr "使用執行緒查詢最佳 delta 符合" - -#: builtin/pack-objects.c:3407 -msgid "do not create an empty pack output" -msgstr "不建立空的包輸出" - -#: builtin/pack-objects.c:3409 -msgid "read revision arguments from standard input" -msgstr "從標準輸入讀取版本號參數" - -#: builtin/pack-objects.c:3411 -msgid "limit the objects to those that are not yet packed" -msgstr "限制那些尚未打包的物件" - -#: builtin/pack-objects.c:3414 -msgid "include objects reachable from any reference" -msgstr "包括可以從任何引用存取到的物件" - -#: builtin/pack-objects.c:3417 -msgid "include objects referred by reflog entries" -msgstr "包括被引用日誌引用到的物件" - -#: builtin/pack-objects.c:3420 -msgid "include objects referred to by the index" -msgstr "包括被索引引用到的物件" - -#: builtin/pack-objects.c:3423 -msgid "output pack to stdout" -msgstr "輸出包到標準輸出" - -#: builtin/pack-objects.c:3425 -msgid "include tag objects that refer to objects to be packed" -msgstr "包括那些引用了待打包物件的標籤物件" - -#: builtin/pack-objects.c:3427 -msgid "keep unreachable objects" -msgstr "維持無法取得的物件" - -#: builtin/pack-objects.c:3429 -msgid "pack loose unreachable objects" -msgstr "打包鬆散的無法取得物件" - -#: builtin/pack-objects.c:3431 -msgid "unpack unreachable objects newer than <time>" -msgstr "將比提供 <時間> 新的無法存取的物件解包" - -#: builtin/pack-objects.c:3434 -msgid "use the sparse reachability algorithm" -msgstr "使用稀疏可以取得性演算法" - -#: builtin/pack-objects.c:3436 -msgid "create thin packs" -msgstr "建立精簡包" - -#: builtin/pack-objects.c:3438 -msgid "create packs suitable for shallow fetches" -msgstr "建立適合淺複製版本庫取得的包" - -#: builtin/pack-objects.c:3440 -msgid "ignore packs that have companion .keep file" -msgstr "忽略配有 .keep 檔案的包" - -#: builtin/pack-objects.c:3442 -msgid "ignore this pack" -msgstr "忽略該 pack" - -#: builtin/pack-objects.c:3444 -msgid "pack compression level" -msgstr "打包壓縮級別" - -#: builtin/pack-objects.c:3446 -msgid "do not hide commits by grafts" -msgstr "顯示被移植隱藏的提交" - -#: builtin/pack-objects.c:3448 -msgid "use a bitmap index if available to speed up counting objects" -msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度" - -#: builtin/pack-objects.c:3450 -msgid "write a bitmap index together with the pack index" -msgstr "在建立包索引的同時建立 bitmap 索引" - -#: builtin/pack-objects.c:3454 -msgid "write a bitmap index if possible" -msgstr "如果可能，寫 bitmap 索引" - -#: builtin/pack-objects.c:3458 -msgid "handling for missing objects" -msgstr "處理遺失的物件" - -#: builtin/pack-objects.c:3461 -msgid "do not pack objects in promisor packfiles" -msgstr "不要打包 promisor packfile 中的物件" - -#: builtin/pack-objects.c:3463 -msgid "respect islands during delta compression" -msgstr "在增量壓縮時參考資料島" - -#: builtin/pack-objects.c:3492 -#, c-format -msgid "delta chain depth %d is too deep, forcing %d" -msgstr "增量鏈深度 %d 太深了，強制為 %d" - -#: builtin/pack-objects.c:3497 -#, c-format -msgid "pack.deltaCacheLimit is too high, forcing %d" -msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d" - -#: builtin/pack-objects.c:3551 -msgid "--max-pack-size cannot be used to build a pack for transfer" -msgstr "不能使用 --max-pack-size 來構建傳輸用的包檔案" - -#: builtin/pack-objects.c:3553 -msgid "minimum pack size limit is 1 MiB" -msgstr "最小的包檔案大小是 1 MiB" - -#: builtin/pack-objects.c:3558 -msgid "--thin cannot be used to build an indexable pack" -msgstr "--thin 不能用於建立一個可索引包" - -#: builtin/pack-objects.c:3561 -msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" - -#: builtin/pack-objects.c:3567 -msgid "cannot use --filter without --stdout" -msgstr "不能在沒有 --stdout 的情況下使用 --filter" - -#: builtin/pack-objects.c:3627 -msgid "Enumerating objects" -msgstr "枚舉物件" - -#: builtin/pack-objects.c:3657 -#, c-format -msgid "" -"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" -"reused %<PRIu32>" -msgstr "" -"總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 " -"%<PRIu32>" - -#: builtin/pack-refs.c:8 -msgid "git pack-refs [<options>]" -msgstr "git pack-refs [<選項>]" - -#: builtin/pack-refs.c:16 -msgid "pack everything" -msgstr "打包一切" - -#: builtin/pack-refs.c:17 -msgid "prune loose refs (default)" -msgstr "清除鬆散的引用（預設）" - -#: builtin/prune-packed.c:9 -msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" -msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" - -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "正在刪除重複物件" - -#: builtin/prune.c:12 -msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" -msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]" - -#: builtin/prune.c:131 -msgid "report pruned objects" -msgstr "報告清除的物件" - -#: builtin/prune.c:134 -msgid "expire objects older than <time>" -msgstr "使早於提供時間的物件過期" - -#: builtin/prune.c:136 -msgid "limit traversal to objects outside promisor packfiles" -msgstr "限制遍歷 promisor packfile 以外的物件" - -#: builtin/prune.c:150 -msgid "cannot prune in a precious-objects repo" -msgstr "不能在珍品版本庫中執行清理動作" - -#: builtin/pull.c:45 builtin/pull.c:47 -#, c-format -msgid "Invalid value for %s: %s" -msgstr "%s 的值無效：%s" - -#: builtin/pull.c:67 -msgid "git pull [<options>] [<repository> [<refspec>...]]" -msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]" - -#: builtin/pull.c:122 -msgid "control for recursive fetching of submodules" -msgstr "控制子模組的遞迴取得" - -#: builtin/pull.c:126 -msgid "Options related to merging" -msgstr "和合併相關的選項" - -#: builtin/pull.c:129 -msgid "incorporate changes by rebasing rather than merging" -msgstr "使用重定基底動作取代合併動作以套用修改" - -#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 -msgid "allow fast-forward" -msgstr "允許快轉式" - -#: builtin/pull.c:166 -msgid "automatically stash/stash pop before and after rebase" -msgstr "重定基底動作前後執行自動儲藏和彈出儲藏" - -#: builtin/pull.c:182 -msgid "Options related to fetching" -msgstr "和取得相關的參數" - -#: builtin/pull.c:192 -msgid "force overwrite of local branch" -msgstr "強制覆蓋本機分支" - -#: builtin/pull.c:200 -msgid "number of submodules pulled in parallel" -msgstr "並發拉取的子模組的數量" - -#: builtin/pull.c:300 -#, c-format -msgid "Invalid value for pull.ff: %s" -msgstr "pull.ff 的取值無效：%s" - -#: builtin/pull.c:426 -msgid "" -"There is no candidate for rebasing against among the refs that you just " -"fetched." -msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。" - -#: builtin/pull.c:428 -msgid "" -"There are no candidates for merging among the refs that you just fetched." -msgstr "在您剛剛取得到的引用中沒有合併動作的候選。" - -#: builtin/pull.c:429 -msgid "" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "通常這意味著您提供了一萬用字元引用規格但未能和遠端符合。" - -#: builtin/pull.c:432 -#, c-format -msgid "" -"You asked to pull from the remote '%s', but did not specify\n" -"a branch. Because this is not the default configured remote\n" -"for your current branch, you must specify a branch on the command line." -msgstr "" -"您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n" -"分支預設的遠端版本庫，您必須在指令列中指定一個分支名。" - -#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 -msgid "You are not currently on a branch." -msgstr "您目前不在一個分支上。" - -#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 -msgid "Please specify which branch you want to rebase against." -msgstr "請指定您要重定基底到哪一個分支。" - -#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 -msgid "Please specify which branch you want to merge with." -msgstr "請指定您要合併哪一個分支。" - -#: builtin/pull.c:442 builtin/pull.c:457 -msgid "See git-pull(1) for details." -msgstr "詳見 git-pull(1)。" - -#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 -#: builtin/rebase.c:1415 git-parse-remote.sh:64 -msgid "<remote>" -msgstr "<遠端>" - -#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 -#: git-parse-remote.sh:65 -msgid "<branch>" -msgstr "<分支>" - -#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 -msgid "There is no tracking information for the current branch." -msgstr "目前分支沒有追蹤訊息。" - -#: builtin/pull.c:461 git-parse-remote.sh:95 -msgid "" -"If you wish to set tracking information for this branch you can do so with:" -msgstr "如果您想要為此分支建立追蹤訊息，您可以執行：" - -#: builtin/pull.c:466 -#, c-format -msgid "" -"Your configuration specifies to merge with the ref '%s'\n" -"from the remote, but no such ref was fetched." -msgstr "" -"您的設定中指定要合併遠端的引用 '%s'，\n" -"但是沒有取得到這個引用。" - -#: builtin/pull.c:576 -#, c-format -msgid "unable to access commit %s" -msgstr "無法存取提交 %s" - -#: builtin/pull.c:857 -msgid "ignoring --verify-signatures for rebase" -msgstr "為重定基底動作忽略 --verify-signatures" - -#: builtin/pull.c:912 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "--[no-]autostash 選項只在使用 --rebase 時有效。" - -#: builtin/pull.c:920 -msgid "Updating an unborn branch with changes added to the index." -msgstr "更新尚未誕生的分支，變更新增至索引。" - -#: builtin/pull.c:924 -msgid "pull with rebase" -msgstr "重定基底式拉取" - -#: builtin/pull.c:925 -msgid "please commit or stash them." -msgstr "請提交或儲藏它們。" - -#: builtin/pull.c:950 -#, c-format -msgid "" -"fetch updated the current branch head.\n" -"fast-forwarding your working tree from\n" -"commit %s." -msgstr "" -"fetch 更新了目前的分支。快轉您的工作區\n" -"至提交 %s。" - -#: builtin/pull.c:956 -#, c-format -msgid "" -"Cannot fast-forward your working tree.\n" -"After making sure that you saved anything precious from\n" -"$ git diff %s\n" -"output, run\n" -"$ git reset --hard\n" -"to recover." -msgstr "" -"您目前的工作區無法執行快轉動作。\n" -"首先執行如下指令：\n" -"$ git diff %s\n" -"以確認所有有用的資料均已儲存。然後執行下面的指令\n" -"$ git reset --hard\n" -"復原之前的狀態。" - -#: builtin/pull.c:971 -msgid "Cannot merge multiple branches into empty head." -msgstr "無法將多個分支合併到空分支。" - -#: builtin/pull.c:975 -msgid "Cannot rebase onto multiple branches." -msgstr "無法重定基底到多個分支。" - -#: builtin/pull.c:982 -msgid "cannot rebase with locally recorded submodule modifications" -msgstr "本機子模組中有修改，無法重定基底" - -#: builtin/push.c:19 -msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git push [<選項>] [<版本庫> [<引用規格>...]]" - -#: builtin/push.c:112 -msgid "tag shorthand without <tag>" -msgstr "標籤後面未提供 <標籤> 參數" - -#: builtin/push.c:122 -msgid "--delete only accepts plain target ref names" -msgstr "--delete 只接受簡單的目標引用名" - -#: builtin/push.c:168 -msgid "" -"\n" -"To choose either option permanently, see push.default in 'git help config'." -msgstr "" -"\n" -"為了永久地選擇任一選項，參見 'git help config' 中的 push.default。" - -#: builtin/push.c:171 -#, c-format -msgid "" -"The upstream branch of your current branch does not match\n" -"the name of your current branch. To push to the upstream branch\n" -"on the remote, use\n" -"\n" -" git push %s HEAD:%s\n" -"\n" -"To push to the branch of the same name on the remote, use\n" -"\n" -" git push %s HEAD\n" -"%s" -msgstr "" -"您目前分支的上游分支和您目前分支名不符合，為推送到遠端的上游分支，\n" -"使用\n" -"\n" -" git push %s HEAD:%s\n" -"\n" -"為推送至遠端同名分支，使用\n" -"\n" -" git push %s HEAD\n" -"%s" - -#: builtin/push.c:186 -#, c-format -msgid "" -"You are not currently on a branch.\n" -"To push the history leading to the current (detached HEAD)\n" -"state now, use\n" -"\n" -" git push %s HEAD:<name-of-remote-branch>\n" -msgstr "" -"您目前不在一個分支上。\n" -"現在為推送目前（分離開頭指標）的歷史，使用\n" -"\n" -" git push %s HEAD:<遠端分支名字>\n" - -#: builtin/push.c:200 -#, c-format -msgid "" -"The current branch %s has no upstream branch.\n" -"To push the current branch and set the remote as upstream, use\n" -"\n" -" git push --set-upstream %s %s\n" -msgstr "" -"目前分支 %s 沒有對應的上游分支。\n" -"為推送目前分支並建立與遠端上游的追蹤，使用\n" -"\n" -" git push --set-upstream %s %s\n" - -#: builtin/push.c:208 -#, c-format -msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "目前分支 %s 有多個上游分支，拒絕推送。" - -#: builtin/push.c:211 -#, c-format -msgid "" -"You are pushing to remote '%s', which is not the upstream of\n" -"your current branch '%s', without telling me what to push\n" -"to update which remote branch." -msgstr "" -"您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n" -"而沒有告訴我要推送什麼、更新哪個遠端分支。" - -#: builtin/push.c:270 -msgid "" -"You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" - -#: builtin/push.c:277 -msgid "" -"Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." -msgstr "" -"更新被拒絕，因為您目前分支的最新提交落後於其對應的遠端分支。\n" -"再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n" -"'git push --help' 中的 'Note about fast-forwards' 小節。" - -#: builtin/push.c:283 -msgid "" -"Updates were rejected because a pushed branch tip is behind its remote\n" -"counterpart. Check out this branch and integrate the remote changes\n" -"(e.g. 'git pull ...') before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." -msgstr "" -"更新被拒絕，因為推送的一個分支的最新提交落後於其對應的遠端分支。\n" -"簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" -"'git push --help' 中的 'Note about fast-forwards' 小節。" - -#: builtin/push.c:289 -msgid "" -"Updates were rejected because the remote contains work that you do\n" -"not have locally. This is usually caused by another repository pushing\n" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" -"See the 'Note about fast-forwards' in 'git push --help' for details." -msgstr "" -"因為遠端版本庫包含您本機尚不存在的提交，而導致更新被拒絕。這通常是因為另外\n" -"一個版本庫已向該引用進行了推送。再次推送前，您可能需要先整合遠端變更\n" -"（如 'git pull ...'）。\n" -"詳見 'git push --help' 中的 'Note about fast-forwards' 小節。" - -#: builtin/push.c:296 -msgid "Updates were rejected because the tag already exists in the remote." -msgstr "更新被拒絕，因為該標籤在遠端已經存在。" - -#: builtin/push.c:299 -msgid "" -"You cannot update a remote ref that points at a non-commit object,\n" -"or update a remote ref to make it point at a non-commit object,\n" -"without using the '--force' option.\n" -msgstr "" -"如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n" -"也不能更新遠端引用讓其指向一個非提交物件。\n" - -#: builtin/push.c:360 -#, c-format -msgid "Pushing to %s\n" -msgstr "推送到 %s\n" - -#: builtin/push.c:367 -#, c-format -msgid "failed to push some refs to '%s'" -msgstr "推送一些引用到 '%s' 失敗" - -#: builtin/push.c:542 -msgid "repository" -msgstr "版本庫" - -#: builtin/push.c:543 builtin/send-pack.c:164 -msgid "push all refs" -msgstr "推送所有引用" - -#: builtin/push.c:544 builtin/send-pack.c:166 -msgid "mirror all refs" -msgstr "鏡像所有引用" - -#: builtin/push.c:546 -msgid "delete refs" -msgstr "刪除引用" - -#: builtin/push.c:547 -msgid "push tags (can't be used with --all or --mirror)" -msgstr "推送標籤（不能使用 --all or --mirror）" - -#: builtin/push.c:550 builtin/send-pack.c:167 -msgid "force updates" -msgstr "強制更新" - -#: builtin/push.c:552 builtin/send-pack.c:181 -msgid "<refname>:<expect>" -msgstr "<引用名>:<期望值>" - -#: builtin/push.c:553 builtin/send-pack.c:182 -msgid "require old value of ref to be at this value" -msgstr "要求引用舊的取值為設定值" - -#: builtin/push.c:556 -msgid "control recursive pushing of submodules" -msgstr "控制子模組的遞迴推送" - -#: builtin/push.c:558 builtin/send-pack.c:175 -msgid "use thin pack" -msgstr "使用精簡打包" - -#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 -msgid "receive pack program" -msgstr "接收包程式" - -#: builtin/push.c:561 -msgid "set upstream for git pull/status" -msgstr "設定 git pull/status 的上游" - -#: builtin/push.c:564 -msgid "prune locally removed refs" -msgstr "清除本機刪除的引用" - -#: builtin/push.c:566 -msgid "bypass pre-push hook" -msgstr "繞過 pre-push 掛鉤" - -#: builtin/push.c:567 -msgid "push missing but relevant tags" -msgstr "推送缺少但有關的標籤" - -#: builtin/push.c:570 builtin/send-pack.c:169 -msgid "GPG sign the push" -msgstr "用 GPG 為推送簽名" - -#: builtin/push.c:572 builtin/send-pack.c:176 -msgid "request atomic transaction on remote side" -msgstr "需要遠端支援原子事務" - -#: builtin/push.c:590 -msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete 與 --all、--mirror 及 --tags 不相容" - -#: builtin/push.c:592 -msgid "--delete doesn't make sense without any refs" -msgstr "--delete 未接任何引用沒有意義" - -#: builtin/push.c:612 -#, c-format -msgid "bad repository '%s'" -msgstr "壞的版本庫 '%s'" - -#: builtin/push.c:613 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"沒有設定推送目標。\n" -"或透過指令列指定 URL，或用下面指令設定一個遠端版本庫\n" -"\n" -" git remote add <名稱> <位址>\n" -"\n" -"然後使用該遠端版本庫名執行推送\n" -"\n" -" git push <名稱>\n" - -#: builtin/push.c:628 -msgid "--all and --tags are incompatible" -msgstr "--all 和 --tags 不相容" - -#: builtin/push.c:630 -msgid "--all can't be combined with refspecs" -msgstr "--all 不能和引用規格同時使用" - -#: builtin/push.c:634 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror 和 --tags 不相容" - -#: builtin/push.c:636 -msgid "--mirror can't be combined with refspecs" -msgstr "--mirror 不能和引用規格同時使用" - -#: builtin/push.c:639 -msgid "--all and --mirror are incompatible" -msgstr "--all 和 --mirror 不相容" - -#: builtin/push.c:643 -msgid "push options must not have new line characters" -msgstr "推送選項不能有換行符號" - -#: builtin/range-diff.c:8 -msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" -msgstr "git range-diff [<選項>] <old-base>..<old-tip> <new-base>..<new-tip>" - -#: builtin/range-diff.c:9 -msgid "git range-diff [<options>] <old-tip>...<new-tip>" -msgstr "git range-diff [<選項>] <old-tip>...<new-tip>" - -#: builtin/range-diff.c:10 -msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" -msgstr "git range-diff [<選項>] <base> <old-tip> <new-tip>" - -#: builtin/range-diff.c:22 -msgid "Percentage by which creation is weighted" -msgstr "建立權重的百分比" - -#: builtin/range-diff.c:24 -msgid "use simple diff colors" -msgstr "使用簡單差異顏色" - -#: builtin/range-diff.c:26 -msgid "notes" -msgstr "註解" - -#: builtin/range-diff.c:26 -msgid "passed to 'git log'" -msgstr "傳遞給 'git log'" - -#: builtin/range-diff.c:50 builtin/range-diff.c:54 -#, c-format -msgid "no .. in range: '%s'" -msgstr "沒有在範圍中使用 ..：'%s'" - -#: builtin/range-diff.c:64 -msgid "single arg format must be symmetric range" -msgstr "單個參數格式必須是對稱範圍（即包含...）" - -#: builtin/range-diff.c:79 -msgid "need two commit ranges" -msgstr "需要兩個提交範圍" - -#: builtin/read-tree.c:41 -msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " -"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" -msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前綴>) [-" -"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" -"index-output=<檔案>] (--empty | <樹狀物件1> [<樹狀物件2> [<樹狀物件3>]])" - -#: builtin/read-tree.c:124 -msgid "write resulting index to <file>" -msgstr "將索引結果寫入 <檔案>" - -#: builtin/read-tree.c:127 -msgid "only empty the index" -msgstr "只是清空索引" - -#: builtin/read-tree.c:129 -msgid "Merging" -msgstr "合併" - -#: builtin/read-tree.c:131 -msgid "perform a merge in addition to a read" -msgstr "讀取之餘再執行一個合併" - -#: builtin/read-tree.c:133 -msgid "3-way merge if no file level merging required" -msgstr "如果沒有檔案級合併需要，執行三方合併" - -#: builtin/read-tree.c:135 -msgid "3-way merge in presence of adds and removes" -msgstr "存在新增和刪除時，也執行三方合併" - -#: builtin/read-tree.c:137 -msgid "same as -m, but discard unmerged entries" -msgstr "類似於 -m，但捨棄未合併的條目" - -#: builtin/read-tree.c:138 -msgid "<subdirectory>/" -msgstr "<子目錄>/" - -#: builtin/read-tree.c:139 -msgid "read the tree into the index under <subdirectory>/" -msgstr "讀取樹狀物件到索引的 <子目錄>/ 下" - -#: builtin/read-tree.c:142 -msgid "update working tree with merge result" -msgstr "用合併的結果更新工作區" - -#: builtin/read-tree.c:144 -msgid "gitignore" -msgstr "gitignore" - -#: builtin/read-tree.c:145 -msgid "allow explicitly ignored files to be overwritten" -msgstr "允許忽略檔案中設定的檔案可以被覆蓋" - -#: builtin/read-tree.c:148 -msgid "don't check the working tree after merging" -msgstr "合併後不檢查工作區" - -#: builtin/read-tree.c:149 -msgid "don't update the index or the work tree" -msgstr "不更新索引區和工作區" - -#: builtin/read-tree.c:151 -msgid "skip applying sparse checkout filter" -msgstr "跳過應用稀疏簽出過濾器" - -#: builtin/read-tree.c:153 -msgid "debug unpack-trees" -msgstr "除錯 unpack-trees" - -#: builtin/read-tree.c:157 -msgid "suppress feedback messages" -msgstr "抑制回饋訊息" - -#: builtin/read-tree.c:188 -msgid "You need to resolve your current index first" -msgstr "您需要先解決目前索引的衝突" - -#: builtin/rebase.c:32 -msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " -"[<upstream> [<branch>]]" -msgstr "" -"git rebase [-i] [options] [--exec <指令>] [--onto <新基礎> | --keep-base] [<" -"上游> [<分支>]]" - -#: builtin/rebase.c:34 -msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" -msgstr "" -"git rebase [-i] [選項] [--exec <指令>] [--onto <新基礎>] --root [<分支>]" - -#: builtin/rebase.c:36 -msgid "git rebase --continue | --abort | --skip | --edit-todo" -msgstr "git rebase --continue | --abort | --skip | --edit-todo" - -#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "不可用的待辦列表：'%s'" - -#: builtin/rebase.c:292 -#, c-format -msgid "could not create temporary %s" -msgstr "無法建立暫時的 %s" - -#: builtin/rebase.c:298 -msgid "could not mark as interactive" -msgstr "無法標記為互動式" - -#: builtin/rebase.c:352 -msgid "could not generate todo list" -msgstr "無法生成待辦列表" - -#: builtin/rebase.c:391 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交" - -#: builtin/rebase.c:461 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<選項>]" - -#: builtin/rebase.c:474 builtin/rebase.c:1550 -msgid "(DEPRECATED) keep empty commits" -msgstr "(棄用) 保持空提交" - -#: builtin/rebase.c:478 builtin/revert.c:128 -msgid "allow commits with empty messages" -msgstr "允許提交說明為空" - -#: builtin/rebase.c:480 -msgid "rebase merge commits" -msgstr "對合併提交重定基底" - -#: builtin/rebase.c:482 -msgid "keep original branch points of cousins" -msgstr "保持兄弟提交的原始分支點" - -#: builtin/rebase.c:484 -msgid "move commits that begin with squash!/fixup!" -msgstr "移動以 squash!/fixup! 開頭的提交" - -#: builtin/rebase.c:485 -msgid "sign commits" -msgstr "簽名提交" - -#: builtin/rebase.c:487 builtin/rebase.c:1490 -msgid "display a diffstat of what changed upstream" -msgstr "顯示上游變化的差異統計" - -#: builtin/rebase.c:489 -msgid "continue rebase" -msgstr "繼續重定基底" - -#: builtin/rebase.c:491 -msgid "skip commit" -msgstr "跳過提交" - -#: builtin/rebase.c:492 -msgid "edit the todo list" -msgstr "重定基底待辦列表" - -#: builtin/rebase.c:494 -msgid "show the current patch" -msgstr "顯示目前修補檔" - -#: builtin/rebase.c:497 -msgid "shorten commit ids in the todo list" -msgstr "縮短待辦列表中的提交號" - -#: builtin/rebase.c:499 -msgid "expand commit ids in the todo list" -msgstr "擴展待辦列表中的提交號" - -#: builtin/rebase.c:501 -msgid "check the todo list" -msgstr "檢查待辦列表" - -#: builtin/rebase.c:503 -msgid "rearrange fixup/squash lines" -msgstr "重新排列 fixup/squash 行" - -#: builtin/rebase.c:505 -msgid "insert exec commands in todo list" -msgstr "在待辦列表中插入 exec 執行指令" - -#: builtin/rebase.c:506 -msgid "onto" -msgstr "onto" - -#: builtin/rebase.c:509 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase.c:509 -msgid "restrict revision" -msgstr "限制版本" - -#: builtin/rebase.c:511 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase.c:512 -msgid "squash onto" -msgstr "squash onto" - -#: builtin/rebase.c:514 -msgid "the upstream commit" -msgstr "上游提交" - -#: builtin/rebase.c:516 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase.c:516 -msgid "head name" -msgstr "head 名稱" - -#: builtin/rebase.c:521 -msgid "rebase strategy" -msgstr "重定基底策略" - -#: builtin/rebase.c:522 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase.c:523 -msgid "strategy options" -msgstr "策略選項" - -#: builtin/rebase.c:524 -msgid "switch-to" -msgstr "切換到" - -#: builtin/rebase.c:525 -msgid "the branch or commit to checkout" -msgstr "要簽出的分支或提交" - -#: builtin/rebase.c:526 -msgid "onto-name" -msgstr "onto-name" - -#: builtin/rebase.c:526 -msgid "onto name" -msgstr "onto name" - -#: builtin/rebase.c:527 -msgid "cmd" -msgstr "cmd" - -#: builtin/rebase.c:527 -msgid "the command to run" -msgstr "要執行的指令" - -#: builtin/rebase.c:530 builtin/rebase.c:1584 -msgid "automatically re-schedule any `exec` that fails" -msgstr "自動重新安排任何失敗的 `exec`" - -#: builtin/rebase.c:546 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果" - -#: builtin/rebase.c:562 -#, c-format -msgid "%s requires an interactive rebase" -msgstr "%s 需要互動式重定基底" - -#: builtin/rebase.c:612 -#, c-format -msgid "could not get 'onto': '%s'" -msgstr "無法取得 'onto'：'%s'" - -#: builtin/rebase.c:627 -#, c-format -msgid "invalid orig-head: '%s'" -msgstr "無效的原始 head：'%s'" - -#: builtin/rebase.c:652 -#, c-format -msgid "ignoring invalid allow_rerere_autoupdate: '%s'" -msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" - -#: builtin/rebase.c:728 -#, c-format -msgid "Could not read '%s'" -msgstr "不能讀取 '%s'" - -#: builtin/rebase.c:746 -#, c-format -msgid "Cannot store %s" -msgstr "不能儲存 %s" - -#: builtin/rebase.c:853 -msgid "could not determine HEAD revision" -msgstr "不能確定 HEAD 版本" - -#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 -msgid "" -"Resolve all conflicts manually, mark them as resolved with\n" -"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" -"You can instead skip this commit: run \"git rebase --skip\".\n" -"To abort and get back to the state before \"git rebase\", run \"git rebase --" -"abort\"." -msgstr "" -"手動解決所有衝突，執行 \"git add/rm <衝突的檔案>\" 標記\n" -"衝突已解決，然後執行 \"git rebase --continue\"。您也可以執行\n" -"\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n" -"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" - -#: builtin/rebase.c:1058 -#, c-format -msgid "" -"\n" -"git encountered an error while preparing the patches to replay\n" -"these revisions:\n" -"\n" -" %s\n" -"\n" -"As a result, git cannot rebase them." -msgstr "" -"\n" -"在為重放這些版本而準備修補檔時，git 遇到了一個錯誤：\n" -"\n" -" %s\n" -"\n" -"因此 git 無法對其重定基底。" - -#: builtin/rebase.c:1383 -#, c-format -msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." -msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。" - -#: builtin/rebase.c:1401 -#, c-format -msgid "" -"%s\n" -"Please specify which branch you want to rebase against.\n" -"See git-rebase(1) for details.\n" -"\n" -" git rebase '<branch>'\n" -"\n" -msgstr "" -"%s\n" -"請指定您要重定基底到哪個分支。\n" -"詳見 git-rebase(1)。\n" -"\n" -" git rebase '<branch>'\n" -"\n" - -#: builtin/rebase.c:1417 -#, c-format -msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -"\n" -msgstr "" -"如果您想要為此分支建立追蹤訊息，您可以執行：\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" -"\n" - -#: builtin/rebase.c:1447 -msgid "exec commands cannot contain newlines" -msgstr "exec 指令不能包含換行符號" - -#: builtin/rebase.c:1451 -msgid "empty exec command" -msgstr "空的 exec 指令" - -#: builtin/rebase.c:1481 -msgid "rebase onto given branch instead of upstream" -msgstr "重定基底到提供的分支而非上游" - -#: builtin/rebase.c:1483 -msgid "use the merge-base of upstream and branch as the current base" -msgstr "使用上游和分支的合併基礎做為目前基礎" - -#: builtin/rebase.c:1485 -msgid "allow pre-rebase hook to run" -msgstr "允許執行 pre-rebase 掛鉤" - -#: builtin/rebase.c:1487 -msgid "be quiet. implies --no-stat" -msgstr "安靜。暗示 --no-stat" - -#: builtin/rebase.c:1493 -msgid "do not show diffstat of what changed upstream" -msgstr "不顯示上游變化的差異統計" - -#: builtin/rebase.c:1496 -msgid "add a Signed-off-by: line to each commit" -msgstr "為每一個提交新增一個 Signed-off-by: 簽名" - -#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 -msgid "passed to 'git am'" -msgstr "傳遞給 'git am'" - -#: builtin/rebase.c:1506 builtin/rebase.c:1508 -msgid "passed to 'git apply'" -msgstr "傳遞給 'git apply'" - -#: builtin/rebase.c:1510 builtin/rebase.c:1513 -msgid "cherry-pick all commits, even if unchanged" -msgstr "揀選所有提交，即使未修改" - -#: builtin/rebase.c:1515 -msgid "continue" -msgstr "繼續" - -#: builtin/rebase.c:1518 -msgid "skip current patch and continue" -msgstr "跳過目前修補檔並繼續" - -# 譯者：請維持前導空格 -#: builtin/rebase.c:1520 -msgid "abort and check out the original branch" -msgstr "終止並簽出原有分支" - -#: builtin/rebase.c:1523 -msgid "abort but keep HEAD where it is" -msgstr "終止但保持 HEAD 不變" - -#: builtin/rebase.c:1524 -msgid "edit the todo list during an interactive rebase" -msgstr "在互動式重定基底中編輯待辦列表" - -#: builtin/rebase.c:1527 -msgid "show the patch file being applied or merged" -msgstr "顯示正在套用或合併的修補檔案" - -#: builtin/rebase.c:1530 -msgid "use apply strategies to rebase" -msgstr "使用套用策略進行重定基底" - -#: builtin/rebase.c:1534 -msgid "use merging strategies to rebase" -msgstr "使用合併策略進行重定基底" - -#: builtin/rebase.c:1538 -msgid "let the user edit the list of commits to rebase" -msgstr "讓使用者編輯要重定基底的提交列表" - -#: builtin/rebase.c:1542 -msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "（已棄用）嘗試重建合併提交而非忽略它們" - -#: builtin/rebase.c:1547 -msgid "how to handle commits that become empty" -msgstr "處理空白提交的方式" - -#: builtin/rebase.c:1554 -msgid "move commits that begin with squash!/fixup! under -i" -msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交" - -#: builtin/rebase.c:1560 -msgid "automatically stash/stash pop before and after" -msgstr "在動作前後執行自動儲藏和彈出儲藏" - -#: builtin/rebase.c:1562 -msgid "add exec lines after each commit of the editable list" -msgstr "可編輯列表的每一個提交下面增加一行 exec" - -#: builtin/rebase.c:1566 -msgid "allow rebasing commits with empty messages" -msgstr "允許針對空提交說明的提交重定基底" - -#: builtin/rebase.c:1570 -msgid "try to rebase merges instead of skipping them" -msgstr "嘗試對合併提交重定基底而不是忽略它們" - -#: builtin/rebase.c:1573 -msgid "use 'merge-base --fork-point' to refine upstream" -msgstr "使用 'merge-base --fork-point' 來最佳化上游" - -#: builtin/rebase.c:1575 -msgid "use the given merge strategy" -msgstr "使用提供的合併策略" - -#: builtin/rebase.c:1577 builtin/revert.c:115 -msgid "option" -msgstr "選項" - -#: builtin/rebase.c:1578 -msgid "pass the argument through to the merge strategy" -msgstr "將參數傳遞給合併策略" - -#: builtin/rebase.c:1581 -msgid "rebase all reachable commits up to the root(s)" -msgstr "將所有可以取得的提交重定基底到根提交" - -#: builtin/rebase.c:1598 -msgid "" -"the rebase.useBuiltin support has been removed!\n" -"See its entry in 'git help config' for details." -msgstr "" -"對 rebase.useBuiltin 的支援已被刪除！\n" -"詳見 'git help config' 中的條目。" - -#: builtin/rebase.c:1604 -msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "看起來 'git-am' 正在執行中。無法重定基底。" - -#: builtin/rebase.c:1645 -msgid "" -"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." -msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。" - -#: builtin/rebase.c:1650 -msgid "cannot combine '--keep-base' with '--onto'" -msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" - -#: builtin/rebase.c:1652 -msgid "cannot combine '--keep-base' with '--root'" -msgstr "不能將 '--keep-base' 和 '--root' 組合使用" - -#: builtin/rebase.c:1656 -msgid "No rebase in progress?" -msgstr "沒有正在進行的重定基底？" - -#: builtin/rebase.c:1660 -msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" - -#: builtin/rebase.c:1683 -msgid "Cannot read HEAD" -msgstr "不能讀取 HEAD" - -#: builtin/rebase.c:1695 -msgid "" -"You must edit all merge conflicts and then\n" -"mark them as resolved using git add" -msgstr "" -"您必須編輯所有的合併衝突，然後透過 git add\n" -"指令將它們標記為已解決" - -#: builtin/rebase.c:1714 -msgid "could not discard worktree changes" -msgstr "無法捨棄工作區變更" - -#: builtin/rebase.c:1733 -#, c-format -msgid "could not move back to %s" -msgstr "無法移回 %s" - -#: builtin/rebase.c:1778 -#, c-format -msgid "" -"It seems that there is already a %s directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t%s\n" -"If that is not the case, please\n" -"\t%s\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there.\n" -msgstr "" -"似乎已有一個 %s 目錄，我懷疑您正處於另外一個重定基底動作過程中。\n" -"如果是這樣，請執行\n" -"\t%s\n" -"如果不是這樣，請執行\n" -"\t%s\n" -"然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n" - -#: builtin/rebase.c:1806 -msgid "switch `C' expects a numerical value" -msgstr "開關 `C' 期望一個數字值" - -#: builtin/rebase.c:1847 -#, c-format -msgid "Unknown mode: %s" -msgstr "未知模式：%s" - -#: builtin/rebase.c:1869 -msgid "--strategy requires --merge or --interactive" -msgstr "--strategy 需要 --merge 或 --interactive" - -#: builtin/rebase.c:1899 -msgid "cannot combine apply options with merge options" -msgstr "不能將 apply 套用選項與 merge 合併選項一起使用" - -#: builtin/rebase.c:1912 -#, c-format -msgid "Unknown rebase backend: %s" -msgstr "未知 rebase 後端：%s" - -#: builtin/rebase.c:1937 -msgid "--reschedule-failed-exec requires --exec or --interactive" -msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" - -#: builtin/rebase.c:1957 -msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用" - -#: builtin/rebase.c:1961 -msgid "" -"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -msgstr "" -"錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用" - -#: builtin/rebase.c:1985 -#, c-format -msgid "invalid upstream '%s'" -msgstr "無效的上游 '%s'" - -#: builtin/rebase.c:1991 -msgid "Could not create new root commit" -msgstr "不能建立新的根提交" - -#: builtin/rebase.c:2017 -#, c-format -msgid "'%s': need exactly one merge base with branch" -msgstr "'%s'：只需要與分支的一個合併基礎" - -#: builtin/rebase.c:2020 -#, c-format -msgid "'%s': need exactly one merge base" -msgstr "'%s'：只需要一個合併基礎" - -#: builtin/rebase.c:2028 -#, c-format -msgid "Does not point to a valid commit '%s'" -msgstr "沒有指向一個有效的提交 '%s'" - -#: builtin/rebase.c:2054 -#, c-format -msgid "fatal: no such branch/commit '%s'" -msgstr "致命錯誤：無此分支/提交 '%s'" - -#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 -#, c-format -msgid "No such ref: %s" -msgstr "沒有這樣的引用：%s" - -#: builtin/rebase.c:2073 -msgid "Could not resolve HEAD to a revision" -msgstr "無法將 HEAD 解析為一個版本" - -#: builtin/rebase.c:2111 -msgid "Cannot autostash" -msgstr "無法 autostash" - -#: builtin/rebase.c:2114 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "意外的 stash 回應：'%s'" - -#: builtin/rebase.c:2120 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "不能為 '%s' 建立目錄" - -#: builtin/rebase.c:2123 -#, c-format -msgid "Created autostash: %s\n" -msgstr "建立了 autostash：%s\n" - -#: builtin/rebase.c:2126 -msgid "could not reset --hard" -msgstr "無法 reset --hard" - -#: builtin/rebase.c:2135 -msgid "Please commit or stash them." -msgstr "請提交或儲藏修改。" - -#: builtin/rebase.c:2169 -#, c-format -msgid "could not switch to %s" -msgstr "無法切換到 %s" - -#: builtin/rebase.c:2180 -msgid "HEAD is up to date." -msgstr "HEAD 是最新的。" - -#: builtin/rebase.c:2182 -#, c-format -msgid "Current branch %s is up to date.\n" -msgstr "目前分支 %s 是最新的。\n" - -#: builtin/rebase.c:2190 -msgid "HEAD is up to date, rebase forced." -msgstr "HEAD 是最新的，強制重定基底。" - -#: builtin/rebase.c:2192 -#, c-format -msgid "Current branch %s is up to date, rebase forced.\n" -msgstr "目前分支 %s 是最新的，強制重定基底。\n" - -#: builtin/rebase.c:2200 -msgid "The pre-rebase hook refused to rebase." -msgstr "pre-rebase 掛鉤拒絕了重定基底動作。" - -#: builtin/rebase.c:2207 -#, c-format -msgid "Changes to %s:\n" -msgstr "到 %s 的變更：\n" - -#: builtin/rebase.c:2210 -#, c-format -msgid "Changes from %s to %s:\n" -msgstr "從 %s 到 %s 的變更：\n" - -#: builtin/rebase.c:2235 -#, c-format -msgid "First, rewinding head to replay your work on top of it...\n" -msgstr "首先，還原開頭指標以便在其上重放您的工作...\n" - -#: builtin/rebase.c:2244 -msgid "Could not detach HEAD" -msgstr "無法分離開頭指標" - -#: builtin/rebase.c:2253 -#, c-format -msgid "Fast-forwarded %s to %s.\n" -msgstr "快轉 %s 到 %s。\n" - -#: builtin/receive-pack.c:33 -msgid "git receive-pack <git-dir>" -msgstr "git receive-pack <版本庫目錄>" - -#: builtin/receive-pack.c:821 -msgid "" -"By default, updating the current branch in a non-bare repository\n" -"is denied, because it will make the index and work tree inconsistent\n" -"with what you pushed, and will require 'git reset --hard' to match\n" -"the work tree to HEAD.\n" -"\n" -"You can set the 'receive.denyCurrentBranch' configuration variable\n" -"to 'ignore' or 'warn' in the remote repository to allow pushing into\n" -"its current branch; however, this is not recommended unless you\n" -"arranged to update its work tree to match what you pushed in some\n" -"other way.\n" -"\n" -"To squelch this message and still keep the default behaviour, set\n" -"'receive.denyCurrentBranch' configuration variable to 'refuse'." -msgstr "" -"預設禁止更新非純版本庫的目前分支，因為您推送的內容將導致索引和工作區\n" -"不一致，並且將需要執行 'git reset --hard' 將工作區符合到 HEAD。\n" -"\n" -"您可以在遠端版本庫中設定 'receive.denyCurrentBranch' 設定變數為\n" -"'ignore' 或 'warn' 以允許推送到目前分支。然而不推薦這麼做，除非您\n" -"用某種方式將其工作區更新至您推送的狀態。\n" -"\n" -"若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n" -"設定變數為 'refuse'。" - -#: builtin/receive-pack.c:841 -msgid "" -"By default, deleting the current branch is denied, because the next\n" -"'git clone' won't result in any file checked out, causing confusion.\n" -"\n" -"You can set 'receive.denyDeleteCurrent' configuration variable to\n" -"'warn' or 'ignore' in the remote repository to allow deleting the\n" -"current branch, with or without a warning message.\n" -"\n" -"To squelch this message, you can set it to 'refuse'." -msgstr "" -"預設禁止刪除目前分支，因為下一次 'git clone' 將不會簽出任何檔案，\n" -"導致困惑。\n" -"\n" -"您可以在遠端版本庫中設定 'receive.denyDeleteCurrent' 設定變數為\n" -"'warn'（顯示警告訊息）或 'ignore'（忽略警告訊息）以允許刪除目前分支。\n" -"\n" -"若要封鎖此訊息，您可以設定它為 'refuse'。" - -#: builtin/receive-pack.c:1938 -msgid "quiet" -msgstr "靜默模式" - -#: builtin/receive-pack.c:1952 -msgid "You must specify a directory." -msgstr "您必須指定一個目錄。" - -#: builtin/reflog.c:17 -msgid "" -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" -"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " -"<refs>..." -msgstr "" -"git reflog expire [--expire=<時間>] [--expire-unreachable=<時間>] [--" -"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引" -"用>..." - -#: builtin/reflog.c:22 -msgid "" -"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " -"<refs>..." -msgstr "" -"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <引" -"用>..." - -#: builtin/reflog.c:25 -msgid "git reflog exists <ref>" -msgstr "git reflog exists <引用>" - -#: builtin/reflog.c:568 builtin/reflog.c:573 -#, c-format -msgid "'%s' is not a valid timestamp" -msgstr "'%s' 不是一個有效的時間戳" - -#: builtin/reflog.c:606 -#, c-format -msgid "Marking reachable objects..." -msgstr "正在標記可以取得物件..." - -#: builtin/reflog.c:644 -#, c-format -msgid "%s points nowhere!" -msgstr "%s 指向不存在！" - -#: builtin/reflog.c:696 -msgid "no reflog specified to delete" -msgstr "未指定要刪除的引用日誌" - -#: builtin/reflog.c:705 -#, c-format -msgid "not a reflog: %s" -msgstr "不是一個引用日誌：%s" - -#: builtin/reflog.c:710 -#, c-format -msgid "no reflog for '%s'" -msgstr "沒有 '%s' 的引用日誌" - -#: builtin/reflog.c:756 -#, c-format -msgid "invalid ref format: %s" -msgstr "無效的引用格式：%s" - -#: builtin/reflog.c:765 -msgid "git reflog [ show | expire | delete | exists ]" -msgstr "git reflog [ show | expire | delete | exists ]" - -#: builtin/remote.c:17 -msgid "git remote [-v | --verbose]" -msgstr "git remote [-v | --verbose]" - -#: builtin/remote.c:18 -msgid "" -"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" -"mirror=<fetch|push>] <name> <url>" -msgstr "" -"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" -"mirror=<fetch|push>] <名稱> <位址>" - -#: builtin/remote.c:19 builtin/remote.c:39 -msgid "git remote rename <old> <new>" -msgstr "git remote rename <舊名稱> <新名稱>" - -#: builtin/remote.c:20 builtin/remote.c:44 -msgid "git remote remove <name>" -msgstr "git remote remove <名稱>" - -#: builtin/remote.c:21 builtin/remote.c:49 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)" - -#: builtin/remote.c:22 -msgid "git remote [-v | --verbose] show [-n] <name>" -msgstr "git remote [-v | --verbose] show [-n] <名稱>" - -#: builtin/remote.c:23 -msgid "git remote prune [-n | --dry-run] <name>" -msgstr "git remote prune [-n | --dry-run] <名稱>" - -#: builtin/remote.c:24 -msgid "" -"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...]" - -#: builtin/remote.c:25 -msgid "git remote set-branches [--add] <name> <branch>..." -msgstr "git remote set-branches [--add] <名稱> <分支>..." - -#: builtin/remote.c:26 builtin/remote.c:75 -msgid "git remote get-url [--push] [--all] <name>" -msgstr "git remote get-url [--push] [--all] <名稱>" - -#: builtin/remote.c:27 builtin/remote.c:80 -msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" -msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]" - -#: builtin/remote.c:28 builtin/remote.c:81 -msgid "git remote set-url --add <name> <newurl>" -msgstr "git remote set-url --add <名稱> <新的位址>" - -#: builtin/remote.c:29 builtin/remote.c:82 -msgid "git remote set-url --delete <name> <url>" -msgstr "git remote set-url --delete <名稱> <位址>" - -#: builtin/remote.c:34 -msgid "git remote add [<options>] <name> <url>" -msgstr "git remote add [<選項>] <名稱> <位址>" - -#: builtin/remote.c:54 -msgid "git remote set-branches <name> <branch>..." -msgstr "git remote set-branches <名稱> <分支>..." - -#: builtin/remote.c:55 -msgid "git remote set-branches --add <name> <branch>..." -msgstr "git remote set-branches --add <名稱> <分支>..." - -#: builtin/remote.c:60 -msgid "git remote show [<options>] <name>" -msgstr "git remote show [<選項>] <名稱>" - -#: builtin/remote.c:65 -msgid "git remote prune [<options>] <name>" -msgstr "git remote prune [<選項>] <名稱>" - -#: builtin/remote.c:70 -msgid "git remote update [<options>] [<group> | <remote>]..." -msgstr "git remote update [<選項>] [<組> | <遠端>]..." - -#: builtin/remote.c:99 -#, c-format -msgid "Updating %s" -msgstr "更新 %s 中" - -#: builtin/remote.c:131 -msgid "" -"--mirror is dangerous and deprecated; please\n" -"\t use --mirror=fetch or --mirror=push instead" -msgstr "" -"--mirror 選項危險且過時，請使用 --mirror=fetch\n" -"\t 或 --mirror=push" - -#: builtin/remote.c:148 -#, c-format -msgid "unknown mirror argument: %s" -msgstr "未知的鏡像參數：%s" - -#: builtin/remote.c:164 -msgid "fetch the remote branches" -msgstr "抓取遠端的分支" - -#: builtin/remote.c:166 -msgid "import all tags and associated objects when fetching" -msgstr "抓取時匯入所有的標籤和關聯物件" - -#: builtin/remote.c:169 -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "或不抓取任何標籤（--no-tags）" - -#: builtin/remote.c:171 -msgid "branch(es) to track" -msgstr "追蹤的分支" - -#: builtin/remote.c:172 -msgid "master branch" -msgstr "主線分支" - -#: builtin/remote.c:174 -msgid "set up remote as a mirror to push to or fetch from" -msgstr "把遠端設定為用以推送或抓取的鏡像" - -#: builtin/remote.c:186 -msgid "specifying a master branch makes no sense with --mirror" -msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義" - -#: builtin/remote.c:188 -msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義" - -#: builtin/remote.c:195 builtin/remote.c:696 -#, c-format -msgid "remote %s already exists." -msgstr "遠端 %s 已經存在。" - -#: builtin/remote.c:199 builtin/remote.c:700 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "'%s' 不是一個有效的遠端名稱" - -#: builtin/remote.c:239 -#, c-format -msgid "Could not setup master '%s'" -msgstr "無法設定 master '%s'" - -#: builtin/remote.c:354 -#, c-format -msgid "Could not get fetch map for refspec %s" -msgstr "無法得到引用規格 %s 的取得列表" - -#: builtin/remote.c:453 builtin/remote.c:461 -msgid "(matching)" -msgstr "（符合）" - -#: builtin/remote.c:465 -msgid "(delete)" -msgstr "（刪除）" - -#: builtin/remote.c:653 -#, c-format -msgid "could not set '%s'" -msgstr "無法設定 '%s'" - -#: builtin/remote.c:658 -#, c-format -msgid "" -"The %s configuration remote.pushDefault in:\n" -"\t%s:%d\n" -"now names the non-existent remote '%s'" -msgstr "" -"位於下述位置的 %s 設定項 remote.pushDefault：\n" -"\t%s:%d\n" -"現命名成不存在的遠端分支 '%s'" - -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 -#, c-format -msgid "No such remote: '%s'" -msgstr "沒有此遠端版本庫：'%s'" - -#: builtin/remote.c:706 -#, c-format -msgid "Could not rename config section '%s' to '%s'" -msgstr "不能重新命名設定小節 '%s' 到 '%s'" - -#: builtin/remote.c:726 -#, c-format -msgid "" -"Not updating non-default fetch refspec\n" -"\t%s\n" -"\tPlease update the configuration manually if necessary." -msgstr "" -"沒有更新非預設的取得引用規格\n" -"\t%s\n" -"\t如果必要請手動更新設定。" - -#: builtin/remote.c:766 -#, c-format -msgid "deleting '%s' failed" -msgstr "刪除 '%s' 失敗" - -#: builtin/remote.c:800 -#, c-format -msgid "creating '%s' failed" -msgstr "建立 '%s' 失敗" - -#: builtin/remote.c:876 -msgid "" -"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" -"to delete it, use:" -msgid_plural "" -"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" -"to delete them, use:" -msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用：" - -#: builtin/remote.c:890 -#, c-format -msgid "Could not remove config section '%s'" -msgstr "不能移除設定小節 '%s'" - -#: builtin/remote.c:993 -#, c-format -msgid " new (next fetch will store in remotes/%s)" -msgstr " 新的（下一次取得將儲存於 remotes/%s）" - -#: builtin/remote.c:996 -msgid " tracked" -msgstr " 已追蹤" - -#: builtin/remote.c:998 -msgid " stale (use 'git remote prune' to remove)" -msgstr " 過時（使用 'git remote prune' 來移除）" - -#: builtin/remote.c:1000 -msgid " ???" -msgstr " ???" - -#: builtin/remote.c:1041 -#, c-format -msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" -msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支" - -#: builtin/remote.c:1050 -#, c-format -msgid "rebases interactively onto remote %s" -msgstr "互動式重定基底到遠端 %s" - -#: builtin/remote.c:1052 -#, c-format -msgid "rebases interactively (with merges) onto remote %s" -msgstr "互動式重定基底（含合併提交）到遠端 %s" - -#: builtin/remote.c:1055 -#, c-format -msgid "rebases onto remote %s" -msgstr "重定基底到遠端 %s" - -#: builtin/remote.c:1059 -#, c-format -msgid " merges with remote %s" -msgstr " 與遠端 %s 合併" - -#: builtin/remote.c:1062 -#, c-format -msgid "merges with remote %s" -msgstr "與遠端 %s 合併" - -#: builtin/remote.c:1065 -#, c-format -msgid "%-*s and with remote %s\n" -msgstr "%-*s 以及和遠端 %s\n" - -#: builtin/remote.c:1108 -msgid "create" -msgstr "建立" - -#: builtin/remote.c:1111 -msgid "delete" -msgstr "刪除" - -#: builtin/remote.c:1115 -msgid "up to date" -msgstr "最新" - -#: builtin/remote.c:1118 -msgid "fast-forwardable" -msgstr "可快轉" - -#: builtin/remote.c:1121 -msgid "local out of date" -msgstr "本機已過時" - -#: builtin/remote.c:1128 -#, c-format -msgid " %-*s forces to %-*s (%s)" -msgstr " %-*s 強制推送至 %-*s (%s)" - -#: builtin/remote.c:1131 -#, c-format -msgid " %-*s pushes to %-*s (%s)" -msgstr " %-*s 推送至 %-*s (%s)" - -#: builtin/remote.c:1135 -#, c-format -msgid " %-*s forces to %s" -msgstr " %-*s 強制推送至 %s" - -#: builtin/remote.c:1138 -#, c-format -msgid " %-*s pushes to %s" -msgstr " %-*s 推送至 %s" - -#: builtin/remote.c:1206 -msgid "do not query remotes" -msgstr "不查詢遠端" - -#: builtin/remote.c:1233 -#, c-format -msgid "* remote %s" -msgstr "* 遠端 %s" - -#: builtin/remote.c:1234 -#, c-format -msgid " Fetch URL: %s" -msgstr " 取得位址：%s" - -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 -msgid "(no URL)" -msgstr "(無 URL)" - -#. TRANSLATORS: the colon ':' should align -#. with the one in " Fetch URL: %s" -#. translation. -#. -#: builtin/remote.c:1249 builtin/remote.c:1251 -#, c-format -msgid " Push URL: %s" -msgstr " 推送位址：%s" - -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 -#, c-format -msgid " HEAD branch: %s" -msgstr " HEAD 分支：%s" - -# 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1253 -msgid "(not queried)" -msgstr "（未查詢）" - -#: builtin/remote.c:1255 -msgid "(unknown)" -msgstr "（未知）" - -#: builtin/remote.c:1259 -#, c-format -msgid "" -" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n" - -#: builtin/remote.c:1271 -#, c-format -msgid " Remote branch:%s" -msgid_plural " Remote branches:%s" -msgstr[0] " 遠端分支：%s" - -# 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1274 builtin/remote.c:1300 -msgid " (status not queried)" -msgstr "（狀態未查詢）" - -#: builtin/remote.c:1283 -msgid " Local branch configured for 'git pull':" -msgid_plural " Local branches configured for 'git pull':" -msgstr[0] " 為 'git pull' 設定的本機分支：" - -#: builtin/remote.c:1291 -msgid " Local refs will be mirrored by 'git push'" -msgstr " 本機引用將在 'git push' 時被鏡像" - -#: builtin/remote.c:1297 -#, c-format -msgid " Local ref configured for 'git push'%s:" -msgid_plural " Local refs configured for 'git push'%s:" -msgstr[0] " 為 'git push' 設定的本機引用%s：" - -#: builtin/remote.c:1318 -msgid "set refs/remotes/<name>/HEAD according to remote" -msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD" - -#: builtin/remote.c:1320 -msgid "delete refs/remotes/<name>/HEAD" -msgstr "刪除 refs/remotes/<名稱>/HEAD" - -#: builtin/remote.c:1335 -msgid "Cannot determine remote HEAD" -msgstr "無法確定遠端 HEAD" - -#: builtin/remote.c:1337 -msgid "Multiple remote HEAD branches. Please choose one explicitly with:" -msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令：" - -#: builtin/remote.c:1347 -#, c-format -msgid "Could not delete %s" -msgstr "無法刪除 %s" - -#: builtin/remote.c:1355 -#, c-format -msgid "Not a valid ref: %s" -msgstr "不是一個有效引用：%s" - -#: builtin/remote.c:1357 -#, c-format -msgid "Could not setup %s" -msgstr "不能設定 %s" - -# 譯者：請維持前導空格 -#: builtin/remote.c:1375 -#, c-format -msgid " %s will become dangling!" -msgstr " %s 將成為懸空狀態！" - -# 譯者：請維持前導空格 -#: builtin/remote.c:1376 -#, c-format -msgid " %s has become dangling!" -msgstr " %s 已成為懸空狀態！" - -#: builtin/remote.c:1386 -#, c-format -msgid "Pruning %s" -msgstr "修剪 %s" - -#: builtin/remote.c:1387 -#, c-format -msgid "URL: %s" -msgstr "URL：%s" - -#: builtin/remote.c:1403 -#, c-format -msgid " * [would prune] %s" -msgstr " * [將刪除] %s" - -#: builtin/remote.c:1406 -#, c-format -msgid " * [pruned] %s" -msgstr " * [已刪除] %s" - -#: builtin/remote.c:1451 -msgid "prune remotes after fetching" -msgstr "抓取後清除遠端" - -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 -#, c-format -msgid "No such remote '%s'" -msgstr "沒有此遠端 '%s'" - -#: builtin/remote.c:1530 -msgid "add branch" -msgstr "新增分支" - -#: builtin/remote.c:1537 -msgid "no remote specified" -msgstr "未指定遠端" - -#: builtin/remote.c:1554 -msgid "query push URLs rather than fetch URLs" -msgstr "查詢推送 URL 位址，而非取得 URL 位址" - -#: builtin/remote.c:1556 -msgid "return all URLs" -msgstr "返回所有 URL 位址" - -#: builtin/remote.c:1584 -#, c-format -msgid "no URLs configured for remote '%s'" -msgstr "沒有給遠端版本庫 '%s' 設定 URL" - -#: builtin/remote.c:1610 -msgid "manipulate push URLs" -msgstr "動作推送 URLS" - -#: builtin/remote.c:1612 -msgid "add URL" -msgstr "新增 URL" - -#: builtin/remote.c:1614 -msgid "delete URLs" -msgstr "刪除 URL" - -#: builtin/remote.c:1621 -msgid "--add --delete doesn't make sense" -msgstr "--add --delete 無意義" - -#: builtin/remote.c:1660 -#, c-format -msgid "Invalid old URL pattern: %s" -msgstr "無效的舊 URL 符合範本：%s" - -#: builtin/remote.c:1668 -#, c-format -msgid "No such URL found: %s" -msgstr "未找到此 URL：%s" - -#: builtin/remote.c:1670 -msgid "Will not delete all non-push URLs" -msgstr "將不會刪除所有非推送 URL 位址" - -#: builtin/repack.c:23 -msgid "git repack [<options>]" -msgstr "git repack [<選項>]" - -#: builtin/repack.c:28 -msgid "" -"Incremental repacks are incompatible with bitmap indexes. Use\n" -"--no-write-bitmap-index or disable the pack.writebitmaps configuration." -msgstr "" -"增量 repack 和 bitmap 索引不相容。 使用 --no-write-bitmap-index\n" -"或禁用 pack.writebitmaps 設定。" - -#: builtin/repack.c:191 -msgid "could not start pack-objects to repack promisor objects" -msgstr "無法開始 pack-objects 來重新打包 promisor 物件" - -#: builtin/repack.c:230 builtin/repack.c:416 -msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" - -#: builtin/repack.c:254 -msgid "could not finish pack-objects to repack promisor objects" -msgstr "無法完成 pack-objects 來重新打包 promisor 物件" - -#: builtin/repack.c:292 -msgid "pack everything in a single pack" -msgstr "所有內容打包到一個包檔案中" - -#: builtin/repack.c:294 -msgid "same as -a, and turn unreachable objects loose" -msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" - -#: builtin/repack.c:297 -msgid "remove redundant packs, and run git-prune-packed" -msgstr "刪除多餘的包，執行 git-prune-packed" - -#: builtin/repack.c:299 -msgid "pass --no-reuse-delta to git-pack-objects" -msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta" - -#: builtin/repack.c:301 -msgid "pass --no-reuse-object to git-pack-objects" -msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object" - -#: builtin/repack.c:303 -msgid "do not run git-update-server-info" -msgstr "不執行 git-update-server-info" - -#: builtin/repack.c:306 -msgid "pass --local to git-pack-objects" -msgstr "向 git-pack-objects 傳遞參數 --local" - -#: builtin/repack.c:308 -msgid "write bitmap index" -msgstr "寫 bitmap 索引" - -#: builtin/repack.c:310 -msgid "pass --delta-islands to git-pack-objects" -msgstr "向 git-pack-objects 傳遞參數 --delta-islands" - -#: builtin/repack.c:311 -msgid "approxidate" -msgstr "近似日期" - -#: builtin/repack.c:312 -msgid "with -A, do not loosen objects older than this" -msgstr "使用 -A，不要將早於提供時間的物件過期" - -#: builtin/repack.c:314 -msgid "with -a, repack unreachable objects" -msgstr "使用 -a ，重新對無法取得物件打包" - -#: builtin/repack.c:316 -msgid "size of the window used for delta compression" -msgstr "用於增量壓縮的視窗值" - -#: builtin/repack.c:317 builtin/repack.c:323 -msgid "bytes" -msgstr "位元組" - -#: builtin/repack.c:318 -msgid "same as the above, but limit memory size instead of entries count" -msgstr "和上面的相似，但限制記憶體大小而非條目數" - -#: builtin/repack.c:320 -msgid "limits the maximum delta depth" -msgstr "限制最大增量深度" - -#: builtin/repack.c:322 -msgid "limits the maximum number of threads" -msgstr "限制最大執行緒數" - -#: builtin/repack.c:324 -msgid "maximum size of each packfile" -msgstr "每個 packfile 的最大尺寸" - -#: builtin/repack.c:326 -msgid "repack objects in packs marked with .keep" -msgstr "對標記為 .keep 的包中的物件重新打包" - -#: builtin/repack.c:328 -msgid "do not repack this pack" -msgstr "不要對該包檔案重新打包" - -#: builtin/repack.c:338 -msgid "cannot delete packs in a precious-objects repo" -msgstr "不能刪除珍品版本庫中的打包檔案" - -#: builtin/repack.c:342 -msgid "--keep-unreachable and -A are incompatible" -msgstr "--keep-unreachable 和 -A 不相容" - -#: builtin/repack.c:425 -msgid "Nothing new to pack." -msgstr "沒有新的要打包。" - -#: builtin/repack.c:486 -#, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" -"警告：為了將包檔案取代為新版本，一些使用中的包已經\n" -"警告：透過新增 old- 前綴的方式重新命名。但是動作失敗，\n" -"警告：並且嘗試重新命名改回原有檔案名的動作也失敗。\n" -"警告：請手動將 %s 下的這些檔案重新命名：\n" - -#: builtin/repack.c:534 -#, c-format -msgid "failed to remove '%s'" -msgstr "刪除 '%s' 失敗" - -#: builtin/replace.c:22 -msgid "git replace [-f] <object> <replacement>" -msgstr "git replace [-f] <物件> <取代物>" - -#: builtin/replace.c:23 -msgid "git replace [-f] --edit <object>" -msgstr "git replace [-f] --edit <物件>" - -#: builtin/replace.c:24 -msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "git replace [-f] --graft <提交> [<父提交>...]" - -#: builtin/replace.c:25 -msgid "git replace [-f] --convert-graft-file" -msgstr "git replace [-f] --convert-graft-file" - -#: builtin/replace.c:26 -msgid "git replace -d <object>..." -msgstr "git replace -d <物件>..." - -#: builtin/replace.c:27 -msgid "git replace [--format=<format>] [-l [<pattern>]]" -msgstr "git replace [--format=<格式>] [-l [<模式>]]" - -#: builtin/replace.c:90 -#, c-format -msgid "" -"invalid replace format '%s'\n" -"valid formats are 'short', 'medium' and 'long'" -msgstr "" -"無效的取代格式 '%s'\n" -"有效的格式有 'short'、'medium' 和 'long'" - -#: builtin/replace.c:125 -#, c-format -msgid "replace ref '%s' not found" -msgstr "未發現取代引用 '%s'" - -#: builtin/replace.c:141 -#, c-format -msgid "Deleted replace ref '%s'" -msgstr "已刪除取代引用 '%s'" - -#: builtin/replace.c:153 -#, c-format -msgid "'%s' is not a valid ref name" -msgstr "'%s' 不是一個有效的引用名" - -#: builtin/replace.c:158 -#, c-format -msgid "replace ref '%s' already exists" -msgstr "取代引用 '%s' 已經存在" - -#: builtin/replace.c:178 -#, c-format -msgid "" -"Objects must be of the same type.\n" -"'%s' points to a replaced object of type '%s'\n" -"while '%s' points to a replacement object of type '%s'." -msgstr "" -"物件必須屬於同一類型。\n" -"'%s' 指向 '%s' 類型的取代物件\n" -"而 '%s' 指向 '%s' 類型的取代物件。" - -#: builtin/replace.c:229 -#, c-format -msgid "unable to open %s for writing" -msgstr "無法為寫入開啟 %s" - -#: builtin/replace.c:242 -msgid "cat-file reported failure" -msgstr "cat-file 報告失敗" - -#: builtin/replace.c:258 -#, c-format -msgid "unable to open %s for reading" -msgstr "無法為讀取開啟 %s" - -#: builtin/replace.c:272 -msgid "unable to spawn mktree" -msgstr "無法啟動 mktree" - -#: builtin/replace.c:276 -msgid "unable to read from mktree" -msgstr "無法從 mktree 讀取" - -#: builtin/replace.c:285 -msgid "mktree reported failure" -msgstr "mktree 報告失敗" - -#: builtin/replace.c:289 -msgid "mktree did not return an object name" -msgstr "mktree 沒有返回一個物件名" - -#: builtin/replace.c:298 -#, c-format -msgid "unable to fstat %s" -msgstr "無法對 %s 執行 fstat" - -#: builtin/replace.c:303 -msgid "unable to write object to database" -msgstr "無法向資料庫寫入物件" - -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 -#: builtin/replace.c:454 -#, c-format -msgid "not a valid object name: '%s'" -msgstr "不是一個有效的物件名：'%s'" - -#: builtin/replace.c:326 -#, c-format -msgid "unable to get object type for %s" -msgstr "無法得到 %s 的物件類型" - -#: builtin/replace.c:342 -msgid "editing object file failed" -msgstr "編輯物件檔案失敗" - -#: builtin/replace.c:351 -#, c-format -msgid "new object is the same as the old one: '%s'" -msgstr "新物件和舊物件相同：'%s'" - -#: builtin/replace.c:384 -#, c-format -msgid "could not parse %s as a commit" -msgstr "無法將 %s 解析為一個提交" - -#: builtin/replace.c:416 -#, c-format -msgid "bad mergetag in commit '%s'" -msgstr "提交 '%s' 中含有損壞的合併標籤" - -#: builtin/replace.c:418 -#, c-format -msgid "malformed mergetag in commit '%s'" -msgstr "提交 '%s' 中含有格式錯誤的合併標籤" - -#: builtin/replace.c:430 -#, c-format -msgid "" -"original commit '%s' contains mergetag '%s' that is discarded; use --edit " -"instead of --graft" -msgstr "原始提交 '%s' 包含已經捨棄的合併標籤 '%s'，使用 --edit 代替 --graft" - -#: builtin/replace.c:469 -#, c-format -msgid "the original commit '%s' has a gpg signature" -msgstr "原始提交 '%s' 中有一個 gpg 簽名" - -#: builtin/replace.c:470 -msgid "the signature will be removed in the replacement commit!" -msgstr "在取代的提交中簽名將被移除！" - -#: builtin/replace.c:480 -#, c-format -msgid "could not write replacement commit for: '%s'" -msgstr "不能為 '%s' 寫取代提交" - -#: builtin/replace.c:488 -#, c-format -msgid "graft for '%s' unnecessary" -msgstr "對 '%s' 移植沒有必要" - -#: builtin/replace.c:492 -#, c-format -msgid "new commit is the same as the old one: '%s'" -msgstr "新提交和舊的一樣：'%s'" - -#: builtin/replace.c:527 -#, c-format -msgid "" -"could not convert the following graft(s):\n" -"%s" -msgstr "" -"不能轉換下列移植：\n" -"%s" - -#: builtin/replace.c:548 -msgid "list replace refs" -msgstr "列出取代的引用" - -#: builtin/replace.c:549 -msgid "delete replace refs" -msgstr "刪除取代的引用" - -#: builtin/replace.c:550 -msgid "edit existing object" -msgstr "編輯現存的物件" - -#: builtin/replace.c:551 -msgid "change a commit's parents" -msgstr "修改一個提交的父提交" - -#: builtin/replace.c:552 -msgid "convert existing graft file" -msgstr "轉換現存的移植檔案" - -#: builtin/replace.c:553 -msgid "replace the ref if it exists" -msgstr "如果存在則取代引用" - -#: builtin/replace.c:555 -msgid "do not pretty-print contents for --edit" -msgstr "不要為 --edit 動作美觀顯示內容" - -#: builtin/replace.c:556 -msgid "use this format" -msgstr "使用此格式" - -#: builtin/replace.c:569 -msgid "--format cannot be used when not listing" -msgstr "不列出時不能使用 --format" - -#: builtin/replace.c:577 -msgid "-f only makes sense when writing a replacement" -msgstr "只有寫一個取代時 -f 才有意義" - -#: builtin/replace.c:581 -msgid "--raw only makes sense with --edit" -msgstr "--raw 只有和 --edit 共用才有意義" - -#: builtin/replace.c:587 -msgid "-d needs at least one argument" -msgstr "-d 需要至少一個參數" - -#: builtin/replace.c:593 -msgid "bad number of arguments" -msgstr "錯誤的參數個數" - -#: builtin/replace.c:599 -msgid "-e needs exactly one argument" -msgstr "-e 需要且僅需要一個參數" - -#: builtin/replace.c:605 -msgid "-g needs at least one argument" -msgstr "-g 需要至少一個參數" - -#: builtin/replace.c:611 -msgid "--convert-graft-file takes no argument" -msgstr "--convert-graft-file 不帶參數" - -#: builtin/replace.c:617 -msgid "only one pattern can be given with -l" -msgstr "只能為 -l 提供一個模式" - -#: builtin/rerere.c:13 -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" -msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]" - -#: builtin/rerere.c:60 -msgid "register clean resolutions in index" -msgstr "在索引中註冊乾淨的解決方案" - -#: builtin/rerere.c:79 -msgid "'git rerere forget' without paths is deprecated" -msgstr "沒有路徑的 'git rerere forget' 已經過時" - -#: builtin/rerere.c:113 -#, c-format -msgid "unable to generate diff for '%s'" -msgstr "無法為 '%s' 生成差異" - -#: builtin/reset.c:32 -msgid "" -"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" - -#: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." -msgstr "git reset [-q] [<樹或提交>] [--] <路徑規格>..." - -#: builtin/reset.c:34 -msgid "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "" -"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<樹或提交>]" - -#: builtin/reset.c:35 -msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" -msgstr "git reset --patch [<樹或提交>] [--] [<路徑規格>...]" - -#: builtin/reset.c:41 -msgid "mixed" -msgstr "混雜" - -#: builtin/reset.c:41 -msgid "soft" -msgstr "軟性" - -#: builtin/reset.c:41 -msgid "hard" -msgstr "硬性" - -#: builtin/reset.c:41 -msgid "merge" -msgstr "合併" - -#: builtin/reset.c:41 -msgid "keep" -msgstr "保持" - -#: builtin/reset.c:82 -msgid "You do not have a valid HEAD." -msgstr "您沒有一個有效的 HEAD。" - -#: builtin/reset.c:84 -msgid "Failed to find tree of HEAD." -msgstr "無法找到 HEAD 指向的樹。" - -#: builtin/reset.c:90 -#, c-format -msgid "Failed to find tree of %s." -msgstr "無法找到 %s 指向的樹。" - -#: builtin/reset.c:115 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD 現在位於 %s" - -# 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:194 -#, c-format -msgid "Cannot do a %s reset in the middle of a merge." -msgstr "在合併過程中不能做%s重設動作。" - -#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 -msgid "be quiet, only report errors" -msgstr "安靜模式，只報告錯誤" - -#: builtin/reset.c:296 -msgid "reset HEAD and index" -msgstr "重設 HEAD 和索引" - -#: builtin/reset.c:297 -msgid "reset only HEAD" -msgstr "只重設 HEAD" - -#: builtin/reset.c:299 builtin/reset.c:301 -msgid "reset HEAD, index and working tree" -msgstr "重設 HEAD、索引和工作區" - -#: builtin/reset.c:303 -msgid "reset HEAD but keep local changes" -msgstr "重設 HEAD 但儲存本機變更" - -#: builtin/reset.c:309 -msgid "record only the fact that removed paths will be added later" -msgstr "將刪除的路徑標記為稍後新增" - -#: builtin/reset.c:343 -#, c-format -msgid "Failed to resolve '%s' as a valid revision." -msgstr "無法將 '%s' 解析為一個有效的版本。" - -#: builtin/reset.c:351 -#, c-format -msgid "Failed to resolve '%s' as a valid tree." -msgstr "無法將 '%s' 解析為一個有效的樹狀物件。" - -#: builtin/reset.c:360 -msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch 與 --{hard、mixed、soft} 選項不相容" - -#: builtin/reset.c:370 -msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." -msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。" - -# 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:372 -#, c-format -msgid "Cannot do %s reset with paths." -msgstr "不能帶路徑進行%s重設。" - -# 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:387 -#, c-format -msgid "%s reset is not allowed in a bare repository" -msgstr "不能對純版本庫進行%s重設" - -#: builtin/reset.c:391 -msgid "-N can only be used with --mixed" -msgstr "-N 只能和 --mixed 同時使用" - -#: builtin/reset.c:412 -msgid "Unstaged changes after reset:" -msgstr "重設後取消暫存的變更：" - -#: builtin/reset.c:415 -#, c-format -msgid "" -"\n" -"It took %.2f seconds to enumerate unstaged changes after reset. You can\n" -"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" -"to make this the default.\n" -msgstr "" -"\n" -"重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n" -"將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n" - -#: builtin/reset.c:425 -#, c-format -msgid "Could not reset index file to revision '%s'." -msgstr "不能重設索引檔案至版本 '%s'。" - -#: builtin/reset.c:429 -msgid "Could not write new index file." -msgstr "不能寫入新的索引檔案。" - -#: builtin/rev-list.c:499 -msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" - -#: builtin/rev-list.c:560 -msgid "object filtering requires --objects" -msgstr "物件過濾需要 --objects" - -#: builtin/rev-list.c:610 -msgid "rev-list does not support display of notes" -msgstr "rev-list 不支援顯示註解" - -#: builtin/rev-list.c:615 -msgid "marked counting is incompatible with --objects" -msgstr "--objects 不相容標記計數 (marked counting)" - -#: builtin/rev-parse.c:408 -msgid "git rev-parse --parseopt [<options>] -- [<args>...]" -msgstr "git rev-parse --parseopt [<選項>] -- [<參數>...]" - -#: builtin/rev-parse.c:413 -msgid "keep the `--` passed as an arg" -msgstr "保持 `--` 作為一個參數傳遞" - -#: builtin/rev-parse.c:415 -msgid "stop parsing after the first non-option argument" -msgstr "遇到第一個非選項參數後停止解析" - -#: builtin/rev-parse.c:418 -msgid "output in stuck long form" -msgstr "以固定長格式輸出" - -#: builtin/rev-parse.c:551 -msgid "" -"git rev-parse --parseopt [<options>] -- [<args>...]\n" -" or: git rev-parse --sq-quote [<arg>...]\n" -" or: git rev-parse [<options>] [<arg>...]\n" -"\n" -"Run \"git rev-parse --parseopt -h\" for more information on the first usage." -msgstr "" -"git rev-parse --parseopt [<選項>] -- [<參數>...]\n" -" 或者：git rev-parse --sq-quote [<參數>...]\n" -" 或者：git rev-parse [<選項>] [<參數>...]\n" -"\n" -"初次使用時執行 \"git rev-parse --parseopt -h\" 來獲得更多訊息。" - -#: builtin/revert.c:24 -msgid "git revert [<options>] <commit-ish>..." -msgstr "git revert [<選項>] <提交號>..." - -#: builtin/revert.c:25 -msgid "git revert <subcommand>" -msgstr "git revert <子指令>" - -#: builtin/revert.c:30 -msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git cherry-pick [<選項>] <提交號>..." - -#: builtin/revert.c:31 -msgid "git cherry-pick <subcommand>" -msgstr "git cherry-pick <子指令>" - -#: builtin/revert.c:72 -#, c-format -msgid "option `%s' expects a number greater than zero" -msgstr "選項 `%s' 期望一個大於零的數字" - -#: builtin/revert.c:92 -#, c-format -msgid "%s: %s cannot be used with %s" -msgstr "%s：%s 不能和 %s 同時使用" - -#: builtin/revert.c:102 -msgid "end revert or cherry-pick sequence" -msgstr "終止反轉或揀選動作" - -#: builtin/revert.c:103 -msgid "resume revert or cherry-pick sequence" -msgstr "繼續反轉或揀選動作" - -#: builtin/revert.c:104 -msgid "cancel revert or cherry-pick sequence" -msgstr "取消反轉或揀選動作" - -#: builtin/revert.c:105 -msgid "skip current commit and continue" -msgstr "跳過目前提交並繼續" - -#: builtin/revert.c:107 -msgid "don't automatically commit" -msgstr "不要自動提交" - -#: builtin/revert.c:108 -msgid "edit the commit message" -msgstr "編輯提交說明" - -#: builtin/revert.c:111 -msgid "parent-number" -msgstr "父編號" - -#: builtin/revert.c:112 -msgid "select mainline parent" -msgstr "選擇主幹父提交編號" - -#: builtin/revert.c:114 -msgid "merge strategy" -msgstr "合併策略" - -#: builtin/revert.c:116 -msgid "option for merge strategy" -msgstr "合併策略的選項" - -#: builtin/revert.c:125 -msgid "append commit name" -msgstr "追加提交名稱" - -#: builtin/revert.c:127 -msgid "preserve initially empty commits" -msgstr "保留初始化的空提交" - -#: builtin/revert.c:129 -msgid "keep redundant, empty commits" -msgstr "保持多餘的、空的提交" - -#: builtin/revert.c:232 -msgid "revert failed" -msgstr "還原失敗" - -#: builtin/revert.c:245 -msgid "cherry-pick failed" -msgstr "揀選失敗" - -#: builtin/rm.c:19 -msgid "git rm [<options>] [--] <file>..." -msgstr "git rm [<選項>] [--] <檔案>..." - -#: builtin/rm.c:207 -msgid "" -"the following file has staged content different from both the\n" -"file and the HEAD:" -msgid_plural "" -"the following files have staged content different from both the\n" -"file and the HEAD:" -msgstr[0] "如下檔案其暫存的內容和工作區及 HEAD 中的都不一樣：" - -#: builtin/rm.c:212 -msgid "" -"\n" -"(use -f to force removal)" -msgstr "" -"\n" -"（使用 -f 強制刪除）" - -#: builtin/rm.c:216 -msgid "the following file has changes staged in the index:" -msgid_plural "the following files have changes staged in the index:" -msgstr[0] "下列檔案索引中有變更" - -#: builtin/rm.c:220 builtin/rm.c:229 -msgid "" -"\n" -"(use --cached to keep the file, or -f to force removal)" -msgstr "" -"\n" -"（使用 --cached 保留本機檔案，或用 -f 強制刪除）" - -#: builtin/rm.c:226 -msgid "the following file has local modifications:" -msgid_plural "the following files have local modifications:" -msgstr[0] "如下檔案有本機修改：" - -#: builtin/rm.c:243 -msgid "do not list removed files" -msgstr "不列出刪除的檔案" - -#: builtin/rm.c:244 -msgid "only remove from the index" -msgstr "只從索引區刪除" - -#: builtin/rm.c:245 -msgid "override the up-to-date check" -msgstr "忽略檔案更新狀態檢查" - -#: builtin/rm.c:246 -msgid "allow recursive removal" -msgstr "允許遞迴刪除" - -#: builtin/rm.c:248 -msgid "exit with a zero status even if nothing matched" -msgstr "即使沒有符合，也以零狀態離開" - -#: builtin/rm.c:282 -msgid "No pathspec was given. Which files should I remove?" -msgstr "沒有提供路徑規格。我該移除哪個檔案？" - -#: builtin/rm.c:305 -msgid "please stage your changes to .gitmodules or stash them to proceed" -msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" - -#: builtin/rm.c:323 -#, c-format -msgid "not removing '%s' recursively without -r" -msgstr "未提供 -r 選項不會遞迴刪除 '%s'" - -#: builtin/rm.c:362 -#, c-format -msgid "git rm: unable to remove %s" -msgstr "git rm：不能刪除 %s" - -#: builtin/send-pack.c:20 -msgid "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " -"[<ref>...]\n" -" --all and explicit <ref> specification are mutually exclusive." -msgstr "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" -"receive-pack>] [--verbose] [--thin] [--atomic] [<主機>:]<目錄> [<引用>...]\n" -" --all 和明確的 <引用> 互斥。" - -#: builtin/send-pack.c:163 -msgid "remote name" -msgstr "遠端名稱" - -#: builtin/send-pack.c:177 -msgid "use stateless RPC protocol" -msgstr "使用無狀態的 RPC 協定" - -#: builtin/send-pack.c:178 -msgid "read refs from stdin" -msgstr "從標準輸入讀取引用" - -#: builtin/send-pack.c:179 -msgid "print status from remote helper" -msgstr "列印來自遠端 helper 的狀態" - -#: builtin/shortlog.c:14 -msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "git shortlog [<選項>] [<版本範圍>] [[--] <路徑>...]" - -#: builtin/shortlog.c:15 -msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "git log --pretty=short | git shortlog [<選項>]" - -#: builtin/shortlog.c:264 -msgid "Group by committer rather than author" -msgstr "按照提交者分組而不是作者" - -#: builtin/shortlog.c:266 -msgid "sort output according to the number of commits per author" -msgstr "根據每個作者的提交數量排序" - -#: builtin/shortlog.c:268 -msgid "Suppress commit descriptions, only provides commit count" -msgstr "隱藏提交說明，只提供提交數量" - -#: builtin/shortlog.c:270 -msgid "Show the email address of each author" -msgstr "顯示每個作者的電子信件位址" - -#: builtin/shortlog.c:271 -msgid "<w>[,<i1>[,<i2>]]" -msgstr "<w>[,<i1>[,<i2>]]" - -#: builtin/shortlog.c:272 -msgid "Linewrap output" -msgstr "折行輸出" - -#: builtin/shortlog.c:301 -msgid "too many arguments given outside repository" -msgstr "版本庫外執行提供了太多的參數" - -#: builtin/show-branch.c:13 -msgid "" -"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" -msgstr "" -"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" -"\t\t[--current] [--color[=<何時>] | --no-color] [--sparse]\n" -"\t\t[--more=<n> | --list | --independent | --merge-base]\n" -"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元>)...]" - -#: builtin/show-branch.c:17 -msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "git show-branch (-g | --reflog)[=<n>[,<起始點>]] [--list] [<引用>]" - -#: builtin/show-branch.c:395 -#, c-format -msgid "ignoring %s; cannot handle more than %d ref" -msgid_plural "ignoring %s; cannot handle more than %d refs" -msgstr[0] "忽略 %s，無法處理 %d 個以上的引用" - -#: builtin/show-branch.c:548 -#, c-format -msgid "no matching refs with %s" -msgstr "沒有和 %s 符合的引用" - -#: builtin/show-branch.c:645 -msgid "show remote-tracking and local branches" -msgstr "顯示遠端追蹤的和本機的分支" - -#: builtin/show-branch.c:647 -msgid "show remote-tracking branches" -msgstr "顯示遠端追蹤的分支" - -#: builtin/show-branch.c:649 -msgid "color '*!+-' corresponding to the branch" -msgstr "著色 '*!+-' 到相應的分支" - -#: builtin/show-branch.c:651 -msgid "show <n> more commits after the common ancestor" -msgstr "顯示共同祖先後的 <n> 個提交" - -#: builtin/show-branch.c:653 -msgid "synonym to more=-1" -msgstr "和 more=-1 同義" - -#: builtin/show-branch.c:654 -msgid "suppress naming strings" -msgstr "不顯示字串命名" - -#: builtin/show-branch.c:656 -msgid "include the current branch" -msgstr "包括目前分支" - -#: builtin/show-branch.c:658 -msgid "name commits with their object names" -msgstr "以物件名字命名提交" - -#: builtin/show-branch.c:660 -msgid "show possible merge bases" -msgstr "顯示可能合併的基礎" - -#: builtin/show-branch.c:662 -msgid "show refs unreachable from any other ref" -msgstr "顯示沒有任何引用的的引用" - -#: builtin/show-branch.c:664 -msgid "show commits in topological order" -msgstr "以拓撲順序顯示提交" - -#: builtin/show-branch.c:667 -msgid "show only commits not on the first branch" -msgstr "只顯示不在第一個分支上的提交" - -#: builtin/show-branch.c:669 -msgid "show merges reachable from only one tip" -msgstr "顯示僅一個分支可存取的合併提交" - -#: builtin/show-branch.c:671 -msgid "topologically sort, maintaining date order where possible" -msgstr "拓撲方式排序，並儘可能地保持日期順序" - -#: builtin/show-branch.c:674 -msgid "<n>[,<base>]" -msgstr "<n>[,<base>]" - -#: builtin/show-branch.c:675 -msgid "show <n> most recent ref-log entries starting at base" -msgstr "顯示從起始點開始的 <n> 條最近的引用日誌記錄" - -#: builtin/show-branch.c:711 -msgid "" -"--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容" - -#: builtin/show-branch.c:735 -msgid "no branches given, and HEAD is not valid" -msgstr "未提供分支，且 HEAD 無效" - -#: builtin/show-branch.c:738 -msgid "--reflog option needs one branch name" -msgstr "選項 --reflog 需要一個分支名" - -#: builtin/show-branch.c:741 -#, c-format -msgid "only %d entry can be shown at one time." -msgid_plural "only %d entries can be shown at one time." -msgstr[0] "一次只能顯示 %d 個條目。" - -#: builtin/show-branch.c:745 -#, c-format -msgid "no such ref %s" -msgstr "無此引用 %s" - -#: builtin/show-branch.c:831 -#, c-format -msgid "cannot handle more than %d rev." -msgid_plural "cannot handle more than %d revs." -msgstr[0] "不能處理 %d 個以上的版本。" - -#: builtin/show-branch.c:835 -#, c-format -msgid "'%s' is not a valid ref." -msgstr "'%s' 不是一個有效的引用。" - -#: builtin/show-branch.c:838 -#, c-format -msgid "cannot find commit %s (%s)" -msgstr "不能找到提交 %s（%s）" - -#: builtin/show-ref.c:12 -msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" -msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" - -#: builtin/show-ref.c:13 -msgid "git show-ref --exclude-existing[=<pattern>]" -msgstr "git show-ref --exclude-existing[=<模式>]" - -#: builtin/show-ref.c:162 -msgid "only show tags (can be combined with heads)" -msgstr "只顯示標籤（可以和頭共用）" - -#: builtin/show-ref.c:163 -msgid "only show heads (can be combined with tags)" -msgstr "只顯示頭（可以和標籤共用）" - -#: builtin/show-ref.c:164 -msgid "stricter reference checking, requires exact ref path" -msgstr "更嚴格的引用檢測，需要精確的引用路徑" - -#: builtin/show-ref.c:167 builtin/show-ref.c:169 -msgid "show the HEAD reference, even if it would be filtered out" -msgstr "顯示 HEAD 引用，即使被過濾掉" - -#: builtin/show-ref.c:171 -msgid "dereference tags into object IDs" -msgstr "轉換標籤到物件 ID" - -#: builtin/show-ref.c:173 -msgid "only show SHA1 hash using <n> digits" -msgstr "只顯示使用 <n> 個數字的 SHA1 雜湊" - -#: builtin/show-ref.c:177 -msgid "do not print results to stdout (useful with --verify)" -msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）" - -#: builtin/show-ref.c:179 -msgid "show refs from stdin that aren't in local repository" -msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" - -#: builtin/sparse-checkout.c:21 -msgid "git sparse-checkout (init|list|set|add|disable) <options>" -msgstr "git sparse-checkout (init|list|set|add|disable) <選項>" - -#: builtin/sparse-checkout.c:64 -msgid "this worktree is not sparse (sparse-checkout file may not exist)" -msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" - -#: builtin/sparse-checkout.c:225 -msgid "failed to create directory for sparse-checkout file" -msgstr "無法建立稀疏簽出檔案的目錄" - -#: builtin/sparse-checkout.c:266 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "無法設定 extensions.worktreeConfig 設定" - -#: builtin/sparse-checkout.c:283 -msgid "git sparse-checkout init [--cone]" -msgstr "git sparse-checkout init [--cone]" - -#: builtin/sparse-checkout.c:302 -msgid "initialize the sparse-checkout in cone mode" -msgstr "以 cone 模式初始化稀疏簽出" - -#: builtin/sparse-checkout.c:308 -msgid "initialize sparse-checkout" -msgstr "初始化稀疏簽出" - -#: builtin/sparse-checkout.c:341 -#, c-format -msgid "failed to open '%s'" -msgstr "無法開啟「%s」" - -#: builtin/sparse-checkout.c:398 -#, c-format -msgid "could not normalize path %s" -msgstr "無法標準化路徑 %s" - -#: builtin/sparse-checkout.c:410 -msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" -msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)" - -#: builtin/sparse-checkout.c:435 -#, c-format -msgid "unable to unquote C-style string '%s'" -msgstr "無法去掉 '%s' C 樣式字串的引號" - -#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 -msgid "unable to load existing sparse-checkout patterns" -msgstr "無法載入現存的稀疏簽出樣式" - -#: builtin/sparse-checkout.c:558 -msgid "read patterns from standard in" -msgstr "從標準輸入讀取樣式" - -#: builtin/sparse-checkout.c:564 -msgid "set sparse-checkout patterns" -msgstr "設定稀疏簽出樣式" - -#: builtin/sparse-checkout.c:581 -msgid "disable sparse-checkout" -msgstr "停用稀疏簽出" - -#: builtin/sparse-checkout.c:593 -msgid "error while refreshing working directory" -msgstr "重新整理工作目錄時發生錯誤" - -#: builtin/stash.c:22 builtin/stash.c:38 -msgid "git stash list [<options>]" -msgstr "git stash list [<選項>]" - -#: builtin/stash.c:23 builtin/stash.c:43 -msgid "git stash show [<options>] [<stash>]" -msgstr "git stash show [<選項>] [<stash>]" - -#: builtin/stash.c:24 builtin/stash.c:48 -msgid "git stash drop [-q|--quiet] [<stash>]" -msgstr "git stash drop [-q|--quiet] [<stash>]" - -#: builtin/stash.c:25 -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" - -#: builtin/stash.c:26 builtin/stash.c:63 -msgid "git stash branch <branchname> [<stash>]" -msgstr "git stash branch <分支名> [<stash>]" - -#: builtin/stash.c:27 builtin/stash.c:68 -msgid "git stash clear" -msgstr "git stash clear" - -#: builtin/stash.c:28 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <訊息>]\n" -" [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n" -" [--] [<路徑規格>...]]" - -#: builtin/stash.c:32 builtin/stash.c:85 -msgid "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<message>]" -msgstr "" -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [<消息>]" - -#: builtin/stash.c:53 -msgid "git stash pop [--index] [-q|--quiet] [<stash>]" -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" - -#: builtin/stash.c:58 -msgid "git stash apply [--index] [-q|--quiet] [<stash>]" -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" - -#: builtin/stash.c:73 -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" -msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" - -#: builtin/stash.c:78 -msgid "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -" [--] [<pathspec>...]]" -msgstr "" -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" -" [--] [<路徑規格>...]]" - -#: builtin/stash.c:128 -#, c-format -msgid "'%s' is not a stash-like commit" -msgstr "'%s' 不像是一個儲藏提交" - -#: builtin/stash.c:148 -#, c-format -msgid "Too many revisions specified:%s" -msgstr "指定了太多的版本：%s" - -#: builtin/stash.c:162 git-legacy-stash.sh:549 -msgid "No stash entries found." -msgstr "未發現儲藏條目。" - -#: builtin/stash.c:176 -#, c-format -msgid "%s is not a valid reference" -msgstr "%s 不是一個有效的引用名" - -#: builtin/stash.c:225 git-legacy-stash.sh:75 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear 不支援參數" - -#: builtin/stash.c:404 -msgid "cannot apply a stash in the middle of a merge" -msgstr "無法在合併過程套用儲藏" - -#: builtin/stash.c:415 -#, c-format -msgid "could not generate diff %s^!." -msgstr "無法生成差異 %s^!." - -#: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." -msgstr "索引中有衝突。嘗試不用 --index。" - -#: builtin/stash.c:428 -msgid "could not save index tree" -msgstr "不能儲存索引樹" - -#: builtin/stash.c:437 -msgid "could not restore untracked files from stash" -msgstr "無法從儲藏條目中復原未追蹤檔案" - -#: builtin/stash.c:451 -#, c-format -msgid "Merging %s with %s" -msgstr "正在合併 %s 和 %s" - -#: builtin/stash.c:461 git-legacy-stash.sh:681 -msgid "Index was not unstashed." -msgstr "索引未從儲藏中復原。" - -#: builtin/stash.c:522 builtin/stash.c:621 -msgid "attempt to recreate the index" -msgstr "嘗試重建索引" - -#: builtin/stash.c:555 -#, c-format -msgid "Dropped %s (%s)" -msgstr "捨棄了 %s（%s）" - -#: builtin/stash.c:558 -#, c-format -msgid "%s: Could not drop stash entry" -msgstr "%s：無法捨棄儲藏條目" - -#: builtin/stash.c:583 -#, c-format -msgid "'%s' is not a stash reference" -msgstr "'%s' 不是一個儲藏引用" - -#: builtin/stash.c:633 git-legacy-stash.sh:695 -msgid "The stash entry is kept in case you need it again." -msgstr "儲藏條目被保留以備您再次需要。" - -#: builtin/stash.c:656 git-legacy-stash.sh:713 -msgid "No branch name specified" -msgstr "未指定分支名" - -#: builtin/stash.c:796 builtin/stash.c:833 -#, c-format -msgid "Cannot update %s with %s" -msgstr "無法用 %2$s 更新 %1$s" - -#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 -msgid "stash message" -msgstr "儲藏說明" - -#: builtin/stash.c:824 -msgid "\"git stash store\" requires one <commit> argument" -msgstr "\"git stash store\" 需要一個 <提交> 參數" - -#: builtin/stash.c:1049 git-legacy-stash.sh:218 -msgid "No changes selected" -msgstr "沒有選擇變更" - -#: builtin/stash.c:1149 git-legacy-stash.sh:150 -msgid "You do not have the initial commit yet" -msgstr "您尚未建立初始提交" - -#: builtin/stash.c:1176 git-legacy-stash.sh:165 -msgid "Cannot save the current index state" -msgstr "無法儲存目前索引狀態" - -#: builtin/stash.c:1185 git-legacy-stash.sh:180 -msgid "Cannot save the untracked files" -msgstr "無法儲存未追蹤檔案" - -#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 -#: git-legacy-stash.sh:214 -msgid "Cannot save the current worktree state" -msgstr "無法儲存目前工作區狀態" - -#: builtin/stash.c:1233 git-legacy-stash.sh:234 -msgid "Cannot record working tree state" -msgstr "不能記錄工作區狀態" - -#: builtin/stash.c:1282 git-legacy-stash.sh:338 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" - -#: builtin/stash.c:1298 -msgid "Did you forget to 'git add'?" -msgstr "您是否忘了執行 'git add'？" - -#: builtin/stash.c:1313 git-legacy-stash.sh:346 -msgid "No local changes to save" -msgstr "沒有要儲存的本機修改" - -#: builtin/stash.c:1320 git-legacy-stash.sh:351 -msgid "Cannot initialize stash" -msgstr "無法初始化儲藏" - -#: builtin/stash.c:1335 git-legacy-stash.sh:355 -msgid "Cannot save the current status" -msgstr "無法儲存目前狀態" - -#: builtin/stash.c:1340 -#, c-format -msgid "Saved working directory and index state %s" -msgstr "儲存工作目錄和索引狀態 %s" - -#: builtin/stash.c:1430 git-legacy-stash.sh:385 -msgid "Cannot remove worktree changes" -msgstr "無法刪除工作區變更" - -#: builtin/stash.c:1469 builtin/stash.c:1534 -msgid "keep index" -msgstr "保持索引" - -#: builtin/stash.c:1471 builtin/stash.c:1536 -msgid "stash in patch mode" -msgstr "以修補檔模式儲藏" - -#: builtin/stash.c:1472 builtin/stash.c:1537 -msgid "quiet mode" -msgstr "靜默模式" - -#: builtin/stash.c:1474 builtin/stash.c:1539 -msgid "include untracked files in stash" -msgstr "儲藏中包含未追蹤檔案" - -#: builtin/stash.c:1476 builtin/stash.c:1541 -msgid "include ignore files" -msgstr "包含忽略的檔案" - -#: builtin/stash.c:1600 -#, c-format -msgid "could not exec %s" -msgstr "不能執行 %s" - -#: builtin/stripspace.c:18 -msgid "git stripspace [-s | --strip-comments]" -msgstr "git stripspace [-s | --strip-comments]" - -#: builtin/stripspace.c:19 -msgid "git stripspace [-c | --comment-lines]" -msgstr "git stripspace [-c | --comment-lines]" - -#: builtin/stripspace.c:37 -msgid "skip and remove all lines starting with comment character" -msgstr "跳過和移除所有的備註行" - -#: builtin/stripspace.c:40 -msgid "prepend comment character and space to each line" -msgstr "為每一行的行首新增備註符和空格" - -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 -#, c-format -msgid "Expecting a full ref name, got %s" -msgstr "期望一個完整的引用名稱，卻得到 %s" - -#: builtin/submodule--helper.c:64 -msgid "submodule--helper print-default-remote takes no arguments" -msgstr "submodule--helper print-default-remote 不帶參數" - -#: builtin/submodule--helper.c:102 -#, c-format -msgid "cannot strip one component off url '%s'" -msgstr "無法從 url '%s' 剝離一個元件" - -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 -msgid "alternative anchor for relative paths" -msgstr "相對路徑的替代錨記（anchor）" - -#: builtin/submodule--helper.c:415 -msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]" - -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 -#, c-format -msgid "No url found for submodule path '%s' in .gitmodules" -msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url" - -#: builtin/submodule--helper.c:524 -#, c-format -msgid "Entering '%s'\n" -msgstr "進入 '%s'\n" - -#: builtin/submodule--helper.c:527 -#, c-format -msgid "" -"run_command returned non-zero status for %s\n" -"." -msgstr "" -"對 %s 執行 run_command 返回非零值。\n" -"." - -#: builtin/submodule--helper.c:549 -#, c-format -msgid "" -"run_command returned non-zero status while recursing in the nested " -"submodules of %s\n" -"." -msgstr "" -"在遞迴 %s 的子模組執行 run_command 時返回非零值。\n" -"." - -#: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" -msgstr "阻止進入每一個子模組指令的輸出" - -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 -msgid "Recurse into nested submodules" -msgstr "遞迴進入嵌套子模組中" - -#: builtin/submodule--helper.c:572 -msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <指令>" - -#: builtin/submodule--helper.c:599 -#, c-format -msgid "" -"could not look up configuration '%s'. Assuming this repository is its own " -"authoritative upstream." -msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" - -#: builtin/submodule--helper.c:667 -#, c-format -msgid "Failed to register url for submodule path '%s'" -msgstr "無法為子模組 '%s' 註冊 url" - -#: builtin/submodule--helper.c:671 -#, c-format -msgid "Submodule '%s' (%s) registered for path '%s'\n" -msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n" - -#: builtin/submodule--helper.c:681 -#, c-format -msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "警告：建議子模組 '%s' 使用指令更新模式\n" - -#: builtin/submodule--helper.c:688 -#, c-format -msgid "Failed to register update mode for submodule path '%s'" -msgstr "無法為子模組 '%s' 註冊更新模式" - -#: builtin/submodule--helper.c:710 -msgid "Suppress output for initializing a submodule" -msgstr "阻止子模組初始化的輸出" - -#: builtin/submodule--helper.c:715 -msgid "git submodule--helper init [<options>] [<path>]" -msgstr "git submodule--helper init [<選項>] [<路徑>]" - -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 -#, c-format -msgid "no submodule mapping found in .gitmodules for path '%s'" -msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" - -#: builtin/submodule--helper.c:837 -#, c-format -msgid "could not resolve HEAD ref inside the submodule '%s'" -msgstr "無法解析子模組 '%s' 的 HEAD 引用" - -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 -#, c-format -msgid "failed to recurse into submodule '%s'" -msgstr "遞迴子模組 '%s' 失敗" - -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 -msgid "Suppress submodule status output" -msgstr "阻止子模組狀態輸出" - -#: builtin/submodule--helper.c:889 -msgid "" -"Use commit stored in the index instead of the one stored in the submodule " -"HEAD" -msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交" - -#: builtin/submodule--helper.c:890 -msgid "recurse into nested submodules" -msgstr "遞迴進入嵌套子模組中" - -#: builtin/submodule--helper.c:895 -msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" -msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" - -#: builtin/submodule--helper.c:919 -msgid "git submodule--helper name <path>" -msgstr "git submodule--helper name <路徑>" - -#: builtin/submodule--helper.c:983 -#, c-format -msgid "Synchronizing submodule url for '%s'\n" -msgstr "為 '%s' 同步子模組 url\n" - -#: builtin/submodule--helper.c:989 -#, c-format -msgid "failed to register url for submodule path '%s'" -msgstr "無法為子模組路徑 '%s' 註冊 url" - -#: builtin/submodule--helper.c:1003 -#, c-format -msgid "failed to get the default remote for submodule '%s'" -msgstr "無法得到子模組 '%s' 的預設遠端關聯" - -#: builtin/submodule--helper.c:1014 -#, c-format -msgid "failed to update remote for submodule '%s'" -msgstr "無法為子模組 '%s' 更新遠端關聯" - -#: builtin/submodule--helper.c:1061 -msgid "Suppress output of synchronizing submodule url" -msgstr "阻止子模組 url 同步的輸出" - -#: builtin/submodule--helper.c:1068 -msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" -msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" - -#: builtin/submodule--helper.c:1122 -#, c-format -msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " -"really want to remove it including all of its history)" -msgstr "" -"子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " -"-rf' 指令）" - -#: builtin/submodule--helper.c:1134 -#, c-format -msgid "" -"Submodule work tree '%s' contains local modifications; use '-f' to discard " -"them" -msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" - -#: builtin/submodule--helper.c:1142 -#, c-format -msgid "Cleared directory '%s'\n" -msgstr "已清除目錄 '%s'\n" - -#: builtin/submodule--helper.c:1144 -#, c-format -msgid "Could not remove submodule work tree '%s'\n" -msgstr "無法移除子模組工作區 '%s'\n" - -#: builtin/submodule--helper.c:1155 -#, c-format -msgid "could not create empty submodule directory %s" -msgstr "不能建立空的子模組目錄 %s" - -#: builtin/submodule--helper.c:1171 -#, c-format -msgid "Submodule '%s' (%s) unregistered for path '%s'\n" -msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" - -#: builtin/submodule--helper.c:1200 -msgid "Remove submodule working trees even if they contain local changes" -msgstr "刪除子模組工作區，即使包含本機修改" - -#: builtin/submodule--helper.c:1201 -msgid "Unregister all submodules" -msgstr "將所有子模組取消註冊" - -#: builtin/submodule--helper.c:1206 -msgid "" -"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" -msgstr "" -"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" - -#: builtin/submodule--helper.c:1220 -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "如果您確實想要對所有子模組執行取消初始化，請使用 '--all'" - -#: builtin/submodule--helper.c:1289 -msgid "" -"An alternate computed from a superproject's alternate is invalid.\n" -"To allow Git to clone without an alternate in such a case, set\n" -"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" -"'--reference-if-able' instead of '--reference'." -msgstr "" -"從上級專案的備用版本庫計算得出的備用版本庫無效。\n" -"這種情況下，請設定 submodule.alternateErrorStrategy 為 'info'\n" -"以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" -"而非 '--reference' 複製。" - -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 -#, c-format -msgid "submodule '%s' cannot add alternate: %s" -msgstr "子模組 '%s' 不能新增版本庫備選：%s" - -#: builtin/submodule--helper.c:1367 -#, c-format -msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" -msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" - -#: builtin/submodule--helper.c:1374 -#, c-format -msgid "Value '%s' for submodule.alternateLocation is not recognized" -msgstr "不能識別 submodule.alternateLocaion 的取值 '%s'" - -#: builtin/submodule--helper.c:1398 -msgid "where the new submodule will be cloned to" -msgstr "新的子模組將要複製的路徑" - -#: builtin/submodule--helper.c:1401 -msgid "name of the new submodule" -msgstr "新子模組的名稱" - -#: builtin/submodule--helper.c:1404 -msgid "url where to clone the submodule from" -msgstr "複製子模組的 url 位址" - -#: builtin/submodule--helper.c:1412 -msgid "depth for shallow clones" -msgstr "淺複製的深度" - -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 -msgid "force cloning progress" -msgstr "強制顯示複製進度" - -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 -msgid "disallow cloning into non-empty directory" -msgstr "不允許複製至非空白目錄" - -#: builtin/submodule--helper.c:1424 -msgid "" -"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " -"<url> --path <path>" -msgstr "" -"git submodule--helper clone [--prefix=<路徑>] [--quiet] [--reference <版本庫" -">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路" -"徑>" - -#: builtin/submodule--helper.c:1449 -#, c-format -msgid "refusing to create/use '%s' in another submodule's git dir" -msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" - -#: builtin/submodule--helper.c:1460 -#, c-format -msgid "clone of '%s' into submodule path '%s' failed" -msgstr "無法複製 '%s' 到子模組路徑 '%s'" - -#: builtin/submodule--helper.c:1464 -#, c-format -msgid "directory not empty: '%s'" -msgstr "目錄不是空的：「%s」" - -#: builtin/submodule--helper.c:1476 -#, c-format -msgid "could not get submodule directory for '%s'" -msgstr "無法得到 '%s' 的子模組目錄" - -#: builtin/submodule--helper.c:1512 -#, c-format -msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" - -#: builtin/submodule--helper.c:1516 -#, c-format -msgid "Invalid update mode '%s' configured for submodule path '%s'" -msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" - -#: builtin/submodule--helper.c:1617 -#, c-format -msgid "Submodule path '%s' not initialized" -msgstr "子模組 '%s' 尚未初始化" - -#: builtin/submodule--helper.c:1621 -msgid "Maybe you want to use 'update --init'?" -msgstr "也許您想要執行 'update --init'？" - -#: builtin/submodule--helper.c:1651 -#, c-format -msgid "Skipping unmerged submodule %s" -msgstr "略過未合併的子模組 %s" - -#: builtin/submodule--helper.c:1680 -#, c-format -msgid "Skipping submodule '%s'" -msgstr "略過子模組 '%s'" - -#: builtin/submodule--helper.c:1830 -#, c-format -msgid "Failed to clone '%s'. Retry scheduled" -msgstr "複製 '%s' 失敗。按計劃重試" - -#: builtin/submodule--helper.c:1841 -#, c-format -msgid "Failed to clone '%s' a second time, aborting" -msgstr "第二次嘗試複製 '%s' 失敗，離開" - -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 -msgid "path into the working tree" -msgstr "到工作區的路徑" - -#: builtin/submodule--helper.c:1906 -msgid "path into the working tree, across nested submodule boundaries" -msgstr "工作區中的路徑，遞迴嵌套子模組" - -#: builtin/submodule--helper.c:1910 -msgid "rebase, merge, checkout or none" -msgstr "rebase、merge、checkout 或 none" - -#: builtin/submodule--helper.c:1916 -msgid "Create a shallow clone truncated to the specified number of revisions" -msgstr "建立一個指定深度的淺複製" - -#: builtin/submodule--helper.c:1919 -msgid "parallel jobs" -msgstr "並發任務" - -#: builtin/submodule--helper.c:1921 -msgid "whether the initial clone should follow the shallow recommendation" -msgstr "初始複製是否應該遵守推薦的淺複製選項" - -#: builtin/submodule--helper.c:1922 -msgid "don't print cloning progress" -msgstr "不要輸出複製進度" - -#: builtin/submodule--helper.c:1933 -msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" - -#: builtin/submodule--helper.c:1946 -msgid "bad value for update parameter" -msgstr "update 參數取值錯誤" - -#: builtin/submodule--helper.c:1994 -#, c-format -msgid "" -"Submodule (%s) branch configured to inherit branch from superproject, but " -"the superproject is not on any branch" -msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上" - -#: builtin/submodule--helper.c:2117 -#, c-format -msgid "could not get a repository handle for submodule '%s'" -msgstr "無法獲得子模組 '%s' 的版本庫句柄" - -#: builtin/submodule--helper.c:2150 -msgid "recurse into submodules" -msgstr "在子模組中遞迴" - -#: builtin/submodule--helper.c:2156 -msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" -msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" - -#: builtin/submodule--helper.c:2212 -msgid "check if it is safe to write to the .gitmodules file" -msgstr "檢查寫入 .gitmodules 檔案是否安全" - -#: builtin/submodule--helper.c:2215 -msgid "unset the config in the .gitmodules file" -msgstr "取消 .gitmodules 檔案中的設定" - -#: builtin/submodule--helper.c:2220 -msgid "git submodule--helper config <name> [<value>]" -msgstr "git submodule--helper config <名稱> [<值>]" - -#: builtin/submodule--helper.c:2221 -msgid "git submodule--helper config --unset <name>" -msgstr "git submodule--helper config --unset <名稱>" - -#: builtin/submodule--helper.c:2222 -msgid "git submodule--helper config --check-writeable" -msgstr "git submodule--helper config --check-writeable" - -#: builtin/submodule--helper.c:2241 git-submodule.sh:174 -#, sh-format -msgid "please make sure that the .gitmodules file is in the working tree" -msgstr "請確認 .gitmodules 檔案在工作區裡" - -#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s 不支援 --super-prefix" - -#: builtin/submodule--helper.c:2297 -#, c-format -msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' 不是一個有效的 submodule--helper 子指令" - -#: builtin/symbolic-ref.c:8 -msgid "git symbolic-ref [<options>] <name> [<ref>]" -msgstr "git symbolic-ref [<選項>] <名稱> [<引用>]" - -#: builtin/symbolic-ref.c:9 -msgid "git symbolic-ref -d [-q] <name>" -msgstr "git symbolic-ref -d [-q] <名稱>" - -#: builtin/symbolic-ref.c:40 -msgid "suppress error message for non-symbolic (detached) refs" -msgstr "不顯示非符號（分離的）引用的錯誤訊息" - -#: builtin/symbolic-ref.c:41 -msgid "delete symbolic ref" -msgstr "刪除符號引用" - -#: builtin/symbolic-ref.c:42 -msgid "shorten ref output" -msgstr "縮短引用輸出" - -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 -msgid "reason" -msgstr "原因" - -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 -msgid "reason of the update" -msgstr "更新的原因" - -#: builtin/tag.c:25 -msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" -"\t\t<tagname> [<head>]" -msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n" -"\t\t<標籤名> [<頭>]" - -#: builtin/tag.c:27 -msgid "git tag -d <tagname>..." -msgstr "git tag -d <標籤名>..." - -#: builtin/tag.c:28 -msgid "" -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" -"points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" -msgstr "" -"git tag -l [-n[<數字>]] [--contains <提交>] [--no-contains <提交>] [--points-" -"at <物件>]\n" -"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" - -#: builtin/tag.c:30 -msgid "git tag -v [--format=<format>] <tagname>..." -msgstr "git tag -v [--format=<格式>] <標籤名>..." - -#: builtin/tag.c:89 -#, c-format -msgid "tag '%s' not found." -msgstr "未發現標籤 '%s'。" - -#: builtin/tag.c:105 -#, c-format -msgid "Deleted tag '%s' (was %s)\n" -msgstr "已刪除標籤 '%s'（曾為 %s）\n" - -#: builtin/tag.c:135 -#, c-format -msgid "" -"\n" -"Write a message for tag:\n" -" %s\n" -"Lines starting with '%c' will be ignored.\n" -msgstr "" -"\n" -"輸入一個標籤說明：\n" -" %s\n" -"以 '%c' 開頭的行將被忽略。\n" - -#: builtin/tag.c:139 -#, c-format -msgid "" -"\n" -"Write a message for tag:\n" -" %s\n" -"Lines starting with '%c' will be kept; you may remove them yourself if you " -"want to.\n" -msgstr "" -"\n" -"輸入一個標籤說明：\n" -" %s\n" -"以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n" - -#: builtin/tag.c:198 -msgid "unable to sign the tag" -msgstr "無法簽署標籤" - -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "無法寫標籤檔案" - -#: builtin/tag.c:216 -#, c-format -msgid "" -"You have created a nested tag. The object referred to by your new tag is\n" -"already a tag. If you meant to tag the object that it points to, use:\n" -"\n" -"\tgit tag -f %s %s^{}" -msgstr "" -"您建立了一個嵌套的標籤。您的新標籤指向的物件已經是一個標籤。如果您想要\n" -"對其指向的目標建立標籤，使用：\n" -"\n" -"\tgit tag -f %s %s^{}" - -#: builtin/tag.c:232 -msgid "bad object type." -msgstr "壞的物件類型。" - -#: builtin/tag.c:284 -msgid "no tag message?" -msgstr "無標籤說明？" - -#: builtin/tag.c:291 -#, c-format -msgid "The tag message has been left in %s\n" -msgstr "標籤說明被保留在 %s\n" - -#: builtin/tag.c:402 -msgid "list tag names" -msgstr "列出標籤名稱" - -#: builtin/tag.c:404 -msgid "print <n> lines of each tag message" -msgstr "每個標籤訊息列印 <n> 行" - -#: builtin/tag.c:406 -msgid "delete tags" -msgstr "刪除標籤" - -#: builtin/tag.c:407 -msgid "verify tags" -msgstr "驗證標籤" - -#: builtin/tag.c:409 -msgid "Tag creation options" -msgstr "標籤建立選項" - -#: builtin/tag.c:411 -msgid "annotated tag, needs a message" -msgstr "附註標籤，需要一個說明" - -#: builtin/tag.c:413 -msgid "tag message" -msgstr "標籤說明" - -#: builtin/tag.c:415 -msgid "force edit of tag message" -msgstr "強制編輯標籤說明" - -#: builtin/tag.c:416 -msgid "annotated and GPG-signed tag" -msgstr "附註並附加 GPG 簽名的標籤" - -#: builtin/tag.c:419 -msgid "use another key to sign the tag" -msgstr "使用另外的私鑰簽名該標籤" - -#: builtin/tag.c:420 -msgid "replace the tag if exists" -msgstr "如果存在，取代現有的標籤" - -#: builtin/tag.c:421 builtin/update-ref.c:369 -msgid "create a reflog" -msgstr "建立引用日誌" - -#: builtin/tag.c:423 -msgid "Tag listing options" -msgstr "標籤列表選項" - -#: builtin/tag.c:424 -msgid "show tag list in columns" -msgstr "以列的方式顯示標籤列表" - -#: builtin/tag.c:425 builtin/tag.c:427 -msgid "print only tags that contain the commit" -msgstr "只列印包含該提交的標籤" - -#: builtin/tag.c:426 builtin/tag.c:428 -msgid "print only tags that don't contain the commit" -msgstr "只列印不包含該提交的標籤" - -#: builtin/tag.c:429 -msgid "print only tags that are merged" -msgstr "只列印已經合併的標籤" - -#: builtin/tag.c:430 -msgid "print only tags that are not merged" -msgstr "只列印尚未合併的標籤" - -#: builtin/tag.c:434 -msgid "print only tags of the object" -msgstr "只列印指向該物件的標籤" - -#: builtin/tag.c:482 -msgid "--column and -n are incompatible" -msgstr "--column 和 -n 不相容" - -#: builtin/tag.c:504 -msgid "-n option is only allowed in list mode" -msgstr "-n 選項只允許用在列表顯示模式" - -#: builtin/tag.c:506 -msgid "--contains option is only allowed in list mode" -msgstr "--contains 選項只允許用在列表顯示模式" - -#: builtin/tag.c:508 -msgid "--no-contains option is only allowed in list mode" -msgstr "--no-contains 選項只允許用在列表顯示模式" - -#: builtin/tag.c:510 -msgid "--points-at option is only allowed in list mode" -msgstr "--points-at 選項只允許用在列表顯示模式" - -#: builtin/tag.c:512 -msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式" - -#: builtin/tag.c:523 -msgid "only one -F or -m option is allowed." -msgstr "只允許一個 -F 或 -m 選項。" - -#: builtin/tag.c:542 -msgid "too many params" -msgstr "太多參數" - -#: builtin/tag.c:548 -#, c-format -msgid "'%s' is not a valid tag name." -msgstr "'%s' 不是一個有效的標籤名稱。" - -#: builtin/tag.c:553 -#, c-format -msgid "tag '%s' already exists" -msgstr "標籤 '%s' 已存在" - -#: builtin/tag.c:584 -#, c-format -msgid "Updated tag '%s' (was %s)\n" -msgstr "已更新標籤 '%s'（曾為 %s）\n" - -#: builtin/unpack-objects.c:502 -msgid "Unpacking objects" -msgstr "展開物件中" - -#: builtin/update-index.c:84 -#, c-format -msgid "failed to create directory %s" -msgstr "建立目錄 %s 失敗" - -#: builtin/update-index.c:100 -#, c-format -msgid "failed to create file %s" -msgstr "建立檔案 %s 失敗" - -#: builtin/update-index.c:108 -#, c-format -msgid "failed to delete file %s" -msgstr "刪除檔案 %s 失敗" - -#: builtin/update-index.c:115 builtin/update-index.c:221 -#, c-format -msgid "failed to delete directory %s" -msgstr "刪除目錄 %s 失敗" - -#: builtin/update-index.c:140 -#, c-format -msgid "Testing mtime in '%s' " -msgstr "在 '%s' 中測試 mtime " - -#: builtin/update-index.c:154 -msgid "directory stat info does not change after adding a new file" -msgstr "新增一個新檔案後，目錄的狀態訊息未改變" - -#: builtin/update-index.c:167 -msgid "directory stat info does not change after adding a new directory" -msgstr "新增一個新目錄後，目錄的狀態訊息未改變" - -#: builtin/update-index.c:180 -msgid "directory stat info changes after updating a file" -msgstr "更新一個檔案後，目錄的狀態訊息被修改" - -#: builtin/update-index.c:191 -msgid "directory stat info changes after adding a file inside subdirectory" -msgstr "在子目錄中新增檔案後，目錄的狀態訊息被修改" - -#: builtin/update-index.c:202 -msgid "directory stat info does not change after deleting a file" -msgstr "刪除一個檔案後，目錄的狀態訊息未改變" - -#: builtin/update-index.c:215 -msgid "directory stat info does not change after deleting a directory" -msgstr "刪除一個目錄後，目錄的狀態訊息未改變" - -#: builtin/update-index.c:222 -msgid " OK" -msgstr " OK" - -#: builtin/update-index.c:591 -msgid "git update-index [<options>] [--] [<file>...]" -msgstr "git update-index [<選項>] [--] [<檔案>...]" - -#: builtin/update-index.c:974 -msgid "continue refresh even when index needs update" -msgstr "當索引需要更新時繼續重新整理" - -#: builtin/update-index.c:977 -msgid "refresh: ignore submodules" -msgstr "重新整理：忽略子模組" - -#: builtin/update-index.c:980 -msgid "do not ignore new files" -msgstr "不忽略新的檔案" - -#: builtin/update-index.c:982 -msgid "let files replace directories and vice-versa" -msgstr "讓檔案取代目錄（反之亦然）" - -#: builtin/update-index.c:984 -msgid "notice files missing from worktree" -msgstr "通知檔案從工作區遺失" - -#: builtin/update-index.c:986 -msgid "refresh even if index contains unmerged entries" -msgstr "即使索引區包含未合併的條目也執行重新整理" - -#: builtin/update-index.c:989 -msgid "refresh stat information" -msgstr "重新整理統計訊息" - -#: builtin/update-index.c:993 -msgid "like --refresh, but ignore assume-unchanged setting" -msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定" - -#: builtin/update-index.c:997 -msgid "<mode>,<object>,<path>" -msgstr "<存取模式>,<物件>,<路徑>" - -#: builtin/update-index.c:998 -msgid "add the specified entry to the index" -msgstr "新增指定的條目到索引區" - -#: builtin/update-index.c:1008 -msgid "mark files as \"not changing\"" -msgstr "把檔案標記為 \"沒有變更\"" - -#: builtin/update-index.c:1011 -msgid "clear assumed-unchanged bit" -msgstr "清除 assumed-unchanged 位" - -#: builtin/update-index.c:1014 -msgid "mark files as \"index-only\"" -msgstr "把檔案標記為 \"僅索引\"" - -#: builtin/update-index.c:1017 -msgid "clear skip-worktree bit" -msgstr "清除 skip-worktree 位" - -#: builtin/update-index.c:1020 -msgid "do not touch index-only entries" -msgstr "不要建立只有索引的項目" - -#: builtin/update-index.c:1022 -msgid "add to index only; do not add content to object database" -msgstr "只新增到索引區；不新增物件到物件庫" - -#: builtin/update-index.c:1024 -msgid "remove named paths even if present in worktree" -msgstr "即使存在工作區裡，也刪除路徑" - -#: builtin/update-index.c:1026 -msgid "with --stdin: input lines are terminated by null bytes" -msgstr "攜帶 --stdin：輸入的行以 null 字元終止" - -#: builtin/update-index.c:1028 -msgid "read list of paths to be updated from standard input" -msgstr "從標準輸入中讀取需要更新的路徑列表" - -#: builtin/update-index.c:1032 -msgid "add entries from standard input to the index" -msgstr "從標準輸入新增條目到索引區" - -#: builtin/update-index.c:1036 -msgid "repopulate stages #2 and #3 for the listed paths" -msgstr "為指定檔案重新生成第2和第3暫存區" - -#: builtin/update-index.c:1040 -msgid "only update entries that differ from HEAD" -msgstr "只更新與 HEAD 不同的條目" - -#: builtin/update-index.c:1044 -msgid "ignore files missing from worktree" -msgstr "忽略工作區遺失的檔案" - -#: builtin/update-index.c:1047 -msgid "report actions to standard output" -msgstr "在標準輸出顯示動作" - -#: builtin/update-index.c:1049 -msgid "(for porcelains) forget saved unresolved conflicts" -msgstr "(for porcelains) 忘記儲存的未解決的衝突" - -#: builtin/update-index.c:1053 -msgid "write index in this format" -msgstr "以這種格式寫入索引區" - -#: builtin/update-index.c:1055 -msgid "enable or disable split index" -msgstr "啟用或禁用索引分割" - -#: builtin/update-index.c:1057 -msgid "enable/disable untracked cache" -msgstr "啟用/禁用對未追蹤檔案的快取" - -#: builtin/update-index.c:1059 -msgid "test if the filesystem supports untracked cache" -msgstr "測試檔案系統是否支援未追蹤檔案快取" - -#: builtin/update-index.c:1061 -msgid "enable untracked cache without testing the filesystem" -msgstr "無需檢測檔案系統，啟用對未追蹤檔案的快取" - -#: builtin/update-index.c:1063 -msgid "write out the index even if is not flagged as changed" -msgstr "即使沒有被標記為已更改，也要寫出索引" - -#: builtin/update-index.c:1065 -msgid "enable or disable file system monitor" -msgstr "啟用或禁用檔案系統監控" - -#: builtin/update-index.c:1067 -msgid "mark files as fsmonitor valid" -msgstr "標記檔案為 fsmonitor 有效" - -#: builtin/update-index.c:1070 -msgid "clear fsmonitor valid bit" -msgstr "清除 fsmonitor 有效位" - -#: builtin/update-index.c:1173 -msgid "" -"core.splitIndex is set to false; remove or change it, if you really want to " -"enable split index" -msgstr "" -"core.splitIndex 被設定為 false。如果您確實要啟用索引分割，請刪除或修改它。" - -#: builtin/update-index.c:1182 -msgid "" -"core.splitIndex is set to true; remove or change it, if you really want to " -"disable split index" -msgstr "" -"core.splitIndex 被設定為 true。如果您確實要禁用索引分割，請刪除或修改它。" - -#: builtin/update-index.c:1194 -msgid "" -"core.untrackedCache is set to true; remove or change it, if you really want " -"to disable the untracked cache" -msgstr "" -"core.untrackedCache 被設定為 true。如果您確實要禁用未追蹤檔案快取，請刪除或修" -"改它。" - -#: builtin/update-index.c:1198 -msgid "Untracked cache disabled" -msgstr "快取未追蹤檔案被禁用" - -#: builtin/update-index.c:1206 -msgid "" -"core.untrackedCache is set to false; remove or change it, if you really want " -"to enable the untracked cache" -msgstr "" -"core.untrackedCache 被設定為 false。如果您確實要啟用未追蹤檔案快取，請刪除或" -"修改它。" - -#: builtin/update-index.c:1210 -#, c-format -msgid "Untracked cache enabled for '%s'" -msgstr "快取未追蹤檔案在 '%s' 啟用" - -#: builtin/update-index.c:1218 -msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" -msgstr "core.fsmonitor 未設定；如果想要啟用 fsmonitor 請設定該選項" - -#: builtin/update-index.c:1222 -msgid "fsmonitor enabled" -msgstr "fsmonitor 被啟用" - -#: builtin/update-index.c:1225 -msgid "" -"core.fsmonitor is set; remove it if you really want to disable fsmonitor" -msgstr "core.fsmonitor 已設定；如果想要禁用 fsmonitor 請移除該選項" - -#: builtin/update-index.c:1229 -msgid "fsmonitor disabled" -msgstr "fsmonitor 被禁用" - -#: builtin/update-ref.c:10 -msgid "git update-ref [<options>] -d <refname> [<old-val>]" -msgstr "git update-ref [<選項>] -d <引用名> [<舊值>]" - -#: builtin/update-ref.c:11 -msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" -msgstr "git update-ref [<選項>] <引用名> <新值> [<舊值>]" - -#: builtin/update-ref.c:12 -msgid "git update-ref [<options>] --stdin [-z]" -msgstr "git update-ref [<選項>] --stdin [-z]" - -#: builtin/update-ref.c:364 -msgid "delete the reference" -msgstr "刪除引用" - -#: builtin/update-ref.c:366 -msgid "update <refname> not the one it points to" -msgstr "更新 <引用名> 本身而不是它指向的引用" - -#: builtin/update-ref.c:367 -msgid "stdin has NUL-terminated arguments" -msgstr "標準輸入有以 NUL 字元終止的參數" - -#: builtin/update-ref.c:368 -msgid "read updates from stdin" -msgstr "從標準輸入讀取更新" - -#: builtin/update-server-info.c:7 -msgid "git update-server-info [--force]" -msgstr "git update-server-info [--force]" - -#: builtin/update-server-info.c:15 -msgid "update the info files from scratch" -msgstr "從頭開始更新檔案訊息" - -#: builtin/upload-pack.c:11 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<選項>] <目錄>" - -#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 -msgid "quit after a single request/response exchange" -msgstr "在一次單獨的請求/回應之後離開" - -#: builtin/upload-pack.c:25 -msgid "exit immediately after initial ref advertisement" -msgstr "在初始的引用廣告後立即離開" - -#: builtin/upload-pack.c:27 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "如果 <目錄> 不是一個 Git 目錄，不要嘗試 <目錄>/.git/" - -#: builtin/upload-pack.c:29 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "不活動 <n> 秒鐘後終止傳輸" - -#: builtin/verify-commit.c:19 -msgid "git verify-commit [-v | --verbose] <commit>..." -msgstr "git verify-commit [-v | --verbose] <提交>..." - -#: builtin/verify-commit.c:68 -msgid "print commit contents" -msgstr "列印提交內容" - -#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 -msgid "print raw gpg status output" -msgstr "列印原始 gpg 狀態輸出" - -#: builtin/verify-pack.c:55 -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." - -#: builtin/verify-pack.c:65 -msgid "verbose" -msgstr "詳細輸出" - -#: builtin/verify-pack.c:67 -msgid "show statistics only" -msgstr "只顯示統計" - -#: builtin/verify-tag.c:18 -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." -msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <標籤>..." - -#: builtin/verify-tag.c:36 -msgid "print tag contents" -msgstr "列印標籤內容" - -#: builtin/worktree.c:17 -msgid "git worktree add [<options>] <path> [<commit-ish>]" -msgstr "git worktree add [<選項>] <路徑> [<提交>]" - -#: builtin/worktree.c:18 -msgid "git worktree list [<options>]" -msgstr "git worktree list [<選項>]" - -#: builtin/worktree.c:19 -msgid "git worktree lock [<options>] <path>" -msgstr "git worktree lock [<選項>] <路徑>" - -#: builtin/worktree.c:20 -msgid "git worktree move <worktree> <new-path>" -msgstr "git worktree move <工作區> <新路徑>" - -#: builtin/worktree.c:21 -msgid "git worktree prune [<options>]" -msgstr "git worktree prune [<選項>]" - -#: builtin/worktree.c:22 -msgid "git worktree remove [<options>] <worktree>" -msgstr "git worktree remove [<選項>] <工作區>" - -#: builtin/worktree.c:23 -msgid "git worktree unlock <path>" -msgstr "git worktree unlock <路徑>" - -#: builtin/worktree.c:60 builtin/worktree.c:891 -#, c-format -msgid "failed to delete '%s'" -msgstr "刪除 '%s' 失敗" - -#: builtin/worktree.c:79 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "刪除工作區/%s：不是一個有效的目錄" - -#: builtin/worktree.c:85 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" -msgstr "刪除 worktrees/%s：gitdir 檔案不存在" - -#: builtin/worktree.c:90 builtin/worktree.c:99 -#, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "刪除 worktrees/%s：無法讀取 gitdir 檔案 (%s)" - -#: builtin/worktree.c:109 -#, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "刪除工作樹/%s：讀取過短（期望 %<PRIuMAX> 位元組，讀取 %<PRIuMAX>）" - -#: builtin/worktree.c:117 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "刪除 worktrees/%s：無效的 gitdir 檔案" - -#: builtin/worktree.c:126 -#, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "刪除 worktrees/%s：gitdir 檔案的指向不存在" - -#: builtin/worktree.c:165 -msgid "report pruned working trees" -msgstr "報告清除的工作區" - -#: builtin/worktree.c:167 -msgid "expire working trees older than <time>" -msgstr "將早於 <時間> 的工作區過期" - -#: builtin/worktree.c:234 -#, c-format -msgid "'%s' already exists" -msgstr "'%s' 已經存在" - -#: builtin/worktree.c:244 -#, c-format -msgid "unable to re-add worktree '%s'" -msgstr "無法再次新增工作區 '%s'" - -#: builtin/worktree.c:249 -#, c-format -msgid "" -"'%s' is a missing but locked worktree;\n" -"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" -msgstr "" -"'%s' 是一個遺失但鎖定的工作區，使用\n" -"'add -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除" - -#: builtin/worktree.c:251 -#, c-format -msgid "" -"'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" -msgstr "" -"'%s' 是一個遺失但已經註冊的工作區，使用\n" -"'add -f' 覆蓋，或 'prune' 或 'remove' 清除" - -#: builtin/worktree.c:301 -#, c-format -msgid "could not create directory of '%s'" -msgstr "不能建立目錄 '%s'" - -#: builtin/worktree.c:432 builtin/worktree.c:438 -#, c-format -msgid "Preparing worktree (new branch '%s')" -msgstr "準備工作區（新分支 '%s'）" - -#: builtin/worktree.c:434 -#, c-format -msgid "Preparing worktree (resetting branch '%s'; was at %s)" -msgstr "準備工作區（重設分支 '%s'，之前為 %s）" - -#: builtin/worktree.c:443 -#, c-format -msgid "Preparing worktree (checking out '%s')" -msgstr "準備工作區（簽出 '%s'）" - -#: builtin/worktree.c:449 -#, c-format -msgid "Preparing worktree (detached HEAD %s)" -msgstr "準備工作區（分離開頭指標 %s）" - -#: builtin/worktree.c:490 -msgid "checkout <branch> even if already checked out in other worktree" -msgstr "簽出 <分支>，即使已經被簽出到其它工作區" - -#: builtin/worktree.c:493 -msgid "create a new branch" -msgstr "建立一個新分支" - -#: builtin/worktree.c:495 -msgid "create or reset a branch" -msgstr "建立或重設一個分支" - -#: builtin/worktree.c:497 -msgid "populate the new working tree" -msgstr "生成新的工作區" - -#: builtin/worktree.c:498 -msgid "keep the new working tree locked" -msgstr "鎖定新工作區" - -#: builtin/worktree.c:501 -msgid "set up tracking mode (see git-branch(1))" -msgstr "設定追蹤模式（參見 git-branch(1)）" - -#: builtin/worktree.c:504 -msgid "try to match the new branch name with a remote-tracking branch" -msgstr "嘗試為新分支名符合一個遠端追蹤分支" - -#: builtin/worktree.c:512 -msgid "-b, -B, and --detach are mutually exclusive" -msgstr "-b、-B 和 --detach 是互斥的" - -#: builtin/worktree.c:573 -msgid "--[no-]track can only be used if a new branch is created" -msgstr "只能在建立新分支時使用選項 --[no-]track " - -#: builtin/worktree.c:673 -msgid "reason for locking" -msgstr "鎖定原因" - -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 -#, c-format -msgid "'%s' is not a working tree" -msgstr "'%s' 不是一個工作區" - -#: builtin/worktree.c:687 builtin/worktree.c:720 -msgid "The main working tree cannot be locked or unlocked" -msgstr "主工作區無法被加鎖或解鎖" - -#: builtin/worktree.c:692 -#, c-format -msgid "'%s' is already locked, reason: %s" -msgstr "'%s' 已被鎖定，原因：%s" - -#: builtin/worktree.c:694 -#, c-format -msgid "'%s' is already locked" -msgstr "'%s' 已被鎖定" - -#: builtin/worktree.c:722 -#, c-format -msgid "'%s' is not locked" -msgstr "'%s' 未被鎖定" - -#: builtin/worktree.c:763 -msgid "working trees containing submodules cannot be moved or removed" -msgstr "不能移動或刪除包含子模組的工作區" - -#: builtin/worktree.c:771 -msgid "force move even if worktree is dirty or locked" -msgstr "強制移動，即使工作區是髒的或已鎖定" - -#: builtin/worktree.c:794 builtin/worktree.c:921 -#, c-format -msgid "'%s' is a main working tree" -msgstr "'%s' 是一個主工作區" - -#: builtin/worktree.c:799 -#, c-format -msgid "could not figure out destination name from '%s'" -msgstr "無法從 '%s' 算出目標名稱" - -#: builtin/worktree.c:805 -#, c-format -msgid "target '%s' already exists" -msgstr "目標 '%s' 已存在" - -#: builtin/worktree.c:813 -#, c-format -msgid "" -"cannot move a locked working tree, lock reason: %s\n" -"use 'move -f -f' to override or unlock first" -msgstr "" -"無法移動一個鎖定的工作區，鎖定原因：%s\n" -"使用 'move -f -f' 覆蓋或先解鎖" - -#: builtin/worktree.c:815 -msgid "" -"cannot move a locked working tree;\n" -"use 'move -f -f' to override or unlock first" -msgstr "" -"無法移動一個鎖定的工作區，\n" -"使用 'move -f -f' 覆蓋或先解鎖" - -#: builtin/worktree.c:818 -#, c-format -msgid "validation failed, cannot move working tree: %s" -msgstr "驗證失敗，無法移動工作區：%s" - -#: builtin/worktree.c:823 -#, c-format -msgid "failed to move '%s' to '%s'" -msgstr "移動 '%s' 到 '%s' 失敗" - -#: builtin/worktree.c:871 -#, c-format -msgid "failed to run 'git status' on '%s'" -msgstr "在 '%s' 中執行 'git status' 失敗" - -#: builtin/worktree.c:875 -#, c-format -msgid "'%s' contains modified or untracked files, use --force to delete it" -msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" - -#: builtin/worktree.c:880 -#, c-format -msgid "failed to run 'git status' on '%s', code %d" -msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" - -#: builtin/worktree.c:903 -msgid "force removal even if worktree is dirty or locked" -msgstr "強制刪除，即使工作區是髒的或已鎖定" - -#: builtin/worktree.c:926 -#, c-format -msgid "" -"cannot remove a locked working tree, lock reason: %s\n" -"use 'remove -f -f' to override or unlock first" -msgstr "" -"無法刪除一個鎖定的工作區，鎖定原因：%s\n" -"使用 'remove -f -f' 覆蓋或先解鎖" - -#: builtin/worktree.c:928 -msgid "" -"cannot remove a locked working tree;\n" -"use 'remove -f -f' to override or unlock first" -msgstr "" -"無法刪除一個鎖定的工作區，\n" -"使用 'remove -f -f' 覆蓋或先解鎖" - -#: builtin/worktree.c:931 -#, c-format -msgid "validation failed, cannot remove working tree: %s" -msgstr "驗證失敗，無法刪除工作區：%s" - -#: builtin/write-tree.c:15 -msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" -msgstr "git write-tree [--missing-ok] [--prefix=<前綴>/]" - -#: builtin/write-tree.c:28 -msgid "<prefix>/" -msgstr "<前綴>/" - -#: builtin/write-tree.c:29 -msgid "write tree object for a subdirectory <prefix>" -msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件" - -#: builtin/write-tree.c:31 -msgid "only useful for debugging" -msgstr "只對除錯有用" - -#: fast-import.c:3125 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "預期 'mark' 指令，得到 %s" - -#: fast-import.c:3130 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "預期 'to' 指令，得到 %s" - -#: fast-import.c:3254 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能" - -#: credential-cache--daemon.c:223 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" -"您的 socket 目錄權限過於寬鬆，其他使用者可能會讀取您快取的認證訊息。考慮執" -"行：\n" -"\n" -"\tchmod 0700 %s" - -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "除錯訊息輸出到標準錯誤" - -#: t/helper/test-reach.c:152 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "提交 %s 沒有標記為可以取得" - -#: t/helper/test-reach.c:162 -msgid "too many commits marked reachable" -msgstr "太多提交標記為可以取得" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<選項>]" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "對能力廣告之後立即離開" - -#: git.c:27 -msgid "" -"git [--version] [--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" -" <command> [<args>]" -msgstr "" -"git [--version] [--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" -" <指令> [<參數>]" - -#: git.c:34 -msgid "" -"'git help -a' and 'git help -g' list available subcommands and some\n" -"concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept.\n" -"See 'git help git' for an overview of the system." -msgstr "" -"指令 'git help -a' 和 'git help -g' 顯示可用的子指令和一些概念說明。\n" -"檢視 'git help <指令>' 或 'git help <概念>' 以取得提供子指令或概念\n" -"說明。\n" -"有關系統概述，檢視 'git help git'。" - -#: git.c:186 -#, c-format -msgid "no directory given for --git-dir\n" -msgstr "沒有為 --git-dir 提供目錄\n" - -#: git.c:200 -#, c-format -msgid "no namespace given for --namespace\n" -msgstr "沒有為 --namespace 提供命名空間\n" - -#: git.c:214 -#, c-format -msgid "no directory given for --work-tree\n" -msgstr "沒有為 --work-tree 提供目錄\n" - -#: git.c:228 -#, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "沒有為 --super-prefix 提供前綴\n" - -#: git.c:250 -#, c-format -msgid "-c expects a configuration string\n" -msgstr "應為 -c 提供一個設定字串\n" - -#: git.c:288 -#, c-format -msgid "no directory given for -C\n" -msgstr "沒有為 -C 提供目錄\n" - -#: git.c:314 -#, c-format -msgid "unknown option: %s\n" -msgstr "未知選項：%s\n" - -#: git.c:360 -#, c-format -msgid "while expanding alias '%s': '%s'" -msgstr "在擴展別名 '%s' 時：'%s'" - -#: git.c:369 -#, c-format -msgid "" -"alias '%s' changes environment variables.\n" -"You can use '!git' in the alias to do this" -msgstr "" -"別名 '%s' 修改環境變數。您可以使用在別名中\n" -"使用 '!git'" - -#: git.c:376 -#, c-format -msgid "empty alias for %s" -msgstr "%s 的空別名" - -#: git.c:379 -#, c-format -msgid "recursive alias: %s" -msgstr "遞迴的別名：%s" - -#: git.c:459 -msgid "write failure on standard output" -msgstr "在標準輸出寫入失敗" - -#: git.c:461 -msgid "unknown write failure on standard output" -msgstr "到標準輸出的未知寫入錯誤" - -#: git.c:463 -msgid "close failed on standard output" -msgstr "標準輸出關閉失敗" - -#: git.c:793 -#, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "檢測到別名循環：'%s'的擴展未終止：%s" - -#: git.c:843 -#, c-format -msgid "cannot handle %s as a builtin" -msgstr "不能作為內建指令處理 %s" - -#: git.c:856 -#, c-format -msgid "" -"usage: %s\n" -"\n" -msgstr "" -"用法：%s\n" -"\n" - -#: git.c:876 -#, c-format -msgid "expansion of alias '%s' failed; '%s' is not a git command\n" -msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" - -#: git.c:888 -#, c-format -msgid "failed to run command '%s': %s\n" -msgstr "執行指令 '%s' 失敗：%s\n" - -#: http.c:378 -#, c-format -msgid "negative value for http.postbuffer; defaulting to %d" -msgstr "http.postbuffer 為負值，預設為 %d" - -#: http.c:399 -msgid "Delegation control is not supported with cURL < 7.22.0" -msgstr "不支援委託控制，因為 cURL < 7.22.0" - -#: http.c:408 -msgid "Public key pinning not supported with cURL < 7.44.0" -msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.44.0" - -#: http.c:876 -msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" -msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0" - -#: http.c:949 -msgid "Protocol restrictions not supported with cURL < 7.19.4" -msgstr "不支援協定限制，因為 cURL < 7.19.4" - -#: http.c:1086 -#, c-format -msgid "Unsupported SSL backend '%s'. Supported SSL backends:" -msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端：" - -#: http.c:1093 -#, c-format -msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" -msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端構建" - -#: http.c:1097 -#, c-format -msgid "Could not set SSL backend to '%s': already set" -msgstr "無法將 SSL 後端設定為 '%s'：已經設定" - -#: http.c:1966 -#, c-format -msgid "" -"unable to update url base from redirection:\n" -" asked for: %s\n" -" redirect: %s" -msgstr "" -"不能更新重定向的 url base：\n" -" 請求：%s\n" -" 重定向：%s" - -#: remote-curl.c:166 -#, c-format -msgid "invalid quoting in push-option value: '%s'" -msgstr "在 push-option 取值中無效的引號：'%s'" - -#: remote-curl.c:263 -#, c-format -msgid "%sinfo/refs not valid: is this a git repository?" -msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？" - -#: remote-curl.c:364 -msgid "invalid server response; expected service, got flush packet" -msgstr "無效的服務端回應。預期服務，得到 flush 包" - -#: remote-curl.c:395 -#, c-format -msgid "invalid server response; got '%s'" -msgstr "無效的服務端回應，得到 '%s'" - -#: remote-curl.c:455 -#, c-format -msgid "repository '%s' not found" -msgstr "版本庫 '%s' 未找到" - -#: remote-curl.c:459 -#, c-format -msgid "Authentication failed for '%s'" -msgstr "'%s' 身份驗證失敗" - -#: remote-curl.c:463 -#, c-format -msgid "unable to access '%s': %s" -msgstr "無法存取 '%s'：%s" - -#: remote-curl.c:469 -#, c-format -msgid "redirecting to %s" -msgstr "重定向到 %s" - -#: remote-curl.c:593 -msgid "shouldn't have EOF when not gentle on EOF" -msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符" - -#: remote-curl.c:673 -msgid "unable to rewind rpc post data - try increasing http.postBuffer" -msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer" - -#: remote-curl.c:733 -#, c-format -msgid "RPC failed; %s" -msgstr "RPC 失敗。%s" - -#: remote-curl.c:773 -msgid "cannot handle pushes this big" -msgstr "不能處理這麼大的推送" - -#: remote-curl.c:888 -#, c-format -msgid "cannot deflate request; zlib deflate error %d" -msgstr "不能壓縮請求，zlib 壓縮錯誤 %d" - -#: remote-curl.c:892 -#, c-format -msgid "cannot deflate request; zlib end error %d" -msgstr "不能壓縮請求，zlib 結束錯誤 %d" - -#: remote-curl.c:1023 -msgid "dumb http transport does not support shallow capabilities" -msgstr "啞 http 傳輸不支援 shalllow 能力" - -#: remote-curl.c:1038 -msgid "fetch failed." -msgstr "取得失敗。" - -#: remote-curl.c:1086 -msgid "cannot fetch by sha1 over smart http" -msgstr "無法透過智慧 HTTP 取得 sha1" - -#: remote-curl.c:1130 remote-curl.c:1136 -#, c-format -msgid "protocol error: expected sha/ref, got '%s'" -msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" - -#: remote-curl.c:1148 remote-curl.c:1263 -#, c-format -msgid "http transport does not support %s" -msgstr "http 傳輸協定不支援 %s" - -#: remote-curl.c:1184 -msgid "git-http-push failed" -msgstr "git-http-push 失敗" - -#: remote-curl.c:1369 -msgid "remote-curl: usage: git remote-curl <remote> [<url>]" -msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]" - -#: remote-curl.c:1401 -msgid "remote-curl: error reading command stream from git" -msgstr "remote-curl：錯誤讀取來自 git 的指令流" - -#: remote-curl.c:1408 -msgid "remote-curl: fetch attempted without a local repo" -msgstr "remote-curl：嘗試沒有本機版本庫下取得" - -#: remote-curl.c:1448 -#, c-format -msgid "remote-curl: unknown command '%s' from git" -msgstr "remote-curl：未知的來自 git 的指令 '%s'" - -#: list-objects-filter-options.h:85 -msgid "args" -msgstr "參數" - -#: list-objects-filter-options.h:86 -msgid "object filtering" -msgstr "物件過濾" - -#: parse-options.h:183 -msgid "expiry-date" -msgstr "到期時間" - -#: parse-options.h:197 -msgid "no-op (backward compatibility)" -msgstr "空動作（向後相容）" - -#: parse-options.h:309 -msgid "be more verbose" -msgstr "更加詳細" - -#: parse-options.h:311 -msgid "be more quiet" -msgstr "更加安靜" - -#: parse-options.h:317 -msgid "use <n> digits to display SHA-1s" -msgstr "用 <n> 位數字顯示 SHA-1 雜湊值" - -#: parse-options.h:336 -msgid "how to strip spaces and #comments from message" -msgstr "設定如何刪除提交說明裡的空格和 #備註" - -#: parse-options.h:337 -msgid "read pathspec from file" -msgstr "從檔案讀取 <路徑規格>" - -#: parse-options.h:338 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔" - -#: ref-filter.h:101 -msgid "key" -msgstr "key" - -#: ref-filter.h:101 -msgid "field name to sort on" -msgstr "排序的欄位名" - -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "如果可能，重用衝突解決更新索引" - -#: wt-status.h:67 -msgid "HEAD detached at " -msgstr "開頭指標分離於 " - -#: wt-status.h:68 -msgid "HEAD detached from " -msgstr "開頭指標分離自 " - -#: command-list.h:50 -msgid "Add file contents to the index" -msgstr "新增檔案內容至索引" - -#: command-list.h:51 -msgid "Apply a series of patches from a mailbox" -msgstr "套用信箱格式的系列修補檔" - -#: command-list.h:52 -msgid "Annotate file lines with commit information" -msgstr "使用提交訊息備註檔案行" - -#: command-list.h:53 -msgid "Apply a patch to files and/or to the index" -msgstr "套用一個修補檔到檔案和/或索引區" - -#: command-list.h:54 -msgid "Import a GNU Arch repository into Git" -msgstr "將一個 GNU Arch 版本庫匯入到 Git" - -#: command-list.h:55 -msgid "Create an archive of files from a named tree" -msgstr "基於命名過的樹建立檔案封存" - -#: command-list.h:56 -msgid "Use binary search to find the commit that introduced a bug" -msgstr "透過二分尋找定位引入 bug 的提交" - -#: command-list.h:57 -msgid "Show what revision and author last modified each line of a file" -msgstr "顯示檔案每一行最後修改的版本和修改者" - -#: command-list.h:58 -msgid "List, create, or delete branches" -msgstr "列出、建立或刪除分支" - -#: command-list.h:59 -msgid "Move objects and refs by archive" -msgstr "透過歸檔移動物件和引用" - -#: command-list.h:60 -msgid "Provide content or type and size information for repository objects" -msgstr "提供版本庫物件的內容、類型或大小" - -#: command-list.h:61 -msgid "Display gitattributes information" -msgstr "顯示 gitattributes 訊息" - -#: command-list.h:62 -msgid "Debug gitignore / exclude files" -msgstr "除錯 gitignore / exclude 檔案" - -#: command-list.h:63 -msgid "Show canonical names and email addresses of contacts" -msgstr "顯示聯絡人的規範名稱和電子信件" - -#: command-list.h:64 -msgid "Switch branches or restore working tree files" -msgstr "切換分支或復原工作區檔案" - -#: command-list.h:65 -msgid "Copy files from the index to the working tree" -msgstr "從索引複製檔案到工作區" - -#: command-list.h:66 -msgid "Ensures that a reference name is well formed" -msgstr "確保引用名稱格式正確" - -#: command-list.h:67 -msgid "Find commits yet to be applied to upstream" -msgstr "尋找尚未套用到上游的提交" - -#: command-list.h:68 -msgid "Apply the changes introduced by some existing commits" -msgstr "應用一些現存提交引入的修改" - -#: command-list.h:69 -msgid "Graphical alternative to git-commit" -msgstr "git-commit 的圖形替代介面" - -#: command-list.h:70 -msgid "Remove untracked files from the working tree" -msgstr "從工作區中刪除未追蹤檔案" - -#: command-list.h:71 -msgid "Clone a repository into a new directory" -msgstr "複製版本庫到一個新目錄" - -#: command-list.h:72 -msgid "Display data in columns" -msgstr "以列的方式顯示資料" - -#: command-list.h:73 -msgid "Record changes to the repository" -msgstr "記錄變更到版本庫" - -#: command-list.h:74 -msgid "Write and verify Git commit-graph files" -msgstr "寫入和驗證 Git 提交圖檔案" - -#: command-list.h:75 -msgid "Create a new commit object" -msgstr "建立一個新的提交物件" - -#: command-list.h:76 -msgid "Get and set repository or global options" -msgstr "取得和設定版本庫或者全域選項" - -#: command-list.h:77 -msgid "Count unpacked number of objects and their disk consumption" -msgstr "計算未打包物件的數量和磁碟空間占用" - -#: command-list.h:78 -msgid "Retrieve and store user credentials" -msgstr "檢索和儲存使用者密碼" - -#: command-list.h:79 -msgid "Helper to temporarily store passwords in memory" -msgstr "在記憶體中暫時儲存密碼的助手" - -#: command-list.h:80 -msgid "Helper to store credentials on disk" -msgstr "在磁碟儲存密碼的助手" - -#: command-list.h:81 -msgid "Export a single commit to a CVS checkout" -msgstr "將一個提交匯出到 CVS 簽出中" - -#: command-list.h:82 -msgid "Salvage your data out of another SCM people love to hate" -msgstr "從另外一個人們愛恨的設定管理系統中拯救你的資料" - -#: command-list.h:83 -msgid "A CVS server emulator for Git" -msgstr "Git 的一個 CVS 服務模擬器" - -#: command-list.h:84 -msgid "A really simple server for Git repositories" -msgstr "一個非常簡單的 Git 版本庫伺服器" - -#: command-list.h:85 -msgid "Give an object a human readable name based on an available ref" -msgstr "基於一個現存的引用為一個物件起一個可讀的名稱" - -#: command-list.h:86 -msgid "Show changes between commits, commit and working tree, etc" -msgstr "顯示提交之間、提交和工作區之間等的差異" - -#: command-list.h:87 -msgid "Compares files in the working tree and the index" -msgstr "比較工作區和索引區中的檔案" - -#: command-list.h:88 -msgid "Compare a tree to the working tree or index" -msgstr "將一個樹和工作區或索引做比較" - -#: command-list.h:89 -msgid "Compares the content and mode of blobs found via two tree objects" -msgstr "比較兩個樹狀物件的檔案內容和模式" - -#: command-list.h:90 -msgid "Show changes using common diff tools" -msgstr "使用常見的差異工具顯示更改" - -#: command-list.h:91 -msgid "Git data exporter" -msgstr "Git 資料匯出器" - -#: command-list.h:92 -msgid "Backend for fast Git data importers" -msgstr "Git 快速資料匯入器後端" - -#: command-list.h:93 -msgid "Download objects and refs from another repository" -msgstr "從另外一個版本庫下載物件和引用" - -#: command-list.h:94 -msgid "Receive missing objects from another repository" -msgstr "從另一個版本庫取得缺少的物件" - -#: command-list.h:95 -msgid "Rewrite branches" -msgstr "重寫分支" - -#: command-list.h:96 -msgid "Produce a merge commit message" -msgstr "生成一個合併提交訊息" - -#: command-list.h:97 -msgid "Output information on each ref" -msgstr "對每一個引用輸出訊息 " - -#: command-list.h:98 -msgid "Prepare patches for e-mail submission" -msgstr "準備電子信件提交的修補檔" - -#: command-list.h:99 -msgid "Verifies the connectivity and validity of the objects in the database" -msgstr "驗證版本庫中物件的連通性和有效性" - -#: command-list.h:100 -msgid "Cleanup unnecessary files and optimize the local repository" -msgstr "清除不必要的檔案和最佳化本機版本庫" - -#: command-list.h:101 -msgid "Extract commit ID from an archive created using git-archive" -msgstr "從 git-archive 建立的歸檔檔案中擷取提交 ID" - -#: command-list.h:102 -msgid "Print lines matching a pattern" -msgstr "輸出和模式符合的行" - -#: command-list.h:103 -msgid "A portable graphical interface to Git" -msgstr "一個便攜的 Git 圖形用戶端" - -#: command-list.h:104 -msgid "Compute object ID and optionally creates a blob from a file" -msgstr "從一個檔案計算物件 ID，並可以建立 blob 資料物件" - -#: command-list.h:105 -msgid "Display help information about Git" -msgstr "顯示 Git 的說明訊息" - -#: command-list.h:106 -msgid "Server side implementation of Git over HTTP" -msgstr "Git HTTP 協定的服務端實現" - -#: command-list.h:107 -msgid "Download from a remote Git repository via HTTP" -msgstr "通過 HTTP 從遠端 Git 版本庫下載" - -#: command-list.h:108 -msgid "Push objects over HTTP/DAV to another repository" -msgstr "通過 HTTP/DAV 推送物件另一個版本庫" - -#: command-list.h:109 -msgid "Send a collection of patches from stdin to an IMAP folder" -msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾" - -#: command-list.h:110 -msgid "Build pack index file for an existing packed archive" -msgstr "從一個現存的包存檔檔案建立包索引" - -#: command-list.h:111 -msgid "Create an empty Git repository or reinitialize an existing one" -msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫" - -#: command-list.h:112 -msgid "Instantly browse your working repository in gitweb" -msgstr "在 gitweb 中即時瀏覽您的工作版本庫" - -#: command-list.h:113 -msgid "Add or parse structured information in commit messages" -msgstr "新增或解析提交說明中的結構化訊息" - -#: command-list.h:114 -msgid "The Git repository browser" -msgstr "Git 版本庫瀏覽器" - -#: command-list.h:115 -msgid "Show commit logs" -msgstr "顯示提交日誌" - -#: command-list.h:116 -msgid "Show information about files in the index and the working tree" -msgstr "顯示索引和工作區中檔案的訊息" - -#: command-list.h:117 -msgid "List references in a remote repository" -msgstr "顯示一個遠端版本庫的引用" - -#: command-list.h:118 -msgid "List the contents of a tree object" -msgstr "顯示一個樹狀物件的內容" - -#: command-list.h:119 -msgid "Extracts patch and authorship from a single e-mail message" -msgstr "從單個電子信件中擷取修補檔和作者身份" - -#: command-list.h:120 -msgid "Simple UNIX mbox splitter program" -msgstr "簡單的 UNIX mbox 信箱切分程式" - -#: command-list.h:121 -msgid "Join two or more development histories together" -msgstr "合併兩個或更多開發歷史" - -#: command-list.h:122 -msgid "Find as good common ancestors as possible for a merge" -msgstr "為了合併尋找儘可能好的公共祖先提交" - -#: command-list.h:123 -msgid "Run a three-way file merge" -msgstr "執行一個三路檔案合併" - -#: command-list.h:124 -msgid "Run a merge for files needing merging" -msgstr "對於需要合併的檔案執行合併" - -#: command-list.h:125 -msgid "The standard helper program to use with git-merge-index" -msgstr "與 git-merge-index 一起使用的標準嚮導程式" - -#: command-list.h:126 -msgid "Run merge conflict resolution tools to resolve merge conflicts" -msgstr "執行合併衝突解決工具以解決合併衝突" - -#: command-list.h:127 -msgid "Show three-way merge without touching index" -msgstr "顯示三路合併而不動索引" - -#: command-list.h:128 -msgid "Write and verify multi-pack-indexes" -msgstr "寫入和驗證多包索引" - -#: command-list.h:129 -msgid "Creates a tag object" -msgstr "建立一個標籤物件" - -#: command-list.h:130 -msgid "Build a tree-object from ls-tree formatted text" -msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件" - -#: command-list.h:131 -msgid "Move or rename a file, a directory, or a symlink" -msgstr "移動或重新命名一個檔案、目錄或符號連結" - -# 尋找提供版本的符號名稱 -#: command-list.h:132 -msgid "Find symbolic names for given revs" -msgstr "尋找提供版本的符號名稱" - -#: command-list.h:133 -msgid "Add or inspect object notes" -msgstr "新增或檢查物件備註" - -#: command-list.h:134 -msgid "Import from and submit to Perforce repositories" -msgstr "匯入和提交到 Perforce 版本庫中" - -#: command-list.h:135 -msgid "Create a packed archive of objects" -msgstr "建立物件的存檔包" - -#: command-list.h:136 -msgid "Find redundant pack files" -msgstr "尋找冗餘的包檔案" - -#: command-list.h:137 -msgid "Pack heads and tags for efficient repository access" -msgstr "打包頭和標籤以實現高效的版本庫存取" - -#: command-list.h:138 -msgid "Routines to help parsing remote repository access parameters" -msgstr "協助解析遠端版本庫存取參數的例程" - -#: command-list.h:139 -msgid "Compute unique ID for a patch" -msgstr "計算一個修補檔的唯一 ID" - -#: command-list.h:140 -msgid "Prune all unreachable objects from the object database" -msgstr "刪除物件庫中所有無法取得物件" - -#: command-list.h:141 -msgid "Remove extra objects that are already in pack files" -msgstr "刪除已經在包檔案中的多餘物件" - -#: command-list.h:142 -msgid "Fetch from and integrate with another repository or a local branch" -msgstr "取得並整合另外的版本庫或一個本機分支" - -#: command-list.h:143 -msgid "Update remote refs along with associated objects" -msgstr "更新遠端引用和相關的物件" - -#: command-list.h:144 -msgid "Applies a quilt patchset onto the current branch" -msgstr "將一個 quilt 修補檔集套用到目前分支。" - -#: command-list.h:145 -msgid "Compare two commit ranges (e.g. two versions of a branch)" -msgstr "比較兩個提交範圍（如一個分支的兩個版本）" - -#: command-list.h:146 -msgid "Reads tree information into the index" -msgstr "將樹訊息讀取到索引" - -#: command-list.h:147 -msgid "Reapply commits on top of another base tip" -msgstr "在另一個分支上重新應用提交" - -#: command-list.h:148 -msgid "Receive what is pushed into the repository" -msgstr "接收推送到版本庫中的物件" - -#: command-list.h:149 -msgid "Manage reflog information" -msgstr "管理 reflog 訊息" - -#: command-list.h:150 -msgid "Manage set of tracked repositories" -msgstr "管理已追蹤版本庫" - -#: command-list.h:151 -msgid "Pack unpacked objects in a repository" -msgstr "打包版本庫中未打包物件" - -#: command-list.h:152 -msgid "Create, list, delete refs to replace objects" -msgstr "建立、列出、刪除物件取代引用" - -#: command-list.h:153 -msgid "Generates a summary of pending changes" -msgstr "生成待定更改的摘要" - -#: command-list.h:154 -msgid "Reuse recorded resolution of conflicted merges" -msgstr "重用衝突合併的解決方案記錄" - -#: command-list.h:155 -msgid "Reset current HEAD to the specified state" -msgstr "重設目前 HEAD 到指定狀態" - -#: command-list.h:156 -msgid "Restore working tree files" -msgstr "復原工作區檔案" - -#: command-list.h:157 -msgid "Revert some existing commits" -msgstr "還原一些現存提交" - -#: command-list.h:158 -msgid "Lists commit objects in reverse chronological order" -msgstr "按時間順序列出提交物件" - -#: command-list.h:159 -msgid "Pick out and massage parameters" -msgstr "選出並處理參數" - -#: command-list.h:160 -msgid "Remove files from the working tree and from the index" -msgstr "從工作區和索引中刪除檔案" - -#: command-list.h:161 -msgid "Send a collection of patches as emails" -msgstr "透過電子信件傳送一組修補檔" - -#: command-list.h:162 -msgid "Push objects over Git protocol to another repository" -msgstr "使用 Git 協定推送物件到另一個版本庫" - -#: command-list.h:163 -msgid "Restricted login shell for Git-only SSH access" -msgstr "只允許 Git SSH 存取的受限登入shell" - -#: command-list.h:164 -msgid "Summarize 'git log' output" -msgstr "'git log' 輸出摘要" - -#: command-list.h:165 -msgid "Show various types of objects" -msgstr "顯示各種類型的物件" - -#: command-list.h:166 -msgid "Show branches and their commits" -msgstr "顯示分支和提交" - -#: command-list.h:167 -msgid "Show packed archive index" -msgstr "顯示打包歸檔索引" - -#: command-list.h:168 -msgid "List references in a local repository" -msgstr "顯示本機版本庫中的引用" - -#: command-list.h:169 -msgid "Git's i18n setup code for shell scripts" -msgstr "為 shell 腳本準備的 Git 國際化設定程式碼" - -#: command-list.h:170 -msgid "Common Git shell script setup code" -msgstr "常用的 Git shell 腳本設定程式碼" - -#: command-list.h:171 -msgid "Initialize and modify the sparse-checkout" -msgstr "初始化並修改稀疏簽出" - -#: command-list.h:172 -msgid "Stash the changes in a dirty working directory away" -msgstr "儲藏髒工作區中的修改" - -#: command-list.h:173 -msgid "Add file contents to the staging area" -msgstr "將檔案內容新增到索引" - -#: command-list.h:174 -msgid "Show the working tree status" -msgstr "顯示工作區狀態" - -#: command-list.h:175 -msgid "Remove unnecessary whitespace" -msgstr "刪除不必要的空白字元" - -#: command-list.h:176 -msgid "Initialize, update or inspect submodules" -msgstr "初始化、更新或檢查子模組" - -#: command-list.h:177 -msgid "Bidirectional operation between a Subversion repository and Git" -msgstr "Subversion 版本庫和 Git 之間的雙向動作" - -#: command-list.h:178 -msgid "Switch branches" -msgstr "切換分支" - -#: command-list.h:179 -msgid "Read, modify and delete symbolic refs" -msgstr "讀取、修改和刪除符號引用" - -#: command-list.h:180 -msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件" - -#: command-list.h:181 -msgid "Creates a temporary file with a blob's contents" -msgstr "用 blob 資料物件的內容建立一個暫存檔" - -#: command-list.h:182 -msgid "Unpack objects from a packed archive" -msgstr "從打包檔案中解壓縮物件" - -#: command-list.h:183 -msgid "Register file contents in the working tree to the index" -msgstr "將工作區的檔案內容註冊到索引" - -#: command-list.h:184 -msgid "Update the object name stored in a ref safely" -msgstr "安全地更新儲存於引用中的物件名稱" - -#: command-list.h:185 -msgid "Update auxiliary info file to help dumb servers" -msgstr "更新輔助訊息檔案以協助啞協定服務" - -#: command-list.h:186 -msgid "Send archive back to git-archive" -msgstr "將存檔傳送回 git-archive" - -#: command-list.h:187 -msgid "Send objects packed back to git-fetch-pack" -msgstr "將物件壓縮包傳送回 git-fetch-pack" - -#: command-list.h:188 -msgid "Show a Git logical variable" -msgstr "顯示 Git 邏輯變數" - -#: command-list.h:189 -msgid "Check the GPG signature of commits" -msgstr "檢查 GPG 提交簽名" - -#: command-list.h:190 -msgid "Validate packed Git archive files" -msgstr "驗證打包的 Git 封存檔案" - -#: command-list.h:191 -msgid "Check the GPG signature of tags" -msgstr "檢查標籤的 GPG 簽名" - -#: command-list.h:192 -msgid "Git web interface (web frontend to Git repositories)" -msgstr "Git web 介面（Git 版本庫的 web 前端）" - -#: command-list.h:193 -msgid "Show logs with difference each commit introduces" -msgstr "顯示每一個提交引入的差異日誌" - -#: command-list.h:194 -msgid "Manage multiple working trees" -msgstr "管理多個工作區" - -#: command-list.h:195 -msgid "Create a tree object from the current index" -msgstr "從目前索引建立一個樹狀物件" - -#: command-list.h:196 -msgid "Defining attributes per path" -msgstr "定義路徑的屬性" - -#: command-list.h:197 -msgid "Git command-line interface and conventions" -msgstr "Git 指令列介面和約定" - -#: command-list.h:198 -msgid "A Git core tutorial for developers" -msgstr "面向開發人員的 Git 核心教學" - -#: command-list.h:199 -msgid "Git for CVS users" -msgstr "適合 CVS 使用者的 Git 協助" - -#: command-list.h:200 -msgid "Tweaking diff output" -msgstr "調整差異輸出" - -#: command-list.h:201 -msgid "A useful minimum set of commands for Everyday Git" -msgstr "每一天 Git 的一組有用的最小指令集合" - -#: command-list.h:202 -msgid "A Git Glossary" -msgstr "Git 詞彙表" - -#: command-list.h:203 -msgid "Hooks used by Git" -msgstr "Git 使用的掛鉤" - -#: command-list.h:204 -msgid "Specifies intentionally untracked files to ignore" -msgstr "忽略指定的未追蹤檔案" - -#: command-list.h:205 -msgid "Defining submodule properties" -msgstr "定義子模組屬性" - -#: command-list.h:206 -msgid "Git namespaces" -msgstr "Git 名字空間" - -#: command-list.h:207 -msgid "Git Repository Layout" -msgstr "Git 版本庫配置" - -#: command-list.h:208 -msgid "Specifying revisions and ranges for Git" -msgstr "指定 Git 的版本和版本範圍" - -#: command-list.h:209 -msgid "Mounting one repository inside another" -msgstr "在某個版本庫掛載某個版本庫" - -#: command-list.h:210 -msgid "A tutorial introduction to Git: part two" -msgstr "一個 Git 教學：第二部分" - -#: command-list.h:211 -msgid "A tutorial introduction to Git" -msgstr "一個 Git 教學" - -#: command-list.h:212 -msgid "An overview of recommended workflows with Git" -msgstr "Git 推薦的工作流概覽" - -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "您需要執行 \"git bisect start\" 來開始" - -# 譯者：請維持句尾空格 -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "您想讓我為您這樣做嗎[Y/n]？ " - -#: git-bisect.sh:101 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "壞的輸入版本：$arg" - -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "壞的輸入版本：$bisected_head" - -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "壞的輸入版本：$rev" - -#: git-bisect.sh:139 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "'git bisect $TERM_BAD' 只能帶一個參數。" - -#: git-bisect.sh:209 -msgid "No logfile given" -msgstr "未提供日誌檔案" - -#: git-bisect.sh:210 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "不能讀取 $file 來重放" - -#: git-bisect.sh:232 -msgid "?? what are you talking about?" -msgstr "?? 您在說什麼?" - -#: git-bisect.sh:241 -msgid "bisect run failed: no command provided." -msgstr "二分尋找執行失敗：沒有提供指令。" - -#: git-bisect.sh:246 -#, sh-format -msgid "running $command" -msgstr "執行 $command" - -#: git-bisect.sh:253 -#, sh-format -msgid "" -"bisect run failed:\n" -"exit code $res from '$command' is < 0 or >= 128" -msgstr "" -"二分尋找執行失敗：\n" -"指令 '$command' 的離開碼 $res 小於 0 或大於等於 128" - -#: git-bisect.sh:279 -msgid "bisect run cannot continue any more" -msgstr "二分尋找不能繼續執行" - -#: git-bisect.sh:285 -#, sh-format -msgid "" -"bisect run failed:\n" -"'bisect_state $state' exited with error code $res" -msgstr "" -"二分尋找執行失敗：\n" -"'bisect_state $state' 離開碼為 $res" - -#: git-bisect.sh:292 -msgid "bisect run success" -msgstr "二分尋找執行成功" - -#: git-bisect.sh:300 -msgid "We are not bisecting." -msgstr "我們沒有在二分尋找。" - -#: git-merge-octopus.sh:46 -msgid "" -"Error: Your local changes to the following files would be overwritten by " -"merge" -msgstr "錯誤：您對下列檔案的本機修改將被合併動作覆蓋" - -#: git-merge-octopus.sh:61 -msgid "Automated merge did not work." -msgstr "自動合併未生效。" - -#: git-merge-octopus.sh:62 -msgid "Should not be doing an octopus." -msgstr "不應該執行章魚式合併。" - -#: git-merge-octopus.sh:73 -#, sh-format -msgid "Unable to find common commit with $pretty_name" -msgstr "無法找到和 $pretty_name 的基礎提交" - -#: git-merge-octopus.sh:77 -#, sh-format -msgid "Already up to date with $pretty_name" -msgstr "已經和 $pretty_name 保持一致" - -#: git-merge-octopus.sh:89 -#, sh-format -msgid "Fast-forwarding to: $pretty_name" -msgstr "快轉至：$pretty_name" - -#: git-merge-octopus.sh:97 -#, sh-format -msgid "Trying simple merge with $pretty_name" -msgstr "嘗試和 $pretty_name 的簡單合併" - -#: git-merge-octopus.sh:102 -msgid "Simple merge did not work, trying automatic merge." -msgstr "簡單合併未生效，嘗試自動合併。" - -#: git-legacy-stash.sh:221 -msgid "Cannot remove temporary index (can't happen)" -msgstr "無法刪除暫時索引（不應發生）" - -#: git-legacy-stash.sh:272 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "無法用 $w_commit 更新 $ref_stash" - -#: git-legacy-stash.sh:324 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "錯誤：'stash push' 的未知選項：$option" - -#: git-legacy-stash.sh:356 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "儲存工作目錄和索引狀態 $stash_msg" - -#: git-legacy-stash.sh:536 -#, sh-format -msgid "unknown option: $opt" -msgstr "未知選項: $opt" - -#: git-legacy-stash.sh:556 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "指定了太多的版本：$REV" - -#: git-legacy-stash.sh:571 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference 不是一個有效的引用" - -#: git-legacy-stash.sh:599 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "'$args' 不是儲藏式提交" - -#: git-legacy-stash.sh:610 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "'$args' 不是一個儲藏引用" - -#: git-legacy-stash.sh:618 -msgid "unable to refresh index" -msgstr "無法重新整理索引" - -#: git-legacy-stash.sh:622 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "無法在合併過程套用儲藏" - -#: git-legacy-stash.sh:630 -msgid "Conflicts in index. Try without --index." -msgstr "索引中有衝突。嘗試不使用 --index。" - -#: git-legacy-stash.sh:632 -msgid "Could not save index tree" -msgstr "不能儲存索引樹" - -#: git-legacy-stash.sh:641 -msgid "Could not restore untracked files from stash entry" -msgstr "無法從儲藏條目中復原未追蹤檔案" - -#: git-legacy-stash.sh:666 -msgid "Cannot unstage modified files" -msgstr "無法將修改的檔案取消暫存" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "捨棄了 ${REV} ($s)" - -#: git-legacy-stash.sh:705 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "${REV}：無法捨棄儲藏條目" - -#: git-legacy-stash.sh:792 -msgid "(To restore them type \"git stash apply\")" -msgstr "（為復原資料輸入 \"git stash apply\"）" - -#: git-submodule.sh:203 -msgid "Relative path can only be used from the toplevel of the working tree" -msgstr "只能在工作區的頂級目錄中使用相對路徑" - -#: git-submodule.sh:213 -#, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "版本庫 URL：'$repo' 必須是絕對路徑或以 ./|../ 起始" - -#: git-submodule.sh:232 -#, sh-format -msgid "'$sm_path' already exists in the index" -msgstr "'$sm_path' 已經存在於索引中" - -#: git-submodule.sh:235 -#, sh-format -msgid "'$sm_path' already exists in the index and is not a submodule" -msgstr "'$sm_path' 已經存在於索引中且不是一個子模組" - -#: git-submodule.sh:242 -#, sh-format -msgid "'$sm_path' does not have a commit checked out" -msgstr "'$sm_path' 沒有簽出的提交" - -#: git-submodule.sh:273 -#, sh-format -msgid "Adding existing repo at '$sm_path' to the index" -msgstr "新增位於 '$sm_path' 的現存版本庫到索引" - -#: git-submodule.sh:275 -#, sh-format -msgid "'$sm_path' already exists and is not a valid git repo" -msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫" - -#: git-submodule.sh:283 -#, sh-format -msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "本機發現 '$sm_name' 的一個 git 目錄，與其對應的遠端版本庫：" - -#: git-submodule.sh:285 -#, sh-format -msgid "" -"If you want to reuse this local git directory instead of cloning again from\n" -" $realrepo\n" -"use the '--force' option. If the local git directory is not the correct " -"repo\n" -"or you are unsure what this means choose another name with the '--name' " -"option." -msgstr "" -"如果您想要重用這個本機 git 目錄而非重新複製自\n" -" $realrepo\n" -"使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" -"或者您不確定這裡的含義，使用 '--name' 選項選擇另外的名稱。" - -#: git-submodule.sh:291 -#, sh-format -msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "啟動本機 git 目錄到子模組 '$sm_name'。" - -#: git-submodule.sh:303 -#, sh-format -msgid "Unable to checkout submodule '$sm_path'" -msgstr "不能簽出子模組 '$sm_path'" - -#: git-submodule.sh:308 -#, sh-format -msgid "Failed to add submodule '$sm_path'" -msgstr "無法新增子模組 '$sm_path'" - -#: git-submodule.sh:317 -#, sh-format -msgid "Failed to register submodule '$sm_path'" -msgstr "無法註冊子模組 '$sm_path'" - -#: git-submodule.sh:590 -#, sh-format -msgid "Unable to find current revision in submodule path '$displaypath'" -msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本" - -#: git-submodule.sh:600 -#, sh-format -msgid "Unable to fetch in submodule path '$sm_path'" -msgstr "無法在子模組路徑 '$sm_path' 中取得" - -#: git-submodule.sh:605 -#, sh-format -msgid "" -"Unable to find current ${remote_name}/${branch} revision in submodule path " -"'$sm_path'" -msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}" - -#: git-submodule.sh:623 -#, sh-format -msgid "" -"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " -"$sha1:" -msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1：" - -#: git-submodule.sh:629 -#, sh-format -msgid "" -"Fetched in submodule path '$displaypath', but it did not contain $sha1. " -"Direct fetching of that commit failed." -msgstr "" -"取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。" - -#: git-submodule.sh:636 -#, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" -msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'" - -#: git-submodule.sh:637 -#, sh-format -msgid "Submodule path '$displaypath': checked out '$sha1'" -msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'" - -#: git-submodule.sh:641 -#, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'" - -#: git-submodule.sh:642 -#, sh-format -msgid "Submodule path '$displaypath': rebased into '$sha1'" -msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'" - -#: git-submodule.sh:647 -#, sh-format -msgid "Unable to merge '$sha1' in submodule path '$displaypath'" -msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中" - -#: git-submodule.sh:648 -#, sh-format -msgid "Submodule path '$displaypath': merged in '$sha1'" -msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'" - -#: git-submodule.sh:653 -#, sh-format -msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" -msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗" - -#: git-submodule.sh:654 -#, sh-format -msgid "Submodule path '$displaypath': '$command $sha1'" -msgstr "子模組 '$displaypath'：'$command $sha1'" - -#: git-submodule.sh:685 -#, sh-format -msgid "Failed to recurse into submodule path '$displaypath'" -msgstr "無法遞迴進子模組路徑 '$displaypath'" - -#: git-submodule.sh:896 -msgid "The --cached option cannot be used with the --files option" -msgstr "選項 --cached 不能和選項 --files 同時使用" - -#: git-submodule.sh:948 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "意外的模式 $mod_dst" - -# 譯者：請維持前導空格 -#: git-submodule.sh:968 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " 警告：$display_name 未包含提交 $sha1_src" - -# 譯者：請維持前導空格 -#: git-submodule.sh:971 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " 警告：$display_name 未包含提交 $sha1_dst" - -# 譯者：請維持前導空格 -#: git-submodule.sh:974 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" - -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "詳見 git-${cmd}(1)。" - -#: git-rebase--preserve-merges.sh:109 -msgid "Applied autostash." -msgstr "已應用 autostash。" - -#: git-rebase--preserve-merges.sh:112 -#, sh-format -msgid "Cannot store $stash_sha1" -msgstr "不能儲存 $stash_sha1" - -#: git-rebase--preserve-merges.sh:191 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "重定基底中（$new_count/$total）" - -#: git-rebase--preserve-merges.sh:207 -msgid "" -"\n" -"Commands:\n" -"p, pick <commit> = use commit\n" -"r, reword <commit> = use commit, but edit the commit message\n" -"e, edit <commit> = use commit, but stop for amending\n" -"s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <commit> = run command (the rest of the line) using shell\n" -"d, drop <commit> = remove commit\n" -"l, label <label> = label current HEAD with a name\n" -"t, reset <label> = reset HEAD to a label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified). Use -c <commit> to reword the commit message.\n" -"\n" -"These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "" -"\n" -"指令:\n" -"p, pick <提交> = 使用提交\n" -"r, reword <提交> = 使用提交，但修改提交說明\n" -"e, edit <提交> = 使用提交，但停下來修補\n" -"s, squash <提交> = 使用提交，但融合到前一個提交\n" -"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n" -"x, exec <指令> = 使用 shell 執行指令（此行剩餘部分）\n" -"d, drop <提交> = 刪除提交\n" -"l, label <標籤> = 為目前 HEAD 打上標籤\n" -"t, reset <標籤> = 重設 HEAD 到該標籤\n" -"m, merge [-C <提交> | -c <提交>] <標籤> [# <oneline>]\n" -". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" -". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n" -". -c <提交> 可以編輯提交說明。\n" -"\n" -"可以對這些行重新排序，將從上至下執行。\n" - -#: git-rebase--preserve-merges.sh:270 -#, sh-format -msgid "" -"You can amend the commit now, with\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"Once you are satisfied with your changes, run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"您現在可以修補這個提交，使用\n" -"\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" -"\n" -"當您對變更感到滿意，執行\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:295 -#, sh-format -msgid "$sha1: not a commit that can be picked" -msgstr "$sha1：不是一個可以被揀選的提交" - -#: git-rebase--preserve-merges.sh:334 -#, sh-format -msgid "Invalid commit name: $sha1" -msgstr "無效的提交名：$sha1" - -#: git-rebase--preserve-merges.sh:364 -msgid "Cannot write current commit's replacement sha1" -msgstr "不能寫入目前提交的替代 sha1" - -#: git-rebase--preserve-merges.sh:415 -#, sh-format -msgid "Fast-forward to $sha1" -msgstr "快轉到 $sha1" - -#: git-rebase--preserve-merges.sh:417 -#, sh-format -msgid "Cannot fast-forward to $sha1" -msgstr "不能快轉到 $sha1" - -#: git-rebase--preserve-merges.sh:426 -#, sh-format -msgid "Cannot move HEAD to $first_parent" -msgstr "不能移動 HEAD 到 $first_parent" - -#: git-rebase--preserve-merges.sh:431 -#, sh-format -msgid "Refusing to squash a merge: $sha1" -msgstr "拒絕壓縮一個合併：$sha1" - -#: git-rebase--preserve-merges.sh:449 -#, sh-format -msgid "Error redoing merge $sha1" -msgstr "無法重做合併 $sha1" - -#: git-rebase--preserve-merges.sh:458 -#, sh-format -msgid "Could not pick $sha1" -msgstr "不能揀選 $sha1" - -#: git-rebase--preserve-merges.sh:467 -#, sh-format -msgid "This is the commit message #${n}:" -msgstr "這是提交說明 #${n}：" - -#: git-rebase--preserve-merges.sh:472 -#, sh-format -msgid "The commit message #${n} will be skipped:" -msgstr "提交說明 #${n} 將被跳過：" - -#: git-rebase--preserve-merges.sh:483 -#, sh-format -msgid "This is a combination of $count commit." -msgid_plural "This is a combination of $count commits." -msgstr[0] "這是一個 $count 個提交的組合。" - -#: git-rebase--preserve-merges.sh:492 -#, sh-format -msgid "Cannot write $fixup_msg" -msgstr "不能寫入 $fixup_msg" - -#: git-rebase--preserve-merges.sh:495 -msgid "This is a combination of 2 commits." -msgstr "這是一個 2 個提交的組合。" - -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 -#, sh-format -msgid "Could not apply $sha1... $rest" -msgstr "不能應用 $sha1... $rest" - -#: git-rebase--preserve-merges.sh:611 -#, sh-format -msgid "" -"Could not amend commit after successfully picking $sha1... $rest\n" -"This is most likely due to an empty commit message, or the pre-commit hook\n" -"failed. If the pre-commit hook failed, you may need to resolve the issue " -"before\n" -"you are able to reword the commit." -msgstr "" -"不能在成功揀選 $sha1... $rest 之後修補提交\n" -"這通常是因為空的提交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-commit\n" -"掛鉤執行失敗，你可能需要在重寫提交說明前解決這個問題。" - -#: git-rebase--preserve-merges.sh:626 -#, sh-format -msgid "Stopped at $sha1_abbrev... $rest" -msgstr "停止在 $sha1_abbrev... $rest" - -#: git-rebase--preserve-merges.sh:641 -#, sh-format -msgid "Cannot '$squash_style' without a previous commit" -msgstr "沒有父提交的情況下不能 '$squash_style'" - -#: git-rebase--preserve-merges.sh:683 -#, sh-format -msgid "Executing: $rest" -msgstr "執行：$rest" - -#: git-rebase--preserve-merges.sh:691 -#, sh-format -msgid "Execution failed: $rest" -msgstr "執行失敗：$rest" - -#: git-rebase--preserve-merges.sh:693 -msgid "and made changes to the index and/or the working tree" -msgstr "並且修改索引和/或工作區" - -# 譯者：請維持前導空格 -#: git-rebase--preserve-merges.sh:695 -msgid "" -"You can fix the problem, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"您可以解決這個問題，然後執行\n" -"\n" -"\tgit rebase --continue" - -#. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 -#, sh-format -msgid "" -"Execution succeeded: $rest\n" -"but left changes to the index and/or the working tree\n" -"Commit or stash your changes, and then run\n" -"\n" -"\tgit rebase --continue" -msgstr "" -"執行成功：$rest\n" -"但是在索引和/或工作區中存在變更。提交或儲藏修改，然後執行\n" -"\n" -"\tgit rebase --continue" - -#: git-rebase--preserve-merges.sh:719 -#, sh-format -msgid "Unknown command: $command $sha1 $rest" -msgstr "未知指令：$command $sha1 $rest" - -#: git-rebase--preserve-merges.sh:720 -msgid "Please fix this using 'git rebase --edit-todo'." -msgstr "要修改請使用指令 'git rebase --edit-todo'。" - -#: git-rebase--preserve-merges.sh:755 -#, sh-format -msgid "Successfully rebased and updated $head_name." -msgstr "成功重定基底並更新 $head_name。" - -#: git-rebase--preserve-merges.sh:812 -msgid "Could not remove CHERRY_PICK_HEAD" -msgstr "不能刪除 CHERRY_PICK_HEAD" - -#: git-rebase--preserve-merges.sh:817 -#, sh-format -msgid "" -"You have staged changes in your working tree.\n" -"If these changes are meant to be\n" -"squashed into the previous commit, run:\n" -"\n" -" git commit --amend $gpg_sign_opt_quoted\n" -"\n" -"If they are meant to go into a new commit, run:\n" -"\n" -" git commit $gpg_sign_opt_quoted\n" -"\n" -"In both cases, once you're done, continue with:\n" -"\n" -" git rebase --continue\n" -msgstr "" -"您已暫存了工作區的修改。如果這些修改要壓縮到前一個提交，執行：\n" -"\n" -" git commit --amend $gpg_sign_opt_quoted\n" -"\n" -"如果這些變更要形成一個新提交，執行：\n" -"\n" -" git commit $gpg_sign_opt_quoted\n" -"\n" -"無論哪種情況，當您完成提交，繼續執行：\n" -"\n" -" git rebase --continue\n" - -#: git-rebase--preserve-merges.sh:834 -msgid "Error trying to find the author identity to amend commit" -msgstr "在修補提交中尋找作者訊息時遇到錯誤" - -#: git-rebase--preserve-merges.sh:839 -msgid "" -"You have uncommitted changes in your working tree. Please commit them\n" -"first and then run 'git rebase --continue' again." -msgstr "" -"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" - -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 -msgid "Could not commit staged changes." -msgstr "不能提交暫存的修改。" - -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 -msgid "Could not execute editor" -msgstr "無法執行編輯器" - -#: git-rebase--preserve-merges.sh:900 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "不能簽出 $switch_to" - -#: git-rebase--preserve-merges.sh:907 -msgid "No HEAD?" -msgstr "沒有 HEAD？" - -#: git-rebase--preserve-merges.sh:908 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "不能建立暫時 $state_dir" - -#: git-rebase--preserve-merges.sh:911 -msgid "Could not mark as interactive" -msgstr "不能標記為互動式" - -#: git-rebase--preserve-merges.sh:943 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）" - -#: git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "注意空提交已被備註掉" - -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 -msgid "Could not init rewritten commits" -msgstr "不能對重寫提交進行初始化" - -#: git-sh-setup.sh:89 git-sh-setup.sh:94 -#, sh-format -msgid "usage: $dashless $USAGE" -msgstr "用法：$dashless $USAGE" - -#: git-sh-setup.sh:191 -#, sh-format -msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "不能切換目錄到 $cdup，工作區的頂級目錄" - -#: git-sh-setup.sh:200 git-sh-setup.sh:207 -#, sh-format -msgid "fatal: $program_name cannot be used without a working tree." -msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用" - -#: git-sh-setup.sh:221 -msgid "Cannot rebase: You have unstaged changes." -msgstr "不能重定基底：您有未暫存的變更。" - -#: git-sh-setup.sh:224 -msgid "Cannot rewrite branches: You have unstaged changes." -msgstr "不能重寫分支：您有未暫存的變更。" - -#: git-sh-setup.sh:227 -msgid "Cannot pull with rebase: You have unstaged changes." -msgstr "無法透過重定基底方式拉取：您有未暫存的變更。" - -#: git-sh-setup.sh:230 -#, sh-format -msgid "Cannot $action: You have unstaged changes." -msgstr "不能 $action：您有未暫存的變更。" - -#: git-sh-setup.sh:243 -msgid "Cannot rebase: Your index contains uncommitted changes." -msgstr "不能重定基底：您的索引中包含未提交的變更。" - -#: git-sh-setup.sh:246 -msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "無法透過重定基底方式拉取：您的索引中包含未提交的變更。" - -#: git-sh-setup.sh:249 -#, sh-format -msgid "Cannot $action: Your index contains uncommitted changes." -msgstr "不能 $action：您的索引中包含未提交的變更。" - -#: git-sh-setup.sh:253 -msgid "Additionally, your index contains uncommitted changes." -msgstr "而且您的索引中包含未提交的變更。" - -#: git-sh-setup.sh:373 -msgid "You need to run this command from the toplevel of the working tree." -msgstr "您需要在工作區的頂級目錄中執行這個指令。" - -#: git-sh-setup.sh:378 -msgid "Unable to determine absolute path of git directory" -msgstr "不能確定 git 目錄的絕對路徑" - -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:212 -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#: git-add--interactive.perl:634 -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "建立了 %d 個路徑\n" - -#: git-add--interactive.perl:1053 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。" - -#: git-add--interactive.perl:1056 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。" - -#: git-add--interactive.perl:1059 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。" - -#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。" - -#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 -#: git-add--interactive.perl:1074 -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。" - -#: git-add--interactive.perl:1111 -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "為寫入開啟區塊編輯檔案失敗：%s" - -#: git-add--interactive.perl:1118 -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"要刪除 '%s' 開始的行，使其成為 ' ' 開始的行（上下文）。\n" -"要刪除 '%s' 開始的行，刪除它們。\n" -"以 %s 開始的行將被刪除。\n" - -#: git-add--interactive.perl:1140 -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "無法讀取區塊編輯檔案：%s" - -#: git-add--interactive.perl:1248 -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"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" -msgstr "" -"y - 暫存此區塊\n" -"n - 不要暫存此區塊\n" -"q - 離開。不暫存此區塊及後面的全部區塊\n" -"a - 暫存此區塊和本檔案中後面的全部區塊\n" -"d - 不暫存此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1254 -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - 儲藏此區塊\n" -"n - 不要儲藏此區塊\n" -"q - 離開。不儲藏此區塊及後面的全部區塊\n" -"a - 儲藏此區塊和本檔案中後面的全部區塊\n" -"d - 不儲藏此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1260 -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"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" -msgstr "" -"y - 不暫存此區塊\n" -"n - 不要不暫存此區塊\n" -"q - 離開。不要不暫存此區塊及後面的全部區塊\n" -"a - 不暫存此區塊和本檔案中後面的全部區塊\n" -"d - 不要不暫存此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1266 -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引中套用此區塊\n" -"n - 不要在索引中套用此區塊\n" -"q - 離開。不要套用此區塊及後面的全部區塊\n" -"a - 套用此區塊和本檔案中後面的全部區塊\n" -"d - 不要套用此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - 在工作區中捨棄此區塊\n" -"n - 不要在工作區中捨棄此區塊\n" -"q - 離開。不要捨棄此區塊及後面的全部區塊\n" -"a - 捨棄此區塊和本檔案中後面的全部區塊\n" -"d - 不要捨棄此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1278 -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引和工作區中捨棄此區塊\n" -"n - 不要在索引和工作區中捨棄此區塊\n" -"q - 離開。不要捨棄此區塊及後面的全部區塊\n" -"a - 捨棄此區塊和本檔案中後面的全部區塊\n" -"d - 不要捨棄此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1284 -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引和工作區中套用此區塊\n" -"n - 不要在索引和工作區中套用此區塊\n" -"q - 離開。不要套用此區塊及後面的全部區塊\n" -"a - 套用此區塊和本檔案中後面的全部區塊\n" -"d - 不要套用此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1296 -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在工作區中套用此區塊\n" -"n - 不要在工作區中套用此區塊\n" -"q - 離開。不要套用此區塊及後面的全部區塊\n" -"a - 套用此區塊和本檔案中後面的全部區塊\n" -"d - 不要套用此區塊和本檔案中後面的全部區塊" - -#: git-add--interactive.perl:1311 -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - 選擇跳轉到一個區塊\n" -"/ - 尋找和提供正規表示式符合的區塊\n" -"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n" -"J - 維持此區塊未決狀態，檢視下一個區塊\n" -"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n" -"K - 維持此區塊未決狀態，檢視上一個區塊\n" -"s - 分割目前區塊為更小的區塊\n" -"e - 手動編輯目前區塊\n" -"? - 顯示說明\n" - -#: git-add--interactive.perl:1342 -msgid "The selected hunks do not apply to the index!\n" -msgstr "選中的區塊不能套用到索引！\n" - -#: git-add--interactive.perl:1357 -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "忽略未套用的：%s\n" - -#: git-add--interactive.perl:1468 -#, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1469 -#, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1470 -#, perl-format -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1570 -msgid "No other hunks to goto\n" -msgstr "沒有其它可供跳轉的區塊\n" - -#: git-add--interactive.perl:1588 -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "無效數字：'%s'\n" - -#: git-add--interactive.perl:1593 -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "對不起，只有 %d 個可用區塊。\n" - -#: git-add--interactive.perl:1619 -msgid "No other hunks to search\n" -msgstr "沒有其它可供尋找的區塊\n" - -#: git-add--interactive.perl:1636 -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "錯誤的正規表示式 %s：%s\n" - -#: git-add--interactive.perl:1646 -msgid "No hunk matches the given pattern\n" -msgstr "沒有和提供模式相符合的區塊\n" - -#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 -msgid "No previous hunk\n" -msgstr "沒有前一個區塊\n" - -#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 -msgid "No next hunk\n" -msgstr "沒有下一個區塊\n" - -#: git-add--interactive.perl:1692 -msgid "Sorry, cannot split this hunk\n" -msgstr "對不起，不能分割這個區塊\n" - -#: git-add--interactive.perl:1698 -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "分割為 %d 塊。\n" - -#: git-add--interactive.perl:1708 -msgid "Sorry, cannot edit this hunk\n" -msgstr "對不起，不能編輯這個區塊\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1773 -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - 顯示含變更的路徑\n" -"update - 新增工作區狀態至暫存列表\n" -"revert - 還原修改的暫存集至 HEAD 版本\n" -"patch - 挑選區塊並且有選擇地更新\n" -"diff - 顯示 HEAD 和索引間差異\n" -"add untracked - 新增未追蹤檔案的內容至暫存列表\n" - -#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 -#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 -#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 -#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 -msgid "missing --" -msgstr "缺少 --" - -#: git-add--interactive.perl:1821 -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "未知的 --patch 模式：%s" - -#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "無效的參數 %s，期望是 --" - -#: git-send-email.perl:138 -msgid "local zone differs from GMT by a non-minute interval\n" -msgstr "本機時間和 GMT 有不到一分鐘間隔\n" - -#: git-send-email.perl:145 git-send-email.perl:151 -msgid "local time offset greater than or equal to 24 hours\n" -msgstr "本機時間位移量大於等於 24 小時\n" - -#: git-send-email.perl:223 git-send-email.perl:229 -msgid "the editor exited uncleanly, aborting everything" -msgstr "編輯器非正常離開，終止所有動作" - -#: git-send-email.perl:310 -#, perl-format -msgid "" -"'%s' contains an intermediate version of the email you were composing.\n" -msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n" - -#: git-send-email.perl:315 -#, perl-format -msgid "'%s.final' contains the composed email.\n" -msgstr "'%s.final' 包含編輯的信件。\n" - -#: git-send-email.perl:408 -msgid "--dump-aliases incompatible with other options\n" -msgstr "--dump-aliases 和其它選項不相容\n" - -#: git-send-email.perl:481 git-send-email.perl:683 -msgid "Cannot run git format-patch from outside a repository\n" -msgstr "不能在版本庫之外執行 git format-patch\n" - -#: git-send-email.perl:484 -msgid "" -"`batch-size` and `relogin` must be specified together (via command-line or " -"configuration option)\n" -msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n" - -#: git-send-email.perl:497 -#, perl-format -msgid "Unknown --suppress-cc field: '%s'\n" -msgstr "未知的 --suppress-cc 欄位：'%s'\n" - -#: git-send-email.perl:528 -#, perl-format -msgid "Unknown --confirm setting: '%s'\n" -msgstr "未知的 --confirm 設定：'%s'\n" - -#: git-send-email.perl:556 -#, perl-format -msgid "warning: sendmail alias with quotes is not supported: %s\n" -msgstr "警告：不支援帶引號的 sendmail 別名：%s\n" - -#: git-send-email.perl:558 -#, perl-format -msgid "warning: `:include:` not supported: %s\n" -msgstr "警告：不支援 `:include:`：%s\n" - -#: git-send-email.perl:560 -#, perl-format -msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" -msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n" - -#: git-send-email.perl:565 -#, perl-format -msgid "warning: sendmail line is not recognized: %s\n" -msgstr "警告：不能識別的 sendmail 行：%s\n" - -#: git-send-email.perl:649 -#, perl-format -msgid "" -"File '%s' exists but it could also be the range of commits\n" -"to produce patches for. Please disambiguate by...\n" -"\n" -" * Saying \"./%s\" if you mean a file; or\n" -" * Giving --format-patch option if you mean a range.\n" -msgstr "" -"存在檔案 '%s' 但是它也可能是一個用於產生修補檔列表的提交範圍。請用如下方法消" -"除歧義：\n" -"\n" -" * 如果含義為一個檔案，使用 \"./%s\"，或者\n" -" * 如果含義為一個範圍，使用 --format-patch 選項。\n" - -#: git-send-email.perl:670 -#, perl-format -msgid "Failed to opendir %s: %s" -msgstr "無法開啟目錄 %s: %s" - -#: git-send-email.perl:694 -#, perl-format -msgid "" -"fatal: %s: %s\n" -"warning: no patches were sent\n" -msgstr "" -"致命錯誤：%s：%s\n" -"警告：修補檔未能傳送\n" - -#: git-send-email.perl:705 -msgid "" -"\n" -"No patch files specified!\n" -"\n" -msgstr "" -"\n" -"未指定修補檔案！\n" -"\n" - -#: git-send-email.perl:718 -#, perl-format -msgid "No subject line in %s?" -msgstr "在 %s 中沒有標題行？" - -#: git-send-email.perl:728 -#, perl-format -msgid "Failed to open for writing %s: %s" -msgstr "為寫入開啟 %s 失敗: %s" - -#: git-send-email.perl:739 -msgid "" -"Lines beginning in \"GIT:\" will be removed.\n" -"Consider including an overall diffstat or table of contents\n" -"for the patch you are writing.\n" -"\n" -"Clear the body content if you don't wish to send a summary.\n" -msgstr "" -"以 \"GIT:\" 開頭的行將被刪除。\n" -"考慮包含一個整體的差異統計或者您正在寫的修補檔的目錄。\n" -"\n" -"如果您不想傳送摘要，清除內容。\n" - -#: git-send-email.perl:763 -#, perl-format -msgid "Failed to open %s: %s" -msgstr "無法開啟 %s: %s" - -#: git-send-email.perl:780 -#, perl-format -msgid "Failed to open %s.final: %s" -msgstr "無法開啟 %s.final: %s" - -#: git-send-email.perl:823 -msgid "Summary email is empty, skipping it\n" -msgstr "摘要信件為空，跳過\n" - -#. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 -#, perl-format -msgid "Are you sure you want to use <%s> [y/N]? " -msgstr "您確認要使用 <%s> [y/N]？" - -#: git-send-email.perl:913 -msgid "" -"The following files are 8bit, but do not declare a Content-Transfer-" -"Encoding.\n" -msgstr "如下檔案含 8bit 內容，但沒有聲明一個 Content-Transfer-Encoding。\n" - -#: git-send-email.perl:918 -msgid "Which 8bit encoding should I declare [UTF-8]? " -msgstr "要聲明 8bit 為什麼樣的編碼格式 [UTF-8]？" - -#: git-send-email.perl:926 -#, perl-format -msgid "" -"Refusing to send because the patch\n" -"\t%s\n" -"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " -"want to send.\n" -msgstr "" -"拒絕傳送，因為修補檔\n" -"\t%s\n" -"包含範本標題 '*** SUBJECT HERE ***'。如果確實想要傳送，使用參數 --force。\n" - -#: git-send-email.perl:945 -msgid "To whom should the emails be sent (if anyone)?" -msgstr "信件將要傳送給誰？" - -#: git-send-email.perl:963 -#, perl-format -msgid "fatal: alias '%s' expands to itself\n" -msgstr "致命錯誤：別名 '%s' 擴展為它自己\n" - -#: git-send-email.perl:975 -msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " -msgstr "Message-ID 被用作第一封信件的 In-Reply-To ？" - -#: git-send-email.perl:1033 git-send-email.perl:1041 -#, perl-format -msgid "error: unable to extract a valid address from: %s\n" -msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" - -#. TRANSLATORS: Make sure to include [q] [d] [e] in your -#. translation. The program will only accept English input -#. at this point. -#: git-send-email.perl:1045 -msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " -msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)：" - -#: git-send-email.perl:1362 -#, perl-format -msgid "CA path \"%s\" does not exist" -msgstr "CA 路徑 \"%s\" 不存在" - -#: git-send-email.perl:1445 -msgid "" -" The Cc list above has been expanded by additional\n" -" addresses found in the patch commit message. By default\n" -" send-email prompts before sending whenever this occurs.\n" -" This behavior is controlled by the sendemail.confirm\n" -" configuration setting.\n" -"\n" -" For additional information, run 'git send-email --help'.\n" -" To retain the current behavior, but squelch this message,\n" -" run 'git config --global sendemail.confirm auto'.\n" -"\n" -msgstr "" -" 以上的抄送列表（Cc）已經用修補檔提交訊息中發現的位址進行\n" -" 了擴展。預設 send-email 會給出提示。這個行為可以透過\n" -" sendemail.confirm 設定設定。\n" -"\n" -" 更多訊息，執行 'git send-email --help'。\n" -" 要保持目前行為，但不顯示此訊息，執行 'git config --global\n" -" sendemail.confirm auto'。\n" -"\n" - -#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your -#. translation. The program will only accept English input -#. at this point. -#: git-send-email.perl:1460 -msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " - -#: git-send-email.perl:1463 -msgid "Send this email reply required" -msgstr "傳送要求的信件回復" - -#: git-send-email.perl:1491 -msgid "The required SMTP server is not properly defined." -msgstr "要求的 SMTP 伺服器未被正確定義。" - -#: git-send-email.perl:1538 -#, perl-format -msgid "Server does not support STARTTLS! %s" -msgstr "伺服器不支援 STARTTLS！%s" - -#: git-send-email.perl:1543 git-send-email.perl:1547 -#, perl-format -msgid "STARTTLS failed! %s" -msgstr "STARTTLS 失敗！%s" - -#: git-send-email.perl:1556 -msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." -msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。" - -#: git-send-email.perl:1574 -#, perl-format -msgid "Failed to send %s\n" -msgstr "無法傳送 %s\n" - -#: git-send-email.perl:1577 -#, perl-format -msgid "Dry-Sent %s\n" -msgstr "測試執行傳送 %s\n" - -#: git-send-email.perl:1577 -#, perl-format -msgid "Sent %s\n" -msgstr "正傳送 %s\n" - -#: git-send-email.perl:1579 -msgid "Dry-OK. Log says:\n" -msgstr "測試執行成功。日誌說：\n" - -#: git-send-email.perl:1579 -msgid "OK. Log says:\n" -msgstr "OK。日誌說：\n" - -#: git-send-email.perl:1591 -msgid "Result: " -msgstr "結果：" - -#: git-send-email.perl:1594 -msgid "Result: OK\n" -msgstr "結果：OK\n" - -#: git-send-email.perl:1612 -#, perl-format -msgid "can't open file %s" -msgstr "無法開啟檔案 %s" - -#: git-send-email.perl:1659 git-send-email.perl:1679 -#, perl-format -msgid "(mbox) Adding cc: %s from line '%s'\n" -msgstr "(mbox) 新增 cc：%s 自行 '%s'\n" - -#: git-send-email.perl:1665 -#, perl-format -msgid "(mbox) Adding to: %s from line '%s'\n" -msgstr "(mbox) 新增 to：%s 自行 '%s'\n" - -#: git-send-email.perl:1718 -#, perl-format -msgid "(non-mbox) Adding cc: %s from line '%s'\n" -msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n" - -#: git-send-email.perl:1753 -#, perl-format -msgid "(body) Adding cc: %s from line '%s'\n" -msgstr "(body) 新增 cc: %s 自行 '%s'\n" - -#: git-send-email.perl:1864 -#, perl-format -msgid "(%s) Could not execute '%s'" -msgstr "(%s) 不能執行 '%s'" - -#: git-send-email.perl:1871 -#, perl-format -msgid "(%s) Adding %s: %s from: '%s'\n" -msgstr "(%s) 新增 %s: %s 自：'%s'\n" - -#: git-send-email.perl:1875 -#, perl-format -msgid "(%s) failed to close pipe to '%s'" -msgstr "(%s) 無法關閉管道至 '%s'" - -#: git-send-email.perl:1905 -msgid "cannot send message as 7bit" -msgstr "不能以 7bit 形式傳送訊息" - -#: git-send-email.perl:1913 -msgid "invalid transfer encoding" -msgstr "無效的傳送編碼" - -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 -#, perl-format -msgid "unable to open %s: %s\n" -msgstr "不能開啟 %s：%s\n" - -#: git-send-email.perl:1957 -#, perl-format -msgid "%s: patch contains a line longer than 998 characters" -msgstr "%s：修補檔包含一個超過 998 字元的行" - -#: git-send-email.perl:1974 -#, perl-format -msgid "Skipping %s with backup suffix '%s'.\n" -msgstr "略過 %s 含備份後綴 '%s'。\n" - -#. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 -#, perl-format -msgid "Do you really want to send %s? [y|N]: " -msgstr "您真的要傳送 %s？[y|N]：" diff --git a/third_party/git/pretty.c b/third_party/git/pretty.c index 28afc701b6..e4ed14effe 100644 --- a/third_party/git/pretty.c +++ b/third_party/git/pretty.c @@ -20,7 +20,6 @@ static struct cmt_fmt_map { int is_tformat; int expand_tabs_in_log; int is_alias; - enum date_mode_type default_date_mode_type; const char *user_format; } *commit_formats; static size_t builtin_formats_len; @@ -98,9 +97,7 @@ static void setup_commit_formats(void) { "mboxrd", CMIT_FMT_MBOXRD, 0, 0 }, { "fuller", CMIT_FMT_FULLER, 0, 8 }, { "full", CMIT_FMT_FULL, 0, 8 }, - { "oneline", CMIT_FMT_ONELINE, 1, 0 }, - { "reference", CMIT_FMT_USERFORMAT, 1, 0, - 0, DATE_SHORT, "%C(auto)%h (%s, %ad)" }, + { "oneline", CMIT_FMT_ONELINE, 1, 0 } /* * Please update $__git_log_pretty_formats in * git-completion.bash when you add new formats. @@ -184,8 +181,6 @@ void get_commit_format(const char *arg, struct rev_info *rev) rev->commit_format = commit_format->format; rev->use_terminator = commit_format->is_tformat; rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log; - if (!rev->date_mode_explicit && commit_format->default_date_mode_type) - rev->date_mode.type = commit_format->default_date_mode_type; if (commit_format->format == CMIT_FMT_USERFORMAT) { save_user_format(rev, commit_format->user_format, commit_format->is_tformat); @@ -701,7 +696,7 @@ static size_t format_person_part(struct strbuf *sb, char part, mail = s.mail_begin; maillen = s.mail_end - s.mail_begin; - if (part == 'N' || part == 'E' || part == 'L') /* mailmap lookup */ + if (part == 'N' || part == 'E') /* mailmap lookup */ mailmap_name(&mail, &maillen, &name, &namelen); if (part == 'n' || part == 'N') { /* name */ strbuf_add(sb, name, namelen); @@ -711,13 +706,6 @@ static size_t format_person_part(struct strbuf *sb, char part, strbuf_add(sb, mail, maillen); return placeholder_len; } - if (part == 'l' || part == 'L') { /* local-part */ - const char *at = memchr(mail, '@', maillen); - if (at) - maillen = at - mail; - strbuf_add(sb, mail, maillen); - return placeholder_len; - } if (!s.date_begin) goto skip; @@ -743,9 +731,6 @@ static size_t format_person_part(struct strbuf *sb, char part, case 'I': /* date, ISO 8601 strict */ strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT))); return placeholder_len; - case 's': - strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(SHORT))); - return placeholder_len; } skip: @@ -1254,9 +1239,11 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ strbuf_addstr(sb, get_revision_mark(NULL, commit)); return 1; case 'd': + load_ref_decorations(NULL, DECORATE_SHORT_REFS); format_decorations(sb, commit, c->auto_color); return 1; case 'D': + load_ref_decorations(NULL, DECORATE_SHORT_REFS); format_decorations_extended(sb, commit, c->auto_color, "", ", ", ""); return 1; case 'S': /* tag/branch like --source */ @@ -1311,18 +1298,9 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ case '?': switch (c->signature_check.result) { case 'G': - switch (c->signature_check.trust_level) { - case TRUST_UNDEFINED: - case TRUST_NEVER: - strbuf_addch(sb, 'U'); - break; - default: - strbuf_addch(sb, 'G'); - break; - } - break; case 'B': case 'E': + case 'U': case 'N': case 'X': case 'Y': @@ -1346,25 +1324,6 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ if (c->signature_check.primary_key_fingerprint) strbuf_addstr(sb, c->signature_check.primary_key_fingerprint); break; - case 'T': - switch (c->signature_check.trust_level) { - case TRUST_UNDEFINED: - strbuf_addstr(sb, "undefined"); - break; - case TRUST_NEVER: - strbuf_addstr(sb, "never"); - break; - case TRUST_MARGINAL: - strbuf_addstr(sb, "marginal"); - break; - case TRUST_FULLY: - strbuf_addstr(sb, "fully"); - break; - case TRUST_ULTIMATE: - strbuf_addstr(sb, "ultimate"); - break; - } - break; default: return 0; } @@ -1609,9 +1568,9 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */ strbuf_setlen(sb, sb->len - 1); } else if (orig_len != sb->len) { if (magic == ADD_LF_BEFORE_NON_EMPTY) - strbuf_insertstr(sb, orig_len, "\n"); + strbuf_insert(sb, orig_len, "\n", 1); else if (magic == ADD_SP_BEFORE_NON_EMPTY) - strbuf_insertstr(sb, orig_len, " "); + strbuf_insert(sb, orig_len, " ", 1); } return consumed + 1; } @@ -1653,14 +1612,14 @@ void repo_format_commit_message(struct repository *r, const char *format, struct strbuf *sb, const struct pretty_print_context *pretty_ctx) { - struct format_commit_context context = { - .commit = commit, - .pretty_ctx = pretty_ctx, - .wrap_start = sb->len - }; + struct format_commit_context context; const char *output_enc = pretty_ctx->output_encoding; const char *utf8 = "UTF-8"; + memset(&context, 0, sizeof(context)); + context.commit = commit; + context.pretty_ctx = pretty_ctx; + context.wrap_start = sb->len; /* * convert a commit message to UTF-8 first * as far as 'format_commit_item' assumes it in UTF-8 diff --git a/third_party/git/progress.c b/third_party/git/progress.c index 19805ac646..277db8afa2 100644 --- a/third_party/git/progress.c +++ b/third_party/git/progress.c @@ -14,7 +14,6 @@ #include "strbuf.h" #include "trace.h" #include "utf8.h" -#include "config.h" #define TP_IDX_MAX 8 @@ -46,19 +45,6 @@ struct progress { static volatile sig_atomic_t progress_update; -/* - * These are only intended for testing the progress output, i.e. exclusively - * for 'test-tool progress'. - */ -int progress_testing; -uint64_t progress_test_ns = 0; -void progress_test_force_update(void); /* To silence -Wmissing-prototypes */ -void progress_test_force_update(void) -{ - progress_update = 1; -} - - static void progress_interval(int signum) { progress_update = 1; @@ -69,9 +55,6 @@ static void set_progress_signal(void) struct sigaction sa; struct itimerval v; - if (progress_testing) - return; - progress_update = 0; memset(&sa, 0, sizeof(sa)); @@ -89,10 +72,6 @@ static void set_progress_signal(void) static void clear_progress_signal(void) { struct itimerval v = {{0,},}; - - if (progress_testing) - return; - setitimer(ITIMER_REAL, &v, NULL); signal(SIGALRM, SIG_IGN); progress_update = 0; @@ -109,7 +88,6 @@ static void display(struct progress *progress, uint64_t n, const char *done) const char *tp; struct strbuf *counters_sb = &progress->counters_sb; int show_update = 0; - int last_count_len = counters_sb->len; if (progress->delay && (!progress_update || --progress->delay)) return; @@ -137,27 +115,21 @@ static void display(struct progress *progress, uint64_t n, const char *done) if (show_update) { if (is_foreground_fd(fileno(stderr)) || done) { const char *eol = done ? done : "\r"; - size_t clear_len = counters_sb->len < last_count_len ? - last_count_len - counters_sb->len + 1 : - 0; - /* The "+ 2" accounts for the ": ". */ - size_t progress_line_len = progress->title_len + - counters_sb->len + 2; - int cols = term_columns(); + term_clear_line(); if (progress->split) { - fprintf(stderr, " %s%*s", counters_sb->buf, - (int) clear_len, eol); - } else if (!done && cols < progress_line_len) { - clear_len = progress->title_len + 1 < cols ? - cols - progress->title_len - 1 : 0; - fprintf(stderr, "%s:%*s\n %s%s", - progress->title, (int) clear_len, "", - counters_sb->buf, eol); + fprintf(stderr, " %s%s", counters_sb->buf, + eol); + } else if (!done && + /* The "+ 2" accounts for the ": ". */ + term_columns() < progress->title_len + + counters_sb->len + 2) { + fprintf(stderr, "%s:\n %s%s", + progress->title, counters_sb->buf, eol); progress->split = 1; } else { - fprintf(stderr, "%s: %s%*s", progress->title, - counters_sb->buf, (int) clear_len, eol); + fprintf(stderr, "%s: %s%s", progress->title, + counters_sb->buf, eol); } fflush(stderr); } @@ -175,14 +147,6 @@ static void throughput_string(struct strbuf *buf, uint64_t total, strbuf_humanise_rate(buf, rate * 1024); } -static uint64_t progress_getnanotime(struct progress *progress) -{ - if (progress_testing) - return progress->start_ns + progress_test_ns; - else - return getnanotime(); -} - void display_throughput(struct progress *progress, uint64_t total) { struct throughput *tp; @@ -193,7 +157,7 @@ void display_throughput(struct progress *progress, uint64_t total) return; tp = progress->throughput; - now_ns = progress_getnanotime(progress); + now_ns = getnanotime(); if (!tp) { progress->throughput = tp = xcalloc(1, sizeof(*tp)); @@ -268,19 +232,9 @@ static struct progress *start_progress_delay(const char *title, uint64_t total, return progress; } -static int get_default_delay(void) -{ - static int delay_in_secs = -1; - - if (delay_in_secs < 0) - delay_in_secs = git_env_ulong("GIT_PROGRESS_DELAY", 2); - - return delay_in_secs; -} - struct progress *start_delayed_progress(const char *title, uint64_t total) { - return start_progress_delay(title, total, get_default_delay(), 0); + return start_progress_delay(title, total, 2, 0); } struct progress *start_progress(const char *title, uint64_t total) @@ -305,7 +259,7 @@ struct progress *start_sparse_progress(const char *title, uint64_t total) struct progress *start_delayed_sparse_progress(const char *title, uint64_t total) { - return start_progress_delay(title, total, get_default_delay(), 1); + return start_progress_delay(title, total, 2, 1); } static void finish_if_sparse(struct progress *progress) @@ -335,7 +289,7 @@ void stop_progress_msg(struct progress **p_progress, const char *msg) struct throughput *tp = progress->throughput; if (tp) { - uint64_t now_ns = progress_getnanotime(progress); + uint64_t now_ns = getnanotime(); unsigned int misecs, rate; misecs = ((now_ns - progress->start_ns) * 4398) >> 32; rate = tp->curr_total / (misecs ? misecs : 1); diff --git a/third_party/git/promisor-remote.c b/third_party/git/promisor-remote.c deleted file mode 100644 index 9f338c945f..0000000000 --- a/third_party/git/promisor-remote.c +++ /dev/null @@ -1,265 +0,0 @@ -#include "cache.h" -#include "object-store.h" -#include "promisor-remote.h" -#include "config.h" -#include "transport.h" - -static char *repository_format_partial_clone; -static const char *core_partial_clone_filter_default; - -void set_repository_format_partial_clone(char *partial_clone) -{ - repository_format_partial_clone = xstrdup_or_null(partial_clone); -} - -static int fetch_refs(const char *remote_name, struct ref *ref) -{ - struct remote *remote; - struct transport *transport; - int res; - - remote = remote_get(remote_name); - if (!remote->url[0]) - die(_("Remote with no URL")); - transport = transport_get(remote, remote->url[0]); - - transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1"); - transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1"); - res = transport_fetch_refs(transport, ref); - - return res; -} - -static int fetch_objects(const char *remote_name, - const struct object_id *oids, - int oid_nr) -{ - struct ref *ref = NULL; - int i; - - for (i = 0; i < oid_nr; i++) { - struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i])); - oidcpy(&new_ref->old_oid, &oids[i]); - new_ref->exact_oid = 1; - new_ref->next = ref; - ref = new_ref; - } - return fetch_refs(remote_name, ref); -} - -static struct promisor_remote *promisors; -static struct promisor_remote **promisors_tail = &promisors; - -static struct promisor_remote *promisor_remote_new(const char *remote_name) -{ - struct promisor_remote *r; - - if (*remote_name == '/') { - warning(_("promisor remote name cannot begin with '/': %s"), - remote_name); - return NULL; - } - - FLEX_ALLOC_STR(r, name, remote_name); - - *promisors_tail = r; - promisors_tail = &r->next; - - return r; -} - -static struct promisor_remote *promisor_remote_lookup(const char *remote_name, - struct promisor_remote **previous) -{ - struct promisor_remote *r, *p; - - for (p = NULL, r = promisors; r; p = r, r = r->next) - if (!strcmp(r->name, remote_name)) { - if (previous) - *previous = p; - return r; - } - - return NULL; -} - -static void promisor_remote_move_to_tail(struct promisor_remote *r, - struct promisor_remote *previous) -{ - if (r->next == NULL) - return; - - if (previous) - previous->next = r->next; - else - promisors = r->next ? r->next : r; - r->next = NULL; - *promisors_tail = r; - promisors_tail = &r->next; -} - -static int promisor_remote_config(const char *var, const char *value, void *data) -{ - const char *name; - int namelen; - const char *subkey; - - if (!strcmp(var, "core.partialclonefilter")) - return git_config_string(&core_partial_clone_filter_default, - var, value); - - if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0) - return 0; - - if (!strcmp(subkey, "promisor")) { - char *remote_name; - - if (!git_config_bool(var, value)) - return 0; - - remote_name = xmemdupz(name, namelen); - - if (!promisor_remote_lookup(remote_name, NULL)) - promisor_remote_new(remote_name); - - free(remote_name); - return 0; - } - if (!strcmp(subkey, "partialclonefilter")) { - struct promisor_remote *r; - char *remote_name = xmemdupz(name, namelen); - - r = promisor_remote_lookup(remote_name, NULL); - if (!r) - r = promisor_remote_new(remote_name); - - free(remote_name); - - if (!r) - return 0; - - return git_config_string(&r->partial_clone_filter, var, value); - } - - return 0; -} - -static int initialized; - -static void promisor_remote_init(void) -{ - if (initialized) - return; - initialized = 1; - - git_config(promisor_remote_config, NULL); - - if (repository_format_partial_clone) { - struct promisor_remote *o, *previous; - - o = promisor_remote_lookup(repository_format_partial_clone, - &previous); - if (o) - promisor_remote_move_to_tail(o, previous); - else - promisor_remote_new(repository_format_partial_clone); - } -} - -static void promisor_remote_clear(void) -{ - while (promisors) { - struct promisor_remote *r = promisors; - promisors = promisors->next; - free(r); - } - - promisors_tail = &promisors; -} - -void promisor_remote_reinit(void) -{ - initialized = 0; - promisor_remote_clear(); - promisor_remote_init(); -} - -struct promisor_remote *promisor_remote_find(const char *remote_name) -{ - promisor_remote_init(); - - if (!remote_name) - return promisors; - - return promisor_remote_lookup(remote_name, NULL); -} - -int has_promisor_remote(void) -{ - return !!promisor_remote_find(NULL); -} - -static int remove_fetched_oids(struct repository *repo, - struct object_id **oids, - int oid_nr, int to_free) -{ - int i, remaining_nr = 0; - int *remaining = xcalloc(oid_nr, sizeof(*remaining)); - struct object_id *old_oids = *oids; - struct object_id *new_oids; - - for (i = 0; i < oid_nr; i++) - if (oid_object_info_extended(repo, &old_oids[i], NULL, - OBJECT_INFO_SKIP_FETCH_OBJECT)) { - remaining[i] = 1; - remaining_nr++; - } - - if (remaining_nr) { - int j = 0; - new_oids = xcalloc(remaining_nr, sizeof(*new_oids)); - for (i = 0; i < oid_nr; i++) - if (remaining[i]) - oidcpy(&new_oids[j++], &old_oids[i]); - *oids = new_oids; - if (to_free) - free(old_oids); - } - - free(remaining); - - return remaining_nr; -} - -int promisor_remote_get_direct(struct repository *repo, - const struct object_id *oids, - int oid_nr) -{ - struct promisor_remote *r; - struct object_id *remaining_oids = (struct object_id *)oids; - int remaining_nr = oid_nr; - int to_free = 0; - int res = -1; - - promisor_remote_init(); - - for (r = promisors; r; r = r->next) { - if (fetch_objects(r->name, remaining_oids, remaining_nr) < 0) { - if (remaining_nr == 1) - continue; - remaining_nr = remove_fetched_oids(repo, &remaining_oids, - remaining_nr, to_free); - if (remaining_nr) { - to_free = 1; - continue; - } - } - res = 0; - break; - } - - if (to_free) - free(remaining_oids); - - return res; -} diff --git a/third_party/git/promisor-remote.h b/third_party/git/promisor-remote.h deleted file mode 100644 index 737bac3a33..0000000000 --- a/third_party/git/promisor-remote.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef PROMISOR_REMOTE_H -#define PROMISOR_REMOTE_H - -#include "repository.h" - -struct object_id; - -/* - * Promisor remote linked list - * - * Information in its fields come from remote.XXX config entries or - * from extensions.partialclone or core.partialclonefilter. - */ -struct promisor_remote { - struct promisor_remote *next; - const char *partial_clone_filter; - const char name[FLEX_ARRAY]; -}; - -void promisor_remote_reinit(void); -struct promisor_remote *promisor_remote_find(const char *remote_name); -int has_promisor_remote(void); -int promisor_remote_get_direct(struct repository *repo, - const struct object_id *oids, - int oid_nr); - -/* - * This should be used only once from setup.c to set the value we got - * from the extensions.partialclone config option. - */ -void set_repository_format_partial_clone(char *partial_clone); - -#endif /* PROMISOR_REMOTE_H */ diff --git a/third_party/git/protocol.c b/third_party/git/protocol.c index 803bef5c87..9741f05750 100644 --- a/third_party/git/protocol.c +++ b/third_party/git/protocol.c @@ -17,8 +17,9 @@ static enum protocol_version parse_protocol_version(const char *value) enum protocol_version get_protocol_version_config(void) { const char *value; + enum protocol_version retval = protocol_v0; const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION"; - const char *git_test_v; + const char *git_test_v = getenv(git_test_k); if (!git_config_get_string_const("protocol.version", &value)) { enum protocol_version version = parse_protocol_version(value); @@ -27,19 +28,19 @@ enum protocol_version get_protocol_version_config(void) die("unknown value for config 'protocol.version': %s", value); - return version; + retval = version; } - git_test_v = getenv(git_test_k); if (git_test_v && *git_test_v) { enum protocol_version env = parse_protocol_version(git_test_v); if (env == protocol_unknown_version) die("unknown value for %s: %s", git_test_k, git_test_v); - return env; + if (retval < env) + retval = env; } - return protocol_v2; + return retval; } enum protocol_version determine_protocol_version_server(void) diff --git a/third_party/git/quote.c b/third_party/git/quote.c index bcc0dbc50d..7f2aa6faa4 100644 --- a/third_party/git/quote.c +++ b/third_party/git/quote.c @@ -48,14 +48,8 @@ void sq_quote_buf_pretty(struct strbuf *dst, const char *src) static const char ok_punct[] = "+,-./:=@_^"; const char *p; - /* Avoid losing a zero-length string by adding '' */ - if (!*src) { - strbuf_addstr(dst, "''"); - return; - } - for (p = src; *p; p++) { - if (!isalnum(*p) && !strchr(ok_punct, *p)) { + if (!isalpha(*p) && !isdigit(*p) && !strchr(ok_punct, *p)) { sq_quote_buf(dst, src); return; } @@ -90,28 +84,12 @@ void sq_quote_argv(struct strbuf *dst, const char **argv) } } -/* - * Legacy function to append each argv value, quoted as necessasry, - * with whitespace before each value. This results in a leading - * space in the result. - */ void sq_quote_argv_pretty(struct strbuf *dst, const char **argv) { - if (argv[0]) - strbuf_addch(dst, ' '); - sq_append_quote_argv_pretty(dst, argv); -} - -/* - * Append each argv value, quoted as necessary, with whitespace between them. - */ -void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv) -{ int i; for (i = 0; argv[i]; i++) { - if (i > 0) - strbuf_addch(dst, ' '); + strbuf_addch(dst, ' '); sq_quote_buf_pretty(dst, argv[i]); } } diff --git a/third_party/git/quote.h b/third_party/git/quote.h index ca8ee3144a..fb08dc085c 100644 --- a/third_party/git/quote.h +++ b/third_party/git/quote.h @@ -40,7 +40,6 @@ void sq_quotef(struct strbuf *, const char *fmt, ...); */ void sq_quote_buf_pretty(struct strbuf *, const char *src); void sq_quote_argv_pretty(struct strbuf *, const char **argv); -void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv); /* This unwraps what sq_quote() produces in place, but returns * NULL if the input does not look like what sq_quote would have diff --git a/third_party/git/range-diff.c b/third_party/git/range-diff.c index f745567cf6..ba1e9a4265 100644 --- a/third_party/git/range-diff.c +++ b/third_party/git/range-diff.c @@ -40,8 +40,7 @@ static size_t find_end_of_line(char *buffer, unsigned long size) * Reads the patches into a string list, with the `util` field being populated * as struct object_id (will need to be free()d). */ -static int read_patches(const char *range, struct string_list *list, - const struct argv_array *other_arg) +static int read_patches(const char *range, struct string_list *list) { struct child_process cp = CHILD_PROCESS_INIT; struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT; @@ -53,7 +52,6 @@ static int read_patches(const char *range, struct string_list *list, argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges", "--reverse", "--date-order", "--decorate=no", - "--no-prefix", /* * Choose indicators that are not used anywhere * else in diffs, but still look reasonable @@ -62,11 +60,8 @@ static int read_patches(const char *range, struct string_list *list, "--output-indicator-new=>", "--output-indicator-old=<", "--output-indicator-context=#", - "--no-abbrev-commit", + "--no-abbrev-commit", range, NULL); - if (other_arg) - argv_array_pushv(&cp.args, other_arg->argv); - argv_array_push(&cp.args, range); cp.out = -1; cp.no_stdin = 1; cp.git_cmd = 1; @@ -116,7 +111,7 @@ static int read_patches(const char *range, struct string_list *list, if (!util->diff_offset) util->diff_offset = buf.len; line[len - 1] = '\n'; - len = parse_git_diff_header(&root, &linenr, 0, line, + len = parse_git_diff_header(&root, &linenr, 1, line, len, size, &patch); if (len < 0) die(_("could not parse git header '%.*s'"), (int)len, line); @@ -148,12 +143,6 @@ static int read_patches(const char *range, struct string_list *list, strbuf_addstr(&buf, line); strbuf_addstr(&buf, "\n\n"); strbuf_addstr(&buf, " ## Commit message ##\n"); - } else if (starts_with(line, "Notes") && - line[strlen(line) - 1] == ':') { - strbuf_addstr(&buf, "\n\n"); - /* strip the trailing colon */ - strbuf_addf(&buf, " ## %.*s ##\n", - (int)(strlen(line) - 1), line); } else if (starts_with(line, " ")) { p = line + len - 2; while (isspace(*p) && p >= line) @@ -228,8 +217,8 @@ static void find_exact_matches(struct string_list *a, struct string_list *b) util->i = i; util->patch = a->items[i].string; util->diff = util->patch + util->diff_offset; - hashmap_entry_init(&util->e, strhash(util->diff)); - hashmap_add(&map, &util->e); + hashmap_entry_init(util, strhash(util->diff)); + hashmap_add(&map, util); } /* Now try to find exact matches in b */ @@ -239,8 +228,8 @@ static void find_exact_matches(struct string_list *a, struct string_list *b) util->i = i; util->patch = b->items[i].string; util->diff = util->patch + util->diff_offset; - hashmap_entry_init(&util->e, strhash(util->diff)); - other = hashmap_remove_entry(&map, util, e, NULL); + hashmap_entry_init(util, strhash(util->diff)); + other = hashmap_remove(&map, util, NULL); if (other) { if (other->matching >= 0) BUG("already assigned!"); @@ -250,7 +239,7 @@ static void find_exact_matches(struct string_list *a, struct string_list *b) } } - hashmap_free(&map); + hashmap_free(&map, 0); } static void diffsize_consume(void *data, char *line, unsigned long len) @@ -506,17 +495,16 @@ static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data) int show_range_diff(const char *range1, const char *range2, int creation_factor, int dual_color, - const struct diff_options *diffopt, - const struct argv_array *other_arg) + struct diff_options *diffopt) { int res = 0; struct string_list branch1 = STRING_LIST_INIT_DUP; struct string_list branch2 = STRING_LIST_INIT_DUP; - if (read_patches(range1, &branch1, other_arg)) + if (read_patches(range1, &branch1)) res = error(_("could not parse log for '%s'"), range1); - if (!res && read_patches(range2, &branch2, other_arg)) + if (!res && read_patches(range2, &branch2)) res = error(_("could not parse log for '%s'"), range2); if (!res) { diff --git a/third_party/git/range-diff.h b/third_party/git/range-diff.h index e11976dc81..08a50b6e98 100644 --- a/third_party/git/range-diff.h +++ b/third_party/git/range-diff.h @@ -2,18 +2,16 @@ #define RANGE_DIFF_H #include "diff.h" -#include "argv-array.h" #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60 /* - * Compare series of commits in RANGE1 and RANGE2, and emit to the + * Compare series of commmits in RANGE1 and RANGE2, and emit to the * standard output. NULL can be passed to DIFFOPT to use the built-in * default. */ int show_range_diff(const char *range1, const char *range2, int creation_factor, int dual_color, - const struct diff_options *diffopt, - const struct argv_array *other_arg); + struct diff_options *diffopt); #endif diff --git a/third_party/git/reachable.c b/third_party/git/reachable.c index 77a60c70a5..8f50235b28 100644 --- a/third_party/git/reachable.c +++ b/third_party/git/reachable.c @@ -223,9 +223,9 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog, cp.progress = progress; cp.count = 0; - bitmap_git = prepare_bitmap_walk(revs, NULL); + bitmap_git = prepare_bitmap_walk(revs); if (bitmap_git) { - traverse_bitmap_commit_list(bitmap_git, revs, mark_object_seen); + traverse_bitmap_commit_list(bitmap_git, mark_object_seen); free_bitmap_index(bitmap_git); return; } diff --git a/third_party/git/read-cache.c b/third_party/git/read-cache.c index aa427c5c17..52ffa8a313 100644 --- a/third_party/git/read-cache.c +++ b/third_party/git/read-cache.c @@ -959,14 +959,11 @@ static int verify_dotfile(const char *rest, unsigned mode) int verify_path(const char *path, unsigned mode) { - char c = 0; + char c; if (has_dos_drive_prefix(path)) return 0; - if (!is_valid_path(path)) - return 0; - goto inside; for (;;) { if (!c) @@ -974,7 +971,6 @@ int verify_path(const char *path, unsigned mode) if (is_dir_sep(c)) { inside: if (protect_hfs) { - if (is_hfs_dotgit(path)) return 0; if (S_ISLNK(mode)) { @@ -983,10 +979,6 @@ inside: } } if (protect_ntfs) { -#ifdef GIT_WINDOWS_NATIVE - if (c == '\\') - return 0; -#endif if (is_ntfs_dotgit(path)) return 0; if (S_ISLNK(mode)) { @@ -999,15 +991,7 @@ inside: if ((c == '.' && !verify_dotfile(path, mode)) || is_dir_sep(c) || c == '\0') return 0; - } else if (c == '\\' && protect_ntfs) { - if (is_ntfs_dotgit(path)) - return 0; - if (S_ISLNK(mode)) { - if (is_ntfs_dotgitmodules(path)) - return 0; - } } - c = *path++; } } @@ -1292,7 +1276,7 @@ static int add_index_entry_with_check(struct index_state *istate, struct cache_e */ if (istate->cache_nr > 0 && strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0) - pos = index_pos_to_insert_pos(istate->cache_nr); + pos = -istate->cache_nr - 1; else pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce)); @@ -1488,27 +1472,6 @@ static void show_file(const char * fmt, const char * name, int in_porcelain, printf(fmt, name); } -int repo_refresh_and_write_index(struct repository *repo, - unsigned int refresh_flags, - unsigned int write_flags, - int gentle, - const struct pathspec *pathspec, - char *seen, const char *header_msg) -{ - struct lock_file lock_file = LOCK_INIT; - int fd, ret = 0; - - fd = repo_hold_locked_index(repo, &lock_file, 0); - if (!gentle && fd < 0) - return -1; - if (refresh_index(repo->index, refresh_flags, pathspec, seen, header_msg)) - ret = 1; - if (0 <= fd && write_locked_index(repo->index, &lock_file, COMMIT_LOCK | write_flags)) - ret = -1; - return ret; -} - - int refresh_index(struct index_state *istate, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg) @@ -1636,17 +1599,16 @@ struct cache_entry *refresh_cache_entry(struct index_state *istate, #define INDEX_FORMAT_DEFAULT 3 -static unsigned int get_index_format_default(struct repository *r) +static unsigned int get_index_format_default(void) { char *envversion = getenv("GIT_INDEX_VERSION"); char *endp; + int value; unsigned int version = INDEX_FORMAT_DEFAULT; if (!envversion) { - prepare_repo_settings(r); - - if (r->settings.index_version >= 0) - version = r->settings.index_version; + if (!git_config_get_int("index.version", &value)) + version = value; if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { warning(_("index.version set, but the value is invalid.\n" "Using version %i"), INDEX_FORMAT_DEFAULT); @@ -1806,7 +1768,7 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool, const unsigned char *cp = (const unsigned char *)name; size_t strip_len, previous_len; - /* If we're at the beginning of a block, ignore the previous name */ + /* If we're at the begining of a block, ignore the previous name */ strip_len = decode_varint(&cp); if (previous_ce) { previous_len = previous_ce->ce_namelen; @@ -1882,17 +1844,18 @@ static void check_ce_order(struct index_state *istate) static void tweak_untracked_cache(struct index_state *istate) { - struct repository *r = the_repository; - - prepare_repo_settings(r); - - if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) { + switch (git_config_get_untracked_cache()) { + case -1: /* keep: do nothing */ + break; + case 0: /* false */ remove_untracked_cache(istate); - return; - } - - if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE) + break; + case 1: /* true */ add_untracked_cache(istate); + break; + default: /* unknown value: do nothing */ + break; + } } static void tweak_split_index(struct index_state *istate) @@ -1931,7 +1894,7 @@ static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries) /* * Account for potential alignment differences. */ - per_entry += align_padding_size(per_entry, 0); + per_entry += align_padding_size(sizeof(struct cache_entry), -sizeof(struct ondisk_cache_entry)); return ondisk_size + entries * per_entry; } @@ -2802,7 +2765,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile, } if (!istate->version) { - istate->version = get_index_format_default(the_repository); + istate->version = get_index_format_default(); if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) init_split_index(istate); } diff --git a/third_party/git/rebase-interactive.c b/third_party/git/rebase-interactive.c index 762853bc7e..aa18ae82b7 100644 --- a/third_party/git/rebase-interactive.c +++ b/third_party/git/rebase-interactive.c @@ -5,13 +5,6 @@ #include "strbuf.h" #include "commit-slab.h" #include "config.h" -#include "dir.h" - -static const char edit_todo_list_advice[] = -N_("You can fix this with 'git rebase --edit-todo' " -"and then run 'git rebase --continue'.\n" -"Or you can abort the rebase with 'git rebase" -" --abort'.\n"); enum missing_commit_check_level { MISSING_COMMIT_CHECK_IGNORE = 0, @@ -35,7 +28,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void) return MISSING_COMMIT_CHECK_IGNORE; } -void append_todo_help(int command_count, +void append_todo_help(unsigned keep_empty, int command_count, const char *shortrevisions, const char *shortonto, struct strbuf *buf) { @@ -87,33 +80,33 @@ void append_todo_help(int command_count, "the rebase will be aborted.\n\n"); strbuf_add_commented_lines(buf, msg, strlen(msg)); + + if (!keep_empty) { + msg = _("Note that empty commits are commented out"); + strbuf_add_commented_lines(buf, msg, strlen(msg)); + } } int edit_todo_list(struct repository *r, struct todo_list *todo_list, struct todo_list *new_todo, const char *shortrevisions, const char *shortonto, unsigned flags) { - const char *todo_file = rebase_path_todo(), - *todo_backup = rebase_path_todo_backup(); + const char *todo_file = rebase_path_todo(); unsigned initial = shortrevisions && shortonto; - int incorrect = 0; /* If the user is editing the todo list, we first try to parse * it. If there is an error, we do not return, because the user * might want to fix it in the first place. */ if (!initial) - incorrect = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list) | - file_exists(rebase_path_dropped()); + todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list); if (todo_list_write_to_file(r, todo_list, todo_file, shortrevisions, shortonto, -1, flags | TODO_LIST_SHORTEN_IDS | TODO_LIST_APPEND_TODO_HELP)) return error_errno(_("could not write '%s'"), todo_file); - if (!incorrect && - todo_list_write_to_file(r, todo_list, todo_backup, - shortrevisions, shortonto, -1, - (flags | TODO_LIST_APPEND_TODO_HELP) & ~TODO_LIST_SHORTEN_IDS) < 0) - return error(_("could not write '%s'."), rebase_path_todo_backup()); + if (initial && copy_file(rebase_path_todo_backup(), todo_file, 0666)) + return error(_("could not copy '%s' to '%s'."), todo_file, + rebase_path_todo_backup()); if (launch_sequence_editor(todo_file, &new_todo->buf, NULL)) return -2; @@ -122,23 +115,10 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list, if (initial && new_todo->buf.len == 0) return -3; - if (todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo)) { - fprintf(stderr, _(edit_todo_list_advice)); - return -4; - } - - if (incorrect) { - if (todo_list_check_against_backup(r, new_todo)) { - write_file(rebase_path_dropped(), "%s", ""); - return -4; - } - - if (incorrect > 0) - unlink(rebase_path_dropped()); - } else if (todo_list_check(todo_list, new_todo)) { - write_file(rebase_path_dropped(), "%s", ""); - return -4; - } + /* For the initial edit, the todo list gets parsed in + * complete_action(). */ + if (!initial) + return todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo); return 0; } @@ -203,52 +183,7 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo) "the level of warnings.\n" "The possible behaviours are: ignore, warn, error.\n\n")); - fprintf(stderr, _(edit_todo_list_advice)); - leave_check: clear_commit_seen(&commit_seen); return res; } - -int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_list) -{ - struct todo_list backup = TODO_LIST_INIT; - int res = 0; - - if (strbuf_read_file(&backup.buf, rebase_path_todo_backup(), 0) > 0) { - todo_list_parse_insn_buffer(r, backup.buf.buf, &backup); - res = todo_list_check(&backup, todo_list); - } - - todo_list_release(&backup); - return res; -} - -int check_todo_list_from_file(struct repository *r) -{ - struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT; - int res = 0; - - if (strbuf_read_file(&new_todo.buf, rebase_path_todo(), 0) < 0) { - res = error(_("could not read '%s'."), rebase_path_todo()); - goto out; - } - - if (strbuf_read_file(&old_todo.buf, rebase_path_todo_backup(), 0) < 0) { - res = error(_("could not read '%s'."), rebase_path_todo_backup()); - goto out; - } - - res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo); - if (!res) - res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo); - if (res) - fprintf(stderr, _(edit_todo_list_advice)); - if (!res) - res = todo_list_check(&old_todo, &new_todo); -out: - todo_list_release(&old_todo); - todo_list_release(&new_todo); - - return res; -} diff --git a/third_party/git/rebase-interactive.h b/third_party/git/rebase-interactive.h index dc2cf0ee12..44dbb06311 100644 --- a/third_party/git/rebase-interactive.h +++ b/third_party/git/rebase-interactive.h @@ -5,17 +5,12 @@ struct strbuf; struct repository; struct todo_list; -void append_todo_help(int command_count, +void append_todo_help(unsigned keep_empty, int command_count, const char *shortrevisions, const char *shortonto, struct strbuf *buf); int edit_todo_list(struct repository *r, struct todo_list *todo_list, struct todo_list *new_todo, const char *shortrevisions, const char *shortonto, unsigned flags); - int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo); -int todo_list_check_against_backup(struct repository *r, - struct todo_list *todo_list); - -int check_todo_list_from_file(struct repository *r); #endif diff --git a/third_party/git/rebase.c b/third_party/git/rebase.c deleted file mode 100644 index f8137d859b..0000000000 --- a/third_party/git/rebase.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "rebase.h" -#include "config.h" - -/* - * Parses textual value for pull.rebase, branch.<name>.rebase, etc. - * Unrecognised value yields REBASE_INVALID, which traditionally is - * treated the same way as REBASE_FALSE. - * - * The callers that care if (any) rebase is requested should say - * if (REBASE_TRUE <= rebase_parse_value(string)) - * - * The callers that want to differenciate an unrecognised value and - * false can do so by treating _INVALID and _FALSE differently. - */ -enum rebase_type rebase_parse_value(const char *value) -{ - int v = git_parse_maybe_bool(value); - - if (!v) - return REBASE_FALSE; - else if (v > 0) - return REBASE_TRUE; - else if (!strcmp(value, "preserve") || !strcmp(value, "p")) - return REBASE_PRESERVE; - else if (!strcmp(value, "merges") || !strcmp(value, "m")) - return REBASE_MERGES; - else if (!strcmp(value, "interactive") || !strcmp(value, "i")) - return REBASE_INTERACTIVE; - /* - * Please update _git_config() in git-completion.bash when you - * add new rebase modes. - */ - - return REBASE_INVALID; -} diff --git a/third_party/git/rebase.h b/third_party/git/rebase.h deleted file mode 100644 index cc723d4748..0000000000 --- a/third_party/git/rebase.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef REBASE_H -#define REBASE_H - -enum rebase_type { - REBASE_INVALID = -1, - REBASE_FALSE = 0, - REBASE_TRUE, - REBASE_PRESERVE, - REBASE_MERGES, - REBASE_INTERACTIVE -}; - -enum rebase_type rebase_parse_value(const char *value); - -#endif /* REBASE */ diff --git a/third_party/git/ref-filter.c b/third_party/git/ref-filter.c index b1812cb69a..f27cfc8c3e 100644 --- a/third_party/git/ref-filter.c +++ b/third_party/git/ref-filter.c @@ -79,20 +79,17 @@ static struct expand_data { } oi, oi_deref; struct ref_to_worktree_entry { - struct hashmap_entry ent; + struct hashmap_entry ent; /* must be the first member! */ struct worktree *wt; /* key is wt->head_ref */ }; static int ref_to_worktree_map_cmpfnc(const void *unused_lookupdata, - const struct hashmap_entry *eptr, - const struct hashmap_entry *kptr, + const void *existing_hashmap_entry_to_test, + const void *key, const void *keydata_aka_refname) { - const struct ref_to_worktree_entry *e, *k; - - e = container_of(eptr, const struct ref_to_worktree_entry, ent); - k = container_of(kptr, const struct ref_to_worktree_entry, ent); - + const struct ref_to_worktree_entry *e = existing_hashmap_entry_to_test; + const struct ref_to_worktree_entry *k = key; return strcmp(e->wt->head_ref, keydata_aka_refname ? keydata_aka_refname : k->wt->head_ref); } @@ -279,9 +276,9 @@ static int deltabase_atom_parser(const struct ref_format *format, struct used_at if (arg) return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments")); if (*atom->name == '*') - oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid; + oi_deref.info.delta_base_sha1 = oi_deref.delta_base_oid.hash; else - oi.info.delta_base_oid = &oi.delta_base_oid; + oi.info.delta_base_sha1 = oi.delta_base_oid.hash; return 0; } @@ -1031,7 +1028,7 @@ static const char *copy_name(const char *buf) if (!strncmp(cp, " <", 2)) return xmemdupz(buf, cp - buf); } - return xstrdup(""); + return ""; } static const char *copy_email(const char *buf) @@ -1039,10 +1036,10 @@ static const char *copy_email(const char *buf) const char *email = strchr(buf, '<'); const char *eoemail; if (!email) - return xstrdup(""); + return ""; eoemail = strchr(email, '>'); if (!eoemail) - return xstrdup(""); + return ""; return xmemdupz(email, eoemail + 1 - email); } @@ -1459,10 +1456,12 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, remote_for_branch(branch, &explicit); *s = xstrdup(explicit ? remote : ""); } else if (atom->u.remote_ref.option == RR_REMOTE_REF) { + int explicit; const char *merge; - merge = remote_ref_for_branch(branch, atom->u.remote_ref.push); - *s = xstrdup(merge ? merge : ""); + merge = remote_ref_for_branch(branch, atom->u.remote_ref.push, + &explicit); + *s = xstrdup(explicit ? merge : ""); } else BUG("unhandled RR_* enum"); } @@ -1566,10 +1565,9 @@ static void populate_worktree_map(struct hashmap *map, struct worktree **worktre struct ref_to_worktree_entry *entry; entry = xmalloc(sizeof(*entry)); entry->wt = worktrees[i]; - hashmap_entry_init(&entry->ent, - strhash(worktrees[i]->head_ref)); + hashmap_entry_init(entry, strhash(worktrees[i]->head_ref)); - hashmap_add(map, &entry->ent); + hashmap_add(map, entry); } } } @@ -1586,20 +1584,18 @@ static void lazy_init_worktree_map(void) static char *get_worktree_path(const struct used_atom *atom, const struct ref_array_item *ref) { - struct hashmap_entry entry, *e; + struct hashmap_entry entry; struct ref_to_worktree_entry *lookup_result; lazy_init_worktree_map(); hashmap_entry_init(&entry, strhash(ref->refname)); - e = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname); + lookup_result = hashmap_get(&(ref_to_worktree_map.map), &entry, ref->refname); - if (!e) + if (lookup_result) + return xstrdup(lookup_result->wt->path); + else return xstrdup(""); - - lookup_result = container_of(e, struct ref_to_worktree_entry, ent); - - return xstrdup(lookup_result->wt->path); } /* @@ -1770,7 +1766,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err) * If it is a tag object, see if we use a value that derefs * the object, and if we do grab the object it refers to. */ - oi_deref.oid = *get_tagged_oid((struct tag *)obj); + oi_deref.oid = ((struct tag *)obj)->tagged->oid; /* * NEEDSWORK: This derefs tag only once, which @@ -2001,7 +1997,7 @@ static const struct object_id *match_points_at(struct oid_array *points_at, if (!obj) die(_("malformed object at '%s'"), refname); if (obj->type == OBJ_TAG) - tagged_oid = get_tagged_oid((struct tag *)obj); + tagged_oid = &((struct tag *)obj)->tagged->oid; if (tagged_oid && oid_array_lookup(points_at, tagged_oid) >= 0) return tagged_oid; return NULL; @@ -2170,8 +2166,7 @@ void ref_array_clear(struct ref_array *array) used_atom_cnt = 0; if (ref_to_worktree_map.worktrees) { - hashmap_free_entries(&(ref_to_worktree_map.map), - struct ref_to_worktree_entry, ent); + hashmap_free(&(ref_to_worktree_map.map), 1); free_worktrees(ref_to_worktree_map.worktrees); ref_to_worktree_map.worktrees = NULL; } diff --git a/third_party/git/refs.c b/third_party/git/refs.c index 1ab0bb54d3..cd297ee4bd 100644 --- a/third_party/git/refs.c +++ b/third_party/git/refs.c @@ -1772,7 +1772,7 @@ int resolve_gitlink_ref(const char *submodule, const char *refname, struct ref_store_hash_entry { - struct hashmap_entry ent; + struct hashmap_entry ent; /* must be the first member! */ struct ref_store *refs; @@ -1781,16 +1781,11 @@ struct ref_store_hash_entry }; static int ref_store_hash_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, const void *entry_or_key, const void *keydata) { - const struct ref_store_hash_entry *e1, *e2; - const char *name; - - e1 = container_of(eptr, const struct ref_store_hash_entry, ent); - e2 = container_of(entry_or_key, const struct ref_store_hash_entry, ent); - name = keydata ? keydata : e2->name; + const struct ref_store_hash_entry *e1 = entry, *e2 = entry_or_key; + const char *name = keydata ? keydata : e2->name; return strcmp(e1->name, name); } @@ -1801,7 +1796,7 @@ static struct ref_store_hash_entry *alloc_ref_store_hash_entry( struct ref_store_hash_entry *entry; FLEX_ALLOC_STR(entry, name, name); - hashmap_entry_init(&entry->ent, strhash(name)); + hashmap_entry_init(entry, strhash(name)); entry->refs = refs; return entry; } @@ -1820,15 +1815,12 @@ static struct ref_store *lookup_ref_store_map(struct hashmap *map, const char *name) { struct ref_store_hash_entry *entry; - unsigned int hash; if (!map->tablesize) /* It's initialized on demand in register_ref_store(). */ return NULL; - hash = strhash(name); - entry = hashmap_get_entry_from_hash(map, hash, name, - struct ref_store_hash_entry, ent); + entry = hashmap_get_from_hash(map, strhash(name), name); return entry ? entry->refs : NULL; } @@ -1871,13 +1863,10 @@ static void register_ref_store_map(struct hashmap *map, struct ref_store *refs, const char *name) { - struct ref_store_hash_entry *entry; - if (!map->tablesize) hashmap_init(map, ref_store_hash_cmp, NULL, 0); - entry = alloc_ref_store_hash_entry(name, refs); - if (hashmap_put(map, &entry->ent)) + if (hashmap_put(map, alloc_ref_store_hash_entry(name, refs))) BUG("%s ref_store '%s' initialized twice", type, name); } diff --git a/third_party/git/refs.h b/third_party/git/refs.h index 545029c6d8..730d05ad91 100644 --- a/third_party/git/refs.h +++ b/third_party/git/refs.h @@ -310,35 +310,19 @@ int refs_for_each_branch_ref(struct ref_store *refs, int refs_for_each_remote_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data); -/* just iterates the head ref. */ int head_ref(each_ref_fn fn, void *cb_data); - -/* iterates all refs. */ int for_each_ref(each_ref_fn fn, void *cb_data); - -/** - * iterates all refs which have a defined prefix and strips that prefix from - * the passed variable refname. - */ int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data); - int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken); int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken); - -/** - * iterate refs from the respective area. - */ int for_each_tag_ref(each_ref_fn fn, void *cb_data); int for_each_branch_ref(each_ref_fn fn, void *cb_data); int for_each_remote_ref(each_ref_fn fn, void *cb_data); int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data); - -/* iterates all refs that match the specified glob pattern. */ int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data); - int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, const char *prefix, void *cb_data); @@ -807,41 +791,6 @@ int reflog_expire(const char *refname, const struct object_id *oid, int ref_storage_backend_exists(const char *name); struct ref_store *get_main_ref_store(struct repository *r); - -/** - * Submodules - * ---------- - * - * If you want to iterate the refs of a submodule you first need to add the - * submodules object database. You can do this by a code-snippet like - * this: - * - * const char *path = "path/to/submodule" - * if (add_submodule_odb(path)) - * die("Error submodule '%s' not populated.", path); - * - * `add_submodule_odb()` will return zero on success. If you - * do not do this you will get an error for each ref that it does not point - * to a valid object. - * - * Note: As a side-effect of this you cannot safely assume that all - * objects you lookup are available in superproject. All submodule objects - * will be available the same way as the superprojects objects. - * - * Example: - * -------- - * - * ---- - * static int handle_remote_ref(const char *refname, - * const unsigned char *sha1, int flags, void *cb_data) - * { - * struct strbuf *output = cb_data; - * strbuf_addf(output, "%s\n", refname); - * return 0; - * } - * - */ - /* * Return the ref_store instance for the specified submodule. For the * main repository, use submodule==NULL; such a call cannot fail. For diff --git a/third_party/git/refs/files-backend.c b/third_party/git/refs/files-backend.c index 561c33ac8a..d60767ab73 100644 --- a/third_party/git/refs/files-backend.c +++ b/third_party/git/refs/files-backend.c @@ -465,7 +465,8 @@ stat_ref: close(fd); strbuf_rtrim(&sb_contents); buf = sb_contents.buf; - if (skip_prefix(buf, "ref:", &buf)) { + if (starts_with(buf, "ref:")) { + buf += 4; while (isspace(*buf)) buf++; @@ -1326,7 +1327,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store, { struct files_ref_store *refs = files_downcast(ref_store, REF_STORE_WRITE, "rename_ref"); - struct object_id orig_oid; + struct object_id oid, orig_oid; int flag = 0, logmoved = 0; struct ref_lock *lock; struct stat loginfo; @@ -1394,7 +1395,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store, */ if (!copy && !refs_read_ref_full(&refs->base, newrefname, RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE, - NULL, NULL) && + &oid, NULL) && refs_delete_ref(&refs->base, NULL, newrefname, NULL, REF_NO_DEREF)) { if (errno == EISDIR) { diff --git a/third_party/git/refs/packed-backend.c b/third_party/git/refs/packed-backend.c index 4458a0f69c..c01c7f5901 100644 --- a/third_party/git/refs/packed-backend.c +++ b/third_party/git/refs/packed-backend.c @@ -1012,23 +1012,14 @@ int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err) } /* - * There is a stat-validity problem might cause `update-ref -d` - * lost the newly commit of a ref, because a new `packed-refs` - * file might has the same on-disk file attributes such as - * timestamp, file size and inode value, but has a changed - * ref value. - * - * This could happen with a very small chance when - * `update-ref -d` is called and at the same time another - * `pack-refs --all` process is running. - * - * Now that we hold the `packed-refs` lock, it is important - * to make sure we could read the latest version of - * `packed-refs` file no matter we have just mmap it or not. - * So what need to do is clear the snapshot if we hold it - * already. + * Now that we hold the `packed-refs` lock, make sure that our + * snapshot matches the current version of the file. Normally + * `get_snapshot()` does that for us, but that function + * assumes that when the file is locked, any existing snapshot + * is still valid. We've just locked the file, but it might + * have changed the moment *before* we locked it. */ - clear_snapshot(refs); + validate_snapshot(refs); /* * Now make sure that the packed-refs file as it exists in the diff --git a/third_party/git/refs/refs-internal.h b/third_party/git/refs/refs-internal.h index ff2436c0fb..f2d8c0123a 100644 --- a/third_party/git/refs/refs-internal.h +++ b/third_party/git/refs/refs-internal.h @@ -262,7 +262,7 @@ int refs_rename_ref_available(struct ref_store *refs, * after calling ref_iterator_advance() again or calling * ref_iterator_abort(), you must make a copy. When the iteration has * been exhausted, ref_iterator_advance() releases any resources - * associated with the iteration, frees the ref_iterator object, and + * assocated with the iteration, frees the ref_iterator object, and * returns ITER_DONE. If you want to abort the iteration early, call * ref_iterator_abort(), which also frees the ref_iterator object and * any associated resources. If there was an internal error advancing diff --git a/third_party/git/refspec.h b/third_party/git/refspec.h index 3f2bd4aaa5..9b6e64a824 100644 --- a/third_party/git/refspec.h +++ b/third_party/git/refspec.h @@ -20,22 +20,6 @@ struct refspec_item { #define REFSPEC_INIT_FETCH { .fetch = REFSPEC_FETCH } #define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH } -/** - * A struct refspec holds the parsed interpretation of a refspec. If it will - * force updates (starts with a '+'), force is true. If it is a pattern - * (sides end with '*') pattern is true. src and dest are the two sides - * (including '*' characters if present); if there is only one side, it is src, - * and dst is NULL; if sides exist but are empty (i.e., the refspec either - * starts or ends with ':'), the corresponding side is "". - * - * An array of strings can be parsed into an array of struct refspecs using - * parse_fetch_refspec() or parse_push_refspec(). - * - * remote_find_tracking(), given a remote and a struct refspec with either src - * or dst filled out, will fill out the other such that the result is in the - * "fetch" specification for the remote (note that this evaluates patterns and - * returns a single result). - */ struct refspec { struct refspec_item *items; int alloc; diff --git a/third_party/git/remote-curl.c b/third_party/git/remote-curl.c index e4cd321844..051f26629d 100644 --- a/third_party/git/remote-curl.c +++ b/third_party/git/remote-curl.c @@ -40,8 +40,7 @@ struct options { push_cert : 2, deepen_relative : 1, from_promisor : 1, - no_dependents : 1, - atomic : 1; + no_dependents : 1; }; static struct options options; static struct string_list cas_options = STRING_LIST_INIT_DUP; @@ -149,14 +148,6 @@ static int set_option(const char *name, const char *value) else return -1; return 0; - } else if (!strcmp(name, "atomic")) { - if (!strcmp(value, "true")) - options.atomic = 1; - else if (!strcmp(value, "false")) - options.atomic = 0; - else - return -1; - return 0; } else if (!strcmp(name, "push-option")) { if (*value != '"') string_list_append(&options.push_options, value); @@ -1026,7 +1017,6 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch) walker = get_http_walker(url.buf); walker->get_verbosely = options.verbosity >= 3; - walker->get_progress = options.progress; walker->get_recover = 0; ret = walker_fetch(walker, nr_heads, targets, NULL, NULL); walker_free(walker); @@ -1164,7 +1154,7 @@ static void parse_fetch(struct strbuf *buf) strbuf_reset(buf); } -static int push_dav(int nr_spec, const char **specs) +static int push_dav(int nr_spec, char **specs) { struct child_process child = CHILD_PROCESS_INIT; size_t i; @@ -1185,7 +1175,7 @@ static int push_dav(int nr_spec, const char **specs) return 0; } -static int push_git(struct discovery *heads, int nr_spec, const char **specs) +static int push_git(struct discovery *heads, int nr_spec, char **specs) { struct rpc_state rpc; int i, err; @@ -1206,8 +1196,6 @@ static int push_git(struct discovery *heads, int nr_spec, const char **specs) argv_array_push(&args, "--signed=yes"); else if (options.push_cert == SEND_PACK_PUSH_CERT_IF_ASKED) argv_array_push(&args, "--signed=if-asked"); - if (options.atomic) - argv_array_push(&args, "--atomic"); if (options.verbosity == 0) argv_array_push(&args, "--quiet"); else if (options.verbosity > 1) @@ -1237,7 +1225,7 @@ static int push_git(struct discovery *heads, int nr_spec, const char **specs) return err; } -static int push(int nr_spec, const char **specs) +static int push(int nr_spec, char **specs) { struct discovery *heads = discover_refs("git-receive-pack", 1); int ret; @@ -1252,13 +1240,14 @@ static int push(int nr_spec, const char **specs) static void parse_push(struct strbuf *buf) { - struct argv_array specs = ARGV_ARRAY_INIT; - int ret; + char **specs = NULL; + int alloc_spec = 0, nr_spec = 0, i, ret; do { - const char *arg; - if (skip_prefix(buf->buf, "push ", &arg)) - argv_array_push(&specs, arg); + if (starts_with(buf->buf, "push ")) { + ALLOC_GROW(specs, nr_spec + 1, alloc_spec); + specs[nr_spec++] = xstrdup(buf->buf + 5); + } else die(_("http transport does not support %s"), buf->buf); @@ -1269,7 +1258,7 @@ static void parse_push(struct strbuf *buf) break; } while (1); - ret = push(specs.argc, specs.argv); + ret = push(nr_spec, specs); printf("\n"); fflush(stdout); @@ -1277,7 +1266,9 @@ static void parse_push(struct strbuf *buf) exit(128); /* error already reported */ free_specs: - argv_array_clear(&specs); + for (i = 0; i < nr_spec; i++) + free(specs[i]); + free(specs); } static int stateless_connect(const char *service_name) diff --git a/third_party/git/remote.c b/third_party/git/remote.c index c43196ec06..e50f7602ed 100644 --- a/third_party/git/remote.c +++ b/third_party/git/remote.c @@ -111,16 +111,14 @@ struct remotes_hash_key { }; static int remotes_hash_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *keydata) { - const struct remote *a, *b; + const struct remote *a = entry; + const struct remote *b = entry_or_key; const struct remotes_hash_key *key = keydata; - a = container_of(eptr, const struct remote, ent); - b = container_of(entry_or_key, const struct remote, ent); - if (key) return strncmp(a->name, key->str, key->len) || a->name[key->len]; else @@ -137,7 +135,7 @@ static struct remote *make_remote(const char *name, int len) { struct remote *ret, *replaced; struct remotes_hash_key lookup; - struct hashmap_entry lookup_entry, *e; + struct hashmap_entry lookup_entry; if (!len) len = strlen(name); @@ -147,9 +145,8 @@ static struct remote *make_remote(const char *name, int len) lookup.len = len; hashmap_entry_init(&lookup_entry, memhash(name, len)); - e = hashmap_get(&remotes_hash, &lookup_entry, &lookup); - if (e) - return container_of(e, struct remote, ent); + if ((ret = hashmap_get(&remotes_hash, &lookup_entry, &lookup)) != NULL) + return ret; ret = xcalloc(1, sizeof(struct remote)); ret->prune = -1; /* unspecified */ @@ -161,8 +158,8 @@ static struct remote *make_remote(const char *name, int len) ALLOC_GROW(remotes, remotes_nr + 1, remotes_alloc); remotes[remotes_nr++] = ret; - hashmap_entry_init(&ret->ent, lookup_entry.hash); - replaced = hashmap_put_entry(&remotes_hash, ret, ent); + hashmap_entry_init(ret, lookup_entry.hash); + replaced = hashmap_put(&remotes_hash, ret); assert(replaced == NULL); /* no previous entry overwritten */ return ret; } @@ -369,8 +366,7 @@ static int handle_config(const char *key, const char *value, void *cb) } remote = make_remote(name, namelen); remote->origin = REMOTE_CONFIG; - if (current_config_scope() == CONFIG_SCOPE_LOCAL || - current_config_scope() == CONFIG_SCOPE_WORKTREE) + if (current_config_scope() == CONFIG_SCOPE_REPO) remote->configured_in_repo = 1; if (!strcmp(subkey, "mirror")) remote->mirror = git_config_bool(key, value); @@ -516,11 +512,14 @@ const char *pushremote_for_branch(struct branch *branch, int *explicit) return remote_for_branch(branch, explicit); } -const char *remote_ref_for_branch(struct branch *branch, int for_push) +const char *remote_ref_for_branch(struct branch *branch, int for_push, + int *explicit) { if (branch) { if (!for_push) { if (branch->merge_nr) { + if (explicit) + *explicit = 1; return branch->merge_name[0]; } } else { @@ -531,11 +530,15 @@ const char *remote_ref_for_branch(struct branch *branch, int for_push) if (remote && remote->push.nr && (dst = apply_refspecs(&remote->push, branch->refname))) { + if (explicit) + *explicit = 1; return dst; } } } - return NULL; + if (explicit) + *explicit = 0; + return ""; } static struct remote *remote_get_1(const char *name, diff --git a/third_party/git/remote.h b/third_party/git/remote.h index 11d8719b58..83e885672b 100644 --- a/third_party/git/remote.h +++ b/third_party/git/remote.h @@ -6,14 +6,6 @@ #include "hashmap.h" #include "refspec.h" -/** - * The API gives access to the configuration related to remotes. It handles - * all three configuration mechanisms historically and currently used by Git, - * and presents the information in a uniform fashion. Note that the code also - * handles plain URLs without any configuration, giving them just the default - * information. - */ - enum { REMOTE_UNCONFIGURED = 0, REMOTE_CONFIG, @@ -22,24 +14,18 @@ enum { }; struct remote { - struct hashmap_entry ent; + struct hashmap_entry ent; /* must be first */ - /* The user's nickname for the remote */ const char *name; - int origin, configured_in_repo; const char *foreign_vcs; - /* An array of all of the url_nr URLs configured for the remote */ const char **url; - int url_nr; int url_alloc; - /* An array of all of the pushurl_nr push URLs configured for the remote */ const char **pushurl; - int pushurl_nr; int pushurl_alloc; @@ -48,47 +34,32 @@ struct remote { struct refspec fetch; /* - * The setting for whether to fetch tags (as a separate rule from the - * configured refspecs); * -1 to never fetch tags * 0 to auto-follow tags on heuristic (default) * 1 to always auto-follow tags * 2 to always fetch tags */ int fetch_tags; - int skip_default_update; int mirror; int prune; int prune_tags; - /** - * The configured helper programs to run on the remote side, for - * Git-native protocols. - */ const char *receivepack; const char *uploadpack; - /* The proxy to use for curl (http, https, ftp, etc.) URLs. */ + /* + * for curl remotes only + */ char *http_proxy; - - /* The method used for authenticating against `http_proxy`. */ char *http_proxy_authmethod; }; -/** - * struct remotes can be found by name with remote_get(). - * remote_get(NULL) will return the default remote, given the current branch - * and configuration. - */ struct remote *remote_get(const char *name); - struct remote *pushremote_get(const char *name); int remote_is_configured(struct remote *remote, int in_repo); typedef int each_remote_fn(struct remote *remote, void *priv); - -/* iterate through struct remotes */ int for_each_remote(each_remote_fn fn, void *priv); int remote_has_url(struct remote *remote, const char *url); @@ -223,36 +194,16 @@ struct ref *get_remote_ref(const struct ref *remote_refs, const char *name); */ int remote_find_tracking(struct remote *remote, struct refspec_item *refspec); -/** - * struct branch holds the configuration for a branch. It can be looked up with - * branch_get(name) for "refs/heads/{name}", or with branch_get(NULL) for HEAD. - */ struct branch { - - /* The short name of the branch. */ const char *name; - - /* The full path for the branch ref. */ const char *refname; - /* The name of the remote listed in the configuration. */ const char *remote_name; - const char *pushremote_name; - /* An array of the "merge" lines in the configuration. */ const char **merge_name; - - /** - * An array of the struct refspecs used for the merge lines. That is, - * merge[i]->dst is a local tracking ref which should be merged into this - * branch by default. - */ struct refspec_item **merge; - - /* The number of merge configurations */ int merge_nr; - int merge_alloc; const char *push_tracking_ref; @@ -261,11 +212,10 @@ struct branch { struct branch *branch_get(const char *name); const char *remote_for_branch(struct branch *branch, int *explicit); const char *pushremote_for_branch(struct branch *branch, int *explicit); -const char *remote_ref_for_branch(struct branch *branch, int for_push); +const char *remote_ref_for_branch(struct branch *branch, int for_push, + int *explicit); -/* returns true if the given branch has merge configuration given. */ int branch_has_merge_config(struct branch *branch); - int branch_merge_matches(struct branch *, int n, const char *); /** diff --git a/third_party/git/replace-object.c b/third_party/git/replace-object.c index 7bd9aba6ee..e295e87943 100644 --- a/third_party/git/replace-object.c +++ b/third_party/git/replace-object.c @@ -34,23 +34,14 @@ static int register_replace_ref(struct repository *r, void prepare_replace_object(struct repository *r) { - if (r->objects->replace_map_initialized) + if (r->objects->replace_map) return; - pthread_mutex_lock(&r->objects->replace_mutex); - if (r->objects->replace_map_initialized) { - pthread_mutex_unlock(&r->objects->replace_mutex); - return; - } - r->objects->replace_map = xmalloc(sizeof(*r->objects->replace_map)); oidmap_init(r->objects->replace_map, 0); for_each_replace_ref(r, register_replace_ref, NULL); - r->objects->replace_map_initialized = 1; - - pthread_mutex_unlock(&r->objects->replace_mutex); } /* We allow "recursive" replacement. Only within reason, though */ diff --git a/third_party/git/replace-object.h b/third_party/git/replace-object.h index 3fbc32eb7b..04ed7a85a2 100644 --- a/third_party/git/replace-object.h +++ b/third_party/git/replace-object.h @@ -24,17 +24,12 @@ const struct object_id *do_lookup_replace_object(struct repository *r, * name (replaced recursively, if necessary). The return value is * either sha1 or a pointer to a permanently-allocated value. When * object replacement is suppressed, always return sha1. - * - * Note: some thread debuggers might point a data race on the - * replace_map_initialized reading in this function. However, we know there's no - * problem in the value being updated by one thread right after another one read - * it here (and it should be written to only once, anyway). */ static inline const struct object_id *lookup_replace_object(struct repository *r, const struct object_id *oid) { if (!read_replace_refs || - (r->objects->replace_map_initialized && + (r->objects->replace_map && r->objects->replace_map->map.tablesize == 0)) return oid; return do_lookup_replace_object(r, oid); diff --git a/third_party/git/repo-settings.c b/third_party/git/repo-settings.c deleted file mode 100644 index a703e407a3..0000000000 --- a/third_party/git/repo-settings.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "cache.h" -#include "config.h" -#include "repository.h" - -#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0) - -void prepare_repo_settings(struct repository *r) -{ - int value; - char *strval; - - if (r->settings.initialized) - return; - - /* Defaults */ - memset(&r->settings, -1, sizeof(r->settings)); - - if (!repo_config_get_bool(r, "core.commitgraph", &value)) - r->settings.core_commit_graph = value; - if (!repo_config_get_bool(r, "gc.writecommitgraph", &value)) - r->settings.gc_write_commit_graph = value; - UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1); - UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1); - - if (!repo_config_get_int(r, "index.version", &value)) - r->settings.index_version = value; - if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) { - if (value == 0) - r->settings.core_untracked_cache = UNTRACKED_CACHE_REMOVE; - else - r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE; - } else if (!repo_config_get_string(r, "core.untrackedcache", &strval)) { - if (!strcasecmp(strval, "keep")) - r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP; - - free(strval); - } - - if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) { - if (!strcasecmp(strval, "skipping")) - r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING; - else - r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT; - } - - if (!repo_config_get_bool(r, "pack.usesparse", &value)) - r->settings.pack_use_sparse = value; - if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) { - UPDATE_DEFAULT_BOOL(r->settings.index_version, 4); - UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE); - } - if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value)) - r->settings.fetch_write_commit_graph = value; - if (!repo_config_get_bool(r, "feature.experimental", &value) && value) { - UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1); - UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING); - UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1); - } - UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0); - - /* Hack for test programs like test-dump-untracked-cache */ - if (ignore_untracked_cache_config) - r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP; - else - UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_KEEP); - - UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_DEFAULT); -} diff --git a/third_party/git/repository.c b/third_party/git/repository.c index a4174ddb06..682c239fe3 100644 --- a/third_party/git/repository.c +++ b/third_party/git/repository.c @@ -200,9 +200,9 @@ int repo_submodule_init(struct repository *subrepo, if (repo_init(subrepo, gitdir.buf, worktree.buf)) { /* - * If initialization fails then it may be due to the submodule + * If initilization fails then it may be due to the submodule * not being populated in the superproject's worktree. Instead - * we can try to initialize the submodule by finding it's gitdir + * we can try to initilize the submodule by finding it's gitdir * in the superproject's 'modules' directory. In this case the * submodule would not have a worktree. */ diff --git a/third_party/git/repository.h b/third_party/git/repository.h index 040057dea6..4fb6a5885f 100644 --- a/third_party/git/repository.h +++ b/third_party/git/repository.h @@ -11,34 +11,6 @@ struct pathspec; struct raw_object_store; struct submodule_cache; -enum untracked_cache_setting { - UNTRACKED_CACHE_UNSET = -1, - UNTRACKED_CACHE_REMOVE = 0, - UNTRACKED_CACHE_KEEP = 1, - UNTRACKED_CACHE_WRITE = 2 -}; - -enum fetch_negotiation_setting { - FETCH_NEGOTIATION_UNSET = -1, - FETCH_NEGOTIATION_NONE = 0, - FETCH_NEGOTIATION_DEFAULT = 1, - FETCH_NEGOTIATION_SKIPPING = 2, -}; - -struct repo_settings { - int initialized; - - int core_commit_graph; - int gc_write_commit_graph; - int fetch_write_commit_graph; - - int index_version; - enum untracked_cache_setting core_untracked_cache; - - int pack_use_sparse; - enum fetch_negotiation_setting fetch_negotiation_algorithm; -}; - struct repository { /* Environment */ /* @@ -100,8 +72,6 @@ struct repository { */ char *submodule_prefix; - struct repo_settings settings; - /* Subsystems */ /* * Repository's config which contains key-value pairs from the usual @@ -125,9 +95,6 @@ struct repository { /* A unique-id for tracing purposes. */ int trace2_repo_id; - /* True if commit-graph has been disabled within this process. */ - int commit_graph_disabled; - /* Configurations */ /* Indicate if a repository has a different 'commondir' from 'gitdir' */ @@ -172,7 +139,7 @@ void repo_clear(struct repository *repo); * be allocated if needed. * * Return the number of index entries in the populated index or a value less - * than zero if an error occurred. If the repository's index has already been + * than zero if an error occured. If the repository's index has already been * populated then the number of entries will simply be returned. */ int repo_read_index(struct repository *repo); @@ -190,6 +157,5 @@ int repo_read_index_unmerged(struct repository *); */ void repo_update_index_if_able(struct repository *, struct lock_file *); -void prepare_repo_settings(struct repository *r); #endif /* REPOSITORY_H */ diff --git a/third_party/git/rerere.c b/third_party/git/rerere.c index 9281131a9f..17abb47321 100644 --- a/third_party/git/rerere.c +++ b/third_party/git/rerere.c @@ -52,7 +52,7 @@ static void free_rerere_id(struct string_list_item *item) static const char *rerere_id_hex(const struct rerere_id *id) { - return hash_to_hex(id->collection->hash); + return sha1_to_hex(id->collection->hash); } static void fit_variant(struct rerere_dir *rr_dir, int variant) @@ -115,7 +115,7 @@ static int is_rr_file(const char *name, const char *filename, int *variant) static void scan_rerere_dir(struct rerere_dir *rr_dir) { struct dirent *de; - DIR *dir = opendir(git_path("rr-cache/%s", hash_to_hex(rr_dir->hash))); + DIR *dir = opendir(git_path("rr-cache/%s", sha1_to_hex(rr_dir->hash))); if (!dir) return; @@ -186,9 +186,9 @@ static struct rerere_id *new_rerere_id_hex(char *hex) return id; } -static struct rerere_id *new_rerere_id(unsigned char *hash) +static struct rerere_id *new_rerere_id(unsigned char *sha1) { - return new_rerere_id_hex(hash_to_hex(hash)); + return new_rerere_id_hex(sha1_to_hex(sha1)); } /* @@ -431,7 +431,7 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io, * and NUL concatenated together. * * Return 1 if conflict hunks are found, 0 if there are no conflict - * hunks and -1 if an error occurred. + * hunks and -1 if an error occured. */ static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size) { diff --git a/third_party/git/revision.c b/third_party/git/revision.c index 8136929e23..07412297f0 100644 --- a/third_party/git/revision.c +++ b/third_party/git/revision.c @@ -28,7 +28,6 @@ #include "commit-graph.h" #include "prio-queue.h" #include "hashmap.h" -#include "utf8.h" volatile show_early_output_fn_t show_early_output; @@ -108,34 +107,30 @@ struct path_and_oids_entry { }; static int path_and_oids_cmp(const void *hashmap_cmp_fn_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const struct path_and_oids_entry *e1, + const struct path_and_oids_entry *e2, const void *keydata) { - const struct path_and_oids_entry *e1, *e2; - - e1 = container_of(eptr, const struct path_and_oids_entry, ent); - e2 = container_of(entry_or_key, const struct path_and_oids_entry, ent); - return strcmp(e1->path, e2->path); } static void paths_and_oids_init(struct hashmap *map) { - hashmap_init(map, path_and_oids_cmp, NULL, 0); + hashmap_init(map, (hashmap_cmp_fn) path_and_oids_cmp, NULL, 0); } static void paths_and_oids_clear(struct hashmap *map) { struct hashmap_iter iter; struct path_and_oids_entry *entry; + hashmap_iter_init(map, &iter); - hashmap_for_each_entry(map, &iter, entry, ent /* member name */) { + while ((entry = (struct path_and_oids_entry *)hashmap_iter_next(&iter))) { oidset_clear(&entry->trees); free(entry->path); } - hashmap_free_entries(map, struct path_and_oids_entry, ent); + hashmap_free(map, 1); } static void paths_and_oids_insert(struct hashmap *map, @@ -146,19 +141,18 @@ static void paths_and_oids_insert(struct hashmap *map, struct path_and_oids_entry key; struct path_and_oids_entry *entry; - hashmap_entry_init(&key.ent, hash); + hashmap_entry_init(&key, hash); /* use a shallow copy for the lookup */ key.path = (char *)path; oidset_init(&key.trees, 0); - entry = hashmap_get_entry(map, &key, ent, NULL); - if (!entry) { + if (!(entry = (struct path_and_oids_entry *)hashmap_get(map, &key, NULL))) { entry = xcalloc(1, sizeof(struct path_and_oids_entry)); - hashmap_entry_init(&entry->ent, hash); + hashmap_entry_init(entry, hash); entry->path = xstrdup(key.path); oidset_init(&entry->trees, 16); - hashmap_put(map, &entry->ent); + hashmap_put(map, entry); } oidset_insert(&entry->trees, oid); @@ -241,7 +235,8 @@ void mark_trees_uninteresting_sparse(struct repository *r, add_children_by_path(r, tree, &map); } - hashmap_for_each_entry(&map, &map_iter, entry, ent /* member name */) + hashmap_iter_init(&map, &map_iter); + while ((entry = hashmap_iter_next(&map_iter))) mark_trees_uninteresting_sparse(r, &entry->trees); paths_and_oids_clear(&map); @@ -409,7 +404,9 @@ static struct commit *handle_commit(struct rev_info *revs, struct tag *tag = (struct tag *) object; if (revs->tag_objects && !(flags & UNINTERESTING)) add_pending_object(revs, object, tag->tag); - object = parse_object(revs->repo, get_tagged_oid(tag)); + if (!tag->tagged) + die("bad tag"); + object = parse_object(revs->repo, &tag->tagged->oid); if (!object) { if (revs->ignore_missing_links || (flags & UNINTERESTING)) return NULL; @@ -1668,7 +1665,7 @@ void repo_init_revisions(struct repository *r, revs->diffopt.prefix_length = strlen(prefix); } - init_display_notes(&revs->notes_opt); + revs->notes_opt.use_default_notes = -1; } static void add_pending_commit_list(struct rev_info *revs, @@ -2066,6 +2063,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->simplify_by_decoration = 1; revs->limited = 1; revs->prune = 1; + load_ref_decorations(NULL, DECORATE_SHORT_REFS); } else if (!strcmp(arg, "--date-order")) { revs->sort_order = REV_SORT_BY_COMMIT_DATE; revs->topo_order = 1; @@ -2203,8 +2201,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg die("'%s': not a non-negative integer", arg); revs->expand_tabs_in_log = val; } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) { - enable_default_display_notes(&revs->notes_opt, &revs->show_notes); + revs->show_notes = 1; revs->show_notes_given = 1; + revs->notes_opt.use_default_notes = 1; } else if (!strcmp(arg, "--show-signature")) { revs->show_signature = 1; } else if (!strcmp(arg, "--no-show-signature")) { @@ -2219,14 +2218,25 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->track_first_time = 1; } else if (skip_prefix(arg, "--show-notes=", &optarg) || skip_prefix(arg, "--notes=", &optarg)) { + struct strbuf buf = STRBUF_INIT; + revs->show_notes = 1; + revs->show_notes_given = 1; if (starts_with(arg, "--show-notes=") && revs->notes_opt.use_default_notes < 0) revs->notes_opt.use_default_notes = 1; - enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg); - revs->show_notes_given = 1; + strbuf_addstr(&buf, optarg); + expand_notes_ref(&buf); + string_list_append(&revs->notes_opt.extra_notes_refs, + strbuf_detach(&buf, NULL)); } else if (!strcmp(arg, "--no-notes")) { - disable_display_notes(&revs->notes_opt, &revs->show_notes); + revs->show_notes = 0; revs->show_notes_given = 1; + revs->notes_opt.use_default_notes = -1; + /* we have been strdup'ing ourselves, so trick + * string_list into free()ing strings */ + revs->notes_opt.extra_notes_refs.strdup_strings = 1; + string_list_clear(&revs->notes_opt.extra_notes_refs, 0); + revs->notes_opt.extra_notes_refs.strdup_strings = 0; } else if (!strcmp(arg, "--standard-notes")) { revs->show_notes_given = 1; revs->notes_opt.use_default_notes = 1; @@ -2513,7 +2523,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt; struct argv_array prune_data = ARGV_ARRAY_INIT; const char *submodule = NULL; - int seen_end_of_options = 0; if (opt) submodule = opt->submodule; @@ -2543,7 +2552,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s revarg_opt |= REVARG_CANNOT_BE_FILENAME; for (left = i = 1; i < argc; i++) { const char *arg = argv[i]; - if (!seen_end_of_options && *arg == '-') { + if (*arg == '-') { int opts; opts = handle_revision_pseudo_opt(submodule, @@ -2565,11 +2574,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s continue; } - if (!strcmp(arg, "--end-of-options")) { - seen_end_of_options = 1; - continue; - } - opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv, opt); if (opts > 0) { @@ -2680,8 +2684,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED, &revs->grep_filter); - if (!is_encoding_utf8(get_log_output_encoding())) - revs->grep_filter.ignore_locale = 1; compile_grep_patterns(&revs->grep_filter); if (revs->reverse && revs->reflog_info) @@ -3086,7 +3088,7 @@ static void set_children(struct rev_info *revs) void reset_revision_walk(void) { - clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE); + clear_object_flags(SEEN | ADDED | SHOWN); } static int mark_uninteresting(const struct object_id *oid, @@ -3199,26 +3201,10 @@ static void compute_indegrees_to_depth(struct rev_info *revs, indegree_walk_step(revs); } -static void reset_topo_walk(struct rev_info *revs) -{ - struct topo_walk_info *info = revs->topo_walk_info; - - clear_prio_queue(&info->explore_queue); - clear_prio_queue(&info->indegree_queue); - clear_prio_queue(&info->topo_queue); - clear_indegree_slab(&info->indegree); - clear_author_date_slab(&info->author_date); - - FREE_AND_NULL(revs->topo_walk_info); -} - static void init_topo_walk(struct rev_info *revs) { struct topo_walk_info *info; struct commit_list *list; - if (revs->topo_walk_info) - reset_topo_walk(revs); - revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info)); info = revs->topo_walk_info; memset(info, 0, sizeof(struct topo_walk_info)); @@ -3948,7 +3934,7 @@ struct commit *get_revision(struct rev_info *revs) return c; } -const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit) +char *get_revision_mark(const struct rev_info *revs, const struct commit *commit) { if (commit->object.flags & BOUNDARY) return "-"; @@ -3970,7 +3956,7 @@ const char *get_revision_mark(const struct rev_info *revs, const struct commit * void put_revision_mark(const struct rev_info *revs, const struct commit *commit) { - const char *mark = get_revision_mark(revs, commit); + char *mark = get_revision_mark(revs, commit); if (!strlen(mark)) return; fputs(mark, stdout); diff --git a/third_party/git/revision.h b/third_party/git/revision.h index 475f048fb6..4134dc6029 100644 --- a/third_party/git/revision.h +++ b/third_party/git/revision.h @@ -9,19 +9,6 @@ #include "diff.h" #include "commit-slab-decl.h" -/** - * The revision walking API offers functions to build a list of revisions - * and then iterate over that list. - * - * Calling sequence - * ---------------- - * - * The walking API has a given calling sequence: first you need to initialize - * a rev_info structure, then add revisions to control what kind of revision - * list do you want to get, finally you can iterate over the revision list. - * - */ - /* Remember to update object flag allocation in object.h */ #define SEEN (1u<<0) #define UNINTERESTING (1u<<1) @@ -190,10 +177,10 @@ struct rev_info { always_show_header:1; /* Format info */ - int show_notes; unsigned int shown_one:1, shown_dashes:1, show_merge:1, + show_notes:1, show_notes_given:1, show_signature:1, pretty_given:1, @@ -319,29 +306,11 @@ struct setup_revision_opt { #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS #define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix) #endif - -/** - * Initialize a rev_info structure with default values. The third parameter may - * be NULL or can be prefix path, and then the `.prefix` variable will be set - * to it. This is typically the first function you want to call when you want - * to deal with a revision list. After calling this function, you are free to - * customize options, like set `.ignore_merges` to 0 if you don't want to - * ignore merges, and so on. - */ void repo_init_revisions(struct repository *r, struct rev_info *revs, const char *prefix); - -/** - * Parse revision information, filling in the `rev_info` structure, and - * removing the used arguments from the argument list. Returns the number - * of arguments left that weren't recognized, which are also moved to the - * head of the argument list. The last parameter is used in case no - * parameter given by the first two arguments. - */ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *); - void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, const struct option *options, const char * const usagestr[]); @@ -350,28 +319,11 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx, int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt); -/** - * Reset the flags used by the revision walking api. You can use this to do - * multiple sequential revision walks. - */ void reset_revision_walk(void); - -/** - * Prepares the rev_info structure for a walk. You should check if it returns - * any error (non-zero return code) and if it does not, you can start using - * get_revision() to do the iteration. - */ int prepare_revision_walk(struct rev_info *revs); - -/** - * Takes a pointer to a `rev_info` structure and iterates over it, returning a - * `struct commit *` each time you call it. The end of the revision list is - * indicated by returning a NULL pointer. - */ struct commit *get_revision(struct rev_info *revs); - -const char *get_revision_mark(const struct rev_info *revs, - const struct commit *commit); +char *get_revision_mark(const struct rev_info *revs, + const struct commit *commit); void put_revision_mark(const struct rev_info *revs, const struct commit *commit); @@ -381,19 +333,8 @@ void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees) void show_object_with_name(FILE *, struct object *, const char *); -/** - * This function can be used if you want to add commit objects as revision - * information. You can use the `UNINTERESTING` object flag to indicate if - * you want to include or exclude the given commit (and commits reachable - * from the given commit) from the revision list. - * - * NOTE: If you have the commits as a string list then you probably want to - * use setup_revisions(), instead of parsing each string and using this - * function. - */ void add_pending_object(struct rev_info *revs, struct object *obj, const char *name); - void add_pending_oid(struct rev_info *revs, const char *name, const struct object_id *oid, unsigned int flags); diff --git a/third_party/git/run-command.c b/third_party/git/run-command.c index f5e1149f9b..3449db319b 100644 --- a/third_party/git/run-command.c +++ b/third_party/git/run-command.c @@ -213,9 +213,8 @@ static char *locate_in_PATH(const char *file) static int exists_in_PATH(const char *file) { char *r = locate_in_PATH(file); - int found = r != NULL; free(r); - return found; + return r != NULL; } int sane_execvp(const char *file, char * const argv[]) @@ -413,7 +412,8 @@ static int prepare_cmd(struct argv_array *out, const struct child_process *cmd) argv_array_push(out, SHELL_PATH); if (cmd->git_cmd) { - prepare_git_cmd(out, cmd->argv); + argv_array_push(out, "git"); + argv_array_pushv(out, cmd->argv); } else if (cmd->use_shell) { prepare_shell_cmd(out, cmd->argv); } else { diff --git a/third_party/git/run-command.h b/third_party/git/run-command.h index 0f3cc73ab6..f769e03f01 100644 --- a/third_party/git/run-command.h +++ b/third_party/git/run-command.h @@ -5,60 +5,8 @@ #include "argv-array.h" -/** - * The run-command API offers a versatile tool to run sub-processes with - * redirected input and output as well as with a modified environment - * and an alternate current directory. - * - * A similar API offers the capability to run a function asynchronously, - * which is primarily used to capture the output that the function - * produces in the caller in order to process it. - */ - - -/** - * This describes the arguments, redirections, and environment of a - * command to run in a sub-process. - * - * The caller: - * - * 1. allocates and clears (using child_process_init() or - * CHILD_PROCESS_INIT) a struct child_process variable; - * 2. initializes the members; - * 3. calls start_command(); - * 4. processes the data; - * 5. closes file descriptors (if necessary; see below); - * 6. calls finish_command(). - * - * Special forms of redirection are available by setting these members - * to 1: - * - * .no_stdin, .no_stdout, .no_stderr: The respective channel is - * redirected to /dev/null. - * - * .stdout_to_stderr: stdout of the child is redirected to its - * stderr. This happens after stderr is itself redirected. - * So stdout will follow stderr to wherever it is - * redirected. - */ struct child_process { - - /** - * The .argv member is set up as an array of string pointers (NULL - * terminated), of which .argv[0] is the program name to run (usually - * without a path). If the command to run is a git command, set argv[0] to - * the command name without the 'git-' prefix and set .git_cmd = 1. - * - * Note that the ownership of the memory pointed to by .argv stays with the - * caller, but it should survive until `finish_command` completes. If the - * .argv member is NULL, `start_command` will point it at the .args - * `argv_array` (so you may use one or the other, but you must use exactly - * one). The memory in .args will be cleaned up automatically during - * `finish_command` (or during `start_command` when it is unsuccessful). - * - */ const char **argv; - struct argv_array args; struct argv_array env_array; pid_t pid; @@ -70,8 +18,8 @@ struct child_process { /* * Using .in, .out, .err: - * - Specify 0 for no redirections. No new file descriptor is allocated. - * (child inherits stdin, stdout, stderr from parent). + * - Specify 0 for no redirections (child inherits stdin, stdout, + * stderr from parent). * - Specify -1 to have a pipe allocated as follows: * .in: returns the writable pipe end; parent writes to it, * the readable pipe end becomes child's stdin @@ -89,43 +37,13 @@ struct child_process { int in; int out; int err; - - /** - * To specify a new initial working directory for the sub-process, - * specify it in the .dir member. - */ const char *dir; - - /** - * To modify the environment of the sub-process, specify an array of - * string pointers (NULL terminated) in .env: - * - * - If the string is of the form "VAR=value", i.e. it contains '=' - * the variable is added to the child process's environment. - * - * - If the string does not contain '=', it names an environment - * variable that will be removed from the child process's environment. - * - * If the .env member is NULL, `start_command` will point it at the - * .env_array `argv_array` (so you may use one or the other, but not both). - * The memory in .env_array will be cleaned up automatically during - * `finish_command` (or during `start_command` when it is unsuccessful). - */ const char *const *env; - unsigned no_stdin:1; unsigned no_stdout:1; unsigned no_stderr:1; unsigned git_cmd:1; /* if this is to be git sub-command */ - - /** - * If the program cannot be found, the functions return -1 and set - * errno to ENOENT. Normally, an error message is printed, but if - * .silent_exec_failure is set to 1, no message is printed for this - * special error condition. - */ unsigned silent_exec_failure:1; - unsigned stdout_to_stderr:1; unsigned use_shell:1; unsigned clean_on_exit:1; @@ -135,63 +53,13 @@ struct child_process { }; #define CHILD_PROCESS_INIT { NULL, ARGV_ARRAY_INIT, ARGV_ARRAY_INIT } - -/** - * The functions: child_process_init, start_command, finish_command, - * run_command, run_command_v_opt, run_command_v_opt_cd_env, child_process_clear - * do the following: - * - * - If a system call failed, errno is set and -1 is returned. A diagnostic - * is printed. - * - * - If the program was not found, then -1 is returned and errno is set to - * ENOENT; a diagnostic is printed only if .silent_exec_failure is 0. - * - * - Otherwise, the program is run. If it terminates regularly, its exit - * code is returned. No diagnostic is printed, even if the exit code is - * non-zero. - * - * - If the program terminated due to a signal, then the return value is the - * signal number + 128, ie. the same value that a POSIX shell's $? would - * report. A diagnostic is printed. - * - */ - -/** - * Initialize a struct child_process variable. - */ void child_process_init(struct child_process *); - -/** - * Release the memory associated with the struct child_process. - * Most users of the run-command API don't need to call this - * function explicitly because `start_command` invokes it on - * failure and `finish_command` calls it automatically already. - */ void child_process_clear(struct child_process *); - int is_executable(const char *name); -/** - * 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. - */ int start_command(struct child_process *); - -/** - * Wait for the completion of a sub-process that was started with - * start_command(). - */ int finish_command(struct child_process *); - int finish_command_in_signal(struct child_process *); - -/** - * A convenience function that encapsulates a sequence of - * start_command() followed by finish_command(). Takes a pointer - * to a `struct child_process` that specifies the details. - */ int run_command(struct child_process *); /* @@ -200,20 +68,6 @@ int run_command(struct child_process *); * overwritten by further calls to find_hook and run_hook_*. */ const char *find_hook(const char *name); - -/** - * Run a hook. - * The first argument is a pathname to an index file, or NULL - * if the hook uses the default index file or no index is needed. - * The second argument is the name of the hook. - * The further arguments correspond to the hook arguments. - * The last argument has to be NULL to terminate the arguments list. - * If the hook does not exist or is not executable, the return - * value will be zero. - * If it is executable, the hook will be executed and the exit - * status of the hook is returned. - * On execution, .stdout_to_stderr and .no_stdin will be set. - */ LAST_ARG_MUST_BE_NULL int run_hook_le(const char *const *env, const char *name, ...); int run_hook_ve(const char *const *env, const char *name, va_list args); @@ -224,18 +78,6 @@ int run_hook_ve(const char *const *env, const char *name, va_list args); #define RUN_SILENT_EXEC_FAILURE 8 #define RUN_USING_SHELL 16 #define RUN_CLEAN_ON_EXIT 32 - -/** - * Convenience functions that encapsulate a sequence of - * start_command() followed by finish_command(). The argument argv - * specifies the program and its arguments. The argument opt is zero - * or more of the flags `RUN_COMMAND_NO_STDIN`, `RUN_GIT_CMD`, - * `RUN_COMMAND_STDOUT_TO_STDERR`, or `RUN_SILENT_EXEC_FAILURE` - * that correspond to the members .no_stdin, .git_cmd, - * .stdout_to_stderr, .silent_exec_failure of `struct child_process`. - * The argument dir corresponds the member .dir. The argument env - * corresponds to the member .env. - */ int run_command_v_opt(const char **argv, int opt); int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class); /* @@ -283,84 +125,15 @@ static inline int capture_command(struct child_process *cmd, * It is expected that no synchronization and mutual exclusion between * the caller and the feed function is necessary so that the function * can run in a thread without interfering with the caller. - * - * The caller: - * - * 1. allocates and clears (memset(&asy, 0, sizeof(asy));) a - * struct async variable; - * 2. initializes .proc and .data; - * 3. calls start_async(); - * 4. processes communicates with proc through .in and .out; - * 5. closes .in and .out; - * 6. calls finish_async(). - * - * There are serious restrictions on what the asynchronous function can do - * because this facility is implemented by a thread in the same address - * space on most platforms (when pthreads is available), but by a pipe to - * a forked process otherwise: - * - * - It cannot change the program's state (global variables, environment, - * etc.) in a way that the caller notices; in other words, .in and .out - * are the only communication channels to the caller. - * - * - It must not change the program's state that the caller of the - * facility also uses. - * */ struct async { - - /** - * The function pointer in .proc has the following signature: - * - * int proc(int in, int out, void *data); - * - * - in, out specifies a set of file descriptors to which the function - * must read/write the data that it needs/produces. The function - * *must* close these descriptors before it returns. A descriptor - * may be -1 if the caller did not configure a descriptor for that - * direction. - * - * - data is the value that the caller has specified in the .data member - * of struct async. - * - * - The return value of the function is 0 on success and non-zero - * on failure. If the function indicates failure, finish_async() will - * report failure as well. - * + /* + * proc reads from in; closes it before return + * proc writes to out; closes it before return + * returns 0 on success, non-zero on failure */ int (*proc)(int in, int out, void *data); - void *data; - - /** - * The members .in, .out are used to provide a set of fd's for - * communication between the caller and the callee as follows: - * - * - Specify 0 to have no file descriptor passed. The callee will - * receive -1 in the corresponding argument. - * - * - Specify < 0 to have a pipe allocated; start_async() replaces - * with the pipe FD in the following way: - * - * .in: Returns the writable pipe end into which the caller - * writes; the readable end of the pipe becomes the function's - * in argument. - * - * .out: Returns the readable pipe end from which the caller - * reads; the writable end of the pipe becomes the function's - * out argument. - * - * The caller of start_async() must close the returned FDs after it - * has completed reading from/writing from them. - * - * - Specify a file descriptor > 0 to be used by the function: - * - * .in: The FD must be readable; it becomes the function's in. - * .out: The FD must be writable; it becomes the function's out. - * - * The specified FD is closed by start_async(), even if it fails to - * run the function. - */ int in; /* caller writes here and closes it */ int out; /* caller reads from here and closes it */ #ifdef NO_PTHREADS @@ -373,19 +146,8 @@ struct async { int isolate_sigpipe; }; -/** - * Run a function asynchronously. Takes a pointer to a `struct - * async` that specifies the details and returns a set of pipe FDs - * for communication with the function. See below for details. - */ int start_async(struct async *async); - -/** - * Wait for the completion of an asynchronous function that was - * started with start_async(). - */ int finish_async(struct async *async); - int in_async(void); int async_with_fork(void); void check_pipe(int err); diff --git a/third_party/git/send-pack.c b/third_party/git/send-pack.c index 0407841ae8..6dc16c3211 100644 --- a/third_party/git/send-pack.c +++ b/third_party/git/send-pack.c @@ -40,10 +40,7 @@ int option_parse_push_signed(const struct option *opt, static void feed_object(const struct object_id *oid, FILE *fh, int negative) { - if (negative && - !has_object_file_with_flags(oid, - OBJECT_INFO_SKIP_FETCH_OBJECT | - OBJECT_INFO_QUICK)) + if (negative && !has_object_file(oid)) return; if (negative) @@ -567,6 +564,8 @@ int send_pack(struct send_pack_args *args, if (need_pack_data && cmds_sent) { if (pack_objects(out, remote_refs, extra_have, args) < 0) { + for (ref = remote_refs; ref; ref = ref->next) + ref->status = REF_STATUS_NONE; if (args->stateless_rpc) close(out); if (git_connection_is_socket(conn)) @@ -574,12 +573,10 @@ int send_pack(struct send_pack_args *args, /* * Do not even bother with the return value; we know we - * are failing, and just want the error() side effects, - * as well as marking refs with their remote status (if - * we get one). + * are failing, and just want the error() side effects. */ if (status_report) - receive_status(&reader, remote_refs); + receive_unpack_status(&reader); if (use_sideband) { close(demux.out); diff --git a/third_party/git/sequencer.c b/third_party/git/sequencer.c index e528225e78..34ebf8ed94 100644 --- a/third_party/git/sequencer.c +++ b/third_party/git/sequencer.c @@ -57,8 +57,6 @@ static GIT_PATH_FUNC(rebase_path, "rebase-merge") GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo") GIT_PATH_FUNC(rebase_path_todo_backup, "rebase-merge/git-rebase-todo.backup") -GIT_PATH_FUNC(rebase_path_dropped, "rebase-merge/dropped") - /* * The rebase command lines that have already been processed. A line * is moved here when it is first handled, before any associated user @@ -133,7 +131,7 @@ static GIT_PATH_FUNC(rebase_path_rewritten_pending, "rebase-merge/rewritten-pending") /* - * The path of the file containing the OID of the "squash onto" commit, i.e. + * The path of the file containig the OID of the "squash onto" commit, i.e. * the dummy commit used for `reset [new root]`. */ static GIT_PATH_FUNC(rebase_path_squash_onto, "rebase-merge/squash-onto") @@ -160,8 +158,6 @@ static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy") static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts") static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate") static GIT_PATH_FUNC(rebase_path_reschedule_failed_exec, "rebase-merge/reschedule-failed-exec") -static GIT_PATH_FUNC(rebase_path_drop_redundant_commits, "rebase-merge/drop_redundant_commits") -static GIT_PATH_FUNC(rebase_path_keep_redundant_commits, "rebase-merge/keep_redundant_commits") static int git_sequencer_config(const char *k, const char *v, void *cb) { @@ -292,7 +288,7 @@ int sequencer_remove_state(struct replay_opts *opts) char *eol = strchr(p, '\n'); if (eol) *eol = '\0'; - if (delete_ref("(rebase) cleanup", p, NULL, 0) < 0) { + if (delete_ref("(rebase -i) cleanup", p, NULL, 0) < 0) { warning(_("could not delete '%s'"), p); ret = -1; } @@ -326,7 +322,7 @@ static const char *action_name(const struct replay_opts *opts) case REPLAY_PICK: return N_("cherry-pick"); case REPLAY_INTERACTIVE_REBASE: - return N_("rebase"); + return N_("rebase -i"); } die(_("unknown action: %d"), opts->action); } @@ -590,9 +586,9 @@ static int do_recursive_merge(struct repository *r, struct replay_opts *opts) { struct merge_options o; - struct tree *next_tree, *base_tree, *head_tree; + struct tree *result, *next_tree, *base_tree, *head_tree; int clean; - int i; + char **xopt; struct lock_file index_lock = LOCK_INIT; if (repo_hold_locked_index(r, &index_lock, LOCK_REPORT_ON_ERROR) < 0) @@ -612,15 +608,16 @@ static int do_recursive_merge(struct repository *r, next_tree = next ? get_commit_tree(next) : empty_tree(r); base_tree = base ? get_commit_tree(base) : empty_tree(r); - for (i = 0; i < opts->xopts_nr; i++) - parse_merge_opt(&o, opts->xopts[i]); + for (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++) + parse_merge_opt(&o, *xopt); clean = merge_trees(&o, head_tree, - next_tree, base_tree); + next_tree, base_tree, &result); if (is_rebase_i(opts) && clean <= 0) fputs(o.obuf.buf, stdout); strbuf_release(&o.obuf); + diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0); if (clean < 0) { rollback_lock_file(&index_lock); return clean; @@ -630,7 +627,7 @@ static int do_recursive_merge(struct repository *r, COMMIT_LOCK | SKIP_IF_UNCHANGED)) /* * TRANSLATORS: %s will be "revert", "cherry-pick" or - * "rebase". + * "rebase -i". */ return error(_("%s: Unable to write new index file"), _(action_name(opts))); @@ -872,6 +869,34 @@ static char *get_author(const char *message) return NULL; } +/* Read author-script and return an ident line (author <email> timestamp) */ +static const char *read_author_ident(struct strbuf *buf) +{ + struct strbuf out = STRBUF_INIT; + char *name, *email, *date; + + if (read_author_script(rebase_path_author_script(), + &name, &email, &date, 0)) + return NULL; + + /* validate date since fmt_ident() will die() on bad value */ + if (parse_date(date, &out)){ + warning(_("invalid date format '%s' in '%s'"), + date, rebase_path_author_script()); + strbuf_release(&out); + return NULL; + } + + strbuf_reset(&out); + strbuf_addstr(&out, fmt_ident(name, email, WANT_AUTHOR_IDENT, date, 0)); + strbuf_swap(buf, &out); + strbuf_release(&out); + free(name); + free(email); + free(date); + return buf->buf; +} + static const char staged_changes_advice[] = N_("you have staged changes in your working tree\n" "If these changes are meant to be squashed into the previous commit, run:\n" @@ -929,6 +954,47 @@ static int run_git_commit(struct repository *r, { struct child_process cmd = CHILD_PROCESS_INIT; + if ((flags & CREATE_ROOT_COMMIT) && !(flags & AMEND_MSG)) { + struct strbuf msg = STRBUF_INIT, script = STRBUF_INIT; + const char *author = NULL; + struct object_id root_commit, *cache_tree_oid; + int res = 0; + + if (is_rebase_i(opts)) { + author = read_author_ident(&script); + if (!author) { + strbuf_release(&script); + return -1; + } + } + + if (!defmsg) + BUG("root commit without message"); + + if (!(cache_tree_oid = get_cache_tree_oid(r->index))) + res = -1; + + if (!res) + res = strbuf_read_file(&msg, defmsg, 0); + + if (res <= 0) + res = error_errno(_("could not read '%s'"), defmsg); + else + res = commit_tree(msg.buf, msg.len, cache_tree_oid, + NULL, &root_commit, author, + opts->gpg_sign); + + strbuf_release(&msg); + strbuf_release(&script); + if (!res) { + update_ref(NULL, "CHERRY_PICK_HEAD", &root_commit, NULL, + REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR); + res = update_ref(NULL, "HEAD", &root_commit, NULL, 0, + UPDATE_REFS_MSG_ON_ERR); + } + return res < 0 ? error(_("writing root commit")) : 0; + } + cmd.git_cmd = 1; if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) { @@ -1130,22 +1196,25 @@ static int run_prepare_commit_msg_hook(struct repository *r, struct strbuf *msg, const char *commit) { - int ret = 0; - const char *name, *arg1 = NULL, *arg2 = NULL; + struct argv_array hook_env = ARGV_ARRAY_INIT; + int ret; + const char *name; name = git_path_commit_editmsg(); if (write_message(msg->buf, msg->len, name, 0)) return -1; - if (commit) { - arg1 = "commit"; - arg2 = commit; - } else { - arg1 = "message"; - } - if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name, - arg1, arg2, NULL)) + argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", r->index_file); + argv_array_push(&hook_env, "GIT_EDITOR=:"); + if (commit) + ret = run_hook_le(hook_env.argv, "prepare-commit-msg", name, + "commit", commit, NULL); + else + ret = run_hook_le(hook_env.argv, "prepare-commit-msg", name, + "message", NULL); + if (ret) ret = error(_("'prepare-commit-msg' hook failed")); + argv_array_clear(&hook_env); return ret; } @@ -1309,7 +1378,7 @@ static int try_to_commit(struct repository *r, struct object_id *oid) { struct object_id tree; - struct commit *current_head = NULL; + struct commit *current_head; struct commit_list *parents = NULL; struct commit_extra_header *extra = NULL; struct strbuf err = STRBUF_INIT; @@ -1344,8 +1413,7 @@ static int try_to_commit(struct repository *r, } parents = copy_commit_list(current_head->parents); extra = read_commit_extra_headers(current_head, exclude_gpgsig); - } else if (current_head && - (!(flags & CREATE_ROOT_COMMIT) || (flags & AMEND_MSG))) { + } else if (current_head) { commit_list_insert(current_head, &parents); } @@ -1354,27 +1422,11 @@ static int try_to_commit(struct repository *r, goto out; } - if (!(flags & ALLOW_EMPTY)) { - struct commit *first_parent = current_head; - - if (flags & AMEND_MSG) { - if (current_head->parents) { - first_parent = current_head->parents->item; - if (repo_parse_commit(r, first_parent)) { - res = error(_("could not parse HEAD commit")); - goto out; - } - } else { - first_parent = NULL; - } - } - if (oideq(first_parent - ? get_commit_tree_oid(first_parent) - : the_hash_algo->empty_tree, - &tree)) { - res = 1; /* run 'git commit' to display error message */ - goto out; - } + if (!(flags & ALLOW_EMPTY) && oideq(current_head ? + get_commit_tree_oid(current_head) : + the_hash_algo->empty_tree, &tree)) { + res = 1; /* run 'git commit' to display error message */ + goto out; } if (find_hook("prepare-commit-msg")) { @@ -1420,7 +1472,6 @@ static int try_to_commit(struct repository *r, goto out; } - run_commit_hook(0, r->index_file, "post-commit", NULL); if (flags & AMEND_MSG) commit_post_rewrite(r, current_head, oid); @@ -1439,7 +1490,8 @@ static int do_commit(struct repository *r, { int res = 1; - if (!(flags & EDIT_MSG) && !(flags & VERIFY_MSG)) { + if (!(flags & EDIT_MSG) && !(flags & VERIFY_MSG) && + !(flags & CREATE_ROOT_COMMIT)) { struct object_id oid; struct strbuf sb = STRBUF_INIT; @@ -1487,30 +1539,23 @@ static int is_original_commit_empty(struct commit *commit) } /* - * Should empty commits be allowed? Return status: - * <0: Error in is_index_unchanged(r) or is_original_commit_empty(commit) - * 0: Halt on empty commit - * 1: Allow empty commit - * 2: Drop empty commit + * Do we run "git commit" with "--allow-empty"? */ static int allow_empty(struct repository *r, struct replay_opts *opts, struct commit *commit) { - int index_unchanged, originally_empty; + int index_unchanged, empty_commit; /* - * Four cases: + * Three cases: * * (1) we do not allow empty at all and error out. * - * (2) we allow ones that were initially empty, and - * just drop the ones that become empty + * (2) we allow ones that were initially empty, but + * forbid the ones that become empty; * - * (3) we allow ones that were initially empty, but - * halt for the ones that become empty; - * - * (4) we allow both. + * (3) we allow both. */ if (!opts->allow_empty) return 0; /* let "git commit" barf as necessary */ @@ -1524,15 +1569,13 @@ static int allow_empty(struct repository *r, if (opts->keep_redundant_commits) return 1; - originally_empty = is_original_commit_empty(commit); - if (originally_empty < 0) - return originally_empty; - if (originally_empty) - return 1; - else if (opts->drop_redundant_commits) - return 2; - else + empty_commit = is_original_commit_empty(commit); + if (empty_commit < 0) + return empty_commit; + if (!empty_commit) return 0; + else + return 1; } static struct { @@ -1603,7 +1646,6 @@ static int update_squash_messages(struct repository *r, struct strbuf buf = STRBUF_INIT; int res; const char *message, *body; - const char *encoding = get_commit_output_encoding(); if (opts->current_fixup_count > 0) { struct strbuf header = STRBUF_INIT; @@ -1630,7 +1672,7 @@ static int update_squash_messages(struct repository *r, return error(_("need a HEAD to fixup")); if (!(head_commit = lookup_commit_reference(r, &head))) return error(_("could not read HEAD")); - if (!(head_message = logmsg_reencode(head_commit, NULL, encoding))) + if (!(head_message = get_commit_buffer(head_commit, NULL))) return error(_("could not read HEAD's commit message")); find_commit_subject(head_message, &body); @@ -1651,7 +1693,7 @@ static int update_squash_messages(struct repository *r, unuse_commit_buffer(head_commit, head_message); } - if (!(message = logmsg_reencode(commit, NULL, encoding))) + if (!(message = get_commit_buffer(commit, NULL))) return error(_("could not read commit message of %s"), oid_to_hex(&commit->object.oid)); find_commit_subject(message, &body); @@ -1733,7 +1775,7 @@ static int do_pick_commit(struct repository *r, enum todo_command command, struct commit *commit, struct replay_opts *opts, - int final_fixup, int *check_todo) + int final_fixup) { unsigned int flags = opts->edit ? EDIT_MSG : 0; const char *msg_file = opts->edit ? NULL : git_path_merge_msg(r); @@ -1743,7 +1785,7 @@ static int do_pick_commit(struct repository *r, char *author = NULL; struct commit_message msg = { NULL, NULL, NULL, NULL }; struct strbuf msgbuf = STRBUF_INIT; - int res, unborn = 0, reword = 0, allow, drop_commit; + int res, unborn = 0, allow; if (opts->no_commit) { /* @@ -1813,7 +1855,7 @@ static int do_pick_commit(struct repository *r, opts); if (res || command != TODO_REWORD) goto leave; - reword = 1; + flags |= EDIT_MSG | AMEND_MSG | VERIFY_MSG; msg_file = NULL; goto fast_forward_edit; } @@ -1871,7 +1913,7 @@ static int do_pick_commit(struct repository *r, } if (command == TODO_REWORD) - reword = 1; + flags |= EDIT_MSG | VERIFY_MSG; else if (is_fixup(command)) { if (update_squash_messages(r, command, commit, opts)) return -1; @@ -1948,37 +1990,20 @@ static int do_pick_commit(struct repository *r, goto leave; } - drop_commit = 0; allow = allow_empty(r, opts, commit); if (allow < 0) { res = allow; goto leave; - } else if (allow == 1) { + } else if (allow) flags |= ALLOW_EMPTY; - } else if (allow == 2) { - drop_commit = 1; - unlink(git_path_cherry_pick_head(r)); - unlink(git_path_merge_msg(r)); - fprintf(stderr, - _("dropping %s %s -- patch contents already upstream\n"), - oid_to_hex(&commit->object.oid), msg.subject); - } /* else allow == 0 and there's nothing special to do */ - if (!opts->no_commit && !drop_commit) { + if (!opts->no_commit) { +fast_forward_edit: if (author || command == TODO_REVERT || (flags & AMEND_MSG)) res = do_commit(r, msg_file, author, opts, flags); else res = error(_("unable to parse commit author")); - *check_todo = !!(flags & EDIT_MSG); - if (!res && reword) { -fast_forward_edit: - res = run_git_commit(r, NULL, opts, EDIT_MSG | - VERIFY_MSG | AMEND_MSG | - (flags & ALLOW_EMPTY)); - *check_todo = 1; - } } - if (!res && final_fixup) { unlink(rebase_path_fixup_msg()); unlink(rebase_path_squash_msg()); @@ -2045,7 +2070,6 @@ void todo_list_release(struct todo_list *todo_list) static struct todo_item *append_new_todo(struct todo_list *todo_list) { ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc); - todo_list->total_nr++; return todo_list->items + todo_list->nr++; } @@ -2140,8 +2164,6 @@ static int parse_insn_line(struct repository *r, struct todo_item *item, saved = *end_of_object_name; *end_of_object_name = '\0'; status = get_oid(bol, &commit_oid); - if (status < 0) - error(_("could not parse '%s'"), bol); /* return later */ *end_of_object_name = saved; bol = end_of_object_name + strspn(end_of_object_name, " \t"); @@ -2149,10 +2171,11 @@ static int parse_insn_line(struct repository *r, struct todo_item *item, item->arg_len = (int)(eol - bol); if (status < 0) - return status; + return error(_("could not parse '%.*s'"), + (int)(end_of_object_name - bol), bol); item->commit = lookup_commit_reference(r, &commit_oid); - return item->commit ? 0 : -1; + return !item->commit; } int sequencer_get_last_command(struct repository *r, enum replay_action *action) @@ -2318,16 +2341,6 @@ void sequencer_post_commit_cleanup(struct repository *r, int verbose) sequencer_remove_state(&opts); } -static void todo_list_write_total_nr(struct todo_list *todo_list) -{ - FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w"); - - if (f) { - fprintf(f, "%d\n", todo_list->total_nr); - fclose(f); - } -} - static int read_populate_todo(struct repository *r, struct todo_list *todo_list, struct replay_opts *opts) @@ -2373,6 +2386,7 @@ static int read_populate_todo(struct repository *r, if (is_rebase_i(opts)) { struct todo_list done = TODO_LIST_INIT; + FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w"); if (strbuf_read_file(&done.buf, rebase_path_done(), 0) > 0 && !todo_list_parse_insn_buffer(r, done.buf.buf, &done)) @@ -2384,7 +2398,10 @@ static int read_populate_todo(struct repository *r, + count_commands(todo_list); todo_list_release(&done); - todo_list_write_total_nr(todo_list); + if (f) { + fprintf(f, "%d\n", todo_list->total_nr); + fclose(f); + } } return 0; @@ -2518,12 +2535,6 @@ static int read_populate_opts(struct replay_opts *opts) if (file_exists(rebase_path_reschedule_failed_exec())) opts->reschedule_failed_exec = 1; - if (file_exists(rebase_path_drop_redundant_commits())) - opts->drop_redundant_commits = 1; - - if (file_exists(rebase_path_keep_redundant_commits())) - opts->keep_redundant_commits = 1; - read_strategy_opts(opts, &buf); strbuf_release(&buf); @@ -2575,6 +2586,8 @@ static void write_strategy_opts(struct replay_opts *opts) int write_basic_state(struct replay_opts *opts, const char *head_name, struct commit *onto, const char *orig_head) { + const char *quiet = getenv("GIT_QUIET"); + if (head_name) write_file(rebase_path_head_name(), "%s\n", head_name); if (onto) @@ -2583,8 +2596,8 @@ int write_basic_state(struct replay_opts *opts, const char *head_name, if (orig_head) write_file(rebase_path_orig_head(), "%s\n", orig_head); - if (opts->quiet) - write_file(rebase_path_quiet(), "%s", ""); + if (quiet) + write_file(rebase_path_quiet(), "%s\n", quiet); if (opts->verbose) write_file(rebase_path_verbose(), "%s", ""); if (opts->strategy) @@ -2601,10 +2614,6 @@ int write_basic_state(struct replay_opts *opts, const char *head_name, write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign); if (opts->signoff) write_file(rebase_path_signoff(), "--signoff\n"); - if (opts->drop_redundant_commits) - write_file(rebase_path_drop_redundant_commits(), "%s", ""); - if (opts->keep_redundant_commits) - write_file(rebase_path_keep_redundant_commits(), "%s", ""); if (opts->reschedule_failed_exec) write_file(rebase_path_reschedule_failed_exec(), "%s", ""); @@ -2617,17 +2626,14 @@ static int walk_revs_populate_todo(struct todo_list *todo_list, enum todo_command command = opts->action == REPLAY_PICK ? TODO_PICK : TODO_REVERT; const char *command_string = todo_command_info[command].str; - const char *encoding; struct commit *commit; if (prepare_revs(opts)) return -1; - encoding = get_log_output_encoding(); - while ((commit = get_revision(opts->revs))) { struct todo_item *item = append_new_todo(todo_list); - const char *commit_buffer = logmsg_reencode(commit, NULL, encoding); + const char *commit_buffer = get_commit_buffer(commit, NULL); const char *subject; int subject_len; @@ -3024,8 +3030,7 @@ static int make_patch(struct repository *r, strbuf_addf(&buf, "%s/message", get_dir(opts)); if (!file_exists(buf.buf)) { - const char *encoding = get_commit_output_encoding(); - const char *commit_buffer = logmsg_reencode(commit, NULL, encoding); + const char *commit_buffer = get_commit_buffer(commit, NULL); find_commit_subject(commit_buffer, &subject); res |= write_message(subject, strlen(subject), buf.buf, 1); unuse_commit_buffer(commit, commit_buffer); @@ -3204,7 +3209,7 @@ static int do_label(struct repository *r, const char *name, int len) return error(_("illegal label name: '%.*s'"), len, name); strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name); - strbuf_addf(&msg, "rebase (label) '%.*s'", len, name); + strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name); transaction = ref_store_transaction_begin(refs, &err); if (!transaction) { @@ -3359,9 +3364,6 @@ static int do_merge(struct repository *r, struct commit *head_commit, *merge_commit, *i; struct commit_list *bases, *j, *reversed = NULL; struct commit_list *to_merge = NULL, **tail = &to_merge; - const char *strategy = !opts->xopts_nr && - (!opts->strategy || !strcmp(opts->strategy, "recursive")) ? - NULL : opts->strategy; struct merge_options o; int merge_arg_len, oneline_offset, can_fast_forward, ret, k; static struct lock_file lock; @@ -3427,8 +3429,7 @@ static int do_merge(struct repository *r, } if (commit) { - const char *encoding = get_commit_output_encoding(); - const char *message = logmsg_reencode(commit, NULL, encoding); + const char *message = get_commit_buffer(commit, NULL); const char *body; int len; @@ -3515,7 +3516,7 @@ static int do_merge(struct repository *r, goto leave_merge; } - if (strategy || to_merge->next) { + if (to_merge->next) { /* Octopus merge */ struct child_process cmd = CHILD_PROCESS_INIT; @@ -3529,14 +3530,7 @@ static int do_merge(struct repository *r, cmd.git_cmd = 1; argv_array_push(&cmd.args, "merge"); argv_array_push(&cmd.args, "-s"); - if (!strategy) - argv_array_push(&cmd.args, "octopus"); - else { - argv_array_push(&cmd.args, strategy); - for (k = 0; k < opts->xopts_nr; k++) - argv_array_pushf(&cmd.args, - "-X%s", opts->xopts[k]); - } + argv_array_push(&cmd.args, "octopus"); argv_array_push(&cmd.args, "--no-edit"); argv_array_push(&cmd.args, "--no-ff"); argv_array_push(&cmd.args, "--no-log"); @@ -3574,7 +3568,7 @@ static int do_merge(struct repository *r, goto leave_merge; } - write_message(oid_to_hex(&merge_commit->object.oid), the_hash_algo->hexsz, + write_message(oid_to_hex(&merge_commit->object.oid), GIT_SHA1_HEXSZ, git_path_merge_head(r), 0); write_message("no-ff", 5, git_path_merge_mode(r), 0); @@ -3746,6 +3740,20 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts, return ret; } +int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts, + const char *commit) +{ + const char *action; + + if (commit && *commit) { + action = reflog_message(opts, "start", "checkout %s", commit); + if (run_git_checkout(r, opts, commit, action)) + return error(_("could not checkout %s"), commit); + } + + return 0; +} + static int checkout_onto(struct repository *r, struct replay_opts *opts, const char *onto_name, const struct object_id *onto, const char *orig_head) @@ -3810,7 +3818,6 @@ static int pick_commits(struct repository *r, while (todo_list->current < todo_list->nr) { struct todo_item *item = todo_list->items + todo_list->current; const char *arg = todo_item_get_arg(todo_list, item); - int check_todo = 0; if (save_todo(todo_list, opts)) return -1; @@ -3849,8 +3856,7 @@ static int pick_commits(struct repository *r, command_to_string(item->command), NULL), 1); res = do_pick_commit(r, item->command, item->commit, - opts, is_final_fixup(todo_list), - &check_todo); + opts, is_final_fixup(todo_list)); if (is_rebase_i(opts) && res < 0) { /* Reschedule */ advise(_(rescheduled_advice), @@ -3907,6 +3913,7 @@ static int pick_commits(struct repository *r, } else if (item->command == TODO_EXEC) { char *end_of_arg = (char *)(arg + item->arg_len); int saved = *end_of_arg; + struct stat st; if (!opts->verbose) term_clear_line(); @@ -3917,8 +3924,17 @@ static int pick_commits(struct repository *r, if (res) { if (opts->reschedule_failed_exec) reschedule = 1; + } else if (stat(get_todo_path(opts), &st)) + res = error_errno(_("could not stat '%s'"), + get_todo_path(opts)); + else if (match_stat_data(&todo_list->stat, &st)) { + /* Reread the todo file if it has changed. */ + todo_list_release(todo_list); + if (read_populate_todo(r, todo_list, opts)) + res = -1; /* message was printed */ + /* `current` will be incremented below */ + todo_list->current = -1; } - check_todo = 1; } else if (item->command == TODO_LABEL) { if ((res = do_label(r, arg, item->arg_len))) reschedule = 1; @@ -3954,20 +3970,6 @@ static int pick_commits(struct repository *r, item->commit, arg, item->arg_len, opts, res, 0); - } else if (is_rebase_i(opts) && check_todo && !res) { - struct stat st; - - if (stat(get_todo_path(opts), &st)) { - res = error_errno(_("could not stat '%s'"), - get_todo_path(opts)); - } else if (match_stat_data(&todo_list->stat, &st)) { - /* Reread the todo file if it has changed. */ - todo_list_release(todo_list); - if (read_populate_todo(r, todo_list, opts)) - res = -1; /* message was printed */ - /* `current` will be incremented below */ - todo_list->current = -1; - } } todo_list->current++; @@ -4195,10 +4197,9 @@ static int commit_staged_changes(struct repository *r, */ struct commit *commit; const char *path = rebase_path_squash_msg(); - const char *encoding = get_commit_output_encoding(); if (parse_head(r, &commit) || - !(p = logmsg_reencode(commit, NULL, encoding)) || + !(p = get_commit_buffer(commit, NULL)) || write_message(p, strlen(p), path, 0)) { unuse_commit_buffer(commit, p); return error(_("could not write file: " @@ -4255,18 +4256,8 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts) if (is_rebase_i(opts)) { if ((res = read_populate_todo(r, &todo_list, opts))) goto release_todo_list; - - if (file_exists(rebase_path_dropped())) { - if ((res = todo_list_check_against_backup(r, &todo_list))) - goto release_todo_list; - - unlink(rebase_path_dropped()); - } - - if (commit_staged_changes(r, opts, &todo_list)) { - res = -1; - goto release_todo_list; - } + if (commit_staged_changes(r, opts, &todo_list)) + return -1; } else if (!file_exists(get_todo_path(opts))) return continue_single_pick(r); else if ((res = read_populate_todo(r, &todo_list, opts))) @@ -4305,12 +4296,9 @@ static int single_pick(struct repository *r, struct commit *cmit, struct replay_opts *opts) { - int check_todo; - setenv(GIT_REFLOG_ACTION, action_name(opts), 0); return do_pick_commit(r, opts->action == REPLAY_PICK ? - TODO_PICK : TODO_REVERT, cmit, opts, 0, - &check_todo); + TODO_PICK : TODO_REVERT, cmit, opts, 0); } int sequencer_pick_revisions(struct repository *r, @@ -4452,14 +4440,9 @@ struct labels_entry { char label[FLEX_ARRAY]; }; -static int labels_cmp(const void *fndata, const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, const void *key) +static int labels_cmp(const void *fndata, const struct labels_entry *a, + const struct labels_entry *b, const void *key) { - const struct labels_entry *a, *b; - - a = container_of(eptr, const struct labels_entry, entry); - b = container_of(entry_or_key, const struct labels_entry, entry); - return key ? strcmp(a->label, key) : strcmp(a->label, b->label); } @@ -4480,6 +4463,7 @@ static const char *label_oid(struct object_id *oid, const char *label, struct labels_entry *labels_entry; struct string_entry *string_entry; struct object_id dummy; + size_t len; int i; string_entry = oidmap_get(&state->commit2label, oid); @@ -4499,11 +4483,11 @@ static const char *label_oid(struct object_id *oid, const char *label, * abbreviation for any uninteresting commit's names that does not * clash with any other label. */ - strbuf_reset(&state->buf); if (!label) { char *p; - strbuf_grow(&state->buf, GIT_MAX_HEXSZ); + strbuf_reset(&state->buf); + strbuf_grow(&state->buf, GIT_SHA1_HEXSZ); label = p = state->buf.buf; find_unique_abbrev_r(p, oid, default_abbrev); @@ -4516,7 +4500,7 @@ static const char *label_oid(struct object_id *oid, const char *label, size_t i = strlen(p) + 1; oid_to_hex_r(p, oid); - for (; i < the_hash_algo->hexsz; i++) { + for (; i < GIT_SHA1_HEXSZ; i++) { char save = p[i]; p[i] = '\0'; if (!hashmap_get_from_hash(&state->labels, @@ -4525,60 +4509,37 @@ static const char *label_oid(struct object_id *oid, const char *label, p[i] = save; } } - } else { - struct strbuf *buf = &state->buf; - + } else if (((len = strlen(label)) == the_hash_algo->hexsz && + !get_oid_hex(label, &dummy)) || + (len == 1 && *label == '#') || + hashmap_get_from_hash(&state->labels, + strihash(label), label)) { /* - * Sanitize labels by replacing non-alpha-numeric characters - * (including white-space ones) by dashes, as they might be - * illegal in file names (and hence in ref names). - * - * Note that we retain non-ASCII UTF-8 characters (identified - * via the most significant bit). They should be all acceptable - * in file names. We do not validate the UTF-8 here, that's not - * the job of this function. + * If the label already exists, or if the label is a valid full + * OID, or the label is a '#' (which we use as a separator + * between merge heads and oneline), we append a dash and a + * number to make it unique. */ - for (; *label; label++) - if ((*label & 0x80) || isalnum(*label)) - strbuf_addch(buf, *label); - /* avoid leading dash and double-dashes */ - else if (buf->len && buf->buf[buf->len - 1] != '-') - strbuf_addch(buf, '-'); - if (!buf->len) { - strbuf_addstr(buf, "rev-"); - strbuf_add_unique_abbrev(buf, oid, default_abbrev); - } - label = buf->buf; + struct strbuf *buf = &state->buf; - if ((buf->len == the_hash_algo->hexsz && - !get_oid_hex(label, &dummy)) || - (buf->len == 1 && *label == '#') || - hashmap_get_from_hash(&state->labels, - strihash(label), label)) { - /* - * If the label already exists, or if the label is a - * valid full OID, or the label is a '#' (which we use - * as a separator between merge heads and oneline), we - * append a dash and a number to make it unique. - */ - size_t len = buf->len; + strbuf_reset(buf); + strbuf_add(buf, label, len); - for (i = 2; ; i++) { - strbuf_setlen(buf, len); - strbuf_addf(buf, "-%d", i); - if (!hashmap_get_from_hash(&state->labels, - strihash(buf->buf), - buf->buf)) - break; - } - - label = buf->buf; + for (i = 2; ; i++) { + strbuf_setlen(buf, len); + strbuf_addf(buf, "-%d", i); + if (!hashmap_get_from_hash(&state->labels, + strihash(buf->buf), + buf->buf)) + break; } + + label = buf->buf; } FLEX_ALLOC_STR(labels_entry, label, label); - hashmap_entry_init(&labels_entry->entry, strihash(label)); - hashmap_add(&state->labels, &labels_entry->entry); + hashmap_entry_init(labels_entry, strihash(label)); + hashmap_add(&state->labels, labels_entry); FLEX_ALLOC_STR(string_entry, string, label); oidcpy(&string_entry->entry.oid, oid); @@ -4591,8 +4552,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, struct rev_info *revs, struct strbuf *out, unsigned flags) { + int keep_empty = flags & TODO_LIST_KEEP_EMPTY; int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS; - int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO; struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT; struct strbuf label = STRBUF_INIT; struct commit_list *commits = NULL, **tail = &commits, *iter; @@ -4612,19 +4573,14 @@ static int make_script_with_merges(struct pretty_print_context *pp, oidmap_init(&commit2todo, 0); oidmap_init(&state.commit2label, 0); - hashmap_init(&state.labels, labels_cmp, NULL, 0); + hashmap_init(&state.labels, (hashmap_cmp_fn) labels_cmp, NULL, 0); strbuf_init(&state.buf, 32); if (revs->cmdline.nr && (revs->cmdline.rev[0].flags & BOTTOM)) { - struct labels_entry *onto_label_entry; struct object_id *oid = &revs->cmdline.rev[0].item->oid; FLEX_ALLOC_STR(entry, string, "onto"); oidcpy(&entry->entry.oid, oid); oidmap_put(&state.commit2label, entry); - - FLEX_ALLOC_STR(onto_label_entry, label, "onto"); - hashmap_entry_init(&onto_label_entry->entry, strihash("onto")); - hashmap_add(&state.labels, &onto_label_entry->entry); } /* @@ -4653,6 +4609,8 @@ static int make_script_with_merges(struct pretty_print_context *pp, if (!to_merge) { /* non-merge commit: easy case */ strbuf_reset(&buf); + if (!keep_empty && is_empty) + strbuf_addf(&buf, "%c ", comment_line_char); strbuf_addf(&buf, "%s %s %s", cmd_pick, oid_to_hex(&commit->object.oid), oneline.buf); @@ -4677,6 +4635,10 @@ static int make_script_with_merges(struct pretty_print_context *pp, else strbuf_addbuf(&label, &oneline); + for (p1 = label.buf; *p1; p1++) + if (isspace(*p1)) + *(char *)p1 = '-'; + strbuf_reset(&buf); strbuf_addf(&buf, "%s -C %s", cmd_merge, oid_to_hex(&commit->object.oid)); @@ -4719,7 +4681,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, label_oid(oid, "branch-point", &state); } - /* Add HEAD as implicit "tip of branch" */ + /* Add HEAD as implict "tip of branch" */ if (!iter->next) tips_tail = &commit_list_insert(iter->item, tips_tail)->next; @@ -4758,8 +4720,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, if (!commit) strbuf_addf(out, "%s %s\n", cmd_reset, - rebase_cousins || root_with_onto ? - "onto" : "[new root]"); + rebase_cousins ? "onto" : "[new root]"); else { const char *to = NULL; @@ -4806,7 +4767,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, oidmap_free(&commit2todo, 1); oidmap_free(&state.commit2label, 1); - hashmap_free_entries(&state.labels, struct labels_entry, entry); + hashmap_free(&state.labels, 1); strbuf_release(&state.buf); return 0; @@ -4819,6 +4780,7 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, struct pretty_print_context pp = {0}; struct rev_info revs; struct commit *commit; + int keep_empty = flags & TODO_LIST_KEEP_EMPTY; const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick"; int rebase_merges = flags & TODO_LIST_REBASE_MERGES; @@ -4854,10 +4816,12 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, return make_script_with_merges(&pp, &revs, out, flags); while ((commit = get_revision(&revs))) { - int is_empty = is_original_commit_empty(commit); + int is_empty = is_original_commit_empty(commit); if (!is_empty && (commit->object.flags & PATCHSAME)) continue; + if (!keep_empty && is_empty) + strbuf_addf(out, "%c ", comment_line_char); strbuf_addf(out, "%s %s ", insn, oid_to_hex(&commit->object.oid)); pretty_print_commit(&pp, commit, out); @@ -4898,7 +4862,7 @@ void todo_list_add_exec_commands(struct todo_list *todo_list, * are considered part of the pick, so we insert the commands *after* * those chains if there are any. * - * As we insert the exec commands immediately after rearranging + * As we insert the exec commands immediatly after rearranging * any fixups and before the user edits the list, a fixup chain * can never contain comments (any comments are empty picks that * have been commented out because the user did not specify @@ -4994,7 +4958,7 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list, todo_list_to_strbuf(r, todo_list, &buf, num, flags); if (flags & TODO_LIST_APPEND_TODO_HELP) - append_todo_help(count_commands(todo_list), + append_todo_help(flags & TODO_LIST_KEEP_EMPTY, count_commands(todo_list), shortrevisions, shortonto, &buf); res = write_message(buf.buf, buf.len, file, 0); @@ -5003,6 +4967,41 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list, return res; } +static const char edit_todo_list_advice[] = +N_("You can fix this with 'git rebase --edit-todo' " +"and then run 'git rebase --continue'.\n" +"Or you can abort the rebase with 'git rebase" +" --abort'.\n"); + +int check_todo_list_from_file(struct repository *r) +{ + struct todo_list old_todo = TODO_LIST_INIT, new_todo = TODO_LIST_INIT; + int res = 0; + + if (strbuf_read_file_or_whine(&new_todo.buf, rebase_path_todo()) < 0) { + res = -1; + goto out; + } + + if (strbuf_read_file_or_whine(&old_todo.buf, rebase_path_todo_backup()) < 0) { + res = -1; + goto out; + } + + res = todo_list_parse_insn_buffer(r, old_todo.buf.buf, &old_todo); + if (!res) + res = todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo); + if (!res) + res = todo_list_check(&old_todo, &new_todo); + if (res) + fprintf(stderr, _(edit_todo_list_advice)); +out: + todo_list_release(&old_todo); + todo_list_release(&new_todo); + + return res; +} + /* skip picking commits whose parents are unchanged */ static int skip_unnecessary_picks(struct repository *r, struct todo_list *todo_list, @@ -5042,7 +5041,6 @@ static int skip_unnecessary_picks(struct repository *r, MOVE_ARRAY(todo_list->items, todo_list->items + i, todo_list->nr - i); todo_list->nr -= i; todo_list->current = 0; - todo_list->done_nr += i; if (is_fixup(peek_command(todo_list, 0))) record_in_rewritten(base_oid, peek_command(todo_list, 0)); @@ -5059,7 +5057,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla { const char *shortonto, *todo_file = rebase_path_todo(); struct todo_list new_todo = TODO_LIST_INIT; - struct strbuf *buf = &todo_list->buf, buf2 = STRBUF_INIT; + struct strbuf *buf = &todo_list->buf; struct object_id oid = onto->object.oid; int res; @@ -5100,22 +5098,17 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla todo_list_release(&new_todo); return error(_("nothing to do")); - } else if (res == -4) { + } + + if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) || + todo_list_check(todo_list, &new_todo)) { + fprintf(stderr, _(edit_todo_list_advice)); checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head); todo_list_release(&new_todo); return -1; } - /* Expand the commit IDs */ - todo_list_to_strbuf(r, &new_todo, &buf2, -1, 0); - strbuf_swap(&new_todo.buf, &buf2); - strbuf_release(&buf2); - new_todo.total_nr -= new_todo.nr; - if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) < 0) - BUG("invalid todo list after expanding IDs:\n%s", - new_todo.buf.buf); - if (opts->allow_ff && skip_unnecessary_picks(r, &new_todo, &oid)) { todo_list_release(&new_todo); return error(_("could not skip unnecessary pick commands")); @@ -5127,21 +5120,15 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla return error_errno(_("could not write '%s'"), todo_file); } - res = -1; + todo_list_release(&new_todo); if (checkout_onto(r, opts, onto_name, &oid, orig_head)) - goto cleanup; + return -1; if (require_clean_work_tree(r, "rebase", "", 1, 1)) - goto cleanup; - - todo_list_write_total_nr(&new_todo); - res = pick_commits(r, &new_todo, opts); - -cleanup: - todo_list_release(&new_todo); + return -1; - return res; + return sequencer_continue(r, opts); } struct subject2item_entry { @@ -5151,15 +5138,9 @@ struct subject2item_entry { }; static int subject2item_cmp(const void *fndata, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, - const void *key) + const struct subject2item_entry *a, + const struct subject2item_entry *b, const void *key) { - const struct subject2item_entry *a, *b; - - a = container_of(eptr, const struct subject2item_entry, entry); - b = container_of(entry_or_key, const struct subject2item_entry, entry); - return key ? strcmp(a->subject, key) : strcmp(a->subject, b->subject); } @@ -5192,7 +5173,8 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) * In that case, last[i] will indicate the index of the latest item to * be moved to appear after the i'th. */ - hashmap_init(&subject2item, subject2item_cmp, NULL, todo_list->nr); + hashmap_init(&subject2item, (hashmap_cmp_fn) subject2item_cmp, + NULL, todo_list->nr); ALLOC_ARRAY(next, todo_list->nr); ALLOC_ARRAY(tail, todo_list->nr); ALLOC_ARRAY(subjects, todo_list->nr); @@ -5218,7 +5200,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) *commit_todo_item_at(&commit_todo, item->commit) = item; parse_commit(item->commit); - commit_buffer = logmsg_reencode(item->commit, NULL, "UTF-8"); + commit_buffer = get_commit_buffer(item->commit, NULL); find_commit_subject(commit_buffer, &subject); format_subject(&buf, subject, " "); subject = subjects[i] = strbuf_detach(&buf, &subject_len); @@ -5235,11 +5217,8 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) break; } - entry = hashmap_get_entry_from_hash(&subject2item, - strhash(p), p, - struct subject2item_entry, - entry); - if (entry) + if ((entry = hashmap_get_from_hash(&subject2item, + strhash(p), p))) /* found by title */ i2 = entry->i; else if (!strchr(p, ' ') && @@ -5273,9 +5252,8 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) strhash(subject), subject)) { FLEX_ALLOC_MEM(entry, subject, subject, subject_len); entry->i = i; - hashmap_entry_init(&entry->entry, - strhash(entry->subject)); - hashmap_put(&subject2item, &entry->entry); + hashmap_entry_init(entry, strhash(entry->subject)); + hashmap_put(&subject2item, entry); } } @@ -5309,7 +5287,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list) for (i = 0; i < todo_list->nr; i++) free(subjects[i]); free(subjects); - hashmap_free_entries(&subject2item, struct subject2item_entry, entry); + hashmap_free(&subject2item, 1); clear_commit_todo_item(&commit_todo); diff --git a/third_party/git/sequencer.h b/third_party/git/sequencer.h index 718a07426d..6704acbb9c 100644 --- a/third_party/git/sequencer.h +++ b/third_party/git/sequencer.h @@ -11,7 +11,6 @@ const char *git_path_commit_editmsg(void); const char *git_path_seq_dir(void); const char *rebase_path_todo(void); const char *rebase_path_todo_backup(void); -const char *rebase_path_dropped(void); #define APPEND_SIGNOFF_DEDUP (1u << 0) @@ -40,7 +39,6 @@ struct replay_opts { int allow_rerere_auto; int allow_empty; int allow_empty_message; - int drop_redundant_commits; int keep_redundant_commits; int verbose; int quiet; @@ -134,7 +132,7 @@ int sequencer_rollback(struct repository *repo, struct replay_opts *opts); int sequencer_skip(struct repository *repo, struct replay_opts *opts); int sequencer_remove_state(struct replay_opts *opts); -/* #define TODO_LIST_KEEP_EMPTY (1U << 0) */ /* No longer used */ +#define TODO_LIST_KEEP_EMPTY (1U << 0) #define TODO_LIST_SHORTEN_IDS (1U << 1) #define TODO_LIST_ABBREVIATE_CMDS (1U << 2) #define TODO_LIST_REBASE_MERGES (1U << 3) @@ -145,18 +143,13 @@ int sequencer_remove_state(struct replay_opts *opts); */ #define TODO_LIST_REBASE_COUSINS (1U << 4) #define TODO_LIST_APPEND_TODO_HELP (1U << 5) -/* - * When generating a script that rebases merges with `--root` *and* with - * `--onto`, we do not want to re-generate the root commits. - */ -#define TODO_LIST_ROOT_WITH_ONTO (1U << 6) - int sequencer_make_script(struct repository *r, struct strbuf *out, int argc, const char **argv, unsigned flags); void todo_list_add_exec_commands(struct todo_list *todo_list, struct string_list *commands); +int check_todo_list_from_file(struct repository *r); int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags, const char *shortrevisions, const char *onto_name, struct commit *onto, const char *orig_head, struct string_list *commands, @@ -191,6 +184,9 @@ void commit_post_rewrite(struct repository *r, const struct commit *current_head, const struct object_id *new_head); +int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts, + const char *commit); + #define SUMMARY_INITIAL_COMMIT (1 << 0) #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1) void print_commit_summary(struct repository *repo, @@ -200,10 +196,11 @@ void print_commit_summary(struct repository *repo, int read_author_script(const char *path, char **name, char **email, char **date, int allow_missing); +#endif + void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); int write_basic_state(struct replay_opts *opts, const char *head_name, struct commit *onto, const char *orig_head); void sequencer_post_commit_cleanup(struct repository *r, int verbose); int sequencer_get_last_command(struct repository* r, enum replay_action *action); -#endif /* SEQUENCER_H */ diff --git a/third_party/git/server-info.c b/third_party/git/server-info.c index bae2cdfd51..4d8199b1d9 100644 --- a/third_party/git/server-info.c +++ b/third_party/git/server-info.c @@ -93,7 +93,7 @@ static int update_info_file(char *path, uic.old_fp = fopen_or_warn(path, "r"); /* - * uic_printf will compare incremental comparison against old_fp + * uic_printf will compare incremental comparison aginst old_fp * and mark uic as stale if needed */ ret = generate(&uic); diff --git a/third_party/git/setup.c b/third_party/git/setup.c index 5ea9285a12..8dcb4631f7 100644 --- a/third_party/git/setup.c +++ b/third_party/git/setup.c @@ -4,7 +4,6 @@ #include "dir.h" #include "string-list.h" #include "chdir-notify.h" -#include "promisor-remote.h" static int inside_git_dir = -1; static int inside_work_tree = -1; @@ -120,13 +119,8 @@ char *prefix_path_gently(const char *prefix, int len, char *prefix_path(const char *prefix, int len, const char *path) { char *r = prefix_path_gently(prefix, len, NULL, path); - if (!r) { - const char *hint_path = get_git_work_tree(); - if (!hint_path) - hint_path = get_git_dir(); - die(_("'%s' is outside repository at '%s'"), path, - absolute_path(hint_path)); - } + if (!r) + die(_("'%s' is outside repository"), path); return r; } @@ -202,26 +196,9 @@ static void NORETURN die_verify_filename(struct repository *r, */ static int looks_like_pathspec(const char *arg) { - const char *p; - int escaped = 0; - - /* - * Wildcard characters imply the user is looking to match pathspecs - * that aren't in the filesystem. Note that this doesn't include - * backslash even though it's a glob special; by itself it doesn't - * cause any increase in the match. Likewise ignore backslash-escaped - * wildcard characters. - */ - for (p = arg; *p; p++) { - if (escaped) { - escaped = 0; - } else if (is_glob_special(*p)) { - if (*p == '\\') - escaped = 1; - else - return 1; - } - } + /* anything with a wildcard character */ + if (!no_wildcard(arg)) + return 1; /* long-form pathspec magic */ if (starts_with(arg, ":(")) @@ -501,7 +478,7 @@ static int check_repository_format_gently(const char *gitdir, struct repository_ } repository_format_precious_objects = candidate->precious_objects; - set_repository_format_partial_clone(candidate->partial_clone); + repository_format_partial_clone = xstrdup_or_null(candidate->partial_clone); repository_format_worktree_config = candidate->worktree_config; string_list_clear(&candidate->unknown_extensions, 0); @@ -820,7 +797,7 @@ static const char *setup_discovered_git_dir(const char *gitdir, set_git_dir(gitdir); inside_git_dir = 0; inside_work_tree = 1; - if (offset >= cwd->len) + if (offset == cwd->len) return NULL; /* Make "offset" point past the '/' (already the case for root dirs) */ @@ -942,7 +919,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir, const char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT); struct string_list ceiling_dirs = STRING_LIST_INIT_DUP; const char *gitdirenv; - int ceil_offset = -1, min_offset = offset_1st_component(dir->buf); + int ceil_offset = -1, min_offset = has_dos_drive_prefix(dir->buf) ? 3 : 1; dev_t current_device = 0; int one_filesystem = 1; @@ -970,12 +947,6 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir, if (ceil_offset < 0) ceil_offset = min_offset - 2; - if (min_offset && min_offset == dir->len && - !is_dir_sep(dir->buf[min_offset - 1])) { - strbuf_addch(dir, '/'); - min_offset++; - } - /* * Test in the following order (relative to the dir): * - .git (file containing "gitdir: <path>") diff --git a/third_party/git/sha1-array.c b/third_party/git/sha1-array.c index 3eeadfede9..d922e94e3f 100644 --- a/third_party/git/sha1-array.c +++ b/third_party/git/sha1-array.c @@ -48,7 +48,7 @@ int oid_array_for_each(struct oid_array *array, { int i; - /* No oid_array_sort() here! See sha1-array.h */ + /* No oid_array_sort() here! See the api-oid-array.txt docs! */ for (i = 0; i < array->nr; i++) { int ret = fn(array->oid + i, data); diff --git a/third_party/git/sha1-array.h b/third_party/git/sha1-array.h index dc1bca9c9a..55d016c4bf 100644 --- a/third_party/git/sha1-array.h +++ b/third_party/git/sha1-array.h @@ -1,52 +1,6 @@ #ifndef SHA1_ARRAY_H #define SHA1_ARRAY_H -/** - * The API provides storage and manipulation of sets of object identifiers. - * The emphasis is on storage and processing efficiency, making them suitable - * for large lists. Note that the ordering of items is not preserved over some - * operations. - * - * Examples - * -------- - * ----------------------------------------- - * int print_callback(const struct object_id *oid, - * void *data) - * { - * printf("%s\n", oid_to_hex(oid)); - * return 0; // always continue - * } - * - * void some_func(void) - * { - * struct sha1_array hashes = OID_ARRAY_INIT; - * struct object_id oid; - * - * // Read objects into our set - * while (read_object_from_stdin(oid.hash)) - * oid_array_append(&hashes, &oid); - * - * // Check if some objects are in our set - * while (read_object_from_stdin(oid.hash)) { - * if (oid_array_lookup(&hashes, &oid) >= 0) - * printf("it's in there!\n"); - * - * // Print the unique set of objects. We could also have - * // avoided adding duplicate objects in the first place, - * // but we would end up re-sorting the array repeatedly. - * // Instead, this will sort once and then skip duplicates - * // in linear time. - * - * oid_array_for_each_unique(&hashes, print_callback, NULL); - * } - */ - -/** - * A single array of object IDs. This should be initialized by assignment from - * `OID_ARRAY_INIT`. The `oid` member contains the actual data. The `nr` member - * contains the number of items in the set. The `alloc` and `sorted` members - * are used internally, and should not be needed by API callers. - */ struct oid_array { struct object_id *oid; int nr; @@ -56,52 +10,18 @@ struct oid_array { #define OID_ARRAY_INIT { NULL, 0, 0, 0 } -/** - * Add an item to the set. The object ID will be placed at the end of the array - * (but note that some operations below may lose this ordering). - */ void oid_array_append(struct oid_array *array, const struct object_id *oid); - -/** - * Perform a binary search of the array for a specific object ID. If found, - * returns the offset (in number of elements) of the object ID. If not found, - * returns a negative integer. If the array is not sorted, this function has - * the side effect of sorting it. - */ int oid_array_lookup(struct oid_array *array, const struct object_id *oid); - -/** - * Free all memory associated with the array and return it to the initial, - * empty state. - */ void oid_array_clear(struct oid_array *array); typedef int (*for_each_oid_fn)(const struct object_id *oid, void *data); -/** - * Iterate over each element of the list, executing the callback function for - * each one. Does not sort the list, so any custom hash order is retained. - * If the callback returns a non-zero value, the iteration ends immediately - * and the callback's return is propagated; otherwise, 0 is returned. - */ int oid_array_for_each(struct oid_array *array, for_each_oid_fn fn, void *data); - -/** - * Iterate over each unique element of the list in sorted order, but otherwise - * behave like `oid_array_for_each`. If the array is not sorted, this function - * has the side effect of sorting it. - */ int oid_array_for_each_unique(struct oid_array *array, for_each_oid_fn fn, void *data); - -/** - * Apply the callback function `want` to each entry in the array, retaining - * only the entries for which the function returns true. Preserve the order - * of the entries that are retained. - */ void oid_array_filter(struct oid_array *array, for_each_oid_fn want, void *cbdata); diff --git a/third_party/git/sha1-file.c b/third_party/git/sha1-file.c index 616886799e..487ea35d2d 100644 --- a/third_party/git/sha1-file.c +++ b/third_party/git/sha1-file.c @@ -30,8 +30,8 @@ #include "mergesort.h" #include "quote.h" #include "packfile.h" +#include "fetch-object.h" #include "object-store.h" -#include "promisor-remote.h" /* The maximum size for an object header. */ #define MAX_HEADER_LEN 32 @@ -55,6 +55,7 @@ "\x6f\xe1\x41\xf7\x74\x91\x20\xa3\x03\x72" \ "\x18\x13" +const unsigned char null_sha1[GIT_MAX_RAWSZ]; const struct object_id null_oid; static const struct object_id empty_tree_oid = { EMPTY_TREE_SHA1_BIN_LITERAL @@ -951,8 +952,12 @@ void *xmmap_gently(void *start, size_t length, mmap_limit_check(length); ret = mmap(start, length, prot, flags, fd, offset); - if (ret == MAP_FAILED && !length) - ret = NULL; + if (ret == MAP_FAILED) { + if (!length) + return NULL; + release_pack_memory(length); + ret = mmap(start, length, prot, flags, fd, offset); + } return ret; } @@ -971,8 +976,8 @@ void *xmmap(void *start, size_t length, * With "map" == NULL, try reading the object named with "oid" using * the streaming interface and rehash it to do the same. */ -int check_object_signature(struct repository *r, const struct object_id *oid, - void *map, unsigned long size, const char *type) +int check_object_signature(const struct object_id *oid, void *map, + unsigned long size, const char *type) { struct object_id real_oid; enum object_type obj_type; @@ -982,11 +987,11 @@ int check_object_signature(struct repository *r, const struct object_id *oid, int hdrlen; if (map) { - hash_object_file(r->hash_algo, map, size, type, &real_oid); + hash_object_file(map, size, type, &real_oid); return !oideq(oid, &real_oid) ? -1 : 0; } - st = open_istream(r, oid, &obj_type, &size, NULL); + st = open_istream(oid, &obj_type, &size, NULL); if (!st) return -1; @@ -994,8 +999,8 @@ int check_object_signature(struct repository *r, const struct object_id *oid, hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(obj_type), (uintmax_t)size) + 1; /* Sha1.. */ - r->hash_algo->init_fn(&c); - r->hash_algo->update_fn(&c, hdr, hdrlen); + the_hash_algo->init_fn(&c); + the_hash_algo->update_fn(&c, hdr, hdrlen); for (;;) { char buf[1024 * 16]; ssize_t readlen = read_istream(st, buf, sizeof(buf)); @@ -1006,9 +1011,9 @@ int check_object_signature(struct repository *r, const struct object_id *oid, } if (!readlen) break; - r->hash_algo->update_fn(&c, buf, readlen); + the_hash_algo->update_fn(&c, buf, readlen); } - r->hash_algo->final_fn(real_oid.hash, &c); + the_hash_algo->final_fn(real_oid.hash, &c); close_istream(st); return !oideq(oid, &real_oid) ? -1 : 0; } @@ -1147,8 +1152,6 @@ static int unpack_loose_short_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz) { - int ret; - /* Get the data stream */ memset(stream, 0, sizeof(*stream)); stream->next_in = map; @@ -1157,11 +1160,7 @@ static int unpack_loose_short_header(git_zstream *stream, stream->avail_out = bufsiz; git_inflate_init(stream); - obj_read_unlock(); - ret = git_inflate(stream, 0); - obj_read_lock(); - - return ret; + return git_inflate(stream, 0); } int unpack_loose_header(git_zstream *stream, @@ -1206,9 +1205,7 @@ static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map stream->avail_out = bufsiz; do { - obj_read_unlock(); status = git_inflate(stream, 0); - obj_read_lock(); strbuf_add(header, buffer, stream->next_out - (unsigned char *)buffer); if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer)) return 0; @@ -1248,11 +1245,8 @@ static void *unpack_loose_rest(git_zstream *stream, */ stream->next_out = buf + bytes; stream->avail_out = size - bytes; - while (status == Z_OK) { - obj_read_unlock(); + while (status == Z_OK) status = git_inflate(stream, Z_FINISH); - obj_read_lock(); - } } if (status == Z_STREAM_END && !stream->avail_in) { git_inflate_end(stream); @@ -1354,8 +1348,8 @@ static int loose_object_info(struct repository *r, struct strbuf hdrbuf = STRBUF_INIT; unsigned long size_scratch; - if (oi->delta_base_oid) - oidclr(oi->delta_base_oid); + if (oi->delta_base_sha1) + hashclr(oi->delta_base_sha1); /* * If we don't care about type or size, then we don't @@ -1422,41 +1416,17 @@ static int loose_object_info(struct repository *r, return (status < 0) ? status : 0; } -int obj_read_use_lock = 0; -pthread_mutex_t obj_read_mutex; - -void enable_obj_read_lock(void) -{ - if (obj_read_use_lock) - return; - - obj_read_use_lock = 1; - init_recursive_mutex(&obj_read_mutex); -} - -void disable_obj_read_lock(void) -{ - if (!obj_read_use_lock) - return; - - obj_read_use_lock = 0; - pthread_mutex_destroy(&obj_read_mutex); -} - int fetch_if_missing = 1; -static int do_oid_object_info_extended(struct repository *r, - const struct object_id *oid, - struct object_info *oi, unsigned flags) +int oid_object_info_extended(struct repository *r, const struct object_id *oid, + struct object_info *oi, unsigned flags) { static struct object_info blank_oi = OBJECT_INFO_INIT; - struct cached_object *co; struct pack_entry e; int rtype; const struct object_id *real = oid; int already_retried = 0; - if (flags & OBJECT_INFO_LOOKUP_REPLACE) real = lookup_replace_object(r, oid); @@ -1466,22 +1436,24 @@ static int do_oid_object_info_extended(struct repository *r, if (!oi) oi = &blank_oi; - co = find_cached_object(real); - if (co) { - if (oi->typep) - *(oi->typep) = co->type; - if (oi->sizep) - *(oi->sizep) = co->size; - if (oi->disk_sizep) - *(oi->disk_sizep) = 0; - if (oi->delta_base_oid) - oidclr(oi->delta_base_oid); - if (oi->type_name) - strbuf_addstr(oi->type_name, type_name(co->type)); - if (oi->contentp) - *oi->contentp = xmemdupz(co->buf, co->size); - oi->whence = OI_CACHED; - return 0; + if (!(flags & OBJECT_INFO_SKIP_CACHED)) { + struct cached_object *co = find_cached_object(real); + if (co) { + if (oi->typep) + *(oi->typep) = co->type; + if (oi->sizep) + *(oi->sizep) = co->size; + if (oi->disk_sizep) + *(oi->disk_sizep) = 0; + if (oi->delta_base_sha1) + hashclr(oi->delta_base_sha1); + if (oi->type_name) + strbuf_addstr(oi->type_name, type_name(co->type)); + if (oi->contentp) + *oi->contentp = xmemdupz(co->buf, co->size); + oi->whence = OI_CACHED; + return 0; + } } while (1) { @@ -1503,17 +1475,16 @@ static int do_oid_object_info_extended(struct repository *r, } /* Check if it is a missing object */ - if (fetch_if_missing && has_promisor_remote() && + if (fetch_if_missing && repository_format_partial_clone && !already_retried && r == the_repository && !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) { /* - * TODO Investigate checking promisor_remote_get_direct() - * TODO return value and stopping on error here. - * TODO Pass a repository struct through - * promisor_remote_get_direct(), such that arbitrary - * repositories work. + * TODO Investigate having fetch_object() return + * TODO error/success and stopping the music here. + * TODO Pass a repository struct through fetch_object, + * such that arbitrary repositories work. */ - promisor_remote_get_direct(r, real, 1); + fetch_objects(repository_format_partial_clone, real, 1); already_retried = 1; continue; } @@ -1530,7 +1501,7 @@ static int do_oid_object_info_extended(struct repository *r, rtype = packed_object_info(r, e.p, e.offset, oi); if (rtype < 0) { mark_bad_packed_object(e.p, real->hash); - return do_oid_object_info_extended(r, real, oi, 0); + return oid_object_info_extended(r, real, oi, 0); } else if (oi->whence == OI_PACKED) { oi->u.packed.offset = e.offset; oi->u.packed.pack = e.p; @@ -1541,17 +1512,6 @@ static int do_oid_object_info_extended(struct repository *r, return 0; } -int oid_object_info_extended(struct repository *r, const struct object_id *oid, - struct object_info *oi, unsigned flags) -{ - int ret; - obj_read_lock(); - ret = do_oid_object_info_extended(r, oid, oi, flags); - obj_read_unlock(); - return ret; -} - - /* returns enum object_type or negative */ int oid_object_info(struct repository *r, const struct object_id *oid, @@ -1588,7 +1548,7 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type, { struct cached_object *co; - hash_object_file(the_hash_algo, buf, len, type_name(type), oid); + hash_object_file(buf, len, type_name(type), oid); if (has_object_file(oid) || find_cached_object(oid)) return 0; ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc); @@ -1624,7 +1584,6 @@ void *read_object_file_extended(struct repository *r, if (data) return data; - obj_read_lock(); if (errno && errno != ENOENT) die_errno(_("failed to read object %s"), oid_to_hex(oid)); @@ -1640,7 +1599,6 @@ void *read_object_file_extended(struct repository *r, if ((p = has_packed_and_bad(r, repl->hash)) != NULL) die(_("packed object %s (stored in %s) is corrupt"), oid_to_hex(repl), p->pack_name); - obj_read_unlock(); return NULL; } @@ -1694,8 +1652,7 @@ void *read_object_with_reference(struct repository *r, } } -static void write_object_file_prepare(const struct git_hash_algo *algo, - const void *buf, unsigned long len, +static void write_object_file_prepare(const void *buf, unsigned long len, const char *type, struct object_id *oid, char *hdr, int *hdrlen) { @@ -1705,10 +1662,10 @@ static void write_object_file_prepare(const struct git_hash_algo *algo, *hdrlen = xsnprintf(hdr, *hdrlen, "%s %"PRIuMAX , type, (uintmax_t)len)+1; /* Sha1.. */ - algo->init_fn(&c); - algo->update_fn(&c, hdr, *hdrlen); - algo->update_fn(&c, buf, len); - algo->final_fn(oid->hash, &c); + the_hash_algo->init_fn(&c); + the_hash_algo->update_fn(&c, hdr, *hdrlen); + the_hash_algo->update_fn(&c, buf, len); + the_hash_algo->final_fn(oid->hash, &c); } /* @@ -1761,13 +1718,12 @@ static int write_buffer(int fd, const void *buf, size_t len) return 0; } -int hash_object_file(const struct git_hash_algo *algo, const void *buf, - unsigned long len, const char *type, +int hash_object_file(const void *buf, unsigned long len, const char *type, struct object_id *oid) { char hdr[MAX_HEADER_LEN]; int hdrlen = sizeof(hdr); - write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen); + write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen); return 0; } @@ -1925,8 +1881,7 @@ int write_object_file(const void *buf, unsigned long len, const char *type, /* Normally if we have it in the pack then we do not bother writing * it out into .git/objects/??/?{38} file. */ - write_object_file_prepare(the_hash_algo, buf, len, type, oid, hdr, - &hdrlen); + write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen); if (freshen_packed_object(oid) || freshen_loose_object(oid)) return 0; return write_loose_object(oid, hdr, hdrlen, buf, len, 0); @@ -1942,8 +1897,7 @@ int hash_object_file_literally(const void *buf, unsigned long len, /* type string, SP, %lu of the length plus NUL must fit this */ hdrlen = strlen(type) + MAX_HEADER_LEN; header = xmalloc(hdrlen); - write_object_file_prepare(the_hash_algo, buf, len, type, oid, header, - &hdrlen); + write_object_file_prepare(buf, len, type, oid, header, &hdrlen); if (!(flags & HASH_WRITE_OBJECT)) goto cleanup; @@ -1982,7 +1936,8 @@ int repo_has_object_file_with_flags(struct repository *r, { if (!startup_info->have_repository) return 0; - return oid_object_info_extended(r, oid, NULL, flags) >= 0; + return oid_object_info_extended(r, oid, NULL, + flags | OBJECT_INFO_SKIP_CACHED) >= 0; } int repo_has_object_file(struct repository *r, @@ -2053,8 +2008,7 @@ static int index_mem(struct index_state *istate, if (write_object) ret = write_object_file(buf, size, type_name(type), oid); else - ret = hash_object_file(the_hash_algo, buf, size, - type_name(type), oid); + ret = hash_object_file(buf, size, type_name(type), oid); if (re_allocated) free(buf); return ret; @@ -2080,8 +2034,8 @@ static int index_stream_convert_blob(struct index_state *istate, ret = write_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB), oid); else - ret = hash_object_file(the_hash_algo, sbuf.buf, sbuf.len, - type_name(OBJ_BLOB), oid); + ret = hash_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB), + oid); strbuf_release(&sbuf); return ret; } @@ -2199,8 +2153,7 @@ int index_path(struct index_state *istate, struct object_id *oid, if (strbuf_readlink(&sb, path, st->st_size)) return error_errno("readlink(\"%s\")", path); if (!(flags & HASH_WRITE_OBJECT)) - hash_object_file(the_hash_algo, sb.buf, sb.len, - blob_type, oid); + hash_object_file(sb.buf, sb.len, blob_type, oid); else if (write_object_file(sb.buf, sb.len, blob_type, oid)) rc = error(_("%s: failed to insert into database"), path); strbuf_release(&sb); @@ -2501,9 +2454,8 @@ int read_loose_object(const char *path, git_inflate_end(&stream); goto out; } - if (check_object_signature(the_repository, expected_oid, - *contents, *size, - type_name(*type))) { + if (check_object_signature(expected_oid, *contents, + *size, type_name(*type))) { error(_("hash mismatch for %s (expected %s)"), path, oid_to_hex(expected_oid)); free(*contents); diff --git a/third_party/git/sha1-lookup.c b/third_party/git/sha1-lookup.c index 29185844ec..796ab68da8 100644 --- a/third_party/git/sha1-lookup.c +++ b/third_party/git/sha1-lookup.c @@ -50,7 +50,7 @@ static uint32_t take2(const unsigned char *sha1) * The sha1 of element i (between 0 and nr - 1) should be returned * by "fn(i, table)". */ -int sha1_pos(const unsigned char *hash, void *table, size_t nr, +int sha1_pos(const unsigned char *sha1, void *table, size_t nr, sha1_access_fn fn) { size_t hi = nr; @@ -63,14 +63,14 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr, if (nr != 1) { size_t lov, hiv, miv, ofs; - for (ofs = 0; ofs < the_hash_algo->rawsz - 2; ofs += 2) { + for (ofs = 0; ofs < 18; ofs += 2) { lov = take2(fn(0, table) + ofs); hiv = take2(fn(nr - 1, table) + ofs); - miv = take2(hash + ofs); + miv = take2(sha1 + ofs); if (miv < lov) return -1; if (hiv < miv) - return index_pos_to_insert_pos(nr); + return -1 - nr; if (lov != hiv) { /* * At this point miv could be equal @@ -88,7 +88,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr, do { int cmp; - cmp = hashcmp(fn(mi, table), hash); + cmp = hashcmp(fn(mi, table), sha1); if (!cmp) return mi; if (cmp > 0) @@ -97,7 +97,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr, lo = mi + 1; mi = lo + (hi - lo) / 2; } while (lo < hi); - return index_pos_to_insert_pos(lo); + return -lo-1; } int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo, diff --git a/third_party/git/sha1-name.c b/third_party/git/sha1-name.c index 5bb006e5a9..2989e27b71 100644 --- a/third_party/git/sha1-name.c +++ b/third_party/git/sha1-name.c @@ -155,6 +155,7 @@ static void unique_in_pack(struct packed_git *p, struct disambiguate_state *ds) { uint32_t num, i, first = 0; + const struct object_id *current = NULL; if (p->multi_pack_index) return; @@ -172,10 +173,10 @@ static void unique_in_pack(struct packed_git *p, */ for (i = first; i < num && !ds->ambiguous; i++) { struct object_id oid; - nth_packed_object_id(&oid, p, i); - if (!match_sha(ds->len, ds->bin_pfx.hash, oid.hash)) + current = nth_packed_object_oid(&oid, p, i); + if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash)) break; - update_candidates(ds, &oid); + update_candidates(ds, current); } } @@ -402,9 +403,9 @@ static int repo_collect_ambiguous(struct repository *r, return collect_ambiguous(oid, data); } -static int sort_ambiguous(const void *a, const void *b, void *ctx) +static struct repository *sort_ambiguous_repo; +static int sort_ambiguous(const void *a, const void *b) { - struct repository *sort_ambiguous_repo = ctx; int a_type = oid_object_info(sort_ambiguous_repo, a, NULL); int b_type = oid_object_info(sort_ambiguous_repo, b, NULL); int a_type_sort; @@ -433,7 +434,10 @@ static int sort_ambiguous(const void *a, const void *b, void *ctx) static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a) { - QSORT_S(a->oid, a->nr, sort_ambiguous, r); + /* mutex will be needed if this code is to be made thread safe */ + sort_ambiguous_repo = r; + QSORT(a->oid, a->nr, sort_ambiguous); + sort_ambiguous_repo = NULL; } static enum get_oid_result get_short_oid(struct repository *r, @@ -642,14 +646,14 @@ static void find_abbrev_len_for_pack(struct packed_git *p, */ mad->init_len = 0; if (!match) { - if (!nth_packed_object_id(&oid, p, first)) + if (nth_packed_object_oid(&oid, p, first)) extend_abbrev_len(&oid, mad); } else if (first < num - 1) { - if (!nth_packed_object_id(&oid, p, first + 1)) + if (nth_packed_object_oid(&oid, p, first + 1)) extend_abbrev_len(&oid, mad); } if (first > 0) { - if (!nth_packed_object_id(&oid, p, first - 1)) + if (nth_packed_object_oid(&oid, p, first - 1)) extend_abbrev_len(&oid, mad); } mad->init_len = mad->cur_len; @@ -907,21 +911,26 @@ static int get_oid_basic(struct repository *r, const char *str, int len, real_ref, flags, at_time, nth, oid, NULL, &co_time, &co_tz, &co_cnt)) { if (!len) { - if (!skip_prefix(real_ref, "refs/heads/", &str)) + if (starts_with(real_ref, "refs/heads/")) { + str = real_ref + 11; + len = strlen(real_ref + 11); + } else { + /* detached HEAD */ str = "HEAD"; - len = strlen(str); + len = 4; + } } if (at_time) { if (!(flags & GET_OID_QUIETLY)) { - warning(_("log for '%.*s' only goes back to %s"), - len, str, + warning("Log for '%.*s' only goes " + "back to %s.", len, str, show_date(co_time, co_tz, DATE_MODE(RFC2822))); } } else { if (flags & GET_OID_QUIETLY) { exit(128); } - die(_("log for '%.*s' only has %d entries"), + die("Log for '%.*s' only has %d entries.", len, str, co_cnt); } } @@ -1154,22 +1163,13 @@ static enum get_oid_result get_oid_1(struct repository *r, } if (has_suffix) { - unsigned int num = 0; + int num = 0; int len1 = cp - name; cp++; - while (cp < name + len) { - unsigned int digit = *cp++ - '0'; - if (unsigned_mult_overflows(num, 10)) - return MISSING_OBJECT; - num *= 10; - if (unsigned_add_overflows(num, digit)) - return MISSING_OBJECT; - num += digit; - } + while (cp < name + len) + num = num * 10 + *cp++ - '0'; if (!num && len1 == len - 1) num = 1; - else if (num > INT_MAX) - return MISSING_OBJECT; if (has_suffix == '^') return get_parent(r, name, len1, oid, num); /* else if (has_suffix == '~') -- goes without saying */ @@ -1289,7 +1289,7 @@ static int get_oid_oneline(struct repository *r, struct grab_nth_branch_switch_cbdata { int remaining; - struct strbuf *sb; + struct strbuf buf; }; static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid, @@ -1307,8 +1307,8 @@ static int grab_nth_branch_switch(struct object_id *ooid, struct object_id *noid return 0; if (--(cb->remaining) == 0) { len = target - match; - strbuf_reset(cb->sb); - strbuf_add(cb->sb, match, len); + strbuf_reset(&cb->buf); + strbuf_add(&cb->buf, match, len); return 1; /* we are done */ } return 0; @@ -1341,15 +1341,18 @@ static int interpret_nth_prior_checkout(struct repository *r, if (nth <= 0) return -1; cb.remaining = nth; - cb.sb = buf; + strbuf_init(&cb.buf, 20); retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r), "HEAD", grab_nth_branch_switch, &cb); if (0 < retval) { + strbuf_reset(buf); + strbuf_addbuf(buf, &cb.buf); retval = brace - name + 1; } else retval = 0; + strbuf_release(&cb.buf); return retval; } @@ -1686,14 +1689,14 @@ static void diagnose_invalid_oid_path(struct repository *r, prefix = ""; if (file_exists(filename)) - die(_("path '%s' exists on disk, but not in '%.*s'"), + die("Path '%s' exists on disk, but not in '%.*s'.", filename, object_name_len, object_name); if (is_missing_file_error(errno)) { char *fullname = xstrfmt("%s%s", prefix, filename); if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) { - die(_("path '%s' exists, but not '%s'\n" - "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"), + die("Path '%s' exists, but not '%s'.\n" + "Did you mean '%.*s:%s' aka '%.*s:./%s'?", fullname, filename, object_name_len, object_name, @@ -1701,7 +1704,7 @@ static void diagnose_invalid_oid_path(struct repository *r, object_name_len, object_name, filename); } - die(_("path '%s' does not exist in '%.*s'"), + die("Path '%s' does not exist in '%.*s'", filename, object_name_len, object_name); } } @@ -1729,8 +1732,8 @@ static void diagnose_invalid_index_path(struct repository *r, ce = istate->cache[pos]; if (ce_namelen(ce) == namelen && !memcmp(ce->name, filename, namelen)) - die(_("path '%s' is in the index, but not at stage %d\n" - "hint: Did you mean ':%d:%s'?"), + die("Path '%s' is in the index, but not at stage %d.\n" + "Did you mean ':%d:%s'?", filename, stage, ce_stage(ce), filename); } @@ -1745,17 +1748,17 @@ static void diagnose_invalid_index_path(struct repository *r, ce = istate->cache[pos]; if (ce_namelen(ce) == fullname.len && !memcmp(ce->name, fullname.buf, fullname.len)) - die(_("path '%s' is in the index, but not '%s'\n" - "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"), + die("Path '%s' is in the index, but not '%s'.\n" + "Did you mean ':%d:%s' aka ':%d:./%s'?", fullname.buf, filename, ce_stage(ce), fullname.buf, ce_stage(ce), filename); } if (repo_file_exists(r, filename)) - die(_("path '%s' exists on disk, but not in the index"), filename); + die("Path '%s' exists on disk, but not in the index.", filename); if (is_missing_file_error(errno)) - die(_("path '%s' does not exist (neither on disk nor in the index)"), + die("Path '%s' does not exist (neither on disk nor in the index).", filename); strbuf_release(&fullname); @@ -1768,7 +1771,7 @@ static char *resolve_relative_path(struct repository *r, const char *rel) return NULL; if (r != the_repository || !is_inside_work_tree()) - die(_("relative path syntax can't be used outside working tree")); + die("relative path syntax can't be used outside working tree."); /* die() inside prefix_path() if resolved path is outside worktree */ return prefix_path(startup_info->prefix, @@ -1906,7 +1909,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo, return ret; } else { if (only_to_die) - die(_("invalid object name '%.*s'."), len, name); + die("Invalid object name '%.*s'.", len, name); } } return ret; diff --git a/third_party/git/sha1dc/sha1.c b/third_party/git/sha1dc/sha1.c index dede2cbddf..9d3cf81d4d 100644 --- a/third_party/git/sha1dc/sha1.c +++ b/third_party/git/sha1dc/sha1.c @@ -72,7 +72,7 @@ /* Not under GCC-alike or glibc */ #elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN) /* - * *BSD and newlib (embedded linux, cygwin, etc). + * *BSD and newlib (embeded linux, cygwin, etc). * the defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN) part prevents * this condition from matching with Solaris/sparc. * (Solaris defines only one endian macro) @@ -98,7 +98,7 @@ /* * Defines Big Endian on a whitelist of OSs that are known to be Big * Endian-only. See - * https://lore.kernel.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/ + * https://public-inbox.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/ */ #define SHA1DC_BIGENDIAN diff --git a/third_party/git/sha1dc_git.c b/third_party/git/sha1dc_git.c index 5c300e812e..e0cc9d988c 100644 --- a/third_party/git/sha1dc_git.c +++ b/third_party/git/sha1dc_git.c @@ -19,7 +19,7 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx) if (!SHA1DCFinal(hash, ctx)) return; die("SHA-1 appears to be part of a collision attack: %s", - hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1])); + sha1_to_hex(hash)); } /* diff --git a/third_party/git/shallow.c b/third_party/git/shallow.c index 7fd04afed1..5fa2b15d37 100644 --- a/third_party/git/shallow.c +++ b/third_party/git/shallow.c @@ -12,7 +12,10 @@ #include "diff.h" #include "revision.h" #include "commit-slab.h" +#include "revision.h" #include "list-objects.h" +#include "commit-slab.h" +#include "repository.h" #include "commit-reach.h" void set_alternate_shallow_file(struct repository *r, const char *path, int override) @@ -153,8 +156,6 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, for (i = 0; i < depths.slab_count; i++) { int j; - if (!depths.slab[i]) - continue; for (j = 0; j < depths.slab_size; j++) free(depths.slab[i][j]); } diff --git a/third_party/git/shell.c b/third_party/git/shell.c index 54cca7439d..40084a3013 100644 --- a/third_party/git/shell.c +++ b/third_party/git/shell.c @@ -16,10 +16,10 @@ static int do_generic_cmd(const char *me, char *arg) setup_path(); if (!arg || !(arg = sq_dequote(arg)) || *arg == '-') die("bad argument"); - if (!skip_prefix(me, "git-", &me)) + if (!starts_with(me, "git-")) die("bad command"); - my_argv[0] = me; + my_argv[0] = me + 4; my_argv[1] = arg; my_argv[2] = NULL; diff --git a/third_party/git/sigchain.h b/third_party/git/sigchain.h index 8e6bada892..138b20f54b 100644 --- a/third_party/git/sigchain.h +++ b/third_party/git/sigchain.h @@ -1,57 +1,12 @@ #ifndef SIGCHAIN_H #define SIGCHAIN_H -/** - * Code often wants to set a signal handler to clean up temporary files or - * other work-in-progress when we die unexpectedly. For multiple pieces of - * code to do this without conflicting, each piece of code must remember - * the old value of the handler and restore it either when: - * - * 1. The work-in-progress is finished, and the handler is no longer - * necessary. The handler should revert to the original behavior - * (either another handler, SIG_DFL, or SIG_IGN). - * - * 2. The signal is received. We should then do our cleanup, then chain - * to the next handler (or die if it is SIG_DFL). - * - * Sigchain is a tiny library for keeping a stack of handlers. Your handler - * and installation code should look something like: - * - * ------------------------------------------ - * void clean_foo_on_signal(int sig) - * { - * clean_foo(); - * sigchain_pop(sig); - * raise(sig); - * } - * - * void other_func() - * { - * sigchain_push_common(clean_foo_on_signal); - * mess_up_foo(); - * clean_foo(); - * } - * ------------------------------------------ - * - */ - -/** - * Handlers are given the typedef of sigchain_fun. This is the same type - * that is given to signal() or sigaction(). It is perfectly reasonable to - * push SIG_DFL or SIG_IGN onto the stack. - */ typedef void (*sigchain_fun)(int); -/* You can sigchain_push and sigchain_pop individual signals. */ int sigchain_push(int sig, sigchain_fun f); int sigchain_pop(int sig); -/** - * push the handler onto the stack for the common signals: - * SIGINT, SIGHUP, SIGTERM, SIGQUIT and SIGPIPE. - */ void sigchain_push_common(sigchain_fun f); - void sigchain_pop_common(void); #endif /* SIGCHAIN_H */ diff --git a/third_party/git/strbuf.c b/third_party/git/strbuf.c index bb0065ccaf..d30f916858 100644 --- a/third_party/git/strbuf.c +++ b/third_party/git/strbuf.c @@ -479,21 +479,6 @@ void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src) } } -#define URL_UNSAFE_CHARS " <>\"%{}|\\^`:/?#[]@!$&'()*+,;=" - -void strbuf_add_percentencode(struct strbuf *dst, const char *src) -{ - size_t i, len = strlen(src); - - for (i = 0; i < len; i++) { - unsigned char ch = src[i]; - if (ch <= 0x1F || ch >= 0x7F || strchr(URL_UNSAFE_CHARS, ch)) - strbuf_addf(dst, "%%%02X", (unsigned char)ch); - else - strbuf_addch(dst, ch); - } -} - size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f) { size_t res; @@ -789,10 +774,8 @@ void strbuf_addstr_xml_quoted(struct strbuf *buf, const char *s) } } -int is_rfc3986_reserved_or_unreserved(char ch) +static int is_rfc3986_reserved(char ch) { - if (is_rfc3986_unreserved(ch)) - return 1; switch (ch) { case '!': case '*': case '\'': case '(': case ')': case ';': case ':': case '@': case '&': case '=': case '+': case '$': @@ -802,19 +785,20 @@ int is_rfc3986_reserved_or_unreserved(char ch) return 0; } -int is_rfc3986_unreserved(char ch) +static int is_rfc3986_unreserved(char ch) { return isalnum(ch) || ch == '-' || ch == '_' || ch == '.' || ch == '~'; } static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len, - char_predicate allow_unencoded_fn) + int reserved) { strbuf_grow(sb, len); while (len--) { char ch = *s++; - if (allow_unencoded_fn(ch)) + if (is_rfc3986_unreserved(ch) || + (!reserved && is_rfc3986_reserved(ch))) strbuf_addch(sb, ch); else strbuf_addf(sb, "%%%02x", (unsigned char)ch); @@ -822,9 +806,9 @@ static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len, } void strbuf_addstr_urlencode(struct strbuf *sb, const char *s, - char_predicate allow_unencoded_fn) + int reserved) { - strbuf_add_urlencode(sb, s, strlen(s), allow_unencoded_fn); + strbuf_add_urlencode(sb, s, strlen(s), reserved); } static void strbuf_humanise(struct strbuf *buf, off_t bytes, @@ -1140,31 +1124,3 @@ int strbuf_normalize_path(struct strbuf *src) strbuf_release(&dst); return 0; } - -int strbuf_edit_interactively(struct strbuf *buffer, const char *path, - const char *const *env) -{ - char *path2 = NULL; - int fd, res = 0; - - if (!is_absolute_path(path)) - path = path2 = xstrdup(git_path("%s", path)); - - fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666); - if (fd < 0) - res = error_errno(_("could not open '%s' for writing"), path); - else if (write_in_full(fd, buffer->buf, buffer->len) < 0) { - res = error_errno(_("could not write to '%s'"), path); - close(fd); - } else if (close(fd) < 0) - res = error_errno(_("could not close '%s'"), path); - else { - strbuf_reset(buffer); - if (launch_editor(path, buffer, env) < 0) - res = error_errno(_("could not edit '%s'"), path); - unlink(path); - } - - free(path2); - return res; -} diff --git a/third_party/git/strbuf.h b/third_party/git/strbuf.h index ce8e49c0b2..f62278a0be 100644 --- a/third_party/git/strbuf.h +++ b/third_party/git/strbuf.h @@ -245,18 +245,6 @@ void strbuf_addchars(struct strbuf *sb, int c, size_t n); void strbuf_insert(struct strbuf *sb, size_t pos, const void *, size_t); /** - * Insert a NUL-terminated string to the given position of the buffer. - * The remaining contents will be shifted, not overwritten. It's an - * inline function to allow the compiler to resolve strlen() calls on - * constants at compile time. - */ -static inline void strbuf_insertstr(struct strbuf *sb, size_t pos, - const char *s) -{ - strbuf_insert(sb, pos, s, strlen(s)); -} - -/** * Insert data to the given position of the buffer giving a printf format * string. The contents will be shifted, not overwritten. */ @@ -379,12 +367,6 @@ size_t strbuf_expand_dict_cb(struct strbuf *sb, void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src); /** - * Append the contents of a string to a strbuf, percent-encoding any characters - * that are needed to be encoded for a URL. - */ -void strbuf_add_percentencode(struct strbuf *dst, const char *src); - -/** * Append the given byte size as a human-readable string (i.e. 12.23 KiB, * 3.50 MiB). */ @@ -639,17 +621,6 @@ int launch_editor(const char *path, struct strbuf *buffer, int launch_sequence_editor(const char *path, struct strbuf *buffer, const char *const *env); -/* - * In contrast to `launch_editor()`, this function writes out the contents - * of the specified file first, then clears the `buffer`, then launches - * the editor and reads back in the file contents into the `buffer`. - * Finally, it deletes the temporary file. - * - * If `path` is relative, it refers to a file in the `.git` directory. - */ -int strbuf_edit_interactively(struct strbuf *buffer, const char *path, - const char *const *env); - void strbuf_add_lines(struct strbuf *sb, const char *prefix, const char *buf, @@ -701,13 +672,8 @@ void strbuf_branchname(struct strbuf *sb, const char *name, */ int strbuf_check_branch_ref(struct strbuf *sb, const char *name); -typedef int (*char_predicate)(char ch); - -int is_rfc3986_unreserved(char ch); -int is_rfc3986_reserved_or_unreserved(char ch); - void strbuf_addstr_urlencode(struct strbuf *sb, const char *name, - char_predicate allow_unencoded_fn); + int reserved); __attribute__((format (printf,1,2))) int printf_ln(const char *fmt, ...); diff --git a/third_party/git/streaming.c b/third_party/git/streaming.c index 800f07a52c..fcd6303219 100644 --- a/third_party/git/streaming.c +++ b/third_party/git/streaming.c @@ -16,7 +16,6 @@ enum input_source { }; typedef int (*open_istream_fn)(struct git_istream *, - struct repository *, struct object_info *, const struct object_id *, enum object_type *); @@ -30,8 +29,8 @@ struct stream_vtbl { #define open_method_decl(name) \ int open_istream_ ##name \ - (struct git_istream *st, struct repository *r, \ - struct object_info *oi, const struct object_id *oid, \ + (struct git_istream *st, struct object_info *oi, \ + const struct object_id *oid, \ enum object_type *type) #define close_method_decl(name) \ @@ -109,8 +108,7 @@ ssize_t read_istream(struct git_istream *st, void *buf, size_t sz) return st->vtbl->read(st, buf, sz); } -static enum input_source istream_source(struct repository *r, - const struct object_id *oid, +static enum input_source istream_source(const struct object_id *oid, enum object_type *type, struct object_info *oi) { @@ -119,7 +117,7 @@ static enum input_source istream_source(struct repository *r, oi->typep = type; oi->sizep = &size; - status = oid_object_info_extended(r, oid, oi, 0); + status = oid_object_info_extended(the_repository, oid, oi, 0); if (status < 0) return stream_error; @@ -135,23 +133,22 @@ static enum input_source istream_source(struct repository *r, } } -struct git_istream *open_istream(struct repository *r, - const struct object_id *oid, +struct git_istream *open_istream(const struct object_id *oid, enum object_type *type, unsigned long *size, struct stream_filter *filter) { struct git_istream *st; struct object_info oi = OBJECT_INFO_INIT; - const struct object_id *real = lookup_replace_object(r, oid); - enum input_source src = istream_source(r, real, type, &oi); + const struct object_id *real = lookup_replace_object(the_repository, oid); + enum input_source src = istream_source(real, type, &oi); if (src < 0) return NULL; st = xmalloc(sizeof(*st)); - if (open_istream_tbl[src](st, r, &oi, real, type)) { - if (open_istream_incore(st, r, &oi, real, type)) { + if (open_istream_tbl[src](st, &oi, real, type)) { + if (open_istream_incore(st, &oi, real, type)) { free(st); return NULL; } @@ -341,7 +338,8 @@ static struct stream_vtbl loose_vtbl = { static open_method_decl(loose) { - st->u.loose.mapped = map_loose_object(r, oid, &st->u.loose.mapsize); + st->u.loose.mapped = map_loose_object(the_repository, + oid, &st->u.loose.mapsize); if (!st->u.loose.mapped) return -1; if ((unpack_loose_header(&st->z, @@ -501,7 +499,7 @@ static struct stream_vtbl incore_vtbl = { static open_method_decl(incore) { - st->u.incore.buf = read_object_file_extended(r, oid, type, &st->size, 0); + st->u.incore.buf = read_object_file_extended(the_repository, oid, type, &st->size, 0); st->u.incore.read_ptr = 0; st->vtbl = &incore_vtbl; @@ -522,7 +520,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter ssize_t kept = 0; int result = -1; - st = open_istream(the_repository, oid, &type, &sz, filter); + st = open_istream(oid, &type, &sz, filter); if (!st) { if (filter) free_stream_filter(filter); diff --git a/third_party/git/streaming.h b/third_party/git/streaming.h index 5e4e6acfd0..f465a3cd31 100644 --- a/third_party/git/streaming.h +++ b/third_party/git/streaming.h @@ -8,9 +8,7 @@ /* opaque */ struct git_istream; -struct git_istream *open_istream(struct repository *, const struct object_id *, - enum object_type *, unsigned long *, - struct stream_filter *); +struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *); int close_istream(struct git_istream *); ssize_t read_istream(struct git_istream *, void *, size_t); diff --git a/third_party/git/string-list.h b/third_party/git/string-list.h index 6c5d274126..f964399949 100644 --- a/third_party/git/string-list.h +++ b/third_party/git/string-list.h @@ -4,8 +4,7 @@ /** * The string_list API offers a data structure and functions to handle * sorted and unsorted arrays of strings. A "sorted" list is one whose - * entries are sorted by string value in the order specified by the `cmp` - * member (`strcmp()` by default). + * entries are sorted by string value in `strcmp()` order. * * The caller: * @@ -180,7 +179,7 @@ void string_list_remove(struct string_list *list, const char *string, /** * Check if the given string is part of a sorted list. If it is part of the list, - * return the corresponding string_list_item, NULL otherwise. + * return the coresponding string_list_item, NULL otherwise. */ struct string_list_item *string_list_lookup(struct string_list *list, const char *string); @@ -210,8 +209,7 @@ struct string_list_item *string_list_append(struct string_list *list, const char struct string_list_item *string_list_append_nodup(struct string_list *list, char *string); /** - * Sort the list's entries by string value in order specified by list->cmp - * (strcmp() if list->cmp is NULL). + * Sort the list's entries by string value in `strcmp()` order. */ void string_list_sort(struct string_list *list); diff --git a/third_party/git/sub-process.c b/third_party/git/sub-process.c index 1b1af9dcbd..3f4af93555 100644 --- a/third_party/git/sub-process.c +++ b/third_party/git/sub-process.c @@ -6,14 +6,12 @@ #include "pkt-line.h" int cmd2process_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct subprocess_entry *e1, *e2; - - e1 = container_of(eptr, const struct subprocess_entry, ent); - e2 = container_of(entry_or_key, const struct subprocess_entry, ent); + const struct subprocess_entry *e1 = entry; + const struct subprocess_entry *e2 = entry_or_key; return strcmp(e1->cmd, e2->cmd); } @@ -22,9 +20,9 @@ struct subprocess_entry *subprocess_find_entry(struct hashmap *hashmap, const ch { struct subprocess_entry key; - hashmap_entry_init(&key.ent, strhash(cmd)); + hashmap_entry_init(&key, strhash(cmd)); key.cmd = cmd; - return hashmap_get_entry(hashmap, &key, ent, NULL); + return hashmap_get(hashmap, &key, NULL); } int subprocess_read_status(int fd, struct strbuf *status) @@ -60,7 +58,7 @@ void subprocess_stop(struct hashmap *hashmap, struct subprocess_entry *entry) kill(entry->process.pid, SIGTERM); finish_command(&entry->process); - hashmap_remove(hashmap, &entry->ent, NULL); + hashmap_remove(hashmap, entry, NULL); } static void subprocess_exit_handler(struct child_process *process) @@ -98,7 +96,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co return err; } - hashmap_entry_init(&entry->ent, strhash(cmd)); + hashmap_entry_init(entry, strhash(cmd)); err = startfn(entry); if (err) { @@ -107,7 +105,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co return err; } - hashmap_add(hashmap, &entry->ent); + hashmap_add(hashmap, entry); return 0; } diff --git a/third_party/git/sub-process.h b/third_party/git/sub-process.h index e85f21fa1a..5c182fad98 100644 --- a/third_party/git/sub-process.h +++ b/third_party/git/sub-process.h @@ -24,7 +24,7 @@ /* Members should not be accessed directly. */ struct subprocess_entry { - struct hashmap_entry ent; + struct hashmap_entry ent; /* must be the first member! */ const char *cmd; struct child_process process; }; @@ -43,8 +43,8 @@ struct subprocess_capability { /* Function to test two subprocess hashmap entries for equality. */ int cmd2process_cmp(const void *unused_cmp_data, - const struct hashmap_entry *e, - const struct hashmap_entry *entry_or_key, + const void *e1, + const void *e2, const void *unused_keydata); /* diff --git a/third_party/git/submodule-config.c b/third_party/git/submodule-config.c index 4d1c92d582..4264ee216f 100644 --- a/third_party/git/submodule-config.c +++ b/third_party/git/submodule-config.c @@ -38,28 +38,24 @@ enum lookup_type { }; static int config_path_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct submodule_entry *a, *b; - - a = container_of(eptr, const struct submodule_entry, ent); - b = container_of(entry_or_key, const struct submodule_entry, ent); + const struct submodule_entry *a = entry; + const struct submodule_entry *b = entry_or_key; return strcmp(a->config->path, b->config->path) || !oideq(&a->config->gitmodules_oid, &b->config->gitmodules_oid); } static int config_name_cmp(const void *unused_cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *unused_keydata) { - const struct submodule_entry *a, *b; - - a = container_of(eptr, const struct submodule_entry, ent); - b = container_of(entry_or_key, const struct submodule_entry, ent); + const struct submodule_entry *a = entry; + const struct submodule_entry *b = entry_or_key; return strcmp(a->config->name, b->config->name) || !oideq(&a->config->gitmodules_oid, &b->config->gitmodules_oid); @@ -99,12 +95,12 @@ static void submodule_cache_clear(struct submodule_cache *cache) * allocation of struct submodule entries. Each is allocated by * their .gitmodules blob sha1 and submodule name. */ - hashmap_for_each_entry(&cache->for_name, &iter, entry, - ent /* member name */) + hashmap_iter_init(&cache->for_name, &iter); + while ((entry = hashmap_iter_next(&iter))) free_one_config(entry); - hashmap_free_entries(&cache->for_path, struct submodule_entry, ent); - hashmap_free_entries(&cache->for_name, struct submodule_entry, ent); + hashmap_free(&cache->for_path, 1); + hashmap_free(&cache->for_name, 1); cache->initialized = 0; cache->gitmodules_read = 0; } @@ -127,9 +123,9 @@ static void cache_put_path(struct submodule_cache *cache, unsigned int hash = hash_oid_string(&submodule->gitmodules_oid, submodule->path); struct submodule_entry *e = xmalloc(sizeof(*e)); - hashmap_entry_init(&e->ent, hash); + hashmap_entry_init(e, hash); e->config = submodule; - hashmap_put(&cache->for_path, &e->ent); + hashmap_put(&cache->for_path, e); } static void cache_remove_path(struct submodule_cache *cache, @@ -139,9 +135,9 @@ static void cache_remove_path(struct submodule_cache *cache, submodule->path); struct submodule_entry e; struct submodule_entry *removed; - hashmap_entry_init(&e.ent, hash); + hashmap_entry_init(&e, hash); e.config = submodule; - removed = hashmap_remove_entry(&cache->for_path, &e, ent, NULL); + removed = hashmap_remove(&cache->for_path, &e, NULL); free(removed); } @@ -151,9 +147,9 @@ static void cache_add(struct submodule_cache *cache, unsigned int hash = hash_oid_string(&submodule->gitmodules_oid, submodule->name); struct submodule_entry *e = xmalloc(sizeof(*e)); - hashmap_entry_init(&e->ent, hash); + hashmap_entry_init(e, hash); e->config = submodule; - hashmap_add(&cache->for_name, &e->ent); + hashmap_add(&cache->for_name, e); } static const struct submodule *cache_lookup_path(struct submodule_cache *cache, @@ -167,10 +163,10 @@ static const struct submodule *cache_lookup_path(struct submodule_cache *cache, oidcpy(&key_config.gitmodules_oid, gitmodules_oid); key_config.path = path; - hashmap_entry_init(&key.ent, hash); + hashmap_entry_init(&key, hash); key.config = &key_config; - entry = hashmap_get_entry(&cache->for_path, &key, ent, NULL); + entry = hashmap_get(&cache->for_path, &key, NULL); if (entry) return entry->config; return NULL; @@ -187,10 +183,10 @@ static struct submodule *cache_lookup_name(struct submodule_cache *cache, oidcpy(&key_config.gitmodules_oid, gitmodules_oid); key_config.name = name; - hashmap_entry_init(&key.ent, hash); + hashmap_entry_init(&key, hash); key.config = &key_config; - entry = hashmap_get_entry(&cache->for_name, &key, ent, NULL); + entry = hashmap_get(&cache->for_name, &key, NULL); if (entry) return entry->config; return NULL; @@ -409,13 +405,6 @@ struct parse_config_parameter { int overwrite; }; -/* - * Parse a config item from .gitmodules. - * - * This does not handle submodule-related configuration from the main - * config store (.git/config, etc). Callers are responsible for - * checking for overrides in the main config store when appropriate. - */ static int parse_config(const char *var, const char *value, void *data) { struct parse_config_parameter *me = data; @@ -493,9 +482,8 @@ static int parse_config(const char *var, const char *value, void *data) warn_multiple_config(me->treeish_name, submodule->name, "update"); else if (parse_submodule_update_strategy(value, - &submodule->update_strategy) < 0 || - submodule->update_strategy.type == SM_UPDATE_COMMAND) - die(_("invalid value for %s"), var); + &submodule->update_strategy) < 0) + die(_("invalid value for %s"), var); } else if (!strcmp(item.buf, "shallow")) { if (!me->overwrite && submodule->recommend_shallow != -1) warn_multiple_config(me->treeish_name, submodule->name, @@ -562,9 +550,7 @@ static const struct submodule *config_from(struct submodule_cache *cache, struct hashmap_iter iter; struct submodule_entry *entry; - entry = hashmap_iter_first_entry(&cache->for_name, &iter, - struct submodule_entry, - ent /* member name */); + entry = hashmap_iter_first(&cache->for_name, &iter); if (!entry) return NULL; return entry->config; @@ -626,7 +612,7 @@ static void submodule_cache_check_init(struct repository *repo) /* * Note: This function is private for a reason, the '.gitmodules' file should - * not be used as a mechanism to retrieve arbitrary configuration stored in + * not be used as as a mechanism to retrieve arbitrary configuration stored in * the repository. * * Runs the provided config function on the '.gitmodules' file found in the @@ -635,9 +621,7 @@ static void submodule_cache_check_init(struct repository *repo) static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void *data) { if (repo->worktree) { - struct git_config_source config_source = { - 0, .scope = CONFIG_SCOPE_SUBMODULE - }; + struct git_config_source config_source = { 0 }; const struct config_options opts = { 0 }; struct object_id oid; char *file; @@ -676,13 +660,10 @@ static int gitmodules_cb(const char *var, const char *value, void *data) return parse_config(var, value, ¶meter); } -void repo_read_gitmodules(struct repository *repo, int skip_if_read) +void repo_read_gitmodules(struct repository *repo) { submodule_cache_check_init(repo); - if (repo->submodule_cache->gitmodules_read && skip_if_read) - return; - if (repo_read_index(repo) < 0) return; @@ -708,11 +689,20 @@ void gitmodules_config_oid(const struct object_id *commit_oid) the_repository->submodule_cache->gitmodules_read = 1; } +static void gitmodules_read_check(struct repository *repo) +{ + submodule_cache_check_init(repo); + + /* read the repo's .gitmodules file if it hasn't been already */ + if (!repo->submodule_cache->gitmodules_read) + repo_read_gitmodules(repo); +} + const struct submodule *submodule_from_name(struct repository *r, const struct object_id *treeish_name, const char *name) { - repo_read_gitmodules(r, 1); + gitmodules_read_check(r); return config_from(r->submodule_cache, treeish_name, name, lookup_name); } @@ -720,7 +710,7 @@ const struct submodule *submodule_from_path(struct repository *r, const struct object_id *treeish_name, const char *path) { - repo_read_gitmodules(r, 1); + gitmodules_read_check(r); return config_from(r->submodule_cache, treeish_name, path, lookup_path); } diff --git a/third_party/git/submodule-config.h b/third_party/git/submodule-config.h index c11e22cf50..1b4e2da658 100644 --- a/third_party/git/submodule-config.h +++ b/third_party/git/submodule-config.h @@ -7,31 +7,9 @@ #include "submodule.h" #include "strbuf.h" -/** - * The submodule config cache API allows to read submodule - * configurations/information from specified revisions. Internally - * information is lazily read into a cache that is used to avoid - * unnecessary parsing of the same .gitmodules files. Lookups can be done by - * submodule path or name. - * - * Usage - * ----- - * - * The caller can look up information about submodules by using the - * `submodule_from_path()` or `submodule_from_name()` functions. They return - * a `struct submodule` which contains the values. The API automatically - * initializes and allocates the needed infrastructure on-demand. If the - * caller does only want to lookup values from revisions the initialization - * can be skipped. - * - * If the internal cache might grow too big or when the caller is done with - * the API, all internally cached values can be freed with submodule_free(). - * - */ - /* * Submodule entry containing the information about a certain submodule - * in a certain revision. It is returned by the lookup functions. + * in a certain revision. */ struct submodule { const char *path; @@ -61,29 +39,15 @@ int option_fetch_parse_recurse_submodules(const struct option *opt, const char *arg, int unset); int parse_update_recurse_submodules_arg(const char *opt, const char *arg); int parse_push_recurse_submodules_arg(const char *opt, const char *arg); -void repo_read_gitmodules(struct repository *repo, int skip_if_read); +void repo_read_gitmodules(struct repository *repo); void gitmodules_config_oid(const struct object_id *commit_oid); - -/** - * Same as submodule_from_path but lookup by name. - */ const struct submodule *submodule_from_name(struct repository *r, const struct object_id *commit_or_tree, const char *name); - -/** - * Given a tree-ish in the superproject and a path, return the submodule that - * is bound at the path in the named tree. - */ const struct submodule *submodule_from_path(struct repository *r, const struct object_id *commit_or_tree, const char *path); - -/** - * Use these to free the internally cached values. - */ void submodule_free(struct repository *r); - int print_config_from_gitmodules(struct repository *repo, const char *key); int config_set_in_gitmodules_file_gently(const char *key, const char *value); diff --git a/third_party/git/submodule.c b/third_party/git/submodule.c index 31f391d7d2..0f199c5137 100644 --- a/third_party/git/submodule.c +++ b/third_party/git/submodule.c @@ -82,7 +82,7 @@ int is_staging_gitmodules_ok(struct index_state *istate) if ((pos >= 0) && (pos < istate->cache_nr)) { struct stat st; if (lstat(GITMODULES_FILE, &st) == 0 && - ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED) + ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED) return 0; } @@ -431,7 +431,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt, else if (!strcmp(arg, "dirty")) diffopt->flags.ignore_dirty_submodules = 1; else if (strcmp(arg, "none")) - die(_("bad --ignore-submodules argument: %s"), arg); + die("bad --ignore-submodules argument: %s", arg); /* * Please update _git_status() in git-completion.bash when you * add new options @@ -812,9 +812,9 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q, submodule = submodule_from_name(me->repo, commit_oid, name); if (submodule) { - warning(_("Submodule in commit %s at path: " + warning("Submodule in commit %s at path: " "'%s' collides with a submodule named " - "the same. Skipping it."), + "the same. Skipping it.", oid_to_hex(commit_oid), p->two->path); name = NULL; } @@ -844,7 +844,7 @@ static void collect_changed_submodules(struct repository *r, repo_init_revisions(r, &rev, NULL); setup_revisions(argv->argc, argv->argv, &rev, NULL); if (prepare_revision_walk(&rev)) - die(_("revision walk setup failed")); + die("revision walk setup failed"); while ((commit = get_revision(&rev))) { struct rev_info diff_rev; @@ -992,7 +992,7 @@ static int submodule_needs_pushing(struct repository *r, cp.out = -1; cp.dir = path; if (start_command(&cp)) - die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"), + die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s", path); if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1)) needs_pushing = 1; @@ -1115,7 +1115,7 @@ static void submodule_push_check(const char *path, const char *head, * child process. */ if (run_command(&cp)) - die(_("process for submodule '%s' failed"), path); + die("process for submodule '%s' failed", path); } int push_unpushed_submodules(struct repository *r, @@ -1155,10 +1155,10 @@ int push_unpushed_submodules(struct repository *r, /* Actually push the submodules */ for (i = 0; i < needs_pushing.nr; i++) { const char *path = needs_pushing.items[i].string; - fprintf(stderr, _("Pushing submodule '%s'\n"), path); + fprintf(stderr, "Pushing submodule '%s'\n", path); if (!push_submodule(path, remote, rs, push_options, dry_run)) { - fprintf(stderr, _("Unable to push submodule '%s'\n"), path); + fprintf(stderr, "Unable to push submodule '%s'\n", path); ret = 0; } } @@ -1280,12 +1280,10 @@ struct submodule_parallel_fetch { /* Pending fetches by OIDs */ struct fetch_task **oid_fetch_tasks; int oid_fetch_tasks_nr, oid_fetch_tasks_alloc; - - struct strbuf submodules_with_errors; }; #define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0, \ STRING_LIST_INIT_DUP, \ - NULL, 0, 0, STRBUF_INIT} + NULL, 0, 0} static int get_fetch_recurse_config(const struct submodule *submodule, struct submodule_parallel_fetch *spf) @@ -1450,7 +1448,7 @@ static int get_next_submodule(struct child_process *cp, prepare_submodule_repo_env_in_gitdir(&cp->env_array); cp->git_cmd = 1; if (!spf->quiet) - strbuf_addf(err, _("Fetching submodule %s%s\n"), + strbuf_addf(err, "Fetching submodule %s%s\n", spf->prefix, ce->name); argv_array_init(&cp->args); argv_array_pushv(&cp->args, spf->args.argv); @@ -1480,7 +1478,7 @@ static int get_next_submodule(struct child_process *cp, !is_empty_dir(ce->name)) { spf->result = 1; strbuf_addf(err, - _("Could not access submodule '%s'\n"), + _("Could not access submodule '%s'"), ce->name); } } @@ -1549,10 +1547,7 @@ static int fetch_finish(int retvalue, struct strbuf *err, struct string_list_item *it; struct oid_array *commits; - if (!task || !task->sub) - BUG("callback cookie bogus"); - - if (retvalue) { + if (retvalue) /* * NEEDSWORK: This indicates that the overall fetch * failed, even though there may be a subsequent fetch @@ -1562,9 +1557,8 @@ static int fetch_finish(int retvalue, struct strbuf *err, */ spf->result = 1; - strbuf_addf(&spf->submodules_with_errors, "\t%s\n", - task->sub->name); - } + if (!task || !task->sub) + BUG("callback cookie bogus"); /* Is this the second time we process this submodule? */ if (task->commits) @@ -1616,7 +1610,7 @@ int fetch_populated_submodules(struct repository *r, goto out; if (repo_read_index(r) < 0) - die(_("index file corrupt")); + die("index file corrupt"); argv_array_push(&spf.args, "fetch"); for (i = 0; i < options->argc; i++) @@ -1633,11 +1627,6 @@ int fetch_populated_submodules(struct repository *r, &spf, "submodule", "parallel/fetch"); - if (spf.submodules_with_errors.len > 0) - fprintf(stderr, _("Errors during submodule fetch:\n%s"), - spf.submodules_with_errors.buf); - - argv_array_clear(&spf.args); out: free_submodules_oids(&spf.changed_submodule_names); @@ -1676,7 +1665,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) cp.out = -1; cp.dir = path; if (start_command(&cp)) - die(_("Could not run 'git status --porcelain=2' in submodule %s"), path); + die("Could not run 'git status --porcelain=2' in submodule %s", path); fp = xfdopen(cp.out, "r"); while (strbuf_getwholeline(&buf, fp, '\n') != EOF) { @@ -1717,7 +1706,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) fclose(fp); if (finish_command(&cp) && !ignore_cp_exit_code) - die(_("'git status --porcelain=2' failed in submodule %s"), path); + die("'git status --porcelain=2' failed in submodule %s", path); strbuf_release(&buf); return dirty_submodule; @@ -1822,7 +1811,7 @@ out: void submodule_unset_core_worktree(const struct submodule *sub) { char *config_path = xstrfmt("%s/modules/%s/config", - get_git_dir(), sub->name); + get_git_common_dir(), sub->name); if (git_config_set_in_file_gently(config_path, "core.worktree", NULL)) warning(_("Could not unset core.worktree setting in submodule '%s'"), @@ -1852,7 +1841,7 @@ static int submodule_has_dirty_index(const struct submodule *sub) cp.no_stdout = 1; cp.dir = sub->path; if (start_command(&cp)) - die(_("could not recurse into submodule '%s'"), sub->path); + die("could not recurse into submodule '%s'", sub->path); return finish_command(&cp); } @@ -1873,7 +1862,7 @@ static void submodule_reset_index(const char *path) argv_array_push(&cp.args, empty_tree_oid_hex()); if (run_command(&cp)) - die(_("could not reset submodule index")); + die("could not reset submodule index"); } /** @@ -1925,7 +1914,7 @@ int submodule_move_head(const char *path, ABSORB_GITDIR_RECURSE_SUBMODULES); } else { char *gitdir = xstrfmt("%s/modules/%s", - get_git_dir(), sub->name); + get_git_common_dir(), sub->name); connect_work_tree_and_git_dir(path, gitdir, 0); free(gitdir); @@ -1935,7 +1924,7 @@ int submodule_move_head(const char *path, if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) { char *gitdir = xstrfmt("%s/modules/%s", - get_git_dir(), sub->name); + get_git_common_dir(), sub->name); connect_work_tree_and_git_dir(path, gitdir, 1); free(gitdir); } @@ -2004,47 +1993,6 @@ out: return ret; } -int validate_submodule_git_dir(char *git_dir, const char *submodule_name) -{ - size_t len = strlen(git_dir), suffix_len = strlen(submodule_name); - char *p; - int ret = 0; - - if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' || - strcmp(p, submodule_name)) - BUG("submodule name '%s' not a suffix of git dir '%s'", - submodule_name, git_dir); - - /* - * We prevent the contents of sibling submodules' git directories to - * clash. - * - * Example: having a submodule named `hippo` and another one named - * `hippo/hooks` would result in the git directories - * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively, - * but the latter directory is already designated to contain the hooks - * of the former. - */ - for (; *p; p++) { - if (is_dir_sep(*p)) { - char c = *p; - - *p = '\0'; - if (is_git_directory(git_dir)) - ret = -1; - *p = c; - - if (ret < 0) - return error(_("submodule git dir '%s' is " - "inside git dir '%.*s'"), - git_dir, - (int)(p - git_dir), git_dir); - } - } - - return 0; -} - /* * Embeds a single submodules git directory into the superprojects git dir, * non recursively. @@ -2052,7 +2000,7 @@ int validate_submodule_git_dir(char *git_dir, const char *submodule_name) static void relocate_single_git_dir_into_superproject(const char *path) { char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL; - char *new_git_dir; + const char *new_git_dir; const struct submodule *sub; if (submodule_uses_worktrees(path)) @@ -2070,14 +2018,10 @@ static void relocate_single_git_dir_into_superproject(const char *path) if (!sub) die(_("could not lookup name for submodule '%s'"), path); - new_git_dir = git_pathdup("modules/%s", sub->name); - if (validate_submodule_git_dir(new_git_dir, sub->name) < 0) - die(_("refusing to move '%s' into an existing git dir"), - real_old_git_dir); + new_git_dir = git_path("modules/%s", sub->name); if (safe_create_leading_directories_const(new_git_dir) < 0) die(_("could not create directory '%s'"), new_git_dir); real_new_git_dir = real_pathdup(new_git_dir, 1); - free(new_git_dir); fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"), get_super_prefix_or_empty(), path, diff --git a/third_party/git/submodule.h b/third_party/git/submodule.h index c81ec1a9b6..8072e6d6dd 100644 --- a/third_party/git/submodule.h +++ b/third_party/git/submodule.h @@ -124,11 +124,6 @@ int push_unpushed_submodules(struct repository *r, */ int submodule_to_gitdir(struct strbuf *buf, const char *submodule); -/* - * Make sure that no submodule's git dir is nested in a sibling submodule's. - */ -int validate_submodule_git_dir(char *git_dir, const char *submodule_name); - #define SUBMODULE_MOVE_HEAD_DRY_RUN (1<<0) #define SUBMODULE_MOVE_HEAD_FORCE (1<<1) int submodule_move_head(const char *path, diff --git a/third_party/git/t/README b/third_party/git/t/README index 9afd61e3ca..60d5b77bcc 100644 --- a/third_party/git/t/README +++ b/third_party/git/t/README @@ -352,8 +352,8 @@ details. GIT_TEST_SPLIT_INDEX=<boolean> forces split-index mode on the whole test suite. Accept any boolean values that are accepted by git-config. -GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version' -default to n. +GIT_TEST_PROTOCOL_VERSION=<n>, when set, overrides the +'protocol.version' setting to n if it is less than n. GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon pack-objects code path where there are more than 1024 packs even if @@ -397,10 +397,6 @@ GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the built-in version of git-stash. See 'stash.useBuiltin' in git-config(1). -GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the -built-in version of git add -i. See 'add.interactive.useBuiltin' in -git-config(1). - GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading of the index for the whole test suite by bypassing the default number of cache entries and thread minimums. Setting this to 1 will make the @@ -982,15 +978,6 @@ library for your script to use. output to the downstream---unlike the real version, it generates only up to 99 lines. - - test_bool_env <env-variable-name> <default-value> - - Given the name of an environment variable with a bool value, - normalize its value to a 0 (true) or 1 (false or empty string) - return code. Return with code corresponding to the given default - value if the variable is unset. - Abort the test script if either the value of the variable or the - default are not valid bool values. - Prerequisites ------------- diff --git a/third_party/git/t/check-non-portable-shell.pl b/third_party/git/t/check-non-portable-shell.pl index fd3303552b..38bfeebd88 100755 --- a/third_party/git/t/check-non-portable-shell.pl +++ b/third_party/git/t/check-non-portable-shell.pl @@ -46,7 +46,7 @@ while (<>) { /(?:\$\(seq|^\s*seq\b)/ and err 'seq is not portable (use test_seq)'; /\bgrep\b.*--file\b/ and err 'grep --file FILE is not portable (use grep -f FILE)'; /\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is not portable (use FOO=bar && export FOO)'; - /^\s*([A-Z0-9_]+=(\w*|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and + /^\s*([A-Z0-9_]+=(\w+|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and err '"FOO=bar shell_func" assignment extends beyond "shell_func"'; $line = ''; # this resets our $. for each file diff --git a/third_party/git/t/gitweb-lib.sh b/third_party/git/t/gitweb-lib.sh index 1f32ca66ea..006d2a8152 100644 --- a/third_party/git/t/gitweb-lib.sh +++ b/third_party/git/t/gitweb-lib.sh @@ -58,11 +58,10 @@ gitweb_run () { GATEWAY_INTERFACE='CGI/1.1' HTTP_ACCEPT='*/*' REQUEST_METHOD='GET' - QUERY_STRING=$1 - PATH_INFO=$2 - REQUEST_URI=/gitweb.cgi$PATH_INFO + QUERY_STRING=""$1"" + PATH_INFO=""$2"" export GATEWAY_INTERFACE HTTP_ACCEPT REQUEST_METHOD \ - QUERY_STRING PATH_INFO REQUEST_URI + QUERY_STRING PATH_INFO GITWEB_CONFIG=$(pwd)/gitweb_config.perl export GITWEB_CONFIG diff --git a/third_party/git/t/helper/.gitignore b/third_party/git/t/helper/.gitignore index 48c7bb0bbb..2bad28af92 100644 --- a/third_party/git/t/helper/.gitignore +++ b/third_party/git/t/helper/.gitignore @@ -1,4 +1,5 @@ -/test-tool -/test-fake-ssh -/test-line-buffer -/test-svn-fe +* +!*.sh +!*.[ch] +!*.gitignore + diff --git a/third_party/git/t/helper/test-config.c b/third_party/git/t/helper/test-config.c index 234c722b48..214003d5b2 100644 --- a/third_party/git/t/helper/test-config.c +++ b/third_party/git/t/helper/test-config.c @@ -37,6 +37,21 @@ * */ +static const char *scope_name(enum config_scope scope) +{ + switch (scope) { + case CONFIG_SCOPE_SYSTEM: + return "system"; + case CONFIG_SCOPE_GLOBAL: + return "global"; + case CONFIG_SCOPE_REPO: + return "repo"; + case CONFIG_SCOPE_CMDLINE: + return "cmdline"; + default: + return "unknown"; + } +} static int iterate_cb(const char *var, const char *value, void *data) { static int nr; @@ -48,8 +63,7 @@ static int iterate_cb(const char *var, const char *value, void *data) printf("value=%s\n", value ? value : "(null)"); printf("origin=%s\n", current_config_origin_type()); printf("name=%s\n", current_config_name()); - printf("lno=%d\n", current_config_line()); - printf("scope=%s\n", config_scope_name(current_config_scope())); + printf("scope=%s\n", scope_name(current_config_scope())); return 0; } diff --git a/third_party/git/t/helper/test-date.c b/third_party/git/t/helper/test-date.c index 099eff4f0f..585347ea48 100644 --- a/third_party/git/t/helper/test-date.c +++ b/third_party/git/t/helper/test-date.c @@ -12,13 +12,13 @@ static const char *usage_msg = "\n" " test-tool date is64bit\n" " test-tool date time_t-is64bit\n"; -static void show_relative_dates(const char **argv) +static void show_relative_dates(const char **argv, struct timeval *now) { struct strbuf buf = STRBUF_INIT; for (; *argv; argv++) { time_t t = atoi(*argv); - show_date_relative(t, &buf); + show_date_relative(t, now, &buf); printf("%s -> %s\n", *argv, buf.buf); } strbuf_release(&buf); @@ -74,20 +74,20 @@ static void parse_dates(const char **argv) strbuf_release(&result); } -static void parse_approxidate(const char **argv) +static void parse_approxidate(const char **argv, struct timeval *now) { for (; *argv; argv++) { timestamp_t t; - t = approxidate_relative(*argv); + t = approxidate_relative(*argv, now); printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601))); } } -static void parse_approx_timestamp(const char **argv) +static void parse_approx_timestamp(const char **argv, struct timeval *now) { for (; *argv; argv++) { timestamp_t t; - t = approxidate_relative(*argv); + t = approxidate_relative(*argv, now); printf("%s -> %"PRItime"\n", *argv, t); } } @@ -103,13 +103,22 @@ static void getnanos(const char **argv) int cmd__date(int argc, const char **argv) { + struct timeval now; const char *x; + x = getenv("GIT_TEST_DATE_NOW"); + if (x) { + now.tv_sec = atoi(x); + now.tv_usec = 0; + } + else + gettimeofday(&now, NULL); + argv++; if (!*argv) usage(usage_msg); if (!strcmp(*argv, "relative")) - show_relative_dates(argv+1); + show_relative_dates(argv+1, &now); else if (!strcmp(*argv, "human")) show_human_dates(argv+1); else if (skip_prefix(*argv, "show:", &x)) @@ -117,9 +126,9 @@ int cmd__date(int argc, const char **argv) else if (!strcmp(*argv, "parse")) parse_dates(argv+1); else if (!strcmp(*argv, "approxidate")) - parse_approxidate(argv+1); + parse_approxidate(argv+1, &now); else if (!strcmp(*argv, "timestamp")) - parse_approx_timestamp(argv+1); + parse_approx_timestamp(argv+1, &now); else if (!strcmp(*argv, "getnanos")) getnanos(argv+1); else if (!strcmp(*argv, "is64bit")) diff --git a/third_party/git/t/helper/test-drop-caches.c b/third_party/git/t/helper/test-drop-caches.c index 7b4278462b..f65e301f9d 100644 --- a/third_party/git/t/helper/test-drop-caches.c +++ b/third_party/git/t/helper/test-drop-caches.c @@ -8,21 +8,18 @@ static int cmd_sync(void) { char Buffer[MAX_PATH]; DWORD dwRet; - char szVolumeAccessPath[] = "\\\\.\\XXXX:"; + char szVolumeAccessPath[] = "\\\\.\\X:"; HANDLE hVolWrite; - int success = 0, dos_drive_prefix; + int success = 0; dwRet = GetCurrentDirectory(MAX_PATH, Buffer); if ((0 == dwRet) || (dwRet > MAX_PATH)) return error("Error getting current directory"); - dos_drive_prefix = has_dos_drive_prefix(Buffer); - if (!dos_drive_prefix) + if (!has_dos_drive_prefix(Buffer)) return error("'%s': invalid drive letter", Buffer); - memcpy(szVolumeAccessPath, Buffer, dos_drive_prefix); - szVolumeAccessPath[dos_drive_prefix] = '\0'; - + szVolumeAccessPath[4] = Buffer[0]; hVolWrite = CreateFile(szVolumeAccessPath, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (INVALID_HANDLE_VALUE == hVolWrite) diff --git a/third_party/git/t/helper/test-dump-fsmonitor.c b/third_party/git/t/helper/test-dump-fsmonitor.c index 975f0ac890..2786f47088 100644 --- a/third_party/git/t/helper/test-dump-fsmonitor.c +++ b/third_party/git/t/helper/test-dump-fsmonitor.c @@ -13,7 +13,7 @@ int cmd__dump_fsmonitor(int ac, const char **av) printf("no fsmonitor\n"); return 0; } - printf("fsmonitor last update %s\n", istate->fsmonitor_last_update); + printf("fsmonitor last update %"PRIuMAX"\n", (uintmax_t)istate->fsmonitor_last_update); for (i = 0; i < istate->cache_nr; i++) printf((istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) ? "+" : "-"); diff --git a/third_party/git/t/helper/test-hashmap.c b/third_party/git/t/helper/test-hashmap.c index f38706216f..aaf17b0ddf 100644 --- a/third_party/git/t/helper/test-hashmap.c +++ b/third_party/git/t/helper/test-hashmap.c @@ -5,7 +5,6 @@ struct test_entry { - int padding; /* hashmap entry no longer needs to be the first member */ struct hashmap_entry ent; /* key and value as two \0-terminated strings */ char key[FLEX_ARRAY]; @@ -17,17 +16,15 @@ static const char *get_value(const struct test_entry *e) } static int test_entry_cmp(const void *cmp_data, - const struct hashmap_entry *eptr, - const struct hashmap_entry *entry_or_key, + const void *entry, + const void *entry_or_key, const void *keydata) { const int ignore_case = cmp_data ? *((int *)cmp_data) : 0; - const struct test_entry *e1, *e2; + const struct test_entry *e1 = entry; + const struct test_entry *e2 = entry_or_key; const char *key = keydata; - e1 = container_of(eptr, const struct test_entry, ent); - e2 = container_of(entry_or_key, const struct test_entry, ent); - if (ignore_case) return strcasecmp(e1->key, key ? key : e2->key); else @@ -40,7 +37,7 @@ static struct test_entry *alloc_test_entry(unsigned int hash, size_t klen = strlen(key); size_t vlen = strlen(value); struct test_entry *entry = xmalloc(st_add4(sizeof(*entry), klen, vlen, 2)); - hashmap_entry_init(&entry->ent, hash); + hashmap_entry_init(entry, hash); memcpy(entry->key, key, klen + 1); memcpy(entry->key + klen + 1, value, vlen + 1); return entry; @@ -106,11 +103,11 @@ static void perf_hashmap(unsigned int method, unsigned int rounds) /* add entries */ for (i = 0; i < TEST_SIZE; i++) { - hashmap_entry_init(&entries[i]->ent, hashes[i]); - hashmap_add(&map, &entries[i]->ent); + hashmap_entry_init(entries[i], hashes[i]); + hashmap_add(&map, entries[i]); } - hashmap_free(&map); + hashmap_free(&map, 0); } } else { /* test map lookups */ @@ -119,8 +116,8 @@ static void perf_hashmap(unsigned int method, unsigned int rounds) /* fill the map (sparsely if specified) */ j = (method & TEST_SPARSE) ? TEST_SIZE / 10 : TEST_SIZE; for (i = 0; i < j; i++) { - hashmap_entry_init(&entries[i]->ent, hashes[i]); - hashmap_add(&map, &entries[i]->ent); + hashmap_entry_init(entries[i], hashes[i]); + hashmap_add(&map, entries[i]); } for (j = 0; j < rounds; j++) { @@ -130,7 +127,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds) } } - hashmap_free(&map); + hashmap_free(&map, 0); } } @@ -182,7 +179,7 @@ int cmd__hashmap(int argc, const char **argv) entry = alloc_test_entry(hash, p1, p2); /* add to hashmap */ - hashmap_add(&map, &entry->ent); + hashmap_add(&map, entry); } else if (!strcmp("put", cmd) && p1 && p2) { @@ -190,44 +187,43 @@ int cmd__hashmap(int argc, const char **argv) entry = alloc_test_entry(hash, p1, p2); /* add / replace entry */ - entry = hashmap_put_entry(&map, entry, ent); + entry = hashmap_put(&map, entry); /* print and free replaced entry, if any */ puts(entry ? get_value(entry) : "NULL"); free(entry); } else if (!strcmp("get", cmd) && p1) { + /* lookup entry in hashmap */ - entry = hashmap_get_entry_from_hash(&map, hash, p1, - struct test_entry, ent); + entry = hashmap_get_from_hash(&map, hash, p1); /* print result */ if (!entry) puts("NULL"); - hashmap_for_each_entry_from(&map, entry, ent) + while (entry) { puts(get_value(entry)); + entry = hashmap_get_next(&map, entry); + } } else if (!strcmp("remove", cmd) && p1) { /* setup static key */ struct hashmap_entry key; - struct hashmap_entry *rm; hashmap_entry_init(&key, hash); /* remove entry from hashmap */ - rm = hashmap_remove(&map, &key, p1); - entry = rm ? container_of(rm, struct test_entry, ent) - : NULL; + entry = hashmap_remove(&map, &key, p1); /* print result and free entry*/ puts(entry ? get_value(entry) : "NULL"); free(entry); } else if (!strcmp("iterate", cmd)) { - struct hashmap_iter iter; - hashmap_for_each_entry(&map, &iter, entry, - ent /* member name */) + struct hashmap_iter iter; + hashmap_iter_init(&map, &iter); + while ((entry = hashmap_iter_next(&iter))) printf("%s %s\n", entry->key, get_value(entry)); } else if (!strcmp("size", cmd)) { @@ -262,6 +258,6 @@ int cmd__hashmap(int argc, const char **argv) } strbuf_release(&line); - hashmap_free_entries(&map, struct test_entry, ent); + hashmap_free(&map, 1); return 0; } diff --git a/third_party/git/t/helper/test-lazy-init-name-hash.c b/third_party/git/t/helper/test-lazy-init-name-hash.c index cd1b4c9736..b99a37080d 100644 --- a/third_party/git/t/helper/test-lazy-init-name-hash.c +++ b/third_party/git/t/helper/test-lazy-init-name-hash.c @@ -41,13 +41,17 @@ static void dump_run(void) die("non-threaded code path used"); } - hashmap_for_each_entry(&the_index.dir_hash, &iter_dir, dir, - ent /* member name */) + dir = hashmap_iter_first(&the_index.dir_hash, &iter_dir); + while (dir) { printf("dir %08x %7d %s\n", dir->ent.hash, dir->nr, dir->name); + dir = hashmap_iter_next(&iter_dir); + } - hashmap_for_each_entry(&the_index.name_hash, &iter_cache, ce, - ent /* member name */) + ce = hashmap_iter_first(&the_index.name_hash, &iter_cache); + while (ce) { printf("name %08x %s\n", ce->ent.hash, ce->name); + ce = hashmap_iter_next(&iter_cache); + } discard_cache(); } diff --git a/third_party/git/t/helper/test-parse-options.c b/third_party/git/t/helper/test-parse-options.c index 2051ce57db..af82db06ac 100644 --- a/third_party/git/t/helper/test-parse-options.c +++ b/third_party/git/t/helper/test-parse-options.c @@ -121,8 +121,6 @@ int cmd__parse_options(int argc, const char **argv) OPT_INTEGER('j', NULL, &integer, "get a integer, too"), OPT_MAGNITUDE('m', "magnitude", &magnitude, "get a magnitude"), OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23), - OPT_CMDMODE(0, "mode1", &integer, "set integer to 1 (cmdmode option)", 1), - OPT_CMDMODE(0, "mode2", &integer, "set integer to 2 (cmdmode option)", 2), OPT_CALLBACK('L', "length", &integer, "str", "get length of <str>", length_callback), OPT_FILENAME('F', "file", &file, "set file to <file>"), diff --git a/third_party/git/t/helper/test-parse-pathspec-file.c b/third_party/git/t/helper/test-parse-pathspec-file.c deleted file mode 100644 index 02f4ccfd2a..0000000000 --- a/third_party/git/t/helper/test-parse-pathspec-file.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "test-tool.h" -#include "parse-options.h" -#include "pathspec.h" -#include "gettext.h" - -int cmd__parse_pathspec_file(int argc, const char **argv) -{ - struct pathspec pathspec; - const char *pathspec_from_file = 0; - int pathspec_file_nul = 0, i; - - static const char *const usage[] = { - "test-tool parse-pathspec-file --pathspec-from-file [--pathspec-file-nul]", - NULL - }; - - struct option options[] = { - OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), - OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), - OPT_END() - }; - - parse_options(argc, argv, 0, options, usage, 0); - - parse_pathspec_file(&pathspec, 0, 0, 0, pathspec_from_file, - pathspec_file_nul); - - for (i = 0; i < pathspec.nr; i++) - printf("%s\n", pathspec.items[i].original); - - clear_pathspec(&pathspec); - return 0; -} diff --git a/third_party/git/t/helper/test-path-utils.c b/third_party/git/t/helper/test-path-utils.c index 409034cf4e..5d543ad21f 100644 --- a/third_party/git/t/helper/test-path-utils.c +++ b/third_party/git/t/helper/test-path-utils.c @@ -185,99 +185,6 @@ static int cmp_by_st_size(const void *a, const void *b) return x > y ? -1 : (x < y ? +1 : 0); } -/* - * A very simple, reproducible pseudo-random generator. Copied from - * `test-genrandom.c`. - */ -static uint64_t my_random_value = 1234; - -static uint64_t my_random(void) -{ - my_random_value = my_random_value * 1103515245 + 12345; - return my_random_value; -} - -/* - * A fast approximation of the square root, without requiring math.h. - * - * It uses Newton's method to approximate the solution of 0 = x^2 - value. - */ -static double my_sqrt(double value) -{ - const double epsilon = 1e-6; - double x = value; - - if (value == 0) - return 0; - - for (;;) { - double delta = (value / x - x) / 2; - if (delta < epsilon && delta > -epsilon) - return x + delta; - x += delta; - } -} - -static int protect_ntfs_hfs_benchmark(int argc, const char **argv) -{ - size_t i, j, nr, min_len = 3, max_len = 20; - char **names; - int repetitions = 15, file_mode = 0100644; - uint64_t begin, end; - double m[3][2], v[3][2]; - uint64_t cumul; - double cumul2; - - if (argc > 1 && !strcmp(argv[1], "--with-symlink-mode")) { - file_mode = 0120000; - argc--; - argv++; - } - - nr = argc > 1 ? strtoul(argv[1], NULL, 0) : 1000000; - ALLOC_ARRAY(names, nr); - - if (argc > 2) { - min_len = strtoul(argv[2], NULL, 0); - if (argc > 3) - max_len = strtoul(argv[3], NULL, 0); - if (min_len > max_len) - die("min_len > max_len"); - } - - for (i = 0; i < nr; i++) { - size_t len = min_len + (my_random() % (max_len + 1 - min_len)); - - names[i] = xmallocz(len); - while (len > 0) - names[i][--len] = (char)(' ' + (my_random() % ('\x7f' - ' '))); - } - - for (protect_ntfs = 0; protect_ntfs < 2; protect_ntfs++) - for (protect_hfs = 0; protect_hfs < 2; protect_hfs++) { - cumul = 0; - cumul2 = 0; - for (i = 0; i < repetitions; i++) { - begin = getnanotime(); - for (j = 0; j < nr; j++) - verify_path(names[j], file_mode); - end = getnanotime(); - printf("protect_ntfs = %d, protect_hfs = %d: %lfms\n", protect_ntfs, protect_hfs, (end-begin) / (double)1e6); - cumul += end - begin; - cumul2 += (end - begin) * (end - begin); - } - m[protect_ntfs][protect_hfs] = cumul / (double)repetitions; - v[protect_ntfs][protect_hfs] = my_sqrt(cumul2 / (double)repetitions - m[protect_ntfs][protect_hfs] * m[protect_ntfs][protect_hfs]); - printf("mean: %lfms, stddev: %lfms\n", m[protect_ntfs][protect_hfs] / (double)1e6, v[protect_ntfs][protect_hfs] / (double)1e6); - } - - for (protect_ntfs = 0; protect_ntfs < 2; protect_ntfs++) - for (protect_hfs = 0; protect_hfs < 2; protect_hfs++) - printf("ntfs=%d/hfs=%d: %lf%% slower\n", protect_ntfs, protect_hfs, (m[protect_ntfs][protect_hfs] - m[0][0]) * 100 / m[0][0]); - - return 0; -} - int cmd__path_utils(int argc, const char **argv) { if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) { @@ -448,26 +355,6 @@ int cmd__path_utils(int argc, const char **argv) return !!res; } - if (argc > 1 && !strcmp(argv[1], "protect_ntfs_hfs")) - return !!protect_ntfs_hfs_benchmark(argc - 1, argv + 1); - - if (argc > 1 && !strcmp(argv[1], "is_valid_path")) { - int res = 0, expect = 1, i; - - for (i = 2; i < argc; i++) - if (!strcmp("--not", argv[i])) - expect = 0; - else if (expect != is_valid_path(argv[i])) - res = error("'%s' is%s a valid path", - argv[i], expect ? " not" : ""); - else - fprintf(stderr, - "'%s' is%s a valid path\n", - argv[i], expect ? "" : " not"); - - return !!res; - } - fprintf(stderr, "%s: unknown function name: %s\n", argv[0], argv[1] ? argv[1] : "(there was none)"); return 1; diff --git a/third_party/git/t/helper/test-progress.c b/third_party/git/t/helper/test-progress.c deleted file mode 100644 index 42b96cb103..0000000000 --- a/third_party/git/t/helper/test-progress.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * A test helper to exercise the progress display. - * - * Reads instructions from standard input, one instruction per line: - * - * "progress <items>" - Call display_progress() with the given item count - * as parameter. - * "throughput <bytes> <millis> - Call display_throughput() with the given - * byte count as parameter. The 'millis' - * specify the time elapsed since the - * start_progress() call. - * "update" - Set the 'progress_update' flag. - * - * See 't0500-progress-display.sh' for examples. - */ -#include "test-tool.h" -#include "gettext.h" -#include "parse-options.h" -#include "progress.h" -#include "strbuf.h" - -/* - * These are defined in 'progress.c', but are not exposed in 'progress.h', - * because they are exclusively for testing. - */ -extern int progress_testing; -extern uint64_t progress_test_ns; -void progress_test_force_update(void); - -int cmd__progress(int argc, const char **argv) -{ - int total = 0; - const char *title; - struct strbuf line = STRBUF_INIT; - struct progress *progress; - - const char *usage[] = { - "test-tool progress [--total=<n>] <progress-title>", - NULL - }; - struct option options[] = { - OPT_INTEGER(0, "total", &total, "total number of items"), - OPT_END(), - }; - - argc = parse_options(argc, argv, NULL, options, usage, 0); - if (argc != 1) - die("need a title for the progress output"); - title = argv[0]; - - progress_testing = 1; - progress = start_progress(title, total); - while (strbuf_getline(&line, stdin) != EOF) { - char *end; - - if (skip_prefix(line.buf, "progress ", (const char **) &end)) { - uint64_t item_count = strtoull(end, &end, 10); - if (*end != '\0') - die("invalid input: '%s'\n", line.buf); - display_progress(progress, item_count); - } else if (skip_prefix(line.buf, "throughput ", - (const char **) &end)) { - uint64_t byte_count, test_ms; - - byte_count = strtoull(end, &end, 10); - if (*end != ' ') - die("invalid input: '%s'\n", line.buf); - test_ms = strtoull(end + 1, &end, 10); - if (*end != '\0') - die("invalid input: '%s'\n", line.buf); - progress_test_ns = test_ms * 1000 * 1000; - display_throughput(progress, byte_count); - } else if (!strcmp(line.buf, "update")) - progress_test_force_update(); - else - die("invalid input: '%s'\n", line.buf); - } - stop_progress(&progress); - - return 0; -} diff --git a/third_party/git/t/helper/test-read-cache.c b/third_party/git/t/helper/test-read-cache.c index 244977a29b..7e79b555de 100644 --- a/third_party/git/t/helper/test-read-cache.c +++ b/third_party/git/t/helper/test-read-cache.c @@ -4,10 +4,11 @@ int cmd__read_cache(int argc, const char **argv) { - int i, cnt = 1; + int i, cnt = 1, namelen; const char *name = NULL; if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) { + namelen = strlen(name); argc--; argv++; } @@ -23,7 +24,7 @@ int cmd__read_cache(int argc, const char **argv) refresh_index(&the_index, REFRESH_QUIET, NULL, NULL, NULL); - pos = index_name_pos(&the_index, name, strlen(name)); + pos = index_name_pos(&the_index, name, namelen); if (pos < 0) die("%s not in index", name); printf("%s is%s up to date\n", name, diff --git a/third_party/git/t/helper/test-read-graph.c b/third_party/git/t/helper/test-read-graph.c deleted file mode 100644 index f8a461767c..0000000000 --- a/third_party/git/t/helper/test-read-graph.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "test-tool.h" -#include "cache.h" -#include "commit-graph.h" -#include "repository.h" -#include "object-store.h" - -int cmd__read_graph(int argc, const char **argv) -{ - struct commit_graph *graph = NULL; - char *graph_name; - int open_ok; - int fd; - struct stat st; - struct object_directory *odb; - - setup_git_directory(); - odb = the_repository->objects->odb; - - graph_name = get_commit_graph_filename(odb); - - open_ok = open_commit_graph(graph_name, &fd, &st); - if (!open_ok) - die_errno(_("Could not open commit-graph '%s'"), graph_name); - - graph = load_commit_graph_one_fd_st(fd, &st, odb); - if (!graph) - return 1; - - FREE_AND_NULL(graph_name); - - printf("header: %08x %d %d %d %d\n", - ntohl(*(uint32_t*)graph->data), - *(unsigned char*)(graph->data + 4), - *(unsigned char*)(graph->data + 5), - *(unsigned char*)(graph->data + 6), - *(unsigned char*)(graph->data + 7)); - printf("num_commits: %u\n", graph->num_commits); - printf("chunks:"); - - if (graph->chunk_oid_fanout) - printf(" oid_fanout"); - if (graph->chunk_oid_lookup) - printf(" oid_lookup"); - if (graph->chunk_commit_data) - printf(" commit_metadata"); - if (graph->chunk_extra_edges) - printf(" extra_edges"); - printf("\n"); - - UNLEAK(graph); - - return 0; -} diff --git a/third_party/git/t/helper/test-run-command.c b/third_party/git/t/helper/test-run-command.c index 1646aa25d8..2cc93bb69c 100644 --- a/third_party/git/t/helper/test-run-command.c +++ b/third_party/git/t/helper/test-run-command.c @@ -10,16 +10,11 @@ #include "test-tool.h" #include "git-compat-util.h" -#include "cache.h" #include "run-command.h" #include "argv-array.h" #include "strbuf.h" -#include "parse-options.h" -#include "string-list.h" -#include "thread-utils.h" -#include "wildmatch.h" -#include "gettext.h" -#include "parse-options.h" +#include <string.h> +#include <errno.h> static int number_callbacks; static int parallel_next(struct child_process *cp, @@ -55,337 +50,11 @@ static int task_finished(int result, return 1; } -struct testsuite { - struct string_list tests, failed; - int next; - int quiet, immediate, verbose, verbose_log, trace, write_junit_xml; -}; -#define TESTSUITE_INIT \ - { STRING_LIST_INIT_DUP, STRING_LIST_INIT_DUP, -1, 0, 0, 0, 0, 0, 0 } - -static int next_test(struct child_process *cp, struct strbuf *err, void *cb, - void **task_cb) -{ - struct testsuite *suite = cb; - const char *test; - if (suite->next >= suite->tests.nr) - return 0; - - test = suite->tests.items[suite->next++].string; - argv_array_pushl(&cp->args, "sh", test, NULL); - if (suite->quiet) - argv_array_push(&cp->args, "--quiet"); - if (suite->immediate) - argv_array_push(&cp->args, "-i"); - if (suite->verbose) - argv_array_push(&cp->args, "-v"); - if (suite->verbose_log) - argv_array_push(&cp->args, "-V"); - if (suite->trace) - argv_array_push(&cp->args, "-x"); - if (suite->write_junit_xml) - argv_array_push(&cp->args, "--write-junit-xml"); - - strbuf_addf(err, "Output of '%s':\n", test); - *task_cb = (void *)test; - - return 1; -} - -static int test_finished(int result, struct strbuf *err, void *cb, - void *task_cb) -{ - struct testsuite *suite = cb; - const char *name = (const char *)task_cb; - - if (result) - string_list_append(&suite->failed, name); - - strbuf_addf(err, "%s: '%s'\n", result ? "FAIL" : "SUCCESS", name); - - return 0; -} - -static int test_failed(struct strbuf *out, void *cb, void *task_cb) -{ - struct testsuite *suite = cb; - const char *name = (const char *)task_cb; - - string_list_append(&suite->failed, name); - strbuf_addf(out, "FAILED TO START: '%s'\n", name); - - return 0; -} - -static const char * const testsuite_usage[] = { - "test-run-command testsuite [<options>] [<pattern>...]", - NULL -}; - -static int testsuite(int argc, const char **argv) -{ - struct testsuite suite = TESTSUITE_INIT; - int max_jobs = 1, i, ret; - DIR *dir; - struct dirent *d; - struct option options[] = { - OPT_BOOL('i', "immediate", &suite.immediate, - "stop at first failed test case(s)"), - OPT_INTEGER('j', "jobs", &max_jobs, "run <N> jobs in parallel"), - OPT_BOOL('q', "quiet", &suite.quiet, "be terse"), - OPT_BOOL('v', "verbose", &suite.verbose, "be verbose"), - OPT_BOOL('V', "verbose-log", &suite.verbose_log, - "be verbose, redirected to a file"), - OPT_BOOL('x', "trace", &suite.trace, "trace shell commands"), - OPT_BOOL(0, "write-junit-xml", &suite.write_junit_xml, - "write JUnit-style XML files"), - OPT_END() - }; - - memset(&suite, 0, sizeof(suite)); - suite.tests.strdup_strings = suite.failed.strdup_strings = 1; - - argc = parse_options(argc, argv, NULL, options, - testsuite_usage, PARSE_OPT_STOP_AT_NON_OPTION); - - if (max_jobs <= 0) - max_jobs = online_cpus(); - - dir = opendir("."); - if (!dir) - die("Could not open the current directory"); - while ((d = readdir(dir))) { - const char *p = d->d_name; - - if (*p != 't' || !isdigit(p[1]) || !isdigit(p[2]) || - !isdigit(p[3]) || !isdigit(p[4]) || p[5] != '-' || - !ends_with(p, ".sh")) - continue; - - /* No pattern: match all */ - if (!argc) { - string_list_append(&suite.tests, p); - continue; - } - - for (i = 0; i < argc; i++) - if (!wildmatch(argv[i], p, 0)) { - string_list_append(&suite.tests, p); - break; - } - } - closedir(dir); - - if (!suite.tests.nr) - die("No tests match!"); - if (max_jobs > suite.tests.nr) - max_jobs = suite.tests.nr; - - fprintf(stderr, "Running %d tests (%d at a time)\n", - suite.tests.nr, max_jobs); - - ret = run_processes_parallel(max_jobs, next_test, test_failed, - test_finished, &suite); - - if (suite.failed.nr > 0) { - ret = 1; - fprintf(stderr, "%d tests failed:\n\n", suite.failed.nr); - for (i = 0; i < suite.failed.nr; i++) - fprintf(stderr, "\t%s\n", suite.failed.items[i].string); - } - - string_list_clear(&suite.tests, 0); - string_list_clear(&suite.failed, 0); - - return !!ret; -} - -static uint64_t my_random_next = 1234; - -static uint64_t my_random(void) -{ - uint64_t res = my_random_next; - my_random_next = my_random_next * 1103515245 + 12345; - return res; -} - -static int quote_stress_test(int argc, const char **argv) -{ - /* - * We are running a quote-stress test. - * spawn a subprocess that runs quote-stress with a - * special option that echoes back the arguments that - * were passed in. - */ - char special[] = ".?*\\^_\"'`{}()[]<>@~&+:;$%"; // \t\r\n\a"; - int i, j, k, trials = 100, skip = 0, msys2 = 0; - struct strbuf out = STRBUF_INIT; - struct argv_array args = ARGV_ARRAY_INIT; - struct option options[] = { - OPT_INTEGER('n', "trials", &trials, "Number of trials"), - OPT_INTEGER('s', "skip", &skip, "Skip <n> trials"), - OPT_BOOL('m', "msys2", &msys2, "Test quoting for MSYS2's sh"), - OPT_END() - }; - const char * const usage[] = { - "test-tool run-command quote-stress-test <options>", - NULL - }; - - argc = parse_options(argc, argv, NULL, options, usage, 0); - - setenv("MSYS_NO_PATHCONV", "1", 0); - - for (i = 0; i < trials; i++) { - struct child_process cp = CHILD_PROCESS_INIT; - size_t arg_count, arg_offset; - int ret = 0; - - argv_array_clear(&args); - if (msys2) - argv_array_pushl(&args, "sh", "-c", - "printf %s\\\\0 \"$@\"", "skip", NULL); - else - argv_array_pushl(&args, "test-tool", "run-command", - "quote-echo", NULL); - arg_offset = args.argc; - - if (argc > 0) { - trials = 1; - arg_count = argc; - for (j = 0; j < arg_count; j++) - argv_array_push(&args, argv[j]); - } else { - arg_count = 1 + (my_random() % 5); - for (j = 0; j < arg_count; j++) { - char buf[20]; - size_t min_len = 1; - size_t arg_len = min_len + - (my_random() % (ARRAY_SIZE(buf) - min_len)); - - for (k = 0; k < arg_len; k++) - buf[k] = special[my_random() % - ARRAY_SIZE(special)]; - buf[arg_len] = '\0'; - - argv_array_push(&args, buf); - } - } - - if (i < skip) - continue; - - cp.argv = args.argv; - strbuf_reset(&out); - if (pipe_command(&cp, NULL, 0, &out, 0, NULL, 0) < 0) - return error("Failed to spawn child process"); - - for (j = 0, k = 0; j < arg_count; j++) { - const char *arg = args.argv[j + arg_offset]; - - if (strcmp(arg, out.buf + k)) - ret = error("incorrectly quoted arg: '%s', " - "echoed back as '%s'", - arg, out.buf + k); - k += strlen(out.buf + k) + 1; - } - - if (k != out.len) - ret = error("got %d bytes, but consumed only %d", - (int)out.len, (int)k); - - if (ret) { - fprintf(stderr, "Trial #%d failed. Arguments:\n", i); - for (j = 0; j < arg_count; j++) - fprintf(stderr, "arg #%d: '%s'\n", - (int)j, args.argv[j + arg_offset]); - - strbuf_release(&out); - argv_array_clear(&args); - - return ret; - } - - if (i && (i % 100) == 0) - fprintf(stderr, "Trials completed: %d\n", (int)i); - } - - strbuf_release(&out); - argv_array_clear(&args); - - return 0; -} - -static int quote_echo(int argc, const char **argv) -{ - while (argc > 1) { - fwrite(argv[1], strlen(argv[1]), 1, stdout); - fputc('\0', stdout); - argv++; - argc--; - } - - return 0; -} - -static int inherit_handle(const char *argv0) -{ - struct child_process cp = CHILD_PROCESS_INIT; - char path[PATH_MAX]; - int tmp; - - /* First, open an inheritable handle */ - xsnprintf(path, sizeof(path), "out-XXXXXX"); - tmp = xmkstemp(path); - - argv_array_pushl(&cp.args, - "test-tool", argv0, "inherited-handle-child", NULL); - cp.in = -1; - cp.no_stdout = cp.no_stderr = 1; - if (start_command(&cp) < 0) - die("Could not start child process"); - - /* Then close it, and try to delete it. */ - close(tmp); - if (unlink(path)) - die("Could not delete '%s'", path); - - if (close(cp.in) < 0 || finish_command(&cp) < 0) - die("Child did not finish"); - - return 0; -} - -static int inherit_handle_child(void) -{ - struct strbuf buf = STRBUF_INIT; - - if (strbuf_read(&buf, 0, 0) < 0) - die("Could not read stdin"); - printf("Received %s\n", buf.buf); - strbuf_release(&buf); - - return 0; -} - int cmd__run_command(int argc, const char **argv) { struct child_process proc = CHILD_PROCESS_INIT; int jobs; - if (argc > 1 && !strcmp(argv[1], "testsuite")) - exit(testsuite(argc - 1, argv + 1)); - if (!strcmp(argv[1], "inherited-handle")) - exit(inherit_handle(argv[0])); - if (!strcmp(argv[1], "inherited-handle-child")) - exit(inherit_handle_child()); - - if (argc >= 2 && !strcmp(argv[1], "quote-stress-test")) - return !!quote_stress_test(argc - 1, argv + 1); - - if (argc >= 2 && !strcmp(argv[1], "quote-echo")) - return !!quote_echo(argc - 1, argv + 1); - if (argc < 3) return 1; while (!strcmp(argv[1], "env")) { diff --git a/third_party/git/t/helper/test-tool.c b/third_party/git/t/helper/test-tool.c index c9a232d238..ce7e89028c 100644 --- a/third_party/git/t/helper/test-tool.c +++ b/third_party/git/t/helper/test-tool.c @@ -39,14 +39,11 @@ static struct test_cmd cmds[] = { { "oidmap", cmd__oidmap }, { "online-cpus", cmd__online_cpus }, { "parse-options", cmd__parse_options }, - { "parse-pathspec-file", cmd__parse_pathspec_file }, { "path-utils", cmd__path_utils }, { "pkt-line", cmd__pkt_line }, { "prio-queue", cmd__prio_queue }, - { "progress", cmd__progress }, { "reach", cmd__reach }, { "read-cache", cmd__read_cache }, - { "read-graph", cmd__read_graph }, { "read-midx", cmd__read_midx }, { "ref-store", cmd__ref_store }, { "regex", cmd__regex }, diff --git a/third_party/git/t/helper/test-tool.h b/third_party/git/t/helper/test-tool.h index c8549fd87f..f805bb39ae 100644 --- a/third_party/git/t/helper/test-tool.h +++ b/third_party/git/t/helper/test-tool.h @@ -29,14 +29,11 @@ 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__parse_options(int argc, const char **argv); -int cmd__parse_pathspec_file(int argc, const char** argv); int cmd__path_utils(int argc, const char **argv); int cmd__pkt_line(int argc, const char **argv); int cmd__prio_queue(int argc, const char **argv); -int cmd__progress(int argc, const char **argv); int cmd__reach(int argc, const char **argv); int cmd__read_cache(int argc, const char **argv); -int cmd__read_graph(int argc, const char **argv); int cmd__read_midx(int argc, const char **argv); int cmd__ref_store(int argc, const char **argv); int cmd__regex(int argc, const char **argv); diff --git a/third_party/git/t/helper/test-windows-named-pipe.c b/third_party/git/t/helper/test-windows-named-pipe.c index ae52183e63..b4b752b01a 100644 --- a/third_party/git/t/helper/test-windows-named-pipe.c +++ b/third_party/git/t/helper/test-windows-named-pipe.c @@ -19,7 +19,7 @@ int cmd__windows_named_pipe(int argc, const char **argv) if (argc < 2) goto print_usage; filename = argv[1]; - if (strpbrk(filename, "/\\")) + if (strchr(filename, '/') || strchr(filename, '\\')) goto print_usage; strbuf_addf(&pathname, "//./pipe/%s", filename); diff --git a/third_party/git/t/lib-bash.sh b/third_party/git/t/lib-bash.sh index b0b6060929..2be955fafb 100644 --- a/third_party/git/t/lib-bash.sh +++ b/third_party/git/t/lib-bash.sh @@ -2,12 +2,10 @@ # to run under Bash; primarily intended for tests of the completion # script. -if test -n "$BASH" && test -z "$POSIXLY_CORRECT" -then +if test -n "$BASH" && test -z "$POSIXLY_CORRECT"; then # we are in full-on bash mode true -elif type bash >/dev/null 2>&1 -then +elif type bash >/dev/null 2>&1; then # execute in full-on bash mode unset POSIXLY_CORRECT exec bash "$0" "$@" diff --git a/third_party/git/t/lib-credential.sh b/third_party/git/t/lib-credential.sh index bb88cc0108..937b831ea6 100755 --- a/third_party/git/t/lib-credential.sh +++ b/third_party/git/t/lib-credential.sh @@ -19,7 +19,7 @@ check() { false fi && test_cmp expect-stdout stdout && - test_i18ncmp expect-stderr stderr + test_cmp expect-stderr stderr } read_chunk() { diff --git a/third_party/git/t/lib-git-daemon.sh b/third_party/git/t/lib-git-daemon.sh index e62569222b..fb8f887080 100644 --- a/third_party/git/t/lib-git-daemon.sh +++ b/third_party/git/t/lib-git-daemon.sh @@ -15,7 +15,7 @@ # # test_done -if ! test_bool_env GIT_TEST_GIT_DAEMON true +if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON then skip_all="git-daemon testing disabled (unset GIT_TEST_GIT_DAEMON to enable)" test_done diff --git a/third_party/git/t/lib-git-p4.sh b/third_party/git/t/lib-git-p4.sh index 5aff2abe8b..547b9f88e1 100644 --- a/third_party/git/t/lib-git-p4.sh +++ b/third_party/git/t/lib-git-p4.sh @@ -175,7 +175,7 @@ stop_and_cleanup_p4d () { cleanup_git () { retry_until_success rm -r "$git" - test_path_is_missing "$git" && + test_must_fail test -d "$git" && retry_until_success mkdir "$git" } diff --git a/third_party/git/t/lib-git-svn.sh b/third_party/git/t/lib-git-svn.sh index 7d248e6588..5d4ae629e1 100644 --- a/third_party/git/t/lib-git-svn.sh +++ b/third_party/git/t/lib-git-svn.sh @@ -69,7 +69,7 @@ svn_cmd () { maybe_start_httpd () { loc=${1-svn} - if test_bool_env GIT_TEST_SVN_HTTPD false + if git env--helper --type=bool --default=false --exit-code GIT_TEST_HTTPD then . "$TEST_DIRECTORY"/lib-httpd.sh LIB_HTTPD_SVN="$loc" @@ -104,7 +104,7 @@ EOF } require_svnserve () { - if ! test_bool_env GIT_TEST_SVNSERVE false + if ! git env--helper --type=bool --default=false --exit-code GIT_TEST_SVNSERVE then skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)' test_done diff --git a/third_party/git/t/lib-httpd.sh b/third_party/git/t/lib-httpd.sh index 1449ee95e9..0d985758c6 100644 --- a/third_party/git/t/lib-httpd.sh +++ b/third_party/git/t/lib-httpd.sh @@ -41,7 +41,7 @@ then test_done fi -if ! test_bool_env GIT_TEST_HTTPD true +if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_HTTPD then skip_all="Network testing disabled (unset GIT_TEST_HTTPD to enable)" test_done @@ -132,7 +132,7 @@ prepare_httpd() { install_script broken-smart-http.sh install_script error-smart-http.sh install_script error.sh - install_script apply-one-time-perl.sh + install_script apply-one-time-sed.sh ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" diff --git a/third_party/git/t/lib-httpd/apache.conf b/third_party/git/t/lib-httpd/apache.conf index 994e5290d6..5c1c86c193 100644 --- a/third_party/git/t/lib-httpd/apache.conf +++ b/third_party/git/t/lib-httpd/apache.conf @@ -113,7 +113,7 @@ Alias /auth/dumb/ www/auth/dumb/ SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} SetEnv GIT_HTTP_EXPORT_ALL </LocationMatch> -<LocationMatch /one_time_perl/> +<LocationMatch /one_time_sed/> SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} SetEnv GIT_HTTP_EXPORT_ALL </LocationMatch> @@ -122,7 +122,7 @@ ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1 ScriptAlias /broken_smart/ broken-smart-http.sh/ ScriptAlias /error_smart/ error-smart-http.sh/ ScriptAlias /error/ error.sh/ -ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1 +ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1 <Directory ${GIT_EXEC_PATH}> Options FollowSymlinks </Directory> @@ -135,7 +135,7 @@ ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1 <Files error.sh> Options ExecCGI </Files> -<Files apply-one-time-perl.sh> +<Files apply-one-time-sed.sh> Options ExecCGI </Files> <Files ${GIT_EXEC_PATH}/git-http-backend> diff --git a/third_party/git/t/lib-httpd/apply-one-time-perl.sh b/third_party/git/t/lib-httpd/apply-one-time-perl.sh deleted file mode 100644 index 09a0abdff7..0000000000 --- a/third_party/git/t/lib-httpd/apply-one-time-perl.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# If "one-time-perl" exists in $HTTPD_ROOT_PATH, run perl on the HTTP response, -# using the contents of "one-time-perl" as the perl command to be run. If the -# response was modified as a result, delete "one-time-perl" so that subsequent -# HTTP responses are no longer modified. -# -# This can be used to simulate the effects of the repository changing in -# between HTTP request-response pairs. -if test -f one-time-perl -then - LC_ALL=C - export LC_ALL - - "$GIT_EXEC_PATH/git-http-backend" >out - perl -pe "$(cat one-time-perl)" out >out_modified - - if cmp -s out out_modified - then - cat out - else - cat out_modified - rm one-time-perl - fi -else - "$GIT_EXEC_PATH/git-http-backend" -fi diff --git a/third_party/git/t/lib-httpd/apply-one-time-sed.sh b/third_party/git/t/lib-httpd/apply-one-time-sed.sh new file mode 100644 index 0000000000..fcef728925 --- /dev/null +++ b/third_party/git/t/lib-httpd/apply-one-time-sed.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# If "one-time-sed" exists in $HTTPD_ROOT_PATH, run sed on the HTTP response, +# using the contents of "one-time-sed" as the sed command to be run. If the +# response was modified as a result, delete "one-time-sed" so that subsequent +# HTTP responses are no longer modified. +# +# This can be used to simulate the effects of the repository changing in +# between HTTP request-response pairs. +if [ -e one-time-sed ]; then + "$GIT_EXEC_PATH/git-http-backend" >out + sed "$(cat one-time-sed)" <out >out_modified + + if diff out out_modified >/dev/null; then + cat out + else + cat out_modified + rm one-time-sed + fi +else + "$GIT_EXEC_PATH/git-http-backend" +fi diff --git a/third_party/git/t/lib-log-graph.sh b/third_party/git/t/lib-log-graph.sh deleted file mode 100755 index 1184cceef2..0000000000 --- a/third_party/git/t/lib-log-graph.sh +++ /dev/null @@ -1,28 +0,0 @@ -# Helps shared by the test scripts for comparing log graphs. - -sanitize_log_output () { - sed -e 's/ *$//' \ - -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \ - -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \ - -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \ - -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \ - -e 's/index [0-9a-f]*\.\.[0-9a-f]*/index BEFORE..AFTER/' -} - -lib_test_cmp_graph () { - git log --graph "$@" >output && - sed 's/ *$//' >output.sanitized <output && - test_i18ncmp expect output.sanitized -} - -lib_test_cmp_short_graph () { - git log --graph --pretty=short "$@" >output && - sanitize_log_output >output.sanitized <output && - test_i18ncmp expect output.sanitized -} - -lib_test_cmp_colored_graph () { - git log --graph --color=always "$@" >output.colors.raw && - test_decode_color <output.colors.raw | sed "s/ *\$//" >output.colors && - test_cmp expect.colors output.colors -} diff --git a/third_party/git/t/lib-pack.sh b/third_party/git/t/lib-pack.sh index f3463170b3..c4d907a450 100644 --- a/third_party/git/t/lib-pack.sh +++ b/third_party/git/t/lib-pack.sh @@ -35,11 +35,9 @@ pack_header () { # have hardcoded some well-known objects. See the case statements below for the # complete list. pack_obj () { - test_oid_init - case "$1" in # empty blob - $EMPTY_BLOB) + e69de29bb2d1d6434b8b29ae775ad8c2e48c5391) case "$2" in '') printf '\060\170\234\003\0\0\0\0\1' @@ -49,7 +47,7 @@ pack_obj () { ;; # blob containing "\7\76" - $(test_oid packlib_7_76)) + e68fe8129b546b101aee9510c5328e7f21ca1d18) case "$2" in '') printf '\062\170\234\143\267\3\0\0\116\0\106' @@ -61,18 +59,11 @@ pack_obj () { printf '\234\143\142\142\142\267\003\0\0\151\0\114' return ;; - 37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683) - printf '\165\67\310\342\301\133\262\53\221\56\131' && - printf '\264\77\325\32\117\176\224\145\355\13\120' && - printf '\204\305\241\101\35\231\34\276\143\6\203\170' && - printf '\234\143\142\142\142\267\003\0\0\151\0\114' - return - ;; esac ;; # blob containing "\7\0" - $(test_oid packlib_7_0)) + 01d7713666f4de822776c7622c10f1b07de280dc) case "$2" in '') printf '\062\170\234\143\147\0\0\0\20\0\10' @@ -84,13 +75,6 @@ pack_obj () { printf '\143\142\142\142\147\0\0\0\53\0\16' return ;; - 5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886) - printf '\165\135\216\157\304\17\55\253\0\346\230\72' && - printf '\110\122\77\345\176\142\37\106\103\114\265' && - printf '\215\275\104\42\373\240\63\200\330\206\170\234' && - printf '\143\142\142\142\147\0\0\0\53\0\16' - return - ;; esac ;; esac @@ -102,7 +86,7 @@ pack_obj () { then echo "$1" | git pack-objects --stdout >pack_obj.tmp && size=$(wc -c <pack_obj.tmp) && - dd if=pack_obj.tmp bs=1 count=$((size - $(test_oid rawsz) - 12)) skip=12 && + dd if=pack_obj.tmp bs=1 count=$((size - 20 - 12)) skip=12 && rm -f pack_obj.tmp return fi @@ -113,8 +97,7 @@ pack_obj () { # Compute and append pack trailer to "$1" pack_trailer () { - test_oid_init && - test-tool $(test_oid algo) -b <"$1" >trailer.tmp && + test-tool sha1 -b <"$1" >trailer.tmp && cat trailer.tmp >>"$1" && rm -f trailer.tmp } @@ -125,11 +108,3 @@ pack_trailer () { clear_packs () { rm -f .git/objects/pack/* } - -test_oid_cache <<-EOF -packlib_7_0 sha1:01d7713666f4de822776c7622c10f1b07de280dc -packlib_7_0 sha256:37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683 - -packlib_7_76 sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18 -packlib_7_76 sha256:5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886 -EOF diff --git a/third_party/git/t/lib-rebase.sh b/third_party/git/t/lib-rebase.sh index b72c051f47..7ea30e5006 100644 --- a/third_party/git/t/lib-rebase.sh +++ b/third_party/git/t/lib-rebase.sh @@ -44,10 +44,10 @@ set_fake_editor () { rm -f "$1" echo 'rebase -i script before editing:' cat "$1".tmp - action=\& + action=pick for line in $FAKE_LINES; do case $line in - pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d|label|l|reset|r|merge|m) + pick|p|squash|s|fixup|f|edit|e|reword|r|drop|d) action="$line";; exec_*|x_*|break|b) echo "$line" | sed 's/_/ /g' >> "$1";; @@ -58,12 +58,11 @@ set_fake_editor () { bad) action="badcmd";; fakesha) - test \& != "$action" || action=pick echo "$action XXXXXXX False commit" >> "$1" action=pick;; *) - sed -n "${line}s/^[a-z][a-z]*/$action/p" < "$1".tmp >> "$1" - action=\&;; + sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1" + action=pick;; esac done echo 'rebase -i script after editing:' @@ -119,31 +118,3 @@ make_empty () { git commit --allow-empty -m "$1" && git tag "$1" } - -# Call this (inside test_expect_success) at the end of a test file to -# check that no tests have changed editor related environment -# variables or config settings -test_editor_unchanged () { - # We're only interested in exported variables hence 'sh -c' - sh -c 'cat >actual <<-EOF - EDITOR=$EDITOR - FAKE_COMMIT_AMEND=$FAKE_COMMIT_AMEND - FAKE_COMMIT_MESSAGE=$FAKE_COMMIT_MESSAGE - FAKE_LINES=$FAKE_LINES - GIT_EDITOR=$GIT_EDITOR - GIT_SEQUENCE_EDITOR=$GIT_SEQUENCE_EDITOR - core.editor=$(git config core.editor) - sequence.editor=$(git config sequence.editor) - EOF' - cat >expect <<-\EOF - EDITOR=: - FAKE_COMMIT_AMEND= - FAKE_COMMIT_MESSAGE= - FAKE_LINES= - GIT_EDITOR= - GIT_SEQUENCE_EDITOR= - core.editor= - sequence.editor= - EOF - test_cmp expect actual -} diff --git a/third_party/git/t/oid-info/hash-info b/third_party/git/t/oid-info/hash-info index d0736dd1a0..ccdbfdf974 100644 --- a/third_party/git/t/oid-info/hash-info +++ b/third_party/git/t/oid-info/hash-info @@ -6,12 +6,3 @@ hexsz sha256:64 zero sha1:0000000000000000000000000000000000000000 zero sha256:0000000000000000000000000000000000000000000000000000000000000000 - -algo sha1:sha1 -algo sha256:sha256 - -empty_blob sha1:e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 -empty_blob sha256:473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813 - -empty_tree sha1:4b825dc642cb6eb9a060e54bf8d69288fbee4904 -empty_tree sha256:6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321 diff --git a/third_party/git/t/perf/aggregate.perl b/third_party/git/t/perf/aggregate.perl index 14e4cda287..66554d2161 100755 --- a/third_party/git/t/perf/aggregate.perl +++ b/third_party/git/t/perf/aggregate.perl @@ -4,6 +4,7 @@ use lib '../../perl/build/lib'; use strict; use warnings; use Getopt::Long; +use Git; use Cwd qw(realpath); sub get_times { @@ -84,11 +85,6 @@ sub format_size { return $out; } -sub sane_backticks { - open(my $fh, '-|', @_); - return <$fh>; -} - my (@dirs, %dirnames, %dirabbrevs, %prefixes, @tests, $codespeed, $sortby, $subsection, $reponame); @@ -106,8 +102,7 @@ while (scalar @ARGV) { my $prefix = ''; last if -f $arg or $arg eq "--"; if (! -d $arg) { - my $rev = sane_backticks(qw(git rev-parse --verify), $arg); - chomp $rev; + my $rev = Git::command_oneline(qw(rev-parse --verify), $arg); $dir = "build/".$rev; } elsif ($arg eq '.') { $dir = '.'; @@ -224,7 +219,13 @@ sub print_default_results { for my $i (0..$#dirs) { my $d = $dirs[$i]; my $base = "$resultsdir/$prefixes{$d}$t"; - $times{$prefixes{$d}.$t} = [get_times("$base.result")]; + $times{$prefixes{$d}.$t} = []; + foreach my $type (qw(times size)) { + if (-e "$base.$type") { + $times{$prefixes{$d}.$t} = [get_times("$base.$type")]; + last; + } + } my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}}; my $w = length format_times($r,$u,$s,$firstr); $colwidth[$i] = $w if $w > $colwidth[$i]; @@ -266,7 +267,7 @@ sub print_sorted_results { my ($prevr, $prevu, $prevs, $prevrev); for my $i (0..$#dirs) { my $d = $dirs[$i]; - my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result"); + my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times"); if ($i > 0 and defined $r and defined $prevr and $prevr > 0) { my $percent = 100.0 * ($r - $prevr) / $prevr; push @evolutions, { "percent" => $percent, @@ -326,7 +327,7 @@ sub print_codespeed_results { my $commitid = $prefixes{$d}; $commitid =~ s/^build_//; $commitid =~ s/\.$//; - my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result"); + my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times"); my %vals = ( "commitid" => $commitid, diff --git a/third_party/git/t/perf/bisect_regression b/third_party/git/t/perf/bisect_regression index ce47e1662a..a94d9955d0 100755 --- a/third_party/git/t/perf/bisect_regression +++ b/third_party/git/t/perf/bisect_regression @@ -51,7 +51,7 @@ oldtime=$(echo "$oldtime" | sed -e 's/^\([0-9]\+\.[0-9]\+\).*$/\1/') newtime=$(echo "$newtime" | sed -e 's/^\([0-9]\+\.[0-9]\+\).*$/\1/') test $(echo "$newtime" "$oldtime" | awk '{ print ($1 > $2) }') = 1 || - die "New time '$newtime' should be greater than old time '$oldtime'" + die "New time '$newtime' shoud be greater than old time '$oldtime'" tmpdir=$(mktemp -d -t bisect_regression_XXXXXX) || die "Failed to create temp directory" echo "$oldtime" >"$tmpdir/oldtime" || die "Failed to write to '$tmpdir/oldtime'" diff --git a/third_party/git/t/perf/p5303-many-packs.sh b/third_party/git/t/perf/p5303-many-packs.sh index 7ee791669a..3779851941 100755 --- a/third_party/git/t/perf/p5303-many-packs.sh +++ b/third_party/git/t/perf/p5303-many-packs.sh @@ -77,7 +77,6 @@ do # actual pack generation, without smudging the on-disk setup # between trials. test_perf "repack ($nr_packs)" ' - GIT_TEST_FULL_IN_PACK_ARRAY=1 \ git pack-objects --keep-true-parents \ --honor-pack-keep --non-empty --all \ --reflog --indexed-objects --delta-base-offset \ @@ -85,22 +84,4 @@ do ' done -# Measure pack loading with 10,000 packs. -test_expect_success 'generate lots of packs' ' - for i in $(test_seq 10000); do - echo "blob" - echo "data <<EOF" - echo "blob $i" - echo "EOF" - echo "checkpoint" - done | - git -c fastimport.unpackLimit=0 fast-import -' - -# The purpose of this test is to evaluate load time for a large number -# of packs while doing as little other work as possible. -test_perf "load 10,000 packs" ' - git rev-parse --verify "HEAD^{commit}" -' - test_done diff --git a/third_party/git/t/perf/p5310-pack-bitmaps.sh b/third_party/git/t/perf/p5310-pack-bitmaps.sh index 7743f4f4c9..6a3a42531b 100755 --- a/third_party/git/t/perf/p5310-pack-bitmaps.sh +++ b/third_party/git/t/perf/p5310-pack-bitmaps.sh @@ -39,28 +39,6 @@ test_perf 'pack to file (bitmap)' ' git pack-objects --use-bitmap-index --all pack1b </dev/null >/dev/null ' -test_perf 'rev-list (commits)' ' - git rev-list --all --use-bitmap-index >/dev/null -' - -test_perf 'rev-list (objects)' ' - git rev-list --all --use-bitmap-index --objects >/dev/null -' - -test_perf 'rev-list count with blob:none' ' - git rev-list --use-bitmap-index --count --objects --all \ - --filter=blob:none >/dev/null -' - -test_perf 'rev-list count with blob:limit=1k' ' - git rev-list --use-bitmap-index --count --objects --all \ - --filter=blob:limit=1k >/dev/null -' - -test_perf 'simulated partial clone' ' - git pack-objects --stdout --all --filter=blob:none </dev/null >/dev/null -' - test_expect_success 'create partial bitmap state' ' # pick a commit to represent the repo tip in the past cutoff=$(git rev-list HEAD~100 -1) && diff --git a/third_party/git/t/perf/p5601-clone-reference.sh b/third_party/git/t/perf/p5600-clone-reference.sh index 68fed66347..68fed66347 100755 --- a/third_party/git/t/perf/p5601-clone-reference.sh +++ b/third_party/git/t/perf/p5600-clone-reference.sh diff --git a/third_party/git/t/perf/perf-lib.sh b/third_party/git/t/perf/perf-lib.sh index 13e389367a..b58a43ea43 100644 --- a/third_party/git/t/perf/perf-lib.sh +++ b/third_party/git/t/perf/perf-lib.sh @@ -214,7 +214,7 @@ test_perf_ () { else test_ok_ "$1" fi - "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result + "$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times } test_perf () { @@ -223,7 +223,7 @@ test_perf () { test_size_ () { say >&3 "running: $2" - if test_eval_ "$2" 3>"$base".result; then + if test_eval_ "$2" 3>"$base".size; then test_ok_ "$1" else test_failure_ "$@" diff --git a/third_party/git/t/t0000-basic.sh b/third_party/git/t/t0000-basic.sh index 3e440c078d..9ca0818cbe 100755 --- a/third_party/git/t/t0000-basic.sh +++ b/third_party/git/t/t0000-basic.sh @@ -20,9 +20,9 @@ modification *should* take notice and update the test vectors here. . ./test-lib.sh -try_local_xy () { - local x="local" y="alsolocal" && - echo "$x $y" +try_local_x () { + local x="local" && + echo "$x" } # Check whether the shell supports the "local" keyword. "local" is not @@ -35,12 +35,11 @@ try_local_xy () { # relying on "local". test_expect_success 'verify that the running shell supports "local"' ' x="notlocal" && - y="alsonotlocal" && - echo "local alsolocal" >expected1 && - try_local_xy >actual1 && + echo "local" >expected1 && + try_local_x >actual1 && test_cmp expected1 actual1 && - echo "notlocal alsonotlocal" >expected2 && - echo "$x $y" >actual2 && + echo "notlocal" >expected2 && + echo "$x" >actual2 && test_cmp expected2 actual2 ' @@ -127,7 +126,7 @@ check_sub_test_lib_test () { check_sub_test_lib_test_err () { name="$1" # stdin is the expected output from the test - # expected error output is in descriptor 3 + # expected error output is in descriptior 3 ( cd "$name" && sed -e 's/^> //' -e 's/Z$//' >expect.out && @@ -155,7 +154,7 @@ test_expect_success 'pretend we have a fully passing test suite' " " test_expect_success 'pretend we have a partially passing test suite' " - run_sub_test_lib_test_err \ + test_must_fail run_sub_test_lib_test \ partial-pass '2/3 tests passing' <<-\\EOF && test_expect_success 'passing test #1' 'true' test_expect_success 'failing test #2' 'false' @@ -219,7 +218,7 @@ test_expect_success 'pretend we have fixed one of two known breakages (run in su " test_expect_success 'pretend we have a pass, fail, and known breakage' " - run_sub_test_lib_test_err \ + test_must_fail run_sub_test_lib_test \ mixed-results1 'mixed results #1' <<-\\EOF && test_expect_success 'passing test' 'true' test_expect_success 'failing test' 'false' @@ -238,7 +237,7 @@ test_expect_success 'pretend we have a pass, fail, and known breakage' " " test_expect_success 'pretend we have a mix of all possible results' " - run_sub_test_lib_test_err \ + test_must_fail run_sub_test_lib_test \ mixed-results2 'mixed results #2' <<-\\EOF && test_expect_success 'passing test' 'true' test_expect_success 'passing test' 'true' @@ -274,24 +273,24 @@ test_expect_success 'pretend we have a mix of all possible results' " " test_expect_success C_LOCALE_OUTPUT 'test --verbose' ' - run_sub_test_lib_test_err \ - t1234-verbose "test verbose" --verbose <<-\EOF && + test_must_fail run_sub_test_lib_test \ + test-verbose "test verbose" --verbose <<-\EOF && test_expect_success "passing test" true test_expect_success "test with output" "echo foo" test_expect_success "failing test" false test_done EOF - mv t1234-verbose/out t1234-verbose/out+ && - grep -v "^Initialized empty" t1234-verbose/out+ >t1234-verbose/out && - check_sub_test_lib_test t1234-verbose <<-\EOF - > expecting success of 1234.1 '\''passing test'\'': true + mv test-verbose/out test-verbose/out+ && + grep -v "^Initialized empty" test-verbose/out+ >test-verbose/out && + check_sub_test_lib_test test-verbose <<-\EOF + > expecting success: true > ok 1 - passing test > Z - > expecting success of 1234.2 '\''test with output'\'': echo foo + > expecting success: echo foo > foo > ok 2 - test with output > Z - > expecting success of 1234.3 '\''failing test'\'': false + > expecting success: false > not ok 3 - failing test > # false > Z @@ -301,18 +300,18 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' ' ' test_expect_success 'test --verbose-only' ' - run_sub_test_lib_test_err \ - t2345-verbose-only-2 "test verbose-only=2" \ + test_must_fail run_sub_test_lib_test \ + test-verbose-only-2 "test verbose-only=2" \ --verbose-only=2 <<-\EOF && test_expect_success "passing test" true test_expect_success "test with output" "echo foo" test_expect_success "failing test" false test_done EOF - check_sub_test_lib_test t2345-verbose-only-2 <<-\EOF + check_sub_test_lib_test test-verbose-only-2 <<-\EOF > ok 1 - passing test > Z - > expecting success of 2345.2 '\''test with output'\'': echo foo + > expecting success: echo foo > foo > ok 2 - test with output > Z @@ -392,44 +391,6 @@ test_expect_success 'GIT_SKIP_TESTS sh pattern' " ) " -test_expect_success 'GIT_SKIP_TESTS entire suite' " - ( - GIT_SKIP_TESTS='git' && export GIT_SKIP_TESTS && - run_sub_test_lib_test git-skip-tests-entire-suite \ - 'GIT_SKIP_TESTS entire suite' <<-\\EOF && - for i in 1 2 3 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test git-skip-tests-entire-suite <<-\\EOF - > 1..0 # SKIP skip all tests in git - EOF - ) -" - -test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' " - ( - GIT_SKIP_TESTS='notgit' && export GIT_SKIP_TESTS && - run_sub_test_lib_test git-skip-tests-unmatched-suite \ - 'GIT_SKIP_TESTS does not skip unmatched suite' <<-\\EOF && - for i in 1 2 3 - do - test_expect_success \"passing test #\$i\" 'true' - done - test_done - EOF - check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\\EOF - > ok 1 - passing test #1 - > ok 2 - passing test #2 - > ok 3 - passing test #3 - > # passed all 3 test(s) - > 1..3 - EOF - ) -" - test_expect_success '--run basic' " run_sub_test_lib_test run-basic \ '--run basic' --run='1 3 5' <<-\\EOF && @@ -834,7 +795,7 @@ then fi test_expect_success 'tests clean up even on failures' " - run_sub_test_lib_test_err \ + test_must_fail run_sub_test_lib_test \ failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF && test_expect_success 'tests clean up even after a failure' ' touch clean-after-failure && @@ -863,7 +824,7 @@ test_expect_success 'tests clean up even on failures' " " test_expect_success 'test_atexit is run' " - run_sub_test_lib_test_err \ + test_must_fail run_sub_test_lib_test \ atexit-cleanup 'Run atexit commands' -i <<-\\EOF && test_expect_success 'tests clean up even after a failure' ' > ../../clean-atexit && @@ -917,40 +878,6 @@ test_expect_success 'test_oid can look up data for SHA-256' ' test "$hexsz" -eq 64 ' -test_expect_success 'test_bool_env' ' - ( - sane_unset envvar && - - test_bool_env envvar true && - ! test_bool_env envvar false && - - envvar= && - export envvar && - ! test_bool_env envvar true && - ! test_bool_env envvar false && - - envvar=true && - test_bool_env envvar true && - test_bool_env envvar false && - - envvar=false && - ! test_bool_env envvar true && - ! test_bool_env envvar false && - - envvar=invalid && - # When encountering an invalid bool value, test_bool_env - # prints its error message to the original stderr of the - # test script, hence the redirection of fd 7, and aborts - # with "exit 1", hence the subshell. - ! ( test_bool_env envvar true ) 7>err && - grep "error: test_bool_env requires bool values" err && - - envvar=true && - ! ( test_bool_env envvar invalid ) 7>err && - grep "error: test_bool_env requires bool values" err - ) -' - ################################################################ # Basics of the basics diff --git a/third_party/git/t/t0003-attributes.sh b/third_party/git/t/t0003-attributes.sh index b660593c20..71e63d8b50 100755 --- a/third_party/git/t/t0003-attributes.sh +++ b/third_party/git/t/t0003-attributes.sh @@ -5,16 +5,19 @@ test_description=gitattributes . ./test-lib.sh attr_check () { - path="$1" expect="$2" git_opts="$3" && + path="$1" expect="$2" - git $git_opts check-attr test -- "$path" >actual 2>err && - echo "$path: test: $expect" >expect && + git $3 check-attr test -- "$path" >actual 2>err && + echo "$path: test: $2" >expect && test_cmp expect actual && - test_must_be_empty err + test_line_count = 0 err } attr_check_quote () { - path="$1" quoted_path="$2" expect="$3" && + + path="$1" + quoted_path="$2" + expect="$3" git check-attr test -- "$path" >actual && echo "\"$quoted_path\": test: $expect" >expect && @@ -24,7 +27,7 @@ attr_check_quote () { test_expect_success 'open-quoted pathname' ' echo "\"a test=a" >.gitattributes && - attr_check a unspecified + test_must_fail attr_check a a ' @@ -109,20 +112,20 @@ test_expect_success 'attribute test' ' test_expect_success 'attribute matching is case sensitive when core.ignorecase=0' ' - attr_check F unspecified "-c core.ignorecase=0" && - attr_check a/F unspecified "-c core.ignorecase=0" && - attr_check a/c/F unspecified "-c core.ignorecase=0" && - attr_check a/G unspecified "-c core.ignorecase=0" && - attr_check a/B/g a/g "-c core.ignorecase=0" && - attr_check a/b/G unspecified "-c core.ignorecase=0" && - attr_check a/b/H unspecified "-c core.ignorecase=0" && - attr_check a/b/D/g a/g "-c core.ignorecase=0" && - attr_check oNoFf unspecified "-c core.ignorecase=0" && - attr_check oFfOn unspecified "-c core.ignorecase=0" && + test_must_fail attr_check F f "-c core.ignorecase=0" && + test_must_fail attr_check a/F f "-c core.ignorecase=0" && + test_must_fail attr_check a/c/F f "-c core.ignorecase=0" && + test_must_fail attr_check a/G a/g "-c core.ignorecase=0" && + test_must_fail attr_check a/B/g a/b/g "-c core.ignorecase=0" && + test_must_fail attr_check a/b/G a/b/g "-c core.ignorecase=0" && + test_must_fail attr_check a/b/H a/b/h "-c core.ignorecase=0" && + test_must_fail attr_check a/b/D/g "a/b/d/*" "-c core.ignorecase=0" && + test_must_fail attr_check oNoFf unset "-c core.ignorecase=0" && + test_must_fail attr_check oFfOn set "-c core.ignorecase=0" && attr_check NO unspecified "-c core.ignorecase=0" && - attr_check a/b/D/NO unspecified "-c core.ignorecase=0" && + test_must_fail attr_check a/b/D/NO "a/b/d/*" "-c core.ignorecase=0" && attr_check a/b/d/YES a/b/d/* "-c core.ignorecase=0" && - attr_check a/E/f f "-c core.ignorecase=0" + test_must_fail attr_check a/E/f "A/e/F" "-c core.ignorecase=0" ' @@ -146,8 +149,8 @@ test_expect_success 'attribute matching is case insensitive when core.ignorecase ' test_expect_success CASE_INSENSITIVE_FS 'additional case insensitivity tests' ' - attr_check a/B/D/g a/g "-c core.ignorecase=0" && - attr_check A/B/D/NO unspecified "-c core.ignorecase=0" && + test_must_fail attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=0" && + test_must_fail attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=0" && attr_check A/b/h a/b/h "-c core.ignorecase=1" && attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=1" && attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=1" @@ -241,7 +244,7 @@ EOF git check-attr foo -- "a/b/f" >>actual 2>>err && git check-attr foo -- "a/b/c/f" >>actual 2>>err && test_cmp expect actual && - test_must_be_empty err + test_line_count = 0 err ' test_expect_success '"**" with no slashes test' ' @@ -262,7 +265,7 @@ EOF git check-attr foo -- "a/b/f" >>actual 2>>err && git check-attr foo -- "a/b/c/f" >>actual 2>>err && test_cmp expect actual && - test_must_be_empty err + test_line_count = 0 err ' test_expect_success 'using --git-dir and --work-tree' ' diff --git a/third_party/git/t/t0008-ignores.sh b/third_party/git/t/t0008-ignores.sh index 370a389e5c..1744cee5e9 100755 --- a/third_party/git/t/t0008-ignores.sh +++ b/third_party/git/t/t0008-ignores.sh @@ -424,24 +424,9 @@ test_expect_success 'local ignore inside a sub-directory with --verbose' ' ) ' -test_expect_success 'nested include of negated pattern' ' - expect "" && - test_check_ignore "a/b/one" 1 -' - -test_expect_success 'nested include of negated pattern with -q' ' - expect "" && - test_check_ignore "-q a/b/one" 1 -' - -test_expect_success 'nested include of negated pattern with -v' ' - expect "a/b/.gitignore:8:!on* a/b/one" && - test_check_ignore "-v a/b/one" 0 -' - -test_expect_success 'nested include of negated pattern with -v -n' ' - expect "a/b/.gitignore:8:!on* a/b/one" && - test_check_ignore "-v -n a/b/one" 0 +test_expect_success_multi 'nested include' \ + 'a/b/.gitignore:8:!on* a/b/one' ' + test_check_ignore "a/b/one" ' ############################################################################ @@ -475,6 +460,7 @@ test_expect_success 'cd to ignored sub-directory' ' expect_from_stdin <<-\EOF && foo twoooo + ../one seven ../../one EOF @@ -557,6 +543,7 @@ test_expect_success 'global ignore' ' globalthree a/globalthree a/per-repo + globaltwo EOF test_check_ignore "globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo" ' @@ -599,7 +586,17 @@ EOF cat <<-\EOF >expected-default one a/one + a/b/on + a/b/one + a/b/one one + a/b/one two + "a/b/one\"three" + a/b/two a/b/twooo + globaltwo + a/globaltwo + a/b/globaltwo + b/globaltwo EOF cat <<-EOF >expected-verbose .gitignore:1:one one @@ -699,12 +696,8 @@ cat <<-EOF >expected-all $global_excludes:2:!globaltwo ../b/globaltwo :: c/not-ignored EOF -cat <<-EOF >expected-default -../one -one -b/twooo -EOF grep -v '^:: ' expected-all >expected-verbose +sed -e 's/.* //' expected-verbose >expected-default broken_c_unquote stdin >stdin0 diff --git a/third_party/git/t/t0014-alias.sh b/third_party/git/t/t0014-alias.sh index 8d3d9144c0..a070e645d7 100755 --- a/third_party/git/t/t0014-alias.sh +++ b/third_party/git/t/t0014-alias.sh @@ -37,11 +37,4 @@ test_expect_success 'looping aliases - internal execution' ' # test_i18ngrep "^fatal: alias loop detected: expansion of" output #' -test_expect_success 'run-command formats empty args properly' ' - test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw && - sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual && - echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect && - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t0020-crlf.sh b/third_party/git/t/t0020-crlf.sh index b63ba62e5d..854da0ae16 100755 --- a/third_party/git/t/t0020-crlf.sh +++ b/third_party/git/t/t0020-crlf.sh @@ -159,8 +159,8 @@ test_expect_success 'checkout with autocrlf=input' ' rm -f tmp one dir/two three && git config core.autocrlf input && git read-tree --reset -u HEAD && - ! has_cr one && - ! has_cr dir/two && + test_must_fail has_cr one && + test_must_fail has_cr dir/two && git update-index -- one dir/two && test "$one" = $(git hash-object --stdin <one) && test "$two" = $(git hash-object --stdin <dir/two) && @@ -237,9 +237,9 @@ test_expect_success '.gitattributes says two is binary' ' git config core.autocrlf true && git read-tree --reset -u HEAD && - ! has_cr dir/two && + test_must_fail has_cr dir/two && verbose has_cr one && - ! has_cr three + test_must_fail has_cr three ' test_expect_success '.gitattributes says two is input' ' @@ -248,7 +248,7 @@ test_expect_success '.gitattributes says two is input' ' echo "two crlf=input" >.gitattributes && git read-tree --reset -u HEAD && - ! has_cr dir/two + test_must_fail has_cr dir/two ' test_expect_success '.gitattributes says two and three are text' ' @@ -270,7 +270,7 @@ test_expect_success 'in-tree .gitattributes (1)' ' rm -rf tmp one dir .gitattributes patch.file three && git read-tree --reset -u HEAD && - ! has_cr one && + test_must_fail has_cr one && verbose has_cr three ' @@ -280,7 +280,7 @@ test_expect_success 'in-tree .gitattributes (2)' ' git read-tree --reset HEAD && git checkout-index -f -q -u -a && - ! has_cr one && + test_must_fail has_cr one && verbose has_cr three ' @@ -291,7 +291,7 @@ test_expect_success 'in-tree .gitattributes (3)' ' git checkout-index -u .gitattributes && git checkout-index -u one dir/two three && - ! has_cr one && + test_must_fail has_cr one && verbose has_cr three ' @@ -302,7 +302,7 @@ test_expect_success 'in-tree .gitattributes (4)' ' git checkout-index -u one dir/two three && git checkout-index -u .gitattributes && - ! has_cr one && + test_must_fail has_cr one && verbose has_cr three ' diff --git a/third_party/git/t/t0021-conversion.sh b/third_party/git/t/t0021-conversion.sh index dc664da551..e10f5f787f 100755 --- a/third_party/git/t/t0021-conversion.sh +++ b/third_party/git/t/t0021-conversion.sh @@ -35,7 +35,7 @@ filter_git () { # Compare two files and ensure that `clean` and `smudge` respectively are # called at least once if specified in the `expect` file. The actual # invocation count is not relevant because their number can vary. -# c.f. http://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ +# c.f. http://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ test_cmp_count () { expect=$1 actual=$2 @@ -50,7 +50,7 @@ test_cmp_count () { # Compare two files but exclude all `clean` invocations because Git can # call `clean` zero or more times. -# c.f. http://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ +# c.f. http://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/ test_cmp_exclude_clean () { expect=$1 actual=$2 @@ -390,9 +390,6 @@ test_expect_success PERL 'required process filter should filter data' ' EOF test_cmp_exclude_clean expected.log debug.log && - # Make sure that the file appears dirty, so checkout below has to - # run the configured filter. - touch test.r && filter_git checkout --quiet --no-progress empty-branch && cat >expected.log <<-EOF && START @@ -795,6 +792,7 @@ test_expect_success PERL 'missing file in delayed checkout' ' rm -rf repo-cloned && test_must_fail git clone repo repo-cloned 2>git-stderr.log && + cat git-stderr.log && grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log ' diff --git a/third_party/git/t/t0027-auto-crlf.sh b/third_party/git/t/t0027-auto-crlf.sh index 9fcd56fab3..959b6da449 100755 --- a/third_party/git/t/t0027-auto-crlf.sh +++ b/third_party/git/t/t0027-auto-crlf.sh @@ -215,7 +215,7 @@ stats_ascii () { } -# construct the attr/ returned by git ls-files --eol +# contruct the attr/ returned by git ls-files --eol # Take none (=empty), one or two args # convert.c: eol=XX overrides text=auto attr_ascii () { diff --git a/third_party/git/t/t0028-working-tree-encoding.sh b/third_party/git/t/t0028-working-tree-encoding.sh index bfc4fb9af5..1090e650ed 100755 --- a/third_party/git/t/t0028-working-tree-encoding.sh +++ b/third_party/git/t/t0028-working-tree-encoding.sh @@ -17,7 +17,7 @@ test_lazy_prereq NO_UTF32_BOM ' write_utf16 () { if test_have_prereq NO_UTF16_BOM then - printf '\376\377' + printf '\xfe\xff' fi && iconv -f UTF-8 -t UTF-16 } @@ -25,7 +25,7 @@ write_utf16 () { write_utf32 () { if test_have_prereq NO_UTF32_BOM then - printf '\0\0\376\377' + printf '\x00\x00\xfe\xff' fi && iconv -f UTF-8 -t UTF-32 } @@ -40,7 +40,7 @@ test_expect_success 'setup test files' ' printf "$text" | write_utf16 >test.utf16.raw && printf "$text" | write_utf32 >test.utf32.raw && printf "\377\376" >test.utf16lebom.raw && - printf "$text" | iconv -f UTF-8 -t UTF-16LE >>test.utf16lebom.raw && + printf "$text" | iconv -f UTF-8 -t UTF-32LE >>test.utf16lebom.raw && # Line ending tests printf "one\ntwo\nthree\n" >lf.utf8.raw && @@ -280,43 +280,4 @@ test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' ' git reset ' -# $1: checkout encoding -# $2: test string -# $3: binary test string in checkout encoding -test_commit_utf8_checkout_other () { - encoding="$1" - orig_string="$2" - expect_bytes="$3" - - test_expect_success "Commit UTF-8, checkout $encoding" ' - test_when_finished "git checkout HEAD -- .gitattributes" && - - test_ext="commit_utf8_checkout_$encoding" && - test_file="test.$test_ext" && - - # Commit as UTF-8 - echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes && - printf "$orig_string" >$test_file && - git add $test_file && - git commit -m "Test data" && - - # Checkout in tested encoding - rm $test_file && - echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes && - git checkout HEAD -- $test_file && - - # Test - printf $expect_bytes >$test_file.raw && - test_cmp_bin $test_file.raw $test_file - ' -} - -test_commit_utf8_checkout_other "UTF-8" "Test Тест" "\124\145\163\164\040\320\242\320\265\321\201\321\202" -test_commit_utf8_checkout_other "UTF-16LE" "Test Тест" "\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004" -test_commit_utf8_checkout_other "UTF-16BE" "Test Тест" "\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102" -test_commit_utf8_checkout_other "UTF-16LE-BOM" "Test Тест" "\377\376\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004" -test_commit_utf8_checkout_other "UTF-16BE-BOM" "Test Тест" "\376\377\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102" -test_commit_utf8_checkout_other "UTF-32LE" "Test Тест" "\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\000\042\004\000\000\065\004\000\000\101\004\000\000\102\004\000\000" -test_commit_utf8_checkout_other "UTF-32BE" "Test Тест" "\000\000\000\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\004\042\000\000\004\065\000\000\004\101\000\000\004\102" - test_done diff --git a/third_party/git/t/t0040-parse-options.sh b/third_party/git/t/t0040-parse-options.sh index 3483b72db4..cebc77fab0 100755 --- a/third_party/git/t/t0040-parse-options.sh +++ b/third_party/git/t/t0040-parse-options.sh @@ -23,8 +23,6 @@ usage: test-tool parse-options <options> -j <n> get a integer, too -m, --magnitude <n> get a magnitude --set23 set integer to 23 - --mode1 set integer to 1 (cmdmode option) - --mode2 set integer to 2 (cmdmode option) -L, --length <str> get length of <str> -F, --file <file> set file to <file> @@ -244,7 +242,7 @@ test_expect_success 'Alias options do not contribute to abbreviation' ' ' cat >typo.err <<\EOF -error: did you mean `--boolean` (with two dashes)? +error: did you mean `--boolean` (with two dashes ?) EOF test_expect_success 'detect possible typos' ' @@ -254,7 +252,7 @@ test_expect_success 'detect possible typos' ' ' cat >typo.err <<\EOF -error: did you mean `--ambiguous` (with two dashes)? +error: did you mean `--ambiguous` (with two dashes ?) EOF test_expect_success 'detect possible typos' ' @@ -326,22 +324,6 @@ test_expect_success 'OPT_NEGBIT() works' ' test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4 ' -test_expect_success 'OPT_CMDMODE() works' ' - test-tool parse-options --expect="integer: 1" --mode1 -' - -test_expect_success 'OPT_CMDMODE() detects incompatibility' ' - test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err && - test_must_be_empty output && - test_i18ngrep "incompatible with --mode" output.err -' - -test_expect_success 'OPT_CMDMODE() detects incompatibility with something else' ' - test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err && - test_must_be_empty output && - test_i18ngrep "incompatible with something else" output.err -' - test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' ' test-tool parse-options --expect="boolean: 6" + + + + + + ' @@ -417,11 +399,4 @@ test_expect_success 'GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS works' ' test-tool parse-options --ye ' -test_expect_success '--end-of-options treats remainder as args' ' - test-tool parse-options \ - --expect="verbose: -1" \ - --expect="arg 00: --verbose" \ - --end-of-options --verbose -' - test_done diff --git a/third_party/git/t/t0050-filesystem.sh b/third_party/git/t/t0050-filesystem.sh index 608673fb77..192c94eccd 100755 --- a/third_party/git/t/t0050-filesystem.sh +++ b/third_party/git/t/t0050-filesystem.sh @@ -131,24 +131,4 @@ $test_unicode 'merge (silent unicode normalization)' ' git merge topic ' -test_expect_success CASE_INSENSITIVE_FS 'checkout with no pathspec and a case insensitive fs' ' - git init repo && - ( - cd repo && - - >Gitweb && - git add Gitweb && - git commit -m "add Gitweb" && - - git checkout --orphan todo && - git reset --hard && - mkdir -p gitweb/subdir && - >gitweb/subdir/file && - git add gitweb && - git commit -m "add gitweb/subdir/file" && - - git checkout master - ) -' - test_done diff --git a/third_party/git/t/t0060-path-utils.sh b/third_party/git/t/t0060-path-utils.sh index 2ea2d00c39..c7b53e494b 100755 --- a/third_party/git/t/t0060-path-utils.sh +++ b/third_party/git/t/t0060-path-utils.sh @@ -165,15 +165,6 @@ test_expect_success 'absolute path rejects the empty string' ' test_must_fail test-tool path-utils absolute_path "" ' -test_expect_success MINGW '<drive-letter>:\\abc is an absolute path' ' - for letter in : \" C Z 1 ä - do - path=$letter:\\abc && - absolute="$(test-tool path-utils absolute_path "$path")" && - test "$path" = "$absolute" || return 1 - done -' - test_expect_success 'real path rejects the empty string' ' test_must_fail test-tool path-utils real_path "" ' @@ -294,13 +285,9 @@ test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2 test_expect_success 'setup common repository' 'git --git-dir=bar init' test_git_path GIT_COMMON_DIR=bar index .git/index -test_git_path GIT_COMMON_DIR=bar index.lock .git/index.lock test_git_path GIT_COMMON_DIR=bar HEAD .git/HEAD test_git_path GIT_COMMON_DIR=bar logs/HEAD .git/logs/HEAD -test_git_path GIT_COMMON_DIR=bar logs/HEAD.lock .git/logs/HEAD.lock test_git_path GIT_COMMON_DIR=bar logs/refs/bisect/foo .git/logs/refs/bisect/foo -test_git_path GIT_COMMON_DIR=bar logs/refs bar/logs/refs -test_git_path GIT_COMMON_DIR=bar logs/refs/ bar/logs/refs/ test_git_path GIT_COMMON_DIR=bar logs/refs/bisec/foo bar/logs/refs/bisec/foo test_git_path GIT_COMMON_DIR=bar logs/refs/bisec bar/logs/refs/bisec test_git_path GIT_COMMON_DIR=bar logs/refs/bisectfoo bar/logs/refs/bisectfoo @@ -436,9 +423,6 @@ test_expect_success 'match .gitmodules' ' ~1000000 \ ~9999999 \ \ - .gitmodules:\$DATA \ - "gitmod~4 . :\$DATA" \ - \ --not \ ".gitmodules x" \ ".gitmodules .x" \ @@ -463,34 +447,7 @@ test_expect_success 'match .gitmodules' ' \ GI7EB~1 \ GI7EB~01 \ - GI7EB~1X \ - \ - .gitmodules,:\$DATA -' - -test_expect_success MINGW 'is_valid_path() on Windows' ' - test-tool path-utils is_valid_path \ - win32 \ - "win32 x" \ - ../hello.txt \ - C:\\git \ - comm \ - conout.c \ - lptN \ - \ - --not \ - "win32 " \ - "win32 /x " \ - "win32." \ - "win32 . ." \ - .../hello.txt \ - colon:test \ - "AUX.c" \ - "abc/conOut\$ .xyz/test" \ - lpt8 \ - "lpt*" \ - Nul \ - "PRN./abc" + GI7EB~1X ' test_done diff --git a/third_party/git/t/t0061-run-command.sh b/third_party/git/t/t0061-run-command.sh index 7d599675e3..015fac8b5d 100755 --- a/third_party/git/t/t0061-run-command.sh +++ b/third_party/git/t/t0061-run-command.sh @@ -12,10 +12,6 @@ cat >hello-script <<-EOF cat hello-script EOF -test_expect_success MINGW 'subprocess inherits only std handles' ' - test-tool run-command inherited-handle -' - test_expect_success 'start_command reports ENOENT (slash)' ' test-tool run-command start-command-ENOENT ./does-not-exist 2>err && test_i18ngrep "\./does-not-exist" err @@ -214,23 +210,10 @@ test_expect_success MINGW 'verify curlies are quoted properly' ' test_cmp expect actual ' -test_expect_success MINGW 'can spawn .bat with argv[0] containing spaces' ' - bat="$TRASH_DIRECTORY/bat with spaces in name.bat" && - - # Every .bat invocation will log its arguments to file "out" - rm -f out && - echo "echo %* >>out" >"$bat" && - - # Ask git to invoke .bat; clone will fail due to fake SSH helper - test_must_fail env GIT_SSH="$bat" git clone myhost:src ssh-clone && - - # Spawning .bat can fail if there are two quoted cmd.exe arguments. - # .bat itself is first (due to spaces in name), so just one more is - # needed to verify. GIT_SSH will invoke .bat multiple times: - # 1) -G myhost - # 2) myhost "git-upload-pack src" - # First invocation will always succeed. Test the second one. - grep "git-upload-pack" out +test_expect_success MINGW 'can spawn with argv[0] containing spaces' ' + cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" ./ && + test_must_fail "$PWD/test-fake-ssh$X" 2>err && + grep TRASH_DIRECTORY err ' test_done diff --git a/third_party/git/t/t0067-parse_pathspec_file.sh b/third_party/git/t/t0067-parse_pathspec_file.sh deleted file mode 100755 index 7bab49f361..0000000000 --- a/third_party/git/t/t0067-parse_pathspec_file.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh - -test_description='Test parse_pathspec_file()' - -. ./test-lib.sh - -test_expect_success 'one item from stdin' ' - cat >expect <<-\EOF && - fileA.t - EOF - - echo fileA.t | - test-tool parse-pathspec-file --pathspec-from-file=- >actual && - - test_cmp expect actual -' - -test_expect_success 'one item from file' ' - cat >expect <<-\EOF && - fileA.t - EOF - - echo fileA.t >list && - test-tool parse-pathspec-file --pathspec-from-file=list >actual && - - test_cmp expect actual -' - -test_expect_success 'NUL delimiters' ' - cat >expect <<-\EOF && - fileA.t - fileB.t - EOF - - printf "fileA.t\0fileB.t\0" | - test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual && - - test_cmp expect actual -' - -test_expect_success 'LF delimiters' ' - cat >expect <<-\EOF && - fileA.t - fileB.t - EOF - - printf "fileA.t\nfileB.t\n" | - test-tool parse-pathspec-file --pathspec-from-file=- >actual && - - test_cmp expect actual -' - -test_expect_success 'no trailing delimiter' ' - cat >expect <<-\EOF && - fileA.t - fileB.t - EOF - - printf "fileA.t\nfileB.t" | - test-tool parse-pathspec-file --pathspec-from-file=- >actual && - - test_cmp expect actual -' - -test_expect_success 'CRLF delimiters' ' - cat >expect <<-\EOF && - fileA.t - fileB.t - EOF - - printf "fileA.t\r\nfileB.t\r\n" | - test-tool parse-pathspec-file --pathspec-from-file=- >actual && - - test_cmp expect actual -' - -test_expect_success 'quotes' ' - cat >expect <<-\EOF && - fileA.t - EOF - - cat >list <<-\EOF && - "file\101.t" - EOF - - test-tool parse-pathspec-file --pathspec-from-file=list >actual && - - test_cmp expect actual -' - -test_expect_success '--pathspec-file-nul takes quotes literally' ' - # Note: there is an extra newline because --pathspec-file-nul takes - # input \n literally, too - cat >expect <<-\EOF && - "file\101.t" - - EOF - - cat >list <<-\EOF && - "file\101.t" - EOF - - test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual && - - test_cmp expect actual -' - -test_done diff --git a/third_party/git/t/t0090-cache-tree.sh b/third_party/git/t/t0090-cache-tree.sh index 5a633690bf..ce9a4a5f32 100755 --- a/third_party/git/t/t0090-cache-tree.sh +++ b/third_party/git/t/t0090-cache-tree.sh @@ -21,10 +21,9 @@ generate_expected_cache_tree_rec () { parent="$2" && # ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux # We want to count only foo because it's the only direct child - git ls-files >files && - subtrees=$(grep / files|cut -d / -f 1|uniq) && + subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) && subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') && - entries=$(wc -l <files) && + entries=$(git ls-files|wc -l) && printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" && for subtree in $subtrees do diff --git a/third_party/git/t/t0211-trace2-perf.sh b/third_party/git/t/t0211-trace2-perf.sh index 6ee8ee3b67..2c3ad6e8c1 100755 --- a/third_party/git/t/t0211-trace2-perf.sh +++ b/third_party/git/t/t0211-trace2-perf.sh @@ -130,11 +130,11 @@ test_expect_success 'perf stream, child processes' ' d0|main|version|||||$V d0|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 004child test-tool trace2 001return 0 d0|main|cmd_name|||||trace2 (trace2) - d0|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 004child test-tool trace2 001return 0] + d0|main|child_start||_T_ABS_|||[ch0] class:? argv: test-tool trace2 004child test-tool trace2 001return 0 d1|main|version|||||$V d1|main|start||_T_ABS_|||_EXE_ trace2 004child test-tool trace2 001return 0 d1|main|cmd_name|||||trace2 (trace2/trace2) - d1|main|child_start||_T_ABS_|||[ch0] class:? argv:[test-tool trace2 001return 0] + d1|main|child_start||_T_ABS_|||[ch0] class:? argv: test-tool trace2 001return 0 d2|main|version|||||$V d2|main|start||_T_ABS_|||_EXE_ trace2 001return 0 d2|main|cmd_name|||||trace2 (trace2/trace2/trace2) diff --git a/third_party/git/t/t0212-trace2-event.sh b/third_party/git/t/t0212-trace2-event.sh index 7065a1b937..ff5b9cc729 100755 --- a/third_party/git/t/t0212-trace2-event.sh +++ b/third_party/git/t/t0212-trace2-event.sh @@ -265,23 +265,4 @@ test_expect_success JSON_PP 'using global config, event stream, error event' ' test_cmp expect actual ' -test_expect_success 'discard traces when there are too many files' ' - mkdir trace_target_dir && - test_when_finished "rm -r trace_target_dir" && - ( - GIT_TRACE2_MAX_FILES=5 && - export GIT_TRACE2_MAX_FILES && - cd trace_target_dir && - test_seq $GIT_TRACE2_MAX_FILES >../expected_filenames.txt && - xargs touch <../expected_filenames.txt && - cd .. && - GIT_TRACE2_EVENT="$(pwd)/trace_target_dir" test-tool trace2 001return 0 - ) && - echo git-trace2-discard >>expected_filenames.txt && - ls trace_target_dir >ls_output.txt && - test_cmp expected_filenames.txt ls_output.txt && - head -n1 trace_target_dir/git-trace2-discard | grep \"event\":\"version\" && - head -n2 trace_target_dir/git-trace2-discard | tail -n1 | grep \"event\":\"too_many_files\" -' - test_done diff --git a/third_party/git/t/t0300-credentials.sh b/third_party/git/t/t0300-credentials.sh index 5555a1524f..82eaaea0f4 100755 --- a/third_party/git/t/t0300-credentials.sh +++ b/third_party/git/t/t0300-credentials.sh @@ -22,11 +22,6 @@ test_expect_success 'setup helper scripts' ' exit 0 EOF - write_script git-credential-quit <<-\EOF && - . ./dump - echo quit=1 - EOF - write_script git-credential-verbatim <<-\EOF && user=$1; shift pass=$1; shift @@ -40,71 +35,43 @@ test_expect_success 'setup helper scripts' ' test_expect_success 'credential_fill invokes helper' ' check fill "verbatim foo bar" <<-\EOF - protocol=http - host=example.com -- - protocol=http - host=example.com username=foo password=bar -- verbatim: get - verbatim: protocol=http - verbatim: host=example.com EOF ' test_expect_success 'credential_fill invokes multiple helpers' ' check fill useless "verbatim foo bar" <<-\EOF - protocol=http - host=example.com -- - protocol=http - host=example.com username=foo password=bar -- useless: get - useless: protocol=http - useless: host=example.com verbatim: get - verbatim: protocol=http - verbatim: host=example.com EOF ' test_expect_success 'credential_fill stops when we get a full response' ' check fill "verbatim one two" "verbatim three four" <<-\EOF - protocol=http - host=example.com -- - protocol=http - host=example.com username=one password=two -- verbatim: get - verbatim: protocol=http - verbatim: host=example.com EOF ' test_expect_success 'credential_fill continues through partial response' ' check fill "verbatim one \"\"" "verbatim two three" <<-\EOF - protocol=http - host=example.com -- - protocol=http - host=example.com username=two password=three -- verbatim: get - verbatim: protocol=http - verbatim: host=example.com verbatim: get - verbatim: protocol=http - verbatim: host=example.com verbatim: username=one EOF ' @@ -130,20 +97,14 @@ test_expect_success 'credential_fill passes along metadata' ' test_expect_success 'credential_approve calls all helpers' ' check approve useless "verbatim one two" <<-\EOF - protocol=http - host=example.com username=foo password=bar -- -- useless: store - useless: protocol=http - useless: host=example.com useless: username=foo useless: password=bar verbatim: store - verbatim: protocol=http - verbatim: host=example.com verbatim: username=foo verbatim: password=bar EOF @@ -151,8 +112,6 @@ test_expect_success 'credential_approve calls all helpers' ' test_expect_success 'do not bother storing password-less credential' ' check approve useless <<-\EOF - protocol=http - host=example.com username=foo -- -- @@ -162,20 +121,14 @@ test_expect_success 'do not bother storing password-less credential' ' test_expect_success 'credential_reject calls all helpers' ' check reject useless "verbatim one two" <<-\EOF - protocol=http - host=example.com username=foo password=bar -- -- useless: erase - useless: protocol=http - useless: host=example.com useless: username=foo useless: password=bar verbatim: erase - verbatim: protocol=http - verbatim: host=example.com verbatim: username=foo verbatim: password=bar EOF @@ -183,49 +136,33 @@ test_expect_success 'credential_reject calls all helpers' ' test_expect_success 'usernames can be preserved' ' check fill "verbatim \"\" three" <<-\EOF - protocol=http - host=example.com username=one -- - protocol=http - host=example.com username=one password=three -- verbatim: get - verbatim: protocol=http - verbatim: host=example.com verbatim: username=one EOF ' test_expect_success 'usernames can be overridden' ' check fill "verbatim two three" <<-\EOF - protocol=http - host=example.com username=one -- - protocol=http - host=example.com username=two password=three -- verbatim: get - verbatim: protocol=http - verbatim: host=example.com verbatim: username=one EOF ' test_expect_success 'do not bother completing already-full credential' ' check fill "verbatim three four" <<-\EOF - protocol=http - host=example.com username=one password=two -- - protocol=http - host=example.com username=one password=two -- @@ -237,31 +174,23 @@ test_expect_success 'do not bother completing already-full credential' ' # askpass helper is run, we know the internal getpass is working. test_expect_success 'empty helper list falls back to internal getpass' ' check fill <<-\EOF - protocol=http - host=example.com -- - protocol=http - host=example.com username=askpass-username password=askpass-password -- - askpass: Username for '\''http://example.com'\'': - askpass: Password for '\''http://askpass-username@example.com'\'': + askpass: Username: + askpass: Password: EOF ' test_expect_success 'internal getpass does not ask for known username' ' check fill <<-\EOF - protocol=http - host=example.com username=foo -- - protocol=http - host=example.com username=foo password=askpass-password -- - askpass: Password for '\''http://foo@example.com'\'': + askpass: Password: EOF ' @@ -273,11 +202,7 @@ HELPER="!f() { test_expect_success 'respect configured credentials' ' test_config credential.helper "$HELPER" && check fill <<-\EOF - protocol=http - host=example.com -- - protocol=http - host=example.com username=foo password=bar -- @@ -315,57 +240,6 @@ test_expect_success 'do not match configured credential' ' EOF ' -test_expect_success 'match multiple configured helpers' ' - test_config credential.helper "verbatim \"\" \"\"" && - test_config credential.https://example.com.helper "$HELPER" && - check fill <<-\EOF - protocol=https - host=example.com - path=repo.git - -- - protocol=https - host=example.com - username=foo - password=bar - -- - verbatim: get - verbatim: protocol=https - verbatim: host=example.com - EOF -' - -test_expect_success 'match multiple configured helpers with URLs' ' - test_config credential.https://example.com/repo.git.helper "verbatim \"\" \"\"" && - test_config credential.https://example.com.helper "$HELPER" && - check fill <<-\EOF - protocol=https - host=example.com - path=repo.git - -- - protocol=https - host=example.com - username=foo - password=bar - -- - verbatim: get - verbatim: protocol=https - verbatim: host=example.com - EOF -' - -test_expect_success 'match percent-encoded values' ' - test_config credential.https://example.com/%2566.git.helper "$HELPER" && - check fill <<-\EOF - url=https://example.com/%2566.git - -- - protocol=https - host=example.com - username=foo - password=bar - -- - EOF -' - test_expect_success 'pull username from config' ' test_config credential.https://example.com.username foo && check fill <<-\EOF @@ -381,63 +255,6 @@ test_expect_success 'pull username from config' ' EOF ' -test_expect_success 'honors username from URL over helper (URL)' ' - test_config credential.https://example.com.username bob && - test_config credential.https://example.com.helper "verbatim \"\" bar" && - check fill <<-\EOF - url=https://alice@example.com - -- - protocol=https - host=example.com - username=alice - password=bar - -- - verbatim: get - verbatim: protocol=https - verbatim: host=example.com - verbatim: username=alice - EOF -' - -test_expect_success 'honors username from URL over helper (components)' ' - test_config credential.https://example.com.username bob && - test_config credential.https://example.com.helper "verbatim \"\" bar" && - check fill <<-\EOF - protocol=https - host=example.com - username=alice - -- - protocol=https - host=example.com - username=alice - password=bar - -- - verbatim: get - verbatim: protocol=https - verbatim: host=example.com - verbatim: username=alice - EOF -' - -test_expect_success 'last matching username wins' ' - test_config credential.https://example.com/path.git.username bob && - test_config credential.https://example.com.username alice && - test_config credential.https://example.com.helper "verbatim \"\" bar" && - check fill <<-\EOF - url=https://example.com/path.git - -- - protocol=https - host=example.com - username=alice - password=bar - -- - verbatim: get - verbatim: protocol=https - verbatim: host=example.com - verbatim: username=alice - EOF -' - test_expect_success 'http paths can be part of context' ' check fill "verbatim foo bar" <<-\EOF && protocol=https @@ -472,107 +289,23 @@ test_expect_success 'http paths can be part of context' ' EOF ' -test_expect_success 'context uses urlmatch' ' - test_config "credential.https://*.org.useHttpPath" true && - check fill "verbatim foo bar" <<-\EOF - protocol=https - host=example.org - path=foo.git - -- - protocol=https - host=example.org - path=foo.git - username=foo - password=bar - -- - verbatim: get - verbatim: protocol=https - verbatim: host=example.org - verbatim: path=foo.git - EOF -' - test_expect_success 'helpers can abort the process' ' test_must_fail git \ - -c credential.helper=quit \ + -c credential.helper="!f() { echo quit=1; }; f" \ -c credential.helper="verbatim foo bar" \ - credential fill >stdout 2>stderr <<-\EOF && - protocol=http - host=example.com - EOF - test_must_be_empty stdout && - cat >expect <<-\EOF && - quit: get - quit: protocol=http - quit: host=example.com - fatal: credential helper '\''quit'\'' told us to quit - EOF - test_i18ncmp expect stderr + credential fill >stdout && + test_must_be_empty stdout ' test_expect_success 'empty helper spec resets helper list' ' test_config credential.helper "verbatim file file" && check fill "" "verbatim cmdline cmdline" <<-\EOF - protocol=http - host=example.com -- - protocol=http - host=example.com username=cmdline password=cmdline -- verbatim: get - verbatim: protocol=http - verbatim: host=example.com - EOF -' - -test_expect_success 'url parser rejects embedded newlines' ' - test_must_fail git credential fill 2>stderr <<-\EOF && - url=https://one.example.com?%0ahost=two.example.com/ - EOF - cat >expect <<-\EOF && - warning: url contains a newline in its host component: https://one.example.com?%0ahost=two.example.com/ - fatal: credential url cannot be parsed: https://one.example.com?%0ahost=two.example.com/ - EOF - test_i18ncmp expect stderr -' - -test_expect_success 'host-less URLs are parsed as empty host' ' - check fill "verbatim foo bar" <<-\EOF - url=cert:///path/to/cert.pem - -- - protocol=cert - host= - path=path/to/cert.pem - username=foo - password=bar - -- - verbatim: get - verbatim: protocol=cert - verbatim: host= - verbatim: path=path/to/cert.pem - EOF -' - -test_expect_success 'credential system refuses to work with missing host' ' - test_must_fail git credential fill 2>stderr <<-\EOF && - protocol=http - EOF - cat >expect <<-\EOF && - fatal: refusing to work with credential missing host field - EOF - test_i18ncmp expect stderr -' - -test_expect_success 'credential system refuses to work with missing protocol' ' - test_must_fail git credential fill 2>stderr <<-\EOF && - host=example.com - EOF - cat >expect <<-\EOF && - fatal: refusing to work with credential missing protocol field EOF - test_i18ncmp expect stderr ' test_done diff --git a/third_party/git/t/t0410-partial-clone.sh b/third_party/git/t/t0410-partial-clone.sh index a3988bd4b8..5bd892f2f7 100755 --- a/third_party/git/t/t0410-partial-clone.sh +++ b/third_party/git/t/t0410-partial-clone.sh @@ -26,7 +26,7 @@ promise_and_delete () { test_expect_success 'extensions.partialclone without filter' ' test_create_repo server && git clone --filter="blob:none" "file://$(pwd)/server" client && - git -C client config --unset remote.origin.partialclonefilter && + git -C client config --unset core.partialclonefilter && git -C client fetch origin ' @@ -166,9 +166,8 @@ test_expect_success 'fetching of missing objects' ' # associated packfile contains the object ls repo/.git/objects/pack/pack-*.promisor >promisorlist && test_line_count = 1 promisorlist && - IDX=$(sed "s/promisor$/idx/" promisorlist) && - git verify-pack --verbose "$IDX" >out && - grep "$HASH" out + IDX=$(cat promisorlist | sed "s/promisor$/idx/") && + git verify-pack --verbose "$IDX" | grep "$HASH" ' test_expect_success 'fetching of missing objects works with ref-in-want enabled' ' @@ -183,55 +182,8 @@ test_expect_success 'fetching of missing objects works with ref-in-want enabled' grep "git< fetch=.*ref-in-want" trace ' -test_expect_success 'fetching of missing objects from another promisor remote' ' - git clone "file://$(pwd)/server" server2 && - test_commit -C server2 bar && - git -C server2 repack -a -d --write-bitmap-index && - HASH2=$(git -C server2 rev-parse bar) && - - git -C repo remote add server2 "file://$(pwd)/server2" && - git -C repo config remote.server2.promisor true && - git -C repo cat-file -p "$HASH2" && - - git -C repo fetch server2 && - rm -rf repo/.git/objects/* && - git -C repo cat-file -p "$HASH2" && - - # Ensure that the .promisor file is written, and check that its - # associated packfile contains the object - ls repo/.git/objects/pack/pack-*.promisor >promisorlist && - test_line_count = 1 promisorlist && - IDX=$(sed "s/promisor$/idx/" promisorlist) && - git verify-pack --verbose "$IDX" >out && - grep "$HASH2" out -' - -test_expect_success 'fetching of missing objects configures a promisor remote' ' - git clone "file://$(pwd)/server" server3 && - test_commit -C server3 baz && - git -C server3 repack -a -d --write-bitmap-index && - HASH3=$(git -C server3 rev-parse baz) && - git -C server3 config uploadpack.allowfilter 1 && - - rm repo/.git/objects/pack/pack-*.promisor && - - git -C repo remote add server3 "file://$(pwd)/server3" && - git -C repo fetch --filter="blob:none" server3 $HASH3 && - - test_cmp_config -C repo true remote.server3.promisor && - - # Ensure that the .promisor file is written, and check that its - # associated packfile contains the object - ls repo/.git/objects/pack/pack-*.promisor >promisorlist && - test_line_count = 1 promisorlist && - IDX=$(sed "s/promisor$/idx/" promisorlist) && - git verify-pack --verbose "$IDX" >out && - grep "$HASH3" out -' - test_expect_success 'fetching of missing blobs works' ' - rm -rf server server2 repo && - rm -rf server server3 repo && + rm -rf server repo && test_create_repo server && test_commit -C server foo && git -C server repack -a -d --write-bitmap-index && @@ -282,7 +234,7 @@ test_expect_success 'rev-list stops traversal at missing and promised commit' ' git -C repo config core.repositoryformatversion 1 && git -C repo config extensions.partialclone "arbitrary string" && - GIT_TEST_COMMIT_GRAPH=0 git -C repo -c core.commitGraph=false rev-list --exclude-promisor-objects --objects bar >out && + GIT_TEST_COMMIT_GRAPH=0 git -C repo rev-list --exclude-promisor-objects --objects bar >out && grep $(git -C repo rev-parse bar) out && ! grep $FOO out ' @@ -429,19 +381,6 @@ test_expect_success 'rev-list dies for missing objects on cmd line' ' done ' -test_expect_success 'single promisor remote can be re-initialized gracefully' ' - # ensure one promisor is in the promisors list - rm -rf repo && - test_create_repo repo && - test_create_repo other && - git -C repo remote add foo "file://$(pwd)/other" && - git -C repo config remote.foo.promisor true && - git -C repo config extensions.partialclone foo && - - # reinitialize the promisors list - git -C repo fetch --filter=blob:none foo -' - test_expect_success 'gc repacks promisor objects separately from non-promisor objects' ' rm -rf repo && test_create_repo repo && @@ -553,20 +492,6 @@ test_expect_success 'gc stops traversal when a missing but promised object is re ! grep "$TREE_HASH" out ' -test_expect_success 'do not fetch when checking existence of tree we construct ourselves' ' - rm -rf repo && - test_create_repo repo && - test_commit -C repo base && - test_commit -C repo side1 && - git -C repo checkout base && - test_commit -C repo side2 && - - git -C repo config core.repositoryformatversion 1 && - git -C repo config extensions.partialclone "arbitrary string" && - - git -C repo cherry-pick side1 -' - . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd @@ -589,12 +514,8 @@ test_expect_success 'fetching of missing objects from an HTTP server' ' # associated packfile contains the object ls repo/.git/objects/pack/pack-*.promisor >promisorlist && test_line_count = 1 promisorlist && - IDX=$(sed "s/promisor$/idx/" promisorlist) && - git verify-pack --verbose "$IDX" >out && - grep "$HASH" out + IDX=$(cat promisorlist | sed "s/promisor$/idx/") && + git verify-pack --verbose "$IDX" | grep "$HASH" ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t0500-progress-display.sh b/third_party/git/t/t0500-progress-display.sh deleted file mode 100755 index d2d088d9a0..0000000000 --- a/third_party/git/t/t0500-progress-display.sh +++ /dev/null @@ -1,286 +0,0 @@ -#!/bin/sh - -test_description='progress display' - -. ./test-lib.sh - -show_cr () { - tr '\015' Q | sed -e "s/Q/<CR>\\$LF/g" -} - -test_expect_success 'simple progress display' ' - cat >expect <<-\EOF && - Working hard: 1<CR> - Working hard: 2<CR> - Working hard: 5<CR> - Working hard: 5, done. - EOF - - cat >in <<-\EOF && - update - progress 1 - update - progress 2 - progress 3 - progress 4 - update - progress 5 - EOF - test-tool progress "Working hard" <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'progress display with total' ' - cat >expect <<-\EOF && - Working hard: 33% (1/3)<CR> - Working hard: 66% (2/3)<CR> - Working hard: 100% (3/3)<CR> - Working hard: 100% (3/3), done. - EOF - - cat >in <<-\EOF && - progress 1 - progress 2 - progress 3 - EOF - test-tool progress --total=3 "Working hard" <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'progress display breaks long lines #1' ' - sed -e "s/Z$//" >expect <<\EOF && -Working hard.......2.........3.........4.........5.........6: 0% (100/100000)<CR> -Working hard.......2.........3.........4.........5.........6: 1% (1000/100000)<CR> -Working hard.......2.........3.........4.........5.........6: Z - 10% (10000/100000)<CR> - 100% (100000/100000)<CR> - 100% (100000/100000), done. -EOF - - cat >in <<-\EOF && - progress 100 - progress 1000 - progress 10000 - progress 100000 - EOF - test-tool progress --total=100000 \ - "Working hard.......2.........3.........4.........5.........6" \ - <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'progress display breaks long lines #2' ' - # Note: we do not need that many spaces after the title to cover up - # the last line before breaking the progress line. - sed -e "s/Z$//" >expect <<\EOF && -Working hard.......2.........3.........4.........5.........6: 0% (1/100000)<CR> -Working hard.......2.........3.........4.........5.........6: 0% (2/100000)<CR> -Working hard.......2.........3.........4.........5.........6: Z - 10% (10000/100000)<CR> - 100% (100000/100000)<CR> - 100% (100000/100000), done. -EOF - - cat >in <<-\EOF && - update - progress 1 - update - progress 2 - progress 10000 - progress 100000 - EOF - test-tool progress --total=100000 \ - "Working hard.......2.........3.........4.........5.........6" \ - <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'progress display breaks long lines #3 - even the first is too long' ' - # Note: we do not actually need any spaces at the end of the title - # line, because there is no previous progress line to cover up. - sed -e "s/Z$//" >expect <<\EOF && -Working hard.......2.........3.........4.........5.........6: Z - 25% (25000/100000)<CR> - 50% (50000/100000)<CR> - 75% (75000/100000)<CR> - 100% (100000/100000)<CR> - 100% (100000/100000), done. -EOF - - cat >in <<-\EOF && - progress 25000 - progress 50000 - progress 75000 - progress 100000 - EOF - test-tool progress --total=100000 \ - "Working hard.......2.........3.........4.........5.........6" \ - <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'progress display breaks long lines #4 - title line matches terminal width' ' - cat >expect <<\EOF && -Working hard.......2.........3.........4.........5.........6.........7.........: - 25% (25000/100000)<CR> - 50% (50000/100000)<CR> - 75% (75000/100000)<CR> - 100% (100000/100000)<CR> - 100% (100000/100000), done. -EOF - - cat >in <<-\EOF && - progress 25000 - progress 50000 - progress 75000 - progress 100000 - EOF - test-tool progress --total=100000 \ - "Working hard.......2.........3.........4.........5.........6.........7........." \ - <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -# Progress counter goes backwards, this should not happen in practice. -test_expect_success 'progress shortens - crazy caller' ' - cat >expect <<-\EOF && - Working hard: 10% (100/1000)<CR> - Working hard: 20% (200/1000)<CR> - Working hard: 0% (1/1000) <CR> - Working hard: 100% (1000/1000)<CR> - Working hard: 100% (1000/1000), done. - EOF - - cat >in <<-\EOF && - progress 100 - progress 200 - progress 1 - progress 1000 - EOF - test-tool progress --total=1000 "Working hard" <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'progress display with throughput' ' - cat >expect <<-\EOF && - Working hard: 10<CR> - Working hard: 20, 200.00 KiB | 100.00 KiB/s<CR> - Working hard: 30, 300.00 KiB | 100.00 KiB/s<CR> - Working hard: 40, 400.00 KiB | 100.00 KiB/s<CR> - Working hard: 40, 400.00 KiB | 100.00 KiB/s, done. - EOF - - cat >in <<-\EOF && - throughput 102400 1000 - update - progress 10 - throughput 204800 2000 - update - progress 20 - throughput 307200 3000 - update - progress 30 - throughput 409600 4000 - update - progress 40 - EOF - test-tool progress "Working hard" <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'progress display with throughput and total' ' - cat >expect <<-\EOF && - Working hard: 25% (10/40)<CR> - Working hard: 50% (20/40), 200.00 KiB | 100.00 KiB/s<CR> - Working hard: 75% (30/40), 300.00 KiB | 100.00 KiB/s<CR> - Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s<CR> - Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s, done. - EOF - - cat >in <<-\EOF && - throughput 102400 1000 - progress 10 - throughput 204800 2000 - progress 20 - throughput 307200 3000 - progress 30 - throughput 409600 4000 - progress 40 - EOF - test-tool progress --total=40 "Working hard" <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'cover up after throughput shortens' ' - cat >expect <<-\EOF && - Working hard: 1<CR> - Working hard: 2, 800.00 KiB | 400.00 KiB/s<CR> - Working hard: 3, 1.17 MiB | 400.00 KiB/s <CR> - Working hard: 4, 1.56 MiB | 400.00 KiB/s<CR> - Working hard: 4, 1.56 MiB | 400.00 KiB/s, done. - EOF - - cat >in <<-\EOF && - throughput 409600 1000 - update - progress 1 - throughput 819200 2000 - update - progress 2 - throughput 1228800 3000 - update - progress 3 - throughput 1638400 4000 - update - progress 4 - EOF - test-tool progress "Working hard" <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_expect_success 'cover up after throughput shortens a lot' ' - cat >expect <<-\EOF && - Working hard: 1<CR> - Working hard: 2, 1000.00 KiB | 1000.00 KiB/s<CR> - Working hard: 3, 3.00 MiB | 1.50 MiB/s <CR> - Working hard: 3, 3.00 MiB | 1024.00 KiB/s, done. - EOF - - cat >in <<-\EOF && - throughput 1 1000 - update - progress 1 - throughput 1024000 2000 - update - progress 2 - throughput 3145728 3000 - update - progress 3 - EOF - test-tool progress "Working hard" <in 2>stderr && - - show_cr <stderr >out && - test_i18ncmp expect out -' - -test_done diff --git a/third_party/git/t/t1011-read-tree-sparse-checkout.sh b/third_party/git/t/t1011-read-tree-sparse-checkout.sh index eb44bafb59..ba71b159ba 100755 --- a/third_party/git/t/t1011-read-tree-sparse-checkout.sh +++ b/third_party/git/t/t1011-read-tree-sparse-checkout.sh @@ -215,6 +215,7 @@ test_expect_success 'read-tree adds to worktree, dirty case' ' ' test_expect_success 'index removal and worktree narrowing at the same time' ' + >empty && echo init.t >.git/info/sparse-checkout && echo sub/added >>.git/info/sparse-checkout && git checkout -f top && @@ -222,7 +223,7 @@ test_expect_success 'index removal and worktree narrowing at the same time' ' git checkout removed && git ls-files sub/added >result && test ! -f sub/added && - test_must_be_empty result + test_cmp empty result ' test_expect_success 'read-tree --reset removes outside worktree' ' diff --git a/third_party/git/t/t1014-read-tree-confusing.sh b/third_party/git/t/t1014-read-tree-confusing.sh index da3376b3bb..2f5a25d503 100755 --- a/third_party/git/t/t1014-read-tree-confusing.sh +++ b/third_party/git/t/t1014-read-tree-confusing.sh @@ -49,7 +49,6 @@ git~1 .git.SPACE .git.{space} .\\\\.GIT\\\\foobar backslashes .git\\\\foobar backslashes2 -.git...:alternate-stream EOF test_expect_success 'utf-8 paths allowed with core.protectHFS off' ' diff --git a/third_party/git/t/t1050-large.sh b/third_party/git/t/t1050-large.sh index 184b479a21..dcb4dbba67 100755 --- a/third_party/git/t/t1050-large.sh +++ b/third_party/git/t/t1050-large.sh @@ -53,8 +53,7 @@ test_expect_success 'add a large file or two' ' for p in .git/objects/pack/pack-*.pack do count=$(( $count + 1 )) - if test_path_is_file "$p" && - idx=${p%.pack}.idx && test_path_is_file "$idx" + if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx" then continue fi @@ -66,7 +65,7 @@ test_expect_success 'add a large file or two' ' test $cnt = 2 && for l in .git/objects/??/?????????????????????????????????????? do - test_path_is_file "$l" || continue + test -f "$l" || continue bad=t done && test -z "$bad" && @@ -77,8 +76,7 @@ test_expect_success 'add a large file or two' ' for p in .git/objects/pack/pack-*.pack do count=$(( $count + 1 )) - if test_path_is_file "$p" && - idx=${p%.pack}.idx && test_path_is_file "$idx" + if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx" then continue fi @@ -113,7 +111,7 @@ test_expect_success 'packsize limit' ' count=0 && for pi in .git/objects/pack/pack-*.idx do - test_path_is_file "$pi" && count=$(( $count + 1 )) + test -f "$pi" && count=$(( $count + 1 )) done && test $count = 2 && @@ -196,15 +194,15 @@ test_expect_success 'pack-objects with large loose object' ' test_cmp huge actual ' -test_expect_success 'tar archiving' ' +test_expect_success 'tar achiving' ' git archive --format=tar HEAD >/dev/null ' -test_expect_success 'zip archiving, store only' ' +test_expect_success 'zip achiving, store only' ' git archive --format=zip -0 HEAD >/dev/null ' -test_expect_success 'zip archiving, deflate' ' +test_expect_success 'zip achiving, deflate' ' git archive --format=zip HEAD >/dev/null ' diff --git a/third_party/git/t/t1091-sparse-checkout-builtin.sh b/third_party/git/t/t1091-sparse-checkout-builtin.sh deleted file mode 100755 index 44a91205d6..0000000000 --- a/third_party/git/t/t1091-sparse-checkout-builtin.sh +++ /dev/null @@ -1,524 +0,0 @@ -#!/bin/sh - -test_description='sparse checkout builtin tests' - -. ./test-lib.sh - -list_files() { - # Do not replace this with 'ls "$1"', as "ls" with BSD-lineage - # enables "-A" by default for root and ends up including ".git" and - # such in its output. (Note, though, that running the test suite as - # root is generally not recommended.) - (cd "$1" && printf '%s\n' *) -} - -check_files() { - list_files "$1" >actual && - shift && - printf "%s\n" $@ >expect && - test_cmp expect actual -} - -test_expect_success 'setup' ' - git init repo && - ( - cd repo && - echo "initial" >a && - mkdir folder1 folder2 deep && - mkdir deep/deeper1 deep/deeper2 && - mkdir deep/deeper1/deepest && - cp a folder1 && - cp a folder2 && - cp a deep && - cp a deep/deeper1 && - cp a deep/deeper2 && - cp a deep/deeper1/deepest && - git add . && - git commit -m "initial commit" - ) -' - -test_expect_success 'git sparse-checkout list (empty)' ' - git -C repo sparse-checkout list >list 2>err && - test_must_be_empty list && - test_i18ngrep "this worktree is not sparse (sparse-checkout file may not exist)" err -' - -test_expect_success 'git sparse-checkout list (populated)' ' - test_when_finished rm -f repo/.git/info/sparse-checkout && - cat >repo/.git/info/sparse-checkout <<-\EOF && - /folder1/* - /deep/ - **/a - !*bin* - EOF - cp repo/.git/info/sparse-checkout expect && - git -C repo sparse-checkout list >list && - test_cmp expect list -' - -test_expect_success 'git sparse-checkout init' ' - git -C repo sparse-checkout init && - cat >expect <<-\EOF && - /* - !/*/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - test_cmp_config -C repo true core.sparsecheckout && - check_files repo a -' - -test_expect_success 'git sparse-checkout list after init' ' - git -C repo sparse-checkout list >actual && - cat >expect <<-\EOF && - /* - !/*/ - EOF - test_cmp expect actual -' - -test_expect_success 'init with existing sparse-checkout' ' - echo "*folder*" >> repo/.git/info/sparse-checkout && - git -C repo sparse-checkout init && - cat >expect <<-\EOF && - /* - !/*/ - *folder* - EOF - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a folder1 folder2 -' - -test_expect_success 'clone --sparse' ' - git clone --sparse "file://$(pwd)/repo" clone && - git -C clone sparse-checkout list >actual && - cat >expect <<-\EOF && - /* - !/*/ - EOF - test_cmp expect actual && - check_files clone a -' - -test_expect_success 'set enables config' ' - git init empty-config && - ( - cd empty-config && - test_commit test file && - test_path_is_missing .git/config.worktree && - test_must_fail git sparse-checkout set nothing && - test_path_is_file .git/config.worktree && - test_must_fail git config core.sparseCheckout && - git sparse-checkout set "/*" && - test_cmp_config true core.sparseCheckout - ) -' - -test_expect_success 'set sparse-checkout using builtin' ' - git -C repo sparse-checkout set "/*" "!/*/" "*folder*" && - cat >expect <<-\EOF && - /* - !/*/ - *folder* - EOF - git -C repo sparse-checkout list >actual && - test_cmp expect actual && - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a folder1 folder2 -' - -test_expect_success 'set sparse-checkout using --stdin' ' - cat >expect <<-\EOF && - /* - !/*/ - /folder1/ - /folder2/ - EOF - git -C repo sparse-checkout set --stdin <expect && - git -C repo sparse-checkout list >actual && - test_cmp expect actual && - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo "a folder1 folder2" -' - -test_expect_success 'add to sparse-checkout' ' - cat repo/.git/info/sparse-checkout >expect && - cat >add <<-\EOF && - pattern1 - /folder1/ - pattern2 - EOF - cat add >>expect && - git -C repo sparse-checkout add --stdin <add && - git -C repo sparse-checkout list >actual && - test_cmp expect actual && - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo "a folder1 folder2" -' - -test_expect_success 'cone mode: match patterns' ' - git -C repo config --worktree core.sparseCheckoutCone true && - rm -rf repo/a repo/folder1 repo/folder2 && - git -C repo read-tree -mu HEAD 2>err && - test_i18ngrep ! "disabling cone patterns" err && - git -C repo reset --hard && - check_files repo a folder1 folder2 -' - -test_expect_success 'cone mode: warn on bad pattern' ' - test_when_finished mv sparse-checkout repo/.git/info/ && - cp repo/.git/info/sparse-checkout . && - echo "!/deep/deeper/*" >>repo/.git/info/sparse-checkout && - git -C repo read-tree -mu HEAD 2>err && - test_i18ngrep "unrecognized negative pattern" err -' - -test_expect_success 'sparse-checkout disable' ' - test_when_finished rm -rf repo/.git/info/sparse-checkout && - git -C repo sparse-checkout disable && - test_path_is_file repo/.git/info/sparse-checkout && - git -C repo config --list >config && - test_must_fail git config core.sparseCheckout && - check_files repo a deep folder1 folder2 -' - -test_expect_success 'cone mode: init and set' ' - git -C repo sparse-checkout init --cone && - git -C repo config --list >config && - test_i18ngrep "core.sparsecheckoutcone=true" config && - list_files repo >dir && - echo a >expect && - test_cmp expect dir && - git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err && - test_must_be_empty err && - check_files repo a deep && - check_files repo/deep a deeper1 && - check_files repo/deep/deeper1 a deepest && - cat >expect <<-\EOF && - /* - !/*/ - /deep/ - !/deep/*/ - /deep/deeper1/ - !/deep/deeper1/*/ - /deep/deeper1/deepest/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - git -C repo sparse-checkout set --stdin 2>err <<-\EOF && - folder1 - folder2 - EOF - test_must_be_empty err && - check_files repo a folder1 folder2 -' - -test_expect_success 'cone mode: list' ' - cat >expect <<-\EOF && - folder1 - folder2 - EOF - git -C repo sparse-checkout set --stdin <expect && - git -C repo sparse-checkout list >actual 2>err && - test_must_be_empty err && - test_cmp expect actual -' - -test_expect_success 'cone mode: set with nested folders' ' - git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err && - test_line_count = 0 err && - cat >expect <<-\EOF && - /* - !/*/ - /deep/ - EOF - test_cmp repo/.git/info/sparse-checkout expect -' - -test_expect_success 'cone mode: add independent path' ' - git -C repo sparse-checkout set deep/deeper1 && - git -C repo sparse-checkout add folder1 && - cat >expect <<-\EOF && - /* - !/*/ - /deep/ - !/deep/*/ - /deep/deeper1/ - /folder1/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a deep folder1 -' - -test_expect_success 'cone mode: add sibling path' ' - git -C repo sparse-checkout set deep/deeper1 && - git -C repo sparse-checkout add deep/deeper2 && - cat >expect <<-\EOF && - /* - !/*/ - /deep/ - !/deep/*/ - /deep/deeper1/ - /deep/deeper2/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a deep -' - -test_expect_success 'cone mode: add parent path' ' - git -C repo sparse-checkout set deep/deeper1 folder1 && - git -C repo sparse-checkout add deep && - cat >expect <<-\EOF && - /* - !/*/ - /deep/ - /folder1/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a deep folder1 -' - -test_expect_success 'revert to old sparse-checkout on bad update' ' - test_when_finished git -C repo reset --hard && - git -C repo sparse-checkout set deep && - echo update >repo/deep/deeper2/a && - cp repo/.git/info/sparse-checkout expect && - test_must_fail git -C repo sparse-checkout set deep/deeper1 2>err && - test_i18ngrep "cannot set sparse-checkout patterns" err && - test_cmp repo/.git/info/sparse-checkout expect && - check_files repo/deep a deeper1 deeper2 -' - -test_expect_success 'revert to old sparse-checkout on empty update' ' - git init empty-test && - ( - echo >file && - git add file && - git commit -m "test" && - test_must_fail git sparse-checkout set nothing 2>err && - test_i18ngrep "Sparse checkout leaves no entry on working directory" err && - test_i18ngrep ! ".git/index.lock" err && - git sparse-checkout set file - ) -' - -test_expect_success 'fail when lock is taken' ' - test_when_finished rm -rf repo/.git/info/sparse-checkout.lock && - touch repo/.git/info/sparse-checkout.lock && - test_must_fail git -C repo sparse-checkout set deep 2>err && - test_i18ngrep "Unable to create .*\.lock" err -' - -test_expect_success '.gitignore should not warn about cone mode' ' - git -C repo config --worktree core.sparseCheckoutCone true && - echo "**/bin/*" >repo/.gitignore && - git -C repo reset --hard 2>err && - test_i18ngrep ! "disabling cone patterns" err -' - -test_expect_success 'sparse-checkout (init|set|disable) fails with dirty status' ' - git clone repo dirty && - echo dirty >dirty/folder1/a && - test_must_fail git -C dirty sparse-checkout init && - test_must_fail git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* && - test_must_fail git -C dirty sparse-checkout disable && - git -C dirty reset --hard && - git -C dirty sparse-checkout init && - git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* && - git -C dirty sparse-checkout disable -' - -test_expect_success 'cone mode: set with core.ignoreCase=true' ' - git -C repo sparse-checkout init --cone && - git -C repo -c core.ignoreCase=true sparse-checkout set folder1 && - cat >expect <<-\EOF && - /* - !/*/ - /folder1/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a folder1 -' - -test_expect_success 'interaction with submodules' ' - git clone repo super && - ( - cd super && - mkdir modules && - git submodule add ../repo modules/child && - git add . && - git commit -m "add submodule" && - git sparse-checkout init --cone && - git sparse-checkout set folder1 - ) && - check_files super a folder1 modules && - check_files super/modules/child a deep folder1 folder2 -' - -test_expect_success 'different sparse-checkouts with worktrees' ' - git -C repo worktree add --detach ../worktree && - check_files worktree "a deep folder1 folder2" && - git -C worktree sparse-checkout init --cone && - git -C repo sparse-checkout set folder1 && - git -C worktree sparse-checkout set deep/deeper1 && - check_files repo a folder1 && - check_files worktree a deep -' - -test_expect_success 'set using filename keeps file on-disk' ' - git -C repo sparse-checkout set a deep && - cat >expect <<-\EOF && - /* - !/*/ - /a/ - /deep/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a deep -' - -check_read_tree_errors () { - REPO=$1 - FILES=$2 - ERRORS=$3 - git -C $REPO -c core.sparseCheckoutCone=false read-tree -mu HEAD 2>err && - test_must_be_empty err && - check_files $REPO "$FILES" && - git -C $REPO read-tree -mu HEAD 2>err && - if test -z "$ERRORS" - then - test_must_be_empty err - else - test_i18ngrep "$ERRORS" err - fi && - check_files $REPO $FILES -} - -test_expect_success 'pattern-checks: /A/**' ' - cat >repo/.git/info/sparse-checkout <<-\EOF && - /* - !/*/ - /folder1/** - EOF - check_read_tree_errors repo "a folder1" "disabling cone pattern matching" -' - -test_expect_success 'pattern-checks: /A/**/B/' ' - cat >repo/.git/info/sparse-checkout <<-\EOF && - /* - !/*/ - /deep/**/deepest - EOF - check_read_tree_errors repo "a deep" "disabling cone pattern matching" && - check_files repo/deep "deeper1" && - check_files repo/deep/deeper1 "deepest" -' - -test_expect_success 'pattern-checks: too short' ' - cat >repo/.git/info/sparse-checkout <<-\EOF && - /* - !/*/ - / - EOF - check_read_tree_errors repo "a" "disabling cone pattern matching" -' -test_expect_success 'pattern-checks: not too short' ' - cat >repo/.git/info/sparse-checkout <<-\EOF && - /* - !/*/ - /b/ - EOF - git -C repo read-tree -mu HEAD 2>err && - test_must_be_empty err && - check_files repo a -' - -test_expect_success 'pattern-checks: trailing "*"' ' - cat >repo/.git/info/sparse-checkout <<-\EOF && - /* - !/*/ - /a* - EOF - check_read_tree_errors repo "a" "disabling cone pattern matching" -' - -test_expect_success 'pattern-checks: starting "*"' ' - cat >repo/.git/info/sparse-checkout <<-\EOF && - /* - !/*/ - *eep/ - EOF - check_read_tree_errors repo "a deep" "disabling cone pattern matching" -' - -test_expect_success 'pattern-checks: contained glob characters' ' - for c in "[a]" "\\" "?" "*" - do - cat >repo/.git/info/sparse-checkout <<-EOF && - /* - !/*/ - something$c-else/ - EOF - check_read_tree_errors repo "a" "disabling cone pattern matching" - done -' - -test_expect_success BSLASHPSPEC 'pattern-checks: escaped characters' ' - git clone repo escaped && - TREEOID=$(git -C escaped rev-parse HEAD:folder1) && - NEWTREE=$(git -C escaped mktree <<-EOF - $(git -C escaped ls-tree HEAD) - 040000 tree $TREEOID zbad\\dir - 040000 tree $TREEOID zdoes*exist - 040000 tree $TREEOID zglob[!a]? - EOF - ) && - COMMIT=$(git -C escaped commit-tree $NEWTREE -p HEAD) && - git -C escaped reset --hard $COMMIT && - check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? && - git -C escaped sparse-checkout init --cone && - git -C escaped sparse-checkout set zbad\\dir/bogus "zdoes*not*exist" "zdoes*exist" "zglob[!a]?" && - cat >expect <<-\EOF && - /* - !/*/ - /zbad\\dir/ - !/zbad\\dir/*/ - /zbad\\dir/bogus/ - /zdoes\*exist/ - /zdoes\*not\*exist/ - /zglob\[!a]\?/ - EOF - test_cmp expect escaped/.git/info/sparse-checkout && - check_read_tree_errors escaped "a zbad\\dir zdoes*exist zglob[!a]?" && - git -C escaped ls-tree -d --name-only HEAD >list-expect && - git -C escaped sparse-checkout set --stdin <list-expect && - cat >expect <<-\EOF && - /* - !/*/ - /deep/ - /folder1/ - /folder2/ - /zbad\\dir/ - /zdoes\*exist/ - /zglob\[!a]\?/ - EOF - test_cmp expect escaped/.git/info/sparse-checkout && - check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? && - git -C escaped sparse-checkout list >list-actual && - test_cmp list-expect list-actual -' - -test_expect_success MINGW 'cone mode replaces backslashes with slashes' ' - git -C repo sparse-checkout set deep\\deeper1 && - cat >expect <<-\EOF && - /* - !/*/ - /deep/ - !/deep/*/ - /deep/deeper1/ - EOF - test_cmp expect repo/.git/info/sparse-checkout && - check_files repo a deep && - check_files repo/deep a deeper1 -' - -test_done diff --git a/third_party/git/t/t1300-config.sh b/third_party/git/t/t1300-config.sh index 97ebfe1f9d..428177c390 100755 --- a/third_party/git/t/t1300-config.sh +++ b/third_party/git/t/t1300-config.sh @@ -1191,47 +1191,47 @@ test_expect_success 'old-fashioned settings are case insensitive' ' test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" && cat >testConfig_actual <<-EOF && - [V.A] - r = value1 + [V.A] + r = value1 EOF q_to_tab >testConfig_expect <<-EOF && - [V.A] - Qr = value2 + [V.A] + Qr = value2 EOF git config -f testConfig_actual "v.a.r" value2 && test_cmp testConfig_expect testConfig_actual && cat >testConfig_actual <<-EOF && - [V.A] - r = value1 + [V.A] + r = value1 EOF q_to_tab >testConfig_expect <<-EOF && - [V.A] - QR = value2 + [V.A] + QR = value2 EOF git config -f testConfig_actual "V.a.R" value2 && test_cmp testConfig_expect testConfig_actual && cat >testConfig_actual <<-EOF && - [V.A] - r = value1 + [V.A] + r = value1 EOF q_to_tab >testConfig_expect <<-EOF && - [V.A] - r = value1 - Qr = value2 + [V.A] + r = value1 + Qr = value2 EOF git config -f testConfig_actual "V.A.r" value2 && test_cmp testConfig_expect testConfig_actual && cat >testConfig_actual <<-EOF && - [V.A] - r = value1 + [V.A] + r = value1 EOF q_to_tab >testConfig_expect <<-EOF && - [V.A] - r = value1 - Qr = value2 + [V.A] + r = value1 + Qr = value2 EOF git config -f testConfig_actual "v.A.r" value2 && test_cmp testConfig_expect testConfig_actual @@ -1241,26 +1241,26 @@ test_expect_success 'setting different case sensitive subsections ' ' test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" && cat >testConfig_actual <<-EOF && - [V "A"] - R = v1 - [K "E"] - Y = v1 - [a "b"] - c = v1 - [d "e"] - f = v1 + [V "A"] + R = v1 + [K "E"] + Y = v1 + [a "b"] + c = v1 + [d "e"] + f = v1 EOF q_to_tab >testConfig_expect <<-EOF && - [V "A"] - Qr = v2 - [K "E"] - Qy = v2 - [a "b"] - Qc = v2 - [d "e"] - f = v1 - [d "E"] - Qf = v2 + [V "A"] + Qr = v2 + [K "E"] + Qy = v2 + [a "b"] + Qc = v2 + [d "e"] + f = v1 + [d "E"] + Qf = v2 EOF # exact match git config -f testConfig_actual a.b.c v2 && @@ -1294,25 +1294,26 @@ test_expect_success 'git -c is not confused by empty environment' ' GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list ' +sq="'" test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' ' cat >expect <<-\EOF && env.one one env.two two EOF - GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ} ${SQ}env.two=two${SQ}" \ + GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq} ${sq}env.two=two${sq}" \ git config --get-regexp "env.*" >actual && test_cmp expect actual && cat >expect <<-EOF && - env.one one${SQ} + env.one one${sq} env.two two EOF - GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ$SQ$SQ ${SQ}env.two=two${SQ}" \ + GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq$sq$sq ${sq}env.two=two${sq}" \ git config --get-regexp "env.*" >actual && test_cmp expect actual && test_must_fail env \ - GIT_CONFIG_PARAMETERS="${SQ}env.one=one${SQ}\\$SQ ${SQ}env.two=two${SQ}" \ + GIT_CONFIG_PARAMETERS="${sq}env.one=one${sq}\\$sq ${sq}env.two=two${sq}" \ git config --get-regexp "env.*" ' @@ -1408,8 +1409,6 @@ test_expect_success 'urlmatch favors more specific URLs' ' cookieFile = /tmp/wildcard.txt [http "https://*.example.com/wildcardwithsubdomain"] cookieFile = /tmp/wildcardwithsubdomain.txt - [http "https://*.example.*"] - cookieFile = /tmp/multiwildcard.txt [http "https://trailing.example.com"] cookieFile = /tmp/trailing.txt [http "https://user@*.example.com/"] @@ -1456,10 +1455,6 @@ test_expect_success 'urlmatch favors more specific URLs' ' echo http.cookiefile /tmp/sub.txt >expect && git config --get-urlmatch HTTP https://user@sub.example.com >actual && - test_cmp expect actual && - - echo http.cookiefile /tmp/multiwildcard.txt >expect && - git config --get-urlmatch HTTP https://wildcard.example.org >actual && test_cmp expect actual ' @@ -1628,40 +1623,40 @@ test_expect_success 'set up --show-origin tests' ' INCLUDE_DIR="$HOME/include" && mkdir -p "$INCLUDE_DIR" && cat >"$INCLUDE_DIR"/absolute.include <<-\EOF && - [user] - absolute = include + [user] + absolute = include EOF cat >"$INCLUDE_DIR"/relative.include <<-\EOF && - [user] - relative = include + [user] + relative = include EOF cat >"$HOME"/.gitconfig <<-EOF && - [user] - global = true - override = global - [include] - path = "$INCLUDE_DIR/absolute.include" + [user] + global = true + override = global + [include] + path = "$INCLUDE_DIR/absolute.include" EOF cat >.git/config <<-\EOF - [user] - local = true - override = local - [include] - path = ../include/relative.include + [user] + local = true + override = local + [include] + path = ../include/relative.include EOF ' test_expect_success '--show-origin with --list' ' cat >expect <<-EOF && - file:$HOME/.gitconfig user.global=true - file:$HOME/.gitconfig user.override=global - file:$HOME/.gitconfig include.path=$INCLUDE_DIR/absolute.include - file:$INCLUDE_DIR/absolute.include user.absolute=include - file:.git/config user.local=true - file:.git/config user.override=local - file:.git/config include.path=../include/relative.include - file:.git/../include/relative.include user.relative=include - command line: user.cmdline=true + file:$HOME/.gitconfig user.global=true + file:$HOME/.gitconfig user.override=global + file:$HOME/.gitconfig include.path=$INCLUDE_DIR/absolute.include + file:$INCLUDE_DIR/absolute.include user.absolute=include + file:.git/config user.local=true + file:.git/config user.override=local + file:.git/config include.path=../include/relative.include + file:.git/../include/relative.include user.relative=include + command line: user.cmdline=true EOF git -c user.cmdline=true config --list --show-origin >output && test_cmp expect output @@ -1669,16 +1664,16 @@ test_expect_success '--show-origin with --list' ' test_expect_success '--show-origin with --list --null' ' cat >expect <<-EOF && - file:$HOME/.gitconfigQuser.global - trueQfile:$HOME/.gitconfigQuser.override - globalQfile:$HOME/.gitconfigQinclude.path - $INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute - includeQfile:.git/configQuser.local - trueQfile:.git/configQuser.override - localQfile:.git/configQinclude.path - ../include/relative.includeQfile:.git/../include/relative.includeQuser.relative - includeQcommand line:Quser.cmdline - trueQ + file:$HOME/.gitconfigQuser.global + trueQfile:$HOME/.gitconfigQuser.override + globalQfile:$HOME/.gitconfigQinclude.path + $INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute + includeQfile:.git/configQuser.local + trueQfile:.git/configQuser.override + localQfile:.git/configQinclude.path + ../include/relative.includeQfile:.git/../include/relative.includeQuser.relative + includeQcommand line:Quser.cmdline + trueQ EOF git -c user.cmdline=true config --null --list --show-origin >output.raw && nul_to_q <output.raw >output && @@ -1690,9 +1685,9 @@ test_expect_success '--show-origin with --list --null' ' test_expect_success '--show-origin with single file' ' cat >expect <<-\EOF && - file:.git/config user.local=true - file:.git/config user.override=local - file:.git/config include.path=../include/relative.include + file:.git/config user.local=true + file:.git/config user.override=local + file:.git/config include.path=../include/relative.include EOF git config --local --list --show-origin >output && test_cmp expect output @@ -1700,8 +1695,8 @@ test_expect_success '--show-origin with single file' ' test_expect_success '--show-origin with --get-regexp' ' cat >expect <<-EOF && - file:$HOME/.gitconfig user.global true - file:.git/config user.local true + file:$HOME/.gitconfig user.global true + file:.git/config user.local true EOF git config --show-origin --get-regexp "user\.[g|l].*" >output && test_cmp expect output @@ -1709,36 +1704,31 @@ test_expect_success '--show-origin with --get-regexp' ' test_expect_success '--show-origin getting a single key' ' cat >expect <<-\EOF && - file:.git/config local + file:.git/config local EOF git config --show-origin user.override >output && test_cmp expect output ' test_expect_success 'set up custom config file' ' - CUSTOM_CONFIG_FILE="custom.conf" && + CUSTOM_CONFIG_FILE="file\" (dq) and spaces.conf" && cat >"$CUSTOM_CONFIG_FILE" <<-\EOF - [user] - custom = true + [user] + custom = true EOF ' -test_expect_success !MINGW 'set up custom config file with special name characters' ' - WEIRDLY_NAMED_FILE="file\" (dq) and spaces.conf" && - cp "$CUSTOM_CONFIG_FILE" "$WEIRDLY_NAMED_FILE" -' - test_expect_success !MINGW '--show-origin escape special file name characters' ' cat >expect <<-\EOF && - file:"file\" (dq) and spaces.conf" user.custom=true + file:"file\" (dq) and spaces.conf" user.custom=true EOF - git config --file "$WEIRDLY_NAMED_FILE" --show-origin --list >output && + git config --file "$CUSTOM_CONFIG_FILE" --show-origin --list >output && test_cmp expect output ' test_expect_success '--show-origin stdin' ' cat >expect <<-\EOF && - standard input: user.custom=true + standard input: user.custom=true EOF git config --file - --show-origin --list <"$CUSTOM_CONFIG_FILE" >output && test_cmp expect output @@ -1746,11 +1736,11 @@ test_expect_success '--show-origin stdin' ' test_expect_success '--show-origin stdin with file include' ' cat >"$INCLUDE_DIR"/stdin.include <<-EOF && - [user] - stdin = include + [user] + stdin = include EOF cat >expect <<-EOF && - file:$INCLUDE_DIR/stdin.include include + file:$INCLUDE_DIR/stdin.include include EOF echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" | git config --show-origin --includes --file - user.stdin >output && @@ -1758,18 +1748,18 @@ test_expect_success '--show-origin stdin with file include' ' test_cmp expect output ' -test_expect_success '--show-origin blob' ' +test_expect_success !MINGW '--show-origin blob' ' blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") && cat >expect <<-EOF && - blob:$blob user.custom=true + blob:$blob user.custom=true EOF git config --blob=$blob --show-origin --list >output && test_cmp expect output ' -test_expect_success '--show-origin blob ref' ' +test_expect_success !MINGW '--show-origin blob ref' ' cat >expect <<-\EOF && - blob:master:custom.conf user.custom=true + blob:"master:file\" (dq) and spaces.conf" user.custom=true EOF git add "$CUSTOM_CONFIG_FILE" && git commit -m "new config file" && @@ -1777,65 +1767,6 @@ test_expect_success '--show-origin blob ref' ' test_cmp expect output ' -test_expect_success '--show-scope with --list' ' - cat >expect <<-EOF && - global user.global=true - global user.override=global - global include.path=$INCLUDE_DIR/absolute.include - global user.absolute=include - local user.local=true - local user.override=local - local include.path=../include/relative.include - local user.relative=include - command user.cmdline=true - EOF - git -c user.cmdline=true config --list --show-scope >output && - test_cmp expect output -' - -test_expect_success !MINGW '--show-scope with --blob' ' - blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") && - cat >expect <<-EOF && - command user.custom=true - EOF - git config --blob=$blob --show-scope --list >output && - test_cmp expect output -' - -test_expect_success '--show-scope with --local' ' - cat >expect <<-\EOF && - local user.local=true - local user.override=local - local include.path=../include/relative.include - EOF - git config --local --list --show-scope >output && - test_cmp expect output -' - -test_expect_success '--show-scope getting a single value' ' - cat >expect <<-\EOF && - local true - EOF - git config --show-scope --get user.local >output && - test_cmp expect output -' - -test_expect_success '--show-scope with --show-origin' ' - cat >expect <<-EOF && - global file:$HOME/.gitconfig user.global=true - global file:$HOME/.gitconfig user.override=global - global file:$HOME/.gitconfig include.path=$INCLUDE_DIR/absolute.include - global file:$INCLUDE_DIR/absolute.include user.absolute=include - local file:.git/config user.local=true - local file:.git/config user.override=local - local file:.git/config include.path=../include/relative.include - local file:.git/../include/relative.include user.relative=include - command command line: user.cmdline=true - EOF - git -c user.cmdline=true config --list --show-origin --show-scope >output && - test_cmp expect output -' - test_expect_success '--local requires a repo' ' # we expect 128 to ensure that we do not simply # fail to find anything and return code "1" diff --git a/third_party/git/t/t1305-config-include.sh b/third_party/git/t/t1305-config-include.sh index f1e1b289f9..d20b4d150d 100755 --- a/third_party/git/t/t1305-config-include.sh +++ b/third_party/git/t/t1305-config-include.sh @@ -63,7 +63,7 @@ test_expect_success 'listing includes option and expansion' ' test.one=1 EOF git config --list >actual.full && - grep -v -e ^core -e ^extensions actual.full >actual && + grep -v ^core actual.full >actual && test_cmp expect actual ' diff --git a/third_party/git/t/t1306-xdg-files.sh b/third_party/git/t/t1306-xdg-files.sh index dd87b43be1..21e139a313 100755 --- a/third_party/git/t/t1306-xdg-files.sh +++ b/third_party/git/t/t1306-xdg-files.sh @@ -153,7 +153,7 @@ test_expect_success 'Checking attributes in both XDG and local attributes files' test_expect_success 'Checking attributes in a non-XDG global attributes file' ' - rm -f .gitattributes && + test_might_fail rm .gitattributes && echo "f attr_f=test" >"$HOME"/my_gitattributes && git config core.attributesfile "$HOME"/my_gitattributes && echo "f: attr_f: test" >expected && @@ -165,7 +165,7 @@ test_expect_success 'Checking attributes in a non-XDG global attributes file' ' test_expect_success 'write: xdg file exists and ~/.gitconfig doesn'\''t' ' mkdir -p "$HOME"/.config/git && >"$HOME"/.config/git/config && - rm -f "$HOME"/.gitconfig && + test_might_fail rm "$HOME"/.gitconfig && git config --global user.name "write_config" && echo "[user]" >expected && echo " name = write_config" >>expected && @@ -183,8 +183,8 @@ test_expect_success 'write: xdg file exists and ~/.gitconfig exists' ' test_expect_success 'write: ~/.config/git/ exists and config file doesn'\''t' ' - rm -f "$HOME"/.gitconfig && - rm -f "$HOME"/.config/git/config && + test_might_fail rm "$HOME"/.gitconfig && + test_might_fail rm "$HOME"/.config/git/config && git config --global user.name "write_gitconfig" && echo "[user]" >expected && echo " name = write_gitconfig" >>expected && diff --git a/third_party/git/t/t1307-config-blob.sh b/third_party/git/t/t1307-config-blob.sh index 002e6d3388..37dc689d8c 100755 --- a/third_party/git/t/t1307-config-blob.sh +++ b/third_party/git/t/t1307-config-blob.sh @@ -74,7 +74,7 @@ test_expect_success 'can parse blob ending with CR' ' ' test_expect_success 'config --blob outside of a repository is an error' ' - nongit test_must_fail git config --blob=foo --list + test_must_fail nongit git config --blob=foo --list ' test_done diff --git a/third_party/git/t/t1308-config-set.sh b/third_party/git/t/t1308-config-set.sh index 3a527e3a84..d0a2727b85 100755 --- a/third_party/git/t/t1308-config-set.sh +++ b/third_party/git/t/t1308-config-set.sh @@ -166,14 +166,14 @@ test_expect_success 'find value with highest priority from a configset' ' ' test_expect_success 'find value_list for a key from a configset' ' - cat >expect <<-\EOF && - lama - ball + cat >except <<-\EOF && sam bat hask + lama + ball EOF - test-tool config configset_get_value_multi case.baz config2 .git/config >actual && + test-tool config configset_get_value case.baz config2 .git/config >actual && test_cmp expect actual ' @@ -238,8 +238,8 @@ test_expect_success 'error on modifying repo config without repo' ' cmdline_config="'foo.bar=from-cmdline'" test_expect_success 'iteration shows correct origins' ' - printf "[ignore]\n\tthis = please\n[foo]bar = from-repo\n" >.git/config && - printf "[foo]\n\tbar = from-home\n" >.gitconfig && + echo "[foo]bar = from-repo" >.git/config && + echo "[foo]bar = from-home" >.gitconfig && if test_have_prereq MINGW then # Use Windows path (i.e. *not* $HOME) @@ -253,29 +253,19 @@ test_expect_success 'iteration shows correct origins' ' value=from-home origin=file name=$HOME_GITCONFIG - lno=2 scope=global - key=ignore.this - value=please - origin=file - name=.git/config - lno=2 - scope=local - key=foo.bar value=from-repo origin=file name=.git/config - lno=3 - scope=local + scope=repo key=foo.bar value=from-cmdline origin=command line name= - lno=-1 - scope=command + scope=cmdline EOF GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual && test_cmp expect actual diff --git a/third_party/git/t/t1309-early-config.sh b/third_party/git/t/t1309-early-config.sh index ebb8e1aecb..0c37e7180d 100755 --- a/third_party/git/t/t1309-early-config.sh +++ b/third_party/git/t/t1309-early-config.sh @@ -29,7 +29,7 @@ test_expect_success 'ceiling' ' cd sub && test-tool config read_early_config early.config ) >output && - test_must_be_empty output + test -z "$(cat output)" ' test_expect_success 'ceiling #2' ' @@ -91,12 +91,7 @@ test_expect_failure 'ignore .git/ with invalid config' ' test_expect_success 'early config and onbranch' ' echo "[broken" >broken && - test_with_config "[includeif \"onbranch:master\"]path=../broken" -' - -test_expect_success 'onbranch config outside of git repo' ' - test_config_global includeIf.onbranch:master.path non-existent && - nongit git help + test_with_config "[includeif \"onbranch:refs/heads/master\"]path=../broken" ' test_done diff --git a/third_party/git/t/t1400-update-ref.sh b/third_party/git/t/t1400-update-ref.sh index a6224ef65f..1fbd940408 100755 --- a/third_party/git/t/t1400-update-ref.sh +++ b/third_party/git/t/t1400-update-ref.sh @@ -344,16 +344,14 @@ test_expect_success "verifying $m's log (logged by config)" ' test_cmp expect .git/logs/$m ' -test_expect_success 'set up for querying the reflog' ' - git update-ref $m $D && - cat >.git/logs/$m <<-EOF - $Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500 - $C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500 - $A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500 - $F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500 - $Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500 - EOF -' +git update-ref $m $D +cat >.git/logs/$m <<EOF +$Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500 +$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500 +$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500 +$F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500 +$Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500 +EOF ed="Thu, 26 May 2005 18:32:00 -0500" gd="Thu, 26 May 2005 18:33:00 -0500" @@ -361,67 +359,55 @@ ld="Thu, 26 May 2005 18:43:00 -0500" test_expect_success 'Query "master@{May 25 2005}" (before history)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{May 25 2005}" >o 2>e && - echo "$C" >expect && - test_cmp expect o && - echo "warning: log for '\''master'\'' only goes back to $ed" >expect && - test_i18ncmp expect e + test $C = $(cat o) && + test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)" ' test_expect_success 'Query master@{2005-05-25} (before history)' ' test_when_finished "rm -f o e" && git rev-parse --verify master@{2005-05-25} >o 2>e && - echo "$C" >expect && - test_cmp expect o && - echo "warning: log for '\''master'\'' only goes back to $ed" >expect && - test_i18ncmp expect e + test $C = $(cat o) && + test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)" ' test_expect_success 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e && - echo "$C" >expect && - test_cmp expect o && - echo "warning: log for '\''master'\'' only goes back to $ed" >expect && - test_i18ncmp expect e + test $C = $(cat o) && + test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)" ' test_expect_success 'Query "master@{May 26 2005 23:32:00}" (exactly history start)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e && - echo "$C" >expect && - test_cmp expect o && - test_must_be_empty e + test $C = $(cat o) && + test "" = "$(cat e)" ' test_expect_success 'Query "master@{May 26 2005 23:32:30}" (first non-creation change)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{May 26 2005 23:32:30}" >o 2>e && - echo "$A" >expect && - test_cmp expect o && - test_must_be_empty e + test $A = $(cat o) && + test "" = "$(cat e)" ' test_expect_success 'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e && - echo "$B" >expect && - test_cmp expect o && + test $B = $(cat o) && test_i18ngrep -F "warning: log for ref $m has gap after $gd" e ' test_expect_success 'Query "master@{2005-05-26 23:38:00}" (middle of history)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e && - echo "$Z" >expect && - test_cmp expect o && - test_must_be_empty e + test $Z = $(cat o) && + test "" = "$(cat e)" ' test_expect_success 'Query "master@{2005-05-26 23:43:00}" (exact end of history)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e && - echo "$E" >expect && - test_cmp expect o && - test_must_be_empty e + test $E = $(cat o) && + test "" = "$(cat e)" ' test_expect_success 'Query "master@{2005-05-28}" (past end of history)' ' test_when_finished "rm -f o e" && git rev-parse --verify "master@{2005-05-28}" >o 2>e && - echo "$D" >expect && - test_cmp expect o && + test $D = $(cat o) && test_i18ngrep -F "warning: log for ref $m unexpectedly ended on $ld" e ' diff --git a/third_party/git/t/t1404-update-ref-errors.sh b/third_party/git/t/t1404-update-ref-errors.sh index 2d142e5535..970c5c36b9 100755 --- a/third_party/git/t/t1404-update-ref-errors.sh +++ b/third_party/git/t/t1404-update-ref-errors.sh @@ -32,6 +32,8 @@ test_update_rejected () { test_cmp unchanged actual } +Q="'" + # Test adding and deleting D/F-conflicting references in a single # transaction. df_test() { @@ -91,7 +93,7 @@ df_test() { delname="$delref" fi && cat >expected-err <<-EOF && - fatal: cannot lock ref $SQ$addname$SQ: $SQ$delref$SQ exists; cannot create $SQ$addref$SQ + fatal: cannot lock ref $Q$addname$Q: $Q$delref$Q exists; cannot create $Q$addref$Q EOF $pack && if $add_del @@ -121,7 +123,7 @@ test_expect_success 'existing loose ref is a simple prefix of new' ' 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" + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" ' @@ -129,7 +131,7 @@ test_expect_success 'existing packed ref is a simple prefix of new' ' 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" + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x$Q" ' @@ -137,7 +139,7 @@ test_expect_success 'existing loose ref is a deeper prefix of new' ' 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" + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" ' @@ -145,7 +147,7 @@ test_expect_success 'existing packed ref is a deeper prefix of new' ' 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" + "$Q$prefix/c$Q exists; cannot create $Q$prefix/c/x/y$Q" ' @@ -153,7 +155,7 @@ test_expect_success 'new ref is a simple prefix of existing loose' ' 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" + "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" ' @@ -161,7 +163,7 @@ test_expect_success 'new ref is a simple prefix of existing packed' ' 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" + "$Q$prefix/c/x$Q exists; cannot create $Q$prefix/c$Q" ' @@ -169,7 +171,7 @@ test_expect_success 'new ref is a deeper prefix of existing loose' ' 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" + "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" ' @@ -177,7 +179,7 @@ test_expect_success 'new ref is a deeper prefix of existing packed' ' 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" + "$Q$prefix/c/x/y$Q exists; cannot create $Q$prefix/c$Q" ' @@ -185,7 +187,7 @@ test_expect_success 'one new ref is a simple prefix of another' ' 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 $Q$prefix/c$Q and $Q$prefix/c/x$Q at the same time" ' @@ -332,7 +334,7 @@ test_expect_success 'D/F conflict prevents indirect delete long packed + indirec test_expect_success 'missing old value blocks update' ' 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q EOF printf "%s\n" "update $prefix/foo $E $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -343,7 +345,7 @@ test_expect_success 'incorrect old value blocks update' ' 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 $Q$prefix/foo$Q: 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 && @@ -354,7 +356,7 @@ test_expect_success 'existing old value blocks create' ' 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 $Q$prefix/foo$Q: reference already exists EOF printf "%s\n" "create $prefix/foo $E" | test_must_fail git update-ref --stdin 2>output.err && @@ -365,7 +367,7 @@ test_expect_success 'incorrect old value blocks delete' ' 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 $Q$prefix/foo$Q: is at $C but expected $D EOF printf "%s\n" "delete $prefix/foo $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -376,7 +378,7 @@ test_expect_success 'missing old value blocks indirect update' ' 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q EOF printf "%s\n" "update $prefix/symref $E $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -388,7 +390,7 @@ test_expect_success 'incorrect old value blocks 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 $Q$prefix/symref$Q: 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 && @@ -400,7 +402,7 @@ test_expect_success 'existing old value blocks 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 $Q$prefix/symref$Q: reference already exists EOF printf "%s\n" "create $prefix/symref $E" | test_must_fail git update-ref --stdin 2>output.err && @@ -412,7 +414,7 @@ test_expect_success 'incorrect old value blocks 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 $Q$prefix/symref$Q: is at $C but expected $D EOF printf "%s\n" "delete $prefix/symref $D" | test_must_fail git update-ref --stdin 2>output.err && @@ -423,7 +425,7 @@ test_expect_success 'missing old value blocks indirect no-deref update' ' 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 $Q$prefix/symref$Q: 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 && @@ -435,7 +437,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref 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 $Q$prefix/symref$Q: 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 && @@ -447,7 +449,7 @@ test_expect_success 'existing old value blocks indirect no-deref 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 $Q$prefix/symref$Q: reference already exists EOF printf "%s\n" "option no-deref" "create $prefix/symref $E" | test_must_fail git update-ref --stdin 2>output.err && @@ -459,7 +461,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref 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 $Q$prefix/symref$Q: 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 && @@ -472,13 +474,13 @@ test_expect_success 'non-empty directory blocks create' ' : >.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 $Q$prefix/foo$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q EOF printf "%s\n" "update $prefix/foo $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -491,13 +493,13 @@ test_expect_success 'broken reference blocks create' ' 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: 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 $Q$prefix/foo$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken EOF printf "%s\n" "update $prefix/foo $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -511,13 +513,13 @@ test_expect_success 'non-empty directory blocks indirect create' ' : >.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 $Q$prefix/symref$Q: there is a non-empty directory $Q.git/$prefix/foo$Q blocking reference $Q$prefix/foo$Q 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q EOF printf "%s\n" "update $prefix/symref $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -530,13 +532,13 @@ test_expect_success 'broken reference blocks indirect create' ' 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: 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 $Q$prefix/symref$Q: unable to resolve reference $Q$prefix/foo$Q: reference broken EOF printf "%s\n" "update $prefix/symref $D $C" | test_must_fail git update-ref --stdin 2>output.err && @@ -612,7 +614,7 @@ 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_i18ngrep "Unable to create $SQ.*packed-refs.lock$SQ: " err && + test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: " err && test_cmp unchanged actual ' diff --git a/third_party/git/t/t1406-submodule-ref-store.sh b/third_party/git/t/t1406-submodule-ref-store.sh index 36b7ef5046..d199d872fb 100755 --- a/third_party/git/t/t1406-submodule-ref-store.sh +++ b/third_party/git/t/t1406-submodule-ref-store.sh @@ -75,7 +75,7 @@ test_expect_success 'for_each_reflog()' ' ' test_expect_success 'for_each_reflog_ent()' ' - $RUN for-each-reflog-ent HEAD >actual && + $RUN for-each-reflog-ent HEAD >actual && cat actual && head -n1 actual | grep first && tail -n2 actual | head -n1 | grep master.to.new ' diff --git a/third_party/git/t/t1409-avoid-packing-refs.sh b/third_party/git/t/t1409-avoid-packing-refs.sh index be12fb6350..e5cb8a252d 100755 --- a/third_party/git/t/t1409-avoid-packing-refs.sh +++ b/third_party/git/t/t1409-avoid-packing-refs.sh @@ -8,7 +8,7 @@ test_description='avoid rewriting packed-refs unnecessarily' # shouldn't upset readers, and it should be omitted if the file is # ever rewritten. mark_packed_refs () { - sed -e "s/^\(#.*\)/\1 t1409 /" .git/packed-refs >.git/packed-refs.new && + sed -e "s/^\(#.*\)/\1 t1409 /" <.git/packed-refs >.git/packed-refs.new && mv .git/packed-refs.new .git/packed-refs } @@ -27,15 +27,15 @@ test_expect_success 'setup' ' ' test_expect_success 'do not create packed-refs file gratuitously' ' - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref refs/heads/foo $A && - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref refs/heads/foo $B && - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref refs/heads/foo $C $B && - test_path_is_missing .git/packed-refs && + test_must_fail test -f .git/packed-refs && git update-ref -d refs/heads/foo && - test_path_is_missing .git/packed-refs + test_must_fail test -f .git/packed-refs ' test_expect_success 'check that marking the packed-refs file works' ' @@ -46,7 +46,7 @@ test_expect_success 'check that marking the packed-refs file works' ' git for-each-ref >actual && test_cmp expected actual && git pack-refs --all && - ! check_packed_refs_marked && + test_must_fail check_packed_refs_marked && git for-each-ref >actual2 && test_cmp expected actual2 ' @@ -80,7 +80,7 @@ test_expect_success 'touch packed-refs on delete of packed' ' git pack-refs --all && mark_packed_refs && git update-ref -d refs/heads/packed-delete && - ! check_packed_refs_marked + test_must_fail check_packed_refs_marked ' test_expect_success 'leave packed-refs untouched on update of loose' ' diff --git a/third_party/git/t/t1410-reflog.sh b/third_party/git/t/t1410-reflog.sh index 76d9b744a6..82950c0282 100755 --- a/third_party/git/t/t1410-reflog.sh +++ b/third_party/git/t/t1410-reflog.sh @@ -195,7 +195,7 @@ test_expect_success 'delete' ' git reflog delete master@{1} && git reflog show master > output && - test_line_count = $(($master_entry_count - 1)) output && + test $(($master_entry_count - 1)) = $(wc -l < output) && test $HEAD_entry_count = $(git reflog | wc -l) && ! grep ox < output && @@ -209,7 +209,7 @@ test_expect_success 'delete' ' git reflog delete master@{07.04.2005.15:15:00.-0700} && git reflog show master > output && - test_line_count = $(($master_entry_count - 1)) output && + test $(($master_entry_count - 1)) = $(wc -l < output) && ! grep dragon < output ' diff --git a/third_party/git/t/t1414-reflog-walk.sh b/third_party/git/t/t1414-reflog-walk.sh index 1181a9fb28..feb1efd8ff 100755 --- a/third_party/git/t/t1414-reflog-walk.sh +++ b/third_party/git/t/t1414-reflog-walk.sh @@ -18,9 +18,10 @@ do_walk () { git log -g --format="%gd %gs" "$@" } +sq="'" test_expect_success 'set up expected reflog' ' cat >expect.all <<-EOF - HEAD@{0} commit (merge): Merge branch ${SQ}master${SQ} into side + HEAD@{0} commit (merge): Merge branch ${sq}master${sq} into side HEAD@{1} commit: three HEAD@{2} checkout: moving from master to side HEAD@{3} commit: two diff --git a/third_party/git/t/t1450-fsck.sh b/third_party/git/t/t1450-fsck.sh index d09eff503c..b36e0528d0 100755 --- a/third_party/git/t/t1450-fsck.sh +++ b/third_party/git/t/t1450-fsck.sh @@ -70,6 +70,7 @@ test_expect_success 'object with bad sha1' ' test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "$sha.*corrupt" out ' @@ -77,6 +78,7 @@ test_expect_success 'branch pointing to non-commit' ' git rev-parse HEAD^{tree} >.git/refs/heads/invalid && test_when_finished "git update-ref -d refs/heads/invalid" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "not a commit" out ' @@ -86,6 +88,7 @@ test_expect_success 'HEAD link pointing at a funny object' ' echo $ZERO_OID >.git/HEAD && # avoid corrupt/broken HEAD from interfering with repo discovery test_must_fail env GIT_DIR=.git git fsck 2>out && + cat out && test_i18ngrep "detached HEAD points" out ' @@ -95,6 +98,7 @@ test_expect_success 'HEAD link pointing at a funny place' ' echo "ref: refs/funny/place" >.git/HEAD && # avoid corrupt/broken HEAD from interfering with repo discovery test_must_fail env GIT_DIR=.git git fsck 2>out && + cat out && test_i18ngrep "HEAD points to something strange" out ' @@ -141,6 +145,7 @@ test_expect_success 'email without @ is okay' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && git fsck 2>out && + cat out && ! grep "commit $new" out ' @@ -152,6 +157,7 @@ test_expect_success 'email with embedded > is not okay' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "error in commit $new" out ' @@ -163,6 +169,7 @@ test_expect_success 'missing < email delimiter is reported nicely' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "error in commit $new.* - bad name" out ' @@ -174,6 +181,7 @@ test_expect_success 'missing email is reported nicely' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "error in commit $new.* - missing email" out ' @@ -185,6 +193,7 @@ test_expect_success '> in name is reported' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "error in commit $new" out ' @@ -198,6 +207,7 @@ test_expect_success 'integer overflow in timestamps is reported' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "error in commit $new.*integer overflow" out ' @@ -209,6 +219,7 @@ test_expect_success 'commit with NUL in header' ' git update-ref refs/heads/bogus "$new" && test_when_finished "git update-ref -d refs/heads/bogus" && test_must_fail git fsck 2>out && + cat out && test_i18ngrep "error in commit $new.*unterminated header: NUL at offset" out ' @@ -286,6 +297,7 @@ test_expect_success 'tag pointing to nonexistent' ' echo $tag >.git/refs/tags/invalid && test_when_finished "git update-ref -d refs/tags/invalid" && test_must_fail git fsck --tags >out && + cat out && test_i18ngrep "broken link" out ' @@ -366,6 +378,7 @@ test_expect_success 'tag with NUL in header' ' echo $tag >.git/refs/tags/wrong && test_when_finished "git update-ref -d refs/tags/wrong" && test_must_fail git fsck --tags 2>out && + cat out && test_i18ngrep "error in tag $tag.*unterminated header: NUL at offset" out ' @@ -396,6 +409,7 @@ test_expect_success 'rev-list --verify-objects with bad sha1' ' test_when_finished "git update-ref -d refs/heads/bogus" && test_might_fail git rev-list --verify-objects refs/heads/bogus >/dev/null 2>out && + cat out && test_i18ngrep -q "error: hash mismatch $(dirname $new)$(test_oid ff_2)" out ' @@ -419,6 +433,7 @@ test_expect_success 'fsck notices blob entry pointing to null sha1' ' sha=$(printf "100644 file$_bz$_bzoid" | git hash-object -w --stdin -t tree) && git fsck 2>out && + cat out && test_i18ngrep "warning.*null sha1" out ) ' @@ -429,6 +444,7 @@ test_expect_success 'fsck notices submodule entry pointing to null sha1' ' sha=$(printf "160000 submodule$_bz$_bzoid" | git hash-object -w --stdin -t tree) && git fsck 2>out && + cat out && test_i18ngrep "warning.*null sha1" out ) ' @@ -440,7 +456,6 @@ while read name path pretty; do ( git init $name-$type && cd $name-$type && - git config core.protectNTFS false && echo content >file && git add file && git commit -m base && @@ -450,6 +465,7 @@ while read name path pretty; do printf "$mode $type %s\t%s" "$value" "$path" >bad && bad_tree=$(git mktree <bad) && git fsck 2>out && + cat out && test_i18ngrep "warning.*tree $bad_tree" out )' done <<-\EOF @@ -616,7 +632,7 @@ test_expect_success 'fsck --name-objects' ' remove_object $(git rev-parse julius:caesar.t) && test_must_fail git fsck --name-objects >out && tree=$(git rev-parse --verify julius:) && - test_i18ngrep "$tree (refs/tags/julius:" out + test_i18ngrep -E "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out ) ' diff --git a/third_party/git/t/t1500-rev-parse.sh b/third_party/git/t/t1500-rev-parse.sh index 603019b541..01abee533d 100755 --- a/third_party/git/t/t1500-rev-parse.sh +++ b/third_party/git/t/t1500-rev-parse.sh @@ -59,7 +59,6 @@ test_rev_parse () { ROOT=$(pwd) test_expect_success 'setup' ' - test_oid_init && mkdir -p sub/dir work && cp -R .git repo.git ' @@ -132,30 +131,6 @@ test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' ' test_cmp expect actual ' -test_expect_success 'rev-parse --show-object-format in repo' ' - echo "$(test_oid algo)" >expect && - git rev-parse --show-object-format >actual && - test_cmp expect actual && - git rev-parse --show-object-format=storage >actual && - test_cmp expect actual && - git rev-parse --show-object-format=input >actual && - test_cmp expect actual && - git rev-parse --show-object-format=output >actual && - test_cmp expect actual && - test_must_fail git rev-parse --show-object-format=squeamish-ossifrage 2>err && - grep "unknown mode for --show-object-format: squeamish-ossifrage" err -' - -test_expect_success '--show-toplevel from subdir of working tree' ' - pwd >expect && - git -C sub/dir rev-parse --show-toplevel >actual && - test_cmp expect actual -' - -test_expect_success '--show-toplevel from inside .git' ' - test_must_fail git -C .git rev-parse --show-toplevel -' - test_expect_success 'showing the superproject correctly' ' git rev-parse --show-superproject-working-tree >out && test_must_be_empty out && diff --git a/third_party/git/t/t1501-work-tree.sh b/third_party/git/t/t1501-work-tree.sh index b75558040f..3498d3d55e 100755 --- a/third_party/git/t/t1501-work-tree.sh +++ b/third_party/git/t/t1501-work-tree.sh @@ -350,7 +350,7 @@ test_expect_success 'Multi-worktree setup' ' mkdir work && mkdir -p repo.git/repos/foo && cp repo.git/HEAD repo.git/index repo.git/repos/foo && - { cp repo.git/sharedindex.* repo.git/repos/foo || :; } && + test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo && sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE ' diff --git a/third_party/git/t/t1506-rev-parse-diagnosis.sh b/third_party/git/t/t1506-rev-parse-diagnosis.sh index 52edcbdcc3..4ee009da66 100755 --- a/third_party/git/t/t1506-rev-parse-diagnosis.sh +++ b/third_party/git/t/t1506-rev-parse-diagnosis.sh @@ -8,11 +8,12 @@ exec </dev/null test_did_you_mean () { + sq="'" && cat >expected <<-EOF && - fatal: path '$2$3' $4, but not ${5:-$SQ$3$SQ} - hint: Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}? + fatal: Path '$2$3' $4, but not ${5:-$sq$3$sq}. + Did you mean '$1:$2$3'${2:+ aka $sq$1:./$3$sq}? EOF - test_i18ncmp expected error + test_cmp expected error } HASH_file= @@ -103,66 +104,66 @@ test_expect_success 'correct relative file objects (6)' ' test_expect_success 'incorrect revision id' ' test_must_fail git rev-parse foobar:file.txt 2>error && - test_i18ngrep "invalid object name .foobar." error && - test_must_fail git rev-parse foobar 2>error && + grep "Invalid object name '"'"'foobar'"'"'." error && + test_must_fail git rev-parse foobar 2> error && test_i18ngrep "unknown revision or path not in the working tree." error ' test_expect_success 'incorrect file in sha1:path' ' - test_must_fail git rev-parse HEAD:nothing.txt 2>error && - test_i18ngrep "path .nothing.txt. does not exist in .HEAD." error && - test_must_fail git rev-parse HEAD:index-only.txt 2>error && - test_i18ngrep "path .index-only.txt. exists on disk, but not in .HEAD." error && + test_must_fail git rev-parse HEAD:nothing.txt 2> error && + grep "fatal: Path '"'"'nothing.txt'"'"' does not exist in '"'"'HEAD'"'"'" error && + test_must_fail git rev-parse HEAD:index-only.txt 2> error && + grep "fatal: Path '"'"'index-only.txt'"'"' exists on disk, but not in '"'"'HEAD'"'"'." error && (cd subdir && - test_must_fail git rev-parse HEAD:file2.txt 2>error && + test_must_fail git rev-parse HEAD:file2.txt 2> error && test_did_you_mean HEAD subdir/ file2.txt exists ) ' test_expect_success 'incorrect file in :path and :N:path' ' - test_must_fail git rev-parse :nothing.txt 2>error && - test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error && - test_must_fail git rev-parse :1:nothing.txt 2>error && - test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error && - test_must_fail git rev-parse :1:file.txt 2>error && + test_must_fail git rev-parse :nothing.txt 2> error && + grep "fatal: Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error && + test_must_fail git rev-parse :1:nothing.txt 2> error && + grep "Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error && + test_must_fail git rev-parse :1:file.txt 2> error && test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" && (cd subdir && - test_must_fail git rev-parse :1:file.txt 2>error && + test_must_fail git rev-parse :1:file.txt 2> error && test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" && - test_must_fail git rev-parse :file2.txt 2>error && + test_must_fail git rev-parse :file2.txt 2> error && test_did_you_mean ":0" subdir/ file2.txt "is in the index" && - test_must_fail git rev-parse :2:file2.txt 2>error && + test_must_fail git rev-parse :2:file2.txt 2> error && test_did_you_mean :0 subdir/ file2.txt "is in the index") && - test_must_fail git rev-parse :disk-only.txt 2>error && - test_i18ngrep "path .disk-only.txt. exists on disk, but not in the index" error + test_must_fail git rev-parse :disk-only.txt 2> error && + grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error ' test_expect_success 'invalid @{n} reference' ' test_must_fail git rev-parse master@{99999} >output 2>error && - test_must_be_empty output && - test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error && + test -z "$(cat output)" && + grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error && test_must_fail git rev-parse --verify master@{99999} >output 2>error && - test_must_be_empty output && - test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error + test -z "$(cat output)" && + grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error ' test_expect_success 'relative path not found' ' ( cd subdir && test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error && - test_i18ngrep subdir/nonexistent.txt error + grep subdir/nonexistent.txt error ) ' test_expect_success 'relative path outside worktree' ' test_must_fail git rev-parse HEAD:../file.txt >output 2>error && - test_must_be_empty output && + test -z "$(cat output)" && test_i18ngrep "outside repository" error ' test_expect_success 'relative path when cwd is outside worktree' ' test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error && - test_must_be_empty output && - test_i18ngrep "relative path syntax can.t be used outside working tree" error + test -z "$(cat output)" && + grep "relative path syntax can.t be used outside working tree." error ' test_expect_success '<commit>:file correctly diagnosed after a pathname' ' @@ -214,26 +215,4 @@ test_expect_success 'arg before dashdash must be a revision (ambiguous)' ' test_cmp expect actual ' -test_expect_success 'reject Nth parent if N is too high' ' - test_must_fail git rev-parse HEAD^100000000000000000000000000000000 -' - -test_expect_success 'reject Nth ancestor if N is too high' ' - test_must_fail git rev-parse HEAD~100000000000000000000000000000000 -' - -test_expect_success 'pathspecs with wildcards are not ambiguous' ' - echo "*.c" >expect && - git rev-parse "*.c" >actual && - test_cmp expect actual -' - -test_expect_success 'backslash does not trigger wildcard rule' ' - test_must_fail git rev-parse "foo\\bar" -' - -test_expect_success 'escaped char does not trigger wildcard rule' ' - test_must_fail git rev-parse "foo\\*bar" -' - test_done diff --git a/third_party/git/t/t1507-rev-parse-upstream.sh b/third_party/git/t/t1507-rev-parse-upstream.sh index dfc0d96d8a..fa3e499641 100755 --- a/third_party/git/t/t1507-rev-parse-upstream.sh +++ b/third_party/git/t/t1507-rev-parse-upstream.sh @@ -28,9 +28,16 @@ test_expect_success 'setup' ' ) ' +sq="'" + +full_name () { + (cd clone && + git rev-parse --symbolic-full-name "$@") +} + commit_subject () { (cd clone && - git show -s --pretty=tformat:%s "$@") + git show -s --pretty=format:%s "$@") } error_message () { @@ -39,78 +46,63 @@ error_message () { } test_expect_success '@{upstream} resolves to correct full name' ' - echo refs/remotes/origin/master >expect && - git -C clone rev-parse --symbolic-full-name @{upstream} >actual && - test_cmp expect actual && - git -C clone rev-parse --symbolic-full-name @{UPSTREAM} >actual && - test_cmp expect actual && - git -C clone rev-parse --symbolic-full-name @{UpSTReam} >actual && - test_cmp expect actual + test refs/remotes/origin/master = "$(full_name @{upstream})" && + test refs/remotes/origin/master = "$(full_name @{UPSTREAM})" && + test refs/remotes/origin/master = "$(full_name @{UpSTReam})" ' test_expect_success '@{u} resolves to correct full name' ' - echo refs/remotes/origin/master >expect && - git -C clone rev-parse --symbolic-full-name @{u} >actual && - test_cmp expect actual && - git -C clone rev-parse --symbolic-full-name @{U} >actual && - test_cmp expect actual + test refs/remotes/origin/master = "$(full_name @{u})" && + test refs/remotes/origin/master = "$(full_name @{U})" ' test_expect_success 'my-side@{upstream} resolves to correct full name' ' - echo refs/remotes/origin/side >expect && - git -C clone rev-parse --symbolic-full-name my-side@{u} >actual && - test_cmp expect actual + test refs/remotes/origin/side = "$(full_name my-side@{u})" ' test_expect_success 'upstream of branch with @ in middle' ' - git -C clone rev-parse --symbolic-full-name fun@ny@{u} >actual && + full_name fun@ny@{u} >actual && echo refs/remotes/origin/side >expect && test_cmp expect actual && - git -C clone rev-parse --symbolic-full-name fun@ny@{U} >actual && + full_name fun@ny@{U} >actual && test_cmp expect actual ' test_expect_success 'upstream of branch with @ at start' ' - git -C clone rev-parse --symbolic-full-name @funny@{u} >actual && + full_name @funny@{u} >actual && echo refs/remotes/origin/side >expect && test_cmp expect actual ' test_expect_success 'upstream of branch with @ at end' ' - git -C clone rev-parse --symbolic-full-name funny@@{u} >actual && + full_name funny@@{u} >actual && echo refs/remotes/origin/side >expect && test_cmp expect actual ' test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}' ' - test_must_fail git -C clone rev-parse --symbolic-full-name refs/heads/my-side@{upstream} + test_must_fail full_name refs/heads/my-side@{upstream} ' test_expect_success 'my-side@{u} resolves to correct commit' ' git checkout side && test_commit 5 && (cd clone && git fetch) && - echo 2 >expect && - commit_subject my-side >actual && - test_cmp expect actual && - echo 5 >expect && - commit_subject my-side@{u} >actual + test 2 = "$(commit_subject my-side)" && + test 5 = "$(commit_subject my-side@{u})" ' test_expect_success 'not-tracking@{u} fails' ' - test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} && + test_must_fail full_name non-tracking@{u} && (cd clone && git checkout --no-track -b non-tracking) && - test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} + test_must_fail full_name non-tracking@{u} ' test_expect_success '<branch>@{u}@{1} resolves correctly' ' test_commit 6 && (cd clone && git fetch) && - echo 5 >expect && - commit_subject my-side@{u}@{1} >actual && - test_cmp expect actual && - commit_subject my-side@{U}@{1} >actual && - test_cmp expect actual + test 5 = $(commit_subject my-side@{u}@{1}) && + test 5 = $(commit_subject my-side@{U}@{1}) ' test_expect_success '@{u} without specifying branch fails on a detached HEAD' ' @@ -137,7 +129,7 @@ test_expect_success 'merge my-side@{u} records the correct name' ' git branch -t new my-side@{u} && git merge -s ours new@{u} && git show -s --pretty=tformat:%s >actual && - echo "Merge remote-tracking branch ${SQ}origin/side${SQ}" >expect && + echo "Merge remote-tracking branch ${sq}origin/side${sq}" >expect && test_cmp expect actual ) ' @@ -159,14 +151,12 @@ test_expect_success 'checkout other@{u}' ' ' test_expect_success 'branch@{u} works when tracking a local branch' ' - echo refs/heads/master >expect && - git -C clone rev-parse --symbolic-full-name local-master@{u} >actual && - test_cmp expect actual + test refs/heads/master = "$(full_name local-master@{u})" ' test_expect_success 'branch@{u} error message when no upstream' ' cat >expect <<-EOF && - fatal: no upstream configured for branch ${SQ}non-tracking${SQ} + fatal: no upstream configured for branch ${sq}non-tracking${sq} EOF error_message non-tracking@{u} && test_i18ncmp expect error @@ -174,7 +164,7 @@ test_expect_success 'branch@{u} error message when no upstream' ' test_expect_success '@{u} error message when no upstream' ' cat >expect <<-EOF && - fatal: no upstream configured for branch ${SQ}master${SQ} + fatal: no upstream configured for branch ${sq}master${sq} EOF test_must_fail git rev-parse --verify @{u} 2>actual && test_i18ncmp expect actual @@ -182,7 +172,7 @@ test_expect_success '@{u} error message when no upstream' ' test_expect_success 'branch@{u} error message with misspelt branch' ' cat >expect <<-EOF && - fatal: no such branch: ${SQ}no-such-branch${SQ} + fatal: no such branch: ${sq}no-such-branch${sq} EOF error_message no-such-branch@{u} && test_i18ncmp expect error @@ -199,7 +189,7 @@ test_expect_success '@{u} error message when not on a branch' ' test_expect_success 'branch@{u} error message if upstream branch not fetched' ' cat >expect <<-EOF && - fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch + fatal: upstream branch ${sq}refs/heads/side${sq} not stored as a remote-tracking branch EOF error_message bad-upstream@{u} && test_i18ncmp expect error @@ -215,37 +205,35 @@ test_expect_success 'pull works when tracking a local branch' ' # makes sense if the previous one succeeded test_expect_success '@{u} works when tracking a local branch' ' - echo refs/heads/master >expect && - git -C clone rev-parse --symbolic-full-name @{u} >actual && - test_cmp expect actual + test refs/heads/master = "$(full_name @{u})" ' -test_expect_success 'log -g other@{u}' ' - commit=$(git rev-parse HEAD) && - cat >expect <<-EOF && - commit $commit - Reflog: master@{0} (C O Mitter <committer@example.com>) - Reflog message: branch: Created from HEAD - Author: A U Thor <author@example.com> - Date: Thu Apr 7 15:15:13 2005 -0700 +commit=$(git rev-parse HEAD) +cat >expect <<EOF +commit $commit +Reflog: master@{0} (C O Mitter <committer@example.com>) +Reflog message: branch: Created from HEAD +Author: A U Thor <author@example.com> +Date: Thu Apr 7 15:15:13 2005 -0700 - 3 - EOF + 3 +EOF +test_expect_success 'log -g other@{u}' ' git log -1 -g other@{u} >actual && test_cmp expect actual ' -test_expect_success 'log -g other@{u}@{now}' ' - commit=$(git rev-parse HEAD) && - cat >expect <<-EOF && - commit $commit - Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>) - Reflog message: branch: Created from HEAD - Author: A U Thor <author@example.com> - Date: Thu Apr 7 15:15:13 2005 -0700 +cat >expect <<EOF +commit $commit +Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>) +Reflog message: branch: Created from HEAD +Author: A U Thor <author@example.com> +Date: Thu Apr 7 15:15:13 2005 -0700 - 3 - EOF + 3 +EOF + +test_expect_success 'log -g other@{u}@{now}' ' git log -1 -g other@{u}@{now} >actual && test_cmp expect actual ' diff --git a/third_party/git/t/t1512-rev-parse-disambiguation.sh b/third_party/git/t/t1512-rev-parse-disambiguation.sh index 18fa6cf40d..c19fb500cb 100755 --- a/third_party/git/t/t1512-rev-parse-disambiguation.sh +++ b/third_party/git/t/t1512-rev-parse-disambiguation.sh @@ -282,7 +282,7 @@ test_expect_success 'rev-parse --disambiguate' ' # commits created by commit-tree in earlier tests share a # different prefix. git rev-parse --disambiguate=000000000 >actual && - test_line_count = 16 actual && + test $(wc -l <actual) = 16 && test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000 ' @@ -339,7 +339,7 @@ test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' ' test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' ' test_must_fail git rev-parse 000000000^{commit} 2>stderr && grep ^hint: stderr >hints && - # 5 commits, 1 tag (which is a committish), plus intro line + # 5 commits, 1 tag (which is a commitish), plus intro line test_line_count = 7 hints ' diff --git a/third_party/git/t/t1600-index.sh b/third_party/git/t/t1600-index.sh index b7c31aa86a..42962ed7d4 100755 --- a/third_party/git/t/t1600-index.sh +++ b/third_party/git/t/t1600-index.sh @@ -59,42 +59,17 @@ test_expect_success 'out of bounds index.version issues warning' ' ) ' -test_index_version () { - INDEX_VERSION_CONFIG=$1 && - FEATURE_MANY_FILES=$2 && - ENV_VAR_VERSION=$3 - EXPECTED_OUTPUT_VERSION=$4 && +test_expect_success 'GIT_INDEX_VERSION takes precedence over config' ' ( rm -f .git/index && - rm -f .git/config && - if test "$INDEX_VERSION_CONFIG" -ne 0 - then - git config --add index.version $INDEX_VERSION_CONFIG - fi && - git config --add feature.manyFiles $FEATURE_MANY_FILES - if test "$ENV_VAR_VERSION" -ne 0 - then - GIT_INDEX_VERSION=$ENV_VAR_VERSION && - export GIT_INDEX_VERSION - else - unset GIT_INDEX_VERSION - fi && + GIT_INDEX_VERSION=4 && + export GIT_INDEX_VERSION && + git config --add index.version 2 && git add a 2>&1 && - echo $EXPECTED_OUTPUT_VERSION >expect && + echo 4 >expect && test-tool index-version <.git/index >actual && test_cmp expect actual ) -} - -test_expect_success 'index version config precedence' ' - test_index_version 0 false 0 2 && - test_index_version 2 false 0 2 && - test_index_version 3 false 0 2 && - test_index_version 4 false 0 4 && - test_index_version 2 false 4 4 && - test_index_version 2 true 0 2 && - test_index_version 0 true 0 4 && - test_index_version 0 true 2 2 ' test_done diff --git a/third_party/git/t/t2018-checkout-branch.sh b/third_party/git/t/t2018-checkout-branch.sh index bbca7ef8da..822381dd9d 100755 --- a/third_party/git/t/t2018-checkout-branch.sh +++ b/third_party/git/t/t2018-checkout-branch.sh @@ -1,76 +1,50 @@ #!/bin/sh -test_description='checkout' +test_description='checkout ' . ./test-lib.sh -# Arguments: [!] <branch> <oid> [<checkout options>] +# Arguments: <branch> <sha> [<checkout options>] # # Runs "git checkout" to switch to <branch>, testing that # # 1) we are on the specified branch, <branch>; -# 2) HEAD is <oid>; if <oid> is not specified, the old HEAD is used. +# 2) HEAD is <sha>; if <sha> is not specified, the old HEAD is used. # # If <checkout options> is not specified, "git checkout" is run with -b. -# -# If the first argument is `!`, "git checkout" is expected to fail when -# it is run. -do_checkout () { - should_fail= && - if test "x$1" = "x!" - then - should_fail=yes && - shift - fi && +do_checkout() { exp_branch=$1 && exp_ref="refs/heads/$exp_branch" && - # if <oid> is not specified, use HEAD. - exp_oid=${2:-$(git rev-parse --verify HEAD)} && + # if <sha> is not specified, use HEAD. + exp_sha=${2:-$(git rev-parse --verify HEAD)} && # default options for git checkout: -b - if test -z "$3" - then + if [ -z "$3" ]; then opts="-b" else opts="$3" fi - if test -n "$should_fail" - then - test_must_fail git checkout $opts $exp_branch $exp_oid - else - git checkout $opts $exp_branch $exp_oid && - echo "$exp_ref" >ref.expect && - git rev-parse --symbolic-full-name HEAD >ref.actual && - test_cmp ref.expect ref.actual && - echo "$exp_oid" >oid.expect && - git rev-parse --verify HEAD >oid.actual && - test_cmp oid.expect oid.actual - fi -} + git checkout $opts $exp_branch $exp_sha && -test_dirty_unmergeable () { - test_expect_code 1 git diff --exit-code + test $exp_ref = $(git rev-parse --symbolic-full-name HEAD) && + test $exp_sha = $(git rev-parse --verify HEAD) } -test_dirty_unmergeable_discards_changes () { - git diff --exit-code +test_dirty_unmergeable() { + ! git diff --exit-code >/dev/null } -setup_dirty_unmergeable () { +setup_dirty_unmergeable() { echo >>file1 change2 } -test_dirty_mergeable () { - test_expect_code 1 git diff --cached --exit-code -} - -test_dirty_mergeable_discards_changes () { - git diff --cached --exit-code +test_dirty_mergeable() { + ! git diff --cached --exit-code >/dev/null } -setup_dirty_mergeable () { +setup_dirty_mergeable() { echo >file2 file2 && git add file2 } @@ -108,7 +82,7 @@ test_expect_success 'checkout -b to a new branch, set to an explicit ref' ' test_expect_success 'checkout -b to a new branch with unmergeable changes fails' ' setup_dirty_unmergeable && - do_checkout ! branch2 $HEAD1 && + test_must_fail do_checkout branch2 $HEAD1 && test_dirty_unmergeable ' @@ -119,7 +93,7 @@ test_expect_success 'checkout -f -b to a new branch with unmergeable changes dis # still dirty and on branch1 do_checkout branch2 $HEAD1 "-f -b" && - test_dirty_unmergeable_discards_changes + test_must_fail test_dirty_unmergeable ' test_expect_success 'checkout -b to a new branch preserves mergeable changes' ' @@ -137,12 +111,12 @@ test_expect_success 'checkout -f -b to a new branch with mergeable changes disca test_when_finished git reset --hard HEAD && setup_dirty_mergeable && do_checkout branch2 $HEAD1 "-f -b" && - test_dirty_mergeable_discards_changes + test_must_fail test_dirty_mergeable ' test_expect_success 'checkout -b to an existing branch fails' ' test_when_finished git reset --hard HEAD && - do_checkout ! branch2 $HEAD2 + test_must_fail do_checkout branch2 $HEAD2 ' test_expect_success 'checkout -b to @{-1} fails with the right branch name' ' @@ -166,8 +140,7 @@ test_expect_success 'checkout -B to a merge base' ' ' test_expect_success 'checkout -B to an existing branch from detached HEAD resets branch to HEAD' ' - head=$(git rev-parse --verify HEAD) && - git checkout "$head" && + git checkout $(git rev-parse --verify HEAD) && do_checkout branch2 "" -B ' @@ -182,14 +155,14 @@ test_expect_success 'checkout -B to an existing branch with unmergeable changes git checkout branch1 && setup_dirty_unmergeable && - do_checkout ! branch2 $HEAD1 -B && + test_must_fail do_checkout branch2 $HEAD1 -B && test_dirty_unmergeable ' test_expect_success 'checkout -f -B to an existing branch with unmergeable changes discards changes' ' # still dirty and on branch1 do_checkout branch2 $HEAD1 "-f -B" && - test_dirty_unmergeable_discards_changes + test_must_fail test_dirty_unmergeable ' test_expect_success 'checkout -B to an existing branch preserves mergeable changes' ' @@ -206,7 +179,7 @@ test_expect_success 'checkout -f -B to an existing branch with mergeable changes setup_dirty_mergeable && do_checkout branch2 $HEAD1 "-f -B" && - test_dirty_mergeable_discards_changes + test_must_fail test_dirty_mergeable ' test_expect_success 'checkout -b <describe>' ' diff --git a/third_party/git/t/t2022-checkout-paths.sh b/third_party/git/t/t2022-checkout-paths.sh index 6844afafc0..fc3eb43b89 100755 --- a/third_party/git/t/t2022-checkout-paths.sh +++ b/third_party/git/t/t2022-checkout-paths.sh @@ -78,15 +78,4 @@ test_expect_success 'do not touch files that are already up-to-date' ' test_cmp expect actual ' -test_expect_success 'checkout HEAD adds deleted intent-to-add file back to index' ' - echo "nonempty" >nonempty && - >empty && - git add nonempty empty && - git commit -m "create files to be deleted" && - git rm --cached nonempty empty && - git add -N nonempty empty && - git checkout HEAD nonempty empty && - git diff --cached --exit-code -' - test_done diff --git a/third_party/git/t/t2024-checkout-dwim.sh b/third_party/git/t/t2024-checkout-dwim.sh index accfa9aa4b..fa0718c730 100755 --- a/third_party/git/t/t2024-checkout-dwim.sh +++ b/third_party/git/t/t2024-checkout-dwim.sh @@ -37,9 +37,7 @@ test_expect_success 'setup' ' git checkout -b foo && test_commit a_foo && git checkout -b bar && - test_commit a_bar && - git checkout -b ambiguous_branch_and_file && - test_commit a_ambiguous_branch_and_file + test_commit a_bar ) && git init repo_b && ( @@ -48,9 +46,7 @@ test_expect_success 'setup' ' git checkout -b foo && test_commit b_foo && git checkout -b baz && - test_commit b_baz && - git checkout -b ambiguous_branch_and_file && - test_commit b_ambiguous_branch_and_file + test_commit b_baz ) && git remote add repo_a repo_a && git remote add repo_b repo_b && @@ -79,26 +75,6 @@ test_expect_success 'checkout of branch from multiple remotes fails #1' ' test_branch master ' -test_expect_success 'when arg matches multiple remotes, do not fallback to interpreting as pathspec' ' - # create a file with name matching remote branch name - git checkout -b t_ambiguous_branch_and_file && - >ambiguous_branch_and_file && - git add ambiguous_branch_and_file && - git commit -m "ambiguous_branch_and_file" && - - # modify file to verify that it will not be touched by checkout - test_when_finished "git checkout -- ambiguous_branch_and_file" && - echo "file contents" >ambiguous_branch_and_file && - cp ambiguous_branch_and_file expect && - - test_must_fail git checkout ambiguous_branch_and_file 2>err && - - test_i18ngrep "matched multiple (2) remote tracking branches" err && - - # file must not be altered - test_cmp expect ambiguous_branch_and_file -' - test_expect_success 'checkout of branch from multiple remotes fails with advice' ' git checkout -B master && test_might_fail git branch -D foo && diff --git a/third_party/git/t/t2026-checkout-pathspec-file.sh b/third_party/git/t/t2026-checkout-pathspec-file.sh deleted file mode 100755 index 43d31d7948..0000000000 --- a/third_party/git/t/t2026-checkout-pathspec-file.sh +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/sh - -test_description='checkout --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - test_commit file0 && - - echo 1 >fileA.t && - echo 1 >fileB.t && - echo 1 >fileC.t && - echo 1 >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && - git commit -m "files 1" && - - echo 2 >fileA.t && - echo 2 >fileB.t && - echo 2 >fileC.t && - echo 2 >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && - git commit -m "files 2" && - - git tag checkpoint -' - -restore_checkpoint () { - git reset --hard checkpoint -} - -verify_expect () { - git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual && - test_cmp expect actual -} - -test_expect_success '--pathspec-from-file from stdin' ' - restore_checkpoint && - - echo fileA.t | git checkout --pathspec-from-file=- HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - EOF - verify_expect -' - -test_expect_success '--pathspec-from-file from file' ' - restore_checkpoint && - - echo fileA.t >list && - git checkout --pathspec-from-file=list HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - EOF - verify_expect -' - -test_expect_success 'NUL delimiters' ' - restore_checkpoint && - - printf "fileA.t\0fileB.t\0" | git checkout --pathspec-from-file=- --pathspec-file-nul HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'LF delimiters' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t\n" | git checkout --pathspec-from-file=- HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'no trailing delimiter' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t" | git checkout --pathspec-from-file=- HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'CRLF delimiters' ' - restore_checkpoint && - - printf "fileA.t\r\nfileB.t\r\n" | git checkout --pathspec-from-file=- HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'quotes' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - git checkout --pathspec-from-file=list HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - EOF - verify_expect -' - -test_expect_success 'quotes not compatible with --pathspec-file-nul' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1 -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 && - - cat >expect <<-\EOF && - M fileB.t - M fileC.t - EOF - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo fileA.t >list && - - test_must_fail git checkout --pathspec-from-file=list --detach 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --detach" err && - - test_must_fail git checkout --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err && - - test_must_fail git checkout --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git checkout --pathspec-file-nul 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err -' - -test_done diff --git a/third_party/git/t/t2070-restore.sh b/third_party/git/t/t2070-restore.sh index 076d0df7fc..2650df1966 100755 --- a/third_party/git/t/t2070-restore.sh +++ b/third_party/git/t/t2070-restore.sh @@ -95,32 +95,4 @@ test_expect_success 'restore --ignore-unmerged ignores unmerged entries' ' ) ' -test_expect_success 'restore --staged adds deleted intent-to-add file back to index' ' - echo "nonempty" >nonempty && - >empty && - git add nonempty empty && - git commit -m "create files to be deleted" && - git rm --cached nonempty empty && - git add -N nonempty empty && - git restore --staged nonempty empty && - git diff --cached --exit-code -' - -test_expect_success 'restore --staged invalidates cache tree for deletions' ' - test_when_finished git reset --hard && - >new1 && - >new2 && - git add new1 new2 && - - # It is important to commit and then reset here, so that the index - # contains a valid cache-tree for the "both" tree. - git commit -m both && - git reset --soft HEAD^ && - - git restore --staged new1 && - git commit -m "just new2" && - git rev-parse HEAD:new2 && - test_must_fail git rev-parse HEAD:new1 -' - test_done diff --git a/third_party/git/t/t2072-restore-pathspec-file.sh b/third_party/git/t/t2072-restore-pathspec-file.sh deleted file mode 100755 index 0d47946e8a..0000000000 --- a/third_party/git/t/t2072-restore-pathspec-file.sh +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/sh - -test_description='restore --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - test_commit file0 && - - echo 1 >fileA.t && - echo 1 >fileB.t && - echo 1 >fileC.t && - echo 1 >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && - git commit -m "files 1" && - - echo 2 >fileA.t && - echo 2 >fileB.t && - echo 2 >fileC.t && - echo 2 >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && - git commit -m "files 2" && - - git tag checkpoint -' - -restore_checkpoint () { - git reset --hard checkpoint -} - -verify_expect () { - git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual && - test_cmp expect actual -} - -test_expect_success '--pathspec-from-file from stdin' ' - restore_checkpoint && - - echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - EOF - verify_expect -' - -test_expect_success '--pathspec-from-file from file' ' - restore_checkpoint && - - echo fileA.t >list && - git restore --pathspec-from-file=list --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - EOF - verify_expect -' - -test_expect_success 'NUL delimiters' ' - restore_checkpoint && - - printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'LF delimiters' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'no trailing delimiter' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'CRLF delimiters' ' - restore_checkpoint && - - printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - verify_expect -' - -test_expect_success 'quotes' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - git restore --pathspec-from-file=list --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileA.t - EOF - verify_expect -' - -test_expect_success 'quotes not compatible with --pathspec-file-nul' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1 -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 && - - cat >expect <<-\EOF && - M fileB.t - M fileC.t - EOF - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo fileA.t >list && - >empty_list && - - test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err && - - test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err && - - test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err && - test_i18ngrep -e "you must specify path(s) to restore" err -' - -test_done diff --git a/third_party/git/t/t2107-update-index-basic.sh b/third_party/git/t/t2107-update-index-basic.sh index a30b7ca6bc..2242cd098e 100755 --- a/third_party/git/t/t2107-update-index-basic.sh +++ b/third_party/git/t/t2107-update-index-basic.sh @@ -9,6 +9,7 @@ Tests for command-line parsing and basic operation. test_expect_success 'update-index --nonsense fails' ' test_must_fail git update-index --nonsense 2>msg && + cat msg && test -s msg ' diff --git a/third_party/git/t/t2400-worktree-add.sh b/third_party/git/t/t2400-worktree-add.sh index 5a7495474a..e819ba741e 100755 --- a/third_party/git/t/t2400-worktree-add.sh +++ b/third_party/git/t/t2400-worktree-add.sh @@ -438,7 +438,7 @@ test_expect_success 'git worktree add does not match remote' ' cd foo && test_must_fail git config "branch.foo.remote" && test_must_fail git config "branch.foo.merge" && - test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo + ! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo ) ' @@ -483,7 +483,7 @@ test_expect_success 'git worktree --no-guess-remote option overrides config' ' cd foo && test_must_fail git config "branch.foo.remote" && test_must_fail git config "branch.foo.merge" && - test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo + ! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo ) ' @@ -570,15 +570,6 @@ test_expect_success '"add" an existing locked but missing worktree' ' git worktree add --force --force --detach gnoo ' -test_expect_success '"add" not tripped up by magic worktree matching"' ' - # if worktree "sub1/bar" exists, "git worktree add bar" in distinct - # directory `sub2` should not mistakenly complain that `bar` is an - # already-registered worktree - mkdir sub1 sub2 && - git -C sub1 --git-dir=../.git worktree add --detach bozo && - git -C sub2 --git-dir=../.git worktree add --detach bozo -' - test_expect_success FUNNYNAMES 'sanitize generated worktree name' ' git worktree add --detach ". weird*..?.lock.lock" && test -d .git/worktrees/---weird-.- @@ -596,28 +587,4 @@ test_expect_success '"add" should not fail because of another bad worktree' ' ) ' -test_expect_success '"add" with uninitialized submodule, with submodule.recurse unset' ' - test_create_repo submodule && - test_commit -C submodule first && - test_create_repo project && - git -C project submodule add ../submodule && - git -C project add submodule && - test_tick && - git -C project commit -m add_sub && - git clone project project-clone && - git -C project-clone worktree add ../project-2 -' -test_expect_success '"add" with uninitialized submodule, with submodule.recurse set' ' - git -C project-clone -c submodule.recurse worktree add ../project-3 -' - -test_expect_success '"add" with initialized submodule, with submodule.recurse unset' ' - git -C project-clone submodule update --init && - git -C project-clone worktree add ../project-4 -' - -test_expect_success '"add" with initialized submodule, with submodule.recurse set' ' - git -C project-clone -c submodule.recurse worktree add ../project-5 -' - test_done diff --git a/third_party/git/t/t2402-worktree-list.sh b/third_party/git/t/t2402-worktree-list.sh index 69ffe865b4..bb6fb9b12c 100755 --- a/third_party/git/t/t2402-worktree-list.sh +++ b/third_party/git/t/t2402-worktree-list.sh @@ -151,10 +151,4 @@ test_expect_success 'linked worktrees are sorted' ' test_cmp expected sorted/main/actual ' -test_expect_success 'worktree path when called in .git directory' ' - git worktree list >list1&& - git -C .git worktree list >list2 && - test_cmp list1 list2 -' - test_done diff --git a/third_party/git/t/t2405-worktree-submodule.sh b/third_party/git/t/t2405-worktree-submodule.sh deleted file mode 100755 index e1b2bfd87e..0000000000 --- a/third_party/git/t/t2405-worktree-submodule.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -test_description='Combination of submodules and multiple worktrees' - -. ./test-lib.sh - -base_path=$(pwd -P) - -test_expect_success 'setup: create origin repos' ' - git init origin/sub && - test_commit -C origin/sub file1 && - git init origin/main && - test_commit -C origin/main first && - git -C origin/main submodule add ../sub && - git -C origin/main commit -m "add sub" && - test_commit -C origin/sub "file1 updated" file1 file1updated file1updated && - git -C origin/main/sub pull && - git -C origin/main add sub && - git -C origin/main commit -m "sub updated" -' - -test_expect_success 'setup: clone superproject to create main worktree' ' - git clone --recursive "$base_path/origin/main" main -' - -rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1") -rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1") - -test_expect_success 'add superproject worktree' ' - git -C main worktree add "$base_path/worktree" "$rev1_hash_main" -' - -test_expect_failure 'submodule is checked out just after worktree add' ' - git -C worktree diff --submodule master"^!" >out && - grep "file1 updated" out -' - -test_expect_success 'add superproject worktree and initialize submodules' ' - git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" && - git -C worktree-submodule-update submodule update -' - -test_expect_success 'submodule is checked out just after submodule update in linked worktree' ' - git -C worktree-submodule-update diff --submodule master"^!" >out && - grep "file1 updated" out -' - -test_expect_success 'add superproject worktree and manually add submodule worktree' ' - git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" && - git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub" -' - -test_expect_success 'submodule is checked out after manually adding submodule worktree' ' - git -C linked_submodule diff --submodule master"^!" >out && - grep "file1 updated" out -' - -test_expect_success 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree' ' - git -C main worktree add "$base_path/checkout-recurse" --detach && - git -C checkout-recurse submodule update --init && - echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile && - cat checkout-recurse/sub/.git >actual-gitfile && - test_cmp expect-gitfile actual-gitfile && - git -C main/sub rev-parse HEAD >expect-head-main && - git -C checkout-recurse checkout --recurse-submodules HEAD~1 && - cat checkout-recurse/sub/.git >actual-gitfile && - git -C main/sub rev-parse HEAD >actual-head-main && - test_cmp expect-gitfile actual-gitfile && - test_cmp expect-head-main actual-head-main -' - -test_expect_success 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config' ' - echo "../../../sub" >expect-main && - git -C main/sub config --get core.worktree >actual-main && - test_cmp expect-main actual-main && - echo "../../../../../../checkout-recurse/sub" >expect-linked && - git -C checkout-recurse/sub config --get core.worktree >actual-linked && - test_cmp expect-linked actual-linked && - git -C checkout-recurse checkout --recurse-submodules first && - test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config && - test_must_be_empty linked-config && - git -C main/sub config --get core.worktree >actual-main && - test_cmp expect-main actual-main -' - -test_expect_success 'unsetting core.worktree does not prevent running commands directly against the submodule repository' ' - git -C main/.git/worktrees/checkout-recurse/modules/sub log -' - -test_done diff --git a/third_party/git/t/t3005-ls-files-relative.sh b/third_party/git/t/t3005-ls-files-relative.sh index 2ec69a8a26..209b4c7cd8 100755 --- a/third_party/git/t/t3005-ls-files-relative.sh +++ b/third_party/git/t/t3005-ls-files-relative.sh @@ -7,6 +7,10 @@ This test runs git ls-files with various relative path arguments. . ./test-lib.sh +new_line=' +' +sq=\' + test_expect_success 'prepare' ' : >never-mind-me && git add never-mind-me && @@ -40,9 +44,9 @@ test_expect_success 'ls-files -c' ' cd top/sub && for f in ../y* do - echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git" + echo "error: pathspec $sq$f$sq did not match any file(s) known to git" done >expect.err && - echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err && + echo "Did you forget to ${sq}git add${sq}?" >>expect.err && ls ../x* >expect.out && test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err && test_cmp expect.out actual.out && @@ -55,9 +59,9 @@ test_expect_success 'ls-files -o' ' cd top/sub && for f in ../x* do - echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git" + echo "error: pathspec $sq$f$sq did not match any file(s) known to git" done >expect.err && - echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err && + echo "Did you forget to ${sq}git add${sq}?" >>expect.err && ls ../y* >expect.out && test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err && test_cmp expect.out actual.out && diff --git a/third_party/git/t/t3007-ls-files-recurse-submodules.sh b/third_party/git/t/t3007-ls-files-recurse-submodules.sh index 4a08000713..318b5bce7e 100755 --- a/third_party/git/t/t3007-ls-files-recurse-submodules.sh +++ b/third_party/git/t/t3007-ls-files-recurse-submodules.sh @@ -130,6 +130,7 @@ test_expect_success '--recurse-submodules and pathspecs setup' ' git ls-files --recurse-submodules >actual && test_cmp expect actual && + cat actual && git ls-files --recurse-submodules "*" >actual && test_cmp expect actual ' diff --git a/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh b/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh index 85f3704958..64f047332b 100755 --- a/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh +++ b/third_party/git/t/t3008-ls-files-lazy-init-name-hash.sh @@ -4,7 +4,7 @@ test_description='Test the lazy init name hash with various folder structures' . ./test-lib.sh -if test 1 -eq $(test-tool online-cpus) +if test 1 -eq $($GIT_BUILD_DIR/t/helper/test-tool online-cpus) then skip_all='skipping lazy-init tests, single cpu' test_done diff --git a/third_party/git/t/t3011-common-prefixes-and-directory-traversal.sh b/third_party/git/t/t3011-common-prefixes-and-directory-traversal.sh deleted file mode 100755 index 3da5b2b6e7..0000000000 --- a/third_party/git/t/t3011-common-prefixes-and-directory-traversal.sh +++ /dev/null @@ -1,209 +0,0 @@ -#!/bin/sh - -test_description='directory traversal handling, especially with common prefixes' - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit hello && - - >empty && - mkdir untracked_dir && - >untracked_dir/empty && - git init untracked_repo && - >untracked_repo/empty && - - cat <<-EOF >.gitignore && - ignored - an_ignored_dir/ - EOF - mkdir an_ignored_dir && - mkdir an_untracked_dir && - >an_ignored_dir/ignored && - >an_ignored_dir/untracked && - >an_untracked_dir/ignored && - >an_untracked_dir/untracked -' - -test_expect_success 'git ls-files -o shows the right entries' ' - cat <<-EOF >expect && - .gitignore - actual - an_ignored_dir/ignored - an_ignored_dir/untracked - an_untracked_dir/ignored - an_untracked_dir/untracked - empty - expect - untracked_dir/empty - untracked_repo/ - EOF - git ls-files -o >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o --exclude-standard shows the right entries' ' - cat <<-EOF >expect && - .gitignore - actual - an_untracked_dir/untracked - empty - expect - untracked_dir/empty - untracked_repo/ - EOF - git ls-files -o --exclude-standard >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o untracked_dir recurses' ' - echo untracked_dir/empty >expect && - git ls-files -o untracked_dir >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o untracked_dir/ recurses' ' - echo untracked_dir/empty >expect && - git ls-files -o untracked_dir/ >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o --directory untracked_dir does not recurse' ' - echo untracked_dir/ >expect && - git ls-files -o --directory untracked_dir >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o --directory untracked_dir/ does not recurse' ' - echo untracked_dir/ >expect && - git ls-files -o --directory untracked_dir/ >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o untracked_repo does not recurse' ' - echo untracked_repo/ >expect && - git ls-files -o untracked_repo >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o untracked_repo/ does not recurse' ' - echo untracked_repo/ >expect && - git ls-files -o untracked_repo/ >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only' ' - cat <<-EOF >expect && - untracked_dir/empty - untracked_repo/ - EOF - git ls-files -o untracked_dir untracked_repo >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only' ' - cat <<-EOF >expect && - untracked_dir/empty - untracked_repo/ - EOF - git ls-files -o untracked_dir/ untracked_repo/ >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o --directory untracked_dir untracked_repo does not recurse' ' - cat <<-EOF >expect && - untracked_dir/ - untracked_repo/ - EOF - git ls-files -o --directory untracked_dir untracked_repo >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse' ' - cat <<-EOF >expect && - untracked_dir/ - untracked_repo/ - EOF - git ls-files -o --directory untracked_dir/ untracked_repo/ >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o .git shows nothing' ' - git ls-files -o .git >actual && - test_must_be_empty actual -' - -test_expect_success 'git ls-files -o .git/ shows nothing' ' - git ls-files -o .git/ >actual && - test_must_be_empty actual -' - -test_expect_success FUNNYNAMES 'git ls-files -o untracked_* recurses appropriately' ' - mkdir "untracked_*" && - >"untracked_*/empty" && - - cat <<-EOF >expect && - untracked_*/empty - untracked_dir/empty - untracked_repo/ - EOF - git ls-files -o "untracked_*" >actual && - test_cmp expect actual -' - -# It turns out fill_directory returns the right paths, but ls-files' post-call -# filtering in show_dir_entry() via calling dir_path_match() which ends up -# in git_fnmatch() has logic for PATHSPEC_ONESTAR that assumes the pathspec -# must match the full path; it doesn't check it for matching a leading -# directory. -test_expect_failure FUNNYNAMES 'git ls-files -o untracked_*/ recurses appropriately' ' - cat <<-EOF >expect && - untracked_*/empty - untracked_dir/empty - untracked_repo/ - EOF - git ls-files -o "untracked_*/" >actual && - test_cmp expect actual -' - -test_expect_success FUNNYNAMES 'git ls-files -o --directory untracked_* does not recurse' ' - cat <<-EOF >expect && - untracked_*/ - untracked_dir/ - untracked_repo/ - EOF - git ls-files -o --directory "untracked_*" >actual && - test_cmp expect actual -' - -test_expect_success FUNNYNAMES 'git ls-files -o --directory untracked_*/ does not recurse' ' - cat <<-EOF >expect && - untracked_*/ - untracked_dir/ - untracked_repo/ - EOF - git ls-files -o --directory "untracked_*/" >actual && - test_cmp expect actual -' - -test_expect_success 'git ls-files -o consistent between one or two dirs' ' - git ls-files -o --exclude-standard an_ignored_dir/ an_untracked_dir/ >tmp && - ! grep ^an_ignored_dir/ tmp >expect && - git ls-files -o --exclude-standard an_ignored_dir/ >actual && - test_cmp expect actual -' - -# ls-files doesn't have a way to request showing both untracked and ignored -# files at the same time, so use `git status --ignored` -test_expect_success 'git status --ignored shows same files under dir with or without pathspec' ' - cat <<-EOF >expect && - ?? an_untracked_dir/ - !! an_untracked_dir/ignored - EOF - git status --porcelain --ignored >output && - grep an_untracked_dir output >expect && - git status --porcelain --ignored an_untracked_dir/ >actual && - test_cmp expect actual -' - -test_done diff --git a/third_party/git/t/t3030-merge-recursive.sh b/third_party/git/t/t3030-merge-recursive.sh index d48d211a95..ff641b348a 100755 --- a/third_party/git/t/t3030-merge-recursive.sh +++ b/third_party/git/t/t3030-merge-recursive.sh @@ -452,34 +452,6 @@ test_expect_success 'merge-recursive d/f conflict result' ' ' -test_expect_success SYMLINKS 'dir in working tree with symlink ancestor does not produce d/f conflict' ' - git init sym && - ( - cd sym && - ln -s . foo && - mkdir bar && - >bar/file && - git add foo bar/file && - git commit -m "foo symlink" && - - git checkout -b branch1 && - git commit --allow-empty -m "empty commit" && - - git checkout master && - git rm foo && - mkdir foo && - >foo/bar && - git add foo/bar && - git commit -m "replace foo symlink with real foo dir and foo/bar file" && - - git checkout branch1 && - - git cherry-pick master && - test_path_is_dir foo && - test_path_is_file foo/bar - ) -' - test_expect_success 'reset and 3-way merge' ' git reset --hard "$c2" && @@ -604,7 +576,7 @@ test_expect_success 'merge removes empty directories' ' git commit -mremoved-d/e && git checkout master && git merge -s recursive rm && - test_path_is_missing d + test_must_fail test -d d ' test_expect_success 'merge-recursive simple w/submodule' ' @@ -695,22 +667,15 @@ test_expect_success 'merging with triple rename across D/F conflict' ' test_expect_success 'merge-recursive remembers the names of all base trees' ' git reset --hard HEAD && - # make the index match $c1 so that merge-recursive below does not - # fail early - git diff --binary HEAD $c1 -- | git apply --cached && - # more trees than static slots used by oid_to_hex() for commit in $c0 $c2 $c4 $c5 $c6 $c7 do git rev-parse "$commit^{tree}" done >trees && - # ignore the return code; it only fails because the input is weird... + # ignore the return code -- it only fails because the input is weird test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out && - # ...but make sure it fails in the expected way - test_i18ngrep CONFLICT.*rename/rename out && - # merge-recursive prints in reverse order, but we do not care sort <trees >expect && sed -n "s/^virtual //p" out | sort >actual && diff --git a/third_party/git/t/t3035-merge-sparse.sh b/third_party/git/t/t3035-merge-sparse.sh index 74562e1235..c4b4a94324 100755 --- a/third_party/git/t/t3035-merge-sparse.sh +++ b/third_party/git/t/t3035-merge-sparse.sh @@ -28,7 +28,7 @@ test_expect_success 'setup' ' git config core.sparseCheckout true && echo "/checked-out" >.git/info/sparse-checkout && git reset --hard && - test_must_fail git merge theirs + ! git merge theirs ' test_expect_success 'reset --hard works after the conflict' ' @@ -42,7 +42,7 @@ test_expect_success 'is reset properly' ' ' test_expect_success 'setup: conflict back' ' - test_must_fail git merge theirs + ! git merge theirs ' test_expect_success 'Merge abort works after the conflict' ' diff --git a/third_party/git/t/t3060-ls-files-with-tree.sh b/third_party/git/t/t3060-ls-files-with-tree.sh index 52ed665fcd..44f378ce41 100755 --- a/third_party/git/t/t3060-ls-files-with-tree.sh +++ b/third_party/git/t/t3060-ls-files-with-tree.sh @@ -47,7 +47,7 @@ test_expect_success setup ' git add . ' -test_expect_success 'git ls-files --with-tree should succeed from subdir' ' +test_expect_success 'git -ls-files --with-tree should succeed from subdir' ' # We have to run from a sub-directory to trigger prune_path # Then we finally get to run our --with-tree test ( @@ -57,7 +57,7 @@ test_expect_success 'git ls-files --with-tree should succeed from subdir' ' ' test_expect_success \ - 'git ls-files --with-tree should add entries from named tree.' \ + 'git -ls-files --with-tree should add entries from named tree.' \ 'test_cmp expected output' test_done diff --git a/third_party/git/t/t3201-branch-contains.sh b/third_party/git/t/t3201-branch-contains.sh index 40251c9f8f..0ea4fc4694 100755 --- a/third_party/git/t/t3201-branch-contains.sh +++ b/third_party/git/t/t3201-branch-contains.sh @@ -192,10 +192,10 @@ test_expect_success 'branch --merged with --verbose' ' EOF test_cmp expect actual && git branch --verbose --merged topic >actual && - cat >expect <<-EOF && - master $(git rev-parse --short master) second on master - * topic $(git rev-parse --short topic ) [ahead 1] foo - zzz $(git rev-parse --short zzz ) second on master + cat >expect <<-\EOF && + master c77a0a9 second on master + * topic 2c939f4 [ahead 1] foo + zzz c77a0a9 second on master EOF test_i18ncmp expect actual ' diff --git a/third_party/git/t/t3206-range-diff.sh b/third_party/git/t/t3206-range-diff.sh index bd808f87ed..ec548654ce 100755 --- a/third_party/git/t/t3206-range-diff.sh +++ b/third_party/git/t/t3206-range-diff.sh @@ -8,212 +8,97 @@ test_description='range-diff tests' # harm than good. We need some real history. test_expect_success 'setup' ' - git fast-import <"$TEST_DIRECTORY"/t3206/history.export && - test_oid_cache <<-\EOF - # topic - t1 sha1:4de457d - t2 sha1:fccce22 - t3 sha1:147e64e - t4 sha1:a63e992 - t1 sha256:b89f8b9 - t2 sha256:5f12aad - t3 sha256:ea8b273 - t4 sha256:14b7336 - - # unmodified - u1 sha1:35b9b25 - u2 sha1:de345ab - u3 sha1:9af6654 - u4 sha1:2901f77 - u1 sha256:e3731be - u2 sha256:14fadf8 - u3 sha256:736c4bc - u4 sha256:673e77d - - # reordered - r1 sha1:aca177a - r2 sha1:14ad629 - r3 sha1:ee58208 - r4 sha1:307b27a - r1 sha256:f59d3aa - r2 sha256:fb261a8 - r3 sha256:cb2649b - r4 sha256:958577e - - # removed (deleted) - d1 sha1:7657159 - d2 sha1:43d84d3 - d3 sha1:a740396 - d1 sha256:e312513 - d2 sha256:eb19258 - d3 sha256:1ccb3c1 - - # added - a1 sha1:2716022 - a2 sha1:b62accd - a3 sha1:df46cfa - a4 sha1:3e64548 - a5 sha1:12b4063 - a1 sha256:d724f4d - a2 sha256:1de7762 - a3 sha256:e159431 - a4 sha256:b3e483c - a5 sha256:90866a7 - - # rebased - b1 sha1:cc9c443 - b2 sha1:c5d9641 - b3 sha1:28cc2b6 - b4 sha1:5628ab7 - b5 sha1:a31b12e - b1 sha256:a1a8717 - b2 sha256:20a5862 - b3 sha256:587172a - b4 sha256:2721c5d - b5 sha256:7b57864 - - # changed - c1 sha1:a4b3333 - c2 sha1:f51d370 - c3 sha1:0559556 - c4 sha1:d966c5c - c1 sha256:f8c2b9d - c2 sha256:3fb6318 - c3 sha256:168ab68 - c4 sha256:3526539 - - # changed-message - m1 sha1:f686024 - m2 sha1:4ab067d - m3 sha1:b9cb956 - m4 sha1:8add5f1 - m1 sha256:31e6281 - m2 sha256:a06bf1b - m3 sha256:82dc654 - m4 sha256:48470c5 - - # renamed - n1 sha1:f258d75 - n2 sha1:017b62d - n3 sha1:3ce7af6 - n4 sha1:1e6226b - n1 sha256:ad52114 - n2 sha256:3b54c8f - n3 sha256:3b0a644 - n4 sha256:e461653 - - # mode change - o1 sha1:4d39cb3 - o2 sha1:26c107f - o3 sha1:4c1e0f5 - o1 sha256:d0dd598 - o2 sha256:c4a279e - o3 sha256:78459d7 - - # added and removed - s1 sha1:096b1ba - s2 sha1:d92e698 - s3 sha1:9a1db4d - s4 sha1:fea3b5c - s1 sha256:a7f9134 - s2 sha256:b4c2580 - s3 sha256:1d62aa2 - s4 sha256:48160e8 - - # Empty delimiter (included so lines match neatly) - __ sha1:------- - __ sha256:------- - EOF + git fast-import < "$TEST_DIRECTORY"/t3206/history.export ' test_expect_success 'simple A..B A..C (unmodified)' ' git range-diff --no-color master..topic master..unmodified \ >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ - 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ - 4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/ + cat >expected <<-EOF && + 1: 4de457d = 1: 35b9b25 s/5/A/ + 2: fccce22 = 2: de345ab s/4/A/ + 3: 147e64e = 3: 9af6654 s/11/B/ + 4: a63e992 = 4: 2901f77 s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'simple B...C (unmodified)' ' git range-diff --no-color topic...unmodified >actual && - # same "expect" as above - test_cmp expect actual + # same "expected" as above + test_cmp expected actual ' test_expect_success 'simple A B C (unmodified)' ' git range-diff --no-color master topic unmodified >actual && - # same "expect" as above - test_cmp expect actual + # same "expected" as above + test_cmp expected actual ' test_expect_success 'trivial reordering' ' git range-diff --no-color master topic reordered >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid r1) s/5/A/ - 3: $(test_oid t3) = 2: $(test_oid r2) s/11/B/ - 4: $(test_oid t4) = 3: $(test_oid r3) s/12/B/ - 2: $(test_oid t2) = 4: $(test_oid r4) s/4/A/ + cat >expected <<-EOF && + 1: 4de457d = 1: aca177a s/5/A/ + 3: 147e64e = 2: 14ad629 s/11/B/ + 4: a63e992 = 3: ee58208 s/12/B/ + 2: fccce22 = 4: 307b27a s/4/A/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'removed a commit' ' git range-diff --no-color master topic removed >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid d1) s/5/A/ - 2: $(test_oid t2) < -: $(test_oid __) s/4/A/ - 3: $(test_oid t3) = 2: $(test_oid d2) s/11/B/ - 4: $(test_oid t4) = 3: $(test_oid d3) s/12/B/ + cat >expected <<-EOF && + 1: 4de457d = 1: 7657159 s/5/A/ + 2: fccce22 < -: ------- s/4/A/ + 3: 147e64e = 2: 43d84d3 s/11/B/ + 4: a63e992 = 3: a740396 s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'added a commit' ' git range-diff --no-color master topic added >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid a1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid a2) s/4/A/ - -: $(test_oid __) > 3: $(test_oid a3) s/6/A/ - 3: $(test_oid t3) = 4: $(test_oid a4) s/11/B/ - 4: $(test_oid t4) = 5: $(test_oid a5) s/12/B/ + cat >expected <<-EOF && + 1: 4de457d = 1: 2716022 s/5/A/ + 2: fccce22 = 2: b62accd s/4/A/ + -: ------- > 3: df46cfa s/6/A/ + 3: 147e64e = 4: 3e64548 s/11/B/ + 4: a63e992 = 5: 12b4063 s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'new base, A B C' ' git range-diff --no-color master topic rebased >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid b1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid b2) s/4/A/ - 3: $(test_oid t3) = 3: $(test_oid b3) s/11/B/ - 4: $(test_oid t4) = 4: $(test_oid b4) s/12/B/ + cat >expected <<-EOF && + 1: 4de457d = 1: cc9c443 s/5/A/ + 2: fccce22 = 2: c5d9641 s/4/A/ + 3: 147e64e = 3: 28cc2b6 s/11/B/ + 4: a63e992 = 4: 5628ab7 s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'new base, B...C' ' # this syntax includes the commits from master! git range-diff --no-color topic...rebased >actual && - cat >expect <<-EOF && - -: $(test_oid __) > 1: $(test_oid b5) unrelated - 1: $(test_oid t1) = 2: $(test_oid b1) s/5/A/ - 2: $(test_oid t2) = 3: $(test_oid b2) s/4/A/ - 3: $(test_oid t3) = 4: $(test_oid b3) s/11/B/ - 4: $(test_oid t4) = 5: $(test_oid b4) s/12/B/ + cat >expected <<-EOF && + -: ------- > 1: a31b12e unrelated + 1: 4de457d = 2: cc9c443 s/5/A/ + 2: fccce22 = 3: c5d9641 s/4/A/ + 3: 147e64e = 4: 28cc2b6 s/11/B/ + 4: a63e992 = 5: 5628ab7 s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'changed commit' ' git range-diff --no-color topic...changed >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ - 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ + cat >expected <<-EOF && + 1: 4de457d = 1: a4b3333 s/5/A/ + 2: fccce22 = 2: f51d370 s/4/A/ + 3: 147e64e ! 3: 0559556 s/11/B/ @@ file: A 9 10 @@ -223,7 +108,7 @@ test_expect_success 'changed commit' ' 12 13 14 - 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ + 4: a63e992 ! 4: d966c5c s/12/B/ @@ file @@ file: A 9 @@ -234,45 +119,45 @@ test_expect_success 'changed commit' ' +B 13 EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'changed commit with --no-patch diff option' ' git range-diff --no-color --no-patch topic...changed >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ - 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ - 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ + cat >expected <<-EOF && + 1: 4de457d = 1: a4b3333 s/5/A/ + 2: fccce22 = 2: f51d370 s/4/A/ + 3: 147e64e ! 3: 0559556 s/11/B/ + 4: a63e992 ! 4: d966c5c s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'changed commit with --stat diff option' ' git range-diff --no-color --stat topic...changed >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ + cat >expected <<-EOF && + 1: 4de457d = 1: a4b3333 s/5/A/ a => b | 0 1 file changed, 0 insertions(+), 0 deletions(-) - 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ + 2: fccce22 = 2: f51d370 s/4/A/ a => b | 0 1 file changed, 0 insertions(+), 0 deletions(-) - 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ + 3: 147e64e ! 3: 0559556 s/11/B/ a => b | 0 1 file changed, 0 insertions(+), 0 deletions(-) - 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ + 4: a63e992 ! 4: d966c5c s/12/B/ a => b | 0 1 file changed, 0 insertions(+), 0 deletions(-) EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'changed commit with sm config' ' git range-diff --no-color --submodule=log topic...changed >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/ - 3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/ + cat >expected <<-EOF && + 1: 4de457d = 1: a4b3333 s/5/A/ + 2: fccce22 = 2: f51d370 s/4/A/ + 3: 147e64e ! 3: 0559556 s/11/B/ @@ file: A 9 10 @@ -282,7 +167,7 @@ test_expect_success 'changed commit with sm config' ' 12 13 14 - 4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/ + 4: a63e992 ! 4: d966c5c s/12/B/ @@ file @@ file: A 9 @@ -293,14 +178,14 @@ test_expect_success 'changed commit with sm config' ' +B 13 EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'renamed file' ' git range-diff --no-color --submodule=log topic...renamed-file >actual && - sed s/Z/\ /g >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid n1) s/5/A/ - 2: $(test_oid t2) ! 2: $(test_oid n2) s/4/A/ + sed s/Z/\ /g >expected <<-EOF && + 1: 4de457d = 1: f258d75 s/5/A/ + 2: fccce22 ! 2: 017b62d s/4/A/ @@ Metadata ZAuthor: Thomas Rast <trast@inf.ethz.ch> Z @@ -313,7 +198,7 @@ test_expect_success 'renamed file' ' Z@@ Z 1 Z 2 - 3: $(test_oid t3) ! 3: $(test_oid n3) s/11/B/ + 3: 147e64e ! 3: 3ce7af6 s/11/B/ @@ Metadata Z ## Commit message ## Z s/11/B/ @@ -325,7 +210,7 @@ test_expect_success 'renamed file' ' Z 8 Z 9 Z 10 - 4: $(test_oid t4) ! 4: $(test_oid n4) s/12/B/ + 4: a63e992 ! 4: 1e6226b s/12/B/ @@ Metadata Z ## Commit message ## Z s/12/B/ @@ -338,54 +223,14 @@ test_expect_success 'renamed file' ' Z 10 Z B EOF - test_cmp expect actual -' - -test_expect_success 'file with mode only change' ' - git range-diff --no-color --submodule=log topic...mode-only-change >actual && - sed s/Z/\ /g >expect <<-EOF && - 1: $(test_oid t2) ! 1: $(test_oid o1) s/4/A/ - @@ Metadata - ZAuthor: Thomas Rast <trast@inf.ethz.ch> - Z - Z ## Commit message ## - - s/4/A/ - + s/4/A/ + add other-file - Z - Z ## file ## - Z@@ - @@ file - Z A - Z 6 - Z 7 - + - + ## other-file (new) ## - 2: $(test_oid t3) ! 2: $(test_oid o2) s/11/B/ - @@ Metadata - ZAuthor: Thomas Rast <trast@inf.ethz.ch> - Z - Z ## Commit message ## - - s/11/B/ - + s/11/B/ + mode change other-file - Z - Z ## file ## - Z@@ file: A - @@ file: A - Z 12 - Z 13 - Z 14 - + - + ## other-file (mode change 100644 => 100755) ## - 3: $(test_oid t4) = 3: $(test_oid o3) s/12/B/ - EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'file added and later removed' ' git range-diff --no-color --submodule=log topic...added-removed >actual && - sed s/Z/\ /g >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid s1) s/5/A/ - 2: $(test_oid t2) ! 2: $(test_oid s2) s/4/A/ + sed s/Z/\ /g >expected <<-EOF && + 1: 4de457d = 1: 096b1ba s/5/A/ + 2: fccce22 ! 2: d92e698 s/4/A/ @@ Metadata ZAuthor: Thomas Rast <trast@inf.ethz.ch> Z @@ -401,7 +246,7 @@ test_expect_success 'file added and later removed' ' Z 7 + + ## new-file (new) ## - 3: $(test_oid t3) ! 3: $(test_oid s3) s/11/B/ + 3: 147e64e ! 3: 9a1db4d s/11/B/ @@ Metadata ZAuthor: Thomas Rast <trast@inf.ethz.ch> Z @@ -417,9 +262,9 @@ test_expect_success 'file added and later removed' ' Z 14 + + ## new-file (deleted) ## - 4: $(test_oid t4) = 4: $(test_oid s4) s/12/B/ + 4: a63e992 = 4: fea3b5c s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'no commits on one side' ' @@ -429,9 +274,9 @@ test_expect_success 'no commits on one side' ' test_expect_success 'changed message' ' git range-diff --no-color topic...changed-message >actual && - sed s/Z/\ /g >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid m1) s/5/A/ - 2: $(test_oid t2) ! 2: $(test_oid m2) s/4/A/ + sed s/Z/\ /g >expected <<-EOF && + 1: 4de457d = 1: f686024 s/5/A/ + 2: fccce22 ! 2: 4ab067d s/4/A/ @@ Metadata Z ## Commit message ## Z s/4/A/ @@ -441,16 +286,16 @@ test_expect_success 'changed message' ' Z ## file ## Z@@ Z 1 - 3: $(test_oid t3) = 3: $(test_oid m3) s/11/B/ - 4: $(test_oid t4) = 4: $(test_oid m4) s/12/B/ + 3: 147e64e = 3: b9cb956 s/11/B/ + 4: a63e992 = 4: 8add5f1 s/12/B/ EOF - test_cmp expect actual + test_cmp expected actual ' test_expect_success 'dual-coloring' ' - sed -e "s|^:||" >expect <<-EOF && - :<YELLOW>1: $(test_oid c1) = 1: $(test_oid m1) s/5/A/<RESET> - :<RED>2: $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2: $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET> + sed -e "s|^:||" >expect <<-\EOF && + :<YELLOW>1: a4b3333 = 1: f686024 s/5/A/<RESET> + :<RED>2: f51d370 <RESET><YELLOW>!<RESET><GREEN> 2: 4ab067d<RESET><YELLOW> s/4/A/<RESET> : <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET> : ## Commit message ##<RESET> : s/4/A/<RESET> @@ -460,7 +305,7 @@ test_expect_success 'dual-coloring' ' : ## file ##<RESET> : <CYAN> @@<RESET> : 1<RESET> - :<RED>3: $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3: $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET> + :<RED>3: 0559556 <RESET><YELLOW>!<RESET><GREEN> 3: b9cb956<RESET><YELLOW> s/11/B/<RESET> : <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET> : 9<RESET> : 10<RESET> @@ -470,7 +315,7 @@ test_expect_success 'dual-coloring' ' : 12<RESET> : 13<RESET> : 14<RESET> - :<RED>4: $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4: $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET> + :<RED>4: d966c5c <RESET><YELLOW>!<RESET><GREEN> 4: 8add5f1<RESET><YELLOW> s/12/B/<RESET> : <REVERSE><CYAN>@@<RESET> <RESET>file<RESET> : <CYAN> @@ file: A<RESET> : 9<RESET> @@ -509,206 +354,4 @@ test_expect_success 'format-patch --range-diff as commentary' ' grep "> 1: .* new message" 0001-* ' -test_expect_success 'range-diff overrides diff.noprefix internally' ' - git -c diff.noprefix=true range-diff HEAD^... -' - -test_expect_success 'range-diff compares notes by default' ' - git notes add -m "topic note" topic && - git notes add -m "unmodified note" unmodified && - test_when_finished git notes remove topic unmodified && - git range-diff --no-color master..topic master..unmodified \ - >actual && - sed s/Z/\ /g >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ - 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ - 4: $(test_oid t4) ! 4: $(test_oid u4) s/12/B/ - @@ Commit message - Z - Z - Z ## Notes ## - - topic note - + unmodified note - Z - Z ## file ## - Z@@ file: A - EOF - test_cmp expect actual -' - -test_expect_success 'range-diff with --no-notes' ' - git notes add -m "topic note" topic && - git notes add -m "unmodified note" unmodified && - test_when_finished git notes remove topic unmodified && - git range-diff --no-color --no-notes master..topic master..unmodified \ - >actual && - cat >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ - 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ - 4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/ - EOF - test_cmp expect actual -' - -test_expect_success 'range-diff with multiple --notes' ' - git notes --ref=note1 add -m "topic note1" topic && - git notes --ref=note1 add -m "unmodified note1" unmodified && - test_when_finished git notes --ref=note1 remove topic unmodified && - git notes --ref=note2 add -m "topic note2" topic && - git notes --ref=note2 add -m "unmodified note2" unmodified && - test_when_finished git notes --ref=note2 remove topic unmodified && - git range-diff --no-color --notes=note1 --notes=note2 master..topic master..unmodified \ - >actual && - sed s/Z/\ /g >expect <<-EOF && - 1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/ - 2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/ - 3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/ - 4: $(test_oid t4) ! 4: $(test_oid u4) s/12/B/ - @@ Commit message - Z - Z - Z ## Notes (note1) ## - - topic note1 - + unmodified note1 - Z - Z - Z ## Notes (note2) ## - - topic note2 - + unmodified note2 - Z - Z ## file ## - Z@@ file: A - EOF - test_cmp expect actual -' - -test_expect_success 'format-patch --range-diff does not compare notes by default' ' - git notes add -m "topic note" topic && - git notes add -m "unmodified note" unmodified && - test_when_finished git notes remove topic unmodified && - git format-patch --cover-letter --range-diff=$prev \ - master..unmodified >actual && - test_when_finished "rm 000?-*" && - test_line_count = 5 actual && - test_i18ngrep "^Range-diff:$" 0000-* && - grep "= 1: .* s/5/A" 0000-* && - grep "= 2: .* s/4/A" 0000-* && - grep "= 3: .* s/11/B" 0000-* && - grep "= 4: .* s/12/B" 0000-* && - ! grep "Notes" 0000-* && - ! grep "note" 0000-* -' - -test_expect_success 'format-patch --range-diff with --no-notes' ' - git notes add -m "topic note" topic && - git notes add -m "unmodified note" unmodified && - test_when_finished git notes remove topic unmodified && - git format-patch --no-notes --cover-letter --range-diff=$prev \ - master..unmodified >actual && - test_when_finished "rm 000?-*" && - test_line_count = 5 actual && - test_i18ngrep "^Range-diff:$" 0000-* && - grep "= 1: .* s/5/A" 0000-* && - grep "= 2: .* s/4/A" 0000-* && - grep "= 3: .* s/11/B" 0000-* && - grep "= 4: .* s/12/B" 0000-* && - ! grep "Notes" 0000-* && - ! grep "note" 0000-* -' - -test_expect_success 'format-patch --range-diff with --notes' ' - git notes add -m "topic note" topic && - git notes add -m "unmodified note" unmodified && - test_when_finished git notes remove topic unmodified && - git format-patch --notes --cover-letter --range-diff=$prev \ - master..unmodified >actual && - test_when_finished "rm 000?-*" && - test_line_count = 5 actual && - test_i18ngrep "^Range-diff:$" 0000-* && - grep "= 1: .* s/5/A" 0000-* && - grep "= 2: .* s/4/A" 0000-* && - grep "= 3: .* s/11/B" 0000-* && - grep "! 4: .* s/12/B" 0000-* && - sed s/Z/\ /g >expect <<-EOF && - @@ Commit message - Z - Z - Z ## Notes ## - - topic note - + unmodified note - Z - Z ## file ## - Z@@ file: A - EOF - sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual && - test_cmp expect actual -' - -test_expect_success 'format-patch --range-diff with format.notes config' ' - git notes add -m "topic note" topic && - git notes add -m "unmodified note" unmodified && - test_when_finished git notes remove topic unmodified && - test_config format.notes true && - git format-patch --cover-letter --range-diff=$prev \ - master..unmodified >actual && - test_when_finished "rm 000?-*" && - test_line_count = 5 actual && - test_i18ngrep "^Range-diff:$" 0000-* && - grep "= 1: .* s/5/A" 0000-* && - grep "= 2: .* s/4/A" 0000-* && - grep "= 3: .* s/11/B" 0000-* && - grep "! 4: .* s/12/B" 0000-* && - sed s/Z/\ /g >expect <<-EOF && - @@ Commit message - Z - Z - Z ## Notes ## - - topic note - + unmodified note - Z - Z ## file ## - Z@@ file: A - EOF - sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual && - test_cmp expect actual -' - -test_expect_success 'format-patch --range-diff with multiple notes' ' - git notes --ref=note1 add -m "topic note1" topic && - git notes --ref=note1 add -m "unmodified note1" unmodified && - test_when_finished git notes --ref=note1 remove topic unmodified && - git notes --ref=note2 add -m "topic note2" topic && - git notes --ref=note2 add -m "unmodified note2" unmodified && - test_when_finished git notes --ref=note2 remove topic unmodified && - git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \ - master..unmodified >actual && - test_when_finished "rm 000?-*" && - test_line_count = 5 actual && - test_i18ngrep "^Range-diff:$" 0000-* && - grep "= 1: .* s/5/A" 0000-* && - grep "= 2: .* s/4/A" 0000-* && - grep "= 3: .* s/11/B" 0000-* && - grep "! 4: .* s/12/B" 0000-* && - sed s/Z/\ /g >expect <<-EOF && - @@ Commit message - Z - Z - Z ## Notes (note1) ## - - topic note1 - + unmodified note1 - Z - Z - Z ## Notes (note2) ## - - topic note2 - + unmodified note2 - Z - Z ## file ## - Z@@ file: A - EOF - sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual && - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t3206/history.export b/third_party/git/t/t3206/history.export index 4c808e5b3b..7bb3814962 100644 --- a/third_party/git/t/t3206/history.export +++ b/third_party/git/t/t3206/history.export @@ -55,7 +55,7 @@ A 19 20 -commit refs/heads/mode-only-change +commit refs/heads/topic mark :4 author Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200 committer Thomas Rast <trast@inf.ethz.ch> 1374485014 +0200 @@ -678,32 +678,3 @@ s/12/B/ from :55 M 100644 :9 renamed-file -commit refs/heads/mode-only-change -mark :57 -author Thomas Rast <trast@inf.ethz.ch> 1374485024 +0200 -committer Thomas Gummerer <t.gummerer@gmail.com> 1570473767 +0100 -data 24 -s/4/A/ + add other-file -from :4 -M 100644 :5 file -M 100644 :49 other-file - -commit refs/heads/mode-only-change -mark :58 -author Thomas Rast <trast@inf.ethz.ch> 1374485036 +0200 -committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100 -data 33 -s/11/B/ + mode change other-file -from :57 -M 100644 :7 file -M 100755 :49 other-file - -commit refs/heads/mode-only-change -mark :59 -author Thomas Rast <trast@inf.ethz.ch> 1374485044 +0200 -committer Thomas Gummerer <t.gummerer@gmail.com> 1570473768 +0100 -data 8 -s/12/B/ -from :58 -M 100644 :9 file - diff --git a/third_party/git/t/t3210-pack-refs.sh b/third_party/git/t/t3210-pack-refs.sh index f41b2afb99..9ea5fa4fd2 100755 --- a/third_party/git/t/t3210-pack-refs.sh +++ b/third_party/git/t/t3210-pack-refs.sh @@ -240,7 +240,7 @@ test_expect_success 'retry acquiring packed-refs.lock' ' test_expect_success SYMLINKS 'pack symlinked packed-refs' ' # First make sure that symlinking works when reading: - git update-ref refs/heads/lossy refs/heads/master && + git update-ref refs/heads/loosy refs/heads/master && git for-each-ref >all-refs-before && mv .git/packed-refs .git/my-deviant-packed-refs && ln -s my-deviant-packed-refs .git/packed-refs && diff --git a/third_party/git/t/t3301-notes.sh b/third_party/git/t/t3301-notes.sh index 8f43303007..704bbc6541 100755 --- a/third_party/git/t/t3301-notes.sh +++ b/third_party/git/t/t3301-notes.sh @@ -54,9 +54,7 @@ test_expect_success 'create notes' ' test_path_is_missing .git/NOTES_EDITMSG && git ls-tree -r refs/notes/commits >actual && test_line_count = 1 actual && - echo b4 >expect && - git notes show >actual && - test_cmp expect actual && + test "b4" = "$(git notes show)" && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -68,9 +66,8 @@ test_expect_success 'show notes entry with %N' ' ' test_expect_success 'create reflog entry' ' - ref=$(git rev-parse --short refs/notes/commits) && cat <<-EOF >expect && - $ref refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\'' + a1d8fa6 refs/notes/commits@{0}: notes: Notes added by '\''git notes add'\'' EOF git reflog show refs/notes/commits >actual && test_cmp expect actual @@ -81,21 +78,14 @@ test_expect_success 'edit existing notes' ' test_path_is_missing .git/NOTES_EDITMSG && git ls-tree -r refs/notes/commits >actual && test_line_count = 1 actual && - echo b3 >expect && - git notes show >actual && - test_cmp expect actual && + test "b3" = "$(git notes show)" && git show HEAD^ && test_must_fail git notes show HEAD^ ' test_expect_success 'show notes from treeish' ' - echo b3 >expect && - git notes --ref commits^{tree} show >actual && - test_cmp expect actual && - - echo b4 >expect && - git notes --ref commits@{1} show >actual && - test_cmp expect actual + test "b3" = "$(git notes --ref commits^{tree} show)" && + test "b4" = "$(git notes --ref commits@{1} show)" ' test_expect_success 'cannot edit notes from non-ref' ' @@ -108,9 +98,7 @@ test_expect_success 'cannot "git notes add -m" where notes already exists' ' test_path_is_missing .git/NOTES_EDITMSG && git ls-tree -r refs/notes/commits >actual && test_line_count = 1 actual && - echo b3 >expect && - git notes show >actual && - test_cmp expect actual && + test "b3" = "$(git notes show)" && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -120,9 +108,7 @@ test_expect_success 'can overwrite existing note with "git notes add -f -m"' ' test_path_is_missing .git/NOTES_EDITMSG && git ls-tree -r refs/notes/commits >actual && test_line_count = 1 actual && - echo b1 >expect && - git notes show >actual && - test_cmp expect actual && + test "b1" = "$(git notes show)" && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -132,9 +118,7 @@ test_expect_success 'add w/no options on existing note morphs into edit' ' test_path_is_missing .git/NOTES_EDITMSG && git ls-tree -r refs/notes/commits >actual && test_line_count = 1 actual && - echo b2 >expect && - git notes show >actual && - test_cmp expect actual && + test "b2" = "$(git notes show)" && git show HEAD^ && test_must_fail git notes show HEAD^ ' @@ -144,17 +128,14 @@ test_expect_success 'can overwrite existing note with "git notes add -f"' ' test_path_is_missing .git/NOTES_EDITMSG && git ls-tree -r refs/notes/commits >actual && test_line_count = 1 actual && - echo b1 >expect && - git notes show >actual && - test_cmp expect actual && + test "b1" = "$(git notes show)" && git show HEAD^ && test_must_fail git notes show HEAD^ ' test_expect_success 'show notes' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 7a4ca6ee52a974a66cbaa78e33214535dff1d691 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:14:13 2005 -0700 @@ -163,8 +144,7 @@ test_expect_success 'show notes' ' Notes: ${indent}b1 EOF - git cat-file commit HEAD >commits && - ! grep b1 commits && + ! (git cat-file commit HEAD | grep b1) && git log -1 >actual && test_cmp expect actual ' @@ -172,9 +152,8 @@ test_expect_success 'show notes' ' test_expect_success 'show multi-line notes' ' test_commit 3rd && MSG="b3${LF}c3c3c3c3${LF}d3d3d3" git notes add && - commit=$(git rev-parse HEAD) && cat >expect-multiline <<-EOF && - commit $commit + commit d07d62e5208f22eb5695e7eb47667dc8b9860290 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:15:13 2005 -0700 @@ -195,9 +174,8 @@ test_expect_success 'show -F notes' ' test_commit 4th && echo "xyzzy" >note5 && git notes add -F note5 && - commit=$(git rev-parse HEAD) && cat >expect-F <<-EOF && - commit $commit + commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:16:13 2005 -0700 @@ -220,13 +198,10 @@ test_expect_success 'Re-adding -F notes without -f fails' ' ' test_expect_success 'git log --pretty=raw does not show notes' ' - commit=$(git rev-parse HEAD) && - tree=$(git rev-parse HEAD^{tree}) && - parent=$(git rev-parse HEAD^) && cat >expect <<-EOF && - commit $commit - tree $tree - parent $parent + commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 + tree 05ac65288c4c4b3b709a020ae94b2ece2f2201ae + parent d07d62e5208f22eb5695e7eb47667dc8b9860290 author A U Thor <author@example.com> 1112912173 -0700 committer C O Mitter <committer@example.com> 1112912173 -0700 @@ -316,9 +291,8 @@ test_expect_success 'git log --no-notes resets ref list' ' test_expect_success 'show -m notes' ' test_commit 5th && git notes add -m spam -m "foo${LF}bar${LF}baz" && - commit=$(git rev-parse HEAD) && cat >expect-m <<-EOF && - commit $commit + commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -339,9 +313,8 @@ test_expect_success 'show -m notes' ' test_expect_success 'remove note with add -f -F /dev/null' ' git notes add -f -F /dev/null && - commit=$(git rev-parse HEAD) && cat >expect-rm-F <<-EOF && - commit $commit + commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -383,16 +356,14 @@ test_expect_success 'create note with combination of -m and -F' ' test_expect_success 'remove note with "git notes remove"' ' git notes remove HEAD^ && git notes remove && - commit=$(git rev-parse HEAD) && - parent=$(git rev-parse HEAD^) && cat >expect-rm-remove <<-EOF && - commit $commit + commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 ${indent}5th - commit $parent + commit 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:16:13 2005 -0700 @@ -488,13 +459,9 @@ test_expect_success 'removing with --stdin --ignore-missing' ' ' test_expect_success 'list notes with "git notes list"' ' - commit_2=$(git rev-parse 2nd) && - commit_3=$(git rev-parse 3rd) && - note_2=$(git rev-parse refs/notes/commits:$commit_2) && - note_3=$(git rev-parse refs/notes/commits:$commit_3) && - sort -t" " -k2 >expect <<-EOF && - $note_2 $commit_2 - $note_3 $commit_3 + cat >expect <<-EOF && + c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691 + c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290 EOF git notes list >actual && test_cmp expect actual @@ -506,7 +473,9 @@ test_expect_success 'list notes with "git notes"' ' ' test_expect_success 'list specific note with "git notes list <object>"' ' - git rev-parse refs/notes/commits:$commit_3 >expect && + cat >expect <<-EOF && + c18dc024e14f08d18d14eea0d747ff692d66d6a3 + EOF git notes list HEAD^^ >actual && test_cmp expect actual ' @@ -529,12 +498,10 @@ test_expect_success 'append to existing note with "git notes append"' ' ' test_expect_success '"git notes list" does not expand to "git notes list HEAD"' ' - commit_5=$(git rev-parse 5th) && - note_5=$(git rev-parse refs/notes/commits:$commit_5) && - sort -t" " -k2 >expect_list <<-EOF && - $note_2 $commit_2 - $note_3 $commit_3 - $note_5 $commit_5 + cat >expect_list <<-EOF && + c9c6af7f78bc47490dbf3e822cf2f3c24d4b9061 7a4ca6ee52a974a66cbaa78e33214535dff1d691 + 4b6ad22357cc8a1296720574b8d2fbc22fab0671 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 + c18dc024e14f08d18d14eea0d747ff692d66d6a3 d07d62e5208f22eb5695e7eb47667dc8b9860290 EOF git notes list >actual && test_cmp expect_list actual @@ -564,9 +531,8 @@ test_expect_success 'appending empty string to non-existing note does not create test_expect_success 'create other note on a different notes ref (setup)' ' test_commit 6th && GIT_NOTES_REF="refs/notes/other" git notes add -m "other note" && - commit=$(git rev-parse HEAD) && cat >expect-not-other <<-EOF && - commit $commit + commit 2c125331118caba0ff8238b7f4958ac6e93fe39c Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -603,10 +569,8 @@ test_expect_success 'Do not show note when core.notesRef is overridden' ' ' test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' ' - commit=$(git rev-parse HEAD) && - parent=$(git rev-parse HEAD^) && cat >expect-both <<-EOF && - commit $commit + commit 2c125331118caba0ff8238b7f4958ac6e93fe39c Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -618,7 +582,7 @@ test_expect_success 'Show all notes when notes.displayRef=refs/notes/*' ' Notes (other): ${indent}other note - commit $parent + commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -652,9 +616,8 @@ test_expect_success 'notes.displayRef can be given more than once' ' ' test_expect_success 'notes.displayRef respects order' ' - commit=$(git rev-parse HEAD) && cat >expect-both-reversed <<-EOF && - commit $commit + commit 2c125331118caba0ff8238b7f4958ac6e93fe39c Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -679,16 +642,14 @@ test_expect_success 'GIT_NOTES_DISPLAY_REF works' ' ' test_expect_success 'GIT_NOTES_DISPLAY_REF overrides config' ' - commit=$(git rev-parse HEAD) && - parent=$(git rev-parse HEAD^) && cat >expect-none <<-EOF && - commit $commit + commit 2c125331118caba0ff8238b7f4958ac6e93fe39c Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 ${indent}6th - commit $parent + commit 7f9ad8836c775acb134c0a055fc55fb4cd1ba361 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:17:13 2005 -0700 @@ -705,9 +666,8 @@ test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' ' ' test_expect_success '--no-standard-notes' ' - commit=$(git rev-parse HEAD) && cat >expect-commits <<-EOF && - commit $commit + commit 2c125331118caba0ff8238b7f4958ac6e93fe39c Author: A U Thor <author@example.com> Date: Thu Apr 7 15:18:13 2005 -0700 @@ -740,8 +700,7 @@ test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' ' git notes show HEAD: >actual && test_cmp expect actual && echo "Note on a blob" >expect && - git ls-tree --name-only HEAD >files && - filename=$(head -n1 files) && + filename=$(git ls-tree --name-only HEAD | head -n1) && git notes add -m "Note on a blob" HEAD:$filename && git notes show HEAD:$filename >actual && test_cmp expect actual && @@ -753,10 +712,8 @@ test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' ' ' test_expect_success 'create note from other note with "git notes add -C"' ' - test_commit 7th && - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit fb01e0ca8c33b6cc0c6451dde747f97df567cb5c Author: A U Thor <author@example.com> Date: Thu Apr 7 15:19:13 2005 -0700 @@ -765,13 +722,11 @@ test_expect_success 'create note from other note with "git notes add -C"' ' Notes: ${indent}order test EOF - note=$(git notes list HEAD^) && - git notes add -C $note && + test_commit 7th && + git notes add -C $(git notes list HEAD^) && git log -1 >actual && test_cmp expect actual && - git notes list HEAD^ >expect && - git notes list HEAD >actual && - test_cmp expect actual + test "$(git notes list HEAD)" = "$(git notes list HEAD^)" ' test_expect_success 'create note from non-existing note with "git notes add -C" fails' ' @@ -789,9 +744,8 @@ test_expect_success 'create note from non-blob with "git notes add -C" fails' ' ' test_expect_success 'create note from blob with "git notes add -C" reuses blob id' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 9a4c31c7f722b5d517e92c64e932dd751e1413bf Author: A U Thor <author@example.com> Date: Thu Apr 7 15:20:13 2005 -0700 @@ -800,19 +754,16 @@ test_expect_success 'create note from blob with "git notes add -C" reuses blob i Notes: ${indent}This is a blob object EOF - echo "This is a blob object" | git hash-object -w --stdin >blob && - git notes add -C $(cat blob) && + blob=$(echo "This is a blob object" | git hash-object -w --stdin) && + git notes add -C $blob && git log -1 >actual && test_cmp expect actual && - git notes list HEAD >actual && - test_cmp blob actual + test "$(git notes list HEAD)" = "$blob" ' test_expect_success 'create note from other note with "git notes add -c"' ' - test_commit 9th && - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:21:13 2005 -0700 @@ -821,8 +772,8 @@ test_expect_success 'create note from other note with "git notes add -c"' ' Notes: ${indent}yet another note EOF - note=$(git notes list HEAD^^) && - MSG="yet another note" git notes add -c $note && + test_commit 9th && + MSG="yet another note" git notes add -c $(git notes list HEAD^^) && git log -1 >actual && test_cmp expect actual ' @@ -834,9 +785,8 @@ test_expect_success 'create note from non-existing note with "git notes add -c" ' test_expect_success 'append to note from other note with "git notes append -C"' ' - commit=$(git rev-parse HEAD^) && cat >expect <<-EOF && - commit $commit + commit 2e0db4bc649e174d667a1cde19e725cf897a5bd2 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:21:13 2005 -0700 @@ -847,16 +797,14 @@ test_expect_success 'append to note from other note with "git notes append -C"' ${indent} ${indent}yet another note EOF - note=$(git notes list HEAD^) && - git notes append -C $note HEAD^ && + git notes append -C $(git notes list HEAD^) HEAD^ && git log -1 HEAD^ >actual && test_cmp expect actual ' test_expect_success 'create note from other note with "git notes append -c"' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:22:13 2005 -0700 @@ -865,16 +813,14 @@ test_expect_success 'create note from other note with "git notes append -c"' ' Notes: ${indent}other note EOF - note=$(git notes list HEAD^) && - MSG="other note" git notes append -c $note && + MSG="other note" git notes append -c $(git notes list HEAD^) && git log -1 >actual && test_cmp expect actual ' test_expect_success 'append to note from other note with "git notes append -c"' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 7c3b87ab368f81e11b1ea87b2ab99a71ccd25406 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:22:13 2005 -0700 @@ -885,37 +831,14 @@ test_expect_success 'append to note from other note with "git notes append -c"' ${indent} ${indent}yet another note EOF - note=$(git notes list HEAD) && - MSG="yet another note" git notes append -c $note && + MSG="yet another note" git notes append -c $(git notes list HEAD) && git log -1 >actual && test_cmp expect actual ' test_expect_success 'copy note with "git notes copy"' ' - commit=$(git rev-parse 4th) && cat >expect <<-EOF && - commit $commit - Author: A U Thor <author@example.com> - Date: Thu Apr 7 15:16:13 2005 -0700 - - ${indent}4th - - Notes: - ${indent}This is a blob object - EOF - git notes copy 8th 4th && - git log 3rd..4th >actual && - test_cmp expect actual && - git notes list 4th >expect && - git notes list 8th >actual && - test_cmp expect actual -' - -test_expect_success 'copy note with "git notes copy" with default' ' - test_commit 11th && - commit=$(git rev-parse HEAD) && - cat >expect <<-EOF && - commit $commit + commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:23:13 2005 -0700 @@ -926,59 +849,23 @@ test_expect_success 'copy note with "git notes copy" with default' ' ${indent} ${indent}yet another note EOF - git notes copy HEAD^ && + test_commit 11th && + git notes copy HEAD^ HEAD && git log -1 >actual && test_cmp expect actual && - git notes list HEAD^ >expect && - git notes list HEAD >actual && - test_cmp expect actual + test "$(git notes list HEAD)" = "$(git notes list HEAD^)" ' test_expect_success 'prevent overwrite with "git notes copy"' ' test_must_fail git notes copy HEAD~2 HEAD && - cat >expect <<-EOF && - commit $commit - Author: A U Thor <author@example.com> - Date: Thu Apr 7 15:23:13 2005 -0700 - - ${indent}11th - - Notes: - ${indent}other note - ${indent} - ${indent}yet another note - EOF git log -1 >actual && test_cmp expect actual && - git notes list HEAD^ >expect && - git notes list HEAD >actual && - test_cmp expect actual + test "$(git notes list HEAD)" = "$(git notes list HEAD^)" ' test_expect_success 'allow overwrite with "git notes copy -f"' ' - commit=$(git rev-parse HEAD) && - cat >expect <<-EOF && - commit $commit - Author: A U Thor <author@example.com> - Date: Thu Apr 7 15:23:13 2005 -0700 - - ${indent}11th - - Notes: - ${indent}This is a blob object - EOF - git notes copy -f HEAD~3 HEAD && - git log -1 >actual && - test_cmp expect actual && - git notes list HEAD~3 >expect && - git notes list HEAD >actual && - test_cmp expect actual -' - -test_expect_success 'allow overwrite with "git notes copy -f" with default' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit a446fff8777efdc6eb8f4b7c8a5ff699484df0d5 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:23:13 2005 -0700 @@ -989,12 +876,10 @@ test_expect_success 'allow overwrite with "git notes copy -f" with default' ' ${indent} ${indent}yet another note EOF - git notes copy -f HEAD~2 && + git notes copy -f HEAD~2 HEAD && git log -1 >actual && test_cmp expect actual && - git notes list HEAD~2 >expect && - git notes list HEAD >actual && - test_cmp expect actual + test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" ' test_expect_success 'cannot copy note from object without notes' ' @@ -1004,10 +889,8 @@ test_expect_success 'cannot copy note from object without notes' ' ' test_expect_success 'git notes copy --stdin' ' - commit=$(git rev-parse HEAD) && - parent=$(git rev-parse HEAD^) && cat >expect <<-EOF && - commit $commit + commit e871aa61182b1d95d0a6fb75445d891722863b6b Author: A U Thor <author@example.com> Date: Thu Apr 7 15:25:13 2005 -0700 @@ -1018,7 +901,7 @@ test_expect_success 'git notes copy --stdin' ' ${indent} ${indent}yet another note - commit $parent + commit 65e263ded02ae4e8839bc151095113737579dc12 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:24:13 2005 -0700 @@ -1029,57 +912,41 @@ test_expect_success 'git notes copy --stdin' ' ${indent} ${indent}yet another note EOF - from=$(git rev-parse HEAD~3) && - to=$(git rev-parse HEAD^) && - echo "$from" "$to" >copy && - from=$(git rev-parse HEAD~2) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >>copy && - git notes copy --stdin <copy && + (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) && + echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) | + git notes copy --stdin && git log -2 >actual && test_cmp expect actual && - git notes list HEAD~2 >expect && - git notes list HEAD >actual && - test_cmp expect actual && - git notes list HEAD~3 >expect && - git notes list HEAD^ >actual && - test_cmp expect actual + test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" && + test "$(git notes list HEAD^)" = "$(git notes list HEAD~3)" ' test_expect_success 'git notes copy --for-rewrite (unconfigured)' ' - test_commit 14th && - test_commit 15th && - commit=$(git rev-parse HEAD) && - parent=$(git rev-parse HEAD^) && cat >expect <<-EOF && - commit $commit + commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 ${indent}15th - commit $parent + commit 07c85d77059393ed0154b8c96906547a59dfcddd Author: A U Thor <author@example.com> Date: Thu Apr 7 15:26:13 2005 -0700 ${indent}14th EOF - from=$(git rev-parse HEAD~3) && - to=$(git rev-parse HEAD^) && - echo "$from" "$to" >copy && - from=$(git rev-parse HEAD~2) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >>copy && - git notes copy --for-rewrite=foo <copy && + test_commit 14th && + test_commit 15th && + (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) && + echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) | + git notes copy --for-rewrite=foo && git log -2 >actual && test_cmp expect actual ' test_expect_success 'git notes copy --for-rewrite (enabled)' ' - commit=$(git rev-parse HEAD) && - parent=$(git rev-parse HEAD^) && cat >expect <<-EOF && - commit $commit + commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1090,7 +957,7 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' ' ${indent} ${indent}yet another note - commit $parent + commit 07c85d77059393ed0154b8c96906547a59dfcddd Author: A U Thor <author@example.com> Date: Thu Apr 7 15:26:13 2005 -0700 @@ -1103,31 +970,24 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' ' EOF test_config notes.rewriteMode overwrite && test_config notes.rewriteRef "refs/notes/*" && - from=$(git rev-parse HEAD~3) && - to=$(git rev-parse HEAD^) && - echo "$from" "$to" >copy && - from=$(git rev-parse HEAD~2) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >>copy && - git notes copy --for-rewrite=foo <copy && + (echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) && + echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) | + git notes copy --for-rewrite=foo && git log -2 >actual && test_cmp expect actual ' test_expect_success 'git notes copy --for-rewrite (disabled)' ' test_config notes.rewrite.bar false && - from=$(git rev-parse HEAD~3) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && - git notes copy --for-rewrite=bar <copy && + echo $(git rev-parse HEAD~3) $(git rev-parse HEAD) | + git notes copy --for-rewrite=bar && git log -2 >actual && test_cmp expect actual ' test_expect_success 'git notes copy --for-rewrite (overwrite)' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1139,10 +999,8 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' ' git notes add -f -m"a fresh note" HEAD^ && test_config notes.rewriteMode overwrite && test_config notes.rewriteRef "refs/notes/*" && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && - git notes copy --for-rewrite=foo <copy && + echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | + git notes copy --for-rewrite=foo && git log -1 >actual && test_cmp expect actual ' @@ -1150,18 +1008,15 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' ' test_expect_success 'git notes copy --for-rewrite (ignore)' ' test_config notes.rewriteMode ignore && test_config notes.rewriteRef "refs/notes/*" && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && - git notes copy --for-rewrite=foo <copy && + echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | + git notes copy --for-rewrite=foo && git log -1 >actual && test_cmp expect actual ' test_expect_success 'git notes copy --for-rewrite (append)' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1175,18 +1030,15 @@ test_expect_success 'git notes copy --for-rewrite (append)' ' git notes add -f -m"another fresh note" HEAD^ && test_config notes.rewriteMode concatenate && test_config notes.rewriteRef "refs/notes/*" && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && - git notes copy --for-rewrite=foo <copy && + echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | + git notes copy --for-rewrite=foo && git log -1 >actual && test_cmp expect actual ' test_expect_success 'git notes copy --for-rewrite (append two to one)' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1205,13 +1057,9 @@ test_expect_success 'git notes copy --for-rewrite (append two to one)' ' git notes add -f -m"append 2" HEAD^^ && test_config notes.rewriteMode concatenate && test_config notes.rewriteRef "refs/notes/*" && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && - from=$(git rev-parse HEAD^^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >>copy && - git notes copy --for-rewrite=foo <copy && + (echo $(git rev-parse HEAD^) $(git rev-parse HEAD) && + echo $(git rev-parse HEAD^^) $(git rev-parse HEAD)) | + git notes copy --for-rewrite=foo && git log -1 >actual && test_cmp expect actual ' @@ -1220,18 +1068,15 @@ test_expect_success 'git notes copy --for-rewrite (append empty)' ' git notes remove HEAD^ && test_config notes.rewriteMode concatenate && test_config notes.rewriteRef "refs/notes/*" && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && - git notes copy --for-rewrite=foo <copy && + echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | + git notes copy --for-rewrite=foo && git log -1 >actual && test_cmp expect actual ' test_expect_success 'GIT_NOTES_REWRITE_MODE works' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1243,18 +1088,15 @@ test_expect_success 'GIT_NOTES_REWRITE_MODE works' ' test_config notes.rewriteMode concatenate && test_config notes.rewriteRef "refs/notes/*" && git notes add -f -m"replacement note 1" HEAD^ && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && - GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy && + echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | + GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo && git log -1 >actual && test_cmp expect actual ' test_expect_success 'GIT_NOTES_REWRITE_REF works' ' - commit=$(git rev-parse HEAD) && cat >expect <<-EOF && - commit $commit + commit 4acf42e847e7fffbbf89ee365c20ac7caf40de89 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:27:13 2005 -0700 @@ -1266,11 +1108,9 @@ test_expect_success 'GIT_NOTES_REWRITE_REF works' ' git notes add -f -m"replacement note 2" HEAD^ && test_config notes.rewriteMode overwrite && test_unconfig notes.rewriteRef && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && + echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \ - git notes copy --for-rewrite=foo <copy && + git notes copy --for-rewrite=foo && git log -1 >actual && test_cmp expect actual ' @@ -1279,55 +1119,41 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' ' git notes add -f -m"replacement note 3" HEAD^ && test_config notes.rewriteMode overwrite && test_config notes.rewriteRef refs/notes/other && - from=$(git rev-parse HEAD^) && - to=$(git rev-parse HEAD) && - echo "$from" "$to" >copy && + echo $(git rev-parse HEAD^) $(git rev-parse HEAD) | GIT_NOTES_REWRITE_REF=refs/notes/commits \ - git notes copy --for-rewrite=foo <copy && + git notes copy --for-rewrite=foo && git log -1 >actual && grep "replacement note 3" actual ' test_expect_success 'git notes copy diagnoses too many or too few parameters' ' - test_must_fail git notes copy 2>error && - test_i18ngrep "too few parameters" error && - test_must_fail git notes copy one two three 2>error && - test_i18ngrep "too many parameters" error + test_must_fail git notes copy && + test_must_fail git notes copy one two three ' test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' ' test_unconfig core.notesRef && sane_unset GIT_NOTES_REF && - echo refs/notes/refs/heads/master >expect && - git notes --ref=refs/heads/master get-ref >actual && - test_cmp expect actual + test "$(git notes --ref=refs/heads/master get-ref)" = "refs/notes/refs/heads/master" ' test_expect_success 'git notes get-ref (no overrides)' ' test_unconfig core.notesRef && sane_unset GIT_NOTES_REF && - echo refs/notes/commits >expect && - git notes get-ref >actual && - test_cmp expect actual + test "$(git notes get-ref)" = "refs/notes/commits" ' test_expect_success 'git notes get-ref (core.notesRef)' ' test_config core.notesRef refs/notes/foo && - echo refs/notes/foo >expect && - git notes get-ref >actual && - test_cmp expect actual + test "$(git notes get-ref)" = "refs/notes/foo" ' test_expect_success 'git notes get-ref (GIT_NOTES_REF)' ' - echo refs/notes/bar >expect && - GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual && - test_cmp expect actual + test "$(GIT_NOTES_REF=refs/notes/bar git notes get-ref)" = "refs/notes/bar" ' test_expect_success 'git notes get-ref (--ref)' ' - echo refs/notes/baz >expect && - GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual && - test_cmp expect actual + test "$(GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref)" = "refs/notes/baz" ' test_expect_success 'setup testing of empty notes' ' diff --git a/third_party/git/t/t3305-notes-fanout.sh b/third_party/git/t/t3305-notes-fanout.sh index 3b4753e1b4..54460beec4 100755 --- a/third_party/git/t/t3305-notes-fanout.sh +++ b/third_party/git/t/t3305-notes-fanout.sh @@ -4,38 +4,6 @@ test_description='Test that adding/removing many notes triggers automatic fanout . ./test-lib.sh -path_has_fanout() { - path=$1 && - fanout=$2 && - after_last_slash=$((40 - $fanout * 2)) && - echo $path | grep -q "^\([0-9a-f]\{2\}/\)\{$fanout\}[0-9a-f]\{$after_last_slash\}$" -} - -touched_one_note_with_fanout() { - notes_commit=$1 && - modification=$2 && # 'A' for addition, 'D' for deletion - fanout=$3 && - diff=$(git diff-tree --no-commit-id --name-status --root -r $notes_commit) && - path=$(echo $diff | sed -e "s/^$modification[\t ]//") && - path_has_fanout "$path" $fanout; -} - -all_notes_have_fanout() { - notes_commit=$1 && - fanout=$2 && - git ls-tree -r --name-only $notes_commit 2>/dev/null | - while read path - do - path_has_fanout $path $fanout || return 1 - done -} - -test_expect_success 'tweak test environment' ' - git checkout -b nondeterminism && - test_commit A && - git checkout --orphan with_notes; -' - test_expect_success 'creating many notes with git-notes' ' num_notes=300 && i=0 && @@ -52,7 +20,7 @@ test_expect_success 'creating many notes with git-notes' ' test_expect_success 'many notes created correctly with git-notes' ' git log | grep "^ " > output && - i=$num_notes && + i=300 && while test $i -gt 0 do echo " commit #$i" && @@ -62,46 +30,39 @@ test_expect_success 'many notes created correctly with git-notes' ' test_cmp expect output ' -test_expect_success 'stable fanout 0 is followed by stable fanout 1' ' - i=$num_notes && - fanout=0 && - while test $i -gt 0 +test_expect_success 'many notes created with git-notes triggers fanout' ' + # Expect entire notes tree to have a fanout == 1 + git ls-tree -r --name-only refs/notes/commits | + while read path do - i=$(($i - 1)) && - if touched_one_note_with_fanout refs/notes/commits~$i A $fanout - then - continue - elif test $fanout -eq 0 - then - fanout=1 && - if all_notes_have_fanout refs/notes/commits~$i $fanout - then - echo "Fanout 0 -> 1 at refs/notes/commits~$i" && - continue - fi - fi && - echo "Failed fanout=$fanout check at refs/notes/commits~$i" && - git ls-tree -r --name-only refs/notes/commits~$i && - return 1 - done && - all_notes_have_fanout refs/notes/commits 1 + case "$path" in + ??/??????????????????????????????????????) + : true + ;; + *) + echo "Invalid path \"$path\"" && + return 1 + ;; + esac + done ' test_expect_success 'deleting most notes with git-notes' ' - remove_notes=285 && + num_notes=250 && i=0 && git rev-list HEAD | - while test $i -lt $remove_notes && read sha1 + while test $i -lt $num_notes && read sha1 do i=$(($i + 1)) && test_tick && - git notes remove "$sha1" 2>/dev/null || return 1 + git notes remove "$sha1" || + exit 1 done ' test_expect_success 'most notes deleted correctly with git-notes' ' - git log HEAD~$remove_notes | grep "^ " > output && - i=$(($num_notes - $remove_notes)) && + git log HEAD~250 | grep "^ " > output && + i=50 && while test $i -gt 0 do echo " commit #$i" && @@ -111,29 +72,21 @@ test_expect_success 'most notes deleted correctly with git-notes' ' test_cmp expect output ' -test_expect_success 'stable fanout 1 is followed by stable fanout 0' ' - i=$remove_notes && - fanout=1 && - while test $i -gt 0 +test_expect_success 'deleting most notes triggers fanout consolidation' ' + # Expect entire notes tree to have a fanout == 0 + git ls-tree -r --name-only refs/notes/commits | + while read path do - i=$(($i - 1)) && - if touched_one_note_with_fanout refs/notes/commits~$i D $fanout - then - continue - elif test $fanout -eq 1 - then - fanout=0 && - if all_notes_have_fanout refs/notes/commits~$i $fanout - then - echo "Fanout 1 -> 0 at refs/notes/commits~$i" && - continue - fi - fi && - echo "Failed fanout=$fanout check at refs/notes/commits~$i" && - git ls-tree -r --name-only refs/notes/commits~$i && - return 1 - done && - all_notes_have_fanout refs/notes/commits 0 + case "$path" in + ????????????????????????????????????????) + : true + ;; + *) + echo "Invalid path \"$path\"" && + return 1 + ;; + esac + done ' test_done diff --git a/third_party/git/t/t3306-notes-prune.sh b/third_party/git/t/t3306-notes-prune.sh index 8f4102ff9e..61748088eb 100755 --- a/third_party/git/t/t3306-notes-prune.sh +++ b/third_party/git/t/t3306-notes-prune.sh @@ -11,26 +11,23 @@ test_expect_success 'setup: create a few commits with notes' ' test_tick && git commit -m 1st && git notes add -m "Note #1" && - first=$(git rev-parse HEAD) && : > file2 && git add file2 && test_tick && git commit -m 2nd && git notes add -m "Note #2" && - second=$(git rev-parse HEAD) && : > file3 && git add file3 && test_tick && git commit -m 3rd && - third=$(git rev-parse HEAD) && - COMMIT_FILE=$(echo $third | sed "s!^..!.git/objects/&/!") && + COMMIT_FILE=.git/objects/5e/e1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && test -f $COMMIT_FILE && test-tool chmtime =+0 $COMMIT_FILE && git notes add -m "Note #3" ' cat > expect <<END_OF_LOG -commit $third +commit 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:15:13 2005 -0700 @@ -39,7 +36,7 @@ Date: Thu Apr 7 15:15:13 2005 -0700 Notes: Note #3 -commit $second +commit 08341ad9e94faa089d60fd3f523affb25c6da189 Author: A U Thor <author@example.com> Date: Thu Apr 7 15:14:13 2005 -0700 @@ -48,7 +45,7 @@ Date: Thu Apr 7 15:14:13 2005 -0700 Notes: Note #2 -commit $first +commit ab5f302035f2e7aaf04265f08b42034c23256e1f Author: A U Thor <author@example.com> Date: Thu Apr 7 15:13:13 2005 -0700 @@ -73,16 +70,16 @@ test_expect_success 'remove some commits' ' test_expect_success 'verify that commits are gone' ' - test_must_fail git cat-file -p $third && - git cat-file -p $second && - git cat-file -p $first + test_must_fail git cat-file -p 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && + git cat-file -p 08341ad9e94faa089d60fd3f523affb25c6da189 && + git cat-file -p ab5f302035f2e7aaf04265f08b42034c23256e1f ' test_expect_success 'verify that notes are still present' ' - git notes show $third && - git notes show $second && - git notes show $first + git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && + git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 && + git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f ' test_expect_success 'prune -n does not remove notes' ' @@ -93,10 +90,13 @@ test_expect_success 'prune -n does not remove notes' ' test_cmp expect actual ' +cat > expect <<EOF +5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 +EOF test_expect_success 'prune -n lists prunable notes' ' - echo $third >expect && + git notes prune -n > actual && test_cmp expect actual ' @@ -109,9 +109,9 @@ test_expect_success 'prune notes' ' test_expect_success 'verify that notes are gone' ' - test_must_fail git notes show $third && - git notes show $second && - git notes show $first + test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && + git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 && + git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f ' test_expect_success 'remove some commits' ' @@ -121,18 +121,21 @@ test_expect_success 'remove some commits' ' git gc --prune=now ' +cat > expect <<EOF +08341ad9e94faa089d60fd3f523affb25c6da189 +EOF + test_expect_success 'prune -v notes' ' - echo $second >expect && git notes prune -v > actual && test_cmp expect actual ' test_expect_success 'verify that notes are gone' ' - test_must_fail git notes show $third && - test_must_fail git notes show $second && - git notes show $first + test_must_fail git notes show 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29 && + test_must_fail git notes show 08341ad9e94faa089d60fd3f523affb25c6da189 && + git notes show ab5f302035f2e7aaf04265f08b42034c23256e1f ' test_done diff --git a/third_party/git/t/t3308-notes-merge.sh b/third_party/git/t/t3308-notes-merge.sh index 790e292966..d60588ec8f 100755 --- a/third_party/git/t/t3308-notes-merge.sh +++ b/third_party/git/t/t3308-notes-merge.sh @@ -20,34 +20,7 @@ test_expect_success setup ' git notes add -m "Notes on 3rd commit" 3rd && git notes add -m "Notes on 4th commit" 4th && # Copy notes to remote-notes - git fetch . refs/notes/*:refs/remote-notes/origin/* && - - test_oid_init && - test_oid_cache <<-EOF - hash4a sha1:5e93d24084d32e1cb61f7070505b9d2530cca987 - hash3a sha1:8366731eeee53787d2bdf8fc1eff7d94757e8da0 - hash2a sha1:eede89064cd42441590d6afec6c37b321ada3389 - hash1a sha1:daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 - hash5b sha1:0f2efbd00262f2fd41dfae33df8765618eeacd99 - hash4b sha1:dec2502dac3ea161543f71930044deff93fa945c - hash3b sha1:4069cdb399fd45463ec6eef8e051a16a03592d91 - hash2c sha1:d000d30e6ddcfce3a8122c403226a2ce2fd04d9d - hash1c sha1:43add6bd0c8c0bc871ac7991e0f5573cfba27804 - hash4d sha1:1f257a3a90328557c452f0817d6cc50c89d315d4 - hash3d sha1:05a4927951bcef347f51486575b878b2b60137f2 - - hash4a sha256:eef876be1d32ac2e2e42240e0429325cec116e55e88cb2969899fac695aa762f - hash3a sha256:cf7cd1bc091d7ba4166a86df864110e42087cd893a5ae96bc50d637e0290939d - hash2a sha256:21ddde7ebce2c285213898cb04deca0fd3209610cf7aaf8222e4e2f45262fae2 - hash1a sha256:f9fe0eda16c6027732ed9d4295689a03abd16f893be69b3dcbf4037ddb191921 - hash5b sha256:20046f2244577797a9e3d3f790ea9eca4d8a6bafb2a5570bcb0e03aa02ce100b - hash4b sha256:f90563d134c61a95bb88afbd45d48ccc9e919c62aa6fbfcd483302b3e4d8dbcb - hash3b sha256:988f2aca9f2d87e93e6a73197c2bb99560cc44a2f92d18653968f956f01221e0 - hash2c sha256:84153b777b4d42827a756c6578dcdb59d8ae5d1360b874fb37c430150c825c26 - hash1c sha256:9beb2bc4eef72e4c4087be168a20573e34d993d9ab1883055f23e322afa06567 - hash4d sha256:32de39dc06e679a7abb2d4a55ede7709b3124340a4a90aa305971b1c72ac319d - hash3d sha256:fa73b20e41cbb7541c4c81d1535016131dbfbeb05bf6a71f6115e9cad31c7af5 - EOF + git fetch . refs/notes/*:refs/remote-notes/origin/* ' commit_sha1=$(git rev-parse 1st^{commit}) @@ -67,10 +40,10 @@ verify_notes () { } cat <<EOF | sort >expect_notes_x -$(test_oid hash4a) $commit_sha4 -$(test_oid hash3a) $commit_sha3 -$(test_oid hash2a) $commit_sha2 -$(test_oid hash1a) $commit_sha1 +5e93d24084d32e1cb61f7070505b9d2530cca987 $commit_sha4 +8366731eeee53787d2bdf8fc1eff7d94757e8da0 $commit_sha3 +eede89064cd42441590d6afec6c37b321ada3389 $commit_sha2 +daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1 EOF cat >expect_log_x <<EOF @@ -153,10 +126,10 @@ test_expect_success 'merge previous notes commit (y^ => y) => No-op' ' ' cat <<EOF | sort >expect_notes_y -$(test_oid hash5b) $commit_sha5 -$(test_oid hash4b) $commit_sha4 -$(test_oid hash3b) $commit_sha3 -$(test_oid hash1a) $commit_sha1 +0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 +dec2502dac3ea161543f71930044deff93fa945c $commit_sha4 +4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3 +daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1 EOF cat >expect_log_y <<EOF @@ -220,11 +193,11 @@ test_expect_success 'merge empty notes ref (z => y)' ' ' cat <<EOF | sort >expect_notes_y -$(test_oid hash5b) $commit_sha5 -$(test_oid hash4b) $commit_sha4 -$(test_oid hash3b) $commit_sha3 -$(test_oid hash2c) $commit_sha2 -$(test_oid hash1c) $commit_sha1 +0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 +dec2502dac3ea161543f71930044deff93fa945c $commit_sha4 +4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3 +d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 +43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1 EOF cat >expect_log_y <<EOF @@ -258,9 +231,9 @@ test_expect_success 'change notes on other notes ref (y)' ' ' cat <<EOF | sort >expect_notes_x -$(test_oid hash5b) $commit_sha5 -$(test_oid hash4d) $commit_sha4 -$(test_oid hash1a) $commit_sha1 +0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 +1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4 +daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1 EOF cat >expect_log_x <<EOF @@ -289,10 +262,10 @@ test_expect_success 'change notes on notes ref (x)' ' ' cat <<EOF | sort >expect_notes_x -$(test_oid hash5b) $commit_sha5 -$(test_oid hash4d) $commit_sha4 -$(test_oid hash2c) $commit_sha2 -$(test_oid hash1c) $commit_sha1 +0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 +1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4 +d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 +43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1 EOF cat >expect_log_x <<EOF @@ -323,8 +296,8 @@ test_expect_success 'merge y into x => Non-conflicting 3-way merge' ' ' cat <<EOF | sort >expect_notes_w -$(test_oid hash3d) $commit_sha3 -$(test_oid hash2c) $commit_sha2 +05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3 +d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 EOF cat >expect_log_w <<EOF @@ -353,11 +326,11 @@ test_expect_success 'create notes on new, separate notes ref (w)' ' ' cat <<EOF | sort >expect_notes_x -$(test_oid hash5b) $commit_sha5 -$(test_oid hash4d) $commit_sha4 -$(test_oid hash3d) $commit_sha3 -$(test_oid hash2c) $commit_sha2 -$(test_oid hash1c) $commit_sha1 +0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5 +1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4 +05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3 +d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2 +43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1 EOF cat >expect_log_x <<EOF diff --git a/third_party/git/t/t3309-notes-merge-auto-resolve.sh b/third_party/git/t/t3309-notes-merge-auto-resolve.sh index 141d3e4ca4..14c2adf970 100755 --- a/third_party/git/t/t3309-notes-merge-auto-resolve.sh +++ b/third_party/git/t/t3309-notes-merge-auto-resolve.sh @@ -23,67 +23,7 @@ test_expect_success 'setup commits' ' test_commit 12th && test_commit 13th && test_commit 14th && - test_commit 15th && - - test_oid_cache <<-EOF - hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023 - hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c - hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315 - hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36 - hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545 - hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be - hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910 - hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6 - hash07a sha1:897003322b53bc6ca098e9324ee508362347e734 - hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082 - hash15b sha1:68b8630d25516028bed862719855b3d6768d7833 - hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df - hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc - hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62 - hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b - hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78 - hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 - hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765 - hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d - hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a - hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23 - hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9 - hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54 - hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47 - hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1 - hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b - hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee - hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e - - hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a - hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092 - hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052 - hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e - hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98 - hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb - hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028 - hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067 - hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db - hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf - hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96 - hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1 - hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b - hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840 - hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f - hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9 - hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6 - hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166 - hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa - hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798 - hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58 - hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb - hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88 - hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa - hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a - hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607 - hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec - hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b - EOF + test_commit 15th ' commit_sha1=$(git rev-parse 1st^{commit}) @@ -128,16 +68,16 @@ test_expect_success 'setup merge base (x)' ' ' cat <<EOF | sort >expect_notes_x -$(test_oid hash15a) $commit_sha15 -$(test_oid hash14a) $commit_sha14 -$(test_oid hash13a) $commit_sha13 -$(test_oid hash12a) $commit_sha12 -$(test_oid hash11a) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash09a) $commit_sha9 -$(test_oid hash08a) $commit_sha8 -$(test_oid hash07a) $commit_sha7 -$(test_oid hash06a) $commit_sha6 +457a85d6c814ea208550f15fcc48f804ac8dc023 $commit_sha15 +b0c95b954301d69da2bc3723f4cb1680d355937c $commit_sha14 +5d30216a129eeffa97d9694ffe8c74317a560315 $commit_sha13 +dd161bc149470fd890dd4ab52a4cbd79bbd18c36 $commit_sha12 +7abbc45126d680336fb24294f013a7cdfa3ed545 $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +20c613c835011c48a5abe29170a2402ca6354910 $commit_sha9 +a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6 $commit_sha8 +897003322b53bc6ca098e9324ee508362347e734 $commit_sha7 +11d97fdebfa5ceee540a3da07bce6fa0222bc082 $commit_sha6 EOF cat >expect_log_x <<EOF @@ -201,16 +141,16 @@ test_expect_success 'setup local branch (y)' ' ' cat <<EOF | sort >expect_notes_y -$(test_oid hash15b) $commit_sha15 -$(test_oid hash14b) $commit_sha14 -$(test_oid hash13b) $commit_sha13 -$(test_oid hash12b) $commit_sha12 -$(test_oid hash11a) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash09a) $commit_sha9 -$(test_oid hash05b) $commit_sha5 -$(test_oid hash04b) $commit_sha4 -$(test_oid hash03b) $commit_sha3 +68b8630d25516028bed862719855b3d6768d7833 $commit_sha15 +5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14 +3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13 +a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12 +7abbc45126d680336fb24294f013a7cdfa3ed545 $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +20c613c835011c48a5abe29170a2402ca6354910 $commit_sha9 +154508c7a0bcad82b6fe4b472bc4c26b3bf0825b $commit_sha5 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 EOF cat >expect_log_y <<EOF @@ -274,16 +214,16 @@ test_expect_success 'setup remote branch (z)' ' ' cat <<EOF | sort >expect_notes_z -$(test_oid hash15c) $commit_sha15 -$(test_oid hash14b) $commit_sha14 -$(test_oid hash13a) $commit_sha13 -$(test_oid hash11c) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash08c) $commit_sha8 -$(test_oid hash07a) $commit_sha7 -$(test_oid hash05c) $commit_sha5 -$(test_oid hash04b) $commit_sha4 -$(test_oid hash02c) $commit_sha2 +9b4b2c61f0615412da3c10f98ff85b57c04ec765 $commit_sha15 +5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14 +5d30216a129eeffa97d9694ffe8c74317a560315 $commit_sha13 +7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8 +897003322b53bc6ca098e9324ee508362347e734 $commit_sha7 +99fc34adfc400b95c67b013115e37e31aa9a6d23 $commit_sha5 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 EOF cat >expect_log_z <<EOF @@ -366,16 +306,16 @@ test_expect_success 'merge z into y with invalid configuration option => Fail/No ' cat <<EOF | sort >expect_notes_ours -$(test_oid hash15b) $commit_sha15 -$(test_oid hash14b) $commit_sha14 -$(test_oid hash13b) $commit_sha13 -$(test_oid hash12b) $commit_sha12 -$(test_oid hash11c) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash05b) $commit_sha5 -$(test_oid hash04b) $commit_sha4 -$(test_oid hash03b) $commit_sha3 -$(test_oid hash02c) $commit_sha2 +68b8630d25516028bed862719855b3d6768d7833 $commit_sha15 +5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14 +3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13 +a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12 +7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +154508c7a0bcad82b6fe4b472bc4c26b3bf0825b $commit_sha5 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 EOF cat >expect_log_ours <<EOF @@ -455,16 +395,16 @@ test_expect_success 'reset to pre-merge state (y)' ' ' cat <<EOF | sort >expect_notes_theirs -$(test_oid hash15c) $commit_sha15 -$(test_oid hash14b) $commit_sha14 -$(test_oid hash13b) $commit_sha13 -$(test_oid hash11c) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash08c) $commit_sha8 -$(test_oid hash05c) $commit_sha5 -$(test_oid hash04b) $commit_sha4 -$(test_oid hash03b) $commit_sha3 -$(test_oid hash02c) $commit_sha2 +9b4b2c61f0615412da3c10f98ff85b57c04ec765 $commit_sha15 +5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14 +3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13 +7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8 +99fc34adfc400b95c67b013115e37e31aa9a6d23 $commit_sha5 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 EOF cat >expect_log_theirs <<EOF @@ -533,17 +473,17 @@ test_expect_success 'reset to pre-merge state (y)' ' ' cat <<EOF | sort >expect_notes_union -$(test_oid hash15d) $commit_sha15 -$(test_oid hash14b) $commit_sha14 -$(test_oid hash13b) $commit_sha13 -$(test_oid hash12b) $commit_sha12 -$(test_oid hash11c) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash08c) $commit_sha8 -$(test_oid hash05d) $commit_sha5 -$(test_oid hash04b) $commit_sha4 -$(test_oid hash03b) $commit_sha3 -$(test_oid hash02c) $commit_sha2 +7c4e546efd0fe939f876beb262ece02797880b54 $commit_sha15 +5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14 +3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13 +a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12 +7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8 +6c841cc36ea496027290967ca96bd2bef54dbb47 $commit_sha5 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 EOF cat >expect_log_union <<EOF @@ -634,17 +574,17 @@ test_expect_success 'merge z into y with "manual" per-ref only checks specific r ' cat <<EOF | sort >expect_notes_union2 -$(test_oid hash15e) $commit_sha15 -$(test_oid hash14b) $commit_sha14 -$(test_oid hash13b) $commit_sha13 -$(test_oid hash12b) $commit_sha12 -$(test_oid hash11c) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash08c) $commit_sha8 -$(test_oid hash05e) $commit_sha5 -$(test_oid hash04b) $commit_sha4 -$(test_oid hash03b) $commit_sha3 -$(test_oid hash02c) $commit_sha2 +d682107b8bf7a7aea1e537a8d5cb6a12b60135f1 $commit_sha15 +5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14 +3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13 +a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12 +7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8 +357b6ca14c7afd59b7f8b8aaaa6b8b723771135b $commit_sha5 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 EOF cat >expect_log_union2 <<EOF @@ -708,17 +648,17 @@ test_expect_success 'reset to pre-merge state (z)' ' ' cat <<EOF | sort >expect_notes_cat_sort_uniq -$(test_oid hash15f) $commit_sha15 -$(test_oid hash14b) $commit_sha14 -$(test_oid hash13b) $commit_sha13 -$(test_oid hash12b) $commit_sha12 -$(test_oid hash11c) $commit_sha11 -$(test_oid hash10a) $commit_sha10 -$(test_oid hash08c) $commit_sha8 -$(test_oid hash05f) $commit_sha5 -$(test_oid hash04b) $commit_sha4 -$(test_oid hash03b) $commit_sha3 -$(test_oid hash02c) $commit_sha2 +6be90240b5f54594203e25d9f2f64b7567175aee $commit_sha15 +5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14 +3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13 +a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12 +7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11 +b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10 +851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8 +660311d7f78dc53db12ac373a43fca7465381a7e $commit_sha5 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 EOF cat >expect_log_cat_sort_uniq <<EOF diff --git a/third_party/git/t/t3310-notes-merge-manual-resolve.sh b/third_party/git/t/t3310-notes-merge-manual-resolve.sh index d3d72e25fe..2dea846e25 100755 --- a/third_party/git/t/t3310-notes-merge-manual-resolve.sh +++ b/third_party/git/t/t3310-notes-merge-manual-resolve.sh @@ -13,39 +13,7 @@ test_expect_success 'setup commits' ' test_commit 2nd && test_commit 3rd && test_commit 4th && - test_commit 5th && - - test_oid_cache <<-EOF - hash04a sha1:6e8e3febca3c2bb896704335cc4d0c34cb2f8715 - hash03a sha1:e5388c10860456ee60673025345fe2e153eb8cf8 - hash02a sha1:ceefa674873670e7ecd131814d909723cce2b669 - hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78 - hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 - hash01b sha1:b0a6021ec006d07e80e9b20ec9b444cbd9d560d3 - hash04c sha1:cff59c793c20bb49a4e01bc06fb06bad642e0d54 - hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9 - hash01c sha1:0a81da8956346e19bcb27a906f04af327e03e31b - hash04d sha1:00494adecf2d9635a02fa431308d67993f853968 - hash01e sha1:f75d1df88cbfe4258d49852f26cfc83f2ad4494b - hash04f sha1:021faa20e931fb48986ffc6282b4bb05553ac946 - hash01f sha1:0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 - hash05g sha1:304dfb4325cf243025b9957486eb605a9b51c199 - - hash04a sha256:f18a935e65866345098b3b754071dbf9f3aa3520eb27a7b036b278c5e2f1ed7e - hash03a sha256:713035dc94067a64e5fa6e4e1821b7c3bde49a77c7cb3f80eaadefa1ca41b3d2 - hash02a sha256:f160a67e048b6fa75bec3952184154045076692cf5dccd3da21e3fd34b7a3f0f - hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9 - hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6 - hash01b sha256:da96cf778c15d0a2bb76f98b2a62f6c9c01730fa7030e8f08ef0191048e7d620 - hash04c sha256:cb615d2def4b834d5f55b2351df97dc92bee4f5009d285201427f349081c8aca - hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb - hash01c sha256:5b87237ac1fbae0246256fed9f9a1f077c4140fb7e6444925f8dbfa5ae406cd8 - hash04d sha256:eeddc9f9f6cb3d6b39b861659853f10891dc373e0b6eecb09e03e39b6ce64714 - hash01e sha256:108f521b1a74c2e6d0b52a4eda87e09162bf847f7d190cfce496ee1af0b29a5a - hash04f sha256:901acda0454502b3bbd281f130c419e6c8de78afcf72a8def8d45ad31462bce4 - hash01f sha256:a2d99d1b8bf23c8af7d9d91368454adc110dfd5cc068a4cebb486ee8f5a1e16c - hash05g sha256:4fef015b01da8efe929a68e3bb9b8fbad81f53995f097befe8ebc93f12ab98ec - EOF + test_commit 5th ' commit_sha1=$(git rev-parse 1st^{commit}) @@ -64,16 +32,10 @@ verify_notes () { test_cmp "expect_log_$notes_ref" "output_log_$notes_ref" } -notes_merge_files_gone () { - # No .git/NOTES_MERGE_* files left - { ls .git/NOTES_MERGE_* >output || :; } && - test_must_be_empty output -} - cat <<EOF | sort >expect_notes_x -$(test_oid hash04a) $commit_sha4 -$(test_oid hash03a) $commit_sha3 -$(test_oid hash02a) $commit_sha2 +6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4 +e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3 +ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2 EOF cat >expect_log_x <<EOF @@ -101,9 +63,9 @@ test_expect_success 'setup merge base (x)' ' ' cat <<EOF | sort >expect_notes_y -$(test_oid hash04b) $commit_sha4 -$(test_oid hash03b) $commit_sha3 -$(test_oid hash01b) $commit_sha1 +e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 +b0a6021ec006d07e80e9b20ec9b444cbd9d560d3 $commit_sha1 EOF cat >expect_log_y <<EOF @@ -133,9 +95,9 @@ test_expect_success 'setup local branch (y)' ' ' cat <<EOF | sort >expect_notes_z -$(test_oid hash04c) $commit_sha4 -$(test_oid hash02c) $commit_sha2 -$(test_oid hash01c) $commit_sha1 +cff59c793c20bb49a4e01bc06fb06bad642e0d54 $commit_sha4 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 +0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1 EOF cat >expect_log_z <<EOF @@ -231,9 +193,9 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C ' cat <<EOF | sort >expect_notes_z -$(test_oid hash04d) $commit_sha4 -$(test_oid hash02c) $commit_sha2 -$(test_oid hash01c) $commit_sha1 +00494adecf2d9635a02fa431308d67993f853968 $commit_sha4 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 +0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1 EOF cat >expect_log_z <<EOF @@ -269,8 +231,8 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish # Setup non-conflicting merge between x and new notes ref w cat <<EOF | sort >expect_notes_w -$(test_oid hash02a) $commit_sha2 -$(test_oid hash01e) $commit_sha1 +ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2 +f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1 EOF cat >expect_log_w <<EOF @@ -296,10 +258,10 @@ test_expect_success 'setup unrelated notes ref (w)' ' ' cat <<EOF | sort >expect_notes_w -$(test_oid hash04a) $commit_sha4 -$(test_oid hash03a) $commit_sha3 -$(test_oid hash02a) $commit_sha2 -$(test_oid hash01e) $commit_sha1 +6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4 +e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3 +ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2 +f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1 EOF cat >expect_log_w <<EOF @@ -329,10 +291,10 @@ test_expect_success 'can do merge without conflicts even if previous merge is un ' cat <<EOF | sort >expect_notes_m -$(test_oid hash04f) $commit_sha4 -$(test_oid hash03b) $commit_sha3 -$(test_oid hash02c) $commit_sha2 -$(test_oid hash01f) $commit_sha1 +021faa20e931fb48986ffc6282b4bb05553ac946 $commit_sha4 +5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 +0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1 EOF cat >expect_log_m <<EOF @@ -373,7 +335,9 @@ EOF y and z notes on 4th commit EOF git notes merge --commit && - notes_merge_files_gone && + # No .git/NOTES_MERGE_* files left + test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && + test_must_be_empty output && # Merge commit has pre-merge y and pre-merge z as parents test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" && test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" && @@ -433,7 +397,9 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol test_expect_success 'abort notes merge' ' git notes merge --abort && - notes_merge_files_gone && + # No .git/NOTES_MERGE_* files left + test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && + test_must_be_empty output && # m has not moved (still == y) test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" && # Verify that other notes refs has not changed (w, x, y and z) @@ -464,9 +430,9 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol ' cat <<EOF | sort >expect_notes_m -$(test_oid hash05g) $commit_sha5 -$(test_oid hash02c) $commit_sha2 -$(test_oid hash01f) $commit_sha1 +304dfb4325cf243025b9957486eb605a9b51c199 $commit_sha5 +283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2 +0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1 EOF cat >expect_log_m <<EOF @@ -498,7 +464,9 @@ EOF echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 && # Finalize merge git notes merge --commit && - notes_merge_files_gone && + # No .git/NOTES_MERGE_* files left + test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && + test_must_be_empty output && # Merge commit has pre-merge y and pre-merge z as parents test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" && test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" && @@ -585,7 +553,9 @@ EOF test_expect_success 'resolve situation by aborting the notes merge' ' git notes merge --abort && - notes_merge_files_gone && + # No .git/NOTES_MERGE_* files left + test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null && + test_must_be_empty output && # m has not moved (still == w) test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" && # Verify that other notes refs has not changed (w, x, y and z) diff --git a/third_party/git/t/t3311-notes-merge-fanout.sh b/third_party/git/t/t3311-notes-merge-fanout.sh index 5b675417e9..37151a3adc 100755 --- a/third_party/git/t/t3311-notes-merge-fanout.sh +++ b/third_party/git/t/t3311-notes-merge-fanout.sh @@ -29,10 +29,15 @@ verify_fanout () { git ls-tree -r --name-only "refs/notes/$notes_ref" | while read path do - echo "$path" | grep "^../[0-9a-f]*$" || { + case "$path" in + ??/??????????????????????????????????????) + : true + ;; + *) echo "Invalid path \"$path\"" && - return 1; - } + return 1 + ;; + esac done } @@ -43,10 +48,15 @@ verify_no_fanout () { git ls-tree -r --name-only "refs/notes/$notes_ref" | while read path do - echo "$path" | grep -v "^../.*" || { + case "$path" in + ????????????????????????????????????????) + : true + ;; + *) echo "Invalid path \"$path\"" && - return 1; - } + return 1 + ;; + esac done } @@ -57,27 +67,7 @@ test_expect_success 'setup a few initial commits with notes (notes ref: x)' ' do test_commit "commit$i" >/dev/null && git notes add -m "notes for commit$i" || return 1 - done && - - git log --format=oneline && - - test_oid_cache <<-EOF - hash05a sha1:aed91155c7a72c2188e781fdf40e0f3761b299db - hash04a sha1:99fab268f9d7ee7b011e091a436c78def8eeee69 - hash03a sha1:953c20ae26c7aa0b428c20693fe38bc687f9d1a9 - hash02a sha1:6358796131b8916eaa2dde6902642942a1cb37e1 - hash01a sha1:b02d459c32f0e68f2fe0981033bb34f38776ba47 - hash03b sha1:9f506ee70e20379d7f78204c77b334f43d77410d - hash02b sha1:23a47d6ea7d589895faf800752054818e1e7627b - - hash05a sha256:3aae5d26619d96dba93795f66325716e4cbc486884f95a6adee8fb0615a76d12 - hash04a sha256:07e43dd3d89fe634d3252e253b426aacc7285a995dcdbcf94ac284060a1122cf - hash03a sha256:26fb52eaa7f4866bf735254587be7b31209ec10e525912ffd8e8ba549ba892ff - hash02a sha256:b57ebdf23634e750dcbc4b9a37991d70f90830d568a0e4529ce9de0a3f8d605c - hash01a sha256:377903b1572bd5117087a5518fcb1011b5053cccbc59e3c7c823a8615204173b - hash03b sha256:04e7b392fda7c185bfa17c9179b56db732edc2dc2b3bf887308dcaabb717270d - hash02b sha256:66099aaaec49a485ed990acadd9a9b81232ea592079964113d8f581ff69ef50b - EOF + done ' commit_sha1=$(git rev-parse commit1^{commit}) @@ -87,11 +77,11 @@ commit_sha4=$(git rev-parse commit4^{commit}) commit_sha5=$(git rev-parse commit5^{commit}) cat <<EOF | sort >expect_notes_x -$(test_oid hash05a) $commit_sha5 -$(test_oid hash04a) $commit_sha4 -$(test_oid hash03a) $commit_sha3 -$(test_oid hash02a) $commit_sha2 -$(test_oid hash01a) $commit_sha1 +aed91155c7a72c2188e781fdf40e0f3761b299db $commit_sha5 +99fab268f9d7ee7b011e091a436c78def8eeee69 $commit_sha4 +953c20ae26c7aa0b428c20693fe38bc687f9d1a9 $commit_sha3 +6358796131b8916eaa2dde6902642942a1cb37e1 $commit_sha2 +b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1 EOF cat >expect_log_x <<EOF @@ -155,9 +145,9 @@ test_expect_success 'Fast-forward merge (y => x)' ' ' cat <<EOF | sort >expect_notes_z -$(test_oid hash03b) $commit_sha3 -$(test_oid hash02b) $commit_sha2 -$(test_oid hash01a) $commit_sha1 +9f506ee70e20379d7f78204c77b334f43d77410d $commit_sha3 +23a47d6ea7d589895faf800752054818e1e7627b $commit_sha2 +b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1 EOF cat >expect_log_z <<EOF diff --git a/third_party/git/t/t3400-rebase.sh b/third_party/git/t/t3400-rebase.sh index 40d2975995..80b23fd326 100755 --- a/third_party/git/t/t3400-rebase.sh +++ b/third_party/git/t/t3400-rebase.sh @@ -64,7 +64,7 @@ test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' ' pre="$(git rev-parse --verify HEAD)" && git rebase master && test_cmp_rev "$pre" ORIG_HEAD && - test_cmp_rev ! "$pre" HEAD + ! test_cmp_rev "$pre" HEAD ' test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' ' @@ -143,11 +143,11 @@ test_expect_success 'setup: recover' ' test_expect_success 'Show verbose error when HEAD could not be detached' ' >B && - test_when_finished "rm -f B" && test_must_fail git rebase topic 2>output.err >output.out && test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err && test_i18ngrep B output.err ' +rm -f B test_expect_success 'fail when upstream arg is missing and not on branch' ' git checkout topic && @@ -159,43 +159,19 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_must_fail git rebase ' -test_expect_success 'rebase works with format.useAutoBase' ' - test_config format.useAutoBase true && - git checkout topic && - git rebase master -' - -test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--merge)' ' +test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' git checkout -b default-base master && git checkout -b default topic && git config branch.default.remote . && git config branch.default.merge refs/heads/default-base && - git rebase --merge && - git rev-parse --verify default-base >expect && - git rev-parse default~1 >actual && - test_cmp expect actual && - git checkout default-base && - git reset --hard HEAD^ && - git checkout default && - git rebase --merge && - git rev-parse --verify default-base >expect && - git rev-parse default~1 >actual && - test_cmp expect actual -' - -test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--apply)' ' - git checkout -B default-base master && - git checkout -B default topic && - git config branch.default.remote . && - git config branch.default.merge refs/heads/default-base && - git rebase --apply && + git rebase && git rev-parse --verify default-base >expect && git rev-parse default~1 >actual && test_cmp expect actual && git checkout default-base && git reset --hard HEAD^ && git checkout default && - git rebase --apply && + git rebase && git rev-parse --verify default-base >expect && git rev-parse default~1 >actual && test_cmp expect actual @@ -224,15 +200,9 @@ test_expect_success 'cherry-picked commits and fork-point work together' ' test_cmp expect D ' -test_expect_success 'rebase --apply -q is quiet' ' +test_expect_success 'rebase -q is quiet' ' git checkout -b quiet topic && - git rebase --apply -q master >output.out 2>&1 && - test_must_be_empty output.out -' - -test_expect_success 'rebase --merge -q is quiet' ' - git checkout -B quiet topic && - git rebase --merge -q master >output.out 2>&1 && + git rebase -q master >output.out 2>&1 && test_must_be_empty output.out ' @@ -315,7 +285,7 @@ EOF test_cmp From_.msg out ' -test_expect_success 'rebase --apply and --show-current-patch' ' +test_expect_success 'rebase --am and --show-current-patch' ' test_create_repo conflict-apply && ( cd conflict-apply && @@ -325,48 +295,12 @@ test_expect_success 'rebase --apply and --show-current-patch' ' echo two >>init.t && git commit -a -m two && git tag two && - test_must_fail git rebase --apply -f --onto init HEAD^ && + test_must_fail git rebase --onto init HEAD^ && GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr && grep "show.*$(git rev-parse two)" stderr ) ' -test_expect_success 'rebase --apply and .gitattributes' ' - test_create_repo attributes && - ( - cd attributes && - test_commit init && - git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" && - git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" && - - test_commit second && - git checkout -b test HEAD^ && - - echo "*.txt filter=test" >.gitattributes && - git add .gitattributes && - test_commit third && - - echo "This text is smudged." >a.txt && - git add a.txt && - test_commit fourth && - - git checkout -b removal HEAD^ && - git rm .gitattributes && - git add -u && - test_commit fifth && - git cherry-pick test && - - git checkout test && - git rebase master && - grep "smudged" a.txt && - - git checkout removal && - git reset --hard && - git rebase master && - grep "clean" a.txt - ) -' - test_expect_success 'rebase--merge.sh and --show-current-patch' ' test_create_repo conflict-merge && ( @@ -401,22 +335,4 @@ test_expect_success 'rebase -c rebase.useBuiltin=false warning' ' test_must_be_empty err ' -test_expect_success 'switch to branch checked out here' ' - git checkout master && - git rebase master master -' - -test_expect_success 'switch to branch not checked out' ' - git checkout master && - git branch other && - git rebase master other -' - -test_expect_success 'refuse to switch to branch checked out elsewhere' ' - git checkout master && - git worktree add wt && - test_must_fail git -C wt rebase master master 2>err && - test_i18ngrep "already checked out" err -' - test_done diff --git a/third_party/git/t/t3401-rebase-and-am-rename.sh b/third_party/git/t/t3401-rebase-and-am-rename.sh index f18bae9450..a0b9438b22 100755 --- a/third_party/git/t/t3401-rebase-and-am-rename.sh +++ b/third_party/git/t/t3401-rebase-and-am-rename.sh @@ -52,13 +52,13 @@ test_expect_success 'rebase --interactive: directory rename detected' ' ) ' -test_expect_failure 'rebase --apply: directory rename detected' ' +test_expect_failure 'rebase (am): directory rename detected' ' ( cd dir-rename && git checkout B^0 && - git -c merge.directoryRenames=true rebase --apply A && + git -c merge.directoryRenames=true rebase A && git ls-files -s >out && test_line_count = 5 out && diff --git a/third_party/git/t/t3403-rebase-skip.sh b/third_party/git/t/t3403-rebase-skip.sh index ee8a8dba52..1f5122b632 100755 --- a/third_party/git/t/t3403-rebase-skip.sh +++ b/third_party/git/t/t3403-rebase-skip.sh @@ -7,8 +7,6 @@ test_description='git rebase --merge --skip tests' . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-rebase.sh - # we assume the default git am -3 --skip strategy is tested independently # and always works :) @@ -22,13 +20,6 @@ test_expect_success setup ' git commit -a -m "hello world" && echo goodbye >> hello && git commit -a -m "goodbye" && - git tag goodbye && - - git checkout --detach && - git checkout HEAD^ . && - test_tick && - git commit -m reverted-goodbye && - git tag reverted-goodbye && git checkout -f skip-reference && echo moo > hello && @@ -85,27 +76,4 @@ test_expect_success 'moved back to branch correctly' ' test_debug 'gitk --all & sleep 1' -test_expect_success 'fixup that empties commit fails' ' - test_when_finished "git rebase --abort" && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \ - goodbye^ reverted-goodbye - ) -' - -test_expect_success 'squash that empties commit fails' ' - test_when_finished "git rebase --abort" && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \ - goodbye^ reverted-goodbye - ) -' - -# Must be the last test in this file -test_expect_success '$EDITOR and friends are unchanged' ' - test_editor_unchanged -' - test_done diff --git a/third_party/git/t/t3404-rebase-interactive.sh b/third_party/git/t/t3404-rebase-interactive.sh index c5ce3ab760..461dd539ff 100755 --- a/third_party/git/t/t3404-rebase-interactive.sh +++ b/third_party/git/t/t3404-rebase-interactive.sh @@ -29,6 +29,9 @@ Initial setup: . "$TEST_DIRECTORY"/lib-rebase.sh +# WARNING: Modifications to the initial repository can change the SHA ID used +# in the expect2 file for the 'stop on conflicting pick' test. + test_expect_success 'setup' ' test_commit A file1 && test_commit B file1 && @@ -72,16 +75,12 @@ test_expect_success 'rebase --keep-empty' ' test_line_count = 6 actual ' -test_expect_success 'rebase -i with empty todo list' ' +test_expect_success 'rebase -i with empty HEAD' ' cat >expect <<-\EOF && error: nothing to do EOF - ( - set_fake_editor && - test_must_fail env FAKE_LINES="#" \ - git rebase -i HEAD^ >output 2>&1 - ) && - tail -n 1 output >actual && # Ignore output about changing todo list + set_fake_editor && + test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 && test_i18ncmp expect actual ' @@ -140,11 +139,8 @@ test_expect_success 'rebase -i sets work tree properly' ' test_expect_success 'rebase -i with the exec command checks tree cleanness' ' git checkout master && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \ - git rebase -i HEAD^ - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ && test_cmp_rev master^ HEAD && git reset --hard && git rebase --continue @@ -159,6 +155,8 @@ test_expect_success 'rebase -x with empty command fails' ' test_i18ncmp expected actual ' +LF=' +' test_expect_success 'rebase -x with newline in command fails' ' test_when_finished "git rebase --abort ||:" && test_must_fail env git rebase -x "a${LF}b" @ 2>actual && @@ -170,11 +168,9 @@ test_expect_success 'rebase -x with newline in command fails' ' test_expect_success 'rebase -i with exec of inexistent command' ' git checkout master && test_when_finished "git rebase --abort" && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \ - git rebase -i HEAD^ >actual 2>&1 - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \ + git rebase -i HEAD^ >actual 2>&1 && ! grep "Maybe git-rebase is broken" actual ' @@ -185,6 +181,7 @@ test_expect_success 'implicit interactive rebase does not invoke sequence editor test_expect_success 'no changes are a nop' ' git checkout branch2 && + set_fake_editor && git rebase -i F && test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" && test $(git rev-parse I) = $(git rev-parse HEAD) @@ -194,6 +191,7 @@ test_expect_success 'test the [branch] option' ' git checkout -b dead-end && git rm file6 && git commit -m "stop here" && + set_fake_editor && git rebase -i F branch2 && test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" && test $(git rev-parse I) = $(git rev-parse branch2) && @@ -202,6 +200,7 @@ test_expect_success 'test the [branch] option' ' test_expect_success 'test --onto <branch>' ' git checkout -b test-onto branch2 && + set_fake_editor && git rebase -i --onto branch1 F && test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" && test $(git rev-parse HEAD^) = $(git rev-parse branch1) && @@ -211,6 +210,7 @@ test_expect_success 'test --onto <branch>' ' test_expect_success 'rebase on top of a non-conflicting commit' ' git checkout branch1 && git tag original-branch1 && + set_fake_editor && git rebase -i branch2 && test file6 = $(git diff --name-only original-branch1) && test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" && @@ -223,42 +223,38 @@ test_expect_success 'reflog for the branch shows state before rebase' ' ' test_expect_success 'reflog for the branch shows correct finish message' ' - printf "rebase (finish): refs/heads/branch1 onto %s\n" \ + printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \ "$(git rev-parse branch2)" >expected && git log -g --pretty=%gs -1 refs/heads/branch1 >actual && test_cmp expected actual ' test_expect_success 'exchange two commits' ' - ( - set_fake_editor && - FAKE_LINES="2 1" git rebase -i HEAD~2 - ) && + set_fake_editor && + FAKE_LINES="2 1" git rebase -i HEAD~2 && test H = $(git cat-file commit HEAD^ | sed -ne \$p) && - test G = $(git cat-file commit HEAD | sed -ne \$p) && - blob1=$(git rev-parse --short HEAD^:file1) && - blob2=$(git rev-parse --short HEAD:file1) && - commit=$(git rev-parse --short HEAD) + test G = $(git cat-file commit HEAD | sed -ne \$p) ' test_expect_success 'stop on conflicting pick' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && diff --git a/file1 b/file1 - index $blob1..$blob2 100644 + index f70f10e..fd79235 100644 --- a/file1 +++ b/file1 @@ -1 +1 @@ -A +G EOF - cat >expect2 <<-EOF && + cat >expect2 <<-\EOF && <<<<<<< HEAD D ======= G - >>>>>>> $commit... G + >>>>>>> 5d18e54... G EOF git tag new-branch1 && + set_fake_editor && test_must_fail git rebase -i master && test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" && test_cmp expect .git/rebase-merge/patch && @@ -287,6 +283,7 @@ test_expect_success 'abort' ' test_expect_success 'abort with error when new base cannot be checked out' ' git rm --cached file1 && git commit -m "remove file in base" && + set_fake_editor && test_must_fail git rebase -i master > output 2>&1 && test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \ output && @@ -301,6 +298,7 @@ test_expect_success 'retain authorship' ' test_tick && GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && git tag twerp && + set_fake_editor && git rebase -i --onto master HEAD^ && git show HEAD | grep "^Author: Twerp Snog" ' @@ -318,6 +316,7 @@ test_expect_success 'retain authorship w/ conflicts' ' test_commit b conflict b conflict-b && GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME && + set_fake_editor && test_must_fail git rebase -i conflict-a && echo resolved >conflict && git add conflict && @@ -333,11 +332,9 @@ test_expect_success 'squash' ' test_tick && GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 && echo "******************************" && - ( - set_fake_editor && - FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \ - git rebase -i --onto master HEAD~2 - ) && + set_fake_editor && + FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \ + git rebase -i --onto master HEAD~2 && test B = $(cat file7) && test $(git rev-parse HEAD^) = $(git rev-parse master) ' @@ -348,6 +345,7 @@ test_expect_success 'retain authorship when squashing' ' test_expect_success REBASE_P '-p handles "no changes" gracefully' ' HEAD=$(git rev-parse HEAD) && + set_fake_editor && git rebase -i -p HEAD^ && git update-index --refresh && git diff-files --quiet && @@ -357,10 +355,8 @@ test_expect_success REBASE_P '-p handles "no changes" gracefully' ' test_expect_failure REBASE_P 'exchange two commits with -p' ' git checkout H && - ( - set_fake_editor && - FAKE_LINES="2 1" git rebase -i -p HEAD~2 - ) && + set_fake_editor && + FAKE_LINES="2 1" git rebase -i -p HEAD~2 && test H = $(git cat-file commit HEAD^ | sed -ne \$p) && test G = $(git cat-file commit HEAD | sed -ne \$p) ' @@ -394,6 +390,7 @@ test_expect_success REBASE_P 'preserve merges with -p' ' git commit -m M file1 && git checkout -b to-be-rebased && test_tick && + set_fake_editor && git rebase -i -p --onto branch1 master && git update-index --refresh && git diff-files --quiet && @@ -408,10 +405,8 @@ test_expect_success REBASE_P 'preserve merges with -p' ' ' test_expect_success REBASE_P 'edit ancestor with -p' ' - ( - set_fake_editor && - FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 - ) && + set_fake_editor && + FAKE_LINES="1 2 edit 3 4" git rebase -i -p HEAD~3 && echo 2 > unrelated-file && test_tick && git commit -m L2-modified --amend unrelated-file && @@ -425,13 +420,11 @@ test_expect_success REBASE_P 'edit ancestor with -p' ' test_expect_success '--continue tries to commit' ' git reset --hard D && test_tick && - ( - set_fake_editor && - test_must_fail git rebase -i --onto new-branch1 HEAD^ && - echo resolved > file1 && - git add file1 && - FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue - ) && + set_fake_editor && + test_must_fail git rebase -i --onto new-branch1 HEAD^ && + echo resolved > file1 && + git add file1 && + FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue && test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) && git show HEAD | grep chouette ' @@ -439,6 +432,7 @@ test_expect_success '--continue tries to commit' ' test_expect_success 'verbose flag is heeded, even after --continue' ' git reset --hard master@{1} && test_tick && + set_fake_editor && test_must_fail git rebase -v -i --onto new-branch1 HEAD^ && echo resolved > file1 && git add file1 && @@ -448,13 +442,10 @@ test_expect_success 'verbose flag is heeded, even after --continue' ' test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' ' base=$(git rev-parse HEAD~4) && - ( - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" \ - FAKE_LINES="1 squash 2 squash 3 squash 4" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base - ) && + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) ' @@ -462,12 +453,9 @@ test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' ' test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' ' git checkout -b multi-fixup E && base=$(git rev-parse HEAD~4) && - ( - set_fake_editor && - FAKE_COMMIT_AMEND="NEVER" \ - FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \ - git rebase -i $base - ) && + set_fake_editor && + FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \ + git rebase -i $base && test $base = $(git rev-parse HEAD^) && test 0 = $(git show | grep NEVER | wc -l) && git checkout @{-1} && @@ -477,15 +465,12 @@ test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' ' test_expect_success 'commit message used after conflict' ' git checkout -b conflict-fixup conflict-branch && base=$(git rev-parse HEAD~4) && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \ - git rebase -i $base && - echo three > conflict && - git add conflict && - FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \ - git rebase --continue - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base && + echo three > conflict && + git add conflict && + FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \ + git rebase --continue && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) && git checkout @{-1} && @@ -495,15 +480,12 @@ test_expect_success 'commit message used after conflict' ' test_expect_success 'commit message retained after conflict' ' git checkout -b conflict-squash conflict-branch && base=$(git rev-parse HEAD~4) && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \ - git rebase -i $base && - echo three > conflict && - git add conflict && - FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \ - git rebase --continue - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base && + echo three > conflict && + git add conflict && + FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \ + git rebase --continue && test $base = $(git rev-parse HEAD^) && test 2 = $(git show | grep TWICE | wc -l) && git checkout @{-1} && @@ -520,13 +502,10 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa EOF git checkout -b squash-fixup E && base=$(git rev-parse HEAD~4) && - ( - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" \ - FAKE_LINES="1 fixup 2 squash 3 fixup 4" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base - ) && + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base && git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup && test_cmp expect-squash-fixup actual-squash-fixup && git cat-file commit HEAD@{2} | @@ -540,13 +519,10 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' ' git checkout -b skip-comments E && base=$(git rev-parse HEAD~4) && - ( - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" \ - FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base - ) && + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) && git checkout @{-1} && @@ -556,13 +532,10 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' ' test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' ' git checkout -b skip-blank-lines E && base=$(git rev-parse HEAD~4) && - ( - set_fake_editor && - FAKE_COMMIT_AMEND="ONCE" \ - FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \ - EXPECT_HEADER_COUNT=4 \ - git rebase -i $base - ) && + set_fake_editor && + FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \ + EXPECT_HEADER_COUNT=4 \ + git rebase -i $base && test $base = $(git rev-parse HEAD^) && test 1 = $(git show | grep ONCE | wc -l) && git checkout @{-1} && @@ -572,21 +545,17 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' ' test_expect_success 'squash works as expected' ' git checkout -b squash-works no-conflict-branch && one=$(git rev-parse HEAD~3) && - ( - set_fake_editor && - FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3 - ) && + set_fake_editor && + FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 \ + git rebase -i HEAD~3 && test $one = $(git rev-parse HEAD~2) ' test_expect_success 'interrupted squash works as expected' ' git checkout -b interrupted-squash conflict-branch && one=$(git rev-parse HEAD~3) && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 squash 3 2" \ - git rebase -i HEAD~3 - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 && test_write_lines one two four > conflict && git add conflict && test_must_fail git rebase --continue && @@ -599,11 +568,8 @@ test_expect_success 'interrupted squash works as expected' ' test_expect_success 'interrupted squash works as expected (case 2)' ' git checkout -b interrupted-squash2 conflict-branch && one=$(git rev-parse HEAD~3) && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="3 squash 1 2" \ - git rebase -i HEAD~3 - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 && test_write_lines one four > conflict && git add conflict && test_must_fail git rebase --continue && @@ -623,13 +589,11 @@ test_expect_success '--continue tries to commit, even for "edit"' ' git commit -m "unrelated change" && parent=$(git rev-parse HEAD^) && test_tick && - ( - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i HEAD^ && - echo edited > file7 && - git add file7 && - FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue - ) && + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + echo edited > file7 && + git add file7 && + FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue && test edited = $(git show HEAD:file7) && git show HEAD | grep chouette && test $parent = $(git rev-parse HEAD^) @@ -638,41 +602,34 @@ test_expect_success '--continue tries to commit, even for "edit"' ' test_expect_success 'aborted --continue does not squash commits after "edit"' ' old=$(git rev-parse HEAD) && test_tick && - ( - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i HEAD^ && - echo "edited again" > file7 && - git add file7 && - test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue - ) && + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + echo "edited again" > file7 && + git add file7 && + test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue && test $old = $(git rev-parse HEAD) && git rebase --abort ' test_expect_success 'auto-amend only edited commits after "edit"' ' test_tick && - ( - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i HEAD^ && - echo "edited again" > file7 && - git add file7 && - FAKE_COMMIT_MESSAGE="edited file7 again" git commit && - echo "and again" > file7 && - git add file7 && - test_tick && - test_must_fail env FAKE_COMMIT_MESSAGE="and again" \ - git rebase --continue - ) && + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i HEAD^ && + echo "edited again" > file7 && + git add file7 && + FAKE_COMMIT_MESSAGE="edited file7 again" git commit && + echo "and again" > file7 && + git add file7 && + test_tick && + test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue && git rebase --abort ' test_expect_success 'clean error after failed "exec"' ' test_tick && test_when_finished "git rebase --abort || :" && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ && echo "edited again" > file7 && git add file7 && test_must_fail git rebase --continue 2>error && @@ -683,10 +640,8 @@ test_expect_success 'rebase a detached HEAD' ' grandparent=$(git rev-parse HEAD~2) && git checkout $(git rev-parse HEAD) && test_tick && - ( - set_fake_editor && - FAKE_LINES="2 1" git rebase -i HEAD~2 - ) && + set_fake_editor && + FAKE_LINES="2 1" git rebase -i HEAD~2 && test $grandparent = $(git rev-parse HEAD~2) ' @@ -701,10 +656,9 @@ test_expect_success 'rebase a commit violating pre-commit' ' test_must_fail git commit -m doesnt-verify file1 && git commit -m doesnt-verify --no-verify file1 && test_tick && - ( - set_fake_editor && - FAKE_LINES=2 git rebase -i HEAD~2 - ) + set_fake_editor && + FAKE_LINES=2 git rebase -i HEAD~2 + ' test_expect_success 'rebase with a file named HEAD in worktree' ' @@ -724,10 +678,8 @@ test_expect_success 'rebase with a file named HEAD in worktree' ' git commit -m "Add body" ) && - ( - set_fake_editor && - FAKE_LINES="1 squash 2" git rebase -i @{-1} - ) && + set_fake_editor && + FAKE_LINES="1 squash 2" git rebase -i @{-1} && test "$(git show -s --pretty=format:%an)" = "Squashed Away" ' @@ -738,6 +690,7 @@ test_expect_success 'do "noop" when there is nothing to cherry-pick' ' GIT_EDITOR=: git commit --amend \ --author="Somebody else <somebody@else.com>" && test $(git rev-parse branch3) != $(git rev-parse branch4) && + set_fake_editor && git rebase -i branch3 && test $(git rev-parse branch3) = $(git rev-parse branch4) @@ -762,14 +715,13 @@ test_expect_success 'submodule rebase setup' ' git commit -a -m "submodule second" ) && test_tick && + set_fake_editor && git commit -a -m "Three changes submodule" ' test_expect_success 'submodule rebase -i' ' - ( - set_fake_editor && - FAKE_LINES="1 squash 2 3" git rebase -i A - ) + set_fake_editor && + FAKE_LINES="1 squash 2 3" git rebase -i A ' test_expect_success 'submodule conflict setup' ' @@ -786,6 +738,7 @@ test_expect_success 'submodule conflict setup' ' ' test_expect_success 'rebase -i continue with only submodule staged' ' + set_fake_editor && test_must_fail git rebase -i submodule-base && git add sub && git rebase --continue && @@ -795,6 +748,7 @@ test_expect_success 'rebase -i continue with only submodule staged' ' test_expect_success 'rebase -i continue with unstaged submodule' ' git checkout submodule-topic && git reset --hard && + set_fake_editor && test_must_fail git rebase -i submodule-base && git reset && git rebase --continue && @@ -807,6 +761,7 @@ test_expect_success 'avoid unnecessary reset' ' test-tool chmtime =123456789 file3 && git update-index --refresh && HEAD=$(git rev-parse HEAD) && + set_fake_editor && git rebase -i HEAD~4 && test $HEAD = $(git rev-parse HEAD) && MTIME=$(test-tool chmtime --get file3) && @@ -815,22 +770,16 @@ test_expect_success 'avoid unnecessary reset' ' test_expect_success 'reword' ' git checkout -b reword-branch master && - ( - set_fake_editor && - FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \ - git rebase -i A && - git show HEAD | grep "E changed" && - test $(git rev-parse master) != $(git rev-parse HEAD) && - test $(git rev-parse master^) = $(git rev-parse HEAD^) && - FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \ - git rebase -i A && - git show HEAD^ | grep "D changed" && - FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \ - git rebase -i A && - git show HEAD~3 | grep "B changed" && - FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \ - git rebase -i A - ) && + set_fake_editor && + FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A && + git show HEAD | grep "E changed" && + test $(git rev-parse master) != $(git rev-parse HEAD) && + test $(git rev-parse master^) = $(git rev-parse HEAD^) && + FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A && + git show HEAD^ | grep "D changed" && + FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A && + git show HEAD~3 | grep "B changed" && + FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A && git show HEAD~2 | grep "C changed" ' @@ -841,6 +790,7 @@ test_expect_success 'rebase -i can copy notes' ' test_commit n2 && test_commit n3 && git notes add -m"a note" n3 && + set_fake_editor && git rebase -i --onto n1 n2 && test "a note" = "$(git notes show HEAD)" ' @@ -853,11 +803,8 @@ test_expect_success 'rebase -i can copy notes over a fixup' ' EOF git reset --hard n3 && git notes add -m"an earlier note" n2 && - ( - set_fake_editor && - GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \ - git rebase -i n1 - ) && + set_fake_editor && + GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" git rebase -i n1 && git notes show > output && test_cmp expect output ' @@ -866,10 +813,8 @@ test_expect_success 'rebase while detaching HEAD' ' git symbolic-ref HEAD && grandparent=$(git rev-parse HEAD~2) && test_tick && - ( - set_fake_editor && - FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 - ) && + set_fake_editor && + FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 && test $grandparent = $(git rev-parse HEAD~2) && test_must_fail git symbolic-ref HEAD ' @@ -878,6 +823,7 @@ test_tick # Ensure that the rebased commits get a different timestamp. test_expect_success 'always cherry-pick with --no-ff' ' git checkout no-ff-branch && git tag original-no-ff-branch && + set_fake_editor && git rebase -i --no-ff A && for p in 0 1 2 do @@ -909,10 +855,8 @@ test_expect_success 'set up commits with funny messages' ' test_expect_success 'rebase-i history with funny messages' ' git rev-list A..funny >expect && test_tick && - ( - set_fake_editor && - FAKE_LINES="1 2 3 4" git rebase -i A - ) && + set_fake_editor && + FAKE_LINES="1 2 3 4" git rebase -i A && git rev-list A.. >actual && test_cmp expect actual ' @@ -926,9 +870,9 @@ test_expect_success 'prepare for rebase -i --exec' ' ' test_expect_success 'running "git rebase -i --exec git show HEAD"' ' + set_fake_editor && + git rebase -i --exec "git show HEAD" HEAD~2 >actual && ( - set_fake_editor && - git rebase -i --exec "git show HEAD" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES && git rebase -i HEAD~2 >expect @@ -939,9 +883,9 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' ' test_expect_success 'running "git rebase --exec git show HEAD -i"' ' git reset --hard execute && + set_fake_editor && + git rebase --exec "git show HEAD" -i HEAD~2 >actual && ( - set_fake_editor && - git rebase --exec "git show HEAD" -i HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES && git rebase -i HEAD~2 >expect @@ -952,9 +896,9 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' ' test_expect_success 'running "git rebase -ix git show HEAD"' ' git reset --hard execute && + set_fake_editor && + git rebase -ix "git show HEAD" HEAD~2 >actual && ( - set_fake_editor && - git rebase -ix "git show HEAD" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES && git rebase -i HEAD~2 >expect @@ -966,9 +910,9 @@ test_expect_success 'running "git rebase -ix git show HEAD"' ' test_expect_success 'rebase -ix with several <CMD>' ' git reset --hard execute && + set_fake_editor && + git rebase -ix "git show HEAD; pwd" HEAD~2 >actual && ( - set_fake_editor && - git rebase -ix "git show HEAD; pwd" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" && export FAKE_LINES && git rebase -i HEAD~2 >expect @@ -979,9 +923,9 @@ test_expect_success 'rebase -ix with several <CMD>' ' test_expect_success 'rebase -ix with several instances of --exec' ' git reset --hard execute && + set_fake_editor && + git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual && ( - set_fake_editor && - git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual && FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2 exec_git_show_HEAD exec_pwd" && export FAKE_LINES && @@ -1000,11 +944,13 @@ test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' ' echo bis >bis.txt && git add bis.txt && git commit -m "fixup! two_exec" && - git checkout -b autosquash_actual && - git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual && + set_fake_editor && + ( + git checkout -b autosquash_actual && + git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual + ) && git checkout autosquash && ( - set_fake_editor && git checkout -b autosquash_expected && FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" && export FAKE_LINES && @@ -1025,6 +971,7 @@ test_expect_success 'rebase --exec works without -i ' ' test_expect_success 'rebase -i --exec without <CMD>' ' git reset --hard execute && + set_fake_editor && test_must_fail git rebase -i --exec 2>actual && test_i18ngrep "requires a value" actual && git checkout master @@ -1032,10 +979,8 @@ test_expect_success 'rebase -i --exec without <CMD>' ' test_expect_success 'rebase -i --root re-order and drop commits' ' git checkout E && - ( - set_fake_editor && - FAKE_LINES="3 1 2 5" git rebase -i --root - ) && + set_fake_editor && + FAKE_LINES="3 1 2 5" git rebase -i --root && test E = $(git cat-file commit HEAD | sed -ne \$p) && test B = $(git cat-file commit HEAD^ | sed -ne \$p) && test A = $(git cat-file commit HEAD^^ | sed -ne \$p) && @@ -1048,59 +993,39 @@ test_expect_success 'rebase -i --root retain root commit author and message' ' echo B >file7 && git add file7 && GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && - ( - set_fake_editor && - FAKE_LINES="2" git rebase -i --root - ) && + set_fake_editor && + FAKE_LINES="2" git rebase -i --root && git cat-file commit HEAD | grep -q "^author Twerp Snog" && git cat-file commit HEAD | grep -q "^different author$" ' test_expect_success 'rebase -i --root temporary sentinel commit' ' git checkout B && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="2" git rebase -i --root - ) && - git cat-file commit HEAD | grep "^tree $EMPTY_TREE" && + set_fake_editor && + test_must_fail env FAKE_LINES="2" git rebase -i --root && + git cat-file commit HEAD | grep "^tree 4b825dc642cb" && git rebase --abort ' test_expect_success 'rebase -i --root fixup root commit' ' git checkout B && - ( - set_fake_editor && - FAKE_LINES="1 fixup 2" git rebase -i --root - ) && + set_fake_editor && + FAKE_LINES="1 fixup 2" git rebase -i --root && test A = $(git cat-file commit HEAD | sed -ne \$p) && test B = $(git show HEAD:file1) && test 0 = $(git cat-file commit HEAD | grep -c ^parent\ ) ' -test_expect_success 'rebase -i --root reword original root commit' ' +test_expect_success 'rebase -i --root reword root commit' ' test_when_finished "test_might_fail git rebase --abort" && - git checkout -b reword-original-root-branch master && - ( - set_fake_editor && - FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ - git rebase -i --root - ) && + git checkout -b reword-root-branch master && + set_fake_editor && + FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ + git rebase -i --root && git show HEAD^ | grep "A changed" && test -z "$(git show -s --format=%p HEAD^)" ' -test_expect_success 'rebase -i --root reword new root commit' ' - test_when_finished "test_might_fail git rebase --abort" && - git checkout -b reword-now-root-branch master && - ( - set_fake_editor && - FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \ - git rebase -i --root - ) && - git show HEAD^ | grep "C changed" && - test -z "$(git show -s --format=%p HEAD^)" -' - test_expect_success 'rebase -i --root when root has untracked file conflict' ' test_when_finished "reset_rebase" && git checkout -b failing-root-pick A && @@ -1108,10 +1033,8 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' ' git rm file1 && git commit -m "remove file 1 add file 2" && echo z >file1 && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 2" git rebase -i --root - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="1 2" git rebase -i --root && rm file1 && git rebase --continue && test "$(git log -1 --format=%B)" = "remove file 1 add file 2" && @@ -1121,38 +1044,32 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' ' test_expect_success 'rebase -i --root reword root when root has untracked file conflict' ' test_when_finished "reset_rebase" && echo z>file1 && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="reword 1 2" \ - FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root && - rm file1 && - FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="reword 1 2" \ + FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root && + rm file1 && + FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue && test "$(git log -1 --format=%B HEAD^)" = "Reworded A" && test "$(git rev-list --count HEAD)" = 2 ' test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' ' - git checkout reword-original-root-branch && + git checkout reword-root-branch && git reset --hard && git checkout conflict-branch && - ( - set_fake_editor && - test_must_fail git rebase -f --apply --onto HEAD~2 HEAD~ && - test_must_fail git rebase --edit-todo - ) && + set_fake_editor && + test_must_fail git rebase --onto HEAD~2 HEAD~ && + test_must_fail git rebase --edit-todo && git rebase --abort ' test_expect_success 'rebase --edit-todo can be used to modify todo' ' git reset --hard && git checkout no-conflict-branch^0 && - ( - set_fake_editor && - FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 && - FAKE_LINES="2 1" git rebase --edit-todo && - git rebase --continue - ) && + set_fake_editor && + FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 && + FAKE_LINES="2 1" git rebase --edit-todo && + git rebase --continue && test M = $(git cat-file commit HEAD^ | sed -ne \$p) && test L = $(git cat-file commit HEAD | sed -ne \$p) ' @@ -1160,12 +1077,13 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' ' test_expect_success 'rebase -i produces readable reflog' ' git reset --hard && git branch -f branch-reflog-test H && + set_fake_editor && git rebase -i --onto I F branch-reflog-test && cat >expect <<-\EOF && - rebase (finish): returning to refs/heads/branch-reflog-test - rebase (pick): H - rebase (pick): G - rebase (start): checkout I + rebase -i (finish): returning to refs/heads/branch-reflog-test + rebase -i (pick): H + rebase -i (pick): G + rebase -i (start): checkout I EOF git reflog -n4 HEAD | sed "s/[^:]*: //" >actual && @@ -1180,10 +1098,8 @@ test_expect_success 'rebase -i respects core.commentchar' ' sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" && mv "$1.tmp" "$1" EOF - ( - test_set_editor "$(pwd)/remove-all-but-first.sh" && - git rebase -i B - ) && + test_set_editor "$(pwd)/remove-all-but-first.sh" && + git rebase -i B && test B = $(git cat-file commit HEAD^ | sed -ne \$p) ' @@ -1192,11 +1108,9 @@ test_expect_success 'rebase -i respects core.commentchar=auto' ' write_script copy-edit-script.sh <<-\EOF && cp "$1" edit-script EOF + test_set_editor "$(pwd)/copy-edit-script.sh" && test_when_finished "git rebase --abort || :" && - ( - test_set_editor "$(pwd)/copy-edit-script.sh" && - git rebase -i HEAD^ - ) && + git rebase -i HEAD^ && test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)" ' @@ -1231,11 +1145,8 @@ test_expect_success 'interrupted rebase -i with --strategy and -X' ' echo five >conflict && echo Z >file1 && git commit -a -m "one file conflict" && - ( - set_fake_editor && - FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \ - -Xours conflict-branch - ) && + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch && git rebase --continue && test $(git show conflict-branch:conflict) = $(cat conflict) && test $(cat file1) = Z @@ -1250,7 +1161,7 @@ test_expect_success 'rebase -i error on commits with \ in message' ' test_expect_code 1 grep " emp" error ' -test_expect_success SHA1 'short SHA-1 setup' ' +test_expect_success 'short SHA-1 setup' ' test_when_finished "git checkout master" && git checkout --orphan collide && git rm -rf . && @@ -1262,37 +1173,22 @@ test_expect_success SHA1 'short SHA-1 setup' ' ) ' -test_expect_success SHA1 'short SHA-1 collide' ' +test_expect_success 'short SHA-1 collide' ' test_when_finished "reset_rebase && git checkout master" && git checkout collide && - colliding_sha1=6bcda37 && - test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" && ( - unset test_tick && - test_tick && - set_fake_editor && - FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \ - FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 && - test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" && - grep "^pick $colliding_sha1 " \ - .git/rebase-merge/git-rebase-todo.tmp && - grep "^pick [0-9a-f]\{40\}" \ - .git/rebase-merge/git-rebase-todo && - grep "^pick [0-9a-f]\{40\}" \ - .git/rebase-merge/git-rebase-todo.backup && - git rebase --continue - ) && - collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" && - collide3="$(git rev-parse collide3 | cut -c 1-4)" && - test "$collide2" = "$collide3" + unset test_tick && + test_tick && + set_fake_editor && + FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \ + FAKE_LINES="reword 1 2" git rebase -i HEAD~2 + ) ' test_expect_success 'respect core.abbrev' ' git config core.abbrev 12 && - ( - set_cat_todo_editor && - test_must_fail git rebase -i HEAD~4 >todo-list - ) && + set_cat_todo_editor && + test_must_fail git rebase -i HEAD~4 >todo-list && test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list) ' @@ -1300,20 +1196,16 @@ test_expect_success 'todo count' ' write_script dump-raw.sh <<-\EOF && cat "$1" EOF - ( - test_set_editor "$(pwd)/dump-raw.sh" && - git rebase -i HEAD~4 >actual - ) && + test_set_editor "$(pwd)/dump-raw.sh" && + git rebase -i HEAD~4 >actual && test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual ' test_expect_success 'rebase -i commits that overwrite untracked files (pick)' ' git checkout --force branch2 && git clean -f && - ( - set_fake_editor && - FAKE_LINES="edit 1 2" git rebase -i A - ) && + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i A && test_cmp_rev HEAD F && test_path_is_missing file6 && >file6 && @@ -1328,10 +1220,8 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)' git checkout --force branch2 && git clean -f && git tag original-branch2 && - ( - set_fake_editor && - FAKE_LINES="edit 1 squash 2" git rebase -i A - ) && + set_fake_editor && + FAKE_LINES="edit 1 squash 2" git rebase -i A && test_cmp_rev HEAD F && test_path_is_missing file6 && >file6 && @@ -1346,10 +1236,8 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)' test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' ' git checkout --force branch2 && git clean -f && - ( - set_fake_editor && - FAKE_LINES="edit 1 2" git rebase -i --no-ff A - ) && + set_fake_editor && + FAKE_LINES="edit 1 2" git rebase -i --no-ff A && test $(git cat-file commit HEAD | sed -ne \$p) = F && test_path_is_missing file6 && >file6 && @@ -1372,10 +1260,8 @@ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' ' git tag seq-onto && git reset --hard HEAD~2 && git cherry-pick seq-onto && - ( - set_fake_editor && - test_must_fail env FAKE_LINES= git rebase -i seq-onto - ) && + set_fake_editor && + test_must_fail env FAKE_LINES= git rebase -i seq-onto && test -d .git/rebase-merge && git rebase --continue && git diff --exit-code seq-onto && @@ -1394,10 +1280,8 @@ rebase_setup_and_clean () { test_expect_success 'drop' ' rebase_setup_and_clean drop-test && - ( - set_fake_editor && - FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root - ) && + set_fake_editor && + FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root && test E = $(git cat-file commit HEAD | sed -ne \$p) && test C = $(git cat-file commit HEAD^ | sed -ne \$p) && test A = $(git cat-file commit HEAD^^ | sed -ne \$p) @@ -1406,10 +1290,9 @@ test_expect_success 'drop' ' test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' ' test_config rebase.missingCommitsCheck ignore && rebase_setup_and_clean missing-commit && - ( - set_fake_editor && - FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual - ) && + set_fake_editor && + FAKE_LINES="1 2 3 4" \ + git rebase -i --root 2>actual && test D = $(git cat-file commit HEAD | sed -ne \$p) && test_i18ngrep \ "Successfully rebased and updated refs/heads/missing-commit" \ @@ -1425,10 +1308,9 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' ' EOF test_config rebase.missingCommitsCheck warn && rebase_setup_and_clean missing-commit && - ( - set_fake_editor && - FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2 - ) && + set_fake_editor && + FAKE_LINES="1 2 3 4" \ + git rebase -i --root 2>actual.2 && head -n4 actual.2 >actual && test_i18ncmp expect actual && test D = $(git cat-file commit HEAD | sed -ne \$p) @@ -1450,141 +1332,19 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' ' EOF test_config rebase.missingCommitsCheck error && rebase_setup_and_clean missing-commit && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 2 4" \ - git rebase -i --root 2>actual && - test_i18ncmp expect actual && - cp .git/rebase-merge/git-rebase-todo.backup \ - .git/rebase-merge/git-rebase-todo && - FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="1 2 4" \ + git rebase -i --root 2>actual && + test_i18ncmp expect actual && + cp .git/rebase-merge/git-rebase-todo.backup \ + .git/rebase-merge/git-rebase-todo && + FAKE_LINES="1 2 drop 3 4 drop 5" \ + git rebase --edit-todo && git rebase --continue && test D = $(git cat-file commit HEAD | sed -ne \$p) && test B = $(git cat-file commit HEAD^ | sed -ne \$p) ' -test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore' ' - test_config rebase.missingCommitsCheck ignore && - rebase_setup_and_clean missing-commit && - ( - set_fake_editor && - FAKE_LINES="break 1 2 3 4 5" git rebase -i --root && - FAKE_LINES="1 2 3 4" git rebase --edit-todo && - git rebase --continue 2>actual - ) && - test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ngrep \ - "Successfully rebased and updated refs/heads/missing-commit" \ - actual -' - -test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = warn' ' - cat >expect <<-EOF && - error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 master~4) - Warning: some commits may have been dropped accidentally. - Dropped commits (newer to older): - - $(git rev-list --pretty=oneline --abbrev-commit -1 master) - - $(git rev-list --pretty=oneline --abbrev-commit -1 master~4) - To avoid this message, use "drop" to explicitly remove a commit. - EOF - head -n4 expect >expect.2 && - tail -n1 expect >>expect.2 && - tail -n4 expect.2 >expect.3 && - test_config rebase.missingCommitsCheck warn && - rebase_setup_and_clean missing-commit && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \ - git rebase -i --root && - cp .git/rebase-merge/git-rebase-todo.backup orig && - FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 && - head -n6 actual.2 >actual && - test_i18ncmp expect actual && - cp orig .git/rebase-merge/git-rebase-todo && - FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 && - head -n4 actual.2 >actual && - test_i18ncmp expect.3 actual && - git rebase --continue 2>actual - ) && - test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ngrep \ - "Successfully rebased and updated refs/heads/missing-commit" \ - actual -' - -test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = error' ' - cat >expect <<-EOF && - error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 master~4) - Warning: some commits may have been dropped accidentally. - Dropped commits (newer to older): - - $(git rev-list --pretty=oneline --abbrev-commit -1 master) - - $(git rev-list --pretty=oneline --abbrev-commit -1 master~4) - To avoid this message, use "drop" to explicitly remove a commit. - - Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings. - The possible behaviours are: ignore, warn, error. - - You can fix this with '\''git rebase --edit-todo'\'' and then run '\''git rebase --continue'\''. - Or you can abort the rebase with '\''git rebase --abort'\''. - EOF - tail -n11 expect >expect.2 && - head -n3 expect.2 >expect.3 && - tail -n7 expect.2 >>expect.3 && - test_config rebase.missingCommitsCheck error && - rebase_setup_and_clean missing-commit && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \ - git rebase -i --root && - cp .git/rebase-merge/git-rebase-todo.backup orig && - test_must_fail env FAKE_LINES="2 3 4" \ - git rebase --edit-todo 2>actual && - test_i18ncmp expect actual && - test_must_fail git rebase --continue 2>actual && - test_i18ncmp expect.2 actual && - test_must_fail git rebase --edit-todo && - cp orig .git/rebase-merge/git-rebase-todo && - test_must_fail env FAKE_LINES="1 2 3 4" \ - git rebase --edit-todo 2>actual && - test_i18ncmp expect.3 actual && - test_must_fail git rebase --continue 2>actual && - test_i18ncmp expect.3 actual && - cp orig .git/rebase-merge/git-rebase-todo && - FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo && - git rebase --continue 2>actual - ) && - test D = $(git cat-file commit HEAD | sed -ne \$p) && - test_i18ngrep \ - "Successfully rebased and updated refs/heads/missing-commit" \ - actual -' - -test_expect_success 'rebase.missingCommitsCheck = error after resolving conflicts' ' - test_config rebase.missingCommitsCheck error && - ( - set_fake_editor && - FAKE_LINES="drop 1 break 2 3 4" git rebase -i A E - ) && - git rebase --edit-todo && - test_must_fail git rebase --continue && - echo x >file1 && - git add file1 && - git rebase --continue -' - -test_expect_success 'rebase.missingCommitsCheck = error when editing for a second time' ' - test_config rebase.missingCommitsCheck error && - ( - set_fake_editor && - FAKE_LINES="1 break 2 3" git rebase -i A D && - cp .git/rebase-merge/git-rebase-todo todo && - test_must_fail env FAKE_LINES=2 git rebase --edit-todo && - GIT_SEQUENCE_EDITOR="cp todo" git rebase --edit-todo && - git rebase --continue - ) -' - test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and exec' ' rebase_setup_and_clean abbrevcmd && test_commit "first" file1.txt "first line" first && @@ -1600,27 +1360,21 @@ test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and e x git show HEAD EOF git checkout abbrevcmd && + set_cat_todo_editor && test_config rebase.abbreviateCommands true && - ( - set_cat_todo_editor && - test_must_fail git rebase -i --exec "git show HEAD" \ - --autosquash master >actual - ) && + test_must_fail git rebase -i --exec "git show HEAD" \ + --autosquash master >actual && test_cmp expected actual ' test_expect_success 'static check of bad command' ' rebase_setup_and_clean bad-cmd && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \ + set_fake_editor && + test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \ git rebase -i --root 2>actual && - test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" \ - actual && - test_i18ngrep "You can fix this with .git rebase --edit-todo.." \ - actual && - FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo - ) && + test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" actual && + test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual && + FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo && git rebase --continue && test E = $(git cat-file commit HEAD | sed -ne \$p) && test C = $(git cat-file commit HEAD^ | sed -ne \$p) @@ -1636,24 +1390,19 @@ test_expect_success 'tabs and spaces are accepted in the todolist' ' ) >"$1.new" mv "$1.new" "$1" EOF - ( - test_set_editor "$(pwd)/add-indent.sh" && - git rebase -i HEAD^^^ - ) && + test_set_editor "$(pwd)/add-indent.sh" && + git rebase -i HEAD^^^ && test E = $(git cat-file commit HEAD | sed -ne \$p) ' test_expect_success 'static check of bad SHA-1' ' rebase_setup_and_clean bad-sha && - ( - set_fake_editor && - test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \ - git rebase -i --root 2>actual && - test_i18ngrep "edit XXXXXXX False commit" actual && - test_i18ngrep "You can fix this with .git rebase --edit-todo.." \ - actual && - FAKE_LINES="1 2 4 5 6" git rebase --edit-todo - ) && + set_fake_editor && + test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \ + git rebase -i --root 2>actual && + test_i18ngrep "edit XXXXXXX False commit" actual && + test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual && + FAKE_LINES="1 2 4 5 6" git rebase --edit-todo && git rebase --continue && test E = $(git cat-file commit HEAD | sed -ne \$p) ' @@ -1670,73 +1419,42 @@ test_expect_success 'editor saves as CR/LF' ' ) ' +SQ="'" test_expect_success 'rebase -i --gpg-sign=<key-id>' ' test_when_finished "test_might_fail git rebase --abort" && - ( - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \ - HEAD^ >out 2>err - ) && + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \ + >out 2>err && test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err ' test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' ' test_when_finished "test_might_fail git rebase --abort" && test_config commit.gpgsign true && - ( - set_fake_editor && - FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \ - HEAD^ >out 2>err - ) && + set_fake_editor && + FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \ + >out 2>err && test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err ' test_expect_success 'valid author header after --root swap' ' rebase_setup_and_clean author-header no-conflict-branch && + set_fake_editor && git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit && git cat-file commit HEAD | grep ^author >expected && - ( - set_fake_editor && - FAKE_LINES="5 1" git rebase -i --root - ) && + FAKE_LINES="5 1" git rebase -i --root && git cat-file commit HEAD^ | grep ^author >actual && test_cmp expected actual ' test_expect_success 'valid author header when author contains single quote' ' rebase_setup_and_clean author-header no-conflict-branch && + set_fake_editor && git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit && git cat-file commit HEAD | grep ^author >expected && - ( - set_fake_editor && - FAKE_LINES="2" git rebase -i HEAD~2 - ) && + FAKE_LINES="2" git rebase -i HEAD~2 && git cat-file commit HEAD | grep ^author >actual && test_cmp expected actual ' -test_expect_success 'post-commit hook is called' ' - test_when_finished "rm -f .git/hooks/post-commit" && - >actual && - mkdir -p .git/hooks && - write_script .git/hooks/post-commit <<-\EOS && - git rev-parse HEAD >>actual - EOS - ( - set_fake_editor && - FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E && - echo x>file3 && - git add file3 && - FAKE_COMMIT_MESSAGE=edited git rebase --continue - ) && - git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \ - >expect && - test_cmp expect actual -' - -# This must be the last test in this file -test_expect_success '$EDITOR and friends are unchanged' ' - test_editor_unchanged -' - test_done diff --git a/third_party/git/t/t3406-rebase-message.sh b/third_party/git/t/t3406-rebase-message.sh index 61b76f3301..b393e1e9fe 100755 --- a/third_party/git/t/t3406-rebase-message.sh +++ b/third_party/git/t/t3406-rebase-message.sh @@ -18,29 +18,32 @@ test_expect_success 'setup' ' ' test_expect_success 'rebase -m' ' - git rebase -m master >actual && - test_must_be_empty actual + git rebase -m master >report && + >expect && + sed -n -e "/^Already applied: /p" \ + -e "/^Committed: /p" report >actual && + test_cmp expect actual ' test_expect_success 'rebase against master twice' ' - git rebase --apply master >out && + git rebase master >out && test_i18ngrep "Current branch topic is up to date" out ' test_expect_success 'rebase against master twice with --force' ' - git rebase --force-rebase --apply master >out && + git rebase --force-rebase master >out && test_i18ngrep "Current branch topic is up to date, rebase forced" out ' test_expect_success 'rebase against master twice from another branch' ' git checkout topic^ && - git rebase --apply master topic >out && + git rebase master topic >out && test_i18ngrep "Current branch topic is up to date" out ' test_expect_success 'rebase fast-forward to master' ' git checkout topic^ && - git rebase --apply topic >out && + git rebase topic >out && test_i18ngrep "Fast-forwarded HEAD to topic" out ' @@ -89,7 +92,7 @@ test_expect_success 'GIT_REFLOG_ACTION' ' git checkout -b reflog-topic start && test_commit reflog-to-rebase && - git rebase --apply reflog-onto && + git rebase reflog-onto && git log -g --format=%gs -3 >actual && cat >expect <<-\EOF && rebase finished: returning to refs/heads/reflog-topic @@ -99,7 +102,7 @@ test_expect_success 'GIT_REFLOG_ACTION' ' test_cmp expect actual && git checkout -b reflog-prefix reflog-to-rebase && - GIT_REFLOG_ACTION=change-the-reflog git rebase --apply reflog-onto && + GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto && git log -g --format=%gs -3 >actual && cat >expect <<-\EOF && rebase finished: returning to refs/heads/reflog-prefix diff --git a/third_party/git/t/t3407-rebase-abort.sh b/third_party/git/t/t3407-rebase-abort.sh index 97efea0f56..910f218284 100755 --- a/third_party/git/t/t3407-rebase-abort.sh +++ b/third_party/git/t/t3407-rebase-abort.sh @@ -96,14 +96,14 @@ testrebase() { ' } -testrebase " --apply" .git/rebase-apply +testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge -test_expect_success 'rebase --apply --quit' ' +test_expect_success 'rebase --quit' ' cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase --apply master && + test_must_fail git rebase master && test_path_is_dir .git/rebase-apply && head_before=$(git rev-parse HEAD) && git rebase --quit && diff --git a/third_party/git/t/t3415-rebase-autosquash.sh b/third_party/git/t/t3415-rebase-autosquash.sh index 093de9005b..22d218698e 100755 --- a/third_party/git/t/t3415-rebase-autosquash.sh +++ b/third_party/git/t/t3415-rebase-autosquash.sh @@ -25,13 +25,6 @@ test_expect_success setup ' ' test_auto_fixup () { - no_squash= && - if test "x$1" = 'x!' - then - no_squash=true - shift - fi && - git reset --hard base && echo 1 >file1 && git add -u && @@ -42,19 +35,10 @@ test_auto_fixup () { test_tick && git rebase $2 -i HEAD^^^ && git log --oneline >actual && - if test -n "$no_squash" - then - test_line_count = 4 actual - else - test_line_count = 3 actual && - git diff --exit-code $1 && - echo 1 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^ >commit && - grep first commit >actual && - test_line_count = 1 actual - fi + test_line_count = 3 actual && + git diff --exit-code $1 && + test 1 = "$(git cat-file blob HEAD^:file1)" && + test 1 = $(git cat-file commit HEAD^ | grep first | wc -l) } test_expect_success 'auto fixup (option)' ' @@ -64,19 +48,12 @@ test_expect_success 'auto fixup (option)' ' test_expect_success 'auto fixup (config)' ' git config rebase.autosquash true && test_auto_fixup final-fixup-config-true && - test_auto_fixup ! fixup-config-true-no --no-autosquash && + test_must_fail test_auto_fixup fixup-config-true-no --no-autosquash && git config rebase.autosquash false && - test_auto_fixup ! final-fixup-config-false + test_must_fail test_auto_fixup final-fixup-config-false ' test_auto_squash () { - no_squash= && - if test "x$1" = 'x!' - then - no_squash=true - shift - fi && - git reset --hard base && echo 1 >file1 && git add -u && @@ -87,19 +64,10 @@ test_auto_squash () { test_tick && git rebase $2 -i HEAD^^^ && git log --oneline >actual && - if test -n "$no_squash" - then - test_line_count = 4 actual - else - test_line_count = 3 actual && - git diff --exit-code $1 && - echo 1 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^ >commit && - grep first commit >actual && - test_line_count = 2 actual - fi + test_line_count = 3 actual && + git diff --exit-code $1 && + test 1 = "$(git cat-file blob HEAD^:file1)" && + test 2 = $(git cat-file commit HEAD^ | grep first | wc -l) } test_expect_success 'auto squash (option)' ' @@ -109,9 +77,9 @@ test_expect_success 'auto squash (option)' ' test_expect_success 'auto squash (config)' ' git config rebase.autosquash true && test_auto_squash final-squash-config-true && - test_auto_squash ! squash-config-true-no --no-autosquash && + test_must_fail test_auto_squash squash-config-true-no --no-autosquash && git config rebase.autosquash false && - test_auto_squash ! final-squash-config-false + test_must_fail test_auto_squash final-squash-config-false ' test_expect_success 'misspelled auto squash' ' @@ -126,8 +94,7 @@ test_expect_success 'misspelled auto squash' ' git log --oneline >actual && test_line_count = 4 actual && git diff --exit-code final-missquash && - git rev-list final-missquash...HEAD >list && - test_must_be_empty list + test 0 = $(git rev-list final-missquash...HEAD | wc -l) ' test_expect_success 'auto squash that matches 2 commits' ' @@ -146,15 +113,9 @@ test_expect_success 'auto squash that matches 2 commits' ' git log --oneline >actual && test_line_count = 4 actual && git diff --exit-code final-multisquash && - echo 1 >expect && - git cat-file blob HEAD^^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^^ >commit && - grep first commit >actual && - test_line_count = 2 actual && - git cat-file commit HEAD >commit && - grep first commit >actual && - test_line_count = 1 actual + test 1 = "$(git cat-file blob HEAD^^:file1)" && + test 2 = $(git cat-file commit HEAD^^ | grep first | wc -l) && + test 1 = $(git cat-file commit HEAD | grep first | wc -l) ' test_expect_success 'auto squash that matches a commit after the squash' ' @@ -173,38 +134,25 @@ test_expect_success 'auto squash that matches a commit after the squash' ' git log --oneline >actual && test_line_count = 5 actual && git diff --exit-code final-presquash && - echo 0 >expect && - git cat-file blob HEAD^^:file1 >actual && - test_cmp expect actual && - echo 1 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD >commit && - grep third commit >actual && - test_line_count = 1 actual && - git cat-file commit HEAD^ >commit && - grep third commit >actual && - test_line_count = 1 actual + test 0 = "$(git cat-file blob HEAD^^:file1)" && + test 1 = "$(git cat-file blob HEAD^:file1)" && + test 1 = $(git cat-file commit HEAD | grep third | wc -l) && + test 1 = $(git cat-file commit HEAD^ | grep third | wc -l) ' test_expect_success 'auto squash that matches a sha1' ' git reset --hard base && echo 1 >file1 && git add -u && test_tick && - oid=$(git rev-parse --short HEAD^) && - git commit -m "squash! $oid" && + git commit -m "squash! $(git rev-parse --short HEAD^)" && git tag final-shasquash && test_tick && git rebase --autosquash -i HEAD^^^ && git log --oneline >actual && test_line_count = 3 actual && git diff --exit-code final-shasquash && - echo 1 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^ >commit && - grep squash commit >actual && - test_line_count = 1 actual + test 1 = "$(git cat-file blob HEAD^:file1)" && + test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l) ' test_expect_success 'auto squash that matches longer sha1' ' @@ -212,20 +160,15 @@ test_expect_success 'auto squash that matches longer sha1' ' echo 1 >file1 && git add -u && test_tick && - oid=$(git rev-parse --short=11 HEAD^) && - git commit -m "squash! $oid" && + git commit -m "squash! $(git rev-parse --short=11 HEAD^)" && git tag final-longshasquash && test_tick && git rebase --autosquash -i HEAD^^^ && git log --oneline >actual && test_line_count = 3 actual && git diff --exit-code final-longshasquash && - echo 1 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^ >commit && - grep squash commit >actual && - test_line_count = 1 actual + test 1 = "$(git cat-file blob HEAD^:file1)" && + test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l) ' test_auto_commit_flags () { @@ -240,12 +183,8 @@ test_auto_commit_flags () { git log --oneline >actual && test_line_count = 3 actual && git diff --exit-code final-commit-$1 && - echo 1 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^ >commit && - grep first commit >actual && - test_line_count = $2 actual + test 1 = "$(git cat-file blob HEAD^:file1)" && + test $2 = $(git cat-file commit HEAD^ | grep first | wc -l) } test_expect_success 'use commit --fixup' ' @@ -271,15 +210,11 @@ test_auto_fixup_fixup () { ( set_cat_todo_editor && test_must_fail git rebase --autosquash -i HEAD^^^^ >actual && - head=$(git rev-parse --short HEAD) && - parent1=$(git rev-parse --short HEAD^) && - parent2=$(git rev-parse --short HEAD^^) && - parent3=$(git rev-parse --short HEAD^^^) && cat >expected <<-EOF && - pick $parent3 first commit - $1 $parent1 $1! first - $1 $head $1! $2! first - pick $parent2 second commit + pick $(git rev-parse --short HEAD^^^) first commit + $1 $(git rev-parse --short HEAD^) $1! first + $1 $(git rev-parse --short HEAD) $1! $2! first + pick $(git rev-parse --short HEAD^^) second commit EOF test_cmp expected actual ) && @@ -287,17 +222,13 @@ test_auto_fixup_fixup () { git log --oneline >actual && test_line_count = 3 actual git diff --exit-code "final-$1-$2" && - echo 2 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^ >commit && - grep first commit >actual && + test 2 = "$(git cat-file blob HEAD^:file1)" && if test "$1" = "fixup" then - test_line_count = 1 actual + test 1 = $(git cat-file commit HEAD^ | grep first | wc -l) elif test "$1" = "squash" then - test_line_count = 3 actual + test 3 = $(git cat-file commit HEAD^ | grep first | wc -l) else false fi @@ -325,25 +256,19 @@ test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' ' echo 2 >file1 && git add -u && test_tick && - oid=$(git rev-parse --short HEAD^) && - git commit -m "squash! $oid" && + git commit -m "squash! $(git rev-parse --short HEAD^)" && echo 1 >file1 && git add -u && test_tick && - subject=$(git log -n 1 --format=%s HEAD~2) && - git commit -m "squash! $subject" && + git commit -m "squash! $(git log -n 1 --format=%s HEAD~2)" && git tag final-squash-instFmt && test_tick && git rebase --autosquash -i HEAD~4 && git log --oneline >actual && test_line_count = 3 actual && git diff --exit-code final-squash-instFmt && - echo 1 >expect && - git cat-file blob HEAD^:file1 >actual && - test_cmp expect actual && - git cat-file commit HEAD^ >commit && - grep squash commit >actual && - test_line_count = 2 actual + test 1 = "$(git cat-file blob HEAD^:file1)" && + test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l) ' test_expect_success 'autosquash with empty custom instructionFormat' ' diff --git a/third_party/git/t/t3416-rebase-onto-threedots.sh b/third_party/git/t/t3416-rebase-onto-threedots.sh index 9c2548423b..ddf2f64853 100755 --- a/third_party/git/t/t3416-rebase-onto-threedots.sh +++ b/third_party/git/t/t3416-rebase-onto-threedots.sh @@ -99,64 +99,7 @@ test_expect_success 'rebase -i --onto master...side' ' git checkout side && git reset --hard K && - set_fake_editor && test_must_fail git rebase -i --onto master...side J ' -test_expect_success 'rebase --keep-base --onto incompatible' ' - test_must_fail git rebase --keep-base --onto master... -' - -test_expect_success 'rebase --keep-base --root incompatible' ' - test_must_fail git rebase --keep-base --root -' - -test_expect_success 'rebase --keep-base master from topic' ' - git reset --hard && - git checkout topic && - git reset --hard G && - - git rebase --keep-base master && - git rev-parse C >base.expect && - git merge-base master HEAD >base.actual && - test_cmp base.expect base.actual && - - git rev-parse HEAD~2 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase --keep-base master from side' ' - git reset --hard && - git checkout side && - git reset --hard K && - - test_must_fail git rebase --keep-base master -' - -test_expect_success 'rebase -i --keep-base master from topic' ' - git reset --hard && - git checkout topic && - git reset --hard G && - - set_fake_editor && - EXPECT_COUNT=2 git rebase -i --keep-base master && - git rev-parse C >base.expect && - git merge-base master HEAD >base.actual && - test_cmp base.expect base.actual && - - git rev-parse HEAD~2 >actual && - git rev-parse C^0 >expect && - test_cmp expect actual -' - -test_expect_success 'rebase -i --keep-base master from side' ' - git reset --hard && - git checkout side && - git reset --hard K && - - set_fake_editor && - test_must_fail git rebase -i --keep-base master -' - test_done diff --git a/third_party/git/t/t3418-rebase-continue.sh b/third_party/git/t/t3418-rebase-continue.sh index 7a2da972fd..4eff14dae5 100755 --- a/third_party/git/t/t3418-rebase-continue.sh +++ b/third_party/git/t/t3418-rebase-continue.sh @@ -120,20 +120,6 @@ test_expect_success REBASE_P 'rebase passes merge strategy options correctly' ' git rebase --continue ' -test_expect_success 'rebase -r passes merge strategy options correctly' ' - rm -fr .git/rebase-* && - git reset --hard commit-new-file-F3-on-topic-branch && - test_commit merge-theirs && - git reset --hard HEAD^ && - test_commit some-other-commit && - test_tick && - git merge --no-ff merge-theirs && - FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \ - -s recursive --strategy-option=theirs HEAD~2 && - test_commit force-change-ours && - git rebase --continue -' - test_expect_success '--skip after failed fixup cleans commit message' ' test_when_finished "test_might_fail git rebase --abort" && git checkout -b with-conflicting-fixup && diff --git a/third_party/git/t/t3419-rebase-patch-id.sh b/third_party/git/t/t3419-rebase-patch-id.sh index d934583776..49f548cdb9 100755 --- a/third_party/git/t/t3419-rebase-patch-id.sh +++ b/third_party/git/t/t3419-rebase-patch-id.sh @@ -80,8 +80,7 @@ do_tests () { git commit -q -m "change big file again" && git checkout -q other^{} && git rebase master && - git rev-list master...HEAD~ >revs && - test_must_be_empty revs + test_must_fail test -n "$(git rev-list master...HEAD~)" ' test_expect_success $pr 'do not drop patch' ' @@ -91,7 +90,7 @@ do_tests () { git commit -q -m squashed && git checkout -q other^{} && test_must_fail git rebase squashed && - git rebase --quit + rm -rf .git/rebase-apply ' } diff --git a/third_party/git/t/t3420-rebase-autostash.sh b/third_party/git/t/t3420-rebase-autostash.sh index b97ea62363..b8f4d03467 100755 --- a/third_party/git/t/t3420-rebase-autostash.sh +++ b/third_party/git/t/t3420-rebase-autostash.sh @@ -34,9 +34,10 @@ test_expect_success setup ' remove_progress_re="$(printf "s/.*\\r//")" ' -create_expected_success_apply () { +create_expected_success_am () { cat >expected <<-EOF $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) + HEAD is now at $(git rev-parse --short feature-branch) third commit First, rewinding head to replay your work on top of it... Applying: second commit Applying: third commit @@ -44,17 +45,19 @@ create_expected_success_apply () { EOF } -create_expected_success_merge () { +create_expected_success_interactive () { q_to_cr >expected <<-EOF $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) + HEAD is now at $(git rev-parse --short feature-branch) third commit Applied autostash. Successfully rebased and updated refs/heads/rebased-feature-branch. EOF } -create_expected_failure_apply () { +create_expected_failure_am () { cat >expected <<-EOF $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) + HEAD is now at $(git rev-parse --short feature-branch) third commit First, rewinding head to replay your work on top of it... Applying: second commit Applying: third commit @@ -64,9 +67,10 @@ create_expected_failure_apply () { EOF } -create_expected_failure_merge () { +create_expected_failure_interactive () { cat >expected <<-EOF $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) + HEAD is now at $(git rev-parse --short feature-branch) third commit Applying autostash resulted in conflicts. Your changes are safe in the stash. You can run "git stash pop" or "git stash drop" at any time. @@ -101,9 +105,9 @@ testrebase () { test_expect_success "rebase$type --autostash: check output" ' test_when_finished git branch -D rebased-feature-branch && - suffix=${type#\ --} && suffix=${suffix:-apply} && - if test ${suffix} = "interactive"; then - suffix=merge + suffix=${type#\ --} && suffix=${suffix:-am} && + if test ${suffix} = "merge"; then + suffix=interactive fi && create_expected_success_$suffix && sed "$remove_progress_re" <actual >actual2 && @@ -202,9 +206,9 @@ testrebase () { test_expect_success "rebase$type: check output with conflicting stash" ' test_when_finished git branch -D rebased-feature-branch && - suffix=${type#\ --} && suffix=${suffix:-apply} && - if test ${suffix} = "interactive"; then - suffix=merge + suffix=${type#\ --} && suffix=${suffix:-am} && + if test ${suffix} = "merge"; then + suffix=interactive fi && create_expected_failure_$suffix && sed "$remove_progress_re" <actual >actual2 && @@ -234,7 +238,7 @@ test_expect_success "rebase: noop rebase" ' git checkout feature-branch ' -testrebase " --apply" .git/rebase-apply +testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge testrebase " --interactive" .git/rebase-merge @@ -302,12 +306,4 @@ test_expect_success 'branch is left alone when possible' ' test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)" ' -test_expect_success 'never change active branch' ' - git checkout -b not-the-feature-branch unrelated-onto-branch && - test_when_finished "git reset --hard && git checkout master" && - echo changed >file0 && - git rebase --autostash not-the-feature-branch feature-branch && - test_cmp_rev not-the-feature-branch unrelated-onto-branch -' - test_done diff --git a/third_party/git/t/t3421-rebase-topology-linear.sh b/third_party/git/t/t3421-rebase-topology-linear.sh index cf8dfd6c20..7274dca40b 100755 --- a/third_party/git/t/t3421-rebase-topology-linear.sh +++ b/third_party/git/t/t3421-rebase-topology-linear.sh @@ -26,21 +26,11 @@ test_run_rebase () { test_linear_range 'd e' c.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p -test_expect_success 'setup branches and remote tracking' ' - git tag -l >tags && - for tag in $(cat tags) - do - git branch branch-$tag $tag || return 1 - done && - git remote add origin "file://$PWD" && - git fetch origin -' - test_run_rebase () { result=$1 shift @@ -50,7 +40,7 @@ test_run_rebase () { test_cmp_rev e HEAD " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -61,13 +51,12 @@ test_run_rebase () { test_expect_$result "rebase $* -f rewrites even if upstream is an ancestor" " reset_rebase && git rebase $* -f b e && - test_cmp_rev ! e HEAD && + ! test_cmp_rev e HEAD && test_cmp_rev b HEAD~2 && test_linear_range 'd e' b.. " } -test_run_rebase success --apply -test_run_rebase success --fork-point +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase failure -p @@ -75,31 +64,13 @@ test_have_prereq !REBASE_P || test_run_rebase failure -p test_run_rebase () { result=$1 shift - test_expect_$result "rebase $* -f rewrites even if remote upstream is an ancestor" " - reset_rebase && - git rebase $* -f branch-b branch-e && - test_cmp_rev ! branch-e origin/branch-e && - test_cmp_rev branch-b HEAD~2 && - test_linear_range 'd e' branch-b.. - " -} -test_run_rebase success --apply -test_run_rebase success --fork-point -test_run_rebase success -m -test_run_rebase success -i -test_have_prereq !REBASE_P || test_run_rebase success -p - -test_run_rebase () { - result=$1 - shift test_expect_$result "rebase $* fast-forwards from ancestor of upstream" " reset_rebase && git rebase $* e b && test_cmp_rev e HEAD " } -test_run_rebase success --apply -test_run_rebase success --fork-point +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -139,7 +110,7 @@ test_run_rebase () { test_linear_range 'd i' h.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -154,7 +125,7 @@ test_run_rebase () { test_linear_range 'd' h.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -169,7 +140,7 @@ test_run_rebase () { test_linear_range 'd i' f.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -184,7 +155,7 @@ test_run_rebase () { test_linear_range 'd gp i' h.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -205,17 +176,17 @@ test_expect_success 'setup of linear history for empty commit tests' ' test_run_rebase () { result=$1 shift - test_expect_$result "rebase $* keeps begin-empty commits" " + test_expect_$result "rebase $* drops empty commit" " reset_rebase && - git rebase $* j l && - test_cmp_rev c HEAD~4 && - test_linear_range 'j d k l' c.. + git rebase $* c l && + test_cmp_rev c HEAD~2 && + test_linear_range 'd l' c.. " } -test_run_rebase failure --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i -test_have_prereq !REBASE_P || test_run_rebase failure -p +test_have_prereq !REBASE_P || test_run_rebase success -p test_run_rebase () { result=$1 @@ -227,10 +198,10 @@ test_run_rebase () { test_linear_range 'd k l' c.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i -test_have_prereq !REBASE_P || test_run_rebase success -p +test_have_prereq !REBASE_P || test_run_rebase failure -p test_run_rebase () { result=$1 @@ -242,10 +213,10 @@ test_run_rebase () { test_linear_range 'd k l' j.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i -test_have_prereq !REBASE_P || test_run_rebase success -p +test_have_prereq !REBASE_P || test_run_rebase failure -p test_run_rebase success --rebase-merges # m @@ -282,7 +253,7 @@ test_run_rebase () { test_linear_range 'x y' c.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -297,7 +268,7 @@ test_run_rebase () { test_linear_range 'x y' c.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase failure -p @@ -312,7 +283,7 @@ test_run_rebase () { test_linear_range 'x y' m.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase success -p @@ -328,7 +299,7 @@ test_run_rebase () { " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase failure -p @@ -343,7 +314,7 @@ test_run_rebase () { test_linear_range 'x y' m.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i test_have_prereq !REBASE_P || test_run_rebase failure -p @@ -368,7 +339,7 @@ test_run_rebase () { test_expect_$result "rebase $* -f --root on linear history causes re-write" " reset_rebase && git rebase $* -f --root c && - test_cmp_rev ! a HEAD~2 && + ! test_cmp_rev a HEAD~2 && test_linear_range 'a b c' HEAD " } diff --git a/third_party/git/t/t3422-rebase-incompatible-options.sh b/third_party/git/t/t3422-rebase-incompatible-options.sh index 50e7960702..a5868ea152 100755 --- a/third_party/git/t/t3422-rebase-incompatible-options.sh +++ b/third_party/git/t/t3422-rebase-incompatible-options.sh @@ -76,4 +76,14 @@ test_expect_success REBASE_P \ test_must_fail git rebase --preserve-merges --rebase-merges A ' +test_expect_success '--rebase-merges incompatible with --strategy' ' + git checkout B^0 && + test_must_fail git rebase --rebase-merges -s resolve A +' + +test_expect_success '--rebase-merges incompatible with --strategy-option' ' + git checkout B^0 && + test_must_fail git rebase --rebase-merges -Xignore-space-change A +' + test_done diff --git a/third_party/git/t/t3424-rebase-empty.sh b/third_party/git/t/t3424-rebase-empty.sh deleted file mode 100755 index e1e30517ea..0000000000 --- a/third_party/git/t/t3424-rebase-empty.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -test_description='git rebase of commits that start or become empty' - -. ./test-lib.sh - -test_expect_success 'setup test repository' ' - test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers && - test_write_lines A B C D E F G H I J >letters && - git add numbers letters && - git commit -m A && - - git branch upstream && - git branch localmods && - - git checkout upstream && - test_write_lines A B C D E >letters && - git add letters && - git commit -m B && - - test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers && - git add numbers && - git commit -m C && - - git checkout localmods && - test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers && - git add numbers && - git commit -m C2 && - - git commit --allow-empty -m D && - - test_write_lines A B C D E >letters && - git add letters && - git commit -m "Five letters ought to be enough for anybody" -' - -test_expect_failure 'rebase (apply-backend)' ' - test_when_finished "git rebase --abort" && - git checkout -B testing localmods && - # rebase (--apply) should not drop commits that start empty - git rebase --apply upstream && - - test_write_lines D C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --merge --empty=drop' ' - git checkout -B testing localmods && - git rebase --merge --empty=drop upstream && - - test_write_lines D C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --merge uses default of --empty=drop' ' - git checkout -B testing localmods && - git rebase --merge upstream && - - test_write_lines D C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --merge --empty=keep' ' - git checkout -B testing localmods && - git rebase --merge --empty=keep upstream && - - test_write_lines D C2 C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --merge --empty=ask' ' - git checkout -B testing localmods && - test_must_fail git rebase --merge --empty=ask upstream && - - git rebase --skip && - - test_write_lines D C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --interactive --empty=drop' ' - git checkout -B testing localmods && - git rebase --interactive --empty=drop upstream && - - test_write_lines D C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --interactive --empty=keep' ' - git checkout -B testing localmods && - git rebase --interactive --empty=keep upstream && - - test_write_lines D C2 C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --interactive --empty=ask' ' - git checkout -B testing localmods && - test_must_fail git rebase --interactive --empty=ask upstream && - - git rebase --skip && - - test_write_lines D C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --interactive uses default of --empty=ask' ' - git checkout -B testing localmods && - test_must_fail git rebase --interactive upstream && - - git rebase --skip && - - test_write_lines D C B A >expect && - git log --format=%s >actual && - test_cmp expect actual -' - -test_expect_success 'rebase --merge does not leave state laying around' ' - git checkout -B testing localmods~2 && - git rebase --merge upstream && - - test_path_is_missing .git/CHERRY_PICK_HEAD && - test_path_is_missing .git/MERGE_MSG -' - -test_done diff --git a/third_party/git/t/t3425-rebase-topology-merges.sh b/third_party/git/t/t3425-rebase-topology-merges.sh index e42faa44e7..fd8efe84fe 100755 --- a/third_party/git/t/t3425-rebase-topology-merges.sh +++ b/third_party/git/t/t3425-rebase-topology-merges.sh @@ -54,7 +54,7 @@ test_run_rebase () { test_linear_range 'n o' e.. " } -test_run_rebase success --apply +test_run_rebase success '' test_run_rebase success -m test_run_rebase success -i @@ -70,7 +70,7 @@ test_run_rebase () { test_linear_range "\'"$expected"\'" d.. " } -test_run_rebase success 'n o e' --apply +test_run_rebase success 'n o e' '' test_run_rebase success 'n o e' -m test_run_rebase success 'n o e' -i @@ -86,7 +86,7 @@ test_run_rebase () { test_linear_range "\'"$expected"\'" c.. " } -test_run_rebase success 'd n o e' --apply +test_run_rebase success 'd n o e' '' test_run_rebase success 'd n o e' -m test_run_rebase success 'd n o e' -i @@ -102,7 +102,7 @@ test_run_rebase () { test_linear_range "\'"$expected"\'" c.. " } -test_run_rebase success 'd n o e' --apply +test_run_rebase success 'd n o e' '' test_run_rebase success 'd n o e' -m test_run_rebase success 'd n o e' -i diff --git a/third_party/git/t/t3427-rebase-subtree.sh b/third_party/git/t/t3427-rebase-subtree.sh index 79e43a370b..d8640522a0 100755 --- a/third_party/git/t/t3427-rebase-subtree.sh +++ b/third_party/git/t/t3427-rebase-subtree.sh @@ -11,99 +11,113 @@ commit_message() { git log --pretty=format:%s -1 "$1" } -# There are a few bugs in the rebase with regards to the subtree strategy, and -# this test script tries to document them. First, the following commit history -# is generated (the onelines are shown, time flows from left to right): -# -# master1 - master2 - master3 -# \ -# README ---------------------- Add subproject master - master4 - files_subtree/master5 -# -# Where the merge moves the files master[123].t into the subdirectory -# files_subtree/ and master4 as well as files_subtree/master5 add files to that -# directory directly. -# -# Then, in subsequent test cases, `git filter-branch` is used to distill just -# the commits that touch files_subtree/. To give it a final pre-rebase touch, -# an empty commit is added on top. The pre-rebase commit history looks like -# this: -# -# Add subproject master - master4 - files_subtree/master5 - Empty commit -# -# where the root commit adds three files: master1.t, master2.t and master3.t. -# -# This commit history is then rebased onto `master3` with the -# `-Xsubtree=files_subtree` option in three different ways: -# -# 1. using `--preserve-merges` -# 2. using `--preserve-merges` and --keep-empty -# 3. without specifying a rebase backend - test_expect_success 'setup' ' test_commit README && - - git init files && - test_commit -C files master1 && - test_commit -C files master2 && - test_commit -C files master3 && - - : perform subtree merge into files_subtree/ && - git fetch files refs/heads/master:refs/heads/files-master && - git merge -s ours --no-commit --allow-unrelated-histories \ - files-master && - git read-tree --prefix=files_subtree -u files-master && - git commit -m "Add subproject master" && - - : add two extra commits to rebase && - test_commit -C files_subtree master4 && - test_commit files_subtree/master5 && - - git checkout -b to-rebase && - git fast-export --no-data HEAD -- files_subtree/ | - sed -e "s%\([0-9a-f]\{40\} \)files_subtree/%\1%" | - git fast-import --force --quiet && - git reset --hard && - git commit -m "Empty commit" --allow-empty + mkdir files && + ( + cd files && + git init && + test_commit master1 && + test_commit master2 && + test_commit master3 + ) && + git fetch files master && + git branch files-master FETCH_HEAD && + git read-tree --prefix=files_subtree files-master && + git checkout -- files_subtree && + tree=$(git write-tree) && + head=$(git rev-parse HEAD) && + rev=$(git rev-parse --verify files-master^0) && + commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) && + git update-ref HEAD $commit && + ( + cd files_subtree && + test_commit master4 + ) && + test_commit files_subtree/master5 ' # FAILURE: Does not preserve master4. -test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' ' +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --preserve-merges --onto commit 4' ' reset_rebase && - git checkout -b rebase-preserve-merges to-rebase && + git checkout -b rebase-preserve-merges-4 master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && + git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master && + verbose test "$(commit_message HEAD~)" = "files_subtree/master4" +' + +# FAILURE: Does not preserve master5. +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --preserve-merges --onto commit 5' ' + reset_rebase && + git checkout -b rebase-preserve-merges-5 master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master && - verbose test "$(commit_message HEAD~)" = "master4" && verbose test "$(commit_message HEAD)" = "files_subtree/master5" ' # FAILURE: Does not preserve master4. -test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' ' +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 4' ' reset_rebase && - git checkout -b rebase-keep-empty to-rebase && + git checkout -b rebase-keep-empty-4 master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master && - verbose test "$(commit_message HEAD~2)" = "master4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && - verbose test "$(commit_message HEAD)" = "Empty commit" + verbose test "$(commit_message HEAD~2)" = "files_subtree/master4" ' -test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' ' +# FAILURE: Does not preserve master5. +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit 5' ' reset_rebase && - git checkout -b rebase-onto to-rebase && - test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master && - : first pick results in no changes && - git rebase --skip && - verbose test "$(commit_message HEAD~2)" = "master4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && + git checkout -b rebase-keep-empty-5 master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && + git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master && + verbose test "$(commit_message HEAD~)" = "files_subtree/master5" +' + +# FAILURE: Does not preserve Empty. +test_expect_failure REBASE_P \ + 'Rebase -Xsubtree --keep-empty --preserve-merges --onto empty commit' ' + reset_rebase && + git checkout -b rebase-keep-empty-empty master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && + git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master && verbose test "$(commit_message HEAD)" = "Empty commit" ' -test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' ' +# FAILURE: fatal: Could not parse object +test_expect_failure 'Rebase -Xsubtree --onto commit 4' ' + reset_rebase && + git checkout -b rebase-onto-4 master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && + git rebase -Xsubtree=files_subtree --onto files-master master && + verbose test "$(commit_message HEAD~2)" = "files_subtree/master4" +' + +# FAILURE: fatal: Could not parse object +test_expect_failure 'Rebase -Xsubtree --onto commit 5' ' + reset_rebase && + git checkout -b rebase-onto-5 master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && + git rebase -Xsubtree=files_subtree --onto files-master master && + verbose test "$(commit_message HEAD~)" = "files_subtree/master5" +' +# FAILURE: fatal: Could not parse object +test_expect_failure 'Rebase -Xsubtree --onto empty commit' ' reset_rebase && - git checkout -b rebase-merges-onto to-rebase && - test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root && - : first pick results in no changes && - git rebase --skip && - verbose test "$(commit_message HEAD~2)" = "master4" && - verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && + git checkout -b rebase-onto-empty master && + git filter-branch --prune-empty -f --subdirectory-filter files_subtree && + git commit -m "Empty commit" --allow-empty && + git rebase -Xsubtree=files_subtree --onto files-master master && verbose test "$(commit_message HEAD)" = "Empty commit" ' diff --git a/third_party/git/t/t3429-rebase-edit-todo.sh b/third_party/git/t/t3429-rebase-edit-todo.sh index 7024d49ae7..76f6d306ea 100755 --- a/third_party/git/t/t3429-rebase-edit-todo.sh +++ b/third_party/git/t/t3429-rebase-edit-todo.sh @@ -3,21 +3,15 @@ test_description='rebase should reread the todo file if an exec modifies it' . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-rebase.sh - -test_expect_success 'setup' ' - test_commit first file && - test_commit second file && - test_commit third file -' test_expect_success 'rebase exec modifies rebase-todo' ' + test_commit initial && todo=.git/rebase-merge/git-rebase-todo && git rebase HEAD -x "echo exec touch F >>$todo" && test -e F ' -test_expect_success 'loose object cache vs re-reading todo list' ' +test_expect_success SHA1 'loose object cache vs re-reading todo list' ' GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo && export GIT_REBASE_TODO && write_script append-todo.sh <<-\EOS && @@ -39,47 +33,4 @@ test_expect_success 'loose object cache vs re-reading todo list' ' git rebase HEAD -x "./append-todo.sh 5 6" ' -test_expect_success 'todo is re-read after reword and squash' ' - write_script reword-editor.sh <<-\EOS && - GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \ - git rebase --edit-todo - EOS - - test_write_lines first third >expected && - set_fake_editor && - GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \ - GIT_EDITOR=./reword-editor.sh git rebase -i --root third && - test_cmp expected actual -' - -test_expect_success 're-reading todo doesnt interfere with revert --edit' ' - git reset --hard third && - - git revert --edit third second && - - cat >expect <<-\EOF && - Revert "second" - Revert "third" - third - second - first - EOF - git log --format="%s" >actual && - test_cmp expect actual -' - -test_expect_success 're-reading todo doesnt interfere with cherry-pick --edit' ' - git reset --hard first && - - git cherry-pick --edit second third && - - cat >expect <<-\EOF && - third - second - first - EOF - git log --format="%s" >actual && - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t3430-rebase-merges.sh b/third_party/git/t/t3430-rebase-merges.sh index a1bc3e2001..7b6c4847ad 100755 --- a/third_party/git/t/t3430-rebase-merges.sh +++ b/third_party/git/t/t3430-rebase-merges.sh @@ -20,11 +20,12 @@ Initial setup: ' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-rebase.sh -. "$TEST_DIRECTORY"/lib-log-graph.sh test_cmp_graph () { cat >expect && - lib_test_cmp_graph --boundary --format=%s "$@" + git log --graph --boundary --format=%s "$@" >output && + sed "s/ *$//" <output >output.trimmed && + test_cmp expect output.trimmed } test_expect_success 'setup' ' @@ -36,27 +37,20 @@ test_expect_success 'setup' ' test_commit A && git checkout -b first && test_commit B && - b=$(git rev-parse --short HEAD) && git checkout master && test_commit C && - c=$(git rev-parse --short HEAD) && test_commit D && - d=$(git rev-parse --short HEAD) && git merge --no-commit B && test_tick && git commit -m E && git tag -m E E && - e=$(git rev-parse --short HEAD) && git checkout -b second C && test_commit F && - f=$(git rev-parse --short HEAD) && test_commit G && - g=$(git rev-parse --short HEAD) && git checkout master && git merge --no-commit G && test_tick && git commit -m H && - h=$(git rev-parse --short HEAD) && git tag -m H H && git checkout A && test_commit conflicting-G G.t @@ -99,24 +93,24 @@ test_expect_success 'create completely different structure' ' ' test_expect_success 'generate correct todo list' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && label onto reset onto - pick $b B + pick d9df450 B label E reset onto - pick $c C + pick 5dee784 C label branch-point - pick $f F - pick $g G + pick ca2c861 F + pick 088b00a G label H reset branch-point # C - pick $d D - merge -C $e E # E - merge -C $h H # H + pick 12bd07b D + merge -C 2051b56 E # E + merge -C 233d48a H # H EOF @@ -157,6 +151,7 @@ test_expect_success 'failed `merge -C` writes patch (may be rescheduled, too)' ' test_path_is_file .git/rebase-merge/patch ' +SQ="'" test_expect_success 'failed `merge <branch>` does not crash' ' test_when_finished "test_might_fail git rebase --abort" && git checkout conflicting-G && @@ -345,7 +340,7 @@ test_expect_success 'A root commit can be a cousin, treat it that way' ' git merge --allow-unrelated-histories khnum && test_tick && git rebase -f -r HEAD^ && - test_cmp_rev ! HEAD^2 khnum && + ! test_cmp_rev HEAD^2 khnum && test_cmp_graph HEAD^.. <<-\EOF && * Merge branch '\''khnum'\'' into asherah |\ @@ -407,7 +402,7 @@ test_expect_success 'octopus merges' ' | | * three | * | two | |/ - * / one + * | one |/ o before-octopus EOF @@ -446,52 +441,4 @@ test_expect_success '--continue after resolving conflicts after a merge' ' test_path_is_missing .git/MERGE_HEAD ' -test_expect_success '--rebase-merges with strategies' ' - git checkout -b with-a-strategy F && - test_tick && - git merge -m "Merge conflicting-G" conflicting-G && - - : first, test with a merge strategy option && - git rebase -ir -Xtheirs G && - echo conflicting-G >expect && - test_cmp expect G.t && - - : now, try with a merge strategy other than recursive && - git reset --hard @{1} && - write_script git-merge-override <<-\EOF && - echo overridden$1 >>G.t - git add G.t - EOF - PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G && - test_write_lines G overridden--xopt >expect && - test_cmp expect G.t -' - -test_expect_success '--rebase-merges with commit that can generate bad characters for filename' ' - git checkout -b colon-in-label E && - git merge -m "colon: this should work" G && - git rebase --rebase-merges --force-rebase E -' - -test_expect_success '--rebase-merges with message matched with onto label' ' - git checkout -b onto-label E && - git merge -m onto G && - git rebase --rebase-merges --force-rebase E && - test_cmp_graph <<-\EOF - * onto - |\ - | * G - | * F - * | E - |\ \ - | * | B - * | | D - | |/ - |/| - * | C - |/ - * A - EOF -' - test_done diff --git a/third_party/git/t/t3431-rebase-fork-point.sh b/third_party/git/t/t3431-rebase-fork-point.sh deleted file mode 100755 index 78851b9a2a..0000000000 --- a/third_party/git/t/t3431-rebase-fork-point.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 Denton Liu -# - -test_description='git rebase --fork-point test' - -. ./test-lib.sh - -# A---B---D---E (master) -# \ -# C*---F---G (side) -# -# C was formerly part of master but master was rewound to remove C -# -test_expect_success setup ' - test_commit A && - test_commit B && - test_commit C && - git branch -t side && - git reset --hard HEAD^ && - test_commit D && - test_commit E && - git checkout side && - test_commit F && - test_commit G -' - -test_rebase () { - expected="$1" && - shift && - test_expect_success "git rebase $*" " - git checkout master && - git reset --hard E && - git checkout side && - git reset --hard G && - git rebase $* && - test_write_lines $expected >expect && - git log --pretty=%s >actual && - test_cmp expect actual - " -} - -test_rebase 'G F E D B A' -test_rebase 'G F D B A' --onto D -test_rebase 'G F B A' --keep-base -test_rebase 'G F C E D B A' --no-fork-point -test_rebase 'G F C D B A' --no-fork-point --onto D -test_rebase 'G F C B A' --no-fork-point --keep-base -test_rebase 'G F E D B A' --fork-point refs/heads/master -test_rebase 'G F D B A' --fork-point --onto D refs/heads/master -test_rebase 'G F B A' --fork-point --keep-base refs/heads/master -test_rebase 'G F C E D B A' refs/heads/master -test_rebase 'G F C D B A' --onto D refs/heads/master -test_rebase 'G F C B A' --keep-base refs/heads/master - -test_done diff --git a/third_party/git/t/t3432-rebase-fast-forward.sh b/third_party/git/t/t3432-rebase-fast-forward.sh deleted file mode 100755 index 6c9d4a1375..0000000000 --- a/third_party/git/t/t3432-rebase-fast-forward.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 Denton Liu -# - -test_description='ensure rebase fast-forwards commits when possible' - -. ./test-lib.sh - -test_expect_success setup ' - test_commit A && - test_commit B && - test_commit C && - test_commit D && - git checkout -t -b side -' - -test_rebase_same_head () { - status_n="$1" && - shift && - what_n="$1" && - shift && - cmp_n="$1" && - shift && - status_f="$1" && - shift && - what_f="$1" && - shift && - cmp_f="$1" && - shift && - test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" && - test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*" - test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && - test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" -} - -test_rebase_same_head_ () { - status="$1" && - shift && - what="$1" && - shift && - cmp="$1" && - shift && - flag="$1" - shift && - test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" " - oldhead=\$(git rev-parse HEAD) && - test_when_finished 'git reset --hard \$oldhead' && - cp .git/logs/HEAD expect && - git rebase$flag $* >stdout && - if test $what = work - then - old=\$(wc -l <expect) && - test_line_count '-gt' \$old .git/logs/HEAD - elif test $what = noop - then - test_cmp expect .git/logs/HEAD - fi && - newhead=\$(git rev-parse HEAD) && - if test $cmp = same - then - test_cmp_rev \$oldhead \$newhead - elif test $cmp = diff - then - test_cmp_rev ! \$oldhead \$newhead - fi - " -} - -changes='no changes' -test_rebase_same_head success noop same success work same -test_rebase_same_head success noop same success work same master -test_rebase_same_head success noop same success work diff --onto B B -test_rebase_same_head success noop same success work diff --onto B... B -test_rebase_same_head success noop same success work same --onto master... master -test_rebase_same_head success noop same success work same --keep-base master -test_rebase_same_head success noop same success work same --keep-base -test_rebase_same_head success noop same success work same --no-fork-point -test_rebase_same_head success noop same success work same --keep-base --no-fork-point -test_rebase_same_head success noop same success work same --fork-point master -test_rebase_same_head success noop same success work diff --fork-point --onto B B -test_rebase_same_head success noop same success work diff --fork-point --onto B... B -test_rebase_same_head success noop same success work same --fork-point --onto master... master -test_rebase_same_head success noop same success work same --keep-base --keep-base master - -test_expect_success 'add work same to side' ' - test_commit E -' - -changes='our changes' -test_rebase_same_head success noop same success work same -test_rebase_same_head success noop same success work same master -test_rebase_same_head success noop same success work diff --onto B B -test_rebase_same_head success noop same success work diff --onto B... B -test_rebase_same_head success noop same success work same --onto master... master -test_rebase_same_head success noop same success work same --keep-base master -test_rebase_same_head success noop same success work same --keep-base -test_rebase_same_head success noop same success work same --no-fork-point -test_rebase_same_head success noop same success work same --keep-base --no-fork-point -test_rebase_same_head success noop same success work same --fork-point master -test_rebase_same_head success noop same success work diff --fork-point --onto B B -test_rebase_same_head success noop same success work diff --fork-point --onto B... B -test_rebase_same_head success noop same success work same --fork-point --onto master... master -test_rebase_same_head success noop same success work same --fork-point --keep-base master - -test_expect_success 'add work same to upstream' ' - git checkout master && - test_commit F && - git checkout side -' - -changes='our and their changes' -test_rebase_same_head success noop same success work diff --onto B B -test_rebase_same_head success noop same success work diff --onto B... B -test_rebase_same_head success noop same success work diff --onto master... master -test_rebase_same_head success noop same success work diff --keep-base master -test_rebase_same_head success noop same success work diff --keep-base -test_rebase_same_head failure work same success work diff --fork-point --onto B B -test_rebase_same_head failure work same success work diff --fork-point --onto B... B -test_rebase_same_head success noop same success work diff --fork-point --onto master... master -test_rebase_same_head success noop same success work diff --fork-point --keep-base master - -test_done diff --git a/third_party/git/t/t3433-rebase-across-mode-change.sh b/third_party/git/t/t3433-rebase-across-mode-change.sh deleted file mode 100755 index 05df964670..0000000000 --- a/third_party/git/t/t3433-rebase-across-mode-change.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -test_description='git rebase across mode change' - -. ./test-lib.sh - -test_expect_success 'setup' ' - mkdir DS && - >DS/whatever && - git add DS && - git commit -m base && - - git branch side1 && - git branch side2 && - - git checkout side1 && - git rm -rf DS && - test_ln_s_add unrelated DS && - git commit -m side1 && - - git checkout side2 && - >unrelated && - git add unrelated && - git commit -m commit1 && - - echo >>unrelated && - git commit -am commit2 -' - -test_expect_success 'rebase changes with the apply backend' ' - test_when_finished "git rebase --abort || true" && - git checkout -b apply-backend side2 && - git rebase side1 -' - -test_expect_success 'rebase changes with the merge backend' ' - test_when_finished "git rebase --abort || true" && - git checkout -b merge-backend side2 && - git rebase -m side1 -' - -test_expect_success 'rebase changes with the merge backend with a delay' ' - test_when_finished "git rebase --abort || true" && - git checkout -b merge-delay-backend side2 && - git rebase -m --exec "sleep 1" side1 -' - -test_done diff --git a/third_party/git/t/t3434-rebase-i18n.sh b/third_party/git/t/t3434-rebase-i18n.sh deleted file mode 100755 index c7c835cde9..0000000000 --- a/third_party/git/t/t3434-rebase-i18n.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 Doan Tran Cong Danh -# - -test_description='rebase with changing encoding - -Initial setup: - -1 - 2 master - \ - 3 - 4 first - \ - 5 - 6 second -' - -. ./test-lib.sh - -compare_msg () { - iconv -f "$2" -t "$3" "$TEST_DIRECTORY/t3434/$1" >expect && - git cat-file commit HEAD >raw && - sed "1,/^$/d" raw >actual && - test_cmp expect actual -} - -test_expect_success setup ' - test_commit one && - git branch first && - test_commit two && - git switch first && - test_commit three && - git branch second && - test_commit four && - git switch second && - test_commit five && - test_commit six -' - -test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' ' - git switch -c merge-eucJP-UTF-8 first && - git config i18n.commitencoding eucJP && - git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && - git config i18n.commitencoding UTF-8 && - git rebase --rebase-merges master && - compare_msg eucJP.txt eucJP UTF-8 -' - -test_expect_success 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' ' - git switch -c merge-eucJP-ISO-2022-JP first && - git config i18n.commitencoding eucJP && - git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && - git config i18n.commitencoding ISO-2022-JP && - git rebase --rebase-merges master && - compare_msg eucJP.txt eucJP ISO-2022-JP -' - -test_rebase_continue_update_encode () { - old=$1 - new=$2 - msgfile=$3 - test_expect_success "rebase --continue update from $old to $new" ' - (git rebase --abort || : abort current git-rebase failure) && - git switch -c conflict-$old-$new one && - echo for-conflict >two.t && - git add two.t && - git config i18n.commitencoding $old && - git commit -F "$TEST_DIRECTORY/t3434/$msgfile" && - git config i18n.commitencoding $new && - test_must_fail git rebase -m master && - test -f .git/rebase-merge/message && - git stripspace <.git/rebase-merge/message >two.t && - git add two.t && - git rebase --continue && - compare_msg $msgfile $old $new && - : git-commit assume invalid utf-8 is latin1 && - test_cmp expect two.t - ' -} - -test_rebase_continue_update_encode ISO-8859-1 UTF-8 ISO8859-1.txt -test_rebase_continue_update_encode eucJP UTF-8 eucJP.txt -test_rebase_continue_update_encode eucJP ISO-2022-JP eucJP.txt - -test_done diff --git a/third_party/git/t/t3434/ISO8859-1.txt b/third_party/git/t/t3434/ISO8859-1.txt deleted file mode 100644 index 7cbef0ee6f..0000000000 --- a/third_party/git/t/t3434/ISO8859-1.txt +++ /dev/null @@ -1,3 +0,0 @@ - - -bdfg diff --git a/third_party/git/t/t3434/eucJP.txt b/third_party/git/t/t3434/eucJP.txt deleted file mode 100644 index 546f2aac01..0000000000 --- a/third_party/git/t/t3434/eucJP.txt +++ /dev/null @@ -1,4 +0,0 @@ -ϤҤۤ - -ƤΤΤǡ -ͤۤפݤޤӤء diff --git a/third_party/git/t/t3501-revert-cherry-pick.sh b/third_party/git/t/t3501-revert-cherry-pick.sh index 7c1da21df1..d1c68af8c5 100755 --- a/third_party/git/t/t3501-revert-cherry-pick.sh +++ b/third_party/git/t/t3501-revert-cherry-pick.sh @@ -106,7 +106,7 @@ test_expect_success 'cherry-pick on unborn branch' ' rm -rf * && git cherry-pick initial && git diff --quiet initial && - test_cmp_rev ! initial HEAD + ! test_cmp_rev initial HEAD ' test_expect_success 'cherry-pick "-" to pick from previous branch' ' @@ -150,7 +150,7 @@ test_expect_success 'cherry-pick works with dirty renamed file' ' test_tick && git commit -m renamed && echo modified >renamed && - git cherry-pick refs/heads/unrelated && + git cherry-pick refs/heads/unrelated >out && test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) && grep -q "^modified$" renamed ' diff --git a/third_party/git/t/t3504-cherry-pick-rerere.sh b/third_party/git/t/t3504-cherry-pick-rerere.sh index 80a0d08706..a267b2d144 100755 --- a/third_party/git/t/t3504-cherry-pick-rerere.sh +++ b/third_party/git/t/t3504-cherry-pick-rerere.sh @@ -94,10 +94,8 @@ test_expect_success 'cherry-pick --rerere-autoupdate more than once' ' test_expect_success 'cherry-pick conflict without rerere' ' test_config rerere.enabled false && - test_must_fail git cherry-pick foo-master && - grep ===== foo && - grep foo-dev foo && - grep foo-master foo + test_must_fail git cherry-pick master && + test_must_fail test_cmp expect foo ' test_done diff --git a/third_party/git/t/t3506-cherry-pick-ff.sh b/third_party/git/t/t3506-cherry-pick-ff.sh index 9d5adbc130..127dd0082f 100755 --- a/third_party/git/t/t3506-cherry-pick-ff.sh +++ b/third_party/git/t/t3506-cherry-pick-ff.sh @@ -16,11 +16,7 @@ test_expect_success setup ' git add file1 && test_tick && git commit -m "second" && - git tag second && - test_oid_cache <<-EOF - cp_ff sha1:1df192cd8bc58a2b275d842cede4d221ad9000d1 - cp_ff sha256:e70d6b7fc064bddb516b8d512c9057094b96ce6ff08e12080acc4fe7f1d60a1d - EOF + git tag second ' test_expect_success 'cherry-pick using --ff fast forwards' ' @@ -106,7 +102,7 @@ test_expect_success 'cherry pick a root commit with --ff' ' git add file2 && git commit --amend -m "file2" && git cherry-pick --ff first && - test "$(git rev-parse --verify HEAD)" = "$(test_oid cp_ff)" + test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1" ' test_expect_success 'cherry-pick --ff on unborn branch' ' diff --git a/third_party/git/t/t3507-cherry-pick-conflict.sh b/third_party/git/t/t3507-cherry-pick-conflict.sh index 9bd482ce3b..9b9b4ca8d4 100755 --- a/third_party/git/t/t3507-cherry-pick-conflict.sh +++ b/third_party/git/t/t3507-cherry-pick-conflict.sh @@ -168,7 +168,7 @@ test_expect_success 'successful final commit clears cherry-pick state' ' echo resolved >foo && test_path_is_file .git/sequencer/todo && git commit -a && - test_path_is_missing .git/sequencer + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'reset after final pick clears cherry-pick state' ' @@ -178,7 +178,7 @@ test_expect_success 'reset after final pick clears cherry-pick state' ' echo resolved >foo && test_path_is_file .git/sequencer/todo && git reset && - test_path_is_missing .git/sequencer + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'failed cherry-pick produces dirty index' ' @@ -381,23 +381,23 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' ' ' test_expect_success 'successful final commit clears revert state' ' - pristine_detach picked-signed && + pristine_detach picked-signed && - test_must_fail git revert picked-signed base && - echo resolved >foo && - test_path_is_file .git/sequencer/todo && - git commit -a && - test_path_is_missing .git/sequencer + test_must_fail git revert picked-signed base && + echo resolved >foo && + test_path_is_file .git/sequencer/todo && + git commit -a && + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'reset after final pick clears revert state' ' - pristine_detach picked-signed && + pristine_detach picked-signed && - test_must_fail git revert picked-signed base && - echo resolved >foo && - test_path_is_file .git/sequencer/todo && - git reset && - test_path_is_missing .git/sequencer + test_must_fail git revert picked-signed base && + echo resolved >foo && + test_path_is_file .git/sequencer/todo && + git reset && + test_must_fail test_path_exists .git/sequencer ' test_expect_success 'revert conflict, diff3 -m style' ' diff --git a/third_party/git/t/t3508-cherry-pick-many-commits.sh b/third_party/git/t/t3508-cherry-pick-many-commits.sh index 23070a7b73..b457333e18 100755 --- a/third_party/git/t/t3508-cherry-pick-many-commits.sh +++ b/third_party/git/t/t3508-cherry-pick-many-commits.sh @@ -5,7 +5,7 @@ test_description='test cherry-picking many commits' . ./test-lib.sh check_head_differs_from() { - test_cmp_rev ! HEAD "$1" + ! test_cmp_rev HEAD "$1" } check_head_equals() { diff --git a/third_party/git/t/t3600-rm.sh b/third_party/git/t/t3600-rm.sh index f2c0168941..66282a720e 100755 --- a/third_party/git/t/t3600-rm.sh +++ b/third_party/git/t/t3600-rm.sh @@ -113,10 +113,9 @@ test_expect_success '"rm" command printed' ' echo frotz >test-file && git add test-file && git commit -m "add file for rm test" && - git rm test-file >rm-output.raw && - grep "^rm " rm-output.raw >rm-output && - test_line_count = 1 rm-output && - rm -f test-file rm-output.raw rm-output && + git rm test-file >rm-output && + test $(grep "^rm " rm-output | wc -l) = 1 && + rm -f test-file rm-output && git commit -m "remove file from rm test" ' @@ -241,17 +240,14 @@ test_expect_success 'refresh index before checking if it is up-to-date' ' ' test_expect_success 'choking "git rm" should not let it die with cruft' ' - test_oid_init && git reset -q --hard && test_when_finished "rm -f .git/index.lock && git reset -q --hard" && i=0 && - hash=$(test_oid deadbeef) && while test $i -lt 12000 do - echo "100644 $hash 0 some-file-$i" + echo "100644 1234567890123456789012345678901234567890 0 some-file-$i" i=$(( $i + 1 )) done | git update-index --index-info && - # git command is intentionally placed upstream of pipe to induce SIGPIPE git rm -n "some-file-*" | : && test_path_is_missing .git/index.lock ' @@ -305,8 +301,7 @@ EOF test_expect_success 'rm removes empty submodules from work tree' ' mkdir submod && - hash=$(git rev-parse HEAD) && - git update-index --add --cacheinfo 160000 "$hash" submod && + git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod && git config -f .gitmodules submodule.sub.url ./. && git config -f .gitmodules submodule.sub.path submod && git submodule init && @@ -425,13 +420,6 @@ test_expect_success 'rm will error out on a modified .gitmodules file unless sta git status -s -uno >actual && test_cmp expect actual ' -test_expect_success 'rm will not error out on .gitmodules file with zero stat data' ' - git reset --hard && - git submodule update && - git read-tree HEAD && - git rm submod && - test_path_is_missing submod -' test_expect_success 'rm issues a warning when section is not found in .gitmodules' ' git reset --hard && @@ -632,8 +620,7 @@ test_expect_success 'setup subsubmodule' ' git submodule update && ( cd submod && - hash=$(git rev-parse HEAD) && - git update-index --add --cacheinfo 160000 "$hash" subsubmod && + git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod && git config -f .gitmodules submodule.sub.url ../. && git config -f .gitmodules submodule.sub.path subsubmod && git submodule init && diff --git a/third_party/git/t/t3601-rm-pathspec-file.sh b/third_party/git/t/t3601-rm-pathspec-file.sh deleted file mode 100755 index 7de21f8bcf..0000000000 --- a/third_party/git/t/t3601-rm-pathspec-file.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -test_description='rm --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && - git commit -m "files" && - - git tag checkpoint -' - -restore_checkpoint () { - git reset --hard checkpoint -} - -verify_expect () { - git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual && - test_cmp expect actual -} - -test_expect_success 'simplest' ' - restore_checkpoint && - - cat >expect <<-\EOF && - D fileA.t - EOF - - echo fileA.t | git rm --pathspec-from-file=- && - verify_expect -' - -test_expect_success '--pathspec-file-nul' ' - restore_checkpoint && - - cat >expect <<-\EOF && - D fileA.t - D fileB.t - EOF - - printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul && - verify_expect -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - cat >expect <<-\EOF && - D fileB.t - D fileC.t - EOF - - printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- && - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo fileA.t >list && - - test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git rm --pathspec-file-nul 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err && - - >empty_list && - test_must_fail git rm --pathspec-from-file=empty_list 2>err && - test_i18ngrep -e "No pathspec was given. Which files should I remove?" err -' - -test_done diff --git a/third_party/git/t/t3700-add.sh b/third_party/git/t/t3700-add.sh index 88bc799807..c325167b90 100755 --- a/third_party/git/t/t3700-add.sh +++ b/third_party/git/t/t3700-add.sh @@ -326,9 +326,7 @@ test_expect_success 'git add --dry-run of an existing file output' " cat >expect.err <<\EOF The following paths are ignored by one of your .gitignore files: ignored-file -hint: Use -f if you really want to add them. -hint: Turn this message off by running -hint: "git config advice.addIgnoredFile false" +Use -f if you really want to add them. EOF cat >expect.out <<\EOF add 'track-this' diff --git a/third_party/git/t/t3701-add-interactive.sh b/third_party/git/t/t3701-add-interactive.sh index 5bae6e50f1..69991a3168 100755 --- a/third_party/git/t/t3701-add-interactive.sh +++ b/third_party/git/t/t3701-add-interactive.sh @@ -23,17 +23,6 @@ diff_cmp () { test_cmp "$1.filtered" "$2.filtered" } -# This function uses a trick to manipulate the interactive add to use color: -# the `want_color()` function special-cases the situation where a pager was -# spawned and Git now wants to output colored text: to detect that situation, -# the environment variable `GIT_PAGER_IN_USE` is set. However, color is -# suppressed despite that environment variable if the `TERM` variable -# indicates a dumb terminal, so we set that variable, too. - -force_color () { - env GIT_PAGER_IN_USE=true TERM=vt100 "$@" -} - test_expect_success 'setup (initial)' ' echo content >file && git add file && @@ -68,15 +57,6 @@ test_expect_success 'revert works (initial)' ' ! grep . output ' -test_expect_success 'add untracked (multiple)' ' - test_when_finished "git reset && rm [1-9]" && - touch $(test_seq 9) && - test_write_lines a "2-5 8-" | git add -i -- [1-9] && - test_write_lines 2 3 4 5 8 9 >expected && - git ls-files [1-9] >output && - test_cmp expected output -' - test_expect_success 'setup (commit)' ' echo baseline >file && git add file && @@ -114,6 +94,7 @@ test_expect_success 'revert works (commit)' ' grep "unchanged *+3/-0 file" output ' + test_expect_success 'setup expected' ' cat >expected <<-\EOF EOF @@ -282,35 +263,6 @@ test_expect_success FILEMODE 'stage mode and hunk' ' # end of tests disabled when filemode is not usable -test_expect_success 'different prompts for mode change/deleted' ' - git reset --hard && - >file && - >deleted && - git add --chmod=+x file deleted && - echo changed >file && - rm deleted && - test_write_lines n n n | - git -c core.filemode=true add -p >actual && - sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered && - cat >expect <<-\EOF && - (1/1) Stage deletion [y,n,q,a,d,?]? - (1/2) Stage mode change [y,n,q,a,d,j,J,g,/,?]? - (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? - EOF - test_cmp expect actual.filtered -' - -test_expect_success 'correct message when there is nothing to do' ' - git reset --hard && - git add -p 2>err && - test_i18ngrep "No changes" err && - printf "\\0123" >binary && - git add binary && - printf "\\0abc" >binary && - git add -p 2>err && - test_i18ngrep "Only binary files changed" err -' - test_expect_success 'setup again' ' git reset --hard && test_chmod +x file && @@ -362,7 +314,7 @@ test_expect_success C_LOCALE_OUTPUT 'add first line works' ' git commit -am "clear local changes" && git apply patch && printf "%s\n" s y y | git add -p file 2>error | - sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \ + sed -n -e "s/^Stage this hunk[^@]*\(@@ .*\)/\1/" \ -e "/^[-+@ \\\\]"/p >output && test_must_be_empty error && git diff --cached >diff && @@ -422,36 +374,6 @@ test_expect_success 'split hunk setup' ' test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test ' -test_expect_success 'goto hunk' ' - test_when_finished "git reset" && - tr _ " " >expect <<-EOF && - (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? + 1: -1,2 +1,3 +15 - _ 2: -2,4 +3,8 +21 - go to which hunk? @@ -1,2 +1,3 @@ - _10 - +15 - _20 - (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_ - EOF - test_write_lines s y g 1 | git add -p >actual && - tail -n 7 <actual >actual.trimmed && - test_cmp expect actual.trimmed -' - -test_expect_success 'navigate to hunk via regex' ' - test_when_finished "git reset" && - tr _ " " >expect <<-EOF && - (2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? @@ -1,2 +1,3 @@ - _10 - +15 - _20 - (1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_ - EOF - test_write_lines s y /1,2 | git add -p >actual && - tail -n 5 <actual >actual.trimmed && - test_cmp expect actual.trimmed -' - test_expect_success 'split hunk "add -p (edit)"' ' # Split, say Edit and do nothing. Then: # @@ -481,40 +403,6 @@ test_expect_failure 'split hunk "add -p (no, yes, edit)"' ' ! grep "^+31" actual ' -test_expect_success 'split hunk with incomplete line at end' ' - git reset --hard && - printf "missing LF" >>test && - git add test && - test_write_lines before 10 20 30 40 50 60 70 >test && - git grep --cached missing && - test_write_lines s n y q | git add -p && - test_must_fail git grep --cached missing && - git grep before && - test_must_fail git grep --cached before -' - -test_expect_failure 'edit, adding lines to the first hunk' ' - test_write_lines 10 11 20 30 40 50 51 60 >test && - git reset && - tr _ " " >patch <<-EOF && - @@ -1,5 +1,6 @@ - _10 - +11 - +12 - _20 - +21 - +22 - _30 - EOF - # test sequence is s(plit), e(dit), n(o) - # q n q q is there to make sure we exit at the end. - printf "%s\n" s e n q n q q | - EDITOR=./fake_editor.sh git add -p 2>error && - test_must_be_empty error && - git diff --cached >actual && - grep "^+22" actual -' - test_expect_success 'patch mode ignores unmerged entries' ' git reset --hard && test_commit conflict && @@ -541,61 +429,35 @@ test_expect_success 'patch mode ignores unmerged entries' ' diff_cmp expected diff ' -test_expect_success 'diffs can be colorized' ' +test_expect_success TTY 'diffs can be colorized' ' git reset --hard && echo content >test && - printf y >y && - force_color git add -p >output 2>&1 <y && + printf y | test_terminal git add -p >output 2>&1 && # We do not want to depend on the exact coloring scheme # git uses for diffs, so just check that we saw some kind of color. grep "$(printf "\\033")" output ' -test_expect_success 'colorized diffs respect diff.wsErrorHighlight' ' - git reset --hard && - - echo "old " >test && - git add test && - echo "new " >test && - - printf y >y && - force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y && - test_decode_color <output.raw >output && - grep "old<" output -' - -test_expect_success 'diffFilter filters diff' ' +test_expect_success TTY 'diffFilter filters diff' ' git reset --hard && echo content >test && test_config interactive.diffFilter "sed s/^/foo:/" && - printf y >y && - force_color git add -p >output 2>&1 <y && + printf y | test_terminal git add -p >output 2>&1 && # avoid depending on the exact coloring or content of the prompts, # and just make sure we saw our diff prefixed grep foo:.*content output ' -test_expect_success 'detect bogus diffFilter output' ' +test_expect_success TTY 'detect bogus diffFilter output' ' git reset --hard && echo content >test && - test_config interactive.diffFilter "sed 1d" && - printf y >y && - test_must_fail force_color git add -p <y -' - -test_expect_success 'diff.algorithm is passed to `git diff-files`' ' - git reset --hard && - - >file && - git add file && - echo changed >file && - test_must_fail git -c diff.algorithm=bogus add -p 2>err && - test_i18ngrep "error: option diff-algorithm accepts " err + test_config interactive.diffFilter "echo too-short" && + printf y | test_must_fail test_terminal git add -p ' test_expect_success 'patch-mode via -i prompts for files' ' @@ -785,29 +647,4 @@ test_expect_success 'checkout -p works with pathological context lines' ' test_write_lines a b a b a a b a b a >expect && test_cmp expect a ' - -test_expect_success 'show help from add--helper' ' - git reset --hard && - cat >expect <<-EOF && - - <BOLD>*** Commands ***<RESET> - 1: <BOLD;BLUE>s<RESET>tatus 2: <BOLD;BLUE>u<RESET>pdate 3: <BOLD;BLUE>r<RESET>evert 4: <BOLD;BLUE>a<RESET>dd untracked - 5: <BOLD;BLUE>p<RESET>atch 6: <BOLD;BLUE>d<RESET>iff 7: <BOLD;BLUE>q<RESET>uit 8: <BOLD;BLUE>h<RESET>elp - <BOLD;BLUE>What now<RESET>> <BOLD;RED>status - show paths with changes<RESET> - <BOLD;RED>update - add working tree state to the staged set of changes<RESET> - <BOLD;RED>revert - revert staged set of changes back to the HEAD version<RESET> - <BOLD;RED>patch - pick hunks and update selectively<RESET> - <BOLD;RED>diff - view diff between HEAD and index<RESET> - <BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET> - <BOLD>*** Commands ***<RESET> - 1: <BOLD;BLUE>s<RESET>tatus 2: <BOLD;BLUE>u<RESET>pdate 3: <BOLD;BLUE>r<RESET>evert 4: <BOLD;BLUE>a<RESET>dd untracked - 5: <BOLD;BLUE>p<RESET>atch 6: <BOLD;BLUE>d<RESET>iff 7: <BOLD;BLUE>q<RESET>uit 8: <BOLD;BLUE>h<RESET>elp - <BOLD;BLUE>What now<RESET>>$SP - Bye. - EOF - test_write_lines h | force_color git add -i >actual.colored && - test_decode_color <actual.colored >actual && - test_i18ncmp expect actual -' - test_done diff --git a/third_party/git/t/t3704-add-pathspec-file.sh b/third_party/git/t/t3704-add-pathspec-file.sh deleted file mode 100755 index 9e35c1fbca..0000000000 --- a/third_party/git/t/t3704-add-pathspec-file.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/sh - -test_description='add --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - test_commit file0 && - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t -' - -restore_checkpoint () { - git reset -} - -verify_expect () { - git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual && - test_cmp expect actual -} - -test_expect_success '--pathspec-from-file from stdin' ' - restore_checkpoint && - - echo fileA.t | git add --pathspec-from-file=- && - - cat >expect <<-\EOF && - A fileA.t - EOF - verify_expect -' - -test_expect_success '--pathspec-from-file from file' ' - restore_checkpoint && - - echo fileA.t >list && - git add --pathspec-from-file=list && - - cat >expect <<-\EOF && - A fileA.t - EOF - verify_expect -' - -test_expect_success 'NUL delimiters' ' - restore_checkpoint && - - printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'LF delimiters' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'no trailing delimiter' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'CRLF delimiters' ' - restore_checkpoint && - - printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'quotes' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - git add --pathspec-from-file=list && - - cat >expect <<-\EOF && - A fileA.t - EOF - verify_expect -' - -test_expect_success 'quotes not compatible with --pathspec-file-nul' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - test_must_fail git add --pathspec-from-file=list --pathspec-file-nul -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- && - - cat >expect <<-\EOF && - A fileB.t - A fileC.t - EOF - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo fileA.t >list && - >empty_list && - - test_must_fail git add --pathspec-from-file=list --interactive 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err && - - test_must_fail git add --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err && - - test_must_fail git add --pathspec-from-file=list --edit 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --edit" err && - - test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git add --pathspec-file-nul 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err && - - # This case succeeds, but still prints to stderr - git add --pathspec-from-file=empty_list 2>err && - test_i18ngrep -e "Nothing specified, nothing added." err -' - -test_done diff --git a/third_party/git/t/t3800-mktag.sh b/third_party/git/t/t3800-mktag.sh index 64dcc5ec28..8eb47942e2 100755 --- a/third_party/git/t/t3800-mktag.sh +++ b/third_party/git/t/t3800-mktag.sh @@ -23,7 +23,6 @@ check_verify_failure () { # first create a commit, so we have a valid object/type # for the tag. test_expect_success 'setup' ' - test_oid_init && echo Hello >A && git update-index --add A && git commit -m "Initial commit" && @@ -70,28 +69,28 @@ check_verify_failure '"object" line SHA1 check' '^error: char7: .*SHA1 hash$' # 4. type line label check cat >tag.sig <<EOF -object $head +object 779e9b33986b1c2670fff52c5067603117b3e895 xxxx tag tag mytag tagger . <> 0 +0000 EOF -check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$' +check_verify_failure '"type" line label check' '^error: char47: .*"\\ntype "$' ############################################################ # 5. type line eol check -echo "object $head" >tag.sig +echo "object 779e9b33986b1c2670fff52c5067603117b3e895" >tag.sig printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig -check_verify_failure '"type" line eol check' '^error: char.*: .*"\\n"$' +check_verify_failure '"type" line eol check' '^error: char48: .*"\\n"$' ############################################################ # 6. tag line label check #1 cat >tag.sig <<EOF -object $head +object 779e9b33986b1c2670fff52c5067603117b3e895 type tag xxx mytag tagger . <> 0 +0000 @@ -99,37 +98,37 @@ tagger . <> 0 +0000 EOF check_verify_failure '"tag" line label check #1' \ - '^error: char.*: no "tag " found$' + '^error: char57: no "tag " found$' ############################################################ # 7. tag line label check #2 cat >tag.sig <<EOF -object $head +object 779e9b33986b1c2670fff52c5067603117b3e895 type taggggggggggggggggggggggggggggggg tag EOF check_verify_failure '"tag" line label check #2' \ - '^error: char.*: no "tag " found$' + '^error: char87: no "tag " found$' ############################################################ # 8. type line type-name length check cat >tag.sig <<EOF -object $head +object 779e9b33986b1c2670fff52c5067603117b3e895 type taggggggggggggggggggggggggggggggg tag mytag EOF check_verify_failure '"type" line type-name length check' \ - '^error: char.*: type too long$' + '^error: char53: type too long$' ############################################################ # 9. verify object (SHA1/type) check cat >tag.sig <<EOF -object $(test_oid deadbeef) +object 779e9b33986b1c2670fff52c5067603117b3e895 type tagggg tag mytag tagger . <> 0 +0000 @@ -151,7 +150,7 @@ tagger . <> 0 +0000 EOF check_verify_failure 'verify tag-name check' \ - '^error: char.*: could not verify tag name$' + '^error: char67: could not verify tag name$' ############################################################ # 11. tagger line label check #1 @@ -165,7 +164,7 @@ This is filler EOF check_verify_failure '"tagger" line label check #1' \ - '^error: char.*: could not find "tagger "$' + '^error: char70: could not find "tagger "$' ############################################################ # 12. tagger line label check #2 @@ -180,7 +179,7 @@ This is filler EOF check_verify_failure '"tagger" line label check #2' \ - '^error: char.*: could not find "tagger "$' + '^error: char70: could not find "tagger "$' ############################################################ # 13. disallow missing tag author name @@ -195,7 +194,7 @@ This is filler EOF check_verify_failure 'disallow missing tag author name' \ - '^error: char.*: missing tagger name$' + '^error: char77: missing tagger name$' ############################################################ # 14. disallow missing tag author name @@ -210,7 +209,7 @@ tagger T A Gger < EOF check_verify_failure 'disallow malformed tagger' \ - '^error: char.*: malformed tagger field$' + '^error: char77: malformed tagger field$' ############################################################ # 15. allow empty tag email @@ -239,7 +238,7 @@ tagger T A Gger <tag ger@example.com> 0 +0000 EOF check_verify_failure 'disallow spaces in tag email' \ - '^error: char.*: malformed tagger field$' + '^error: char77: malformed tagger field$' ############################################################ # 17. disallow missing tag timestamp @@ -253,7 +252,7 @@ tagger T A Gger <tagger@example.com>__ EOF check_verify_failure 'disallow missing tag timestamp' \ - '^error: char.*: missing tag timestamp$' + '^error: char107: missing tag timestamp$' ############################################################ # 18. detect invalid tag timestamp1 @@ -267,7 +266,7 @@ tagger T A Gger <tagger@example.com> Tue Mar 25 15:47:44 2008 EOF check_verify_failure 'detect invalid tag timestamp1' \ - '^error: char.*: missing tag timestamp$' + '^error: char107: missing tag timestamp$' ############################################################ # 19. detect invalid tag timestamp2 @@ -281,7 +280,7 @@ tagger T A Gger <tagger@example.com> 2008-03-31T12:20:15-0500 EOF check_verify_failure 'detect invalid tag timestamp2' \ - '^error: char.*: malformed tag timestamp$' + '^error: char111: malformed tag timestamp$' ############################################################ # 20. detect invalid tag timezone1 @@ -295,7 +294,7 @@ tagger T A Gger <tagger@example.com> 1206478233 GMT EOF check_verify_failure 'detect invalid tag timezone1' \ - '^error: char.*: malformed tag timezone$' + '^error: char118: malformed tag timezone$' ############################################################ # 21. detect invalid tag timezone2 @@ -309,7 +308,7 @@ tagger T A Gger <tagger@example.com> 1206478233 + 30 EOF check_verify_failure 'detect invalid tag timezone2' \ - '^error: char.*: malformed tag timezone$' + '^error: char118: malformed tag timezone$' ############################################################ # 22. detect invalid tag timezone3 @@ -323,7 +322,7 @@ tagger T A Gger <tagger@example.com> 1206478233 -1430 EOF check_verify_failure 'detect invalid tag timezone3' \ - '^error: char.*: malformed tag timezone$' + '^error: char118: malformed tag timezone$' ############################################################ # 23. detect invalid header entry @@ -338,7 +337,7 @@ this line should not be here EOF check_verify_failure 'detect invalid header entry' \ - '^error: char.*: trailing garbage in tag header$' + '^error: char124: trailing garbage in tag header$' ############################################################ # 24. create valid tag diff --git a/third_party/git/t/t3900-i18n-commit.sh b/third_party/git/t/t3900-i18n-commit.sh index d277a9f4b7..b92ff95977 100755 --- a/third_party/git/t/t3900-i18n-commit.sh +++ b/third_party/git/t/t3900-i18n-commit.sh @@ -204,41 +204,4 @@ test_commit_autosquash_flags eucJP fixup test_commit_autosquash_flags ISO-2022-JP squash -test_commit_autosquash_multi_encoding () { - flag=$1 - old=$2 - new=$3 - msg=$4 - test_expect_success "commit --$flag into $old from $new" ' - git checkout -b $flag-$old-$new C0 && - git config i18n.commitencoding $old && - echo $old >>F && - git commit -a -F "$TEST_DIRECTORY"/t3900/$msg && - test_tick && - echo intermediate stuff >>G && - git add G && - git commit -a -m "intermediate commit" && - test_tick && - git config i18n.commitencoding $new && - echo $new-$flag >>F && - git commit -a --$flag HEAD^ && - git rebase --autosquash -i HEAD^^^ && - git rev-list HEAD >actual && - test_line_count = 3 actual && - iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect && - if test $flag = squash; then - subject="$(head -1 expect)" && - printf "\nsquash! %s\n" "$subject" >>expect - fi && - git cat-file commit HEAD^ >raw && - (sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual && - test_cmp expect actual - ' -} - -test_commit_autosquash_multi_encoding fixup UTF-8 ISO-8859-1 1-UTF-8.txt -test_commit_autosquash_multi_encoding squash ISO-8859-1 UTF-8 ISO8859-1.txt -test_commit_autosquash_multi_encoding squash eucJP ISO-2022-JP eucJP.txt -test_commit_autosquash_multi_encoding fixup ISO-2022-JP UTF-8 ISO-2022-JP.txt - test_done diff --git a/third_party/git/t/t3903-stash.sh b/third_party/git/t/t3903-stash.sh index 3ad23e2502..b8e337893f 100755 --- a/third_party/git/t/t3903-stash.sh +++ b/third_party/git/t/t3903-stash.sh @@ -7,18 +7,6 @@ test_description='Test git stash' . ./test-lib.sh -diff_cmp () { - for i in "$1" "$2" - do - sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \ - -e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \ - -e 's/^index [0-9a-f]*,[0-9a-f]*\.\.[0-9a-f]*/index 1234567,7654321..89abcde/' \ - "$i" >"$i.compare" || return 1 - done && - test_cmp "$1.compare" "$2.compare" && - rm -f "$1.compare" "$2.compare" -} - test_expect_success 'stash some dirty working directory' ' echo 1 >file && git add file && @@ -48,7 +36,7 @@ EOF test_expect_success 'parents of stash' ' test $(git rev-parse stash^) = $(git rev-parse HEAD) && git diff stash^2..stash >output && - diff_cmp expect output + test_cmp expect output ' test_expect_success 'applying bogus stash does nothing' ' @@ -222,13 +210,13 @@ test_expect_success 'stash branch' ' test refs/heads/stashbranch = $(git symbolic-ref HEAD) && test $(git rev-parse HEAD) = $(git rev-parse master^) && git diff --cached >output && - diff_cmp expect output && + test_cmp expect output && git diff >output && - diff_cmp expect1 output && + test_cmp expect1 output && git add file && git commit -m alternate\ second && git diff master..stashbranch >output && - diff_cmp output expect2 && + test_cmp output expect2 && test 0 = $(git stash list | wc -l) ' @@ -244,11 +232,8 @@ test_expect_success 'save -q is quiet' ' test_must_be_empty output.out ' -test_expect_success 'pop -q works and is quiet' ' +test_expect_success 'pop -q is quiet' ' git stash pop -q >output.out 2>&1 && - echo bar >expect && - git show :file >actual && - test_cmp expect actual && test_must_be_empty output.out ' @@ -257,8 +242,6 @@ test_expect_success 'pop -q --index works and is quiet' ' git add file && git stash save --quiet && git stash pop -q --index >output.out 2>&1 && - git diff-files file2 >file2.diff && - test_must_be_empty file2.diff && test foo = "$(git show :file)" && test_must_be_empty output.out ' @@ -285,11 +268,6 @@ test_expect_success 'stash --no-keep-index' ' test bar,bar2 = $(cat file),$(cat file2) ' -test_expect_success 'dont assume push with non-option args' ' - test_must_fail git stash -q drop 2>err && - test_i18ngrep -e "subcommand wasn'\''t specified; '\''push'\'' can'\''t be assumed due to unexpected token '\''drop'\''" err -' - test_expect_success 'stash --invalid-option' ' echo bar5 >file && echo bar6 >file2 && @@ -599,7 +577,7 @@ test_expect_success 'stash show -p - stashes on stack, stash-like argument' ' +bar EOF git stash show -p ${STASH_ID} >actual && - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'stash show - no stashes on stack, stash-like argument' ' @@ -631,7 +609,7 @@ test_expect_success 'stash show -p - no stashes on stack, stash-like argument' ' +foo EOF git stash show -p ${STASH_ID} >actual && - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'stash show --patience shows diff' ' @@ -649,7 +627,7 @@ test_expect_success 'stash show --patience shows diff' ' +foo EOF git stash show --patience ${STASH_ID} >actual && - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'drop: fail early if specified stash is not a stash ref' ' @@ -813,7 +791,7 @@ test_expect_success 'stash where working directory contains "HEAD" file' ' git diff-index --cached --quiet HEAD && test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" && git diff stash^..stash >output && - diff_cmp expect output + test_cmp expect output ' test_expect_success 'store called with invalid commit' ' @@ -869,7 +847,7 @@ test_expect_success 'stash list implies --first-parent -m' ' +working EOF git stash list --format=%gd -p >actual && - diff_cmp expect actual + test_cmp expect actual ' test_expect_success 'stash list --cc shows combined diff' ' @@ -886,7 +864,7 @@ test_expect_success 'stash list --cc shows combined diff' ' ++working EOF git stash list --format=%gd -p --cc >actual && - diff_cmp expect actual + test_cmp expect actual ' test_expect_success 'stash is not confused by partial renames' ' @@ -1263,31 +1241,4 @@ test_expect_success 'stash --keep-index with file deleted in index does not resu test_path_is_missing to-remove ' -test_expect_success 'stash apply should succeed with unmodified file' ' - echo base >file && - git add file && - git commit -m base && - - # now stash a modification - echo modified >file && - git stash && - - # make the file stat dirty - cp file other && - mv other file && - - git stash apply -' - -test_expect_success 'stash handles skip-worktree entries nicely' ' - test_commit A && - echo changed >A.t && - git add A.t && - git update-index --skip-worktree A.t && - rm A.t && - git stash && - - git rev-parse --verify refs/stash:A.t -' - test_done diff --git a/third_party/git/t/t3905-stash-include-untracked.sh b/third_party/git/t/t3905-stash-include-untracked.sh index f075c7f1f3..29ca76f2fb 100755 --- a/third_party/git/t/t3905-stash-include-untracked.sh +++ b/third_party/git/t/t3905-stash-include-untracked.sh @@ -277,8 +277,8 @@ test_expect_success 'stash -u -- <ignored> leaves ignored file alone' ' test_path_is_file ignored.d/bar ' -test_expect_success 'stash -u -- <non-existent> shows no changes when there are none' ' - git stash push -u -- non-existent >actual && +test_expect_success 'stash -u -- <non-existant> shows no changes when there are none' ' + git stash push -u -- non-existant >actual && echo "No local changes to save" >expect && test_i18ncmp expect actual ' diff --git a/third_party/git/t/t3906-stash-submodule.sh b/third_party/git/t/t3906-stash-submodule.sh index b93d1d74da..d7219d6f8f 100755 --- a/third_party/git/t/t3906-stash-submodule.sh +++ b/third_party/git/t/t3906-stash-submodule.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='stash can handle submodules' +test_description='stash apply can handle submodules' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-submodule-update.sh @@ -21,44 +21,4 @@ KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 test_submodule_switch "git_stash" -setup_basic () { - test_when_finished "rm -rf main sub" && - git init sub && - ( - cd sub && - test_commit sub_file - ) && - git init main && - ( - cd main && - git submodule add ../sub && - test_commit main_file - ) -} - -test_expect_success 'stash push with submodule.recurse=true preserves dirty submodule worktree' ' - setup_basic && - ( - cd main && - git config submodule.recurse true && - echo "x" >main_file.t && - echo "y" >sub/sub_file.t && - git stash push && - test_must_fail git -C sub diff --quiet - ) -' - -test_expect_success 'stash push and pop with submodule.recurse=true preserves dirty submodule worktree' ' - setup_basic && - ( - cd main && - git config submodule.recurse true && - echo "x" >main_file.t && - echo "y" >sub/sub_file.t && - git stash push && - git stash pop && - test_must_fail git -C sub diff --quiet - ) -' - test_done diff --git a/third_party/git/t/t3908-stash-in-worktree.sh b/third_party/git/t/t3908-stash-in-worktree.sh deleted file mode 100755 index 2b2b366ef9..0000000000 --- a/third_party/git/t/t3908-stash-in-worktree.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 Johannes E Schindelin -# - -test_description='Test git stash in a worktree' - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit initial && - git worktree add wt && - test_commit -C wt in-worktree -' - -test_expect_success 'apply in subdirectory' ' - mkdir wt/subdir && - ( - cd wt/subdir && - echo modified >../initial.t && - git stash && - git stash apply >out - ) && - grep "\.\.\/initial\.t" wt/subdir/out -' - -test_done diff --git a/third_party/git/t/t3909-stash-pathspec-file.sh b/third_party/git/t/t3909-stash-pathspec-file.sh deleted file mode 100755 index 55e050cfd4..0000000000 --- a/third_party/git/t/t3909-stash-pathspec-file.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -test_description='stash --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - >fileA.t && - >fileB.t && - >fileC.t && - >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && - git commit -m "Files" && - - git tag checkpoint -' - -restore_checkpoint () { - git reset --hard checkpoint -} - -verify_expect () { - git stash show --name-status >actual && - test_cmp expect actual -} - -test_expect_success 'simplest' ' - restore_checkpoint && - - # More files are written to make sure that git didnt ignore - # --pathspec-from-file, stashing everything - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - - cat >expect <<-\EOF && - M fileA.t - EOF - - echo fileA.t | git stash push --pathspec-from-file=- && - verify_expect -' - -test_expect_success '--pathspec-file-nul' ' - restore_checkpoint && - - # More files are written to make sure that git didnt ignore - # --pathspec-from-file, stashing everything - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - - printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul && - verify_expect -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - # More files are written to make sure that git didnt ignore - # --pathspec-from-file, stashing everything - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - - cat >expect <<-\EOF && - M fileB.t - M fileC.t - EOF - - printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- && - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo A >fileA.t && - echo fileA.t >list && - - test_must_fail git stash push --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err && - - test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git stash push --pathspec-file-nul 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err -' - -test_done diff --git a/third_party/git/t/t4000-diff-format.sh b/third_party/git/t/t4000-diff-format.sh index e5116a76a1..8de36b7d12 100755 --- a/third_party/git/t/t4000-diff-format.sh +++ b/third_party/git/t/t4000-diff-format.sh @@ -78,7 +78,7 @@ test_expect_success 'git diff-files --no-patch --patch shows the patch' ' test_expect_success 'git diff-files --no-patch --patch-with-raw shows the patch and raw data' ' git diff-files --no-patch --patch-with-raw >actual && - grep -q "^:100644 100755 .* $ZERO_OID M path0\$" actual && + grep -q "^:100644 100755 .* 0000000000000000000000000000000000000000 M path0\$" actual && tail -n +4 actual >actual-patch && compare_diff_patch expected actual-patch ' diff --git a/third_party/git/t/t4002-diff-basic.sh b/third_party/git/t/t4002-diff-basic.sh index cbcdd10464..3a6c21e825 100755 --- a/third_party/git/t/t4002-diff-basic.sh +++ b/third_party/git/t/t4002-diff-basic.sh @@ -7,272 +7,123 @@ test_description='Test diff raw-output. ' . ./test-lib.sh - . "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh -test_oid_init - -test_oid_cache <<\EOF -aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d -aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403 - -aa_2 sha1:6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 -aa_2 sha256:6eaa3437de83f145a4aaa6ba355303075ade547b128ec6a2cd00a81ff7ce7a56 - -an_1 sha1:7e426fb079479fd67f6d81f984e4ec649a44bc25 -an_1 sha256:8f92a0bec99e399a38e3bd0e1bf19fbf121e0160efb29b857df79d439f1c4536 - -dd_1 sha1:bcc68ef997017466d5c9094bcf7692295f588c9a -dd_1 sha256:07e17428b00639b85485d2b01083d219e2f3e3ba8579e9ca44e9cc8dd554d952 - -df_1 sha1:6d50f65d3bdab91c63444294d38f08aeff328e42 -df_1 sha256:e367cecc27e9bf5451b1c65828cb21938d36a5f8e39c1b03ad6509cc36bb8e9d - -df_2 sha1:71420ab81e254145d26d6fc0cddee64c1acd4787 -df_2 sha256:0f0a86d10347ff6921d03a3c954679f3f1d14fa3d5cd82f57b32c09755f3a47d - -dfd1 sha1:68a6d8b91da11045cf4aa3a5ab9f2a781c701249 -dfd1 sha256:f3bd3265b02b6978ce86490d8ad026c573639c974b3de1d9faf30d8d5a77d3d5 - -dm_1 sha1:141c1f1642328e4bc46a7d801a71da392e66791e -dm_1 sha256:c89f8656e7b94e21ee5fbaf0e2149bbf783c51edbe2ce110349cac13059ee7ed - -dm_2 sha1:3c4d8de5fbad08572bab8e10eef8dbb264cf0231 -dm_2 sha256:83a572e37e0c94086294dae2cecc43d9131afd6f6c906e495c78972230b54988 - -dn_1 sha1:35abde1506ddf806572ff4d407bd06885d0f8ee9 -dn_1 sha256:775d5852582070e620be63327bfa515fab8f71c7ac3e4f0c3cd6267b4377ba28 - -ll_2 sha1:1d41122ebdd7a640f29d3c9cc4f9d70094374762 -ll_2 sha256:7917b4948a883cfed0a77d3d5a625dc8577d6ddcc3c6c3bbc56c4d4226a2246d - -md_1 sha1:03f24c8c4700babccfd28b654e7e8eac402ad6cd -md_1 sha256:fc9f30369b978595ad685ba11ca9a17de0af16d79cd4b629975f4f1590033902 - -md_2 sha1:103d9f89b50b9aad03054b579be5e7aa665f2d57 -md_2 sha256:fc78ec75275628762fe520479a6b2398dec295ce7aabcb1d15e5963c7b4e9317 - -mm_1 sha1:b258508afb7ceb449981bd9d63d2d3e971bf8d34 -mm_1 sha256:a4b7847d228e900e3000285e240c20fd96f9dd41ce1445305f6eada126d4a04a - -mm_2 sha1:b431b272d829ff3aa4d1a5085f4394ab4d3305b6 -mm_2 sha256:3f8b83ea36aacf689bcf1a1290a9a8ed341564d32682ea6f76fea9a979186782 - -mm_3 sha1:19989d4559aae417fedee240ccf2ba315ea4dc2b -mm_3 sha256:71b3bfc5747ac033fff9ea0ab39ee453a3af2969890e75d6ef547b87544e2681 - -mn_1 sha1:bd084b0c27c7b6cc34f11d6d0509a29be3caf970 -mn_1 sha256:47a67450583d7a329eb01a7c4ba644945af72c0ed2c7c95eb5a00d6e46d4d483 - -mn_2 sha1:a716d58de4a570e0038f5c307bd8db34daea021f -mn_2 sha256:f95104c1ebe27acb84bac25a7be98c71f6b8d3054b21f357a5be0c524ad97e08 - -nm_1 sha1:c8f25781e8f1792e3e40b74225e20553041b5226 -nm_1 sha256:09baddc7afaa62e62e152c23c9c3ab94bf15a3894031e227e9be7fe68e1f4e49 - -nm_2 sha1:cdb9a8c3da571502ac30225e9c17beccb8387983 -nm_2 sha256:58b5227956ac2d2a08d0efa513c0ae37430948b16791ea3869a1308dbf05536d - -na_1 sha1:15885881ea69115351c09b38371f0348a3fb8c67 -na_1 sha256:18e4fdd1670cd7968ee23d35bfd29e5418d56fb190c840094c1c57ceee0aad8f - -nd_1 sha1:a4e179e4291e5536a5e1c82e091052772d2c5a93 -nd_1 sha256:07dac9b01d00956ea0c65bd993d7de4864aeef2ed3cbb1255d9f1d949fcd6df6 - -ss_1 sha1:40c959f984c8b89a2b02520d17f00d717f024397 -ss_1 sha256:50fc1b5df74d9910db2f9270993484235f15b69b75b01bcfb53e059289d14af9 - -ss_2 sha1:2ac547ae9614a00d1b28275de608131f7a0e259f -ss_2 sha256:a90f02e6044f1497d13db587d22ab12f90150a7d1e084afcf96065fab35ae2bc - -tt_1 sha1:4ac13458899ab908ef3b1128fa378daefc88d356 -tt_1 sha256:c53113c7dd5060e86b5b251428bd058f6726f66273c6a24bff1c61a04f498dd3 - -tt_2 sha1:4c86f9a85fbc5e6804ee2e17a797538fbe785bca -tt_2 sha256:0775f2a296129a7cf2862b46bc0e88c14d593f2773a3e3fb1c5193db6f5a7e77 - -tt_3 sha1:c4e4a12231b9fa79a0053cb6077fcb21bb5b135a -tt_3 sha256:47860f93cdd211f96443e0560f21c57ab6c2f4b0ac27ff03651a352e53fe8484 - -z__1 sha1:7d670fdcdb9929f6c7dac196ff78689cd1c566a1 -z__1 sha256:44d0f37aff5e51cfcfdd1134c93a6419bcca7b9964f792ffcd5f9b4fcba1ee63 - -z__2 sha1:5e5f22072bb39f6e12cf663a57cb634c76eefb49 -z__2 sha256:d29de162113190fed104eb5f010820cef4e315f89b9326e8497f7219fb737894 - -z__3 sha1:1ba523955d5160681af65cb776411f574c1e8155 -z__3 sha256:07422d772b07794ab4369a5648e617719f89c2d2212cbeab05d97214b6471636 - -zaa1 sha1:8acb8e9750e3f644bf323fcf3d338849db106c77 -zaa1 sha256:e79b029282c8abec2d9f3f7faceaf2a1405e02d1f368e66450ae66cf5b68d1f4 - -zaa2 sha1:6c0b99286d0bce551ac4a7b3dff8b706edff3715 -zaa2 sha256:c82bd78c3e69ea1796e6b1a7a3ba45bb106c50e819296475b862123d3f5cc5a0 - -zan1 sha1:087494262084cefee7ed484d20c8dc0580791272 -zan1 sha256:4b159eb3804d05599023dd074f771d06d02870f4ab24a7165add8ac3d703b8d3 - -zdd1 sha1:879007efae624d2b1307214b24a956f0a8d686a8 -zdd1 sha256:eecfdd4d8092dd0363fb6d4548b54c6afc8982c3ed9b34e393f1d6a921d8eaa3 - -zdm1 sha1:9b541b2275c06e3a7b13f28badf5294e2ae63df4 -zdm1 sha256:ab136e88e19a843c4bf7713d2090d5a2186ba16a6a80dacc12eeddd256a8e556 - -zdm2 sha1:d77371d15817fcaa57eeec27f770c505ba974ec1 -zdm2 sha256:1c1a5f57363f46a15d95ce8527b3c2c158d88d16853b4acbf81bd20fd2c89a46 - -zdn1 sha1:beb5d38c55283d280685ea21a0e50cfcc0ca064a -zdn1 sha256:0f0eca66183617b0aa5ad74b256540329f841470922ca6760263c996d825eb18 - -zmd1 sha1:d41fda41b7ec4de46b43cb7ea42a45001ae393d5 -zmd1 sha256:1ed32d481852eddf31a0ce12652a0ad14bf5b7a842667b5dbb0b50f35bf1c80a - -zmd2 sha1:a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 -zmd2 sha256:b238da211b404f8917df2d9c6f7030535e904b2186131007a3c292ec6902f933 - -zmm1 sha1:4ca22bae2527d3d9e1676498a0fba3b355bd1278 -zmm1 sha256:072b1d85b5f34fabc99dfa46008c5418df68302d3e317430006f49b32d244226 - -zmm2 sha1:61422ba9c2c873416061a88cd40a59a35b576474 -zmm2 sha256:81dd5d2b3c5cda16fef552256aed4e2ea0802a8450a08f308a92142112ff6dda - -zmm3 sha1:697aad7715a1e7306ca76290a3dd4208fbaeddfa -zmm3 sha256:8b10fab49e9be3414aa5e9a93d0e46f9569053440138a7c19a5eb5536d8e95bf - -zmn1 sha1:b16d7b25b869f2beb124efa53467d8a1550ad694 -zmn1 sha256:609e4f75d1295e844c826feeba213acb0b6cfc609adfe8ff705b19e3829ae3e9 - -zmn2 sha1:a5c544c21cfcb07eb80a4d89a5b7d1570002edfd -zmn2 sha256:d6d03edf2dc1a3b267a8205de5f41a2ff4b03def8c7ae02052b543fb09d589fc - -zna1 sha1:d12979c22fff69c59ca9409e7a8fe3ee25eaee80 -zna1 sha256:b37b80e789e8ea32aa323f004628f02013f632124b0282c7fe00a127d3c64c3c - -znd1 sha1:a18393c636b98e9bd7296b8b437ea4992b72440c -znd1 sha256:af92a22eee8c38410a0c9d2b5135a10aeb052cbc7cf675541ed9a67bfcaf7cf9 - -znm1 sha1:3fdbe17fd013303a2e981e1ca1c6cd6e72789087 -znm1 sha256:f75aeaa0c11e76918e381c105f0752932c6150e941fec565d24fa31098a13dc1 - -znm2 sha1:7e09d6a3a14bd630913e8c75693cea32157b606d -znm2 sha256:938d73cfbaa1c902a84fb5b3afd9736aa0590367fb9bd59c6c4d072ce70fcd6d -EOF - -cat >.test-plain-OA <<EOF -:000000 100644 $(test_oid zero) $(test_oid aa_1) A AA -:000000 100644 $(test_oid zero) $(test_oid an_1) A AN -:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD -:000000 040000 $(test_oid zero) $(test_oid df_1) A DF -:100644 000000 $(test_oid dm_1) $(test_oid zero) D DM -:100644 000000 $(test_oid dn_1) $(test_oid zero) D DN -:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL -:100644 100644 $(test_oid md_1) $(test_oid md_2) M MD -:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M MM -:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M MN -:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS -:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M TT -:040000 040000 $(test_oid z__1) $(test_oid z__2) M Z +cat >.test-plain-OA <<\EOF +:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A AA +:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A AN +:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD +:000000 040000 0000000000000000000000000000000000000000 6d50f65d3bdab91c63444294d38f08aeff328e42 A DF +:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D DM +:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D DN +:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL +:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M MD +:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M MM +:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M MN +:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS +:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M TT +:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 5e5f22072bb39f6e12cf663a57cb634c76eefb49 M Z EOF -cat >.test-recursive-OA <<EOF -:000000 100644 $(test_oid zero) $(test_oid aa_1) A AA -:000000 100644 $(test_oid zero) $(test_oid an_1) A AN -:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD -:000000 100644 $(test_oid zero) $(test_oid dfd1) A DF/DF -:100644 000000 $(test_oid dm_1) $(test_oid zero) D DM -:100644 000000 $(test_oid dn_1) $(test_oid zero) D DN -:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL -:100644 100644 $(test_oid md_1) $(test_oid md_2) M MD -:100644 100644 $(test_oid mm_1) $(test_oid mm_2) M MM -:100644 100644 $(test_oid mn_1) $(test_oid mn_2) M MN -:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS -:100644 100644 $(test_oid tt_1) $(test_oid tt_2) M TT -:000000 100644 $(test_oid zero) $(test_oid zaa1) A Z/AA -:000000 100644 $(test_oid zero) $(test_oid zan1) A Z/AN -:100644 000000 $(test_oid zdd1) $(test_oid zero) D Z/DD -:100644 000000 $(test_oid zdm1) $(test_oid zero) D Z/DM -:100644 000000 $(test_oid zdn1) $(test_oid zero) D Z/DN -:100644 100644 $(test_oid zmd1) $(test_oid zmd2) M Z/MD -:100644 100644 $(test_oid zmm1) $(test_oid zmm2) M Z/MM -:100644 100644 $(test_oid zmn1) $(test_oid zmn2) M Z/MN +cat >.test-recursive-OA <<\EOF +:000000 100644 0000000000000000000000000000000000000000 ccba72ad3888a3520b39efcf780b9ee64167535d A AA +:000000 100644 0000000000000000000000000000000000000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 A AN +:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD +:000000 100644 0000000000000000000000000000000000000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 A DF/DF +:100644 000000 141c1f1642328e4bc46a7d801a71da392e66791e 0000000000000000000000000000000000000000 D DM +:100644 000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 0000000000000000000000000000000000000000 D DN +:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL +:100644 100644 03f24c8c4700babccfd28b654e7e8eac402ad6cd 103d9f89b50b9aad03054b579be5e7aa665f2d57 M MD +:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 M MM +:100644 100644 bd084b0c27c7b6cc34f11d6d0509a29be3caf970 a716d58de4a570e0038f5c307bd8db34daea021f M MN +:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS +:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 4c86f9a85fbc5e6804ee2e17a797538fbe785bca M TT +:000000 100644 0000000000000000000000000000000000000000 8acb8e9750e3f644bf323fcf3d338849db106c77 A Z/AA +:000000 100644 0000000000000000000000000000000000000000 087494262084cefee7ed484d20c8dc0580791272 A Z/AN +:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D Z/DD +:100644 000000 9b541b2275c06e3a7b13f28badf5294e2ae63df4 0000000000000000000000000000000000000000 D Z/DM +:100644 000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a 0000000000000000000000000000000000000000 D Z/DN +:100644 100644 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 M Z/MD +:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 61422ba9c2c873416061a88cd40a59a35b576474 M Z/MM +:100644 100644 b16d7b25b869f2beb124efa53467d8a1550ad694 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd M Z/MN EOF -cat >.test-plain-OB <<EOF -:000000 100644 $(test_oid zero) $(test_oid aa_2) A AA -:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD -:000000 100644 $(test_oid zero) $(test_oid df_2) A DF -:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M DM -:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL -:100644 000000 $(test_oid md_1) $(test_oid zero) D MD -:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M MM -:000000 100644 $(test_oid zero) $(test_oid na_1) A NA -:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND -:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM -:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS -:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M TT -:040000 040000 $(test_oid z__1) $(test_oid z__3) M Z +cat >.test-plain-OB <<\EOF +:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A AA +:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD +:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF +:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M DM +:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL +:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D MD +:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM +:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA +:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND +:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM +:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS +:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT +:040000 040000 7d670fdcdb9929f6c7dac196ff78689cd1c566a1 1ba523955d5160681af65cb776411f574c1e8155 M Z EOF -cat >.test-recursive-OB <<EOF -:000000 100644 $(test_oid zero) $(test_oid aa_2) A AA -:100644 000000 $(test_oid dd_1) $(test_oid zero) D DD -:000000 100644 $(test_oid zero) $(test_oid df_2) A DF -:100644 100644 $(test_oid dm_1) $(test_oid dm_2) M DM -:000000 100644 $(test_oid zero) $(test_oid ll_2) A LL -:100644 000000 $(test_oid md_1) $(test_oid zero) D MD -:100644 100644 $(test_oid mm_1) $(test_oid mm_3) M MM -:000000 100644 $(test_oid zero) $(test_oid na_1) A NA -:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND -:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM -:100644 100644 $(test_oid ss_1) $(test_oid ss_2) M SS -:100644 100644 $(test_oid tt_1) $(test_oid tt_3) M TT -:000000 100644 $(test_oid zero) $(test_oid zaa2) A Z/AA -:100644 000000 $(test_oid zdd1) $(test_oid zero) D Z/DD -:100644 100644 $(test_oid zdm1) $(test_oid zdm2) M Z/DM -:100644 000000 $(test_oid zmd1) $(test_oid zero) D Z/MD -:100644 100644 $(test_oid zmm1) $(test_oid zmm3) M Z/MM -:000000 100644 $(test_oid zero) $(test_oid zna1) A Z/NA -:100644 000000 $(test_oid znd1) $(test_oid zero) D Z/ND -:100644 100644 $(test_oid znm1) $(test_oid znm2) M Z/NM +cat >.test-recursive-OB <<\EOF +:000000 100644 0000000000000000000000000000000000000000 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 A AA +:100644 000000 bcc68ef997017466d5c9094bcf7692295f588c9a 0000000000000000000000000000000000000000 D DD +:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF +:100644 100644 141c1f1642328e4bc46a7d801a71da392e66791e 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 M DM +:000000 100644 0000000000000000000000000000000000000000 1d41122ebdd7a640f29d3c9cc4f9d70094374762 A LL +:100644 000000 03f24c8c4700babccfd28b654e7e8eac402ad6cd 0000000000000000000000000000000000000000 D MD +:100644 100644 b258508afb7ceb449981bd9d63d2d3e971bf8d34 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM +:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA +:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND +:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM +:100644 100644 40c959f984c8b89a2b02520d17f00d717f024397 2ac547ae9614a00d1b28275de608131f7a0e259f M SS +:100644 100644 4ac13458899ab908ef3b1128fa378daefc88d356 c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT +:000000 100644 0000000000000000000000000000000000000000 6c0b99286d0bce551ac4a7b3dff8b706edff3715 A Z/AA +:100644 000000 879007efae624d2b1307214b24a956f0a8d686a8 0000000000000000000000000000000000000000 D Z/DD +:100644 100644 9b541b2275c06e3a7b13f28badf5294e2ae63df4 d77371d15817fcaa57eeec27f770c505ba974ec1 M Z/DM +:100644 000000 d41fda41b7ec4de46b43cb7ea42a45001ae393d5 0000000000000000000000000000000000000000 D Z/MD +:100644 100644 4ca22bae2527d3d9e1676498a0fba3b355bd1278 697aad7715a1e7306ca76290a3dd4208fbaeddfa M Z/MM +:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A Z/NA +:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D Z/ND +:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M Z/NM EOF -cat >.test-plain-AB <<EOF -:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M AA -:100644 000000 $(test_oid an_1) $(test_oid zero) D AN -:000000 100644 $(test_oid zero) $(test_oid df_2) A DF -:040000 000000 $(test_oid df_1) $(test_oid zero) D DF -:000000 100644 $(test_oid zero) $(test_oid dm_2) A DM -:000000 100644 $(test_oid zero) $(test_oid dn_1) A DN -:100644 000000 $(test_oid md_2) $(test_oid zero) D MD -:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M MM -:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M MN -:000000 100644 $(test_oid zero) $(test_oid na_1) A NA -:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND -:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM -:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M TT -:040000 040000 $(test_oid z__2) $(test_oid z__3) M Z +cat >.test-plain-AB <<\EOF +:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M AA +:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D AN +:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF +:040000 000000 6d50f65d3bdab91c63444294d38f08aeff328e42 0000000000000000000000000000000000000000 D DF +:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A DM +:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A DN +:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D MD +:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM +:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M MN +:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA +:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND +:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM +:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT +:040000 040000 5e5f22072bb39f6e12cf663a57cb634c76eefb49 1ba523955d5160681af65cb776411f574c1e8155 M Z EOF -cat >.test-recursive-AB <<EOF -:100644 100644 $(test_oid aa_1) $(test_oid aa_2) M AA -:100644 000000 $(test_oid an_1) $(test_oid zero) D AN -:000000 100644 $(test_oid zero) $(test_oid df_2) A DF -:100644 000000 $(test_oid dfd1) $(test_oid zero) D DF/DF -:000000 100644 $(test_oid zero) $(test_oid dm_2) A DM -:000000 100644 $(test_oid zero) $(test_oid dn_1) A DN -:100644 000000 $(test_oid md_2) $(test_oid zero) D MD -:100644 100644 $(test_oid mm_2) $(test_oid mm_3) M MM -:100644 100644 $(test_oid mn_2) $(test_oid mn_1) M MN -:000000 100644 $(test_oid zero) $(test_oid na_1) A NA -:100644 000000 $(test_oid nd_1) $(test_oid zero) D ND -:100644 100644 $(test_oid nm_1) $(test_oid nm_2) M NM -:100644 100644 $(test_oid tt_2) $(test_oid tt_3) M TT -:100644 100644 $(test_oid zaa1) $(test_oid zaa2) M Z/AA -:100644 000000 $(test_oid zan1) $(test_oid zero) D Z/AN -:000000 100644 $(test_oid zero) $(test_oid zdm2) A Z/DM -:000000 100644 $(test_oid zero) $(test_oid zdn1) A Z/DN -:100644 000000 $(test_oid zmd2) $(test_oid zero) D Z/MD -:100644 100644 $(test_oid zmm2) $(test_oid zmm3) M Z/MM -:100644 100644 $(test_oid zmn2) $(test_oid zmn1) M Z/MN -:000000 100644 $(test_oid zero) $(test_oid zna1) A Z/NA -:100644 000000 $(test_oid znd1) $(test_oid zero) D Z/ND -:100644 100644 $(test_oid znm1) $(test_oid znm2) M Z/NM +cat >.test-recursive-AB <<\EOF +:100644 100644 ccba72ad3888a3520b39efcf780b9ee64167535d 6aa2b5335b16431a0ef71e5c0a28be69183cf6a2 M AA +:100644 000000 7e426fb079479fd67f6d81f984e4ec649a44bc25 0000000000000000000000000000000000000000 D AN +:000000 100644 0000000000000000000000000000000000000000 71420ab81e254145d26d6fc0cddee64c1acd4787 A DF +:100644 000000 68a6d8b91da11045cf4aa3a5ab9f2a781c701249 0000000000000000000000000000000000000000 D DF/DF +:000000 100644 0000000000000000000000000000000000000000 3c4d8de5fbad08572bab8e10eef8dbb264cf0231 A DM +:000000 100644 0000000000000000000000000000000000000000 35abde1506ddf806572ff4d407bd06885d0f8ee9 A DN +:100644 000000 103d9f89b50b9aad03054b579be5e7aa665f2d57 0000000000000000000000000000000000000000 D MD +:100644 100644 b431b272d829ff3aa4d1a5085f4394ab4d3305b6 19989d4559aae417fedee240ccf2ba315ea4dc2b M MM +:100644 100644 a716d58de4a570e0038f5c307bd8db34daea021f bd084b0c27c7b6cc34f11d6d0509a29be3caf970 M MN +:000000 100644 0000000000000000000000000000000000000000 15885881ea69115351c09b38371f0348a3fb8c67 A NA +:100644 000000 a4e179e4291e5536a5e1c82e091052772d2c5a93 0000000000000000000000000000000000000000 D ND +:100644 100644 c8f25781e8f1792e3e40b74225e20553041b5226 cdb9a8c3da571502ac30225e9c17beccb8387983 M NM +:100644 100644 4c86f9a85fbc5e6804ee2e17a797538fbe785bca c4e4a12231b9fa79a0053cb6077fcb21bb5b135a M TT +:100644 100644 8acb8e9750e3f644bf323fcf3d338849db106c77 6c0b99286d0bce551ac4a7b3dff8b706edff3715 M Z/AA +:100644 000000 087494262084cefee7ed484d20c8dc0580791272 0000000000000000000000000000000000000000 D Z/AN +:000000 100644 0000000000000000000000000000000000000000 d77371d15817fcaa57eeec27f770c505ba974ec1 A Z/DM +:000000 100644 0000000000000000000000000000000000000000 beb5d38c55283d280685ea21a0e50cfcc0ca064a A Z/DN +:100644 000000 a79ac3be9377639e1c7d1edf1ae1b3a5f0ccd8a9 0000000000000000000000000000000000000000 D Z/MD +:100644 100644 61422ba9c2c873416061a88cd40a59a35b576474 697aad7715a1e7306ca76290a3dd4208fbaeddfa M Z/MM +:100644 100644 a5c544c21cfcb07eb80a4d89a5b7d1570002edfd b16d7b25b869f2beb124efa53467d8a1550ad694 M Z/MN +:000000 100644 0000000000000000000000000000000000000000 d12979c22fff69c59ca9409e7a8fe3ee25eaee80 A Z/NA +:100644 000000 a18393c636b98e9bd7296b8b437ea4992b72440c 0000000000000000000000000000000000000000 D Z/ND +:100644 100644 3fdbe17fd013303a2e981e1ca1c6cd6e72789087 7e09d6a3a14bd630913e8c75693cea32157b606d M Z/NM EOF cmp_diff_files_output () { diff --git a/third_party/git/t/t4009-diff-rename-4.sh b/third_party/git/t/t4009-diff-rename-4.sh index b63bdf031f..3641fd84d6 100755 --- a/third_party/git/t/t4009-diff-rename-4.sh +++ b/third_party/git/t/t4009-diff-rename-4.sh @@ -14,7 +14,6 @@ test_expect_success \ 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING && echo frotz >rezrov && git update-index --add COPYING rezrov && - orig=$(git hash-object COPYING) && tree=$(git write-tree) && echo $tree' @@ -23,8 +22,6 @@ test_expect_success \ 'sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 && sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 && rm -f COPYING && - c1=$(git hash-object COPYING.1) && - c2=$(git hash-object COPYING.2) && git update-index --add --remove COPYING COPYING.?' # tree has COPYING and rezrov. work tree has COPYING.1 and COPYING.2, @@ -34,11 +31,11 @@ test_expect_success \ git diff-index -z -C $tree >current -cat >expected <<EOF -:100644 100644 $orig $c1 C1234 +cat >expected <<\EOF +:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 -:100644 100644 $orig $c2 R1234 +:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 R1234 COPYING COPYING.2 EOF @@ -60,10 +57,10 @@ test_expect_success \ # about rezrov. git diff-index -z -C $tree >current -cat >expected <<EOF -:100644 100644 $orig $c2 M +cat >expected <<\EOF +:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 06c67961bbaed34a127f76d261f4c0bf73eda471 M COPYING -:100644 100644 $orig $c1 C1234 +:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 EOF @@ -85,8 +82,8 @@ test_expect_success \ git update-index --add --remove COPYING COPYING.1' git diff-index -z -C --find-copies-harder $tree >current -cat >expected <<EOF -:100644 100644 $orig $c1 C1234 +cat >expected <<\EOF +:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 0603b3238a076dc6c8022aedc6648fa523a17178 C1234 COPYING COPYING.1 EOF diff --git a/third_party/git/t/t4010-diff-pathspec.sh b/third_party/git/t/t4010-diff-pathspec.sh index e5ca359edf..281f8fad0c 100755 --- a/third_party/git/t/t4010-diff-pathspec.sh +++ b/third_party/git/t/t4010-diff-pathspec.sh @@ -17,15 +17,11 @@ test_expect_success \ 'echo frotz >file0 && mkdir path1 && echo rezrov >path1/file1 && - before0=$(git hash-object file0) && - before1=$(git hash-object path1/file1) && git update-index --add file0 path1/file1 && tree=$(git write-tree) && echo "$tree" && echo nitfol >file0 && echo yomin >path1/file1 && - after0=$(git hash-object file0) && - after1=$(git hash-object path1/file1) && git update-index file0 path1/file1' cat >expected <<\EOF @@ -35,32 +31,32 @@ test_expect_success \ 'git diff-index --cached $tree -- path >current && compare_diff_raw current expected' -cat >expected <<EOF -:100644 100644 $before1 $after1 M path1/file1 +cat >expected <<\EOF +:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 EOF test_expect_success \ 'limit to path1 should show path1/file1' \ 'git diff-index --cached $tree -- path1 >current && compare_diff_raw current expected' -cat >expected <<EOF -:100644 100644 $before1 $after1 M path1/file1 +cat >expected <<\EOF +:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 EOF test_expect_success \ 'limit to path1/ should show path1/file1' \ 'git diff-index --cached $tree -- path1/ >current && compare_diff_raw current expected' -cat >expected <<EOF -:100644 100644 $before1 $after1 M path1/file1 +cat >expected <<\EOF +:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 EOF test_expect_success \ '"*file1" should show path1/file1' \ 'git diff-index --cached $tree -- "*file1" >current && compare_diff_raw current expected' -cat >expected <<EOF -:100644 100644 $before0 $after0 M file0 +cat >expected <<\EOF +:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df dca6b92303befc93086aa025d90a5facd7eb2812 M file0 EOF test_expect_success \ 'limit to file0 should show file0' \ diff --git a/third_party/git/t/t4011-diff-symlink.sh b/third_party/git/t/t4011-diff-symlink.sh index 717034bb50..5ae19b987d 100755 --- a/third_party/git/t/t4011-diff-symlink.sh +++ b/third_party/git/t/t4011-diff-symlink.sh @@ -9,24 +9,11 @@ test_description='Test diff of symlinks. . ./test-lib.sh . "$TEST_DIRECTORY"/diff-lib.sh -# Print the short OID of a symlink with the given name. -symlink_oid () { - local oid=$(printf "%s" "$1" | git hash-object --stdin) && - git rev-parse --short "$oid" -} - -# Print the short OID of the given file. -short_oid () { - local oid=$(git hash-object "$1") && - git rev-parse --short "$oid" -} - test_expect_success 'diff new symlink and file' ' - symlink=$(symlink_oid xyzzy) && - cat >expected <<-EOF && + cat >expected <<-\EOF && diff --git a/frotz b/frotz new file mode 120000 - index 0000000..$symlink + index 0000000..7c465af --- /dev/null +++ b/frotz @@ -0,0 +1 @@ @@ -34,7 +21,7 @@ test_expect_success 'diff new symlink and file' ' \ No newline at end of file diff --git a/nitfol b/nitfol new file mode 100644 - index 0000000..$symlink + index 0000000..7c465af --- /dev/null +++ b/nitfol @@ -0,0 +1 @@ @@ -59,10 +46,10 @@ test_expect_success 'diff unchanged symlink and file' ' ' test_expect_success 'diff removed symlink and file' ' - cat >expected <<-EOF && + cat >expected <<-\EOF && diff --git a/frotz b/frotz deleted file mode 120000 - index $symlink..0000000 + index 7c465af..0000000 --- a/frotz +++ /dev/null @@ -1 +0,0 @@ @@ -70,7 +57,7 @@ test_expect_success 'diff removed symlink and file' ' \ No newline at end of file diff --git a/nitfol b/nitfol deleted file mode 100644 - index $symlink..0000000 + index 7c465af..0000000 --- a/nitfol +++ /dev/null @@ -1 +0,0 @@ @@ -103,10 +90,9 @@ test_expect_success 'diff identical, but newly created symlink and file' ' ' test_expect_success 'diff different symlink and file' ' - new=$(symlink_oid yxyyz) && - cat >expected <<-EOF && + cat >expected <<-\EOF && diff --git a/frotz b/frotz - index $symlink..$new 120000 + index 7c465af..df1db54 120000 --- a/frotz +++ b/frotz @@ -1 +1 @@ @@ -115,7 +101,7 @@ test_expect_success 'diff different symlink and file' ' +yxyyz \ No newline at end of file diff --git a/nitfol b/nitfol - index $symlink..$new 100644 + index 7c465af..df1db54 100644 --- a/nitfol +++ b/nitfol @@ -1 +1 @@ @@ -151,16 +137,14 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' ' ' test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' ' - file=$(short_oid file.bin) && - link=$(symlink_oid file.bin) && - cat >expect <<-EOF && + cat >expect <<-\EOF && diff --git a/file.bin b/file.bin new file mode 100644 - index 0000000..$file + index 0000000..d95f3ad Binary files /dev/null and b/file.bin differ diff --git a/link.bin b/link.bin new file mode 120000 - index 0000000..$link + index 0000000..dce41ec --- /dev/null +++ b/link.bin @@ -0,0 +1 @@ diff --git a/third_party/git/t/t4013-diff-various.sh b/third_party/git/t/t4013-diff-various.sh index dde3f11fec..a9054d2db1 100755 --- a/third_party/git/t/t4013-diff-various.sh +++ b/third_party/git/t/t4013-diff-various.sh @@ -7,6 +7,9 @@ test_description='Various diff formatting options' . ./test-lib.sh +LF=' +' + test_expect_success setup ' GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" && @@ -120,30 +123,6 @@ test_expect_success setup ' +*++ [initial] Initial EOF -process_diffs () { - _x04="[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" && - _x07="$_x05[0-9a-f][0-9a-f]" && - sed -e "s/$OID_REGEX/$ZERO_OID/g" \ - -e "s/From $_x40 /From $ZERO_OID /" \ - -e "s/from $_x40)/from $ZERO_OID)/" \ - -e "s/commit $_x40\$/commit $ZERO_OID/" \ - -e "s/commit $_x40 (/commit $ZERO_OID (/" \ - -e "s/$_x40 $_x40 $_x40/$ZERO_OID $ZERO_OID $ZERO_OID/" \ - -e "s/$_x40 $_x40 /$ZERO_OID $ZERO_OID /" \ - -e "s/^$_x40 $_x40$/$ZERO_OID $ZERO_OID/" \ - -e "s/^$_x40 /$ZERO_OID /" \ - -e "s/^$_x40$/$ZERO_OID/" \ - -e "s/$_x07\.\.$_x07/fffffff..fffffff/g" \ - -e "s/$_x07,$_x07\.\.$_x07/fffffff,fffffff..fffffff/g" \ - -e "s/$_x07 $_x07 $_x07/fffffff fffffff fffffff/g" \ - -e "s/$_x07 $_x07 /fffffff fffffff /g" \ - -e "s/Merge: $_x07 $_x07/Merge: fffffff fffffff/g" \ - -e "s/$_x07\.\.\./fffffff.../g" \ - -e "s/ $_x04\.\.\./ ffff.../g" \ - -e "s/ $_x04/ ffff/g" \ - "$1" -} - V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g') while read magic cmd do @@ -182,15 +161,13 @@ do } >"$actual" && if test -f "$expect" then - process_diffs "$actual" >actual && - process_diffs "$expect" >expect && case $cmd in *format-patch* | *-stat*) - test_i18ncmp expect actual;; + test_i18ncmp "$expect" "$actual";; *) - test_cmp expect actual;; + test_cmp "$expect" "$actual";; esac && - rm -f "$actual" actual expect + rm -f "$actual" else # this is to help developing new tests. cp "$actual" "$expect" @@ -409,22 +386,16 @@ test_expect_success 'log -S requires an argument' ' test_expect_success 'diff --cached on unborn branch' ' echo ref: refs/heads/unborn >.git/HEAD && git diff --cached >result && - process_diffs result >actual && - process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected && - test_cmp expected actual + test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result ' test_expect_success 'diff --cached -- file on unborn branch' ' git diff --cached -- file0 >result && - process_diffs result >actual && - process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected && - test_cmp expected actual + test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result ' test_expect_success 'diff --line-prefix with spaces' ' git diff --line-prefix="| | | " --cached -- file0 >result && - process_diffs result >actual && - process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected && - test_cmp expected actual + test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result ' test_expect_success 'diff-tree --stdin with log formatting' ' diff --git a/third_party/git/t/t4014-format-patch.sh b/third_party/git/t/t4014-format-patch.sh index b653dd7d44..ca7debf1d4 100755 --- a/third_party/git/t/t4014-format-patch.sh +++ b/third_party/git/t/t4014-format-patch.sh @@ -9,6 +9,7 @@ test_description='various format-patch tests' . "$TEST_DIRECTORY"/lib-terminal.sh test_expect_success setup ' + for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file && cat file >elif && git add file elif && @@ -33,8 +34,7 @@ test_expect_success setup ' git commit -m "Side changes #3 with \\n backslash-n in it." && git checkout master && - git diff-tree -p C2 >patch && - git apply --index <patch && + git diff-tree -p C2 | git apply --index && test_tick && git commit -m "Master accepts moral equivalent of #2" && @@ -59,28 +59,33 @@ test_expect_success setup ' git checkout master ' -test_expect_success 'format-patch --ignore-if-in-upstream' ' +test_expect_success "format-patch --ignore-if-in-upstream" ' + git format-patch --stdout master..side >patch0 && - grep "^From " patch0 >from0 && - test_line_count = 3 from0 + cnt=$(grep "^From " patch0 | wc -l) && + test $cnt = 3 + ' -test_expect_success 'format-patch --ignore-if-in-upstream' ' +test_expect_success "format-patch --ignore-if-in-upstream" ' + git format-patch --stdout \ --ignore-if-in-upstream master..side >patch1 && - grep "^From " patch1 >from1 && - test_line_count = 2 from1 + cnt=$(grep "^From " patch1 | wc -l) && + test $cnt = 2 + ' -test_expect_success 'format-patch --ignore-if-in-upstream handles tags' ' +test_expect_success "format-patch --ignore-if-in-upstream handles tags" ' git tag -a v1 -m tag side && git tag -a v2 -m tag master && git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 && - grep "^From " patch1 >from1 && - test_line_count = 2 from1 + cnt=$(grep "^From " patch1 | wc -l) && + test $cnt = 2 ' test_expect_success "format-patch doesn't consider merge commits" ' + git checkout -b slave master && echo "Another line" >>file && test_tick && @@ -91,138 +96,148 @@ test_expect_success "format-patch doesn't consider merge commits" ' git checkout -b merger master && test_tick && git merge --no-ff slave && - git format-patch -3 --stdout >patch && - grep "^From " patch >from && - test_line_count = 3 from + cnt=$(git format-patch -3 --stdout | grep "^From " | wc -l) && + test $cnt = 3 ' -test_expect_success 'format-patch result applies' ' +test_expect_success "format-patch result applies" ' + git checkout -b rebuild-0 master && git am -3 patch0 && - git rev-list master.. >list && - test_line_count = 2 list + cnt=$(git rev-list master.. | wc -l) && + test $cnt = 2 ' -test_expect_success 'format-patch --ignore-if-in-upstream result applies' ' +test_expect_success "format-patch --ignore-if-in-upstream result applies" ' + git checkout -b rebuild-1 master && git am -3 patch1 && - git rev-list master.. >list && - test_line_count = 2 list + cnt=$(git rev-list master.. | wc -l) && + test $cnt = 2 ' test_expect_success 'commit did not screw up the log message' ' - git cat-file commit side >actual && - grep "^Side .* with .* backslash-n" actual + + git cat-file commit side | grep "^Side .* with .* backslash-n" + ' test_expect_success 'format-patch did not screw up the log message' ' + grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 && grep "^Subject: .*Side changes #3 with .* backslash-n" patch1 + ' test_expect_success 'replay did not screw up the log message' ' - git cat-file commit rebuild-1 >actual && - grep "^Side .* with .* backslash-n" actual + + git cat-file commit rebuild-1 | grep "^Side .* with .* backslash-n" + ' test_expect_success 'extra headers' ' + git config format.headers "To: R E Cipient <rcipient@example.com> " && git config --add format.headers "Cc: S E Cipient <scipient@example.com> " && - git format-patch --stdout master..side >patch2 && - sed -e "/^\$/q" patch2 >hdrs2 && + git format-patch --stdout master..side > patch2 && + sed -e "/^\$/q" patch2 > hdrs2 && grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 && grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2 + ' test_expect_success 'extra headers without newlines' ' + git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" && git config --add format.headers "Cc: S E Cipient <scipient@example.com>" && git format-patch --stdout master..side >patch3 && - sed -e "/^\$/q" patch3 >hdrs3 && + sed -e "/^\$/q" patch3 > hdrs3 && grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 && grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3 + ' test_expect_success 'extra headers with multiple To:s' ' + git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" && git config --add format.headers "To: S E Cipient <scipient@example.com>" && - git format-patch --stdout master..side >patch4 && - sed -e "/^\$/q" patch4 >hdrs4 && + git format-patch --stdout master..side > patch4 && + sed -e "/^\$/q" patch4 > hdrs4 && grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 && grep "^ *S E Cipient <scipient@example.com>\$" hdrs4 ' test_expect_success 'additional command line cc (ascii)' ' + git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" && - git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side >patch5 && - sed -e "/^\$/q" patch5 >hdrs5 && - grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 && - grep "^ *S E Cipient <scipient@example.com>\$" hdrs5 + git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 && + grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 && + grep "^ *S E Cipient <scipient@example.com>\$" patch5 ' test_expect_failure 'additional command line cc (rfc822)' ' + git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" && - git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side >patch5 && - sed -e "/^\$/q" patch5 >hdrs5 && - grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 && - grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5 + git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch5 && + grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch5 && + grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" patch5 ' test_expect_success 'command line headers' ' + git config --unset-all format.headers && - git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side >patch6 && - sed -e "/^\$/q" patch6 >hdrs6 && - grep "^Cc: R E Cipient <rcipient@example.com>\$" hdrs6 + git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch6 && + grep "^Cc: R E Cipient <rcipient@example.com>\$" patch6 ' test_expect_success 'configuration headers and command line headers' ' + git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" && - git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side >patch7 && - sed -e "/^\$/q" patch7 >hdrs7 && - grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 && - grep "^ *S E Cipient <scipient@example.com>\$" hdrs7 + git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch7 && + grep "^Cc: R E Cipient <rcipient@example.com>,\$" patch7 && + grep "^ *S E Cipient <scipient@example.com>\$" patch7 ' test_expect_success 'command line To: header (ascii)' ' + git config --unset-all format.headers && - git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side >patch8 && - sed -e "/^\$/q" patch8 >hdrs8 && - grep "^To: R E Cipient <rcipient@example.com>\$" hdrs8 + git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 && + grep "^To: R E Cipient <rcipient@example.com>\$" patch8 ' test_expect_failure 'command line To: header (rfc822)' ' - git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side >patch8 && - sed -e "/^\$/q" patch8 >hdrs8 && - grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs8 + + git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 && + grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch8 ' test_expect_failure 'command line To: header (rfc2047)' ' - git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side >patch8 && - sed -e "/^\$/q" patch8 >hdrs8 && - grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs8 + + git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side | sed -e "/^\$/q" >patch8 && + grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch8 ' test_expect_success 'configuration To: header (ascii)' ' + git config format.to "R E Cipient <rcipient@example.com>" && - git format-patch --stdout master..side >patch9 && - sed -e "/^\$/q" patch9 >hdrs9 && - grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9 + git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 && + grep "^To: R E Cipient <rcipient@example.com>\$" patch9 ' test_expect_failure 'configuration To: header (rfc822)' ' + git config format.to "R. E. Cipient <rcipient@example.com>" && - git format-patch --stdout master..side >patch9 && - sed -e "/^\$/q" patch9 >hdrs9 && - grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9 + git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 && + grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" patch9 ' test_expect_failure 'configuration To: header (rfc2047)' ' + git config format.to "R Ä Cipient <rcipient@example.com>" && - git format-patch --stdout master..side >patch9 && - sed -e "/^\$/q" patch9 >hdrs9 && - grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9 + git format-patch --stdout master..side | sed -e "/^\$/q" >patch9 && + grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" patch9 ' # check_patch <patch>: Verify that <patch> looks like a half-sane @@ -234,79 +249,89 @@ check_patch () { } test_expect_success 'format.from=false' ' - git -c format.from=false format-patch --stdout master..side >patch && - sed -e "/^\$/q" patch >hdrs && + + git -c format.from=false format-patch --stdout master..side | + sed -e "/^\$/q" >patch && check_patch patch && - ! grep "^From: C O Mitter <committer@example.com>\$" hdrs + ! grep "^From: C O Mitter <committer@example.com>\$" patch ' test_expect_success 'format.from=true' ' - git -c format.from=true format-patch --stdout master..side >patch && - sed -e "/^\$/q" patch >hdrs && - check_patch hdrs && - grep "^From: C O Mitter <committer@example.com>\$" hdrs + + git -c format.from=true format-patch --stdout master..side | + sed -e "/^\$/q" >patch && + check_patch patch && + grep "^From: C O Mitter <committer@example.com>\$" patch ' test_expect_success 'format.from with address' ' - git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side >patch && - sed -e "/^\$/q" patch >hdrs && - check_patch hdrs && - grep "^From: F R Om <from@example.com>\$" hdrs + + git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side | + sed -e "/^\$/q" >patch && + check_patch patch && + grep "^From: F R Om <from@example.com>\$" patch ' test_expect_success '--no-from overrides format.from' ' - git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side >patch && - sed -e "/^\$/q" patch >hdrs && - check_patch hdrs && - ! grep "^From: F R Om <from@example.com>\$" hdrs + + git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side | + sed -e "/^\$/q" >patch && + check_patch patch && + ! grep "^From: F R Om <from@example.com>\$" patch ' test_expect_success '--from overrides format.from' ' - git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side >patch && - sed -e "/^\$/q" patch >hdrs && - check_patch hdrs && - ! grep "^From: F R Om <from@example.com>\$" hdrs + + git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side | + sed -e "/^\$/q" >patch && + check_patch patch && + ! grep "^From: F R Om <from@example.com>\$" patch ' test_expect_success '--no-to overrides config.to' ' + git config --replace-all format.to \ "R E Cipient <rcipient@example.com>" && - git format-patch --no-to --stdout master..side >patch10 && - sed -e "/^\$/q" patch10 >hdrs10 && - check_patch hdrs10 && - ! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10 + git format-patch --no-to --stdout master..side | + sed -e "/^\$/q" >patch10 && + check_patch patch10 && + ! grep "^To: R E Cipient <rcipient@example.com>\$" patch10 ' test_expect_success '--no-to and --to replaces config.to' ' + git config --replace-all format.to \ "Someone <someone@out.there>" && git format-patch --no-to --to="Someone Else <else@out.there>" \ - --stdout master..side >patch11 && - sed -e "/^\$/q" patch11 >hdrs11 && - check_patch hdrs11 && - ! grep "^To: Someone <someone@out.there>\$" hdrs11 && - grep "^To: Someone Else <else@out.there>\$" hdrs11 + --stdout master..side | + sed -e "/^\$/q" >patch11 && + check_patch patch11 && + ! grep "^To: Someone <someone@out.there>\$" patch11 && + grep "^To: Someone Else <else@out.there>\$" patch11 ' test_expect_success '--no-cc overrides config.cc' ' + git config --replace-all format.cc \ "C E Cipient <rcipient@example.com>" && - git format-patch --no-cc --stdout master..side >patch12 && - sed -e "/^\$/q" patch12 >hdrs12 && - check_patch hdrs12 && - ! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12 + git format-patch --no-cc --stdout master..side | + sed -e "/^\$/q" >patch12 && + check_patch patch12 && + ! grep "^Cc: C E Cipient <rcipient@example.com>\$" patch12 ' test_expect_success '--no-add-header overrides config.headers' ' + git config --replace-all format.headers \ "Header1: B E Cipient <rcipient@example.com>" && - git format-patch --no-add-header --stdout master..side >patch13 && - sed -e "/^\$/q" patch13 >hdrs13 && - check_patch hdrs13 && - ! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13 + git format-patch --no-add-header --stdout master..side | + sed -e "/^\$/q" >patch13 && + check_patch patch13 && + ! grep "^Header1: B E Cipient <rcipient@example.com>\$" patch13 ' test_expect_success 'multiple files' ' + rm -rf patches/ && git checkout side && git format-patch -o patches/ master && @@ -332,7 +357,7 @@ test_expect_success 'reroll count (-v)' ' check_threading () { expect="$1" && shift && - git format-patch --stdout "$@" >patch && + (git format-patch --stdout "$@"; echo $? > status.out) | # Prints everything between the Message-ID and In-Reply-To, # and replaces all Message-ID-lookalikes by a sequence number perl -ne ' @@ -347,11 +372,12 @@ check_threading () { print; } print "---\n" if /^From /i; - ' <patch >actual && + ' > actual && + test 0 = "$(cat status.out)" && test_cmp "$expect" actual } -cat >>expect.no-threading <<EOF +cat >> expect.no-threading <<EOF --- --- --- @@ -362,7 +388,7 @@ test_expect_success 'no threading' ' check_threading expect.no-threading master ' -cat >expect.thread <<EOF +cat > expect.thread <<EOF --- Message-Id: <0> --- @@ -379,7 +405,7 @@ test_expect_success 'thread' ' check_threading expect.thread --thread master ' -cat >expect.in-reply-to <<EOF +cat > expect.in-reply-to <<EOF --- Message-Id: <0> In-Reply-To: <1> @@ -399,7 +425,7 @@ test_expect_success 'thread in-reply-to' ' --thread master ' -cat >expect.cover-letter <<EOF +cat > expect.cover-letter <<EOF --- Message-Id: <0> --- @@ -420,7 +446,7 @@ test_expect_success 'thread cover-letter' ' check_threading expect.cover-letter --cover-letter --thread master ' -cat >expect.cl-irt <<EOF +cat > expect.cl-irt <<EOF --- Message-Id: <0> In-Reply-To: <1> @@ -452,7 +478,7 @@ test_expect_success 'thread explicit shallow' ' --in-reply-to="<test.message>" --thread=shallow master ' -cat >expect.deep <<EOF +cat > expect.deep <<EOF --- Message-Id: <0> --- @@ -470,7 +496,7 @@ test_expect_success 'thread deep' ' check_threading expect.deep --thread=deep master ' -cat >expect.deep-irt <<EOF +cat > expect.deep-irt <<EOF --- Message-Id: <0> In-Reply-To: <1> @@ -493,7 +519,7 @@ test_expect_success 'thread deep in-reply-to' ' --in-reply-to="<test.message>" master ' -cat >expect.deep-cl <<EOF +cat > expect.deep-cl <<EOF --- Message-Id: <0> --- @@ -517,7 +543,7 @@ test_expect_success 'thread deep cover-letter' ' check_threading expect.deep-cl --cover-letter --thread=deep master ' -cat >expect.deep-cl-irt <<EOF +cat > expect.deep-cl-irt <<EOF --- Message-Id: <0> In-Reply-To: <1> @@ -568,6 +594,7 @@ test_expect_success 'thread config + --no-thread' ' ' test_expect_success 'excessive subject' ' + rm -rf patches/ && git checkout side && before=$(git hash-object file) && @@ -595,9 +622,10 @@ test_expect_success 'cover-letter inherits diff options' ' ! grep "file => foo .* 0 *\$" 0000-cover-letter.patch && git format-patch --cover-letter -1 -M && grep "file => foo .* 0 *\$" 0000-cover-letter.patch + ' -cat >expect <<EOF +cat > expect << EOF This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole @@ -608,12 +636,14 @@ cat >expect <<EOF EOF test_expect_success 'shortlog of cover-letter wraps overly-long onelines' ' + git format-patch --cover-letter -2 && - sed -e "1,/A U Thor/d" -e "/^\$/q" 0000-cover-letter.patch >output && + sed -e "1,/A U Thor/d" -e "/^\$/q" < 0000-cover-letter.patch > output && test_cmp expect output + ' -cat >expect <<EOF +cat > expect << EOF index $before..$after 100644 --- a/file +++ b/file @@ -626,14 +656,16 @@ index $before..$after 100644 EOF test_expect_success 'format-patch respects -U' ' + git format-patch -U4 -2 && sed -e "1,/^diff/d" -e "/^+5/q" \ <0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \ >output && test_cmp expect output + ' -cat >expect <<EOF +cat > expect << EOF diff --git a/file b/file index $before..$after 100644 @@ -647,9 +679,11 @@ index $before..$after 100644 EOF test_expect_success 'format-patch -p suppresses stat' ' + git format-patch -p -2 && - sed -e "1,/^\$/d" -e "/^+5/q" 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output && + sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output && test_cmp expect output + ' test_expect_success 'format-patch from a subdirectory (1)' ' @@ -702,7 +736,7 @@ test_expect_success 'format-patch from a subdirectory (3)' ' ' test_expect_success 'format-patch --in-reply-to' ' - git format-patch -1 --stdout --in-reply-to "baz@foo.bar" >patch8 && + git format-patch -1 --stdout --in-reply-to "baz@foo.bar" > patch8 && grep "^In-Reply-To: <baz@foo.bar>" patch8 && grep "^References: <baz@foo.bar>" patch8 ' @@ -793,56 +827,21 @@ test_expect_success 'format-patch with multiple notes refs' ' ! grep "this is note 2" out ' -test_expect_success 'format-patch with multiple notes refs in config' ' - test_when_finished "test_unconfig format.notes" && - - git notes --ref note1 add -m "this is note 1" HEAD && - test_when_finished git notes --ref note1 remove HEAD && - git notes --ref note2 add -m "this is note 2" HEAD && - test_when_finished git notes --ref note2 remove HEAD && - - git config format.notes note1 && - git format-patch -1 --stdout >out && - grep "this is note 1" out && - ! grep "this is note 2" out && - git config format.notes note2 && - git format-patch -1 --stdout >out && - ! grep "this is note 1" out && - grep "this is note 2" out && - git config --add format.notes note1 && - git format-patch -1 --stdout >out && - grep "this is note 1" out && - grep "this is note 2" out && - - git config --replace-all format.notes note1 && - git config --add format.notes false && - git format-patch -1 --stdout >out && - ! grep "this is note 1" out && - ! grep "this is note 2" out && - git config --add format.notes note2 && - git format-patch -1 --stdout >out && - ! grep "this is note 1" out && - grep "this is note 2" out -' - -echo "fatal: --name-only does not make sense" >expect.name-only -echo "fatal: --name-status does not make sense" >expect.name-status -echo "fatal: --check does not make sense" >expect.check +echo "fatal: --name-only does not make sense" > expect.name-only +echo "fatal: --name-status does not make sense" > expect.name-status +echo "fatal: --check does not make sense" > expect.check test_expect_success 'options no longer allowed for format-patch' ' - test_must_fail git format-patch --name-only 2>output && + test_must_fail git format-patch --name-only 2> output && test_i18ncmp expect.name-only output && - test_must_fail git format-patch --name-status 2>output && + test_must_fail git format-patch --name-status 2> output && test_i18ncmp expect.name-status output && - test_must_fail git format-patch --check 2>output && - test_i18ncmp expect.check output -' + test_must_fail git format-patch --check 2> output && + test_i18ncmp expect.check output' test_expect_success 'format-patch --numstat should produce a patch' ' - git format-patch --numstat --stdout master..side >output && - grep "^diff --git a/" output >diff && - test_line_count = 5 diff -' + git format-patch --numstat --stdout master..side > output && + test 5 = $(grep "^diff --git a/" output | wc -l)' test_expect_success 'format-patch -- <path>' ' git format-patch master..side -- file 2>error && @@ -853,25 +852,20 @@ test_expect_success 'format-patch --ignore-if-in-upstream HEAD' ' git format-patch --ignore-if-in-upstream HEAD ' -test_expect_success 'get git version' ' - git_version=$(git --version) && - git_version=${git_version##* } -' +git_version="$(git --version | sed "s/.* //")" signature() { printf "%s\n%s\n\n" "-- " "${1:-$git_version}" } test_expect_success 'format-patch default signature' ' - git format-patch --stdout -1 >patch && - tail -n 3 patch >output && + git format-patch --stdout -1 | tail -n 3 >output && signature >expect && test_cmp expect output ' test_expect_success 'format-patch --signature' ' - git format-patch --stdout --signature="my sig" -1 >patch && - tail -n 3 patch >output && + git format-patch --stdout --signature="my sig" -1 | tail -n 3 >output && signature "my sig" >expect && test_cmp expect output ' @@ -903,8 +897,8 @@ test_expect_success 'format-patch --signature --cover-letter' ' git config --unset-all format.signature && git format-patch --stdout --signature="my sig" --cover-letter \ -1 >output && - grep "my sig" output >sig && - test_line_count = 2 sig + grep "my sig" output && + test 2 = $(grep "my sig" output | wc -l) ' test_expect_success 'format.signature="" suppresses signatures' ' @@ -941,7 +935,7 @@ test_expect_success 'prepare mail-signature input' ' test_expect_success '--signature-file=file works' ' git format-patch --stdout --signature-file=mail-signature -1 >output && check_patch output && - sed -e "1,/^-- \$/d" output >actual && + sed -e "1,/^-- \$/d" <output >actual && { cat mail-signature && echo } >expect && @@ -952,7 +946,7 @@ test_expect_success 'format.signaturefile works' ' test_config format.signaturefile mail-signature && git format-patch --stdout -1 >output && check_patch output && - sed -e "1,/^-- \$/d" output >actual && + sed -e "1,/^-- \$/d" <output >actual && { cat mail-signature && echo } >expect && @@ -974,7 +968,7 @@ test_expect_success '--signature-file overrides format.signaturefile' ' git format-patch --stdout \ --signature-file=other-mail-signature -1 >output && check_patch output && - sed -e "1,/^-- \$/d" output >actual && + sed -e "1,/^-- \$/d" <output >actual && { cat other-mail-signature && echo } >expect && @@ -1043,7 +1037,7 @@ test_expect_success 'format-patch wraps extremely long subject (ascii)' ' git add file && git commit -m "$M512" && git format-patch --stdout -1 >patch && - sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject && + sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject && test_cmp expect subject ' @@ -1082,7 +1076,7 @@ test_expect_success 'format-patch wraps extremely long subject (rfc2047)' ' git add file && git commit -m "$M512" && git format-patch --stdout -1 >patch && - sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject && + sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject && test_cmp expect subject ' @@ -1091,7 +1085,7 @@ check_author() { git add file && GIT_AUTHOR_NAME=$1 git commit -m author-check && git format-patch --stdout -1 >patch && - sed -n "/^From: /p; /^ /p; /^$/q" patch >actual && + sed -n "/^From: /p; /^ /p; /^$/q" <patch >actual && test_cmp expect actual } @@ -1211,7 +1205,7 @@ test_expect_success '--from=ident replaces author' ' From: A U Thor <author@example.com> EOF - sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head && + sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head && test_cmp expect patch.head ' @@ -1223,7 +1217,7 @@ test_expect_success '--from uses committer ident' ' From: A U Thor <author@example.com> EOF - sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head && + sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head && test_cmp expect patch.head ' @@ -1233,7 +1227,7 @@ test_expect_success '--from omits redundant in-body header' ' From: A U Thor <author@example.com> EOF - sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head && + sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head && test_cmp expect patch.head ' @@ -1248,7 +1242,7 @@ test_expect_success 'in-body headers trigger content encoding' ' From: éxötìc <author@example.com> EOF - sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" patch >patch.head && + sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" <patch >patch.head && test_cmp expect patch.head ' @@ -1262,283 +1256,283 @@ append_signoff() test_expect_success 'signoff: commit with no body' ' append_signoff </dev/null >actual && - cat <<-\EOF | sed "s/EOL$//" >expect && - 4:Subject: [PATCH] EOL - 8: - 9:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual + cat <<\EOF | sed "s/EOL$//" >expected && +4:Subject: [PATCH] EOL +8: +9:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: commit with only subject' ' echo subject | append_signoff >actual && - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 9:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +9:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: commit with only subject that does not end with NL' ' printf subject | append_signoff >actual && - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 9:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +9:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: no existing signoffs' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 11:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +body +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +11:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: no existing signoffs and no trailing NL' ' printf "subject\n\nbody" | append_signoff >actual && - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 11:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +11:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: some random signoff' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body +body - Signed-off-by: my@house - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 11:Signed-off-by: my@house - 12:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +Signed-off-by: my@house +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +11:Signed-off-by: my@house +12:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: misc conforming footer elements' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body +body - Signed-off-by: my@house - (cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709) - Tested-by: Some One <someone@example.com> - Bug: 1234 - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 11:Signed-off-by: my@house - 15:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +Signed-off-by: my@house +(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709) +Tested-by: Some One <someone@example.com> +Bug: 1234 +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +11:Signed-off-by: my@house +15:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: some random signoff-alike' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body - Fooled-by-me: my@house - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 11: - 12:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +body +Fooled-by-me: my@house +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +11: +12:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: not really a signoff' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - I want to mention about Signed-off-by: here. - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 9:I want to mention about Signed-off-by: here. - 10: - 11:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +I want to mention about Signed-off-by: here. +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +9:I want to mention about Signed-off-by: here. +10: +11:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: not really a signoff (2)' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - My unfortunate - Signed-off-by: example happens to be wrapped here. - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10:Signed-off-by: example happens to be wrapped here. - 11:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +My unfortunate +Signed-off-by: example happens to be wrapped here. +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10:Signed-off-by: example happens to be wrapped here. +11:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: valid S-o-b paragraph in the middle' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - Signed-off-by: my@house - Signed-off-by: your@house +Signed-off-by: my@house +Signed-off-by: your@house - A lot of houses. - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 9:Signed-off-by: my@house - 10:Signed-off-by: your@house - 11: - 13: - 14:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +A lot of houses. +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +9:Signed-off-by: my@house +10:Signed-off-by: your@house +11: +13: +14:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: the same signoff at the end' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body +body - Signed-off-by: C O Mitter <committer@example.com> - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 11:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +Signed-off-by: C O Mitter <committer@example.com> +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +11:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: the same signoff at the end, no trailing NL' ' printf "subject\n\nSigned-off-by: C O Mitter <committer@example.com>" | append_signoff >actual && - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 9:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +9:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: the same signoff NOT at the end' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body +body - Signed-off-by: C O Mitter <committer@example.com> - Signed-off-by: my@house - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 11:Signed-off-by: C O Mitter <committer@example.com> - 12:Signed-off-by: my@house - EOF - test_cmp expect actual +Signed-off-by: C O Mitter <committer@example.com> +Signed-off-by: my@house +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +11:Signed-off-by: C O Mitter <committer@example.com> +12:Signed-off-by: my@house +EOF + test_cmp expected actual ' test_expect_success 'signoff: tolerate garbage in conforming footer' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body +body - Tested-by: my@house - Some Trash - Signed-off-by: C O Mitter <committer@example.com> - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 13:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +Tested-by: my@house +Some Trash +Signed-off-by: C O Mitter <committer@example.com> +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +13:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: respect trailer config' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - Myfooter: x - Some Trash - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 11: - 12:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual && +Myfooter: x +Some Trash +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +11: +12:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual && test_config trailer.Myfooter.ifexists add && - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - Myfooter: x - Some Trash - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 11:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +Myfooter: x +Some Trash +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +11:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'signoff: footer begins with non-signoff without @ sign' ' - append_signoff <<-\EOF >actual && - subject + append_signoff <<\EOF >actual && +subject - body +body - Reviewed-id: Noone - Tested-by: my@house - Change-id: Ideadbeef - Signed-off-by: C O Mitter <committer@example.com> - Bug: 1234 - EOF - cat >expect <<-\EOF && - 4:Subject: [PATCH] subject - 8: - 10: - 14:Signed-off-by: C O Mitter <committer@example.com> - EOF - test_cmp expect actual +Reviewed-id: Noone +Tested-by: my@house +Change-id: Ideadbeef +Signed-off-by: C O Mitter <committer@example.com> +Bug: 1234 +EOF + cat >expected <<\EOF && +4:Subject: [PATCH] subject +8: +10: +14:Signed-off-by: C O Mitter <committer@example.com> +EOF + test_cmp expected actual ' test_expect_success 'format patch ignores color.ui' ' @@ -1549,218 +1543,46 @@ test_expect_success 'format patch ignores color.ui' ' test_cmp expect actual ' -test_expect_success 'cover letter with invalid --cover-from-description and config' ' - test_config branch.rebuild-1.description "config subject - -body" && - test_must_fail git format-patch --cover-letter --cover-from-description garbage master && - test_config format.coverFromDescription garbage && - test_must_fail git format-patch --cover-letter master -' - -test_expect_success 'cover letter with format.coverFromDescription = default' ' - test_config branch.rebuild-1.description "config subject - -body" && - test_config format.coverFromDescription default && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with --cover-from-description default' ' - test_config branch.rebuild-1.description "config subject - -body" && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter --cover-from-description default master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with format.coverFromDescription = none' ' - test_config branch.rebuild-1.description "config subject - -body" && - test_config format.coverFromDescription none && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - grep "^\*\*\* BLURB HERE \*\*\*$" actual && - ! grep "^config subject$" actual && - ! grep "^body$" actual -' - -test_expect_success 'cover letter with --cover-from-description none' ' - test_config branch.rebuild-1.description "config subject - -body" && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter --cover-from-description none master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - grep "^\*\*\* BLURB HERE \*\*\*$" actual && - ! grep "^config subject$" actual && - ! grep "^body$" actual -' - -test_expect_success 'cover letter with format.coverFromDescription = message' ' - test_config branch.rebuild-1.description "config subject - -body" && - test_config format.coverFromDescription message && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with --cover-from-description message' ' - test_config branch.rebuild-1.description "config subject - -body" && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter --cover-from-description message master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with format.coverFromDescription = subject' ' - test_config branch.rebuild-1.description "config subject - -body" && - test_config format.coverFromDescription subject && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter master >actual && - grep "^Subject: \[PATCH 0/2\] config subject$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - ! grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with --cover-from-description subject' ' - test_config branch.rebuild-1.description "config subject - -body" && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter --cover-from-description subject master >actual && - grep "^Subject: \[PATCH 0/2\] config subject$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - ! grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with format.coverFromDescription = auto (short subject line)' ' - test_config branch.rebuild-1.description "config subject - -body" && - test_config format.coverFromDescription auto && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter master >actual && - grep "^Subject: \[PATCH 0/2\] config subject$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - ! grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with --cover-from-description auto (short subject line)' ' - test_config branch.rebuild-1.description "config subject - -body" && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter --cover-from-description auto master >actual && - grep "^Subject: \[PATCH 0/2\] config subject$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - ! grep "^config subject$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with format.coverFromDescription = auto (long subject line)' ' - test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects - -body" && - test_config format.coverFromDescription auto && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with --cover-from-description auto (long subject line)' ' - test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects - -body" && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter --cover-from-description auto master >actual && - grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual && - grep "^body$" actual -' - -test_expect_success 'cover letter with command-line --cover-from-description overrides config' ' - test_config branch.rebuild-1.description "config subject - -body" && - test_config format.coverFromDescription none && - git checkout rebuild-1 && - git format-patch --stdout --cover-letter --cover-from-description subject master >actual && - grep "^Subject: \[PATCH 0/2\] config subject$" actual && - ! grep "^\*\*\* BLURB HERE \*\*\*$" actual && - ! grep "^config subject$" actual && - grep "^body$" actual -' - test_expect_success 'cover letter using branch description (1)' ' git checkout rebuild-1 && test_config branch.rebuild-1.description hello && git format-patch --stdout --cover-letter master >actual && - grep hello actual + grep hello actual >/dev/null ' test_expect_success 'cover letter using branch description (2)' ' git checkout rebuild-1 && test_config branch.rebuild-1.description hello && git format-patch --stdout --cover-letter rebuild-1~2..rebuild-1 >actual && - grep hello actual + grep hello actual >/dev/null ' test_expect_success 'cover letter using branch description (3)' ' git checkout rebuild-1 && test_config branch.rebuild-1.description hello && git format-patch --stdout --cover-letter ^master rebuild-1 >actual && - grep hello actual + grep hello actual >/dev/null ' test_expect_success 'cover letter using branch description (4)' ' git checkout rebuild-1 && test_config branch.rebuild-1.description hello && git format-patch --stdout --cover-letter master.. >actual && - grep hello actual + grep hello actual >/dev/null ' test_expect_success 'cover letter using branch description (5)' ' git checkout rebuild-1 && test_config branch.rebuild-1.description hello && git format-patch --stdout --cover-letter -2 HEAD >actual && - grep hello actual + grep hello actual >/dev/null ' test_expect_success 'cover letter using branch description (6)' ' git checkout rebuild-1 && test_config branch.rebuild-1.description hello && git format-patch --stdout --cover-letter -2 >actual && - grep hello actual + grep hello actual >/dev/null ' test_expect_success 'cover letter with nothing' ' @@ -1810,39 +1632,11 @@ test_expect_success 'From line has expected format' ' test_cmp from filtered ' -test_expect_success 'format-patch -o with no leading directories' ' - rm -fr patches && - git format-patch -o patches master..side && - count=$(git rev-list --count master..side) && - ls patches >list && - test_line_count = $count list -' - -test_expect_success 'format-patch -o with leading existing directories' ' - rm -rf existing-dir && - mkdir existing-dir && - git format-patch -o existing-dir/patches master..side && - count=$(git rev-list --count master..side) && - ls existing-dir/patches >list && - test_line_count = $count list -' - -test_expect_success 'format-patch -o with leading non-existing directories' ' - rm -rf non-existing-dir && - git format-patch -o non-existing-dir/patches master..side && - count=$(git rev-list --count master..side) && - test_path_is_dir non-existing-dir && - ls non-existing-dir/patches >list && - test_line_count = $count list -' - test_expect_success 'format-patch format.outputDirectory option' ' test_config format.outputDirectory patches && rm -fr patches && git format-patch master..side && - count=$(git rev-list --count master..side) && - ls patches >list && - test_line_count = $count list + test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l) ' test_expect_success 'format-patch -o overrides format.outputDirectory' ' @@ -1855,41 +1649,20 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' ' test_expect_success 'format-patch --base' ' git checkout patchid && - - git format-patch --stdout --base=HEAD~3 -1 >patch && - tail -n 7 patch >actual1 && - - git format-patch --stdout --base=HEAD~3 HEAD~.. >patch && - tail -n 7 patch >actual2 && - - echo >expect && - git rev-parse HEAD~3 >commit-id-base && - echo "base-commit: $(cat commit-id-base)" >>expect && - - git show --patch HEAD~2 >patch && - git patch-id --stable <patch >patch.id.raw && - awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect && - - git show --patch HEAD~1 >patch && - git patch-id --stable <patch >patch.id.raw && - awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect && - - signature >>expect && - test_cmp expect actual1 && - test_cmp expect actual2 && - + git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual1 && + git format-patch --stdout --base=HEAD~3 HEAD~.. | tail -n 7 >actual2 && + echo >expected && + echo "base-commit: $(git rev-parse HEAD~3)" >>expected && + echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk "{print \$1}")" >>expected && + echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk "{print \$1}")" >>expected && + signature >> expected && + test_cmp expected actual1 && + test_cmp expected actual2 && echo >fail && - echo "base-commit: $(cat commit-id-base)" >>fail && - - git show --patch HEAD~2 >patch && - git patch-id --unstable <patch >patch.id.raw && - awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail && - - git show --patch HEAD~1 >patch && - git patch-id --unstable <patch >patch.id.raw && - awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail && - - signature >>fail && + echo "base-commit: $(git rev-parse HEAD~3)" >>fail && + echo "prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --unstable | awk "{print \$1}")" >>fail && + echo "prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --unstable | awk "{print \$1}")" >>fail && + signature >> fail && ! test_cmp fail actual1 && ! test_cmp fail actual2 ' @@ -1899,9 +1672,8 @@ test_expect_success 'format-patch --base errors out when base commit is in revis test_must_fail git format-patch --base=HEAD~1 -2 && git format-patch --stdout --base=HEAD~2 -2 >patch && grep "^base-commit:" patch >actual && - git rev-parse HEAD~2 >commit-id-base && - echo "base-commit: $(cat commit-id-base)" >expect && - test_cmp expect actual + echo "base-commit: $(git rev-parse HEAD~2)" >expected && + test_cmp expected actual ' test_expect_success 'format-patch --base errors out when base commit is not ancestor of revision list' ' @@ -1927,8 +1699,8 @@ test_expect_success 'format-patch --base errors out when base commit is not ance test_must_fail git format-patch --base=$(cat commit-id-Z) -3 && git format-patch --stdout --base=$(cat commit-id-base) -3 >patch && grep "^base-commit:" patch >actual && - echo "base-commit: $(cat commit-id-base)" >expect && - test_cmp expect actual + echo "base-commit: $(cat commit-id-base)" >expected && + test_cmp expected actual ' test_expect_success 'format-patch --base=auto' ' @@ -1939,9 +1711,8 @@ test_expect_success 'format-patch --base=auto' ' test_commit N2 && git format-patch --stdout --base=auto -2 >patch && grep "^base-commit:" patch >actual && - git rev-parse upstream >commit-id-base && - echo "base-commit: $(cat commit-id-base)" >expect && - test_cmp expect actual + echo "base-commit: $(git rev-parse upstream)" >expected && + test_cmp expected actual ' test_expect_success 'format-patch errors out when history involves criss-cross' ' @@ -1971,29 +1742,23 @@ test_expect_success 'format-patch errors out when history involves criss-cross' test_must_fail git format-patch --base=auto -1 ' -test_expect_success 'format-patch format.useAutoBase option' ' +test_expect_success 'format-patch format.useAutoBaseoption' ' + test_when_finished "git config --unset format.useAutoBase" && git checkout local && - test_config format.useAutoBase true && + git config format.useAutoBase true && git format-patch --stdout -1 >patch && grep "^base-commit:" patch >actual && - git rev-parse upstream >commit-id-base && - echo "base-commit: $(cat commit-id-base)" >expect && - test_cmp expect actual + echo "base-commit: $(git rev-parse upstream)" >expected && + test_cmp expected actual ' test_expect_success 'format-patch --base overrides format.useAutoBase' ' - test_config format.useAutoBase true && + test_when_finished "git config --unset format.useAutoBase" && + git config format.useAutoBase true && git format-patch --stdout --base=HEAD~1 -1 >patch && grep "^base-commit:" patch >actual && - git rev-parse HEAD~1 >commit-id-base && - echo "base-commit: $(cat commit-id-base)" >expect && - test_cmp expect actual -' - -test_expect_success 'format-patch --no-base overrides format.useAutoBase' ' - test_config format.useAutoBase true && - git format-patch --stdout --no-base -1 >patch && - ! grep "^base-commit:" patch + echo "base-commit: $(git rev-parse HEAD~1)" >expected && + test_cmp expected actual ' test_expect_success 'format-patch --base with --attach' ' @@ -2068,7 +1833,7 @@ test_expect_success 'interdiff: cover-letter' ' git format-patch --cover-letter --interdiff=boop~2 -1 boop && test_i18ngrep "^Interdiff:$" 0000-cover-letter.patch && test_i18ngrep ! "^Interdiff:$" 0001-fleep.patch && - sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual && + sed "1,/^@@ /d; /^-- $/q" <0000-cover-letter.patch >actual && test_cmp expect actual ' @@ -2084,7 +1849,7 @@ test_expect_success 'interdiff: solo-patch' ' EOF git format-patch --interdiff=boop~2 -1 boop && test_i18ngrep "^Interdiff:$" 0001-fleep.patch && - sed "1,/^ @@ /d; /^$/q" 0001-fleep.patch >actual && + sed "1,/^ @@ /d; /^$/q" <0001-fleep.patch >actual && test_cmp expect actual ' diff --git a/third_party/git/t/t4015-diff-whitespace.sh b/third_party/git/t/t4015-diff-whitespace.sh index 88d3026894..6b087df3dc 100755 --- a/third_party/git/t/t4015-diff-whitespace.sh +++ b/third_party/git/t/t4015-diff-whitespace.sh @@ -16,8 +16,6 @@ test_expect_success "Ray Lehtiniemi's example" ' } while (0); EOF git update-index --add x && - old_hash_x=$(git hash-object x) && - before=$(git rev-parse --short "$old_hash_x") && cat <<-\EOF >x && do @@ -26,12 +24,10 @@ test_expect_success "Ray Lehtiniemi's example" ' } while (0); EOF - new_hash_x=$(git hash-object x) && - after=$(git rev-parse --short "$new_hash_x") && - cat <<-EOF >expect && + cat <<-\EOF >expect && diff --git a/x b/x - index $before..$after 100644 + index adf3937..6edc172 100644 --- a/x +++ b/x @@ -1,3 +1,5 @@ @@ -65,8 +61,6 @@ test_expect_success 'another test, without options' ' EOF git update-index x && - old_hash_x=$(git hash-object x) && - before=$(git rev-parse --short "$old_hash_x") && tr "_" " " <<-\EOF >x && _ whitespace at beginning @@ -76,12 +70,10 @@ test_expect_success 'another test, without options' ' unchanged line CR at end EOF - new_hash_x=$(git hash-object x) && - after=$(git rev-parse --short "$new_hash_x") && - tr "Q_" "\015 " <<-EOF >expect && + tr "Q_" "\015 " <<-\EOF >expect && diff --git a/x b/x - index $before..$after 100644 + index d99af23..22d9f73 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -116,9 +108,9 @@ test_expect_success 'another test, without options' ' git diff -w --ignore-cr-at-eol >out && test_must_be_empty out && - tr "Q_" "\015 " <<-EOF >expect && + tr "Q_" "\015 " <<-\EOF >expect && diff --git a/x b/x - index $before..$after 100644 + index d99af23..22d9f73 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -140,9 +132,9 @@ test_expect_success 'another test, without options' ' git diff -b --ignore-cr-at-eol >out && test_cmp expect out && - tr "Q_" "\015 " <<-EOF >expect && + tr "Q_" "\015 " <<-\EOF >expect && diff --git a/x b/x - index $before..$after 100644 + index d99af23..22d9f73 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -162,9 +154,9 @@ test_expect_success 'another test, without options' ' git diff --ignore-space-at-eol --ignore-cr-at-eol >out && test_cmp expect out && - tr "Q_" "\015 " <<-EOF >expect && + tr "Q_" "\015 " <<-\EOF >expect && diff --git a/x b/x - index_$before..$after 100644 + index_d99af23..22d9f73 100644 --- a/x +++ b/x @@ -1,6 +1,6 @@ @@ -530,15 +522,13 @@ test_expect_success 'ignore-blank-lines: mix changes and blank lines' ' test_expect_success 'check mixed spaces and tabs in indent' ' # This is indented with SP HT SP. echo " foo();" >x && - test_must_fail git diff --check >check && - grep "space before tab in indent" check + git diff --check | grep "space before tab in indent" ' test_expect_success 'check mixed tabs and spaces in indent' ' # This is indented with HT SP HT. echo " foo();" >x && - test_must_fail git diff --check >check && - grep "space before tab in indent" check + git diff --check | grep "space before tab in indent" ' test_expect_success 'check with no whitespace errors' ' @@ -759,23 +749,20 @@ test_expect_success 'check tab-in-indent excluded from wildcard whitespace attri test_expect_success 'line numbers in --check output are correct' ' echo "" >x && echo "foo(); " >>x && - test_must_fail git diff --check >check && - grep "x:2:" check + git diff --check | grep "x:2:" ' test_expect_success 'checkdiff detects new trailing blank lines (1)' ' echo "foo();" >x && echo "" >>x && - test_must_fail git diff --check >check && - grep "new blank line" check + git diff --check | grep "new blank line" ' test_expect_success 'checkdiff detects new trailing blank lines (2)' ' - test_write_lines a b "" "" >x && + { echo a; echo b; echo; echo; } >x && git add x && - test_write_lines a "" "" "" "" >x && - test_must_fail git diff --check >check && - grep "new blank line" check + { echo a; echo; echo; echo; echo; } >x && + git diff --check | grep "new blank line" ' test_expect_success 'checkdiff allows new blank lines' ' @@ -799,27 +786,23 @@ test_expect_success 'whitespace-only changes not reported' ' test_must_be_empty actual ' +cat <<EOF >expect +diff --git a/x b/z +similarity index NUM% +rename from x +rename to z +index 380c32a..a97b785 100644 +EOF test_expect_success 'whitespace-only changes reported across renames' ' git reset --hard && for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i"; done >x && git add x && - hash_x=$(git hash-object x) && - before=$(git rev-parse --short "$hash_x") && git commit -m "base" && sed -e "5s/^/ /" x >z && git rm x && git add z && - hash_z=$(git hash-object z) && - after=$(git rev-parse --short "$hash_z") && - git diff -w -M --cached >actual.raw && - sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" actual.raw >actual && - cat <<-EOF >expect && - diff --git a/x b/z - similarity index NUM% - rename from x - rename to z - index $before..$after 100644 - EOF + git diff -w -M --cached | + sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" >actual && test_cmp expect actual ' @@ -851,8 +834,7 @@ test_expect_success 'combined diff with autocrlf conversion' ' git config core.autocrlf true && test_must_fail git merge master && - git diff >actual.raw && - sed -e "1,/^@@@/d" actual.raw >actual && + git diff | sed -e "1,/^@@@/d" >actual && ! grep "^-" actual ' @@ -876,18 +858,13 @@ test_expect_success 'diff that introduces a line with only tabs' ' git config core.whitespace blank-at-eol && git reset --hard && echo "test" >x && - old_hash_x=$(git hash-object x) && - before=$(git rev-parse --short "$old_hash_x") && git commit -m "initial" x && echo "{NTN}" | tr "NT" "\n\t" >>x && - new_hash_x=$(git hash-object x) && - after=$(git rev-parse --short "$new_hash_x") && - git diff --color >current.raw && - test_decode_color <current.raw >current && + git diff --color | test_decode_color >current && - cat >expected <<-EOF && + cat >expected <<-\EOF && <BOLD>diff --git a/x b/x<RESET> - <BOLD>index $before..$after 100644<RESET> + <BOLD>index 9daeafb..2874b91 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1 +1,4 @@<RESET> @@ -906,23 +883,19 @@ test_expect_success 'diff that introduces and removes ws breakages' ' echo "0. blank-at-eol " && echo "1. blank-at-eol " } >x && - old_hash_x=$(git hash-object x) && - before=$(git rev-parse --short "$old_hash_x") && git commit -a --allow-empty -m preimage && { echo "0. blank-at-eol " && echo "1. still-blank-at-eol " && echo "2. and a new line " } >x && - new_hash_x=$(git hash-object x) && - after=$(git rev-parse --short "$new_hash_x") && - git diff --color >current.raw && - test_decode_color <current.raw >current && + git diff --color | + test_decode_color >current && - cat >expected <<-EOF && + cat >expected <<-\EOF && <BOLD>diff --git a/x b/x<RESET> - <BOLD>index $before..$after 100644<RESET> + <BOLD>index d0233a2..700886e 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -942,20 +915,16 @@ test_expect_success 'ws-error-highlight test setup' ' echo "0. blank-at-eol " && echo "1. blank-at-eol " } >x && - old_hash_x=$(git hash-object x) && - before=$(git rev-parse --short "$old_hash_x") && git commit -a --allow-empty -m preimage && { echo "0. blank-at-eol " && echo "1. still-blank-at-eol " && echo "2. and a new line " } >x && - new_hash_x=$(git hash-object x) && - after=$(git rev-parse --short "$new_hash_x") && - cat >expect.default-old <<-EOF && + cat >expect.default-old <<-\EOF && <BOLD>diff --git a/x b/x<RESET> - <BOLD>index $before..$after 100644<RESET> + <BOLD>index d0233a2..700886e 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -965,9 +934,9 @@ test_expect_success 'ws-error-highlight test setup' ' <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET> EOF - cat >expect.all <<-EOF && + cat >expect.all <<-\EOF && <BOLD>diff --git a/x b/x<RESET> - <BOLD>index $before..$after 100644<RESET> + <BOLD>index d0233a2..700886e 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -977,9 +946,9 @@ test_expect_success 'ws-error-highlight test setup' ' <GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET> EOF - cat >expect.none <<-EOF + cat >expect.none <<-\EOF <BOLD>diff --git a/x b/x<RESET> - <BOLD>index $before..$after 100644<RESET> + <BOLD>index d0233a2..700886e 100644<RESET> <BOLD>--- a/x<RESET> <BOLD>+++ b/x<RESET> <CYAN>@@ -1,2 +1,3 @@<RESET> @@ -993,32 +962,32 @@ test_expect_success 'ws-error-highlight test setup' ' test_expect_success 'test --ws-error-highlight option' ' - git diff --color --ws-error-highlight=default,old >current.raw && - test_decode_color <current.raw >current && + git diff --color --ws-error-highlight=default,old | + test_decode_color >current && test_cmp expect.default-old current && - git diff --color --ws-error-highlight=all >current.raw && - test_decode_color <current.raw >current && + git diff --color --ws-error-highlight=all | + test_decode_color >current && test_cmp expect.all current && - git diff --color --ws-error-highlight=none >current.raw && - test_decode_color <current.raw >current && + git diff --color --ws-error-highlight=none | + test_decode_color >current && test_cmp expect.none current ' test_expect_success 'test diff.wsErrorHighlight config' ' - git -c diff.wsErrorHighlight=default,old diff --color >current.raw && - test_decode_color <current.raw >current && + git -c diff.wsErrorHighlight=default,old diff --color | + test_decode_color >current && test_cmp expect.default-old current && - git -c diff.wsErrorHighlight=all diff --color >current.raw && - test_decode_color <current.raw >current && + git -c diff.wsErrorHighlight=all diff --color | + test_decode_color >current && test_cmp expect.all current && - git -c diff.wsErrorHighlight=none diff --color >current.raw && - test_decode_color <current.raw >current && + git -c diff.wsErrorHighlight=none diff --color | + test_decode_color >current && test_cmp expect.none current ' @@ -1026,18 +995,18 @@ test_expect_success 'test diff.wsErrorHighlight config' ' test_expect_success 'option overrides diff.wsErrorHighlight' ' git -c diff.wsErrorHighlight=none \ - diff --color --ws-error-highlight=default,old >current.raw && - test_decode_color <current.raw >current && + diff --color --ws-error-highlight=default,old | + test_decode_color >current && test_cmp expect.default-old current && git -c diff.wsErrorHighlight=default \ - diff --color --ws-error-highlight=all >current.raw && - test_decode_color <current.raw >current && + diff --color --ws-error-highlight=all | + test_decode_color >current && test_cmp expect.all current && git -c diff.wsErrorHighlight=all \ - diff --color --ws-error-highlight=none >current.raw && - test_decode_color <current.raw >current && + diff --color --ws-error-highlight=none | + test_decode_color >current && test_cmp expect.none current ' @@ -1053,16 +1022,14 @@ test_expect_success 'detect moved code, complete file' ' EOF git add test.c && git commit -m "add main function" && - file=$(git rev-parse --short HEAD:test.c) && git mv test.c main.c && test_config color.diff.oldMoved "normal red" && test_config color.diff.newMoved "normal green" && - git diff HEAD --color-moved=zebra --color --no-renames >actual.raw && - test_decode_color <actual.raw >actual && - cat >expected <<-EOF && + git diff HEAD --color-moved=zebra --color --no-renames | test_decode_color >actual && + cat >expected <<-\EOF && <BOLD>diff --git a/main.c b/main.c<RESET> <BOLD>new file mode 100644<RESET> - <BOLD>index 0000000..$file<RESET> + <BOLD>index 0000000..a986c57<RESET> <BOLD>--- /dev/null<RESET> <BOLD>+++ b/main.c<RESET> <CYAN>@@ -0,0 +1,5 @@<RESET> @@ -1073,7 +1040,7 @@ test_expect_success 'detect moved code, complete file' ' <BGREEN>+<RESET><BGREEN>}<RESET> <BOLD>diff --git a/test.c b/test.c<RESET> <BOLD>deleted file mode 100644<RESET> - <BOLD>index $file..0000000<RESET> + <BOLD>index a986c57..0000000<RESET> <BOLD>--- a/test.c<RESET> <BOLD>+++ /dev/null<RESET> <CYAN>@@ -1,5 +0,0 @@<RESET> @@ -1127,8 +1094,6 @@ test_expect_success 'detect malicious moved code, inside file' ' EOF git add main.c test.c && git commit -m "add main and test file" && - before_main=$(git rev-parse --short HEAD:main.c) && - before_test=$(git rev-parse --short HEAD:test.c) && cat <<-\EOF >main.c && #include<stdio.h> int stuff() @@ -1161,15 +1126,10 @@ test_expect_success 'detect malicious moved code, inside file' ' bar(); } EOF - hash_main=$(git hash-object main.c) && - after_main=$(git rev-parse --short "$hash_main") && - hash_test=$(git hash-object test.c) && - after_test=$(git rev-parse --short "$hash_test") && - git diff HEAD --no-renames --color-moved=zebra --color >actual.raw && - test_decode_color <actual.raw >actual && - cat <<-EOF >expected && + git diff HEAD --no-renames --color-moved=zebra --color | test_decode_color >actual && + cat <<-\EOF >expected && <BOLD>diff --git a/main.c b/main.c<RESET> - <BOLD>index $before_main..$after_main 100644<RESET> + <BOLD>index 27a619c..7cf9336 100644<RESET> <BOLD>--- a/main.c<RESET> <BOLD>+++ b/main.c<RESET> <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET> @@ -1187,7 +1147,7 @@ test_expect_success 'detect malicious moved code, inside file' ' {<RESET> foo();<RESET> <BOLD>diff --git a/test.c b/test.c<RESET> - <BOLD>index $before_test..$after_test 100644<RESET> + <BOLD>index 1dc1d85..2bedec9 100644<RESET> <BOLD>--- a/test.c<RESET> <BOLD>+++ b/test.c<RESET> <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET> @@ -1215,11 +1175,10 @@ test_expect_success 'plain moved code, inside file' ' test_config color.diff.oldMovedAlternative "blue" && test_config color.diff.newMovedAlternative "yellow" && # needs previous test as setup - git diff HEAD --no-renames --color-moved=plain --color >actual.raw && - test_decode_color <actual.raw >actual && - cat <<-EOF >expected && + git diff HEAD --no-renames --color-moved=plain --color | test_decode_color >actual && + cat <<-\EOF >expected && <BOLD>diff --git a/main.c b/main.c<RESET> - <BOLD>index $before_main..$after_main 100644<RESET> + <BOLD>index 27a619c..7cf9336 100644<RESET> <BOLD>--- a/main.c<RESET> <BOLD>+++ b/main.c<RESET> <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET> @@ -1237,7 +1196,7 @@ test_expect_success 'plain moved code, inside file' ' {<RESET> foo();<RESET> <BOLD>diff --git a/test.c b/test.c<RESET> - <BOLD>index $before_test..$after_test 100644<RESET> + <BOLD>index 1dc1d85..2bedec9 100644<RESET> <BOLD>--- a/test.c<RESET> <BOLD>+++ b/test.c<RESET> <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET> @@ -1795,8 +1754,7 @@ test_expect_success 'move detection with submodules' ' ! grep BRED decoded_actual && # nor did we mess with it another way - git diff --submodule=diff --color >expect.raw && - test_decode_color <expect.raw >expect && + git diff --submodule=diff --color | test_decode_color >expect && test_cmp expect decoded_actual && rm -rf bananas && git submodule deinit bananas @@ -2050,6 +2008,11 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' ' test_cmp expected actual ' +# Note that the "6" in the expected hunk header below is funny, since we only +# show 5 lines (the missing one was blank and thus ignored). This is how +# --ignore-blank-lines behaves even without --function-context, and this test +# is just checking the interaction of the two features. Don't take it as an +# endorsement of that output. test_expect_success 'combine --ignore-blank-lines with --function-context' ' test_write_lines 1 "" 2 3 4 5 >a && test_write_lines 1 2 3 4 >b && @@ -2059,7 +2022,6 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' ' cat <<-\EOF >expect && @@ -1,6 +1,4 @@ 1 - - 2 3 4 @@ -2068,27 +2030,4 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' ' test_cmp expect actual ' -test_expect_success 'combine --ignore-blank-lines with --function-context 2' ' - test_write_lines a b c "" function 1 2 3 4 5 "" 6 7 8 9 >a && - test_write_lines "" a b c "" function 1 2 3 4 5 6 7 8 >b && - test_must_fail git diff --no-index \ - --ignore-blank-lines --function-context a b >actual.raw && - sed -n "/@@/,\$p" <actual.raw >actual && - cat <<-\EOF >expect && - @@ -5,11 +6,9 @@ c - function - 1 - 2 - 3 - 4 - 5 - - - 6 - 7 - 8 - -9 - EOF - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t4018-diff-funcname.sh b/third_party/git/t/t4018-diff-funcname.sh index 02255a08bf..9261d6d3a0 100755 --- a/third_party/git/t/t4018-diff-funcname.sh +++ b/third_party/git/t/t4018-diff-funcname.sh @@ -31,8 +31,6 @@ diffpatterns=" cpp csharp css - dts - elixir fortran fountain golang @@ -106,6 +104,7 @@ do result=success fi test_expect_$result "hunk header: $i" " + test_when_finished 'cat actual' && # for debugging only git diff -U1 $i >actual && grep '@@ .* @@.*RIGHT' actual " diff --git a/third_party/git/t/t4018/dts-labels b/third_party/git/t/t4018/dts-labels deleted file mode 100644 index b21ef8737b..0000000000 --- a/third_party/git/t/t4018/dts-labels +++ /dev/null @@ -1,9 +0,0 @@ -/ { - label_1: node1@ff00 { - label2: RIGHT { - vendor,some-property; - - ChangeMe = <0x45-30>; - }; - }; -}; diff --git a/third_party/git/t/t4018/dts-node-unitless b/third_party/git/t/t4018/dts-node-unitless deleted file mode 100644 index c5287d9141..0000000000 --- a/third_party/git/t/t4018/dts-node-unitless +++ /dev/null @@ -1,8 +0,0 @@ -/ { - label_1: node1 { - RIGHT { - prop-array = <1>, <4>; - ChangeMe = <0xffeedd00>; - }; - }; -}; diff --git a/third_party/git/t/t4018/dts-nodes b/third_party/git/t/t4018/dts-nodes deleted file mode 100644 index 5a4334bb16..0000000000 --- a/third_party/git/t/t4018/dts-nodes +++ /dev/null @@ -1,8 +0,0 @@ -/ { - label_1: node1@ff00 { - RIGHT@deadf00,4000 { - #size-cells = <1>; - ChangeMe = <0xffeedd00>; - }; - }; -}; diff --git a/third_party/git/t/t4018/dts-nodes-boolean-prop b/third_party/git/t/t4018/dts-nodes-boolean-prop deleted file mode 100644 index afc6b5b404..0000000000 --- a/third_party/git/t/t4018/dts-nodes-boolean-prop +++ /dev/null @@ -1,9 +0,0 @@ -/ { - label_1: node1@ff00 { - RIGHT@deadf00,4000 { - boolean-prop1; - - ChangeMe; - }; - }; -}; diff --git a/third_party/git/t/t4018/dts-nodes-comment1 b/third_party/git/t/t4018/dts-nodes-comment1 deleted file mode 100644 index 559dfce9b3..0000000000 --- a/third_party/git/t/t4018/dts-nodes-comment1 +++ /dev/null @@ -1,8 +0,0 @@ -/ { - label_1: node1@ff00 { - RIGHT@deadf00,4000 /* &a comment */ { - #size-cells = <1>; - ChangeMe = <0xffeedd00>; - }; - }; -}; diff --git a/third_party/git/t/t4018/dts-nodes-comment2 b/third_party/git/t/t4018/dts-nodes-comment2 deleted file mode 100644 index 27e9718b31..0000000000 --- a/third_party/git/t/t4018/dts-nodes-comment2 +++ /dev/null @@ -1,8 +0,0 @@ -/ { - label_1: node1@ff00 { - RIGHT@deadf00,4000 { /* a trailing comment */ - #size-cells = <1>; - ChangeMe = <0xffeedd00>; - }; - }; -}; diff --git a/third_party/git/t/t4018/dts-nodes-multiline-prop b/third_party/git/t/t4018/dts-nodes-multiline-prop deleted file mode 100644 index 072d58b69d..0000000000 --- a/third_party/git/t/t4018/dts-nodes-multiline-prop +++ /dev/null @@ -1,13 +0,0 @@ -/ { - label_1: node1@ff00 { - RIGHT@deadf00,4000 { - multilineprop = <3>, - <4>, - <5>, - <6>, - <7>; - - ChangeMe = <0xffeedd00>; - }; - }; -}; diff --git a/third_party/git/t/t4018/dts-reference b/third_party/git/t/t4018/dts-reference deleted file mode 100644 index 8f0c87d863..0000000000 --- a/third_party/git/t/t4018/dts-reference +++ /dev/null @@ -1,9 +0,0 @@ -&label_1 { - TEST = <455>; -}; - -&RIGHT { - vendor,some-property; - - ChangeMe = <0x45-30>; -}; diff --git a/third_party/git/t/t4018/dts-root b/third_party/git/t/t4018/dts-root deleted file mode 100644 index 4353b8220c..0000000000 --- a/third_party/git/t/t4018/dts-root +++ /dev/null @@ -1,5 +0,0 @@ -/ { RIGHT /* Technically just supposed to be a slash and brace */ - #size-cells = <1>; - - ChangeMe = <0xffeedd00>; -}; diff --git a/third_party/git/t/t4018/dts-root-comment b/third_party/git/t/t4018/dts-root-comment deleted file mode 100644 index 333a625c70..0000000000 --- a/third_party/git/t/t4018/dts-root-comment +++ /dev/null @@ -1,8 +0,0 @@ -/ { RIGHT /* Technically just supposed to be a slash and brace */ - #size-cells = <1>; - - /* This comment should be ignored */ - - some-property = <40+2>; - ChangeMe = <0xffeedd00>; -}; diff --git a/third_party/git/t/t4018/elixir-do-not-pick-end b/third_party/git/t/t4018/elixir-do-not-pick-end deleted file mode 100644 index fae08ba7e8..0000000000 --- a/third_party/git/t/t4018/elixir-do-not-pick-end +++ /dev/null @@ -1,5 +0,0 @@ -defmodule RIGHT do -end -# -# -# ChangeMe; do not pick up 'end' line diff --git a/third_party/git/t/t4018/elixir-ex-unit-test b/third_party/git/t/t4018/elixir-ex-unit-test deleted file mode 100644 index 0560a2b697..0000000000 --- a/third_party/git/t/t4018/elixir-ex-unit-test +++ /dev/null @@ -1,6 +0,0 @@ -defmodule Test do - test "RIGHT" do - assert true == true - assert ChangeMe - end -end diff --git a/third_party/git/t/t4018/elixir-function b/third_party/git/t/t4018/elixir-function deleted file mode 100644 index d452f495a7..0000000000 --- a/third_party/git/t/t4018/elixir-function +++ /dev/null @@ -1,5 +0,0 @@ -def function(RIGHT, arg) do - # comment - # comment - ChangeMe -end diff --git a/third_party/git/t/t4018/elixir-macro b/third_party/git/t/t4018/elixir-macro deleted file mode 100644 index 4f925e9ad4..0000000000 --- a/third_party/git/t/t4018/elixir-macro +++ /dev/null @@ -1,5 +0,0 @@ -defmacro foo(RIGHT) do - # Code - # Code - ChangeMe -end diff --git a/third_party/git/t/t4018/elixir-module b/third_party/git/t/t4018/elixir-module deleted file mode 100644 index 91a4e7aa20..0000000000 --- a/third_party/git/t/t4018/elixir-module +++ /dev/null @@ -1,9 +0,0 @@ -defmodule RIGHT do - @moduledoc """ - Foo bar - """ - - def ChangeMe(a) where is_map(a) do - a - end -end diff --git a/third_party/git/t/t4018/elixir-module-func b/third_party/git/t/t4018/elixir-module-func deleted file mode 100644 index c9910d0675..0000000000 --- a/third_party/git/t/t4018/elixir-module-func +++ /dev/null @@ -1,8 +0,0 @@ -defmodule Foo do - def fun(RIGHT) do - # Code - # Code - # Code - ChangeMe - end -end diff --git a/third_party/git/t/t4018/elixir-nested-module b/third_party/git/t/t4018/elixir-nested-module deleted file mode 100644 index 771ebc5c42..0000000000 --- a/third_party/git/t/t4018/elixir-nested-module +++ /dev/null @@ -1,9 +0,0 @@ -defmodule MyApp.RIGHT do - @moduledoc """ - Foo bar - """ - - def ChangeMe(a) where is_map(a) do - a - end -end diff --git a/third_party/git/t/t4018/elixir-private-function b/third_party/git/t/t4018/elixir-private-function deleted file mode 100644 index 1aabe33b7a..0000000000 --- a/third_party/git/t/t4018/elixir-private-function +++ /dev/null @@ -1,5 +0,0 @@ -defp function(RIGHT, arg) do - # comment - # comment - ChangeMe -end diff --git a/third_party/git/t/t4018/elixir-protocol b/third_party/git/t/t4018/elixir-protocol deleted file mode 100644 index 7d9173691e..0000000000 --- a/third_party/git/t/t4018/elixir-protocol +++ /dev/null @@ -1,6 +0,0 @@ -defprotocol RIGHT do - @doc """ - Calculates the size (and not the length!) of a data structure - """ - def size(data, ChangeMe) -end diff --git a/third_party/git/t/t4018/elixir-protocol-implementation b/third_party/git/t/t4018/elixir-protocol-implementation deleted file mode 100644 index f9234bbfc4..0000000000 --- a/third_party/git/t/t4018/elixir-protocol-implementation +++ /dev/null @@ -1,5 +0,0 @@ -defimpl RIGHT do - # Docs - # Docs - def foo(ChangeMe), do: :ok -end diff --git a/third_party/git/t/t4018/python-async-def b/third_party/git/t/t4018/python-async-def deleted file mode 100644 index 87640e03d2..0000000000 --- a/third_party/git/t/t4018/python-async-def +++ /dev/null @@ -1,4 +0,0 @@ -async def RIGHT(pi: int = 3.14): - while True: - break - return ChangeMe() diff --git a/third_party/git/t/t4018/python-class b/third_party/git/t/t4018/python-class deleted file mode 100644 index ba9e741430..0000000000 --- a/third_party/git/t/t4018/python-class +++ /dev/null @@ -1,4 +0,0 @@ -class RIGHT(int, str): - # comment - # another comment - # ChangeMe diff --git a/third_party/git/t/t4018/python-def b/third_party/git/t/t4018/python-def deleted file mode 100644 index e50b31b0ad..0000000000 --- a/third_party/git/t/t4018/python-def +++ /dev/null @@ -1,4 +0,0 @@ -def RIGHT(pi: int = 3.14): - while True: - break - return ChangeMe() diff --git a/third_party/git/t/t4018/python-indented-async-def b/third_party/git/t/t4018/python-indented-async-def deleted file mode 100644 index f5d03258af..0000000000 --- a/third_party/git/t/t4018/python-indented-async-def +++ /dev/null @@ -1,7 +0,0 @@ -class Foo: - async def RIGHT(self, x: int): - return [ - 1, - 2, - ChangeMe, - ] diff --git a/third_party/git/t/t4018/python-indented-class b/third_party/git/t/t4018/python-indented-class deleted file mode 100644 index 19b4f35c4c..0000000000 --- a/third_party/git/t/t4018/python-indented-class +++ /dev/null @@ -1,5 +0,0 @@ -if TYPE_CHECKING: - class RIGHT: - # comment - # another comment - # ChangeMe diff --git a/third_party/git/t/t4018/python-indented-def b/third_party/git/t/t4018/python-indented-def deleted file mode 100644 index 208fbadd2b..0000000000 --- a/third_party/git/t/t4018/python-indented-def +++ /dev/null @@ -1,7 +0,0 @@ -class Foo: - def RIGHT(self, x: int): - return [ - 1, - 2, - ChangeMe, - ] diff --git a/third_party/git/t/t4026-color.sh b/third_party/git/t/t4026-color.sh index c0b642c1ab..671e951ee5 100755 --- a/third_party/git/t/t4026-color.sh +++ b/third_party/git/t/t4026-color.sh @@ -30,14 +30,6 @@ test_expect_success 'attribute before color name' ' color "bold red" "[1;31m" ' -test_expect_success 'aixterm bright fg color' ' - color "brightred" "[91m" -' - -test_expect_success 'aixterm bright bg color' ' - color "green brightblue" "[32;104m" -' - test_expect_success 'color name before attribute' ' color "red bold" "[1;31m" ' @@ -82,10 +74,6 @@ test_expect_success '0-7 are aliases for basic ANSI color names' ' color "0 7" "[30;47m" ' -test_expect_success '8-15 are aliases for aixterm color names' ' - color "12 13" "[94;105m" -' - test_expect_success '256 colors' ' color "254 bold 255" "[1;38;5;254;48;5;255m" ' diff --git a/third_party/git/t/t4027-diff-submodule.sh b/third_party/git/t/t4027-diff-submodule.sh index e29deaf4a5..9aa8e2b39b 100755 --- a/third_party/git/t/t4027-diff-submodule.sh +++ b/third_party/git/t/t4027-diff-submodule.sh @@ -6,7 +6,6 @@ test_description='difference in submodules' . "$TEST_DIRECTORY"/diff-lib.sh test_expect_success setup ' - test_oid_init && test_tick && test_create_repo sub && ( @@ -37,8 +36,7 @@ test_expect_success setup ' ' test_expect_success 'git diff --raw HEAD' ' - hexsz=$(test_oid hexsz) && - git diff --raw --abbrev=$hexsz HEAD >actual && + git diff --raw --abbrev=40 HEAD >actual && test_cmp expect actual ' @@ -247,21 +245,23 @@ test_expect_success 'git diff (empty submodule dir)' ' ' test_expect_success 'conflicted submodule setup' ' - c=$(test_oid ff_1) && + + # 39 efs + c=fffffffffffffffffffffffffffffffffffffff && ( echo "000000 $ZERO_OID 0 sub" && echo "160000 1$c 1 sub" && echo "160000 2$c 2 sub" && echo "160000 3$c 3 sub" ) | git update-index --index-info && - echo >expect.nosub "diff --cc sub + echo >expect.nosub '\''diff --cc sub index 2ffffff,3ffffff..0000000 --- a/sub +++ b/sub @@@ -1,1 -1,1 +1,1 @@@ -- Subproject commit 2$c - -Subproject commit 3$c -++Subproject commit $ZERO_OID" && +- Subproject commit 2fffffffffffffffffffffffffffffffffffffff + -Subproject commit 3fffffffffffffffffffffffffffffffffffffff +++Subproject commit 0000000000000000000000000000000000000000'\'' && hh=$(git rev-parse HEAD) && sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub diff --git a/third_party/git/t/t4034-diff-words.sh b/third_party/git/t/t4034-diff-words.sh index fb145aa173..912df91226 100755 --- a/third_party/git/t/t4034-diff-words.sh +++ b/third_party/git/t/t4034-diff-words.sh @@ -19,11 +19,9 @@ cat >post.simple <<-\EOF aeff = aeff * ( aaa ) EOF -pre=$(git rev-parse --short $(git hash-object pre.simple)) -post=$(git rev-parse --short $(git hash-object post.simple)) -cat >expect.letter-runs-are-words <<-EOF +cat >expect.letter-runs-are-words <<-\EOF <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 330b04f..5ed8eff 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -35,9 +33,9 @@ cat >expect.letter-runs-are-words <<-EOF <GREEN>aeff = aeff * ( aaa<RESET> ) EOF -cat >expect.non-whitespace-is-word <<-EOF +cat >expect.non-whitespace-is-word <<-\EOF <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 330b04f..5ed8eff 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -51,12 +49,9 @@ cat >expect.non-whitespace-is-word <<-EOF EOF word_diff () { - pre=$(git rev-parse --short $(git hash-object pre)) && - post=$(git rev-parse --short $(git hash-object post)) && test_must_fail git diff --no-index "$@" pre post >output && test_decode_color <output >output.decrypted && - sed -e "2s/index [^ ]*/index $pre..$post/" expect >expected - test_cmp expected output.decrypted + test_cmp expect output.decrypted } test_language_driver () { @@ -82,9 +77,9 @@ test_expect_success 'set up pre and post with runs of whitespace' ' ' test_expect_success 'word diff with runs of whitespace' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 330b04f..5ed8eff 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -102,9 +97,9 @@ test_expect_success 'word diff with runs of whitespace' ' ' test_expect_success '--word-diff=porcelain' ' - sed 's/#.*$//' >expect <<-EOF && + sed 's/#.*$//' >expect <<-\EOF && diff --git a/pre b/post - index $pre..$post 100644 + index 330b04f..5ed8eff 100644 --- a/pre +++ b/post @@ -1,3 +1,7 @@ @@ -126,9 +121,9 @@ test_expect_success '--word-diff=porcelain' ' ' test_expect_success '--word-diff=plain' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && diff --git a/pre b/post - index $pre..$post 100644 + index 330b04f..5ed8eff 100644 --- a/pre +++ b/post @@ -1,3 +1,7 @@ @@ -145,9 +140,9 @@ test_expect_success '--word-diff=plain' ' ' test_expect_success '--word-diff=plain --color' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 330b04f..5ed8eff 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -163,9 +158,9 @@ test_expect_success '--word-diff=plain --color' ' ' test_expect_success 'word diff without context' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 330b04f..5ed8eff 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1 +1 @@<RESET> @@ -212,9 +207,9 @@ test_expect_success 'command-line overrides config' ' ' test_expect_success 'command-line overrides config: --word-diff-regex' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 330b04f..5ed8eff 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -239,9 +234,9 @@ test_expect_success 'setup: remove diff driver regex' ' ' test_expect_success 'use configured regex' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 330b04f..5ed8eff 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1,3 +1,7 @@<RESET> @@ -259,11 +254,9 @@ test_expect_success 'use configured regex' ' test_expect_success 'test parsing words for newline' ' echo "aaa (aaa)" >pre && echo "aaa (aaa) aaa" >post && - pre=$(git rev-parse --short $(git hash-object pre)) && - post=$(git rev-parse --short $(git hash-object post)) && - cat >expect <<-EOF && + cat >expect <<-\EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index c29453b..be22f37 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1 +1 @@<RESET> @@ -275,11 +268,9 @@ test_expect_success 'test parsing words for newline' ' test_expect_success 'test when words are only removed at the end' ' echo "(:" >pre && echo "(" >post && - pre=$(git rev-parse --short $(git hash-object pre)) && - post=$(git rev-parse --short $(git hash-object post)) && - cat >expect <<-EOF && + cat >expect <<-\EOF && <BOLD>diff --git a/pre b/post<RESET> - <BOLD>index $pre..$post 100644<RESET> + <BOLD>index 289cb9d..2d06f37 100644<RESET> <BOLD>--- a/pre<RESET> <BOLD>+++ b/post<RESET> <CYAN>@@ -1 +1 @@<RESET> @@ -291,11 +282,9 @@ test_expect_success 'test when words are only removed at the end' ' test_expect_success '--word-diff=none' ' echo "(:" >pre && echo "(" >post && - pre=$(git rev-parse --short $(git hash-object pre)) && - post=$(git rev-parse --short $(git hash-object post)) && - cat >expect <<-EOF && + cat >expect <<-\EOF && diff --git a/pre b/post - index $pre..$post 100644 + index 289cb9d..2d06f37 100644 --- a/pre +++ b/post @@ -1 +1 @@ @@ -314,7 +303,6 @@ test_language_driver bibtex test_language_driver cpp test_language_driver csharp test_language_driver css -test_language_driver dts test_language_driver fortran test_language_driver html test_language_driver java @@ -328,6 +316,16 @@ test_language_driver ruby test_language_driver tex test_expect_success 'word-diff with diff.sbe' ' + cat >expect <<-\EOF && + diff --git a/pre b/post + index a1a53b5..bc8fe6d 100644 + --- a/pre + +++ b/post + @@ -1,3 +1,3 @@ + a + + [-b-]{+c+} + EOF cat >pre <<-\EOF && a @@ -338,35 +336,21 @@ test_expect_success 'word-diff with diff.sbe' ' c EOF - pre=$(git rev-parse --short $(git hash-object pre)) && - post=$(git rev-parse --short $(git hash-object post)) && - cat >expect <<-EOF && - diff --git a/pre b/post - index $pre..$post 100644 - --- a/pre - +++ b/post - @@ -1,3 +1,3 @@ - a - - [-b-]{+c+} - EOF test_config diff.suppress-blank-empty true && word_diff --word-diff=plain ' test_expect_success 'word-diff with no newline at EOF' ' - printf "%s" "a a a a a" >pre && - printf "%s" "a a ab a a" >post && - pre=$(git rev-parse --short $(git hash-object pre)) && - post=$(git rev-parse --short $(git hash-object post)) && - cat >expect <<-EOF && + cat >expect <<-\EOF && diff --git a/pre b/post - index $pre..$post 100644 + index 7bf316e..3dd0303 100644 --- a/pre +++ b/post @@ -1 +1 @@ a a [-a-]{+ab+} a a EOF + printf "%s" "a a a a a" >pre && + printf "%s" "a a ab a a" >post && word_diff --word-diff=plain ' diff --git a/third_party/git/t/t4034/dts/expect b/third_party/git/t/t4034/dts/expect deleted file mode 100644 index 560fc99184..0000000000 --- a/third_party/git/t/t4034/dts/expect +++ /dev/null @@ -1,37 +0,0 @@ -<BOLD>diff --git a/pre b/post<RESET> -<BOLD>index b6a9051..7803aee 100644<RESET> -<BOLD>--- a/pre<RESET> -<BOLD>+++ b/post<RESET> -<CYAN>@@ -1,32 +1,32 @@<RESET> -/ {<RESET> - <RED>this_handle<RESET><GREEN>HANDLE_2<RESET>: <RED>node<RESET><GREEN>new-node<RESET>@<RED>f00<RESET><GREEN>eeda<RESET> { - compatible = "<RED>mydev<RESET><GREEN>vendor,compat<RESET>"; - string-prop = <RED>start<RESET><GREEN>end<RESET>: "hello <RED>world!<RESET><GREEN>world?<RESET>" <RED>end<RESET><GREEN>start<RESET>: ; - <RED>#size-cells<RESET><GREEN>#address-cells<RESET> = <<RED>0+0<RESET><GREEN>0+40<RESET>>; - reg = <<RED>0xf00<RESET><GREEN>0xeeda<RESET>>; - prop = <<GREEN>(<RESET>1<GREEN>)<RESET>>; - prop = <<GREEN>(<RESET>-1e10<GREEN>)<RESET>>; - prop = <(!<RED>3<RESET><GREEN>1<RESET>)>; - prop = <(~<RED>3<RESET><GREEN>1<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>*<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>/<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>%<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3+4<RESET><GREEN>1+2<RESET>)>; - prop = <(<RED>3-4<RESET><GREEN>1-2<RESET>)>; - prop = /bits/ <RED>64<RESET><GREEN>32<RESET> <(<RED>3<RESET><GREEN>1<RESET><<<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>>><RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>&<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>^<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>|<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>&&<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>3<RESET><GREEN>1<RESET>||<RED>4<RESET><GREEN>2<RESET>)>; - prop = <(<RED>4?5<RESET><GREEN>1?2<RESET>:3)>; - list = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>, <0 0 0 <RED>0<RESET><GREEN>1<RESET>>; - };<RESET> - - &<RED>phandle<RESET><GREEN>phandle2<RESET> { - <RED>pre-phandle<RESET><GREEN>prop_handle<RESET> = <&<RED>this_handle<RESET><GREEN>HANDLE_2<RESET>>; - };<RESET> -};<RESET> diff --git a/third_party/git/t/t4034/dts/post b/third_party/git/t/t4034/dts/post deleted file mode 100644 index 7803aee280..0000000000 --- a/third_party/git/t/t4034/dts/post +++ /dev/null @@ -1,32 +0,0 @@ -/ { - HANDLE_2: new-node@eeda { - compatible = "vendor,compat"; - string-prop = end: "hello world?" start: ; - #address-cells = <0+40>; - reg = <0xeeda>; - prop = <(1)>; - prop = <(-1e10)>; - prop = <(!1)>; - prop = <(~1)>; - prop = <(1*2)>; - prop = <(1&2)>; - prop = <(1*2)>; - prop = <(1/2)>; - prop = <(1%2)>; - prop = <(1+2)>; - prop = <(1-2)>; - prop = /bits/ 32 <(1<<2)>; - prop = <(1>>2)>; - prop = <(1&2)>; - prop = <(1^2)>; - prop = <(1|2)>; - prop = <(1&&2)>; - prop = <(1||2)>; - prop = <(1?2:3)>; - list = <&HANDLE_2>, <0 0 0 1>; - }; - - &phandle2 { - prop_handle = <&HANDLE_2>; - }; -}; diff --git a/third_party/git/t/t4034/dts/pre b/third_party/git/t/t4034/dts/pre deleted file mode 100644 index b6a905113c..0000000000 --- a/third_party/git/t/t4034/dts/pre +++ /dev/null @@ -1,32 +0,0 @@ -/ { - this_handle: node@f00 { - compatible = "mydev"; - string-prop = start: "hello world!" end: ; - #size-cells = <0+0>; - reg = <0xf00>; - prop = <1>; - prop = <-1e10>; - prop = <(!3)>; - prop = <(~3)>; - prop = <(3*4)>; - prop = <(3&4)>; - prop = <(3*4)>; - prop = <(3/4)>; - prop = <(3%4)>; - prop = <(3+4)>; - prop = <(3-4)>; - prop = /bits/ 64 <(3<<4)>; - prop = <(3>>4)>; - prop = <(3&4)>; - prop = <(3^4)>; - prop = <(3|4)>; - prop = <(3&&4)>; - prop = <(3||4)>; - prop = <(4?5:3)>; - list = <&this_handle>, <0 0 0 0>; - }; - - &phandle { - pre-phandle = <&this_handle>; - }; -}; diff --git a/third_party/git/t/t4038-diff-combined.sh b/third_party/git/t/t4038-diff-combined.sh index 94680836ce..d4afe12554 100755 --- a/third_party/git/t/t4038-diff-combined.sh +++ b/third_party/git/t/t4038-diff-combined.sh @@ -354,7 +354,7 @@ test_expect_failure 'combine diff coalesce three parents' ' ' # Test for a bug reported at -# https://lore.kernel.org/git/20130515143508.GO25742@login.drsnuggles.stderr.nl/ +# https://public-inbox.org/git/20130515143508.GO25742@login.drsnuggles.stderr.nl/ # where a delete lines were missing from combined diff output when they # occurred exactly before the context lines of a later change. test_expect_success 'combine diff missing delete bug' ' @@ -440,13 +440,11 @@ test_expect_success 'setup for --combined-all-paths' ' git branch side2c && git checkout side1c && test_seq 1 10 >filename-side1c && - side1cf=$(git hash-object filename-side1c) && git add filename-side1c && git commit -m with && git checkout side2c && test_seq 1 9 >filename-side2c && echo ten >>filename-side2c && - side2cf=$(git hash-object filename-side2c) && git add filename-side2c && git commit -m iam && git checkout -b mergery side1c && @@ -454,14 +452,13 @@ test_expect_success 'setup for --combined-all-paths' ' git rm filename-side1c && echo eleven >>filename-side2c && git mv filename-side2c filename-merged && - mergedf=$(git hash-object filename-merged) && git add filename-merged && git commit ' test_expect_success '--combined-all-paths and --raw' ' - cat <<-EOF >expect && - ::100644 100644 100644 $side1cf $side2cf $mergedf RR filename-side1c filename-side2c filename-merged + cat <<-\EOF >expect && + ::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR filename-side1c filename-side2c filename-merged EOF git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp && sed 1d <actual.tmp >actual && @@ -485,13 +482,11 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names' git checkout side1d && test_seq 1 10 >"$(printf "file\twith\ttabs")" && git add file* && - side1df=$(git hash-object *tabs) && git commit -m with && git checkout side2d && test_seq 1 9 >"$(printf "i\tam\ttabbed")" && echo ten >>"$(printf "i\tam\ttabbed")" && git add *tabbed && - side2df=$(git hash-object *tabbed) && git commit -m iam && git checkout -b funny-names-mergery side1d && git merge --no-commit side2d && @@ -499,14 +494,12 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names' echo eleven >>"$(printf "i\tam\ttabbed")" && git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" && git add fickle* && - headf=$(git hash-object fickle*) && - git commit && - head=$(git rev-parse HEAD) + git commit ' test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names' ' - cat <<-EOF >expect && - ::100644 100644 100644 $side1df $side2df $headf RR "file\twith\ttabs" "i\tam\ttabbed" "fickle\tnaming" + cat <<-\EOF >expect && + ::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR "file\twith\ttabs" "i\tam\ttabbed" "fickle\tnaming" EOF git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp && sed 1d <actual.tmp >actual && @@ -514,9 +507,9 @@ test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names' ' test_expect_success FUNNYNAMES '--combined-all-paths and --raw -and -z and funny names' ' - printf "$head\0::100644 100644 100644 $side1df $side2df $headf RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect && + printf "aaf8087c3cbd4db8e185a2d074cf27c53cfb75d7\0::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect && git diff-tree -c -M --raw --combined-all-paths -z HEAD >actual && - test_cmp expect actual + test_cmp -a expect actual ' test_expect_success FUNNYNAMES '--combined-all-paths and --cc and funny names' ' diff --git a/third_party/git/t/t4039-diff-assume-unchanged.sh b/third_party/git/t/t4039-diff-assume-unchanged.sh index 0eb0314a8b..53ac44b0f0 100755 --- a/third_party/git/t/t4039-diff-assume-unchanged.sh +++ b/third_party/git/t/t4039-diff-assume-unchanged.sh @@ -12,7 +12,6 @@ test_expect_success 'setup' ' git commit -m zero && echo one > one && echo two > two && - blob=$(git hash-object one) && git add one two && git commit -m onetwo && git update-index --assume-unchanged one && @@ -21,7 +20,7 @@ test_expect_success 'setup' ' ' test_expect_success 'diff-index does not examine assume-unchanged entries' ' - git diff-index HEAD^ -- one | grep -q $blob + git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171 ' test_expect_success 'diff-files does not examine assume-unchanged entries' ' diff --git a/third_party/git/t/t4041-diff-submodule-option.sh b/third_party/git/t/t4041-diff-submodule-option.sh index f852136585..619bf97098 100755 --- a/third_party/git/t/t4041-diff-submodule-option.sh +++ b/third_party/git/t/t4041-diff-submodule-option.sh @@ -284,7 +284,7 @@ test_expect_success 'submodule contains untracked content (all ignored)' ' test_must_be_empty actual ' -test_expect_success 'submodule contains untracked and modified content' ' +test_expect_success 'submodule contains untracked and modifed content' ' echo new > sm1/foo6 && git diff-index -p --submodule=log HEAD >actual && cat >expected <<-EOF && @@ -294,7 +294,7 @@ test_expect_success 'submodule contains untracked and modified content' ' test_cmp expected actual ' -test_expect_success 'submodule contains untracked and modified content (untracked ignored)' ' +test_expect_success 'submodule contains untracked and modifed content (untracked ignored)' ' echo new > sm1/foo6 && git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual && cat >expected <<-EOF && @@ -303,19 +303,19 @@ test_expect_success 'submodule contains untracked and modified content (untracke test_cmp expected actual ' -test_expect_success 'submodule contains untracked and modified content (dirty ignored)' ' +test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' ' echo new > sm1/foo6 && git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual && test_must_be_empty actual ' -test_expect_success 'submodule contains untracked and modified content (all ignored)' ' +test_expect_success 'submodule contains untracked and modifed content (all ignored)' ' echo new > sm1/foo6 && git diff-index -p --ignore-submodules --submodule=log HEAD >actual && test_must_be_empty actual ' -test_expect_success 'submodule contains modified content' ' +test_expect_success 'submodule contains modifed content' ' rm -f sm1/new-file && git diff-index -p --submodule=log HEAD >actual && cat >expected <<-EOF && @@ -369,7 +369,7 @@ test_expect_success 'modified submodule contains untracked content (all ignored) test_must_be_empty actual ' -test_expect_success 'modified submodule contains untracked and modified content' ' +test_expect_success 'modified submodule contains untracked and modifed content' ' echo modification >> sm1/foo6 && git diff-index -p --submodule=log HEAD >actual && cat >expected <<-EOF && @@ -381,7 +381,7 @@ test_expect_success 'modified submodule contains untracked and modified content' test_cmp expected actual ' -test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' ' +test_expect_success 'modified submodule contains untracked and modifed content (untracked ignored)' ' echo modification >> sm1/foo6 && git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual && cat >expected <<-EOF && @@ -392,7 +392,7 @@ test_expect_success 'modified submodule contains untracked and modified content test_cmp expected actual ' -test_expect_success 'modified submodule contains untracked and modified content (dirty ignored)' ' +test_expect_success 'modified submodule contains untracked and modifed content (dirty ignored)' ' echo modification >> sm1/foo6 && git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual && cat >expected <<-EOF && @@ -402,13 +402,13 @@ test_expect_success 'modified submodule contains untracked and modified content test_cmp expected actual ' -test_expect_success 'modified submodule contains untracked and modified content (all ignored)' ' +test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' ' echo modification >> sm1/foo6 && git diff-index -p --ignore-submodules --submodule=log HEAD >actual && test_must_be_empty actual ' -test_expect_success 'modified submodule contains modified content' ' +test_expect_success 'modified submodule contains modifed content' ' rm -f sm1/new-file && git diff-index -p --submodule=log HEAD >actual && cat >expected <<-EOF && diff --git a/third_party/git/t/t4044-diff-index-unique-abbrev.sh b/third_party/git/t/t4044-diff-index-unique-abbrev.sh index 4701796d10..647905e01f 100755 --- a/third_party/git/t/t4044-diff-index-unique-abbrev.sh +++ b/third_party/git/t/t4044-diff-index-unique-abbrev.sh @@ -3,48 +3,34 @@ test_description='test unique sha1 abbreviation on "index from..to" line' . ./test-lib.sh -test_expect_success 'setup' ' - test_oid_cache <<-EOF && - val1 sha1:4827 - val1 sha256:5664 - - val2 sha1:11742 - val2 sha256:10625 - - hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1 - hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350 - - hasht1 sha1:51d27384 - hasht1 sha256:ae31dfff - - hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47 - hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5 - - hasht2 sha1:51d2738e - hasht2 sha256:ae31dffa - EOF - - cat >expect_initial <<-EOF && - 100644 blob $(test_oid hash1) foo - EOF +if ! test_have_prereq SHA1 +then + skip_all='not using SHA-1 for objects' + test_done +fi + +cat >expect_initial <<EOF +100644 blob 51d2738463ea4ca66f8691c91e33ce64b7d41bb1 foo +EOF - cat >expect_update <<-EOF && - 100644 blob $(test_oid hash2) foo - EOF +cat >expect_update <<EOF +100644 blob 51d2738efb4ad8a1e40bed839ab8e116f0a15e47 foo +EOF - echo "$(test_oid val1)" > foo && +test_expect_success 'setup' ' + echo 4827 > foo && git add foo && git commit -m "initial" && git cat-file -p HEAD: > actual && test_cmp expect_initial actual && - echo "$(test_oid val2)" > foo && + echo 11742 > foo && git commit -a -m "update" && git cat-file -p HEAD: > actual && test_cmp expect_update actual ' cat >expect <<EOF -index $(test_oid hasht1)..$(test_oid hasht2) 100644 +index 51d27384..51d2738e 100644 EOF test_expect_success 'diff does not produce ambiguous index line' ' diff --git a/third_party/git/t/t4045-diff-relative.sh b/third_party/git/t/t4045-diff-relative.sh index 258808708e..36f8ed8a81 100755 --- a/third_party/git/t/t4045-diff-relative.sh +++ b/third_party/git/t/t4045-diff-relative.sh @@ -70,7 +70,7 @@ check_raw () { expect=$1 shift cat >expected <<-EOF - :000000 100644 $ZERO_OID $blob A $expect + :000000 100644 0000000000000000000000000000000000000000 $blob A $expect EOF test_expect_success "--raw $*" " git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual && diff --git a/third_party/git/t/t4048-diff-combined-binary.sh b/third_party/git/t/t4048-diff-combined-binary.sh index 7f9ad9fa3d..87a8949500 100755 --- a/third_party/git/t/t4048-diff-combined-binary.sh +++ b/third_party/git/t/t4048-diff-combined-binary.sh @@ -9,27 +9,24 @@ test_expect_success 'setup binary merge conflict' ' git commit -m one && echo twoQ2 | q_to_nul >binary && git commit -a -m two && - two=$(git rev-parse --short HEAD:binary) && git checkout -b branch-binary HEAD^ && echo threeQ3 | q_to_nul >binary && git commit -a -m three && - three=$(git rev-parse --short HEAD:binary) && test_must_fail git merge master && echo resolvedQhooray | q_to_nul >binary && - git commit -a -m resolved && - res=$(git rev-parse --short HEAD:binary) + git commit -a -m resolved ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --git a/binary b/binary -index $three..$res 100644 +index 7ea6ded..9563691 100644 Binary files a/binary and b/binary differ resolved diff --git a/binary b/binary -index $two..$res 100644 +index 6197570..9563691 100644 Binary files a/binary and b/binary differ EOF test_expect_success 'diff -m indicates binary-ness' ' @@ -37,11 +34,11 @@ test_expect_success 'diff -m indicates binary-ness' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --combined binary -index $three,$two..$res +index 7ea6ded,6197570..9563691 Binary files differ EOF test_expect_success 'diff -c indicates binary-ness' ' @@ -49,11 +46,11 @@ test_expect_success 'diff -c indicates binary-ness' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --cc binary -index $three,$two..$res +index 7ea6ded,6197570..9563691 Binary files differ EOF test_expect_success 'diff --cc indicates binary-ness' ' @@ -65,26 +62,23 @@ test_expect_success 'setup non-binary with binary attribute' ' git checkout master && test_commit one text && test_commit two text && - two=$(git rev-parse --short HEAD:text) && git checkout -b branch-text HEAD^ && test_commit three text && - three=$(git rev-parse --short HEAD:text) && test_must_fail git merge master && test_commit resolved text && - res=$(git rev-parse --short HEAD:text) && echo text -diff >.gitattributes ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --git a/text b/text -index $three..$res 100644 +index 2bdf67a..2ab19ae 100644 Binary files a/text and b/text differ resolved diff --git a/text b/text -index $two..$res 100644 +index f719efd..2ab19ae 100644 Binary files a/text and b/text differ EOF test_expect_success 'diff -m respects binary attribute' ' @@ -92,11 +86,11 @@ test_expect_success 'diff -m respects binary attribute' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --combined text -index $three,$two..$res +index 2bdf67a,f719efd..2ab19ae Binary files differ EOF test_expect_success 'diff -c respects binary attribute' ' @@ -104,11 +98,11 @@ test_expect_success 'diff -c respects binary attribute' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --cc text -index $three,$two..$res +index 2bdf67a,f719efd..2ab19ae Binary files differ EOF test_expect_success 'diff --cc respects binary attribute' ' @@ -121,11 +115,11 @@ test_expect_success 'setup textconv attribute' ' git config diff.upcase.textconv "tr a-z A-Z <" ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --git a/text b/text -index $three..$res 100644 +index 2bdf67a..2ab19ae 100644 --- a/text +++ b/text @@ -1 +1 @@ @@ -134,7 +128,7 @@ index $three..$res 100644 resolved diff --git a/text b/text -index $two..$res 100644 +index f719efd..2ab19ae 100644 --- a/text +++ b/text @@ -1 +1 @@ @@ -146,11 +140,11 @@ test_expect_success 'diff -m respects textconv attribute' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --combined text -index $three,$two..$res +index 2bdf67a,f719efd..2ab19ae --- a/text +++ b/text @@@ -1,1 -1,1 +1,1 @@@ @@ -163,11 +157,11 @@ test_expect_success 'diff -c respects textconv attribute' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' resolved diff --cc text -index $three,$two..$res +index 2bdf67a,f719efd..2ab19ae --- a/text +++ b/text @@@ -1,1 -1,1 +1,1 @@@ @@ -180,9 +174,9 @@ test_expect_success 'diff --cc respects textconv attribute' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' diff --combined text -index $three,$two..$res +index 2bdf67a,f719efd..2ab19ae --- a/text +++ b/text @@@ -1,1 -1,1 +1,1 @@@ @@ -196,9 +190,9 @@ test_expect_success 'diff-tree plumbing does not respect textconv' ' test_cmp expect actual ' -cat >expect <<EOF +cat >expect <<'EOF' diff --cc text -index $three,$two..0000000 +index 2bdf67a,f719efd..0000000 --- a/text +++ b/text @@@ -1,1 -1,1 +1,5 @@@ diff --git a/third_party/git/t/t4054-diff-bogus-tree.sh b/third_party/git/t/t4054-diff-bogus-tree.sh index 8c95f152b2..fcae82fffa 100755 --- a/third_party/git/t/t4054-diff-bogus-tree.sh +++ b/third_party/git/t/t4054-diff-bogus-tree.sh @@ -4,9 +4,8 @@ test_description='test diff with a bogus tree containing the null sha1' . ./test-lib.sh test_expect_success 'create bogus tree' ' - name=$(echo $ZERO_OID | sed -e "s/00/Q/g") && bogus_tree=$( - printf "100644 fooQ$name" | + printf "100644 fooQQQQQQQQQQQQQQQQQQQQQ" | q_to_nul | git hash-object -w --stdin -t tree ) diff --git a/third_party/git/t/t4057-diff-combined-paths.sh b/third_party/git/t/t4057-diff-combined-paths.sh index 4f4b541658..dff36b77ec 100755 --- a/third_party/git/t/t4057-diff-combined-paths.sh +++ b/third_party/git/t/t4057-diff-combined-paths.sh @@ -33,7 +33,7 @@ test_expect_success 'trivial merge - combine-diff empty' ' ' -test_expect_success 'only one truly conflicting path' ' +test_expect_success 'only one trully conflicting path' ' git checkout side && for i in $(test_seq 2 9) do diff --git a/third_party/git/t/t4060-diff-submodule-option-diff-format.sh b/third_party/git/t/t4060-diff-submodule-option-diff-format.sh index fc8229c726..9dcb69df5c 100755 --- a/third_party/git/t/t4060-diff-submodule-option-diff-format.sh +++ b/third_party/git/t/t4060-diff-submodule-option-diff-format.sh @@ -42,17 +42,6 @@ commit_file () { git commit "$@" -m "Commit $*" >/dev/null } -diff_cmp () { - for i in "$1" "$2" - do - sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \ - -e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \ - "$i" >"$i.compare" || return 1 - done && - test_cmp "$1.compare" "$2.compare" && - rm -f "$1.compare" "$2.compare" -} - test_expect_success 'setup repository' ' test_create_repo sm1 && add_file . foo && @@ -80,7 +69,7 @@ test_expect_success 'added submodule' ' @@ -0,0 +1 @@ +foo2 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'added submodule, set diff.submodule' ' @@ -104,7 +93,7 @@ test_expect_success 'added submodule, set diff.submodule' ' @@ -0,0 +1 @@ +foo2 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success '--submodule=short overrides diff.submodule' ' @@ -120,7 +109,7 @@ test_expect_success '--submodule=short overrides diff.submodule' ' @@ -0,0 +1 @@ +Subproject commit $fullhead1 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'diff.submodule does not affect plumbing' ' @@ -135,7 +124,7 @@ test_expect_success 'diff.submodule does not affect plumbing' ' @@ -0,0 +1 @@ +Subproject commit $fullhead1 EOF - diff_cmp expected actual + test_cmp expected actual ' commit_file sm1 && @@ -153,7 +142,7 @@ test_expect_success 'modified submodule(forward)' ' @@ -0,0 +1 @@ +foo3 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule(forward)' ' @@ -168,7 +157,7 @@ test_expect_success 'modified submodule(forward)' ' @@ -0,0 +1 @@ +foo3 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule(forward) --submodule' ' @@ -177,7 +166,7 @@ test_expect_success 'modified submodule(forward) --submodule' ' Submodule sm1 $head1..$head2: > Add foo3 ($added foo3) EOF - diff_cmp expected actual + test_cmp expected actual ' fullhead2=$(cd sm1; git rev-parse --verify HEAD) @@ -192,7 +181,7 @@ test_expect_success 'modified submodule(forward) --submodule=short' ' -Subproject commit $fullhead1 +Subproject commit $fullhead2 EOF - diff_cmp expected actual + test_cmp expected actual ' commit_file sm1 && @@ -221,7 +210,7 @@ test_expect_success 'modified submodule(backward)' ' @@ -1 +0,0 @@ -foo3 EOF - diff_cmp expected actual + test_cmp expected actual ' head4=$(add_file sm1 foo4 foo5) @@ -258,7 +247,7 @@ test_expect_success 'modified submodule(backward and forward)' ' @@ -0,0 +1 @@ +foo5 EOF - diff_cmp expected actual + test_cmp expected actual ' commit_file sm1 && @@ -302,7 +291,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' ' @@ -0,0 +1 @@ +sm1 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'typechanged submodule(submodule->blob)' ' @@ -338,7 +327,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' ' @@ -0,0 +1 @@ +foo5 EOF - diff_cmp expected actual + test_cmp expected actual ' rm -rf sm1 && @@ -355,7 +344,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' ' @@ -0,0 +1 @@ +sm1 EOF - diff_cmp expected actual + test_cmp expected actual ' rm -f sm1 && @@ -367,7 +356,7 @@ test_expect_success 'nonexistent commit' ' cat >expected <<-EOF && Submodule sm1 $head4...$head6 (commits not present) EOF - diff_cmp expected actual + test_cmp expected actual ' commit_file @@ -397,12 +386,11 @@ test_expect_success 'typechanged submodule(blob->submodule)' ' @@ -0,0 +1 @@ +foo7 EOF - diff_cmp expected actual + test_cmp expected actual ' commit_file sm1 && test_expect_success 'submodule is up to date' ' - head7=$(git -C sm1 rev-parse --short --verify HEAD) && git diff-index -p --submodule=diff HEAD >actual && test_must_be_empty actual ' @@ -413,7 +401,7 @@ test_expect_success 'submodule contains untracked content' ' cat >expected <<-EOF && Submodule sm1 contains untracked content EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'submodule contains untracked content (untracked ignored)' ' @@ -445,7 +433,7 @@ test_expect_success 'submodule contains untracked and modified content' ' -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' # NOT OK @@ -462,7 +450,7 @@ test_expect_success 'submodule contains untracked and modified content (untracke -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'submodule contains untracked and modified content (dirty ignored)' ' @@ -490,7 +478,7 @@ test_expect_success 'submodule contains modified content' ' -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' (cd sm1; git commit -mchange foo6 >/dev/null) && @@ -498,7 +486,7 @@ head8=$(cd sm1; git rev-parse --short --verify HEAD) && test_expect_success 'submodule is modified' ' git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -507,7 +495,7 @@ test_expect_success 'submodule is modified' ' -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule contains untracked content' ' @@ -515,7 +503,7 @@ test_expect_success 'modified submodule contains untracked content' ' git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -524,13 +512,13 @@ test_expect_success 'modified submodule contains untracked content' ' -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule contains untracked content (untracked ignored)' ' git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual && cat >expected <<-EOF && - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..$head8: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -539,13 +527,13 @@ test_expect_success 'modified submodule contains untracked content (untracked ig -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule contains untracked content (dirty ignored)' ' git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual && cat >expected <<-EOF && - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..cfce562: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -554,7 +542,7 @@ test_expect_success 'modified submodule contains untracked content (dirty ignore -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule contains untracked content (all ignored)' ' @@ -568,7 +556,7 @@ test_expect_success 'modified submodule contains untracked and modified content' cat >expected <<-EOF && Submodule sm1 contains untracked content Submodule sm1 contains modified content - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..cfce562: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..dfda541 100644 --- a/sm1/foo6 @@ -578,7 +566,7 @@ test_expect_success 'modified submodule contains untracked and modified content' +new +modification EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' ' @@ -586,7 +574,7 @@ test_expect_success 'modified submodule contains untracked and modified content git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains modified content - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..cfce562: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..e20e2d9 100644 --- a/sm1/foo6 @@ -597,14 +585,14 @@ test_expect_success 'modified submodule contains untracked and modified content +modification +modification EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule contains untracked and modified content (dirty ignored)' ' echo modification >> sm1/foo6 && git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual && cat >expected <<-EOF && - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..cfce562: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..3e75765 100644 --- a/sm1/foo6 @@ -613,7 +601,7 @@ test_expect_success 'modified submodule contains untracked and modified content -foo6 +new EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'modified submodule contains untracked and modified content (all ignored)' ' @@ -628,7 +616,7 @@ test_expect_success 'modified submodule contains modified content' ' git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains modified content - Submodule sm1 $head7..$head8: + Submodule sm1 17243c9..cfce562: diff --git a/sm1/foo6 b/sm1/foo6 index 462398b..ac466ca 100644 --- a/sm1/foo6 @@ -641,29 +629,29 @@ test_expect_success 'modified submodule contains modified content' ' +modification +modification EOF - diff_cmp expected actual + test_cmp expected actual ' rm -rf sm1 test_expect_success 'deleted submodule' ' git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && - Submodule sm1 $head7...0000000 (submodule deleted) + Submodule sm1 17243c9...0000000 (submodule deleted) EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'create second submodule' ' test_create_repo sm2 && - head9=$(add_file sm2 foo8 foo9) && + head7=$(add_file sm2 foo8 foo9) && git add sm2 ' test_expect_success 'multiple submodules' ' git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && - Submodule sm1 $head7...0000000 (submodule deleted) - Submodule sm2 0000000...$head9 (new submodule) + Submodule sm1 17243c9...0000000 (submodule deleted) + Submodule sm2 0000000...a5a65c9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -679,13 +667,13 @@ test_expect_success 'multiple submodules' ' @@ -0,0 +1 @@ +foo9 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'path filter' ' git diff-index -p --submodule=diff HEAD sm2 >actual && cat >expected <<-EOF && - Submodule sm2 0000000...$head9 (new submodule) + Submodule sm2 0000000...a5a65c9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -701,15 +689,15 @@ test_expect_success 'path filter' ' @@ -0,0 +1 @@ +foo9 EOF - diff_cmp expected actual + test_cmp expected actual ' commit_file sm2 test_expect_success 'given commit' ' git diff-index -p --submodule=diff HEAD^ >actual && cat >expected <<-EOF && - Submodule sm1 $head7...0000000 (submodule deleted) - Submodule sm2 0000000...$head9 (new submodule) + Submodule sm1 17243c9...0000000 (submodule deleted) + Submodule sm2 0000000...a5a65c9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -725,7 +713,7 @@ test_expect_success 'given commit' ' @@ -0,0 +1 @@ +foo9 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'setup .git file for sm2' ' @@ -738,8 +726,8 @@ test_expect_success 'setup .git file for sm2' ' test_expect_success 'diff --submodule=diff with .git file' ' git diff --submodule=diff HEAD^ >actual && cat >expected <<-EOF && - Submodule sm1 $head7...0000000 (submodule deleted) - Submodule sm2 0000000...$head9 (new submodule) + Submodule sm1 17243c9...0000000 (submodule deleted) + Submodule sm2 0000000...a5a65c9 (new submodule) diff --git a/sm2/foo8 b/sm2/foo8 new file mode 100644 index 0000000..db9916b @@ -755,27 +743,25 @@ test_expect_success 'diff --submodule=diff with .git file' ' @@ -0,0 +1 @@ +foo9 EOF - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'setup nested submodule' ' git submodule add -f ./sm2 && git commit -a -m "add sm2" && git -C sm2 submodule add ../sm2 nested && - git -C sm2 commit -a -m "nested sub" && - head10=$(git -C sm2 rev-parse --short --verify HEAD) + git -C sm2 commit -a -m "nested sub" ' test_expect_success 'move nested submodule HEAD' ' echo "nested content" >sm2/nested/file && git -C sm2/nested add file && - git -C sm2/nested commit --allow-empty -m "new HEAD" && - head11=$(git -C sm2/nested rev-parse --short --verify HEAD) + git -C sm2/nested commit --allow-empty -m "new HEAD" ' test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' ' cat >expected <<-EOF && - Submodule nested $head9..$head11: + Submodule nested a5a65c9..b55928c: diff --git a/nested/file b/nested/file new file mode 100644 index 0000000..ca281f5 @@ -786,13 +772,13 @@ test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' ' EOF git -C sm2 diff --submodule=diff >actual 2>err && test_must_be_empty err && - diff_cmp expected actual + test_cmp expected actual ' test_expect_success 'diff --submodule=diff recurses into nested submodules' ' cat >expected <<-EOF && Submodule sm2 contains modified content - Submodule sm2 $head9..$head10: + Submodule sm2 a5a65c9..280969a: diff --git a/sm2/.gitmodules b/sm2/.gitmodules new file mode 100644 index 0000000..3a816b8 @@ -802,7 +788,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' ' +[submodule "nested"] + path = nested + url = ../sm2 - Submodule nested 0000000...$head11 (new submodule) + Submodule nested 0000000...b55928c (new submodule) diff --git a/sm2/nested/file b/sm2/nested/file new file mode 100644 index 0000000..ca281f5 @@ -827,7 +813,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' ' EOF git diff --submodule=diff >actual 2>err && test_must_be_empty err && - diff_cmp expected actual + test_cmp expected actual ' test_done diff --git a/third_party/git/t/t4066-diff-emit-delay.sh b/third_party/git/t/t4066-diff-emit-delay.sh index 6331f63b12..5df6b5e64e 100755 --- a/third_party/git/t/t4066-diff-emit-delay.sh +++ b/third_party/git/t/t4066-diff-emit-delay.sh @@ -18,7 +18,7 @@ test_expect_success 'set up history with a merge' ' ' test_expect_success 'log --cc -p --stat --color-moved' ' - cat >expect <<-EOF && + cat >expect <<-\EOF && commit D --- D.t | 1 + @@ -26,7 +26,7 @@ test_expect_success 'log --cc -p --stat --color-moved' ' diff --git a/D.t b/D.t new file mode 100644 - index 0000000..$(git rev-parse --short D:D.t) + index 0000000..1784810 --- /dev/null +++ b/D.t @@ -0,0 +1 @@ @@ -42,7 +42,7 @@ test_expect_success 'log --cc -p --stat --color-moved' ' diff --git a/C.t b/C.t new file mode 100644 - index 0000000..$(git rev-parse --short C:C.t) + index 0000000..3cc58df --- /dev/null +++ b/C.t @@ -0,0 +1 @@ @@ -54,7 +54,7 @@ test_expect_success 'log --cc -p --stat --color-moved' ' diff --git a/B.t b/B.t new file mode 100644 - index 0000000..$(git rev-parse --short B:B.t) + index 0000000..223b783 --- /dev/null +++ b/B.t @@ -0,0 +1 @@ @@ -66,7 +66,7 @@ test_expect_success 'log --cc -p --stat --color-moved' ' diff --git a/A.t b/A.t new file mode 100644 - index 0000000..$(git rev-parse --short A:A.t) + index 0000000..f70f10e --- /dev/null +++ b/A.t @@ -0,0 +1 @@ diff --git a/third_party/git/t/t4067-diff-partial-clone.sh b/third_party/git/t/t4067-diff-partial-clone.sh index 4831ad35e6..90c8fb2901 100755 --- a/third_party/git/t/t4067-diff-partial-clone.sh +++ b/third_party/git/t/t4067-diff-partial-clone.sh @@ -75,37 +75,6 @@ test_expect_success 'diff skips same-OID blobs' ' ! grep "want $(cat hash-b)" trace ' -test_expect_success 'when fetching missing objects, diff skips GITLINKs' ' - test_when_finished "rm -rf sub server client trace" && - - test_create_repo sub && - test_commit -C sub first && - - test_create_repo server && - echo a >server/a && - git -C server add a && - git -C server submodule add "file://$(pwd)/sub" && - git -C server commit -m x && - - test_commit -C server/sub second && - echo another-a >server/a && - git -C server add a sub && - git -C server commit -m x && - - test_config -C server uploadpack.allowfilter 1 && - test_config -C server uploadpack.allowanysha1inwant 1 && - git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client && - - echo a | git hash-object --stdin >hash-old-a && - echo another-a | git hash-object --stdin >hash-new-a && - - # Ensure that a and another-a are fetched, and check (by successful - # execution of the diff) that no invalid OIDs are sent. - GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD && - grep "want $(cat hash-old-a)" trace && - grep "want $(cat hash-new-a)" trace -' - test_expect_success 'diff with rename detection batches blobs' ' test_when_finished "rm -rf server client trace" && diff --git a/third_party/git/t/t4100/t-apply-1.patch b/third_party/git/t/t4100/t-apply-1.patch index 43394f8285..90ab54f0f5 100644 --- a/third_party/git/t/t4100/t-apply-1.patch +++ b/third_party/git/t/t4100/t-apply-1.patch @@ -75,8 +75,8 @@ diff --git a/Documentation/git.txt b/Documentation/git.txt +link:git-ssh-pull.html[git-ssh-pull]:: Pulls from a remote repository over ssh connection - Interrogators: -@@ -156,8 +156,8 @@ Interrogators: + Interogators: +@@ -156,8 +156,8 @@ Interogators: link:git-diff-helper.html[git-diff-helper]:: Generates patch format output for git-diff-* diff --git a/third_party/git/t/t4100/t-apply-3.patch b/third_party/git/t/t4100/t-apply-3.patch index cac172e779..90cdbaa5bb 100644 --- a/third_party/git/t/t4100/t-apply-3.patch +++ b/third_party/git/t/t4100/t-apply-3.patch @@ -211,7 +211,7 @@ dissimilarity index 82% - - /* If this is an exact directory match, we may have - * directory files following this path. Match on them. -- * Otherwise, we're at a patch subcomponent, and we need +- * Otherwise, we're at a pach subcomponent, and we need - * to try to match again. - */ - if (mtype == 0) diff --git a/third_party/git/t/t4100/t-apply-5.patch b/third_party/git/t/t4100/t-apply-5.patch index 57ec79d887..5f6ddc1059 100644 --- a/third_party/git/t/t4100/t-apply-5.patch +++ b/third_party/git/t/t4100/t-apply-5.patch @@ -185,8 +185,8 @@ diff a/Documentation/git.txt b/Documentation/git.txt +link:git-ssh-pull.html[git-ssh-pull]:: Pulls from a remote repository over ssh connection - Interrogators: -@@ -156,8 +156,8 @@ Interrogators: + Interogators: +@@ -156,8 +156,8 @@ Interogators: link:git-diff-helper.html[git-diff-helper]:: Generates patch format output for git-diff-* diff --git a/third_party/git/t/t4100/t-apply-7.patch b/third_party/git/t/t4100/t-apply-7.patch index fa24305108..07c6589e74 100644 --- a/third_party/git/t/t4100/t-apply-7.patch +++ b/third_party/git/t/t4100/t-apply-7.patch @@ -335,7 +335,7 @@ diff a/ls-tree.c b/ls-tree.c - /* If this is an exact directory match, we may have - * directory files following this path. Match on them. -- * Otherwise, we're at a patch subcomponent, and we need +- * Otherwise, we're at a pach subcomponent, and we need - * to try to match again. + if (e->directory) { + /* If this is a directory, we have the following cases: diff --git a/third_party/git/t/t4108-apply-threeway.sh b/third_party/git/t/t4108-apply-threeway.sh index d7349ced6b..fa5d4efb89 100755 --- a/third_party/git/t/t4108-apply-threeway.sh +++ b/third_party/git/t/t4108-apply-threeway.sh @@ -4,17 +4,23 @@ test_description='git apply --3way' . ./test-lib.sh -print_sanitized_conflicted_diff () { - git diff HEAD >diff.raw && +create_file () { + for i + do + echo "$i" + done +} + +sanitize_conflicted_diff () { sed -e ' /^index /d - s/^\(+[<>|][<>|][<>|][<>|]*\) .*/\1/ - ' diff.raw + s/^\(+[<>][<>][<>][<>]*\) .*/\1/ + ' } test_expect_success setup ' test_tick && - test_write_lines 1 2 3 4 5 6 7 >one && + create_file >one 1 2 3 4 5 6 7 && cat one >two && git add one two && git commit -m initial && @@ -22,13 +28,13 @@ test_expect_success setup ' git branch side && test_tick && - test_write_lines 1 two 3 4 5 six 7 >one && - test_write_lines 1 two 3 4 5 6 7 >two && + create_file >one 1 two 3 4 5 six 7 && + create_file >two 1 two 3 4 5 6 7 && git commit -a -m master && git checkout side && - test_write_lines 1 2 3 4 five 6 7 >one && - test_write_lines 1 2 3 4 five 6 7 >two && + create_file >one 1 2 3 4 five 6 7 && + create_file >two 1 2 3 4 five 6 7 && git commit -a -m side && git checkout master @@ -46,7 +52,7 @@ test_expect_success 'apply without --3way' ' git diff-index --exit-code --cached HEAD ' -test_apply_with_3way () { +test_expect_success 'apply with --3way' ' # Merging side should be similar to applying this patch git diff ...side >P.diff && @@ -55,31 +61,22 @@ test_apply_with_3way () { git checkout master^0 && test_must_fail git merge --no-commit side && git ls-files -s >expect.ls && - print_sanitized_conflicted_diff >expect.diff && + git diff HEAD | sanitize_conflicted_diff >expect.diff && # should fail to apply git reset --hard && git checkout master^0 && test_must_fail git apply --index --3way P.diff && git ls-files -s >actual.ls && - print_sanitized_conflicted_diff >actual.diff && + git diff HEAD | sanitize_conflicted_diff >actual.diff && # The result should resemble the corresponding merge test_cmp expect.ls actual.ls && test_cmp expect.diff actual.diff -} - -test_expect_success 'apply with --3way' ' - test_apply_with_3way -' - -test_expect_success 'apply with --3way with merge.conflictStyle = diff3' ' - test_config merge.conflictStyle diff3 && - test_apply_with_3way ' test_expect_success 'apply with --3way with rerere enabled' ' - test_config rerere.enabled true && + git config rerere.enabled true && # Merging side should be similar to applying this patch git diff ...side >P.diff && @@ -90,7 +87,7 @@ test_expect_success 'apply with --3way with rerere enabled' ' test_must_fail git merge --no-commit side && # Manually resolve and record the resolution - test_write_lines 1 two 3 4 five six 7 >one && + create_file 1 two 3 4 five six 7 >one && git rerere && cat one >expect && @@ -107,14 +104,14 @@ test_expect_success 'apply -3 with add/add conflict setup' ' git reset --hard && git checkout -b adder && - test_write_lines 1 2 3 4 5 6 7 >three && - test_write_lines 1 2 3 4 5 6 7 >four && + create_file 1 2 3 4 5 6 7 >three && + create_file 1 2 3 4 5 6 7 >four && git add three four && git commit -m "add three and four" && git checkout -b another adder^ && - test_write_lines 1 2 3 4 5 6 7 >three && - test_write_lines 1 2 3 four 5 6 7 >four && + create_file 1 2 3 4 5 6 7 >three && + create_file 1 2 3 four 5 6 7 >four && git add three four && git commit -m "add three and four" && @@ -124,7 +121,7 @@ test_expect_success 'apply -3 with add/add conflict setup' ' git checkout adder^0 && test_must_fail git merge --no-commit another && git ls-files -s >expect.ls && - print_sanitized_conflicted_diff >expect.diff + git diff HEAD | sanitize_conflicted_diff >expect.diff ' test_expect_success 'apply -3 with add/add conflict' ' @@ -134,7 +131,7 @@ test_expect_success 'apply -3 with add/add conflict' ' test_must_fail git apply --index --3way P.diff && # ... and leave conflicts in the index and in the working tree git ls-files -s >actual.ls && - print_sanitized_conflicted_diff >actual.diff && + git diff HEAD | sanitize_conflicted_diff >actual.diff && # The result should resemble the corresponding merge test_cmp expect.ls actual.ls && diff --git a/third_party/git/t/t4117-apply-reject.sh b/third_party/git/t/t4117-apply-reject.sh index 0ee93fe845..f7de6f077a 100755 --- a/third_party/git/t/t4117-apply-reject.sh +++ b/third_party/git/t/t4117-apply-reject.sh @@ -74,7 +74,7 @@ test_expect_success 'apply with --reject should fail but update the file' ' test_must_fail git apply --reject patch.1 && test_cmp expected file1 && - test_path_is_file file1.rej && + cat file1.rej && test_path_is_missing file2.rej ' @@ -87,7 +87,7 @@ test_expect_success 'apply with --reject should fail but update the file' ' test_path_is_missing file1 && test_cmp expected file2 && - test_path_is_file file2.rej && + cat file2.rej && test_path_is_missing file1.rej ' @@ -101,7 +101,7 @@ test_expect_success 'the same test with --verbose' ' test_path_is_missing file1 && test_cmp expected file2 && - test_path_is_file file2.rej && + cat file2.rej && test_path_is_missing file1.rej ' diff --git a/third_party/git/t/t4124-apply-ws-rule.sh b/third_party/git/t/t4124-apply-ws-rule.sh index 971a5a7512..ff51e9e789 100755 --- a/third_party/git/t/t4124-apply-ws-rule.sh +++ b/third_party/git/t/t4124-apply-ws-rule.sh @@ -35,15 +35,9 @@ prepare_test_file () { } apply_patch () { - cmd_prefix= && - if test "x$1" = 'x!' - then - cmd_prefix=test_must_fail && - shift - fi && >target && sed -e "s|\([ab]\)/file|\1/target|" <patch | - $cmd_prefix git apply "$@" + git apply "$@" } test_fix () { @@ -105,7 +99,7 @@ test_expect_success 'whitespace=warn, default rule' ' test_expect_success 'whitespace=error-all, default rule' ' - apply_patch ! --whitespace=error-all && + test_must_fail apply_patch --whitespace=error-all && test_must_be_empty target ' diff --git a/third_party/git/t/t4134-apply-submodule.sh b/third_party/git/t/t4134-apply-submodule.sh index 99ed4cc546..0043930ca6 100755 --- a/third_party/git/t/t4134-apply-submodule.sh +++ b/third_party/git/t/t4134-apply-submodule.sh @@ -8,7 +8,6 @@ test_description='git apply submodule tests' . ./test-lib.sh test_expect_success setup ' - test_oid_init && cat > create-sm.patch <<EOF && diff --git a/dir/sm b/dir/sm new file mode 160000 @@ -16,7 +15,7 @@ index 0000000..0123456 --- /dev/null +++ b/dir/sm @@ -0,0 +1 @@ -+Subproject commit $(test_oid numeric) ++Subproject commit 0123456789abcdef0123456789abcdef01234567 EOF cat > remove-sm.patch <<EOF diff --git a/dir/sm b/dir/sm @@ -25,7 +24,7 @@ index 0123456..0000000 --- a/dir/sm +++ /dev/null @@ -1 +0,0 @@ --Subproject commit $(test_oid numeric) +-Subproject commit 0123456789abcdef0123456789abcdef01234567 EOF ' diff --git a/third_party/git/t/t4138-apply-ws-expansion.sh b/third_party/git/t/t4138-apply-ws-expansion.sh index b19faeb67a..3b636a63a3 100755 --- a/third_party/git/t/t4138-apply-ws-expansion.sh +++ b/third_party/git/t/t4138-apply-ws-expansion.sh @@ -17,8 +17,8 @@ test_expect_success setup ' printf "\t%s\n" 1 2 3 >after && printf "%64s\n" a b c >>after && printf "\t%s\n" 4 5 6 >>after && - test_expect_code 1 git diff --no-index before after >patch1.patch.raw && - sed -e "s/before/test-1/" -e "s/after/test-1/" patch1.patch.raw >patch1.patch && + git diff --no-index before after | + sed -e "s/before/test-1/" -e "s/after/test-1/" >patch1.patch && printf "%64s\n" 1 2 3 4 5 6 >test-1 && printf "%64s\n" 1 2 3 a b c 4 5 6 >expect-1 && @@ -33,8 +33,8 @@ test_expect_success setup ' x=$(( $x + 1 )) done && printf "\t%s\n" d e f >>after && - test_expect_code 1 git diff --no-index before after >patch2.patch.raw && - sed -e "s/before/test-2/" -e "s/after/test-2/" patch2.patch.raw >patch2.patch && + git diff --no-index before after | + sed -e "s/before/test-2/" -e "s/after/test-2/" >patch2.patch && printf "%64s\n" a b c d e f >test-2 && printf "%64s\n" a b c >expect-2 && x=1 && @@ -56,8 +56,8 @@ test_expect_success setup ' x=$(( $x + 1 )) done && printf "\t%s\n" d e f >>after && - test_expect_code 1 git diff --no-index before after >patch3.patch.raw && - sed -e "s/before/test-3/" -e "s/after/test-3/" patch3.patch.raw >patch3.patch && + git diff --no-index before after | + sed -e "s/before/test-3/" -e "s/after/test-3/" >patch3.patch && printf "%64s\n" a b c d e f >test-3 && printf "%64s\n" a b c >expect-3 && x=0 && @@ -84,8 +84,8 @@ test_expect_success setup ' printf "\t%02d\n" $x >>after x=$(( $x + 1 )) done && - test_expect_code 1 git diff --no-index before after >patch4.patch.raw && - sed -e "s/before/test-4/" -e "s/after/test-4/" patch4.patch.raw >patch4.patch && + git diff --no-index before after | + sed -e "s/before/test-4/" -e "s/after/test-4/" >patch4.patch && >test-4 && x=0 && while test $x -lt 50 diff --git a/third_party/git/t/t4150-am.sh b/third_party/git/t/t4150-am.sh index cb45271457..3f7f750cc8 100755 --- a/third_party/git/t/t4150-am.sh +++ b/third_party/git/t/t4150-am.sh @@ -666,26 +666,6 @@ test_expect_success 'am --show-current-patch' ' test_cmp .git/rebase-apply/0001 actual.patch ' -test_expect_success 'am --show-current-patch=raw' ' - git am --show-current-patch=raw >actual.patch && - test_cmp .git/rebase-apply/0001 actual.patch -' - -test_expect_success 'am --show-current-patch=diff' ' - git am --show-current-patch=diff >actual.patch && - test_cmp .git/rebase-apply/patch actual.patch -' - -test_expect_success 'am accepts repeated --show-current-patch' ' - git am --show-current-patch --show-current-patch=raw >actual.patch && - test_cmp .git/rebase-apply/0001 actual.patch -' - -test_expect_success 'am detects incompatible --show-current-patch' ' - test_must_fail git am --show-current-patch=raw --show-current-patch=diff && - test_must_fail git am --show-current-patch --show-current-patch=diff -' - test_expect_success 'am --skip works' ' echo goodbye >expected && git am --skip && @@ -1081,56 +1061,4 @@ test_expect_success 'am --quit keeps HEAD where it is' ' test_cmp expected actual ' -test_expect_success 'am and .gitattibutes' ' - test_create_repo attributes && - ( - cd attributes && - test_commit init && - git config filter.test.clean "sed -e '\''s/smudged/clean/g'\''" && - git config filter.test.smudge "sed -e '\''s/clean/smudged/g'\''" && - - test_commit second && - git checkout -b test HEAD^ && - - echo "*.txt filter=test conflict-marker-size=10" >.gitattributes && - git add .gitattributes && - test_commit third && - - echo "This text is smudged." >a.txt && - git add a.txt && - test_commit fourth && - - git checkout -b removal HEAD^ && - git rm .gitattributes && - git add -u && - test_commit fifth && - git cherry-pick test && - - git checkout -b conflict third && - echo "This text is different." >a.txt && - git add a.txt && - test_commit sixth && - - git checkout test && - git format-patch --stdout master..HEAD >patches && - git reset --hard master && - git am patches && - grep "smudged" a.txt && - - git checkout removal && - git reset --hard && - git format-patch --stdout master..HEAD >patches && - git reset --hard master && - git am patches && - grep "clean" a.txt && - - git checkout conflict && - git reset --hard && - git format-patch --stdout master..HEAD >patches && - git reset --hard fourth && - test_must_fail git am -3 patches && - grep "<<<<<<<<<<" a.txt - ) -' - test_done diff --git a/third_party/git/t/t4200-rerere.sh b/third_party/git/t/t4200-rerere.sh index 831d424c47..55b7750ade 100755 --- a/third_party/git/t/t4200-rerere.sh +++ b/third_party/git/t/t4200-rerere.sh @@ -25,7 +25,6 @@ test_description='git rerere . ./test-lib.sh test_expect_success 'setup' ' - test_oid_init && cat >a1 <<-\EOF && Some title ========== @@ -211,7 +210,7 @@ test_expect_success 'set up for garbage collection tests' ' echo Hello >$rr/preimage && echo World >$rr/postimage && - sha2=$(test_oid deadbeef) && + sha2=4000000000000000000000000000000000000000 && rr2=.git/rr-cache/$sha2 && mkdir $rr2 && echo Hello >$rr2/preimage && diff --git a/third_party/git/t/t4202-log.sh b/third_party/git/t/t4202-log.sh index 0f766ba65f..c20209324c 100755 --- a/third_party/git/t/t4202-log.sh +++ b/third_party/git/t/t4202-log.sh @@ -5,11 +5,6 @@ test_description='git log' . ./test-lib.sh . "$TEST_DIRECTORY/lib-gpg.sh" . "$TEST_DIRECTORY/lib-terminal.sh" -. "$TEST_DIRECTORY/lib-log-graph.sh" - -test_cmp_graph () { - lib_test_cmp_graph --format=%s "$@" -} test_expect_success setup ' @@ -92,12 +87,12 @@ test_expect_success 'format %w(,1,2)' ' ' cat > expect << EOF -$(git rev-parse --short :/sixth ) sixth -$(git rev-parse --short :/fifth ) fifth -$(git rev-parse --short :/fourth ) fourth -$(git rev-parse --short :/third ) third -$(git rev-parse --short :/second ) second -$(git rev-parse --short :/initial) initial +804a787 sixth +394ef78 fifth +5d31159 fourth +2fbe8c0 third +f7dab8e second +3a2fdcb initial EOF test_expect_success 'oneline' ' @@ -178,45 +173,43 @@ test_expect_success 'git config log.follow is overridden by --no-follow' ' verbose test "$actual" = "$expect" ' -# Note that these commits are intentionally listed out of order. -last_three="$(git rev-parse :/fourth :/sixth :/fifth)" cat > expect << EOF -$(git rev-parse --short :/sixth ) sixth -$(git rev-parse --short :/fifth ) fifth -$(git rev-parse --short :/fourth) fourth +804a787 sixth +394ef78 fifth +5d31159 fourth EOF test_expect_success 'git log --no-walk <commits> sorts by commit time' ' - git log --no-walk --oneline $last_three > actual && + git log --no-walk --oneline 5d31159 804a787 394ef78 > actual && test_cmp expect actual ' test_expect_success 'git log --no-walk=sorted <commits> sorts by commit time' ' - git log --no-walk=sorted --oneline $last_three > actual && + git log --no-walk=sorted --oneline 5d31159 804a787 394ef78 > actual && test_cmp expect actual ' cat > expect << EOF -=== $(git rev-parse --short :/sixth ) sixth -=== $(git rev-parse --short :/fifth ) fifth -=== $(git rev-parse --short :/fourth) fourth +=== 804a787 sixth +=== 394ef78 fifth +=== 5d31159 fourth EOF test_expect_success 'git log --line-prefix="=== " --no-walk <commits> sorts by commit time' ' - git log --line-prefix="=== " --no-walk --oneline $last_three > actual && + git log --line-prefix="=== " --no-walk --oneline 5d31159 804a787 394ef78 > actual && test_cmp expect actual ' cat > expect << EOF -$(git rev-parse --short :/fourth) fourth -$(git rev-parse --short :/sixth ) sixth -$(git rev-parse --short :/fifth ) fifth +5d31159 fourth +804a787 sixth +394ef78 fifth EOF test_expect_success 'git log --no-walk=unsorted <commits> leaves list of commits as given' ' - git log --no-walk=unsorted --oneline $last_three > actual && + git log --no-walk=unsorted --oneline 5d31159 804a787 394ef78 > actual && test_cmp expect actual ' test_expect_success 'git show <commits> leaves list of commits as given' ' - git show --oneline -s $last_three > actual && + git show --oneline -s 5d31159 804a787 394ef78 > actual && test_cmp expect actual ' @@ -457,7 +450,8 @@ cat > expect <<EOF EOF test_expect_success 'simple log --graph' ' - test_cmp_graph + git log --graph --pretty=tformat:%s >actual && + test_cmp expect actual ' cat > expect <<EOF @@ -471,7 +465,8 @@ cat > expect <<EOF EOF test_expect_success 'simple log --graph --line-prefix="123 "' ' - test_cmp_graph --line-prefix="123 " + git log --graph --line-prefix="123 " --pretty=tformat:%s >actual && + test_cmp expect actual ' test_expect_success 'set up merge history' ' @@ -498,7 +493,9 @@ cat > expect <<\EOF EOF test_expect_success 'log --graph with merge' ' - test_cmp_graph --date-order + git log --graph --date-order --pretty=tformat:%s | + sed "s/ *\$//" >actual && + test_cmp expect actual ' cat > expect <<\EOF @@ -517,7 +514,9 @@ cat > expect <<\EOF EOF test_expect_success 'log --graph --line-prefix="| | | " with merge' ' - test_cmp_graph --line-prefix="| | | " --date-order + git log --line-prefix="| | | " --graph --date-order --pretty=tformat:%s | + sed "s/ *\$//" >actual && + test_cmp expect actual ' cat > expect.colors <<\EOF @@ -537,7 +536,9 @@ EOF test_expect_success 'log --graph with merge with log.graphColors' ' test_config log.graphColors " blue,invalid-color, cyan, red , " && - lib_test_cmp_colored_graph --date-order --format=%s + git log --color=always --graph --date-order --pretty=tformat:%s | + test_decode_color | sed "s/ *\$//" >actual && + test_cmp expect.colors actual ' test_expect_success 'log --raw --graph -m with merge' ' @@ -666,14 +667,16 @@ cat > expect <<\EOF * | | fifth * | | fourth |/ / -* / third +* | third |/ * second * initial EOF test_expect_success 'log --graph with merge' ' - test_cmp_graph --date-order + git log --graph --date-order --pretty=tformat:%s | + sed "s/ *\$//" >actual && + test_cmp expect actual ' test_expect_success 'log.decorate configuration' ' @@ -834,21 +837,6 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' ' test_cmp expect.decorate actual ' -test_expect_success 'decorate-refs-exclude and simplify-by-decoration' ' - cat >expect.decorate <<-\EOF && - Merge-tag-reach (HEAD -> master) - reach (tag: reach, reach) - seventh (tag: seventh) - Merge-branch-tangle - Merge-branch-side-early-part-into-tangle (tangle) - tangle-a (tag: tangle-a) - EOF - git log -n6 --decorate=short --pretty="tformat:%f%d" \ - --decorate-refs-exclude="*octopus*" \ - --simplify-by-decoration >actual && - test_cmp expect.decorate actual -' - test_expect_success 'log.decorate config parsing' ' git log --oneline --decorate=full >expect.full && git log --oneline --decorate=short >expect.short && @@ -954,7 +942,7 @@ cat >expect <<\EOF | | | | diff --git a/reach.t b/reach.t | | new file mode 100644 -| | index BEFORE..AFTER +| | index 0000000..10c9591 | | --- /dev/null | | +++ b/reach.t | | @@ -0,0 +1 @@ @@ -977,7 +965,7 @@ cat >expect <<\EOF | | | | | | diff --git a/octopus-b.t b/octopus-b.t | | | new file mode 100644 -| | | index BEFORE..AFTER +| | | index 0000000..d5fcad0 | | | --- /dev/null | | | +++ b/octopus-b.t | | | @@ -0,0 +1 @@ @@ -993,7 +981,7 @@ cat >expect <<\EOF | | | | diff --git a/octopus-a.t b/octopus-a.t | | new file mode 100644 -| | index BEFORE..AFTER +| | index 0000000..11ee015 | | --- /dev/null | | +++ b/octopus-a.t | | @@ -0,0 +1 @@ @@ -1009,7 +997,7 @@ cat >expect <<\EOF | | diff --git a/seventh.t b/seventh.t | new file mode 100644 -| index BEFORE..AFTER +| index 0000000..9744ffc | --- /dev/null | +++ b/seventh.t | @@ -0,0 +1 @@ @@ -1043,7 +1031,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/tangle-a b/tangle-a | | | | new file mode 100644 -| | | | index BEFORE..AFTER +| | | | index 0000000..7898192 | | | | --- /dev/null | | | | +++ b/tangle-a | | | | @@ -0,0 +1 @@ @@ -1065,7 +1053,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/2 b/2 | | | | new file mode 100644 -| | | | index BEFORE..AFTER +| | | | index 0000000..0cfbf08 | | | | --- /dev/null | | | | +++ b/2 | | | | @@ -0,0 +1 @@ @@ -1081,7 +1069,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/1 b/1 | | | | new file mode 100644 -| | | | index BEFORE..AFTER +| | | | index 0000000..d00491f | | | | --- /dev/null | | | | +++ b/1 | | | | @@ -0,0 +1 @@ @@ -1097,7 +1085,7 @@ cat >expect <<\EOF | | | | | | | | diff --git a/one b/one | | | | new file mode 100644 -| | | | index BEFORE..AFTER +| | | | index 0000000..9a33383 | | | | --- /dev/null | | | | +++ b/one | | | | @@ -0,0 +1 @@ @@ -1113,7 +1101,7 @@ cat >expect <<\EOF | | | | | | diff --git a/a/two b/a/two | | | deleted file mode 100644 -| | | index BEFORE..AFTER +| | | index 9245af5..0000000 | | | --- a/a/two | | | +++ /dev/null | | | @@ -1 +0,0 @@ @@ -1129,7 +1117,7 @@ cat >expect <<\EOF | | | | | | diff --git a/a/two b/a/two | | | new file mode 100644 -| | | index BEFORE..AFTER +| | | index 0000000..9245af5 | | | --- /dev/null | | | +++ b/a/two | | | @@ -0,0 +1 @@ @@ -1145,7 +1133,7 @@ cat >expect <<\EOF | | | | diff --git a/ein b/ein | | new file mode 100644 -| | index BEFORE..AFTER +| | index 0000000..9d7e69f | | --- /dev/null | | +++ b/ein | | @@ -0,0 +1 @@ @@ -1162,14 +1150,14 @@ cat >expect <<\EOF | | diff --git a/ichi b/ichi | new file mode 100644 -| index BEFORE..AFTER +| index 0000000..9d7e69f | --- /dev/null | +++ b/ichi | @@ -0,0 +1 @@ | +ichi | diff --git a/one b/one | deleted file mode 100644 -| index BEFORE..AFTER +| index 9d7e69f..0000000 | --- a/one | +++ /dev/null | @@ -1 +0,0 @@ @@ -1184,7 +1172,7 @@ cat >expect <<\EOF | 1 file changed, 1 insertion(+), 1 deletion(-) | | diff --git a/one b/one -| index BEFORE..AFTER 100644 +| index 5626abf..9d7e69f 100644 | --- a/one | +++ b/one | @@ -1 +1 @@ @@ -1201,15 +1189,30 @@ cat >expect <<\EOF diff --git a/one b/one new file mode 100644 - index BEFORE..AFTER + index 0000000..5626abf --- /dev/null +++ b/one @@ -0,0 +1 @@ +one EOF +sanitize_output () { + sed -e 's/ *$//' \ + -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \ + -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \ + -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \ + -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \ + -e 's/, 0 deletions(-)//' \ + -e 's/, 0 insertions(+)//' \ + -e 's/ 1 files changed, / 1 file changed, /' \ + -e 's/, 1 deletions(-)/, 1 deletion(-)/' \ + -e 's/, 1 insertions(+)/, 1 insertion(+)/' +} + test_expect_success 'log --graph with diff and stats' ' - lib_test_cmp_short_graph --no-renames --stat -p + git log --no-renames --graph --pretty=short --stat -p >actual && + sanitize_output >actual.sanitized <actual && + test_i18ncmp expect actual.sanitized ' cat >expect <<\EOF @@ -1229,7 +1232,7 @@ cat >expect <<\EOF *** | | *** | | diff --git a/reach.t b/reach.t *** | | new file mode 100644 -*** | | index BEFORE..AFTER +*** | | index 0000000..10c9591 *** | | --- /dev/null *** | | +++ b/reach.t *** | | @@ -0,0 +1 @@ @@ -1252,7 +1255,7 @@ cat >expect <<\EOF *** | | | *** | | | diff --git a/octopus-b.t b/octopus-b.t *** | | | new file mode 100644 -*** | | | index BEFORE..AFTER +*** | | | index 0000000..d5fcad0 *** | | | --- /dev/null *** | | | +++ b/octopus-b.t *** | | | @@ -0,0 +1 @@ @@ -1268,7 +1271,7 @@ cat >expect <<\EOF *** | | *** | | diff --git a/octopus-a.t b/octopus-a.t *** | | new file mode 100644 -*** | | index BEFORE..AFTER +*** | | index 0000000..11ee015 *** | | --- /dev/null *** | | +++ b/octopus-a.t *** | | @@ -0,0 +1 @@ @@ -1284,7 +1287,7 @@ cat >expect <<\EOF *** | *** | diff --git a/seventh.t b/seventh.t *** | new file mode 100644 -*** | index BEFORE..AFTER +*** | index 0000000..9744ffc *** | --- /dev/null *** | +++ b/seventh.t *** | @@ -0,0 +1 @@ @@ -1318,7 +1321,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/tangle-a b/tangle-a *** | | | | new file mode 100644 -*** | | | | index BEFORE..AFTER +*** | | | | index 0000000..7898192 *** | | | | --- /dev/null *** | | | | +++ b/tangle-a *** | | | | @@ -0,0 +1 @@ @@ -1340,7 +1343,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/2 b/2 *** | | | | new file mode 100644 -*** | | | | index BEFORE..AFTER +*** | | | | index 0000000..0cfbf08 *** | | | | --- /dev/null *** | | | | +++ b/2 *** | | | | @@ -0,0 +1 @@ @@ -1356,7 +1359,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/1 b/1 *** | | | | new file mode 100644 -*** | | | | index BEFORE..AFTER +*** | | | | index 0000000..d00491f *** | | | | --- /dev/null *** | | | | +++ b/1 *** | | | | @@ -0,0 +1 @@ @@ -1372,7 +1375,7 @@ cat >expect <<\EOF *** | | | | *** | | | | diff --git a/one b/one *** | | | | new file mode 100644 -*** | | | | index BEFORE..AFTER +*** | | | | index 0000000..9a33383 *** | | | | --- /dev/null *** | | | | +++ b/one *** | | | | @@ -0,0 +1 @@ @@ -1388,7 +1391,7 @@ cat >expect <<\EOF *** | | | *** | | | diff --git a/a/two b/a/two *** | | | deleted file mode 100644 -*** | | | index BEFORE..AFTER +*** | | | index 9245af5..0000000 *** | | | --- a/a/two *** | | | +++ /dev/null *** | | | @@ -1 +0,0 @@ @@ -1404,7 +1407,7 @@ cat >expect <<\EOF *** | | | *** | | | diff --git a/a/two b/a/two *** | | | new file mode 100644 -*** | | | index BEFORE..AFTER +*** | | | index 0000000..9245af5 *** | | | --- /dev/null *** | | | +++ b/a/two *** | | | @@ -0,0 +1 @@ @@ -1420,7 +1423,7 @@ cat >expect <<\EOF *** | | *** | | diff --git a/ein b/ein *** | | new file mode 100644 -*** | | index BEFORE..AFTER +*** | | index 0000000..9d7e69f *** | | --- /dev/null *** | | +++ b/ein *** | | @@ -0,0 +1 @@ @@ -1437,14 +1440,14 @@ cat >expect <<\EOF *** | *** | diff --git a/ichi b/ichi *** | new file mode 100644 -*** | index BEFORE..AFTER +*** | index 0000000..9d7e69f *** | --- /dev/null *** | +++ b/ichi *** | @@ -0,0 +1 @@ *** | +ichi *** | diff --git a/one b/one *** | deleted file mode 100644 -*** | index BEFORE..AFTER +*** | index 9d7e69f..0000000 *** | --- a/one *** | +++ /dev/null *** | @@ -1 +0,0 @@ @@ -1459,7 +1462,7 @@ cat >expect <<\EOF *** | 1 file changed, 1 insertion(+), 1 deletion(-) *** | *** | diff --git a/one b/one -*** | index BEFORE..AFTER 100644 +*** | index 5626abf..9d7e69f 100644 *** | --- a/one *** | +++ b/one *** | @@ -1 +1 @@ @@ -1476,7 +1479,7 @@ cat >expect <<\EOF *** *** diff --git a/one b/one *** new file mode 100644 -*** index BEFORE..AFTER +*** index 0000000..5626abf *** --- /dev/null *** +++ b/one *** @@ -0,0 +1 @@ @@ -1484,7 +1487,9 @@ cat >expect <<\EOF EOF test_expect_success 'log --line-prefix="*** " --graph with diff and stats' ' - lib_test_cmp_short_graph --line-prefix="*** " --no-renames --stat -p + git log --line-prefix="*** " --no-renames --graph --pretty=short --stat -p >actual && + sanitize_output >actual.sanitized <actual && + test_i18ncmp expect actual.sanitized ' cat >expect <<-\EOF @@ -1506,7 +1511,9 @@ cat >expect <<-\EOF EOF test_expect_success 'log --graph with --name-status' ' - test_cmp_graph --name-status tangle..reach + git log --graph --format=%s --name-status tangle..reach >actual && + sanitize_output <actual >actual.sanitized && + test_cmp expect actual.sanitized ' cat >expect <<-\EOF @@ -1528,7 +1535,9 @@ cat >expect <<-\EOF EOF test_expect_success 'log --graph with --name-only' ' - test_cmp_graph --name-only tangle..reach + git log --graph --format=%s --name-only tangle..reach >actual && + sanitize_output <actual >actual.sanitized && + test_cmp expect actual.sanitized ' test_expect_success 'dotdot is a parent directory' ' @@ -1546,14 +1555,6 @@ test_expect_success GPG 'setup signed branch' ' git commit -S -m signed_commit ' -test_expect_success GPG 'setup signed branch with subkey' ' - test_when_finished "git reset --hard && git checkout master" && - git checkout -b signed-subkey master && - echo foo >foo && - git add foo && - git commit -SB7227189 -m signed_commit -' - test_expect_success GPGSM 'setup signed branch x509' ' test_when_finished "git reset --hard && git checkout master" && git checkout -b signed-x509 master && @@ -1564,18 +1565,6 @@ test_expect_success GPGSM 'setup signed branch x509' ' git commit -S -m signed_commit ' -test_expect_success GPGSM 'log x509 fingerprint' ' - echo "F8BF62E0693D0694816377099909C779FA23FD65 | " >expect && - git log -n1 --format="%GF | %GP" signed-x509 >actual && - test_cmp expect actual -' - -test_expect_success GPGSM 'log OpenPGP fingerprint' ' - echo "D4BE22311AD3131E5EDA29A461092E85B7227189" > expect && - git log -n1 --format="%GP" signed-subkey >actual && - test_cmp expect actual -' - test_expect_success GPG 'log --graph --show-signature' ' git log --graph --show-signature -n1 signed >actual && grep "^| gpg: Signature made" actual && @@ -1607,26 +1596,6 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' ' grep "^| | gpg: Good signature" actual ' -test_expect_success GPG 'log --graph --show-signature for merged tag in shallow clone' ' - test_when_finished "git reset --hard && git checkout master" && - git checkout -b plain-shallow master && - echo aaa >bar && - git add bar && - git commit -m bar_commit && - git checkout --detach master && - echo bbb >baz && - git add baz && - git commit -m baz_commit && - git tag -s -m signed_tag_msg signed_tag_shallow && - hash=$(git rev-parse HEAD) && - git checkout plain-shallow && - git merge --no-ff -m msg signed_tag_shallow && - git clone --depth 1 --no-local . shallow && - test_when_finished "rm -rf shallow" && - git -C shallow log --graph --show-signature -n1 plain-shallow >actual && - grep "tag signed_tag_shallow names a non-parent $hash" actual -' - test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' ' test_when_finished "git reset --hard && git checkout master" && test_config gpg.format x509 && @@ -1705,10 +1674,10 @@ test_expect_success 'set up --source tests' ' ' test_expect_success 'log --source paints branch names' ' - cat >expect <<-EOF && - $(git rev-parse --short :/three) source-b three - $(git rev-parse --short :/two ) source-a two - $(git rev-parse --short :/one ) source-b one + cat >expect <<-\EOF && + 09e12a9 source-b three + 8e393e1 source-a two + 1ac6c77 source-b one EOF git log --oneline --source source-a source-b >actual && test_cmp expect actual @@ -1716,19 +1685,19 @@ test_expect_success 'log --source paints branch names' ' test_expect_success 'log --source paints tag names' ' git tag -m tagged source-tag && - cat >expect <<-EOF && - $(git rev-parse --short :/three) source-tag three - $(git rev-parse --short :/two ) source-a two - $(git rev-parse --short :/one ) source-tag one + cat >expect <<-\EOF && + 09e12a9 source-tag three + 8e393e1 source-a two + 1ac6c77 source-tag one EOF git log --oneline --source source-tag source-a >actual && test_cmp expect actual ' test_expect_success 'log --source paints symmetric ranges' ' - cat >expect <<-EOF && - $(git rev-parse --short :/three) source-b three - $(git rev-parse --short :/two ) source-a two + cat >expect <<-\EOF && + 09e12a9 source-b three + 8e393e1 source-a two EOF git log --oneline --source source-a...source-b >actual && test_cmp expect actual @@ -1738,11 +1707,4 @@ test_expect_success '--exclude-promisor-objects does not BUG-crash' ' test_must_fail git log --exclude-promisor-objects source-a ' -test_expect_success 'log --end-of-options' ' - git update-ref refs/heads/--source HEAD && - git log --end-of-options --source >actual && - git log >expect && - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t4203-mailmap.sh b/third_party/git/t/t4203-mailmap.sh index 586c3a86b1..918ada69eb 100755 --- a/third_party/git/t/t4203-mailmap.sh +++ b/third_party/git/t/t4203-mailmap.sh @@ -13,8 +13,8 @@ fuzz_blame () { } test_expect_success setup ' - cat >contacts <<- EOF && - $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> + cat >contacts <<-\EOF && + A U Thor <author@example.com> nick1 <bugs@company.xx> EOF @@ -33,19 +33,19 @@ test_expect_success 'check-mailmap no arguments' ' ' test_expect_success 'check-mailmap arguments' ' - cat >expect <<- EOF && - $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> + cat >expect <<-\EOF && + A U Thor <author@example.com> nick1 <bugs@company.xx> EOF git check-mailmap \ - "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" \ + "A U Thor <author@example.com>" \ "nick1 <bugs@company.xx>" >actual && test_cmp expect actual ' test_expect_success 'check-mailmap --stdin' ' - cat >expect <<- EOF && - $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> + cat >expect <<-\EOF && + A U Thor <author@example.com> nick1 <bugs@company.xx> EOF git check-mailmap --stdin <contacts >actual && @@ -66,8 +66,8 @@ test_expect_success 'check-mailmap bogus contact' ' test_must_fail git check-mailmap bogus ' -cat >expect << EOF -$GIT_AUTHOR_NAME (1): +cat >expect <<\EOF +A U Thor (1): initial nick1 (1): @@ -90,7 +90,7 @@ nick1 (1): EOF test_expect_success 'default .mailmap' ' - echo "Repo Guy <$GIT_AUTHOR_EMAIL>" > .mailmap && + echo "Repo Guy <author@example.com>" > .mailmap && git shortlog HEAD >actual && test_cmp expect actual ' @@ -122,7 +122,7 @@ Internal Guy (1): EOF test_expect_success 'mailmap.file override' ' - echo "External Guy <$GIT_AUTHOR_EMAIL>" >> internal_mailmap/.mailmap && + echo "External Guy <author@example.com>" >> internal_mailmap/.mailmap && git config mailmap.file internal_mailmap/.mailmap && git shortlog HEAD >actual && test_cmp expect actual @@ -178,8 +178,8 @@ test_expect_success 'name entry after email entry, case-insensitive' ' test_cmp expect actual ' -cat >expect << EOF -$GIT_AUTHOR_NAME (1): +cat >expect <<\EOF +A U Thor (1): initial nick1 (1): @@ -195,18 +195,18 @@ test_expect_success 'No mailmap files, but configured' ' test_expect_success 'setup mailmap blob tests' ' git checkout -b map && test_when_finished "git checkout master" && - cat >just-bugs <<- EOF && + cat >just-bugs <<-\EOF && Blob Guy <bugs@company.xx> EOF - cat >both <<- EOF && - Blob Guy <$GIT_AUTHOR_EMAIL> + cat >both <<-\EOF && + Blob Guy <author@example.com> Blob Guy <bugs@company.xx> EOF - printf "Tricky Guy <$GIT_AUTHOR_EMAIL>" >no-newline && + printf "Tricky Guy <author@example.com>" >no-newline && git add just-bugs both no-newline && git commit -m "my mailmaps" && - echo "Repo Guy <$GIT_AUTHOR_EMAIL>" >.mailmap && - echo "Internal Guy <$GIT_AUTHOR_EMAIL>" >internal.map + echo "Repo Guy <author@example.com>" >.mailmap && + echo "Internal Guy <author@example.com>" >internal.map ' test_expect_success 'mailmap.blob set' ' @@ -266,12 +266,12 @@ test_expect_success 'mailmap.blob defaults to off in non-bare repo' ' git init non-bare && ( cd non-bare && - test_commit one .mailmap "Fake Name <$GIT_AUTHOR_EMAIL>" && + test_commit one .mailmap "Fake Name <author@example.com>" && echo " 1 Fake Name" >expect && git shortlog -ns HEAD >actual && test_cmp expect actual && rm .mailmap && - echo " 1 $GIT_AUTHOR_NAME" >expect && + echo " 1 A U Thor" >expect && git shortlog -ns HEAD >actual && test_cmp expect actual ) @@ -305,26 +305,26 @@ test_expect_success 'cleanup after mailmap.blob tests' ' ' test_expect_success 'single-character name' ' - echo " 1 A <$GIT_AUTHOR_EMAIL>" >expect && + echo " 1 A <author@example.com>" >expect && echo " 1 nick1 <bugs@company.xx>" >>expect && - echo "A <$GIT_AUTHOR_EMAIL>" >.mailmap && + echo "A <author@example.com>" >.mailmap && test_when_finished "rm .mailmap" && git shortlog -es HEAD >actual && test_cmp expect actual ' test_expect_success 'preserve canonical email case' ' - echo " 1 $GIT_AUTHOR_NAME <AUTHOR@example.com>" >expect && + echo " 1 A U Thor <AUTHOR@example.com>" >expect && echo " 1 nick1 <bugs@company.xx>" >>expect && - echo "<AUTHOR@example.com> <$GIT_AUTHOR_EMAIL>" >.mailmap && + echo "<AUTHOR@example.com> <author@example.com>" >.mailmap && test_when_finished "rm .mailmap" && git shortlog -es HEAD >actual && test_cmp expect actual ' # Extended mailmap configurations should give us the following output for shortlog -cat >expect << EOF -$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> (1): +cat >expect <<\EOF +A U Thor <author@example.com> (1): initial CTO <cto@company.xx> (1): @@ -370,7 +370,7 @@ test_expect_success 'Shortlog output (complex mapping)' ' git commit --author "CTO <cto@coompany.xx>" -m seventh && mkdir -p internal_mailmap && - echo "Committed <$GIT_COMMITTER_EMAIL>" > internal_mailmap/.mailmap && + echo "Committed <committer@example.com>" > internal_mailmap/.mailmap && echo "<cto@company.xx> <cto@coompany.xx>" >> internal_mailmap/.mailmap && echo "Some Dude <some@dude.xx> nick1 <bugs@company.xx>" >> internal_mailmap/.mailmap && echo "Other Author <other@author.xx> nick2 <bugs@company.xx>" >> internal_mailmap/.mailmap && @@ -384,27 +384,27 @@ test_expect_success 'Shortlog output (complex mapping)' ' ' # git log with --pretty format which uses the name and email mailmap placemarkers -cat >expect << EOF +cat >expect <<\EOF Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx> -Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx> -Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx> -Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx> -Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx> -Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx> -Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> -Author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> maps to $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> -Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> +Author A U Thor <author@example.com> maps to A U Thor <author@example.com> +Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com> EOF test_expect_success 'Log output (complex mapping)' ' @@ -412,42 +412,14 @@ test_expect_success 'Log output (complex mapping)' ' test_cmp expect actual ' -cat >expect << EOF -Author email cto@coompany.xx has local-part cto -Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME - -Author email me@company.xx has local-part me -Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME - -Author email me@company.xx has local-part me -Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME - -Author email nick2@company.xx has local-part nick2 -Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME - -Author email bugs@company.xx has local-part bugs -Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME - -Author email bugs@company.xx has local-part bugs -Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME - -Author email author@example.com has local-part author -Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME -EOF - -test_expect_success 'Log output (local-part email address)' ' - git log --pretty=format:"Author email %ae has local-part %al%nCommitter email %ce has local-part %cl%n" >actual && - test_cmp expect actual -' - -cat >expect << EOF +cat >expect <<\EOF Author: CTO <cto@company.xx> Author: Santa Claus <santa.claus@northpole.xx> Author: Santa Claus <santa.claus@northpole.xx> Author: Other Author <other@author.xx> Author: Other Author <other@author.xx> Author: Some Dude <some@dude.xx> -Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> +Author: A U Thor <author@example.com> EOF test_expect_success 'Log output with --use-mailmap' ' @@ -455,14 +427,14 @@ test_expect_success 'Log output with --use-mailmap' ' test_cmp expect actual ' -cat >expect << EOF +cat >expect <<\EOF Author: CTO <cto@company.xx> Author: Santa Claus <santa.claus@northpole.xx> Author: Santa Claus <santa.claus@northpole.xx> Author: Other Author <other@author.xx> Author: Other Author <other@author.xx> Author: Some Dude <some@dude.xx> -Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> +Author: A U Thor <author@example.com> EOF test_expect_success 'Log output with log.mailmap' ' @@ -471,28 +443,28 @@ test_expect_success 'Log output with log.mailmap' ' ' test_expect_success 'log.mailmap=false disables mailmap' ' - cat >expect <<- EOF && + cat >expect <<-\EOF && Author: CTO <cto@coompany.xx> Author: claus <me@company.xx> Author: santa <me@company.xx> Author: nick2 <nick2@company.xx> Author: nick2 <bugs@company.xx> Author: nick1 <bugs@company.xx> - Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> + Author: A U Thor <author@example.com> EOF git -c log.mailmap=False log | grep Author > actual && test_cmp expect actual ' test_expect_success '--no-use-mailmap disables mailmap' ' - cat >expect <<- EOF && + cat >expect <<-\EOF && Author: CTO <cto@coompany.xx> Author: claus <me@company.xx> Author: santa <me@company.xx> Author: nick2 <nick2@company.xx> Author: nick2 <bugs@company.xx> Author: nick1 <bugs@company.xx> - Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> + Author: A U Thor <author@example.com> EOF git log --no-use-mailmap | grep Author > actual && test_cmp expect actual @@ -528,8 +500,8 @@ test_expect_success 'Only grep replaced author with --use-mailmap' ' ' # git blame -cat >expect <<EOF -^OBJI ($GIT_AUTHOR_NAME DATE 1) one +cat >expect <<\EOF +^OBJI (A U Thor DATE 1) one OBJID (Some Dude DATE 2) two OBJID (Other Author DATE 3) three OBJID (Other Author DATE 4) four diff --git a/third_party/git/t/t4204-patch-id.sh b/third_party/git/t/t4204-patch-id.sh index 8ff8bd84c7..0288c17ec6 100755 --- a/third_party/git/t/t4204-patch-id.sh +++ b/third_party/git/t/t4204-patch-id.sh @@ -25,7 +25,7 @@ test_expect_success 'setup' ' test_expect_success 'patch-id output is well-formed' ' git log -p -1 | git patch-id >output && - grep "^$OID_REGEX $(git rev-parse HEAD)$" output + grep "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output ' #calculate patch id. Make sure output is not empty. diff --git a/third_party/git/t/t4205-log-pretty-formats.sh b/third_party/git/t/t4205-log-pretty-formats.sh index 204c149d5a..f42a69faa2 100755 --- a/third_party/git/t/t4205-log-pretty-formats.sh +++ b/third_party/git/t/t4205-log-pretty-formats.sh @@ -134,36 +134,6 @@ test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' ' test_cmp expected actual ' -for p in short medium full fuller email raw -do - test_expect_success "NUL termination with --reflog --pretty=$p" ' - revs="$(git rev-list --reflog)" && - for r in $revs - do - git show -s "$r" --pretty="$p" && - printf "\0" || return 1 - done >expect && - { - git log -z --reflog --pretty="$p" && - printf "\0" - } >actual && - test_cmp expect actual - ' -done - -test_expect_success 'NUL termination with --reflog --pretty=oneline' ' - revs="$(git rev-list --reflog)" && - for r in $revs - do - git show -s --pretty=oneline "$r" >raw && - cat raw | lf_to_nul || exit 1 - done >expect && - # the trailing NUL is already produced so we do not need to - # output another one - git log -z --pretty=oneline --reflog >actual && - test_cmp expect actual -' - test_expect_success 'setup more commits' ' test_commit "message one" one one message-one && test_commit "message two" two two message-two && @@ -533,12 +503,6 @@ test_expect_success 'ISO and ISO-strict date formats display the same values' ' test_cmp expected actual ' -test_expect_success 'short date' ' - git log --format=%ad%n%cd --date=short >expected && - git log --format=%as%n%cs >actual && - test_cmp expected actual -' - # get new digests (with no abbreviations) test_expect_success 'set up log decoration tests' ' head1=$(git rev-parse --verify HEAD~0) && @@ -676,7 +640,7 @@ test_expect_success 'pretty format %(trailers:key=foo) multiple keys' ' test_cmp expect actual ' -test_expect_success '%(trailers:key=nonexistent) becomes empty' ' +test_expect_success '%(trailers:key=nonexistant) becomes empty' ' git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual && echo "xx" >expect && test_cmp expect actual @@ -824,47 +788,4 @@ test_expect_success '%S in git log --format works with other placeholders (part test_cmp expect actual ' -test_expect_success 'log --pretty=reference' ' - git log --pretty="tformat:%h (%s, %as)" >expect && - git log --pretty=reference >actual && - test_cmp expect actual -' - -test_expect_success 'log --pretty=reference with log.date is overridden by short date' ' - git log --pretty="tformat:%h (%s, %as)" >expect && - test_config log.date rfc && - git log --pretty=reference >actual && - test_cmp expect actual -' - -test_expect_success 'log --pretty=reference with explicit date overrides short date' ' - git log --date=rfc --pretty="tformat:%h (%s, %ad)" >expect && - git log --date=rfc --pretty=reference >actual && - test_cmp expect actual -' - -test_expect_success 'log --pretty=reference is never unabbreviated' ' - git log --pretty="tformat:%h (%s, %as)" >expect && - git log --no-abbrev-commit --pretty=reference >actual && - test_cmp expect actual -' - -test_expect_success 'log --pretty=reference is never decorated' ' - git log --pretty="tformat:%h (%s, %as)" >expect && - git log --decorate=short --pretty=reference >actual && - test_cmp expect actual -' - -test_expect_success 'log --pretty=reference does not output reflog info' ' - git log --walk-reflogs --pretty="tformat:%h (%s, %as)" >expect && - git log --walk-reflogs --pretty=reference >actual && - test_cmp expect actual -' - -test_expect_success 'log --pretty=reference is colored appropriately' ' - git log --color=always --pretty="tformat:%C(auto)%h (%s, %as)" >expect && - git log --color=always --pretty=reference >actual && - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t4210-log-i18n.sh b/third_party/git/t/t4210-log-i18n.sh index c3792081e6..7c519436ef 100755 --- a/third_party/git/t/t4210-log-i18n.sh +++ b/third_party/git/t/t4210-log-i18n.sh @@ -1,15 +1,12 @@ #!/bin/sh test_description='test log with i18n features' -. ./lib-gettext.sh +. ./test-lib.sh # two forms of é utf8_e=$(printf '\303\251') latin1_e=$(printf '\351') -# invalid UTF-8 -invalid_e=$(printf '\303\50)') # ")" at end to close opening "(" - test_expect_success 'create commits in different encodings' ' test_tick && cat >msg <<-EOF && @@ -51,43 +48,9 @@ test_expect_success !MINGW 'log --grep does not find non-reencoded values (utf8) test_must_be_empty actual ' -test_expect_success !MINGW 'log --grep does not find non-reencoded values (latin1)' ' +test_expect_success 'log --grep does not find non-reencoded values (latin1)' ' git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual && test_must_be_empty actual ' -for engine in fixed basic extended perl -do - prereq= - if test $engine = "perl" - then - prereq="PCRE" - else - prereq="" - fi - force_regex= - if test $engine != "fixed" - then - force_regex=.* - fi - test_expect_success !MINGW,!REGEX_ILLSEQ,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" " - cat >expect <<-\EOF && - latin1 - utf8 - EOF - LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$latin1_e\" >actual && - test_cmp expect actual - " - - test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" " - LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$utf8_e\" >actual && - test_must_be_empty actual - " - - test_expect_success !MINGW,!REGEX_ILLSEQ,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" " - LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$invalid_e\" >actual && - test_must_be_empty actual - " -done - test_done diff --git a/third_party/git/t/t4211-line-log.sh b/third_party/git/t/t4211-line-log.sh index cda58186c2..1db7bd0f59 100755 --- a/third_party/git/t/t4211-line-log.sh +++ b/third_party/git/t/t4211-line-log.sh @@ -4,7 +4,6 @@ test_description='test log -L' . ./test-lib.sh test_expect_success 'setup (import history)' ' - test_oid_init && git fast-import < "$TEST_DIRECTORY"/t4211/history.export && git reset --hard ' @@ -12,7 +11,7 @@ test_expect_success 'setup (import history)' ' canned_test_1 () { test_expect_$1 "$2" " git log $2 >actual && - test_cmp \"\$TEST_DIRECTORY\"/t4211/$(test_oid algo)/expect.$3 actual + test_cmp \"\$TEST_DIRECTORY\"/t4211/expect.$3 actual " } @@ -133,86 +132,4 @@ test_expect_success '--raw is forbidden' ' test_must_fail git log -L1,24:b.c --raw ' -test_expect_success 'setup for checking fancy rename following' ' - git checkout --orphan moves-start && - git reset --hard && - - printf "%s\n" 12 13 14 15 b c d e >file-1 && - printf "%s\n" 22 23 24 25 B C D E >file-2 && - git add file-1 file-2 && - test_tick && - git commit -m "Add file-1 and file-2" && - oid_add_f1_f2=$(git rev-parse --short HEAD) && - - git checkout -b moves-main && - printf "%s\n" 11 12 13 14 15 b c d e >file-1 && - git commit -a -m "Modify file-1 on main" && - oid_mod_f1_main=$(git rev-parse --short HEAD) && - - printf "%s\n" 21 22 23 24 25 B C D E >file-2 && - git commit -a -m "Modify file-2 on main #1" && - oid_mod_f2_main_1=$(git rev-parse --short HEAD) && - - git mv file-1 renamed-1 && - git commit -m "Rename file-1 to renamed-1 on main" && - - printf "%s\n" 11 12 13 14 15 b c d e f >renamed-1 && - git commit -a -m "Modify renamed-1 on main" && - oid_mod_r1_main=$(git rev-parse --short HEAD) && - - printf "%s\n" 21 22 23 24 25 B C D E F >file-2 && - git commit -a -m "Modify file-2 on main #2" && - oid_mod_f2_main_2=$(git rev-parse --short HEAD) && - - git checkout -b moves-side moves-start && - printf "%s\n" 12 13 14 15 16 b c d e >file-1 && - git commit -a -m "Modify file-1 on side #1" && - oid_mod_f1_side_1=$(git rev-parse --short HEAD) && - - printf "%s\n" 22 23 24 25 26 B C D E >file-2 && - git commit -a -m "Modify file-2 on side" && - oid_mod_f2_side=$(git rev-parse --short HEAD) && - - git mv file-2 renamed-2 && - git commit -m "Rename file-2 to renamed-2 on side" && - - printf "%s\n" 12 13 14 15 16 a b c d e >file-1 && - git commit -a -m "Modify file-1 on side #2" && - oid_mod_f1_side_2=$(git rev-parse --short HEAD) && - - printf "%s\n" 22 23 24 25 26 A B C D E >renamed-2 && - git commit -a -m "Modify renamed-2 on side" && - oid_mod_r2_side=$(git rev-parse --short HEAD) && - - git checkout moves-main && - git merge moves-side && - oid_merge=$(git rev-parse --short HEAD) -' - -test_expect_success 'fancy rename following #1' ' - cat >expect <<-EOF && - $oid_merge Merge branch '\''moves-side'\'' into moves-main - $oid_mod_f1_side_2 Modify file-1 on side #2 - $oid_mod_f1_side_1 Modify file-1 on side #1 - $oid_mod_r1_main Modify renamed-1 on main - $oid_mod_f1_main Modify file-1 on main - $oid_add_f1_f2 Add file-1 and file-2 - EOF - git log -L1:renamed-1 --oneline --no-patch >actual && - test_cmp expect actual -' - -test_expect_success 'fancy rename following #2' ' - cat >expect <<-EOF && - $oid_merge Merge branch '\''moves-side'\'' into moves-main - $oid_mod_r2_side Modify renamed-2 on side - $oid_mod_f2_side Modify file-2 on side - $oid_mod_f2_main_2 Modify file-2 on main #2 - $oid_mod_f2_main_1 Modify file-2 on main #1 - $oid_add_f1_f2 Add file-1 and file-2 - EOF - git log -L1:renamed-2 --oneline --no-patch >actual && - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t4211/sha1/expect.beginning-of-file b/third_party/git/t/t4211/expect.beginning-of-file index 91b4054898..91b4054898 100644 --- a/third_party/git/t/t4211/sha1/expect.beginning-of-file +++ b/third_party/git/t/t4211/expect.beginning-of-file diff --git a/third_party/git/t/t4211/sha1/expect.end-of-file b/third_party/git/t/t4211/expect.end-of-file index bd25bb2f59..bd25bb2f59 100644 --- a/third_party/git/t/t4211/sha1/expect.end-of-file +++ b/third_party/git/t/t4211/expect.end-of-file diff --git a/third_party/git/t/t4211/sha1/expect.move-support-f b/third_party/git/t/t4211/expect.move-support-f index c905e01bc2..c905e01bc2 100644 --- a/third_party/git/t/t4211/sha1/expect.move-support-f +++ b/third_party/git/t/t4211/expect.move-support-f diff --git a/third_party/git/t/t4211/sha1/expect.multiple b/third_party/git/t/t4211/expect.multiple index 76ad5b598c..76ad5b598c 100644 --- a/third_party/git/t/t4211/sha1/expect.multiple +++ b/third_party/git/t/t4211/expect.multiple diff --git a/third_party/git/t/t4211/sha1/expect.multiple-overlapping b/third_party/git/t/t4211/expect.multiple-overlapping index d930b6eec4..d930b6eec4 100644 --- a/third_party/git/t/t4211/sha1/expect.multiple-overlapping +++ b/third_party/git/t/t4211/expect.multiple-overlapping diff --git a/third_party/git/t/t4211/sha1/expect.multiple-superset b/third_party/git/t/t4211/expect.multiple-superset index d930b6eec4..d930b6eec4 100644 --- a/third_party/git/t/t4211/sha1/expect.multiple-superset +++ b/third_party/git/t/t4211/expect.multiple-superset diff --git a/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main b/third_party/git/t/t4211/expect.parallel-change-f-to-main index 052def8074..052def8074 100644 --- a/third_party/git/t/t4211/sha1/expect.parallel-change-f-to-main +++ b/third_party/git/t/t4211/expect.parallel-change-f-to-main diff --git a/third_party/git/t/t4211/sha1/expect.simple-f b/third_party/git/t/t4211/expect.simple-f index a1f5bc49c8..a1f5bc49c8 100644 --- a/third_party/git/t/t4211/sha1/expect.simple-f +++ b/third_party/git/t/t4211/expect.simple-f diff --git a/third_party/git/t/t4211/sha1/expect.simple-f-to-main b/third_party/git/t/t4211/expect.simple-f-to-main index a475768710..a475768710 100644 --- a/third_party/git/t/t4211/sha1/expect.simple-f-to-main +++ b/third_party/git/t/t4211/expect.simple-f-to-main diff --git a/third_party/git/t/t4211/sha1/expect.simple-main b/third_party/git/t/t4211/expect.simple-main index 39ce39bebe..39ce39bebe 100644 --- a/third_party/git/t/t4211/sha1/expect.simple-main +++ b/third_party/git/t/t4211/expect.simple-main diff --git a/third_party/git/t/t4211/sha1/expect.simple-main-to-end b/third_party/git/t/t4211/expect.simple-main-to-end index 8480bd9cc4..8480bd9cc4 100644 --- a/third_party/git/t/t4211/sha1/expect.simple-main-to-end +++ b/third_party/git/t/t4211/expect.simple-main-to-end diff --git a/third_party/git/t/t4211/sha1/expect.two-ranges b/third_party/git/t/t4211/expect.two-ranges index 6109aa0dce..6109aa0dce 100644 --- a/third_party/git/t/t4211/sha1/expect.two-ranges +++ b/third_party/git/t/t4211/expect.two-ranges diff --git a/third_party/git/t/t4211/sha1/expect.vanishes-early b/third_party/git/t/t4211/expect.vanishes-early index 1f7cd06941..1f7cd06941 100644 --- a/third_party/git/t/t4211/sha1/expect.vanishes-early +++ b/third_party/git/t/t4211/expect.vanishes-early diff --git a/third_party/git/t/t4211/sha256/expect.beginning-of-file b/third_party/git/t/t4211/sha256/expect.beginning-of-file deleted file mode 100644 index 5adfdfc1a1..0000000000 --- a/third_party/git/t/t4211/sha256/expect.beginning-of-file +++ /dev/null @@ -1,43 +0,0 @@ -commit 62a40b38fa4f00800004aee81ef287b7201317594ebcb990f38cbe493b01d200 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:47:40 2013 +0100 - - change at very beginning - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -1,3 +1,4 @@ -+#include <unistd.h> - #include <stdio.h> - - long f(long x) - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -1,3 +1,3 @@ - #include <stdio.h> - --int f(int x) -+long f(long x) - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +1,3 @@ -+#include <stdio.h> -+ -+int f(int x) diff --git a/third_party/git/t/t4211/sha256/expect.end-of-file b/third_party/git/t/t4211/sha256/expect.end-of-file deleted file mode 100644 index 03ab5c1784..0000000000 --- a/third_party/git/t/t4211/sha256/expect.end-of-file +++ /dev/null @@ -1,62 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -20,3 +20,5 @@ - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} -+ -+/* incomplete lines are bad! */ - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -20,3 +20,3 @@ - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -19,3 +19,3 @@ -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +18,3 @@ -+ printf("%d\n", f(15)); -+ return 0; -+} diff --git a/third_party/git/t/t4211/sha256/expect.move-support-f b/third_party/git/t/t4211/sha256/expect.move-support-f deleted file mode 100644 index 223b4ed2a0..0000000000 --- a/third_party/git/t/t4211/sha256/expect.move-support-f +++ /dev/null @@ -1,80 +0,0 @@ -commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:49:50 2013 +0100 - - another simple change - -diff --git a/b.c b/b.c ---- a/b.c -+++ b/b.c -@@ -4,9 +4,9 @@ - long f(long x) - { - int s = 0; - while (x) { -- x >>= 1; -+ x /= 2; - s++; - } - return s; - } - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,9 +3,9 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,8 +3,9 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,8 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} diff --git a/third_party/git/t/t4211/sha256/expect.multiple b/third_party/git/t/t4211/sha256/expect.multiple deleted file mode 100644 index ca00409b9a..0000000000 --- a/third_party/git/t/t4211/sha256/expect.multiple +++ /dev/null @@ -1,104 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,7 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} -+ -+/* incomplete lines are bad! */ - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,5 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,9 +3,9 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } -@@ -17,5 +17,5 @@ - int main () - { -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,8 +3,9 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,8 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} diff --git a/third_party/git/t/t4211/sha256/expect.multiple-overlapping b/third_party/git/t/t4211/sha256/expect.multiple-overlapping deleted file mode 100644 index 9015a45a25..0000000000 --- a/third_party/git/t/t4211/sha256/expect.multiple-overlapping +++ /dev/null @@ -1,187 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -4,19 +4,21 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} -+ -+/* incomplete lines are bad! */ - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -4,19 +4,19 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:41 2013 +0100 - - touch comment - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,19 +3,19 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* -- * A comment. -+ * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; - } - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,19 +3,19 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * A comment. - */ - - int main () - { -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,18 +3,19 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - - /* - * A comment. - */ - - int main () - { - printf("%d\n", f(15)); - return 0; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,18 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} -+ -+/* -+ * A comment. -+ */ -+ -+int main () -+{ -+ printf("%d\n", f(15)); -+ return 0; -+} diff --git a/third_party/git/t/t4211/sha256/expect.multiple-superset b/third_party/git/t/t4211/sha256/expect.multiple-superset deleted file mode 100644 index 9015a45a25..0000000000 --- a/third_party/git/t/t4211/sha256/expect.multiple-superset +++ /dev/null @@ -1,187 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -4,19 +4,21 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} -+ -+/* incomplete lines are bad! */ - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -4,19 +4,19 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:41 2013 +0100 - - touch comment - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,19 +3,19 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* -- * A comment. -+ * This is only an example! - */ - - int main () - { - printf("%ld\n", f(15)); - return 0; - } - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,19 +3,19 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * A comment. - */ - - int main () - { -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,18 +3,19 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - - /* - * A comment. - */ - - int main () - { - printf("%d\n", f(15)); - return 0; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,18 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} -+ -+/* -+ * A comment. -+ */ -+ -+int main () -+{ -+ printf("%d\n", f(15)); -+ return 0; -+} diff --git a/third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main b/third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main deleted file mode 100644 index e68f8928ea..0000000000 --- a/third_party/git/t/t4211/sha256/expect.parallel-change-f-to-main +++ /dev/null @@ -1,160 +0,0 @@ -commit 98117c2059b76c36995748fb97b02542aef477fe26379e94c18fd70f7790bc67 -Merge: b511694 4f7a581 -Author: Thomas Rast <trast@inf.ethz.ch> -Date: Fri Apr 12 16:16:24 2013 +0200 - - Merge across the rename - - -commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:49:50 2013 +0100 - - another simple change - -diff --git a/b.c b/b.c ---- a/b.c -+++ b/b.c -@@ -4,14 +4,14 @@ - long f(long x) - { - int s = 0; - while (x) { -- x >>= 1; -+ x /= 2; - s++; - } - return s; - } - - /* - * This is only an example! - */ - - -commit b511694f5337663fbd697622993a5f8e1099eca84be4df313f2b3ee94a098b42 -Author: Thomas Rast <trast@inf.ethz.ch> -Date: Fri Apr 12 16:15:57 2013 +0200 - - change on another line of history while rename happens - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -4,14 +4,14 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* -- * This is only an example! -+ * This is only a short example! - */ - - -commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:41 2013 +0100 - - touch comment - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,14 +3,14 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* -- * A comment. -+ * This is only an example! - */ - - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,14 +3,14 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * A comment. - */ - - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,13 +3,14 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - - /* - * A comment. - */ - - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,13 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} -+ -+/* -+ * A comment. -+ */ -+ diff --git a/third_party/git/t/t4211/sha256/expect.simple-f b/third_party/git/t/t4211/sha256/expect.simple-f deleted file mode 100644 index 65508d7c0b..0000000000 --- a/third_party/git/t/t4211/sha256/expect.simple-f +++ /dev/null @@ -1,59 +0,0 @@ -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,9 +3,9 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,8 +3,9 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,8 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} diff --git a/third_party/git/t/t4211/sha256/expect.simple-f-to-main b/third_party/git/t/t4211/sha256/expect.simple-f-to-main deleted file mode 100644 index 77b721c196..0000000000 --- a/third_party/git/t/t4211/sha256/expect.simple-f-to-main +++ /dev/null @@ -1,100 +0,0 @@ -commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:41 2013 +0100 - - touch comment - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,14 +3,14 @@ - long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* -- * A comment. -+ * This is only an example! - */ - - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,14 +3,14 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } - - /* - * A comment. - */ - - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,13 +3,14 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - - /* - * A comment. - */ - - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,13 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} -+ -+/* -+ * A comment. -+ */ -+ diff --git a/third_party/git/t/t4211/sha256/expect.simple-main b/third_party/git/t/t4211/sha256/expect.simple-main deleted file mode 100644 index d20708c9f9..0000000000 --- a/third_party/git/t/t4211/sha256/expect.simple-main +++ /dev/null @@ -1,68 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,5 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,5 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -17,5 +17,5 @@ - int main () - { -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +16,5 @@ -+int main () -+{ -+ printf("%d\n", f(15)); -+ return 0; -+} diff --git a/third_party/git/t/t4211/sha256/expect.simple-main-to-end b/third_party/git/t/t4211/sha256/expect.simple-main-to-end deleted file mode 100644 index 617cdf3481..0000000000 --- a/third_party/git/t/t4211/sha256/expect.simple-main-to-end +++ /dev/null @@ -1,70 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,7 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} -+ -+/* incomplete lines are bad! */ - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,5 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -17,5 +17,5 @@ - int main () - { -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +16,5 @@ -+int main () -+{ -+ printf("%d\n", f(15)); -+ return 0; -+} diff --git a/third_party/git/t/t4211/sha256/expect.two-ranges b/third_party/git/t/t4211/sha256/expect.two-ranges deleted file mode 100644 index af57c8b997..0000000000 --- a/third_party/git/t/t4211/sha256/expect.two-ranges +++ /dev/null @@ -1,102 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,5 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -\ No newline at end of file -+} - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -18,5 +18,5 @@ - int main () - { - printf("%ld\n", f(15)); - return 0; --} -+} -\ No newline at end of file - -commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:45:16 2013 +0100 - - touch both functions - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,9 +3,9 @@ --int f(int x) -+long f(long x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } - return s; - } -@@ -17,5 +17,5 @@ - int main () - { -- printf("%d\n", f(15)); -+ printf("%ld\n", f(15)); - return 0; - } - -commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:55 2013 +0100 - - change f() - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -3,8 +3,9 @@ - int f(int x) - { - int s = 0; - while (x) { - x >>= 1; - s++; - } -+ return s; - } - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +3,8 @@ -+int f(int x) -+{ -+ int s = 0; -+ while (x) { -+ x >>= 1; -+ s++; -+ } -+} diff --git a/third_party/git/t/t4211/sha256/expect.vanishes-early b/third_party/git/t/t4211/sha256/expect.vanishes-early deleted file mode 100644 index 11ec9bdecf..0000000000 --- a/third_party/git/t/t4211/sha256/expect.vanishes-early +++ /dev/null @@ -1,39 +0,0 @@ -commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:43 2013 +0100 - - change back to complete line - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -22,1 +24,1 @@ --} -\ No newline at end of file -+/* incomplete lines are bad! */ - -commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:48:10 2013 +0100 - - change to an incomplete line at end - -diff --git a/a.c b/a.c ---- a/a.c -+++ b/a.c -@@ -22,1 +22,1 @@ --} -+} -\ No newline at end of file - -commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 -Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:44:48 2013 +0100 - - initial - -diff --git a/a.c b/a.c ---- /dev/null -+++ b/a.c -@@ -0,0 +20,1 @@ -+} diff --git a/third_party/git/t/t4213-log-tabexpand.sh b/third_party/git/t/t4213-log-tabexpand.sh index 53a4af3244..7f90f58c03 100755 --- a/third_party/git/t/t4213-log-tabexpand.sh +++ b/third_party/git/t/t4213-log-tabexpand.sh @@ -36,7 +36,7 @@ count_expand () esac # Prefix the output with the command line arguments, and - # replace SP with a dot both in the expected and actual output + # replace SP with a dot both in the expecte and actual output # so that test_cmp would show the difference together with the # breakage in a way easier to consume by the debugging user. { diff --git a/third_party/git/t/t4214-log-graph-octopus.sh b/third_party/git/t/t4214-log-graph-octopus.sh index a080325098..dab96c89aa 100755 --- a/third_party/git/t/t4214-log-graph-octopus.sh +++ b/third_party/git/t/t4214-log-graph-octopus.sh @@ -3,86 +3,82 @@ test_description='git log --graph of skewed left octopus merge.' . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-log-graph.sh - -test_cmp_graph () { - cat >expect && - lib_test_cmp_graph --color=never --date-order --format=%s "$@" -} - -test_cmp_colored_graph () { - lib_test_cmp_colored_graph --date-order --format=%s "$@" -} test_expect_success 'set up merge history' ' - test_commit initial && - for i in 1 2 3 4 ; do - git checkout master -b $i || return $? - # Make tag name different from branch name, to avoid - # ambiguity error when calling checkout. - test_commit $i $i $i tag$i || return $? - done && - git checkout 1 -b merge && - test_merge octopus-merge 1 2 3 4 && - test_commit after-merge && - git checkout 1 -b L && - test_commit left && - git checkout 4 -b crossover && - test_commit after-4 && - git checkout initial -b more-L && - test_commit after-initial -' - -test_expect_success 'log --graph with tricky octopus merge, no color' ' - test_cmp_graph left octopus-merge <<-\EOF + cat >expect.uncolored <<-\EOF && * left - | *-. octopus-merge - |/|\ \ + | *---. octopus-merge + | |\ \ \ + |/ / / / | | | * 4 | | * | 3 | | |/ - | * / 2 + | * | 2 | |/ - * / 1 + * | 1 |/ * initial EOF -' - -test_expect_success 'log --graph with tricky octopus merge with colors' ' - test_config log.graphColors red,green,yellow,blue,magenta,cyan && cat >expect.colors <<-\EOF && * left - <RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET> octopus-merge - <RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> + <RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET> octopus-merge + <RED>|<RESET> <RED>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET> + <RED>|<RESET><RED>/<RESET> <YELLOW>/<RESET> <BLUE>/<RESET> <MAGENTA>/<RESET> <RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4 <RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3 <RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET> - <RED>|<RESET> * <MAGENTA>/<RESET> 2 + <RED>|<RESET> * <MAGENTA>|<RESET> 2 <RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET> - * <MAGENTA>/<RESET> 1 + * <MAGENTA>|<RESET> 1 <MAGENTA>|<RESET><MAGENTA>/<RESET> * initial EOF - test_cmp_colored_graph left octopus-merge + test_commit initial && + for i in 1 2 3 4 ; do + git checkout master -b $i || return $? + # Make tag name different from branch name, to avoid + # ambiguity error when calling checkout. + test_commit $i $i $i tag$i || return $? + done && + git checkout 1 -b merge && + test_tick && + git merge -m octopus-merge 1 2 3 4 && + git checkout 1 -b L && + test_commit left +' + +test_expect_success 'log --graph with tricky octopus merge with colors' ' + test_config log.graphColors red,green,yellow,blue,magenta,cyan && + git log --color=always --graph --date-order --pretty=tformat:%s --all >actual.colors.raw && + test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors && + test_cmp expect.colors actual.colors +' + +test_expect_success 'log --graph with tricky octopus merge, no color' ' + git log --color=never --graph --date-order --pretty=tformat:%s --all >actual.raw && + sed "s/ *\$//" actual.raw >actual && + test_cmp expect.uncolored actual ' # Repeat the previous two tests with "normal" octopus merge (i.e., # without the first parent skewing to the "left" branch column). test_expect_success 'log --graph with normal octopus merge, no color' ' - test_cmp_graph octopus-merge <<-\EOF + cat >expect.uncolored <<-\EOF && *---. octopus-merge |\ \ \ | | | * 4 | | * | 3 | | |/ - | * / 2 + | * | 2 | |/ - * / 1 + * | 1 |/ * initial EOF + git log --color=never --graph --date-order --pretty=tformat:%s merge >actual.raw && + sed "s/ *\$//" actual.raw >actual && + test_cmp expect.uncolored actual ' test_expect_success 'log --graph with normal octopus merge with colors' ' @@ -92,256 +88,15 @@ test_expect_success 'log --graph with normal octopus merge with colors' ' <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4 <RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3 <RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET> - <RED>|<RESET> * <BLUE>/<RESET> 2 + <RED>|<RESET> * <BLUE>|<RESET> 2 <RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET> - * <BLUE>/<RESET> 1 + * <BLUE>|<RESET> 1 <BLUE>|<RESET><BLUE>/<RESET> * initial EOF test_config log.graphColors red,green,yellow,blue,magenta,cyan && - test_cmp_colored_graph octopus-merge + git log --color=always --graph --date-order --pretty=tformat:%s merge >actual.colors.raw && + test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors && + test_cmp expect.colors actual.colors ' - -test_expect_success 'log --graph with normal octopus merge and child, no color' ' - test_cmp_graph after-merge <<-\EOF - * after-merge - *---. octopus-merge - |\ \ \ - | | | * 4 - | | * | 3 - | | |/ - | * / 2 - | |/ - * / 1 - |/ - * initial - EOF -' - -test_expect_success 'log --graph with normal octopus and child merge with colors' ' - cat >expect.colors <<-\EOF && - * after-merge - *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET> octopus-merge - <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET> - <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4 - <GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3 - <GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET> - <GREEN>|<RESET> * <MAGENTA>/<RESET> 2 - <GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET> - * <MAGENTA>/<RESET> 1 - <MAGENTA>|<RESET><MAGENTA>/<RESET> - * initial - EOF - test_config log.graphColors red,green,yellow,blue,magenta,cyan && - test_cmp_colored_graph after-merge -' - -test_expect_success 'log --graph with tricky octopus merge and its child, no color' ' - test_cmp_graph left after-merge <<-\EOF - * left - | * after-merge - | *-. octopus-merge - |/|\ \ - | | | * 4 - | | * | 3 - | | |/ - | * / 2 - | |/ - * / 1 - |/ - * initial - EOF -' - -test_expect_success 'log --graph with tricky octopus merge and its child with colors' ' - test_config log.graphColors red,green,yellow,blue,magenta,cyan && - cat >expect.colors <<-\EOF && - * left - <RED>|<RESET> * after-merge - <RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET> octopus-merge - <RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET> - <RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4 - <RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3 - <RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET> - <RED>|<RESET> * <CYAN>/<RESET> 2 - <RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET> - * <CYAN>/<RESET> 1 - <CYAN>|<RESET><CYAN>/<RESET> - * initial - EOF - test_cmp_colored_graph left after-merge -' - -test_expect_success 'log --graph with crossover in octopus merge, no color' ' - test_cmp_graph after-4 octopus-merge <<-\EOF - * after-4 - | *---. octopus-merge - | |\ \ \ - | |_|_|/ - |/| | | - * | | | 4 - | | | * 3 - | |_|/ - |/| | - | | * 2 - | |/ - |/| - | * 1 - |/ - * initial - EOF -' - -test_expect_success 'log --graph with crossover in octopus merge with colors' ' - test_config log.graphColors red,green,yellow,blue,magenta,cyan && - cat >expect.colors <<-\EOF && - * after-4 - <RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><RED>-<RESET><RED>.<RESET> octopus-merge - <RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <RED>\<RESET> - <RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> - * <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> 4 - <MAGENTA>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3 - <MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>_<RESET><YELLOW>|<RESET><MAGENTA>/<RESET> - <MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> - <MAGENTA>|<RESET> <GREEN>|<RESET> * 2 - <MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>/<RESET> - <MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> - <MAGENTA>|<RESET> * 1 - <MAGENTA>|<RESET><MAGENTA>/<RESET> - * initial - EOF - test_cmp_colored_graph after-4 octopus-merge -' - -test_expect_success 'log --graph with crossover in octopus merge and its child, no color' ' - test_cmp_graph after-4 after-merge <<-\EOF - * after-4 - | * after-merge - | *---. octopus-merge - | |\ \ \ - | |_|_|/ - |/| | | - * | | | 4 - | | | * 3 - | |_|/ - |/| | - | | * 2 - | |/ - |/| - | * 1 - |/ - * initial - EOF -' - -test_expect_success 'log --graph with crossover in octopus merge and its child with colors' ' - test_config log.graphColors red,green,yellow,blue,magenta,cyan && - cat >expect.colors <<-\EOF && - * after-4 - <RED>|<RESET> * after-merge - <RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><RED>-<RESET><RED>.<RESET> octopus-merge - <RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <RED>\<RESET> - <RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> - * <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> 4 - <CYAN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3 - <CYAN>|<RESET> <YELLOW>|<RESET><CYAN>_<RESET><BLUE>|<RESET><CYAN>/<RESET> - <CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> - <CYAN>|<RESET> <YELLOW>|<RESET> * 2 - <CYAN>|<RESET> <YELLOW>|<RESET><CYAN>/<RESET> - <CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> - <CYAN>|<RESET> * 1 - <CYAN>|<RESET><CYAN>/<RESET> - * initial - EOF - test_cmp_colored_graph after-4 after-merge -' - -test_expect_success 'log --graph with unrelated commit and octopus tip, no color' ' - test_cmp_graph after-initial octopus-merge <<-\EOF - * after-initial - | *---. octopus-merge - | |\ \ \ - | | | | * 4 - | |_|_|/ - |/| | | - | | | * 3 - | |_|/ - |/| | - | | * 2 - | |/ - |/| - | * 1 - |/ - * initial - EOF -' - -test_expect_success 'log --graph with unrelated commit and octopus tip with colors' ' - test_config log.graphColors red,green,yellow,blue,magenta,cyan && - cat >expect.colors <<-\EOF && - * after-initial - <RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET> octopus-merge - <RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET> - <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4 - <RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> - <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3 - <RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> - <RED>|<RESET> <GREEN>|<RESET> * 2 - <RED>|<RESET> <GREEN>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><GREEN>|<RESET> - <RED>|<RESET> * 1 - <RED>|<RESET><RED>/<RESET> - * initial - EOF - test_cmp_colored_graph after-initial octopus-merge -' - -test_expect_success 'log --graph with unrelated commit and octopus child, no color' ' - test_cmp_graph after-initial after-merge <<-\EOF - * after-initial - | * after-merge - | *---. octopus-merge - | |\ \ \ - | | | | * 4 - | |_|_|/ - |/| | | - | | | * 3 - | |_|/ - |/| | - | | * 2 - | |/ - |/| - | * 1 - |/ - * initial - EOF -' - -test_expect_success 'log --graph with unrelated commit and octopus child with colors' ' - test_config log.graphColors red,green,yellow,blue,magenta,cyan && - cat >expect.colors <<-\EOF && - * after-initial - <RED>|<RESET> * after-merge - <RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET> octopus-merge - <RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET> - <RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4 - <RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> - <RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3 - <RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> - <RED>|<RESET> <YELLOW>|<RESET> * 2 - <RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET> - <RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> - <RED>|<RESET> * 1 - <RED>|<RESET><RED>/<RESET> - * initial - EOF - test_cmp_colored_graph after-initial after-merge -' - test_done diff --git a/third_party/git/t/t4215-log-skewed-merges.sh b/third_party/git/t/t4215-log-skewed-merges.sh deleted file mode 100755 index 28d0779a8c..0000000000 --- a/third_party/git/t/t4215-log-skewed-merges.sh +++ /dev/null @@ -1,373 +0,0 @@ -#!/bin/sh - -test_description='git log --graph of skewed merges' - -. ./test-lib.sh -. "$TEST_DIRECTORY"/lib-log-graph.sh - -check_graph () { - cat >expect && - lib_test_cmp_graph --format=%s "$@" -} - -test_expect_success 'log --graph with merge fusing with its left and right neighbors' ' - git checkout --orphan _p && - test_commit A && - test_commit B && - git checkout -b _q @^ && test_commit C && - git checkout -b _r @^ && test_commit D && - git checkout _p && git merge --no-ff _q _r -m E && - git checkout _r && test_commit F && - git checkout _p && git merge --no-ff _r -m G && - git checkout @^^ && git merge --no-ff _p -m H && - - check_graph <<-\EOF - * H - |\ - | * G - | |\ - | | * F - | * | E - |/|\| - | | * D - | * | C - | |/ - * / B - |/ - * A - EOF -' - -test_expect_success 'log --graph with left-skewed merge' ' - git checkout --orphan 0_p && test_commit 0_A && - git checkout -b 0_q 0_p && test_commit 0_B && - git checkout -b 0_r 0_p && - test_commit 0_C && - test_commit 0_D && - git checkout -b 0_s 0_p && test_commit 0_E && - git checkout -b 0_t 0_p && git merge --no-ff 0_r^ 0_s -m 0_F && - git checkout 0_p && git merge --no-ff 0_s -m 0_G && - git checkout @^ && git merge --no-ff 0_q 0_r 0_t 0_p -m 0_H && - - check_graph <<-\EOF - *-----. 0_H - |\ \ \ \ - | | | | * 0_G - | |_|_|/| - |/| | | | - | | | * | 0_F - | |_|/|\| - |/| | | | - | | | | * 0_E - | |_|_|/ - |/| | | - | | * | 0_D - | | |/ - | | * 0_C - | |/ - |/| - | * 0_B - |/ - * 0_A - EOF -' - -test_expect_success 'log --graph with nested left-skewed merge' ' - git checkout --orphan 1_p && - test_commit 1_A && - test_commit 1_B && - test_commit 1_C && - git checkout -b 1_q @^ && test_commit 1_D && - git checkout 1_p && git merge --no-ff 1_q -m 1_E && - git checkout -b 1_r @~3 && test_commit 1_F && - git checkout 1_p && git merge --no-ff 1_r -m 1_G && - git checkout @^^ && git merge --no-ff 1_p -m 1_H && - - check_graph <<-\EOF - * 1_H - |\ - | * 1_G - | |\ - | | * 1_F - | * | 1_E - |/| | - | * | 1_D - * | | 1_C - |/ / - * / 1_B - |/ - * 1_A - EOF -' - -test_expect_success 'log --graph with nested left-skewed merge following normal merge' ' - git checkout --orphan 2_p && - test_commit 2_A && - test_commit 2_B && - test_commit 2_C && - git checkout -b 2_q @^^ && - test_commit 2_D && - test_commit 2_E && - git checkout -b 2_r @^ && test_commit 2_F && - git checkout 2_q && - git merge --no-ff 2_r -m 2_G && - git merge --no-ff 2_p^ -m 2_H && - git checkout -b 2_s @^^ && git merge --no-ff 2_q -m 2_J && - git checkout 2_p && git merge --no-ff 2_s -m 2_K && - - check_graph <<-\EOF - * 2_K - |\ - | * 2_J - | |\ - | | * 2_H - | | |\ - | | * | 2_G - | |/| | - | | * | 2_F - | * | | 2_E - | |/ / - | * | 2_D - * | | 2_C - | |/ - |/| - * | 2_B - |/ - * 2_A - EOF -' - -test_expect_success 'log --graph with nested right-skewed merge following left-skewed merge' ' - git checkout --orphan 3_p && - test_commit 3_A && - git checkout -b 3_q && - test_commit 3_B && - test_commit 3_C && - git checkout -b 3_r @^ && - test_commit 3_D && - git checkout 3_q && git merge --no-ff 3_r -m 3_E && - git checkout 3_p && git merge --no-ff 3_q -m 3_F && - git checkout 3_r && test_commit 3_G && - git checkout 3_p && git merge --no-ff 3_r -m 3_H && - git checkout @^^ && git merge --no-ff 3_p -m 3_J && - - check_graph <<-\EOF - * 3_J - |\ - | * 3_H - | |\ - | | * 3_G - | * | 3_F - |/| | - | * | 3_E - | |\| - | | * 3_D - | * | 3_C - | |/ - | * 3_B - |/ - * 3_A - EOF -' - -test_expect_success 'log --graph with right-skewed merge following a left-skewed one' ' - git checkout --orphan 4_p && - test_commit 4_A && - test_commit 4_B && - test_commit 4_C && - git checkout -b 4_q @^^ && test_commit 4_D && - git checkout -b 4_r 4_p^ && git merge --no-ff 4_q -m 4_E && - git checkout -b 4_s 4_p^^ && - git merge --no-ff 4_r -m 4_F && - git merge --no-ff 4_p -m 4_G && - git checkout @^^ && git merge --no-ff 4_s -m 4_H && - - check_graph --date-order <<-\EOF - * 4_H - |\ - | * 4_G - | |\ - | * | 4_F - |/| | - | * | 4_E - | |\ \ - | | * | 4_D - | |/ / - |/| | - | | * 4_C - | |/ - | * 4_B - |/ - * 4_A - EOF -' - -test_expect_success 'log --graph with octopus merge with column joining its penultimate parent' ' - git checkout --orphan 5_p && - test_commit 5_A && - git branch 5_q && - git branch 5_r && - test_commit 5_B && - git checkout 5_q && test_commit 5_C && - git checkout 5_r && test_commit 5_D && - git checkout 5_p && - git merge --no-ff 5_q 5_r -m 5_E && - git checkout 5_q && test_commit 5_F && - git checkout -b 5_s 5_p^ && - git merge --no-ff 5_p 5_q -m 5_G && - git checkout 5_r && - git merge --no-ff 5_s -m 5_H && - - check_graph <<-\EOF - * 5_H - |\ - | *-. 5_G - | |\ \ - | | | * 5_F - | | * | 5_E - | |/|\ \ - | |_|/ / - |/| | / - | | |/ - * | | 5_D - | | * 5_C - | |/ - |/| - | * 5_B - |/ - * 5_A - EOF -' - -test_expect_success 'log --graph with multiple tips' ' - git checkout --orphan 6_1 && - test_commit 6_A && - git branch 6_2 && - git branch 6_4 && - test_commit 6_B && - git branch 6_3 && - test_commit 6_C && - git checkout 6_2 && test_commit 6_D && - git checkout 6_3 && test_commit 6_E && - git checkout -b 6_5 6_1 && - git merge --no-ff 6_2 -m 6_F && - git checkout 6_4 && test_commit 6_G && - git checkout 6_3 && - git merge --no-ff 6_4 -m 6_H && - git checkout 6_1 && - git merge --no-ff 6_2 -m 6_I && - - check_graph 6_1 6_3 6_5 <<-\EOF - * 6_I - |\ - | | * 6_H - | | |\ - | | | * 6_G - | | * | 6_E - | | | | * 6_F - | |_|_|/| - |/| | |/ - | | |/| - | |/| | - | * | | 6_D - | | |/ - | |/| - * | | 6_C - | |/ - |/| - * | 6_B - |/ - * 6_A - EOF -' - -test_expect_success 'log --graph with multiple tips and colors' ' - test_config log.graphColors red,green,yellow,blue,magenta,cyan && - cat >expect.colors <<-\EOF && - * 6_I - <RED>|<RESET><GREEN>\<RESET> - <RED>|<RESET> <GREEN>|<RESET> * 6_H - <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> - <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 6_G - <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 6_F - <RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET><GREEN>|<RESET> - <RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET><GREEN>/<RESET> - <RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET><GREEN>/<RESET><BLUE>|<RESET> - <RED>|<RESET> <GREEN>|<RESET><GREEN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> - <RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 6_E - <RED>|<RESET> * <CYAN>|<RESET> <BLUE>|<RESET> 6_D - <RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><BLUE>/<RESET> - <RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET><CYAN>|<RESET> - * <BLUE>|<RESET> <CYAN>|<RESET> 6_C - <CYAN>|<RESET> <BLUE>|<RESET><CYAN>/<RESET> - <CYAN>|<RESET><CYAN>/<RESET><BLUE>|<RESET> - * <BLUE>|<RESET> 6_B - <BLUE>|<RESET><BLUE>/<RESET> - * 6_A - EOF - lib_test_cmp_colored_graph --date-order --pretty=tformat:%s 6_1 6_3 6_5 -' - -test_expect_success 'log --graph with multiple tips' ' - git checkout --orphan 7_1 && - test_commit 7_A && - test_commit 7_B && - test_commit 7_C && - git checkout -b 7_2 7_1~2 && - test_commit 7_D && - test_commit 7_E && - git checkout -b 7_3 7_1~1 && - test_commit 7_F && - test_commit 7_G && - git checkout -b 7_4 7_2~1 && - test_commit 7_H && - git checkout -b 7_5 7_1~2 && - test_commit 7_I && - git checkout -b 7_6 7_3~1 && - test_commit 7_J && - git checkout -b M_1 7_1 && - git merge --no-ff 7_2 -m 7_M1 && - git checkout -b M_3 7_3 && - git merge --no-ff 7_4 -m 7_M2 && - git checkout -b M_5 7_5 && - git merge --no-ff 7_6 -m 7_M3 && - git checkout -b M_7 7_1 && - git merge --no-ff 7_2 7_3 -m 7_M4 && - - check_graph M_1 M_3 M_5 M_7 <<-\EOF - * 7_M1 - |\ - | | * 7_M2 - | | |\ - | | | * 7_H - | | | | * 7_M3 - | | | | |\ - | | | | | * 7_J - | | | | * | 7_I - | | | | | | * 7_M4 - | |_|_|_|_|/|\ - |/| | | | |/ / - | | |_|_|/| / - | |/| | | |/ - | | | |_|/| - | | |/| | | - | | * | | | 7_G - | | | |_|/ - | | |/| | - | | * | | 7_F - | * | | | 7_E - | | |/ / - | |/| | - | * | | 7_D - | | |/ - | |/| - * | | 7_C - | |/ - |/| - * | 7_B - |/ - * 7_A - EOF -' - -test_done diff --git a/third_party/git/t/t4256-am-format-flowed.sh b/third_party/git/t/t4256-am-format-flowed.sh index 2369c4e17a..6340310e9a 100755 --- a/third_party/git/t/t4256-am-format-flowed.sh +++ b/third_party/git/t/t4256-am-format-flowed.sh @@ -11,7 +11,7 @@ test_expect_success 'setup' ' ' test_expect_success 'am with format=flowed' ' - git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr && + git am <"$TEST_DIRECTORY/t4256/1/patch" >stdout 2>stderr && test_i18ngrep "warning: Patch sent with format=flowed" stderr && test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c ' diff --git a/third_party/git/t/t4300-merge-tree.sh b/third_party/git/t/t4300-merge-tree.sh index e59601e5fe..d87cc7d9ef 100755 --- a/third_party/git/t/t4300-merge-tree.sh +++ b/third_party/git/t/t4300-merge-tree.sh @@ -11,16 +11,16 @@ test_expect_success setup ' ' test_expect_success 'file add A, !B' ' - git reset --hard initial && - test_commit "add-a-not-b" "ONE" "AAA" && - git merge-tree initial initial add-a-not-b >actual && - cat >expected <<EXPECTED && + cat >expected <<\EXPECTED && added in remote - their 100644 $(git rev-parse HEAD:ONE) ONE + their 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE @@ -0,0 +1 @@ +AAA EXPECTED + git reset --hard initial && + test_commit "add-a-not-b" "ONE" "AAA" && + git merge-tree initial initial add-a-not-b >actual && test_cmp expected actual ' @@ -41,15 +41,10 @@ test_expect_success 'file add A, B (same)' ' ' test_expect_success 'file add A, B (different)' ' - git reset --hard initial && - test_commit "add-a-b-diff-A" "ONE" "AAA" && - git reset --hard initial && - test_commit "add-a-b-diff-B" "ONE" "BBB" && - git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual && - cat >expected <<EXPECTED && + cat >expected <<\EXPECTED && added in both - our 100644 $(git rev-parse add-a-b-diff-A:ONE) ONE - their 100644 $(git rev-parse add-a-b-diff-B:ONE) ONE + our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE + their 100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE @@ -1 +1,5 @@ +<<<<<<< .our AAA @@ -58,6 +53,11 @@ added in both +>>>>>>> .their EXPECTED + git reset --hard initial && + test_commit "add-a-b-diff-A" "ONE" "AAA" && + git reset --hard initial && + test_commit "add-a-b-diff-B" "ONE" "BBB" && + git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual && test_cmp expected actual ' @@ -69,18 +69,18 @@ test_expect_success 'file change A, !B' ' ' test_expect_success 'file change !A, B' ' - git reset --hard initial && - test_commit "change-not-a-b" "initial-file" "BBB" && - git merge-tree initial initial change-not-a-b >actual && - cat >expected <<EXPECTED && + cat >expected <<\EXPECTED && merged - result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file - our 100644 $(git rev-parse initial:initial-file ) initial-file + result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file + our 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file @@ -1 +1 @@ -initial +BBB EXPECTED + git reset --hard initial && + test_commit "change-not-a-b" "initial-file" "BBB" && + git merge-tree initial initial change-not-a-b >actual && test_cmp expected actual ' @@ -94,16 +94,11 @@ test_expect_success 'file change A, B (same)' ' ' test_expect_success 'file change A, B (different)' ' - git reset --hard initial && - test_commit "change-a-b-diff-A" "initial-file" "AAA" && - git reset --hard initial && - test_commit "change-a-b-diff-B" "initial-file" "BBB" && - git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual && - cat >expected <<EXPECTED && + cat >expected <<\EXPECTED && changed in both - base 100644 $(git rev-parse initial:initial-file ) initial-file - our 100644 $(git rev-parse change-a-b-diff-A:initial-file) initial-file - their 100644 $(git rev-parse change-a-b-diff-B:initial-file) initial-file + base 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file + our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file + their 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file @@ -1 +1,5 @@ +<<<<<<< .our AAA @@ -112,10 +107,34 @@ changed in both +>>>>>>> .their EXPECTED + git reset --hard initial && + test_commit "change-a-b-diff-A" "initial-file" "AAA" && + git reset --hard initial && + test_commit "change-a-b-diff-B" "initial-file" "BBB" && + git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual && test_cmp expected actual ' test_expect_success 'file change A, B (mixed)' ' + cat >expected <<\EXPECTED && +changed in both + base 100644 f4f1f998c7776568c4ff38f516d77fef9399b5a7 ONE + our 100644 af14c2c3475337c73759d561ef70b59e5c731176 ONE + their 100644 372d761493f524d44d59bd24700c3bdf914c973c ONE +@@ -7,7 +7,11 @@ + AAA + AAA + AAA ++<<<<<<< .our + BBB ++======= ++CCC ++>>>>>>> .their + AAA + AAA + AAA +EXPECTED + git reset --hard initial && test_commit "change-a-b-mix-base" "ONE" " AAA @@ -140,26 +159,6 @@ AAA" && "$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)" && git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \ >actual && - - cat >expected <<EXPECTED && -changed in both - base 100644 $(git rev-parse change-a-b-mix-base:ONE) ONE - our 100644 $(git rev-parse change-a-b-mix-A:ONE ) ONE - their 100644 $(git rev-parse change-a-b-mix-B:ONE ) ONE -@@ -7,7 +7,11 @@ - AAA - AAA - AAA -+<<<<<<< .our - BBB -+======= -+CCC -+>>>>>>> .their - AAA - AAA - AAA -EXPECTED - test_cmp expected actual ' @@ -174,20 +173,20 @@ test_expect_success 'file remove A, !B' ' ' test_expect_success 'file remove !A, B' ' + cat >expected <<\EXPECTED && +removed in remote + base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE + our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE +@@ -1 +0,0 @@ +-AAA +EXPECTED + git reset --hard initial && test_commit "rm-not-a-b-base" "ONE" "AAA" && git rm ONE && git commit -m "rm-not-a-b" && git tag "rm-not-a-b" && git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual && - cat >expected <<EXPECTED && -removed in remote - base 100644 $(git rev-parse rm-a-not-b-base:ONE) ONE - our 100644 $(git rev-parse rm-a-not-b-base:ONE) ONE -@@ -1 +0,0 @@ --AAA -EXPECTED - test_cmp expected actual ' @@ -202,6 +201,14 @@ test_expect_success 'file remove A, B (same)' ' ' test_expect_success 'file change A, remove B' ' + cat >expected <<\EXPECTED && +removed in remote + base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE + our 100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE +@@ -1 +0,0 @@ +-BBB +EXPECTED + git reset --hard initial && test_commit "change-a-rm-b-base" "ONE" "AAA" && test_commit "change-a-rm-b-A" "ONE" "BBB" && @@ -211,18 +218,16 @@ test_expect_success 'file change A, remove B' ' git tag "change-a-rm-b-B" && git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \ >actual && - cat >expected <<EXPECTED && -removed in remote - base 100644 $(git rev-parse change-a-rm-b-base:ONE) ONE - our 100644 $(git rev-parse change-a-rm-b-A:ONE ) ONE -@@ -1 +0,0 @@ --BBB -EXPECTED - test_cmp expected actual ' test_expect_success 'file remove A, change B' ' + cat >expected <<\EXPECTED && +removed in local + base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE + their 100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE +EXPECTED + git reset --hard initial && test_commit "rm-a-change-b-base" "ONE" "AAA" && @@ -233,11 +238,6 @@ test_expect_success 'file remove A, change B' ' test_commit "rm-a-change-b-B" "ONE" "BBB" && git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \ >actual && - cat >expected <<EXPECTED && -removed in local - base 100644 $(git rev-parse rm-a-change-b-base:ONE) ONE - their 100644 $(git rev-parse rm-a-change-b-B:ONE ) ONE -EXPECTED test_cmp expected actual ' @@ -250,17 +250,10 @@ test_expect_success 'tree add A, B (same)' ' ' test_expect_success 'tree add A, B (different)' ' - git reset --hard initial && - mkdir sub && - test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A && - git reset --hard initial && - mkdir sub && - test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B && - git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual && - cat >expect <<-EOF && + cat >expect <<-\EOF && added in both - our 100644 $(git rev-parse add-tree-a-b-A:sub/file) sub/file - their 100644 $(git rev-parse add-tree-a-b-B:sub/file) sub/file + our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file + their 100644 ba629238ca89489f2b350e196ca445e09d8bb834 sub/file @@ -1 +1,5 @@ +<<<<<<< .our AAA @@ -268,10 +261,24 @@ test_expect_success 'tree add A, B (different)' ' +BBB +>>>>>>> .their EOF + git reset --hard initial && + mkdir sub && + test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A && + git reset --hard initial && + mkdir sub && + test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B && + git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual && test_cmp expect actual ' test_expect_success 'tree unchanged A, removed B' ' + cat >expect <<-\EOF && + removed in remote + base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file + our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file + @@ -1 +0,0 @@ + -AAA + EOF git reset --hard initial && mkdir sub && test_commit "add sub/file" "sub/file" "AAA" tree-remove-b-initial && @@ -280,13 +287,6 @@ test_expect_success 'tree unchanged A, removed B' ' git commit -m "remove sub/file" && git tag tree-remove-b-B && git merge-tree tree-remove-b-initial tree-remove-b-initial tree-remove-b-B >actual && - cat >expect <<-EOF && - removed in remote - base 100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file - our 100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file - @@ -1 +0,0 @@ - -AAA - EOF test_cmp expect actual ' @@ -296,14 +296,14 @@ test_expect_success 'turn file to tree' ' mkdir initial-file && test_commit "turn-file-to-tree" "initial-file/ONE" "CCC" && git merge-tree initial initial turn-file-to-tree >actual && - cat >expect <<-EOF && + cat >expect <<-\EOF && added in remote - their 100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE + their 100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 initial-file/ONE @@ -0,0 +1 @@ +CCC removed in remote - base 100644 $(git rev-parse initial:initial-file) initial-file - our 100644 $(git rev-parse initial:initial-file) initial-file + base 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file + our 100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file @@ -1 +0,0 @@ -initial EOF @@ -318,14 +318,14 @@ test_expect_success 'turn tree to file' ' rm -fr dir && test_commit "make-file" "dir" "CCC" && git merge-tree add-tree add-another-tree make-file >actual && - cat >expect <<-EOF && + cat >expect <<-\EOF && removed in remote - base 100644 $(git rev-parse add-tree:dir/path) dir/path - our 100644 $(git rev-parse add-tree:dir/path) dir/path + base 100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path + our 100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path @@ -1 +0,0 @@ -AAA added in remote - their 100644 $(git rev-parse make-file:dir) dir + their 100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 dir @@ -0,0 +1 @@ +CCC EOF diff --git a/third_party/git/t/t5004-archive-corner-cases.sh b/third_party/git/t/t5004-archive-corner-cases.sh index 3e7b23cb32..271eb5a1fd 100755 --- a/third_party/git/t/t5004-archive-corner-cases.sh +++ b/third_party/git/t/t5004-archive-corner-cases.sh @@ -204,23 +204,4 @@ test_expect_success EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO \ grep $size big.lst ' -build_tree() { - perl -e ' - my $hash = $ARGV[0]; - foreach my $order (2..6) { - $first = 10 ** $order; - foreach my $i (-13..-9) { - my $name = "a" x ($first + $i); - print "100644 blob $hash\t$name\n" - } - } - ' "$1" -} - -test_expect_success 'tar archive with long paths' ' - blob=$(echo foo | git hash-object -w --stdin) && - tree=$(build_tree $blob | git mktree) && - git archive -o long_paths.tar $tree -' - test_done diff --git a/third_party/git/t/t5100-mailinfo.sh b/third_party/git/t/t5100-mailinfo.sh index 147e616533..9690dcad4f 100755 --- a/third_party/git/t/t5100-mailinfo.sh +++ b/third_party/git/t/t5100-mailinfo.sh @@ -213,19 +213,4 @@ test_expect_failure 'mailinfo -b separated double [PATCH]' ' test z"$subj" = z"Subject: [other] message" ' -test_expect_success 'mailinfo handles unusual header whitespace' ' - git mailinfo /dev/null /dev/null >actual <<-\EOF && - From:Real Name <user@example.com> - Subject: extra spaces - EOF - - cat >expect <<-\EOF && - Author: Real Name - Email: user@example.com - Subject: extra spaces - - EOF - test_cmp expect actual -' - test_done diff --git a/third_party/git/t/t5150-request-pull.sh b/third_party/git/t/t5150-request-pull.sh index c1811ea0f4..852dcd913f 100755 --- a/third_party/git/t/t5150-request-pull.sh +++ b/third_party/git/t/t5150-request-pull.sh @@ -4,12 +4,6 @@ test_description='Test workflows involving pull request.' . ./test-lib.sh -if ! test_have_prereq PERL -then - skip_all='skipping request-pull tests, perl not available' - test_done -fi - test_expect_success 'setup' ' git init --bare upstream.git && @@ -150,6 +144,7 @@ test_expect_success 'pull request after push' ' git request-pull initial origin master:for-upstream >../request ) && sed -nf read-request.sed <request >digest && + cat digest && { read task && read repository && @@ -178,6 +173,7 @@ test_expect_success 'request asks HEAD to be pulled' ' git request-pull initial "$downstream_url" >../request ) && sed -nf read-request.sed <request >digest && + cat digest && { read task && read repository && diff --git a/third_party/git/t/t5302-pack-index.sh b/third_party/git/t/t5302-pack-index.sh index ad07f2f7fc..91d51b35f9 100755 --- a/third_party/git/t/t5302-pack-index.sh +++ b/third_party/git/t/t5302-pack-index.sh @@ -6,10 +6,9 @@ test_description='pack index with 64-bit offsets and object CRC' . ./test-lib.sh -test_expect_success 'setup' ' - test_oid_init && - rawsz=$(test_oid rawsz) && - rm -rf .git && +test_expect_success \ + 'setup' \ + 'rm -rf .git && git init && git config pack.threads 1 && i=1 && @@ -33,8 +32,7 @@ test_expect_success 'setup' ' echo $tree && git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/" } >obj-list && - git update-ref HEAD $commit -' + git update-ref HEAD $commit' test_expect_success \ 'pack-objects with index version 1' \ @@ -159,11 +157,10 @@ test_expect_success \ offs_101=$(index_obj_offset 1.idx $sha1_101) && nr_099=$(index_obj_nr 1.idx $sha1_099) && chmod +w ".git/objects/pack/pack-${pack1}.pack" && - recordsz=$((rawsz + 4)) && dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \ if=".git/objects/pack/pack-${pack1}.idx" \ - skip=$((4 + 256 * 4 + $nr_099 * recordsz)) \ - bs=1 count=$rawsz conv=notrunc && + skip=$((4 + 256 * 4 + $nr_099 * 24)) \ + bs=1 count=20 conv=notrunc && git cat-file blob $sha1_101 > file_101_foo1' test_expect_success \ @@ -203,8 +200,8 @@ test_expect_success \ chmod +w ".git/objects/pack/pack-${pack1}.pack" && dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \ if=".git/objects/pack/pack-${pack1}.idx" \ - skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \ - bs=1 count=$rawsz conv=notrunc && + skip=$((8 + 256 * 4 + $nr_099 * 20)) \ + bs=1 count=20 conv=notrunc && git cat-file blob $sha1_101 > file_101_foo2' test_expect_success \ @@ -229,7 +226,7 @@ test_expect_success \ nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) && chmod +w ".git/objects/pack/pack-${pack1}.idx" && printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \ - bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) && + bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * 20 + $nr * 4)) && ( while read obj do git cat-file -p $obj >/dev/null || exit 1 done <obj-list ) && diff --git a/third_party/git/t/t5307-pack-missing-commit.sh b/third_party/git/t/t5307-pack-missing-commit.sh index f4338abb78..dacb440b27 100755 --- a/third_party/git/t/t5307-pack-missing-commit.sh +++ b/third_party/git/t/t5307-pack-missing-commit.sh @@ -24,11 +24,11 @@ test_expect_success 'check corruption' ' ' test_expect_success 'rev-list notices corruption (1)' ' - test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD + test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list HEAD ' test_expect_success 'rev-list notices corruption (2)' ' - test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD + test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --objects HEAD ' test_expect_success 'pack-objects notices corruption' ' diff --git a/third_party/git/t/t5309-pack-delta-cycles.sh b/third_party/git/t/t5309-pack-delta-cycles.sh index 55b787630f..491556dad9 100755 --- a/third_party/git/t/t5309-pack-delta-cycles.sh +++ b/third_party/git/t/t5309-pack-delta-cycles.sh @@ -4,9 +4,15 @@ test_description='test index-pack handling of delta cycles in packfiles' . ./test-lib.sh . "$TEST_DIRECTORY"/lib-pack.sh +if ! test_have_prereq SHA1 +then + skip_all='not using SHA-1 for objects' + test_done +fi + # Two similar-ish objects that we have computed deltas between. -A=$(test_oid packlib_7_0) -B=$(test_oid packlib_7_76) +A=01d7713666f4de822776c7622c10f1b07de280dc +B=e68fe8129b546b101aee9510c5328e7f21ca1d18 # double-check our hand-constucted packs test_expect_success 'index-pack works with a single delta (A->B)' ' @@ -56,13 +62,13 @@ test_expect_success 'index-pack detects REF_DELTA cycles' ' test_must_fail git index-pack --fix-thin --stdin <cycle.pack ' -test_expect_success 'failover to an object in another pack' ' +test_expect_failure 'failover to an object in another pack' ' clear_packs && git index-pack --stdin <ab.pack && - test_must_fail git index-pack --stdin --fix-thin <cycle.pack + git index-pack --stdin --fix-thin <cycle.pack ' -test_expect_success 'failover to a duplicate object in the same pack' ' +test_expect_failure 'failover to a duplicate object in the same pack' ' clear_packs && { pack_header 3 && @@ -71,7 +77,7 @@ test_expect_success 'failover to a duplicate object in the same pack' ' pack_obj $A } >recoverable.pack && pack_trailer recoverable.pack && - test_must_fail git index-pack --fix-thin --stdin <recoverable.pack + git index-pack --fix-thin --stdin <recoverable.pack ' test_done diff --git a/third_party/git/t/t5310-pack-bitmaps.sh b/third_party/git/t/t5310-pack-bitmaps.sh index 8318781d2b..6640329ebf 100755 --- a/third_party/git/t/t5310-pack-bitmaps.sh +++ b/third_party/git/t/t5310-pack-bitmaps.sh @@ -74,22 +74,14 @@ rev_list_tests() { test_cmp expect actual ' - test_expect_success "counting objects via bitmap ($state)" ' - git rev-list --count --objects HEAD >expect && - git rev-list --use-bitmap-index --count --objects HEAD >actual && - test_cmp expect actual - ' - - test_expect_success "enumerate commits ($state)" ' - git rev-list --use-bitmap-index HEAD >actual && - git rev-list HEAD >expect && - test_bitmap_traversal --no-confirm-bitmaps expect actual - ' - test_expect_success "enumerate --objects ($state)" ' - git rev-list --objects --use-bitmap-index HEAD >actual && - git rev-list --objects HEAD >expect && - test_bitmap_traversal expect actual + git rev-list --objects --use-bitmap-index HEAD >tmp && + cut -d" " -f1 <tmp >tmp2 && + sort <tmp2 >actual && + git rev-list --objects HEAD >tmp && + cut -d" " -f1 <tmp >tmp2 && + sort <tmp2 >expect && + test_cmp expect actual ' test_expect_success "bitmap --objects handles non-commit objects ($state)" ' @@ -107,20 +99,6 @@ test_expect_success 'clone from bitmapped repository' ' test_cmp expect actual ' -test_expect_success 'partial clone from bitmapped repository' ' - test_config uploadpack.allowfilter true && - git clone --no-local --bare --filter=blob:none . partial-clone.git && - ( - cd partial-clone.git && - pack=$(echo objects/pack/*.pack) && - git verify-pack -v "$pack" >have && - awk "/blob/ { print \$1 }" <have >blobs && - # we expect this single blob because of the direct ref - git rev-parse refs/tags/tagged-blob >expect && - test_cmp expect blobs - ) -' - test_expect_success 'setup further non-bitmapped commits' ' test_commit_bulk --id=further 10 ' diff --git a/third_party/git/t/t5313-pack-bounds-checks.sh b/third_party/git/t/t5313-pack-bounds-checks.sh index 2a4557efc2..f1708d415e 100755 --- a/third_party/git/t/t5313-pack-bounds-checks.sh +++ b/third_party/git/t/t5313-pack-bounds-checks.sh @@ -38,27 +38,16 @@ munge () { # for the initial, and another ofs(4*nr) past that for the extended. # ofs_table () { - echo $((4 + 4 + 4*256 + $(test_oid rawsz)*$1 + 4*$1)) + echo $((4 + 4 + 4*256 + 20*$1 + 4*$1)) } extended_table () { echo $(($(ofs_table "$1") + 4*$1)) } -test_expect_success 'setup' ' - test_oid_init && - test_oid_cache <<-EOF - oid000 sha1:1485 - oid000 sha256:4222 - - oidfff sha1:74 - oidfff sha256:1350 - EOF -' - test_expect_success 'set up base packfile and variables' ' # the hash of this content starts with ff, which # makes some later computations much simpler - echo $(test_oid oidfff) >file && + echo 74 >file && git add file && git commit -m base && git repack -ad && @@ -151,10 +140,10 @@ test_expect_success 'bogus offset inside v2 extended table' ' # an extended table (if the first object were larger than 2^31). # # Note that the value is important here. We want $object as - # the second entry in sorted-hash order. The hash of this object starts + # the second entry in sorted-sha1 order. The sha1 of 1485 starts # with "000", which sorts before that of $object (which starts # with "fff"). - second=$(test_oid oid000 | git hash-object -w --stdin) && + second=$(echo 1485 | git hash-object -w --stdin) && do_pack "$object $second" --index-version=2 && # We have to make extra room for the table, so we cannot diff --git a/third_party/git/t/t5314-pack-cycle-detection.sh b/third_party/git/t/t5314-pack-cycle-detection.sh index 0aec8619e2..e525466de0 100755 --- a/third_party/git/t/t5314-pack-cycle-detection.sh +++ b/third_party/git/t/t5314-pack-cycle-detection.sh @@ -53,7 +53,7 @@ immediately after the lookup for "dummy". -# Create a pack containing the tree $1 and blob $1:file, with +# Create a pack containing the the tree $1 and blob $1:file, with # the latter stored as a delta against $2:file. # # We convince pack-objects to make the delta in the direction of our choosing diff --git a/third_party/git/t/t5317-pack-objects-filter-objects.sh b/third_party/git/t/t5317-pack-objects-filter-objects.sh index dc0446574b..2d2f5d0229 100755 --- a/third_party/git/t/t5317-pack-objects-filter-objects.sh +++ b/third_party/git/t/t5317-pack-objects-filter-objects.sh @@ -45,7 +45,12 @@ test_expect_success 'verify blob:none packfile has no blobs' ' git -C r1 index-pack ../filter.pack && git -C r1 verify-pack -v ../filter.pack >verify_result && - ! grep blob verify_result + grep blob verify_result | + awk -f print_1.awk | + sort >observed && + + nr=$(wc -l <observed) && + test 0 -eq $nr ' test_expect_success 'verify normal and blob:none packfiles have same commits/trees' ' @@ -67,8 +72,7 @@ test_expect_success 'get an error for missing tree object' ' echo foo >r5/foo && git -C r5 add foo && git -C r5 commit -m "foo" && - git -C r5 rev-parse HEAD^{tree} >tree && - del=$(sed "s|..|&/|" tree) && + del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") && rm r5/.git/objects/$del && test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF && HEAD @@ -144,7 +148,12 @@ test_expect_success 'verify blob:limit=500 omits all blobs' ' git -C r2 index-pack ../filter.pack && git -C r2 verify-pack -v ../filter.pack >verify_result && - ! grep blob verify_result + grep blob verify_result | + awk -f print_1.awk | + sort >observed && + + nr=$(wc -l <observed) && + test 0 -eq $nr ' test_expect_success 'verify blob:limit=1000' ' @@ -154,7 +163,12 @@ test_expect_success 'verify blob:limit=1000' ' git -C r2 index-pack ../filter.pack && git -C r2 verify-pack -v ../filter.pack >verify_result && - ! grep blob verify_result + grep blob verify_result | + awk -f print_1.awk | + sort >observed && + + nr=$(wc -l <observed) && + test 0 -eq $nr ' test_expect_success 'verify blob:limit=1001' ' @@ -216,9 +230,10 @@ test_expect_success 'verify explicitly specifying oversized blob in input' ' awk -f print_2.awk ls_files_result | sort >expected && - echo HEAD >objects && - git -C r2 rev-parse HEAD:large.10000 >>objects && - git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack && + git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF && + HEAD + $(git -C r2 rev-parse HEAD:large.10000) + EOF git -C r2 index-pack ../filter.pack && git -C r2 verify-pack -v ../filter.pack >verify_result && @@ -362,8 +377,7 @@ test_expect_success 'verify sparse:oid=OID' ' awk -f print_2.awk ls_files_result | sort >expected && - git -C r4 ls-files -s pattern >staged && - oid=$(awk -f print_2.awk staged) && + oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) && git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF && HEAD EOF diff --git a/third_party/git/t/t5318-commit-graph.sh b/third_party/git/t/t5318-commit-graph.sh index 9bf920ae17..22cb9d6643 100755 --- a/third_party/git/t/t5318-commit-graph.sh +++ b/third_party/git/t/t5318-commit-graph.sh @@ -19,14 +19,15 @@ test_expect_success 'verify graph with no graph file' ' test_expect_success 'write graph with no packs' ' cd "$TRASH_DIRECTORY/full" && - git commit-graph write --object-dir $objdir && - test_path_is_missing $objdir/info/commit-graph + git commit-graph write --object-dir . && + test_path_is_missing info/commit-graph ' -test_expect_success 'exit with correct error on bad input to --stdin-packs' ' +test_expect_success 'close with correct error on bad input' ' cd "$TRASH_DIRECTORY/full" && echo doesnotexist >in && - test_expect_code 1 git commit-graph write --stdin-packs <in 2>stderr && + { git commit-graph write --stdin-packs <in 2>stderr; ret=$?; } && + test "$ret" = 1 && test_i18ngrep "error adding pack" stderr ' @@ -40,15 +41,6 @@ test_expect_success 'create commits and repack' ' git repack ' -test_expect_success 'exit with correct error on bad input to --stdin-commits' ' - cd "$TRASH_DIRECTORY/full" && - echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr && - test_i18ngrep "invalid commit object id" stderr && - # valid tree OID, but not a commit OID - git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr && - test_i18ngrep "invalid commit object id" stderr -' - graph_git_two_modes() { git -c core.commitGraph=true $1 >output git -c core.commitGraph=false $1 >expect @@ -85,7 +77,7 @@ graph_read_expect() { num_commits: $1 chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL EOF - test-tool read-graph >output && + git commit-graph read >output && test_cmp expect output } @@ -124,42 +116,6 @@ test_expect_success 'Add more commits' ' git repack ' -test_expect_success 'commit-graph write progress off for redirected stderr' ' - cd "$TRASH_DIRECTORY/full" && - git commit-graph write 2>err && - test_line_count = 0 err -' - -test_expect_success 'commit-graph write force progress on for stderr' ' - cd "$TRASH_DIRECTORY/full" && - GIT_PROGRESS_DELAY=0 git commit-graph write --progress 2>err && - test_file_not_empty err -' - -test_expect_success 'commit-graph write with the --no-progress option' ' - cd "$TRASH_DIRECTORY/full" && - git commit-graph write --no-progress 2>err && - test_line_count = 0 err -' - -test_expect_success 'commit-graph verify progress off for redirected stderr' ' - cd "$TRASH_DIRECTORY/full" && - git commit-graph verify 2>err && - test_line_count = 0 err -' - -test_expect_success 'commit-graph verify force progress on for stderr' ' - cd "$TRASH_DIRECTORY/full" && - GIT_PROGRESS_DELAY=0 git commit-graph verify --progress 2>err && - test_file_not_empty err -' - -test_expect_success 'commit-graph verify with the --no-progress option' ' - cd "$TRASH_DIRECTORY/full" && - git commit-graph verify --no-progress 2>err && - test_line_count = 0 err -' - # Current graph structure: # # __M3___ @@ -481,7 +437,7 @@ test_expect_success 'detect bad version' ' ' test_expect_success 'detect bad hash version' ' - corrupt_graph_and_verify $GRAPH_BYTE_HASH "\03" \ + corrupt_graph_and_verify $GRAPH_BYTE_HASH "\02" \ "hash version" ' @@ -621,47 +577,4 @@ test_expect_success 'get_commit_tree_in_graph works for non-the_repository' ' test_cmp expect actual ' -test_expect_success 'corrupt commit-graph write (broken parent)' ' - rm -rf repo && - git init repo && - ( - cd repo && - empty="$(git mktree </dev/null)" && - cat >broken <<-EOF && - tree $empty - parent $ZERO_OID - author whatever <whatever@example.com> 1234 -0000 - committer whatever <whatever@example.com> 1234 -0000 - - broken commit - EOF - broken="$(git hash-object -w -t commit --literally broken)" && - git commit-tree -p "$broken" -m "good commit" "$empty" >good && - test_must_fail git commit-graph write --stdin-commits \ - <good 2>test_err && - test_i18ngrep "unable to parse commit" test_err - ) -' - -test_expect_success 'corrupt commit-graph write (missing tree)' ' - rm -rf repo && - git init repo && - ( - cd repo && - tree="$(git mktree </dev/null)" && - cat >broken <<-EOF && - parent $ZERO_OID - author whatever <whatever@example.com> 1234 -0000 - committer whatever <whatever@example.com> 1234 -0000 - - broken commit - EOF - broken="$(git hash-object -w -t commit --literally broken)" && - git commit-tree -p "$broken" -m "good" "$tree" >good && - test_must_fail git commit-graph write --stdin-commits \ - <good 2>test_err && - test_i18ngrep "unable to parse commit" test_err - ) -' - test_done diff --git a/third_party/git/t/t5319-multi-pack-index.sh b/third_party/git/t/t5319-multi-pack-index.sh index 43a7a66c9d..c72ca04399 100755 --- a/third_party/git/t/t5319-multi-pack-index.sh +++ b/third_party/git/t/t5319-multi-pack-index.sh @@ -28,20 +28,6 @@ midx_read_expect () { test_cmp expect actual } -test_expect_success 'setup' ' - test_oid_init && - test_oid_cache <<-EOF - idxoff sha1:2999 - idxoff sha256:3739 - - packnameoff sha1:652 - packnameoff sha256:940 - - fanoutoff sha1:1 - fanoutoff sha256:3 - EOF -' - test_expect_success 'write midx with no packs' ' test_when_finished rm -f pack/multi-pack-index && git multi-pack-index --object-dir=. write && @@ -161,21 +147,6 @@ test_expect_success 'write midx with two packs' ' compare_results_with_midx "two packs" -test_expect_success 'write progress off for redirected stderr' ' - git multi-pack-index --object-dir=$objdir write 2>err && - test_line_count = 0 err -' - -test_expect_success 'write force progress on for stderr' ' - git multi-pack-index --object-dir=$objdir --progress write 2>err && - test_file_not_empty err -' - -test_expect_success 'write with the --no-progress option' ' - git multi-pack-index --object-dir=$objdir --no-progress write 2>err && - test_line_count = 0 err -' - test_expect_success 'add more packs' ' for j in $(test_seq 11 20) do @@ -198,21 +169,6 @@ test_expect_success 'verify multi-pack-index success' ' git multi-pack-index verify --object-dir=$objdir ' -test_expect_success 'verify progress off for redirected stderr' ' - git multi-pack-index verify --object-dir=$objdir 2>err && - test_line_count = 0 err -' - -test_expect_success 'verify force progress on for stderr' ' - git multi-pack-index verify --object-dir=$objdir --progress 2>err && - test_file_not_empty err -' - -test_expect_success 'verify with the --no-progress option' ' - git multi-pack-index verify --object-dir=$objdir --no-progress 2>err && - test_line_count = 0 err -' - # usage: corrupt_midx_and_verify <pos> <data> <objdir> <string> corrupt_midx_and_verify() { POS=$1 && @@ -239,7 +195,7 @@ test_expect_success 'verify bad signature' ' "multi-pack-index signature" ' -HASH_LEN=$(test_oid rawsz) +HASH_LEN=20 NUM_OBJECTS=74 MIDX_BYTE_VERSION=4 MIDX_BYTE_OID_VERSION=5 @@ -252,9 +208,9 @@ MIDX_CHUNK_LOOKUP_WIDTH=12 MIDX_OFFSET_PACKNAMES=$(($MIDX_HEADER_SIZE + \ $MIDX_NUM_CHUNKS * $MIDX_CHUNK_LOOKUP_WIDTH)) MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2)) -MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + $(test_oid packnameoff))) +MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652)) MIDX_OID_FANOUT_WIDTH=4 -MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + $(test_oid fanoutoff))) +MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1)) MIDX_OFFSET_OID_LOOKUP=$(($MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH)) MIDX_BYTE_OID_LOOKUP=$(($MIDX_OFFSET_OID_LOOKUP + 16 * $HASH_LEN)) MIDX_OFFSET_OBJECT_OFFSETS=$(($MIDX_OFFSET_OID_LOOKUP + $NUM_OBJECTS * $HASH_LEN)) @@ -318,31 +274,16 @@ test_expect_success 'verify incorrect pack-int-id' ' ' test_expect_success 'verify incorrect offset' ' - corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ + corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \ "incorrect object offset" ' test_expect_success 'git-fsck incorrect offset' ' - corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \ + corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \ "incorrect object offset" \ "git -c core.multipackindex=true fsck" ' -test_expect_success 'repack progress off for redirected stderr' ' - git multi-pack-index --object-dir=$objdir repack 2>err && - test_line_count = 0 err -' - -test_expect_success 'repack force progress on for stderr' ' - git multi-pack-index --object-dir=$objdir --progress repack 2>err && - test_file_not_empty err -' - -test_expect_success 'repack with the --no-progress option' ' - git multi-pack-index --object-dir=$objdir --no-progress repack 2>err && - test_line_count = 0 err -' - test_expect_success 'repack removes multi-pack-index' ' test_path_is_file $objdir/pack/multi-pack-index && GIT_TEST_MULTI_PACK_INDEX=0 git repack -adf && @@ -401,7 +342,7 @@ test_expect_success 'force some 64-bit offsets with pack-objects' ' pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) && idx64=objects64/pack/test-64-$pack64.idx && chmod u+w $idx64 && - corrupt_data $idx64 $(test_oid idxoff) "\02" && + corrupt_data $idx64 2999 "\02" && midx64=$(git multi-pack-index --object-dir=objects64 write) && midx_read_expect 1 63 5 objects64 " large-offsets" ' @@ -472,30 +413,6 @@ test_expect_success 'expire does not remove any packs' ' ) ' -test_expect_success 'expire progress off for redirected stderr' ' - ( - cd dup && - git multi-pack-index expire 2>err && - test_line_count = 0 err - ) -' - -test_expect_success 'expire force progress on for stderr' ' - ( - cd dup && - git multi-pack-index --progress expire 2>err && - test_file_not_empty err - ) -' - -test_expect_success 'expire with the --no-progress option' ' - ( - cd dup && - git multi-pack-index --no-progress expire 2>err && - test_line_count = 0 err - ) -' - test_expect_success 'expire removes unreferenced packs' ' ( cd dup && diff --git a/third_party/git/t/t5321-pack-large-objects.sh b/third_party/git/t/t5321-pack-large-objects.sh index 8a56d98a0e..a75eab87d3 100755 --- a/third_party/git/t/t5321-pack-large-objects.sh +++ b/third_party/git/t/t5321-pack-large-objects.sh @@ -10,8 +10,8 @@ test_description='git pack-object with "large" deltas . "$TEST_DIRECTORY"/lib-pack.sh # Two similar-ish objects that we have computed deltas between. -A=$(test_oid packlib_7_0) -B=$(test_oid packlib_7_76) +A=01d7713666f4de822776c7622c10f1b07de280dc +B=e68fe8129b546b101aee9510c5328e7f21ca1d18 test_expect_success 'setup' ' clear_packs && diff --git a/third_party/git/t/t5324-split-commit-graph.sh b/third_party/git/t/t5324-split-commit-graph.sh index 53b2e6b455..99f4ef4c19 100755 --- a/third_party/git/t/t5324-split-commit-graph.sh +++ b/third_party/git/t/t5324-split-commit-graph.sh @@ -8,17 +8,9 @@ GIT_TEST_COMMIT_GRAPH=0 test_expect_success 'setup repo' ' git init && git config core.commitGraph true && - git config gc.writeCommitGraph false && infodir=".git/objects/info" && graphdir="$infodir/commit-graphs" && - test_oid_init && - test_oid_cache <<-EOM - shallow sha1:1760 - shallow sha256:2064 - - base sha1:1376 - base sha256:1496 - EOM + test_oid_init ' graph_read_expect() { @@ -32,7 +24,7 @@ graph_read_expect() { num_commits: $1 chunks: oid_fanout oid_lookup commit_metadata EOF - test-tool read-graph >output && + git commit-graph read >output && test_cmp expect output } @@ -255,7 +247,7 @@ test_expect_success 'verify hashes along chain, even in shallow' ' cd verify && git commit-graph verify && base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph && - corrupt_file "$base_file" $(test_oid shallow) "\01" && + corrupt_file "$base_file" 1760 "\01" && test_must_fail git commit-graph verify --shallow 2>test_err && grep -v "^+" test_err >err && test_i18ngrep "incorrect checksum" err @@ -282,7 +274,7 @@ test_expect_success 'warn on base graph chunk incorrect' ' cd base-chunk && git commit-graph verify && base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph && - corrupt_file "$base_file" $(test_oid base) "\01" && + corrupt_file "$base_file" 1376 "\01" && git commit-graph verify --shallow 2>test_err && grep -v "^+" test_err >err && test_i18ngrep "commit-graph chain does not match" err @@ -327,7 +319,7 @@ test_expect_success 'add octopus merge' ' git merge commits/3 commits/4 && git branch merge/octopus && git commit-graph write --reachable --split && - git commit-graph verify --progress 2>err && + git commit-graph verify 2>err && test_line_count = 3 err && test_i18ngrep ! warning err && test_line_count = 3 $graphdir/commit-graph-chain @@ -342,7 +334,6 @@ test_expect_success 'split across alternate where alternate is not split' ' git clone --no-hardlinks . alt-split && ( cd alt-split && - rm -f .git/objects/info/commit-graph && echo "$(pwd)"/../.git/objects >.git/objects/info/alternates && test_commit 18 && git commit-graph write --reachable --split && diff --git a/third_party/git/t/t5400-send-pack.sh b/third_party/git/t/t5400-send-pack.sh index b84618c925..571d620aed 100755 --- a/third_party/git/t/t5400-send-pack.sh +++ b/third_party/git/t/t5400-send-pack.sh @@ -288,7 +288,7 @@ test_expect_success 'receive-pack de-dupes .have lines' ' $shared .have EOF - GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \ + GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION= \ git push \ --receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \ fork HEAD:foo && diff --git a/third_party/git/t/t5407-post-rewrite-hook.sh b/third_party/git/t/t5407-post-rewrite-hook.sh index 80750a817e..7344253bfb 100755 --- a/third_party/git/t/t5407-post-rewrite-hook.sh +++ b/third_party/git/t/t5407-post-rewrite-hook.sh @@ -53,10 +53,10 @@ test_expect_success 'git commit --amend --no-post-rewrite' ' test ! -f post-rewrite.data ' -test_expect_success 'git rebase --apply' ' +test_expect_success 'git rebase' ' git reset --hard D && clear_hook_input && - test_must_fail git rebase --apply --onto A B && + test_must_fail git rebase --onto A B && echo C > foo && git add foo && git rebase --continue && @@ -68,10 +68,10 @@ test_expect_success 'git rebase --apply' ' verify_hook_input ' -test_expect_success 'git rebase --apply --skip' ' +test_expect_success 'git rebase --skip' ' git reset --hard D && clear_hook_input && - test_must_fail git rebase --apply --onto A B && + test_must_fail git rebase --onto A B && test_must_fail git rebase --skip && echo D > foo && git add foo && @@ -84,10 +84,10 @@ test_expect_success 'git rebase --apply --skip' ' verify_hook_input ' -test_expect_success 'git rebase --apply --skip the last one' ' +test_expect_success 'git rebase --skip the last one' ' git reset --hard F && clear_hook_input && - test_must_fail git rebase --apply --onto D A && + test_must_fail git rebase --onto D A && git rebase --skip && echo rebase >expected.args && cat >expected.data <<-EOF && @@ -128,7 +128,7 @@ test_expect_success 'git rebase -m --skip' ' verify_hook_input ' -test_expect_success 'git rebase with implicit use of merge backend' ' +test_expect_success 'git rebase with implicit use of interactive backend' ' git reset --hard D && clear_hook_input && test_must_fail git rebase --keep-empty --onto A B && @@ -143,7 +143,7 @@ test_expect_success 'git rebase with implicit use of merge backend' ' verify_hook_input ' -test_expect_success 'git rebase --skip with implicit use of merge backend' ' +test_expect_success 'git rebase --skip with implicit use of interactive backend' ' git reset --hard D && clear_hook_input && test_must_fail git rebase --keep-empty --onto A B && diff --git a/third_party/git/t/t5409-colorize-remote-messages.sh b/third_party/git/t/t5409-colorize-remote-messages.sh index 5d8f401d8e..2a8c449661 100755 --- a/third_party/git/t/t5409-colorize-remote-messages.sh +++ b/third_party/git/t/t5409-colorize-remote-messages.sh @@ -56,13 +56,14 @@ test_expect_success 'short line' ' test_expect_success 'case-insensitive' ' git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output && + cat output && test_decode_color <output >decoded && grep "<BOLD;RED>error<RESET>: error" decoded && grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded ' test_expect_success 'leading space' ' - git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output && + git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output && cat output && test_decode_color <output >decoded && grep " <BOLD;RED>error<RESET>: leading space" decoded ' diff --git a/third_party/git/t/t5500-fetch-pack.sh b/third_party/git/t/t5500-fetch-pack.sh index baa1a99f45..1c71c0ec77 100755 --- a/third_party/git/t/t5500-fetch-pack.sh +++ b/third_party/git/t/t5500-fetch-pack.sh @@ -440,12 +440,11 @@ test_expect_success 'setup tests for the --stdin parameter' ' ' test_expect_success 'setup fetch refs from cmdline v[12]' ' - cp -r client client0 && cp -r client client1 && cp -r client client2 ' -for version in '' 0 1 2 +for version in '' 1 2 do test_expect_success "protocol.version=$version fetch refs from cmdline" " ( @@ -639,7 +638,7 @@ test_expect_success 'fetch-pack cannot fetch a raw sha1 that is not advertised a git init client && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C client fetch-pack ../server \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= git -C client fetch-pack ../server \ $(git -C server rev-parse refs/heads/master^) 2>err && test_i18ngrep "Server does not allow request for unadvertised object" err ' @@ -709,22 +708,13 @@ do # file with scheme for p in file do - test_expect_success !MINGW "fetch-pack --diag-url $p://$h/$r" ' + test_expect_success "fetch-pack --diag-url $p://$h/$r" ' check_prot_path $p://$h/$r $p "/$r" ' - test_expect_success MINGW "fetch-pack --diag-url $p://$h/$r" ' - check_prot_path $p://$h/$r $p "//$h/$r" - ' - test_expect_success MINGW "fetch-pack --diag-url $p:///$r" ' - check_prot_path $p:///$r $p "/$r" - ' # No "/~" -> "~" conversion for file - test_expect_success !MINGW "fetch-pack --diag-url $p://$h/~$r" ' + test_expect_success "fetch-pack --diag-url $p://$h/~$r" ' check_prot_path $p://$h/~$r $p "/~$r" ' - test_expect_success MINGW "fetch-pack --diag-url $p://$h/~$r" ' - check_prot_path $p://$h/~$r $p "//$h/~$r" - ' done # file without scheme for h in nohost nohost:12 [::1] [::1]:23 [ [:aa @@ -793,44 +783,6 @@ test_expect_success 'clone shallow since selects no commits' ' ) ' -# A few subtle things about the request in this test: -# -# - the server must have commit-graphs present and enabled -# -# - the history is such that our want/have share a common ancestor ("base" -# here) -# -# - we send only a single have, which is fewer than a normal client would -# send. This ensures that we don't parse "base" up front with -# parse_object(), but rather traverse to it as a parent while deciding if we -# can stop the "have" negotiation, and call parse_commit(). The former -# sees the actual object data and so always loads the three oid, whereas the -# latter will try to load it lazily. -# -# - we must use protocol v2, because it handles the "have" negotiation before -# processing the shallow directives -# -test_expect_success 'shallow since with commit graph and already-seen commit' ' - test_create_repo shallow-since-graph && - ( - cd shallow-since-graph && - test_commit base && - test_commit master && - git checkout -b other HEAD^ && - test_commit other && - git commit-graph write --reachable && - git config core.commitGraph true && - - GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null - 0012command=fetch - 00010013deepen-since 1 - 0032want $(git rev-parse other) - 0032have $(git rev-parse master) - 0000 - EOF - ) -' - test_expect_success 'shallow clone exclude tag two' ' test_create_repo shallow-exclude && ( @@ -918,10 +870,7 @@ test_expect_success 'filtering by size' ' git -C client fetch-pack --filter=blob:limit=0 ../server HEAD && # Ensure that object is not inadvertently fetched - commit=$(git -C server rev-parse HEAD) && - blob=$(git hash-object server/one.t) && - git -C client rev-list --objects --missing=allow-any "$commit" >oids && - ! grep "$blob" oids + test_must_fail git -C client cat-file -e $(git hash-object server/one.t) ' test_expect_success 'filtering by size has no effect if support for it is not advertised' ' @@ -933,10 +882,7 @@ test_expect_success 'filtering by size has no effect if support for it is not ad git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err && # Ensure that object is fetched - commit=$(git -C server rev-parse HEAD) && - blob=$(git hash-object server/one.t) && - git -C client rev-list --objects --missing=allow-any "$commit" >oids && - grep "$blob" oids && + git -C client cat-file -e $(git hash-object server/one.t) && test_i18ngrep "filtering not recognized by server" err ' @@ -958,11 +904,9 @@ fetch_filter_blob_limit_zero () { git -C client fetch --filter=blob:limit=0 origin HEAD:somewhere && # Ensure that commit is fetched, but blob is not - commit=$(git -C "$SERVER" rev-parse two) && - blob=$(git hash-object server/two.t) && - git -C client rev-list --objects --missing=allow-any "$commit" >oids && - grep "$commit" oids && - ! grep "$blob" oids + test_config -C client extensions.partialclone "arbitrary string" && + git -C client cat-file -e $(git -C "$SERVER" rev-parse two) && + test_must_fail git -C client cat-file -e $(git hash-object "$SERVER/two.t") } test_expect_success 'fetch with --filter=blob:limit=0' ' @@ -976,7 +920,4 @@ test_expect_success 'fetch with --filter=blob:limit=0 and HTTP' ' fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server" ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5504-fetch-receive-strict.sh b/third_party/git/t/t5504-fetch-receive-strict.sh index 645b4c78d3..fdfe179b11 100755 --- a/third_party/git/t/t5504-fetch-receive-strict.sh +++ b/third_party/git/t/t5504-fetch-receive-strict.sh @@ -4,7 +4,6 @@ test_description='fetch/receive strict mode' . ./test-lib.sh test_expect_success 'setup and inject "corrupt or missing" object' ' - test_oid_init && echo hello >greetings && git add greetings && git commit -m greetings && @@ -145,11 +144,11 @@ test_expect_success 'fsck with no skipList input' ' test_expect_success 'setup sorted and unsorted skipLists' ' cat >SKIP.unsorted <<-EOF && - $(test_oid 004) - $(test_oid 002) + 0000000000000000000000000000000000000004 + 0000000000000000000000000000000000000002 $commit - $(test_oid 001) - $(test_oid 003) + 0000000000000000000000000000000000000001 + 0000000000000000000000000000000000000003 EOF sort SKIP.unsorted >SKIP.sorted ' @@ -173,14 +172,14 @@ test_expect_success 'fsck with invalid or bogus skipList input' ' test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' ' cat >SKIP.with-comment <<-EOF && # Some bad commit - $(test_oid 001) + 0000000000000000000000000000000000000001 EOF test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment && test_i18ngrep "missingEmail" err-with-comment && cat >SKIP.with-empty-line <<-EOF && - $(test_oid 001) + 0000000000000000000000000000000000000001 - $(test_oid 002) + 0000000000000000000000000000000000000002 EOF test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line && test_i18ngrep "missingEmail" err-with-empty-line @@ -205,7 +204,7 @@ test_expect_success 'fsck with exhaustive accepted skipList input (various types echo " # Comment after whitespace" >>SKIP.exhaustive && echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive && echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive && - echo " $(test_oid 001)" >>SKIP.exhaustive && + echo " 0000000000000000000000000000000000000001" >>SKIP.exhaustive && git -c fsck.skipList=SKIP.exhaustive fsck 2>err && test_must_be_empty err ' diff --git a/third_party/git/t/t5505-remote.sh b/third_party/git/t/t5505-remote.sh index dda81b7d07..883b32efa0 100755 --- a/third_party/git/t/t5505-remote.sh +++ b/third_party/git/t/t5505-remote.sh @@ -734,53 +734,15 @@ test_expect_success 'reject adding remote with an invalid name' ' # the last two ones check if the config is updated. test_expect_success 'rename a remote' ' - test_config_global remote.pushDefault origin && git clone one four && ( cd four && - git config branch.master.pushRemote origin && git remote rename origin upstream && test -z "$(git for-each-ref refs/remotes/origin)" && test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" && test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" && test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" && - test "$(git config branch.master.remote)" = "upstream" && - test "$(git config branch.master.pushRemote)" = "upstream" && - test "$(git config --global remote.pushDefault)" = "origin" - ) -' - -test_expect_success 'rename a remote renames repo remote.pushDefault' ' - git clone one four.1 && - ( - cd four.1 && - git config remote.pushDefault origin && - git remote rename origin upstream && - test "$(git config --local remote.pushDefault)" = "upstream" - ) -' - -test_expect_success 'rename a remote renames repo remote.pushDefault but ignores global' ' - test_config_global remote.pushDefault other && - git clone one four.2 && - ( - cd four.2 && - git config remote.pushDefault origin && - git remote rename origin upstream && - test "$(git config --global remote.pushDefault)" = "other" && - test "$(git config --local remote.pushDefault)" = "upstream" - ) -' - -test_expect_success 'rename a remote renames repo remote.pushDefault but keeps global' ' - test_config_global remote.pushDefault origin && - git clone one four.3 && - ( - cd four.3 && - git config remote.pushDefault origin && - git remote rename origin upstream && - test "$(git config --global remote.pushDefault)" = "origin" && - test "$(git config --local remote.pushDefault)" = "upstream" + test "$(git config branch.master.remote)" = "upstream" ) ' @@ -822,54 +784,6 @@ test_expect_success 'rename succeeds with existing remote.<target>.prune' ' git -C four.four remote rename origin upstream ' -test_expect_success 'remove a remote' ' - test_config_global remote.pushDefault origin && - git clone one four.five && - ( - cd four.five && - git config branch.master.pushRemote origin && - git remote remove origin && - test -z "$(git for-each-ref refs/remotes/origin)" && - test_must_fail git config branch.master.remote && - test_must_fail git config branch.master.pushRemote && - test "$(git config --global remote.pushDefault)" = "origin" - ) -' - -test_expect_success 'remove a remote removes repo remote.pushDefault' ' - git clone one four.five.1 && - ( - cd four.five.1 && - git config remote.pushDefault origin && - git remote remove origin && - test_must_fail git config --local remote.pushDefault - ) -' - -test_expect_success 'remove a remote removes repo remote.pushDefault but ignores global' ' - test_config_global remote.pushDefault other && - git clone one four.five.2 && - ( - cd four.five.2 && - git config remote.pushDefault origin && - git remote remove origin && - test "$(git config --global remote.pushDefault)" = "other" && - test_must_fail git config --local remote.pushDefault - ) -' - -test_expect_success 'remove a remote removes repo remote.pushDefault but keeps global' ' - test_config_global remote.pushDefault origin && - git clone one four.five.3 && - ( - cd four.five.3 && - git config remote.pushDefault origin && - git remote remove origin && - test "$(git config --global remote.pushDefault)" = "origin" && - test_must_fail git config --local remote.pushDefault - ) -' - cat >remotes_origin <<EOF URL: $(pwd)/one Push: refs/heads/master:refs/heads/upstream diff --git a/third_party/git/t/t5509-fetch-push-namespaces.sh b/third_party/git/t/t5509-fetch-push-namespaces.sh index a67f792adf..75cbfcc392 100755 --- a/third_party/git/t/t5509-fetch-push-namespaces.sh +++ b/third_party/git/t/t5509-fetch-push-namespaces.sh @@ -20,7 +20,7 @@ test_expect_success setup ' ) && commit0=$(cd original && git rev-parse HEAD^) && commit1=$(cd original && git rev-parse HEAD) && - git init --bare pushee && + git init pushee && git init puller ' @@ -152,15 +152,4 @@ test_expect_success 'clone chooses correct HEAD (v2)' ' test_cmp expect actual ' -test_expect_success 'denyCurrentBranch and unborn branch with ref namespace' ' - ( - cd original && - git init unborn && - git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" && - test_must_fail git push unborn-namespaced HEAD:master && - git -C unborn config receive.denyCurrentBranch updateInstead && - git push unborn-namespaced HEAD:master - ) -' - test_done diff --git a/third_party/git/t/t5510-fetch.sh b/third_party/git/t/t5510-fetch.sh index a66dbe0bde..139f7106f7 100755 --- a/third_party/git/t/t5510-fetch.sh +++ b/third_party/git/t/t5510-fetch.sh @@ -11,7 +11,7 @@ D=$(pwd) test_bundle_object_count () { git verify-pack -v "$1" >verify.out && - test "$2" = $(grep "^$OID_REGEX " verify.out | wc -l) + test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l) } convert_bundle_to_pack () { @@ -174,30 +174,6 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' git rev-parse sometag ' -test_expect_success '--refmap="" ignores configured refspec' ' - cd "$TRASH_DIRECTORY" && - git clone "$D" remote-refs && - git -C remote-refs rev-parse remotes/origin/master >old && - git -C remote-refs update-ref refs/remotes/origin/master master~1 && - git -C remote-refs rev-parse remotes/origin/master >new && - git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" && - git -C remote-refs rev-parse remotes/origin/master >actual && - test_cmp new actual && - git -C remote-refs fetch origin && - git -C remote-refs rev-parse remotes/origin/master >actual && - test_cmp old actual -' - -test_expect_success '--refmap="" and --prune' ' - git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch master && - git -C remote-refs update-ref refs/hidden/foo/otherbranch master && - git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* && - git -C remote-refs rev-parse remotes/origin/foo/otherbranch && - test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch && - git -C remote-refs fetch --prune origin && - test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch -' - test_expect_success 'fetch tags when there is no tags' ' cd "$D" && @@ -285,10 +261,9 @@ test_expect_success 'create bundle 1' ' ' test_expect_success 'header of bundle looks right' ' - head -n 4 "$D"/bundle1 && head -n 1 "$D"/bundle1 | grep "^#" && - head -n 2 "$D"/bundle1 | grep "^-$OID_REGEX " && - head -n 3 "$D"/bundle1 | grep "^$OID_REGEX " && + head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " && + head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " && head -n 4 "$D"/bundle1 | grep "^$" ' @@ -314,7 +289,7 @@ test_expect_success 'bundle 1 has only 3 files ' ' test_expect_success 'unbundle 2' ' cd "$D/bundle" && git fetch ../bundle2 master:master && - test "tip" = "$(git log -1 --pretty=oneline master | cut -d" " -f2)" + test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)" ' test_expect_success 'bundle does not prerequisite objects' ' @@ -379,6 +354,7 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge # the strange name is: a\!'b test_expect_success 'quoting of a strangely named repo' ' test_must_fail git fetch "a\\!'\''b" > result 2>&1 && + cat result && grep "fatal: '\''a\\\\!'\''b'\''" result ' @@ -594,35 +570,6 @@ test_expect_success 'LHS of refspec follows ref disambiguation rules' ' ) ' -test_expect_success 'fetch.writeCommitGraph' ' - git clone three write && - ( - cd three && - test_commit new - ) && - ( - cd write && - git -c fetch.writeCommitGraph fetch origin && - test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain - ) -' - -test_expect_success 'fetch.writeCommitGraph with submodules' ' - git clone dups super && - ( - cd super && - git submodule add "file://$TRASH_DIRECTORY/three" && - git commit -m "add submodule" - ) && - git clone "super" super-clone && - ( - cd super-clone && - rm -rf .git/objects/info && - git -c fetch.writeCommitGraph=true fetch origin && - test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain - ) -' - # configured prune tests set_config_tristate () { @@ -955,29 +902,6 @@ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' ' test_cmp expect actual ' -test_expect_success '--no-show-forced-updates' ' - mkdir forced-updates && - ( - cd forced-updates && - git init && - test_commit 1 && - test_commit 2 - ) && - git clone forced-updates forced-update-clone && - git clone forced-updates no-forced-update-clone && - git -C forced-updates reset --hard HEAD~1 && - ( - cd forced-update-clone && - git fetch --show-forced-updates origin 2>output && - test_i18ngrep "(forced update)" output - ) && - ( - cd no-forced-update-clone && - git fetch --no-show-forced-updates origin 2>output && - test_i18ngrep ! "(forced update)" output - ) -' - setup_negotiation_tip () { SERVER="$1" URL="$2" @@ -1054,7 +978,27 @@ test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protoc check_negotiation_tip ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. +test_expect_success '--no-show-forced-updates' ' + mkdir forced-updates && + ( + cd forced-updates && + git init && + test_commit 1 && + test_commit 2 + ) && + git clone forced-updates forced-update-clone && + git clone forced-updates no-forced-update-clone && + git -C forced-updates reset --hard HEAD~1 && + ( + cd forced-update-clone && + git fetch --show-forced-updates origin 2>output && + test_i18ngrep "(forced update)" output + ) && + ( + cd no-forced-update-clone && + git fetch --no-show-forced-updates origin 2>output && + ! test_i18ngrep "(forced update)" output + ) +' test_done diff --git a/third_party/git/t/t5512-ls-remote.sh b/third_party/git/t/t5512-ls-remote.sh index 04b35402c7..43e1d8d4d2 100755 --- a/third_party/git/t/t5512-ls-remote.sh +++ b/third_party/git/t/t5512-ls-remote.sh @@ -225,50 +225,49 @@ test_expect_success 'ls-remote --symref' ' EOF # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref >actual && + GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref >actual && test_cmp expect actual ' test_expect_success 'ls-remote with filtered symref (refname)' ' - rev=$(git rev-parse HEAD) && - cat >expect <<-EOF && + cat >expect <<-\EOF && ref: refs/heads/master HEAD - $rev HEAD + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a HEAD EOF # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref . HEAD >actual && + GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . HEAD >actual && test_cmp expect actual ' test_expect_failure 'ls-remote with filtered symref (--heads)' ' git symbolic-ref refs/heads/foo refs/tags/mark && - cat >expect <<-EOF && + cat >expect <<-\EOF && ref: refs/tags/mark refs/heads/foo - $rev refs/heads/foo - $rev refs/heads/master + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master EOF # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual && + GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual && test_cmp expect actual ' test_expect_success 'ls-remote --symref omits filtered-out matches' ' - cat >expect <<-EOF && - $rev refs/heads/foo - $rev refs/heads/master + cat >expect <<-\EOF && + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/foo + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/heads/master EOF # Protocol v2 supports sending symrefs for refs other than HEAD, so use # protocol v0 here. - GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual && + GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual && test_cmp expect actual && - GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref . "refs/heads/*" >actual && + GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . "refs/heads/*" >actual && test_cmp expect actual ' test_lazy_prereq GIT_DAEMON ' - test_bool_env GIT_TEST_GIT_DAEMON true + git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON ' # This test spawns a daemon, so run it only if the user would be OK with diff --git a/third_party/git/t/t5514-fetch-multiple.sh b/third_party/git/t/t5514-fetch-multiple.sh index de8e2f1531..5426d4b5ab 100755 --- a/third_party/git/t/t5514-fetch-multiple.sh +++ b/third_party/git/t/t5514-fetch-multiple.sh @@ -183,15 +183,4 @@ test_expect_success 'git fetch --all --tags' ' test_cmp expect test8/output ' -test_expect_success 'parallel' ' - git remote add one ./bogus1 && - git remote add two ./bogus2 && - - test_must_fail env GIT_TRACE="$PWD/trace" \ - git fetch --jobs=2 --multiple one two 2>err && - grep "preparing to run up to 2 tasks" trace && - test_i18ngrep "could not fetch .one.*128" err && - test_i18ngrep "could not fetch .two.*128" err -' - test_done diff --git a/third_party/git/t/t5515-fetch-merge-logic.sh b/third_party/git/t/t5515-fetch-merge-logic.sh index 9d6a46ff56..e55d8474ef 100755 --- a/third_party/git/t/t5515-fetch-merge-logic.sh +++ b/third_party/git/t/t5515-fetch-merge-logic.sh @@ -8,60 +8,18 @@ test_description='Merge logic in fetch' # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. -GIT_TEST_PROTOCOL_VERSION=0 -export GIT_TEST_PROTOCOL_VERSION +GIT_TEST_PROTOCOL_VERSION= . ./test-lib.sh -build_script () { - script="$1" && - for i in one three_file master master2 one_tree three two two2 three2 - do - echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script" - done -} - -convert_expected () { - file="$1" && - script="$2" && - sed -f "$script" "$file" >"$file.tmp" && - mv "$file.tmp" "$file" -} +LF=' +' test_expect_success setup ' GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" && GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" && export GIT_AUTHOR_DATE GIT_COMMITTER_DATE && - test_oid_cache <<-EOF && - one sha1:8e32a6d901327a23ef831511badce7bf3bf46689 - one sha256:8739546433ab1ac72ee93088dce611210effee072b2b586ceac6dde43ebec9ce - - three_file sha1:0e3b14047d3ee365f4f2a1b673db059c3972589c - three_file sha256:bc4447d50c07497a8bfe6eef817f2364ecca9d471452e43b52756cc1a908bd32 - - master sha1:6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 - master sha256:8521c3072461fcfe8f32d67f95cc6e6b832a2db2fa29769ffc788bce85ebcd75 - - one_tree sha1:22feea448b023a2d864ef94b013735af34d238ba - one_tree sha256:6e4743f4ef2356b881dda5e91f5c7cdffe870faf350bf7b312f80a20935f5d83 - - three sha1:c61a82b60967180544e3c19f819ddbd0c9f89899 - three sha256:0cc6d1eda617ded715170786e31ba4e2d0185404ec5a3508dd0d73b324860c6a - - two sha1:525b7fb068d59950d185a8779dc957c77eed73ba - two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db - - master2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f - master2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0 - - two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 - two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4 - - three2 sha1:0567da4d5edd2ff4bb292a465ba9e64dcad9536b - three2 sha256:cceb3e8eca364fa9a0a39a1efbebecacc664af86cbbd8070571f5faeb5f0e8c3 - EOF - echo >file original && git add file && git commit -a -m One && @@ -131,8 +89,7 @@ test_expect_success setup ' git config branch.br-$remote-octopus.remote $remote && git config branch.br-$remote-octopus.merge refs/heads/one && git config --add branch.br-$remote-octopus.merge two - done && - build_script sed_script + done ' # Merge logic depends on branch properties and Pull: or .fetch lines @@ -183,10 +140,6 @@ do actual_r="$pfx-refs.$test" test_expect_success "$cmd" ' - cp "$expect_f" expect_f && - convert_expected expect_f sed_script && - cp "$expect_r" expect_r && - convert_expected expect_r sed_script && { echo "# $cmd" set x $cmd; shift @@ -202,18 +155,18 @@ do cat .git/FETCH_HEAD } >"$actual_f" && git show-ref >"$actual_r" && - if test -f "expect_f" + if test -f "$expect_f" then - test_cmp "expect_f" "$actual_f" && + test_cmp "$expect_f" "$actual_f" && rm -f "$actual_f" else # this is to help developing new tests. cp "$actual_f" "$expect_f" false fi && - if test -f "expect_r" + if test -f "$expect_r" then - test_cmp "expect_r" "$actual_r" && + test_cmp "$expect_r" "$actual_r" && rm -f "$actual_r" else # this is to help developing new tests. diff --git a/third_party/git/t/t5516-fetch-push.sh b/third_party/git/t/t5516-fetch-push.sh index 9ff041a093..c81ca360ac 100755 --- a/third_party/git/t/t5516-fetch-push.sh +++ b/third_party/git/t/t5516-fetch-push.sh @@ -1151,7 +1151,7 @@ test_expect_success 'fetch exact SHA1' ' # unadvertised objects, so restrict this test to v0. # fetching the hidden object should fail by default - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err && test_i18ngrep "Server does not allow request for unadvertised object" err && test_must_fail git rev-parse --verify refs/heads/copy && @@ -1210,7 +1210,7 @@ do cd shallow && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch --depth=1 ../testrepo/.git $SHA1 && git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true && git fetch --depth=1 ../testrepo/.git $SHA1 && @@ -1241,9 +1241,9 @@ do cd shallow && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch ../testrepo/.git $SHA1_3 && - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch ../testrepo/.git $SHA1_1 && git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true && git fetch ../testrepo/.git $SHA1_1 && @@ -1251,7 +1251,7 @@ do test_must_fail git cat-file commit $SHA1_2 && git fetch ../testrepo/.git $SHA1_2 && git cat-file commit $SHA1_2 && - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch ../testrepo/.git $SHA1_3 2>err && test_i18ngrep "remote error:.*not our ref.*$SHA1_3\$" err ) @@ -1291,7 +1291,7 @@ test_expect_success 'peeled advertisements are not considered ref tips' ' git -C testrepo commit --allow-empty -m two && git -C testrepo tag -m foo mytag HEAD^ && oid=$(git -C testrepo rev-parse mytag^{commit}) && - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git fetch testrepo $oid 2>err && test_i18ngrep "Server does not allow request for unadvertised object" err ' @@ -1712,15 +1712,4 @@ test_expect_success 'updateInstead with push-to-checkout hook' ' ) ' -test_expect_success 'denyCurrentBranch and worktrees' ' - git worktree add new-wt && - git clone . cloned && - test_commit -C cloned first && - test_config receive.denyCurrentBranch refuse && - test_must_fail git -C cloned push origin HEAD:new-wt && - test_config receive.denyCurrentBranch updateInstead && - git -C cloned push origin HEAD:new-wt && - test_must_fail git -C cloned push --delete origin new-wt -' - test_done diff --git a/third_party/git/t/t5517-push-mirror.sh b/third_party/git/t/t5517-push-mirror.sh index e4edd56404..c05a661400 100755 --- a/third_party/git/t/t5517-push-mirror.sh +++ b/third_party/git/t/t5517-push-mirror.sh @@ -265,14 +265,4 @@ test_expect_success 'remote.foo.mirror=no has no effect' ' ' -test_expect_success 'push to mirrored repository with refspec fails' ' - mk_repo_pair && - ( - cd master && - echo one >foo && git add foo && git commit -m one && - git config --add remote.up.mirror true && - test_must_fail git push up master - ) -' - test_done diff --git a/third_party/git/t/t5520-pull.sh b/third_party/git/t/t5520-pull.sh index 2f86fca042..cf4cc32fd0 100755 --- a/third_party/git/t/t5520-pull.sh +++ b/third_party/git/t/t5520-pull.sh @@ -5,7 +5,7 @@ test_description='pulling into void' . ./test-lib.sh modify () { - sed -e "$1" "$2" >"$2.x" && + sed -e "$1" <"$2" >"$2.x" && mv "$2.x" "$2" } @@ -15,10 +15,8 @@ test_pull_autostash () { git add new_file && git pull "$@" . copy && test_cmp_rev HEAD^ copy && - echo dirty >expect && - test_cmp expect new_file && - echo "modified again" >expect && - test_cmp expect file + test "$(cat new_file)" = dirty && + test "$(cat file)" = "modified again" } test_pull_autostash_fail () { @@ -41,8 +39,8 @@ test_expect_success 'pulling into void' ' cd cloned && git pull .. ) && - test_path_is_file file && - test_path_is_file cloned/file && + test -f file && + test -f cloned/file && test_cmp file cloned/file ' @@ -52,8 +50,8 @@ test_expect_success 'pulling into void using master:master' ' cd cloned-uho && git pull .. master:master ) && - test_path_is_file file && - test_path_is_file cloned-uho/file && + test -f file && + test -f cloned-uho/file && test_cmp file cloned-uho/file ' @@ -101,7 +99,7 @@ test_expect_success 'pulling into void must not create an octopus' ' ( cd cloned-octopus && test_must_fail git pull .. master master && - test_path_is_missing file + ! test -f file ) ' @@ -112,11 +110,9 @@ test_expect_success 'test . as a remote' ' echo updated >file && git commit -a -m updated && git checkout copy && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && git pull && - echo updated >expect && - test_cmp expect file && + test "$(cat file)" = updated && git reflog -1 >reflog.actual && sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy && echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected && @@ -129,11 +125,9 @@ test_expect_success 'the default remote . should not break explicit pull' ' git commit -a -m modified && git checkout copy && git reset --hard HEAD^ && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && git pull . second && - echo modified >expect && - test_cmp expect file && + test "$(cat file)" = modified && git reflog -1 >reflog.actual && sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy && echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected && @@ -143,11 +137,10 @@ test_expect_success 'the default remote . should not break explicit pull' ' test_expect_success 'fail if wildcard spec does not match any refs' ' git checkout -b test copy^ && test_when_finished "git checkout -f copy && git branch -D test" && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err && test_i18ngrep "no candidates for merging" err && - test_cmp expect file + test "$(cat file)" = file ' test_expect_success 'fail if no branches specified with non-default remote' ' @@ -155,12 +148,11 @@ test_expect_success 'fail if no branches specified with non-default remote' ' test_when_finished "git remote remove test_remote" && git checkout -b test copy^ && test_when_finished "git checkout -f copy && git branch -D test" && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && test_config branch.test.remote origin && test_must_fail git pull test_remote 2>err && test_i18ngrep "specify a branch on the command line" err && - test_cmp expect file + test "$(cat file)" = file ' test_expect_success 'fail if not on a branch' ' @@ -168,11 +160,10 @@ test_expect_success 'fail if not on a branch' ' test_when_finished "git remote remove origin" && git checkout HEAD^ && test_when_finished "git checkout -f copy" && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && test_must_fail git pull 2>err && test_i18ngrep "not currently on a branch" err && - test_cmp expect file + test "$(cat file)" = file ' test_expect_success 'fail if no configuration for current branch' ' @@ -181,11 +172,10 @@ test_expect_success 'fail if no configuration for current branch' ' git checkout -b test copy^ && test_when_finished "git checkout -f copy && git branch -D test" && test_config branch.test.remote test_remote && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && test_must_fail git pull 2>err && test_i18ngrep "no tracking information" err && - test_cmp expect file + test "$(cat file)" = file ' test_expect_success 'pull --all: fail if no configuration for current branch' ' @@ -194,11 +184,10 @@ test_expect_success 'pull --all: fail if no configuration for current branch' ' git checkout -b test copy^ && test_when_finished "git checkout -f copy && git branch -D test" && test_config branch.test.remote test_remote && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && test_must_fail git pull --all 2>err && test_i18ngrep "There is no tracking information" err && - test_cmp expect file + test "$(cat file)" = file ' test_expect_success 'fail if upstream branch does not exist' ' @@ -206,31 +195,26 @@ test_expect_success 'fail if upstream branch does not exist' ' test_when_finished "git checkout -f copy && git branch -D test" && test_config branch.test.remote . && test_config branch.test.merge refs/heads/nonexisting && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && test_must_fail git pull 2>err && test_i18ngrep "no such ref was fetched" err && - test_cmp expect file + test "$(cat file)" = file ' test_expect_success 'fail if the index has unresolved entries' ' git checkout -b third second^ && test_when_finished "git checkout -f copy && git branch -D third" && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && test_commit modified2 file && - git ls-files -u >unmerged && - test_must_be_empty unmerged && + test -z "$(git ls-files -u)" && test_must_fail git pull . second && - git ls-files -u >unmerged && - test_file_not_empty unmerged && + test -n "$(git ls-files -u)" && cp file expected && test_must_fail git pull . second 2>err && test_i18ngrep "Pulling is not possible because you have unmerged files." err && test_cmp expected file && git add file && - git ls-files -u >unmerged && - test_must_be_empty unmerged && + test -z "$(git ls-files -u)" && test_must_fail git pull . second 2>err && test_i18ngrep "You have not concluded your merge" err && test_cmp expected file @@ -239,66 +223,47 @@ test_expect_success 'fail if the index has unresolved entries' ' test_expect_success 'fast-forwards working tree if branch head is updated' ' git checkout -b third second^ && test_when_finished "git checkout -f copy && git branch -D third" && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && git pull . second:third 2>err && test_i18ngrep "fetch updated the current branch head" err && - echo modified >expect && - test_cmp expect file && - test_cmp_rev third second + test "$(cat file)" = modified && + test "$(git rev-parse third)" = "$(git rev-parse second)" ' test_expect_success 'fast-forward fails with conflicting work tree' ' git checkout -b third second^ && test_when_finished "git checkout -f copy && git branch -D third" && - echo file >expect && - test_cmp expect file && + test "$(cat file)" = file && echo conflict >file && test_must_fail git pull . second:third 2>err && test_i18ngrep "Cannot fast-forward your working tree" err && - echo conflict >expect && - test_cmp expect file && - test_cmp_rev third second + test "$(cat file)" = conflict && + test "$(git rev-parse third)" = "$(git rev-parse second)" ' test_expect_success '--rebase' ' git branch to-rebase && - echo modified again >file && + echo modified again > file && git commit -m file file && git checkout to-rebase && - echo new >file2 && + echo new > file2 && git add file2 && git commit -m "new file" && git tag before-rebase && git pull --rebase . copy && - test_cmp_rev HEAD^ copy && - echo new >expect && - git show HEAD:file2 >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && + test new = "$(git show HEAD:file2)" ' -test_expect_success '--rebase (merge) fast forward' ' +test_expect_success '--rebase fast forward' ' git reset --hard before-rebase && git checkout -b ff && echo another modification >file && git commit -m third file && git checkout to-rebase && - git -c rebase.backend=merge pull --rebase . ff && - test_cmp_rev HEAD ff && - - # The above only validates the result. Did we actually bypass rebase? - git reflog -1 >reflog.actual && - sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy && - echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected && - test_cmp reflog.expected reflog.fuzzy -' - -test_expect_success '--rebase (am) fast forward' ' - git reset --hard before-rebase && - - git -c rebase.backend=apply pull --rebase . ff && - test_cmp_rev HEAD ff && + git pull --rebase . ff && + test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" && # The above only validates the result. Did we actually bypass rebase? git reflog -1 >reflog.actual && @@ -322,7 +287,7 @@ test_expect_success '--rebase --autostash fast forward' ' git checkout behind && echo dirty >file && git pull --rebase --autostash . to-rebase-ff && - test_cmp_rev HEAD to-rebase-ff + test "$(git rev-parse HEAD)" = "$(git rev-parse to-rebase-ff)" ' test_expect_success '--rebase with conflicts shows advice' ' @@ -340,7 +305,7 @@ test_expect_success '--rebase with conflicts shows advice' ' test_tick && git commit -m "Create conflict" seq.txt && test_must_fail git pull --rebase . seq 2>err >out && - test_i18ngrep "Resolve all conflicts manually" err + test_i18ngrep "Resolve all conflicts manually" out ' test_expect_success 'failed --rebase shows advice' ' @@ -354,17 +319,15 @@ test_expect_success 'failed --rebase shows advice' ' git checkout -f -b fails-to-rebase HEAD^ && test_commit v2-without-cr file "2" file2-lf && test_must_fail git pull --rebase . diverging 2>err >out && - test_i18ngrep "Resolve all conflicts manually" err + test_i18ngrep "Resolve all conflicts manually" out ' test_expect_success '--rebase fails with multiple branches' ' git reset --hard before-rebase && test_must_fail git pull --rebase . copy master 2>err && - test_cmp_rev HEAD before-rebase && + test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" && test_i18ngrep "Cannot rebase onto multiple branches" err && - echo modified >expect && - git show HEAD:file >actual && - test_cmp expect actual + test modified = "$(git show HEAD:file)" ' test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' ' @@ -414,10 +377,8 @@ test_expect_success 'pull.rebase' ' git reset --hard before-rebase && test_config pull.rebase true && git pull . copy && - test_cmp_rev HEAD^ copy && - echo new >expect && - git show HEAD:file2 >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && + test new = "$(git show HEAD:file2)" ' test_expect_success 'pull --autostash & pull.rebase=true' ' @@ -434,10 +395,8 @@ test_expect_success 'branch.to-rebase.rebase' ' git reset --hard before-rebase && test_config branch.to-rebase.rebase true && git pull . copy && - test_cmp_rev HEAD^ copy && - echo new >expect && - git show HEAD:file2 >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && + test new = "$(git show HEAD:file2)" ' test_expect_success 'branch.to-rebase.rebase should override pull.rebase' ' @@ -445,29 +404,23 @@ test_expect_success 'branch.to-rebase.rebase should override pull.rebase' ' test_config pull.rebase true && test_config branch.to-rebase.rebase false && git pull . copy && - test_cmp_rev ! HEAD^ copy && - echo new >expect && - git show HEAD:file2 >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" && + test new = "$(git show HEAD:file2)" ' -test_expect_success 'pull --rebase warns on --verify-signatures' ' +test_expect_success "pull --rebase warns on --verify-signatures" ' git reset --hard before-rebase && git pull --rebase --verify-signatures . copy 2>err && - test_cmp_rev HEAD^ copy && - echo new >expect && - git show HEAD:file2 >actual && - test_cmp expect actual && + test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && + test new = "$(git show HEAD:file2)" && test_i18ngrep "ignoring --verify-signatures for rebase" err ' -test_expect_success 'pull --rebase does not warn on --no-verify-signatures' ' +test_expect_success "pull --rebase does not warn on --no-verify-signatures" ' git reset --hard before-rebase && git pull --rebase --no-verify-signatures . copy 2>err && - test_cmp_rev HEAD^ copy && - echo new >expect && - git show HEAD:file2 >actual && - test_cmp expect actual && + test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && + test new = "$(git show HEAD:file2)" && test_i18ngrep ! "verify-signatures" err ' @@ -487,31 +440,25 @@ test_expect_success 'pull.rebase=false create a new merge commit' ' git reset --hard before-preserve-rebase && test_config pull.rebase false && git pull . copy && - test_cmp_rev HEAD^1 before-preserve-rebase && - test_cmp_rev HEAD^2 copy && - echo file3 >expect && - git show HEAD:file3.t >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" && + test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" && + test file3 = "$(git show HEAD:file3.t)" ' test_expect_success 'pull.rebase=true flattens keep-merge' ' git reset --hard before-preserve-rebase && test_config pull.rebase true && git pull . copy && - test_cmp_rev HEAD^^ copy && - echo file3 >expect && - git show HEAD:file3.t >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && + test file3 = "$(git show HEAD:file3.t)" ' test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' ' git reset --hard before-preserve-rebase && test_config pull.rebase 1 && git pull . copy && - test_cmp_rev HEAD^^ copy && - echo file3 >expect && - git show HEAD:file3.t >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && + test file3 = "$(git show HEAD:file3.t)" ' test_expect_success REBASE_P \ @@ -519,8 +466,8 @@ test_expect_success REBASE_P \ git reset --hard before-preserve-rebase && test_config pull.rebase preserve && git pull . copy && - test_cmp_rev HEAD^^ copy && - test_cmp_rev HEAD^2 keep-merge + test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && + test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)" ' test_expect_success 'pull.rebase=interactive' ' @@ -531,8 +478,7 @@ test_expect_success 'pull.rebase=interactive' ' test_set_editor "$TRASH_DIRECTORY/fake-editor" && test_when_finished "test_might_fail git rebase --abort" && test_must_fail git pull --rebase=interactive . copy && - echo "I was here" >expect && - test_cmp expect fake.out + test "I was here" = "$(cat fake.out)" ' test_expect_success 'pull --rebase=i' ' @@ -543,35 +489,30 @@ test_expect_success 'pull --rebase=i' ' test_set_editor "$TRASH_DIRECTORY/fake-editor" && test_when_finished "test_might_fail git rebase --abort" && test_must_fail git pull --rebase=i . copy && - echo "I was here, too" >expect && - test_cmp expect fake.out + test "I was here, too" = "$(cat fake.out)" ' test_expect_success 'pull.rebase=invalid fails' ' git reset --hard before-preserve-rebase && test_config pull.rebase invalid && - test_must_fail git pull . copy + ! git pull . copy ' test_expect_success '--rebase=false create a new merge commit' ' git reset --hard before-preserve-rebase && test_config pull.rebase true && git pull --rebase=false . copy && - test_cmp_rev HEAD^1 before-preserve-rebase && - test_cmp_rev HEAD^2 copy && - echo file3 >expect && - git show HEAD:file3.t >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" && + test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" && + test file3 = "$(git show HEAD:file3.t)" ' test_expect_success '--rebase=true rebases and flattens keep-merge' ' git reset --hard before-preserve-rebase && test_config pull.rebase preserve && git pull --rebase=true . copy && - test_cmp_rev HEAD^^ copy && - echo file3 >expect && - git show HEAD:file3.t >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && + test file3 = "$(git show HEAD:file3.t)" ' test_expect_success REBASE_P \ @@ -579,62 +520,58 @@ test_expect_success REBASE_P \ git reset --hard before-preserve-rebase && test_config pull.rebase true && git pull --rebase=preserve . copy && - test_cmp_rev HEAD^^ copy && - test_cmp_rev HEAD^2 keep-merge + test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && + test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)" ' test_expect_success '--rebase=invalid fails' ' git reset --hard before-preserve-rebase && - test_must_fail git pull --rebase=invalid . copy + ! git pull --rebase=invalid . copy ' test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' ' git reset --hard before-preserve-rebase && test_config pull.rebase preserve && git pull --rebase . copy && - test_cmp_rev HEAD^^ copy && - echo file3 >expect && - git show HEAD:file3.t >actual && - test_cmp expect actual + test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" && + test file3 = "$(git show HEAD:file3.t)" ' test_expect_success '--rebase with rebased upstream' ' + git remote add -f me . && git checkout copy && git tag copy-orig && git reset --hard HEAD^ && - echo conflicting modification >file && + echo conflicting modification > file && git commit -m conflict file && git checkout to-rebase && - echo file >file2 && + echo file > file2 && git commit -m to-rebase file2 && git tag to-rebase-orig && git pull --rebase me copy && - echo "conflicting modification" >expect && - test_cmp expect file && - echo file >expect && - test_cmp expect file2 + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" + ' test_expect_success '--rebase -f with rebased upstream' ' test_when_finished "test_might_fail git rebase --abort" && git reset --hard to-rebase-orig && git pull --rebase -f me copy && - echo "conflicting modification" >expect && - test_cmp expect file && - echo file >expect && - test_cmp expect file2 + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" ' test_expect_success '--rebase with rebased default upstream' ' + git update-ref refs/remotes/me/copy copy-orig && git checkout --track -b to-rebase2 me/copy && git reset --hard to-rebase-orig && git pull --rebase && - echo "conflicting modification" >expect && - test_cmp expect file && - echo file >expect && - test_cmp expect file2 + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" + ' test_expect_success 'rebased upstream + fetch + pull --rebase' ' @@ -645,14 +582,13 @@ test_expect_success 'rebased upstream + fetch + pull --rebase' ' git reset --hard to-rebase-orig && git fetch && git pull --rebase && - echo "conflicting modification" >expect && - test_cmp expect file && - echo file >expect && - test_cmp expect file2 + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" ' test_expect_success 'pull --rebase dies early with dirty working directory' ' + git checkout to-rebase && git update-ref refs/remotes/me/copy copy^ && COPY="$(git rev-parse --verify me/copy)" && @@ -660,23 +596,23 @@ test_expect_success 'pull --rebase dies early with dirty working directory' ' test_config branch.to-rebase.remote me && test_config branch.to-rebase.merge refs/heads/copy && test_config branch.to-rebase.rebase true && - echo dirty >>file && + echo dirty >> file && git add file && test_must_fail git pull && - test_cmp_rev "$COPY" me/copy && + test "$COPY" = "$(git rev-parse --verify me/copy)" && git checkout HEAD -- file && git pull && - test_cmp_rev ! "$COPY" me/copy + test "$COPY" != "$(git rev-parse --verify me/copy)" + ' test_expect_success 'pull --rebase works on branch yet to be born' ' git rev-parse master >expect && mkdir empty_repo && - ( - cd empty_repo && - git init && - git pull --rebase .. master && - git rev-parse HEAD >../actual + (cd empty_repo && + git init && + git pull --rebase .. master && + git rev-parse HEAD >../actual ) && test_cmp expect actual ' @@ -688,14 +624,10 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' ' cd empty_repo2 && echo staged-file >staged-file && git add staged-file && - echo staged-file >expect && - git ls-files >actual && - test_cmp expect actual && + test "$(git ls-files)" = staged-file && test_must_fail git pull --rebase .. master 2>err && - git ls-files >actual && - test_cmp expect actual && - git show :staged-file >actual && - test_cmp expect actual && + test "$(git ls-files)" = staged-file && + test "$(git show :staged-file)" = staged-file && test_i18ngrep "unborn branch with changes added to the index" err ) ' @@ -706,8 +638,7 @@ test_expect_success 'pull --rebase fails on corrupt HEAD' ' ( cd corrupt && test_commit one && - git rev-parse --verify HEAD >head && - obj=$(sed "s#^..#&/#" head) && + obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") && rm -f .git/objects/$obj && test_must_fail git pull --rebase ) @@ -715,79 +646,66 @@ test_expect_success 'pull --rebase fails on corrupt HEAD' ' test_expect_success 'setup for detecting upstreamed changes' ' mkdir src && - ( - cd src && - git init && - printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff && - git add stuff && - git commit -m "Initial revision" + (cd src && + git init && + printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff && + git add stuff && + git commit -m "Initial revision" ) && git clone src dst && - ( - cd src && - modify s/5/43/ stuff && - git commit -a -m "5->43" && - modify s/6/42/ stuff && - git commit -a -m "Make it bigger" + (cd src && + modify s/5/43/ stuff && + git commit -a -m "5->43" && + modify s/6/42/ stuff && + git commit -a -m "Make it bigger" ) && - ( - cd dst && - modify s/5/43/ stuff && - git commit -a -m "Independent discovery of 5->43" + (cd dst && + modify s/5/43/ stuff && + git commit -a -m "Independent discovery of 5->43" ) ' test_expect_success 'git pull --rebase detects upstreamed changes' ' - ( - cd dst && - git pull --rebase && - git ls-files -u >untracked && - test_must_be_empty untracked + (cd dst && + git pull --rebase && + test -z "$(git ls-files -u)" ) ' test_expect_success 'setup for avoiding reapplying old patches' ' - ( - cd dst && - test_might_fail git rebase --abort && - git reset --hard origin/master + (cd dst && + test_might_fail git rebase --abort && + git reset --hard origin/master ) && git clone --bare src src-replace.git && rm -rf src && mv src-replace.git src && - ( - cd dst && - modify s/2/22/ stuff && - git commit -a -m "Change 2" && - modify s/3/33/ stuff && - git commit -a -m "Change 3" && - modify s/4/44/ stuff && - git commit -a -m "Change 4" && - git push && - - modify s/44/55/ stuff && - git commit --amend -a -m "Modified Change 4" + (cd dst && + modify s/2/22/ stuff && + git commit -a -m "Change 2" && + modify s/3/33/ stuff && + git commit -a -m "Change 3" && + modify s/4/44/ stuff && + git commit -a -m "Change 4" && + git push && + + modify s/44/55/ stuff && + git commit --amend -a -m "Modified Change 4" ) ' test_expect_success 'git pull --rebase does not reapply old patches' ' - ( - cd dst && - test_must_fail git pull --rebase && - cat .git/rebase-merge/done .git/rebase-merge/git-rebase-todo >work && - grep -v -e \# -e ^$ work >patches && - test_line_count = 1 patches && - rm -f work + (cd dst && + test_must_fail git pull --rebase && + test 1 = $(find .git/rebase-apply -name "000*" | wc -l) ) ' test_expect_success 'git pull --rebase against local branch' ' git checkout -b copy2 to-rebase-orig && git pull --rebase . to-rebase && - echo "conflicting modification" >expect && - test_cmp expect file && - echo file >expect && - test_cmp expect file2 + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" ' test_done diff --git a/third_party/git/t/t5528-push-default.sh b/third_party/git/t/t5528-push-default.sh index 4d1e0c363e..44309566f1 100755 --- a/third_party/git/t/t5528-push-default.sh +++ b/third_party/git/t/t5528-push-default.sh @@ -163,7 +163,7 @@ test_pushdefault_workflow success current master # update parent1's foo (which is our upstream) test_pushdefault_workflow success upstream foo -# upstream is foo which is not the name of the current branch +# upsream is foo which is not the name of the current branch test_pushdefault_workflow failure simple master # master and foo are updated diff --git a/third_party/git/t/t5530-upload-pack-error.sh b/third_party/git/t/t5530-upload-pack-error.sh index 4ce9a9f704..a1d3031d40 100755 --- a/third_party/git/t/t5530-upload-pack-error.sh +++ b/third_party/git/t/t5530-upload-pack-error.sh @@ -14,7 +14,7 @@ corrupt_repo () { } test_expect_success 'setup and corrupt repository' ' - test_oid_init && + echo file >file && git add file && git rev-parse :file && @@ -31,10 +31,9 @@ test_expect_success 'fsck fails' ' ' test_expect_success 'upload-pack fails due to error in pack-objects packing' ' - head=$(git rev-parse HEAD) && - hexsz=$(test_oid hexsz) && - printf "%04xwant %s\n00000009done\n0000" \ - $(($hexsz + 10)) $head >input && + + printf "0032want %s\n00000009done\n0000" \ + $(git rev-parse HEAD) >input && test_must_fail git upload-pack . <input >/dev/null 2>output.err && test_i18ngrep "unable to read" output.err && test_i18ngrep "pack-objects died" output.err @@ -52,17 +51,16 @@ test_expect_success 'fsck fails' ' ' test_expect_success 'upload-pack fails due to error in rev-list' ' - printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \ - $(($hexsz + 10)) $(git rev-parse HEAD) \ - $(($hexsz + 12)) $(git rev-parse HEAD^) >input && + printf "0032want %s\n0034shallow %s00000009done\n0000" \ + $(git rev-parse HEAD) $(git rev-parse HEAD^) >input && test_must_fail git upload-pack . <input >/dev/null 2>output.err && grep "bad tree object" output.err ' test_expect_success 'upload-pack fails due to bad want (no object)' ' - printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \ - $(($hexsz + 29)) $(test_oid deadbeef) >input && + printf "0045want %s multi_ack_detailed\n00000009done\n0000" \ + "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input && test_must_fail git upload-pack . <input >output 2>output.err && grep "not our ref" output.err && grep "ERR" output && @@ -72,8 +70,8 @@ test_expect_success 'upload-pack fails due to bad want (no object)' ' test_expect_success 'upload-pack fails due to bad want (not tip)' ' oid=$(echo an object we have | git hash-object -w --stdin) && - printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \ - $(($hexsz + 29)) "$oid" >input && + printf "0045want %s multi_ack_detailed\n00000009done\n0000" \ + "$oid" >input && test_must_fail git upload-pack . <input >output 2>output.err && grep "not our ref" output.err && grep "ERR" output && @@ -82,8 +80,8 @@ test_expect_success 'upload-pack fails due to bad want (not tip)' ' test_expect_success 'upload-pack fails due to error in pack-objects enumeration' ' - printf "%04xwant %s\n00000009done\n0000" \ - $((hexsz + 10)) $(git rev-parse HEAD) >input && + printf "0032want %s\n00000009done\n0000" \ + $(git rev-parse HEAD) >input && test_must_fail git upload-pack . <input >/dev/null 2>output.err && grep "bad tree object" output.err && grep "pack-objects died" output.err diff --git a/third_party/git/t/t5535-fetch-push-symref.sh b/third_party/git/t/t5535-fetch-push-symref.sh index e8f6d233ff..8ed58d27f2 100755 --- a/third_party/git/t/t5535-fetch-push-symref.sh +++ b/third_party/git/t/t5535-fetch-push-symref.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='avoiding conflicting update through symref aliasing' +test_description='avoiding conflicting update thru symref aliasing' . ./test-lib.sh diff --git a/third_party/git/t/t5537-fetch-shallow.sh b/third_party/git/t/t5537-fetch-shallow.sh index 4f681dbbe1..66f0b64d39 100755 --- a/third_party/git/t/t5537-fetch-shallow.sh +++ b/third_party/git/t/t5537-fetch-shallow.sh @@ -15,11 +15,7 @@ test_expect_success 'setup' ' commit 2 && commit 3 && commit 4 && - git config --global transfer.fsckObjects true && - test_oid_cache <<-EOF - perl sha1:s/0034shallow %s/0036unshallow %s/ - perl sha256:s/004cshallow %s/004eunshallow %s/ - EOF + git config --global transfer.fsckObjects true ' test_expect_success 'setup shallow clone' ' @@ -237,29 +233,26 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f git -C "$REPO" config protocol.version 2 && git -C client config protocol.version 2 && - git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" master:a_branch && + git -C client fetch --depth=2 "$HTTPD_URL/one_time_sed/repo" master:a_branch && # Craft a situation in which the server sends back an unshallow request # with an empty packfile. This is done by refetching with a shorter # depth (to ensure that the packfile is empty), and overwriting the # shallow line in the response with the unshallow line we want. - printf "$(test_oid perl)" \ + printf "s/0034shallow %s/0036unshallow %s/" \ "$(git -C "$REPO" rev-parse HEAD)" \ "$(git -C "$REPO" rev-parse HEAD^)" \ - >"$HTTPD_ROOT_PATH/one-time-perl" && + >"$HTTPD_ROOT_PATH/one-time-sed" && test_must_fail env GIT_TEST_SIDEBAND_ALL=0 git -C client \ - fetch --depth=1 "$HTTPD_URL/one_time_perl/repo" \ + fetch --depth=1 "$HTTPD_URL/one_time_sed/repo" \ master:a_branch && - # Ensure that the one-time-perl script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-perl" && + # Ensure that the one-time-sed script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-sed" && # Ensure that the resulting repo is consistent, despite our failure to # fetch. git -C client fsck ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5539-fetch-http-shallow.sh b/third_party/git/t/t5539-fetch-http-shallow.sh index c0d02dee89..b4ad81f006 100755 --- a/third_party/git/t/t5539-fetch-http-shallow.sh +++ b/third_party/git/t/t5539-fetch-http-shallow.sh @@ -69,7 +69,7 @@ test_expect_success 'no shallow lines after receiving ACK ready' ' test_commit new-too && # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. - GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION=0 \ + GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION= \ git fetch --depth=2 && grep "fetch-pack< ACK .* ready" ../trace && ! grep "fetch-pack> done" ../trace diff --git a/third_party/git/t/t5540-http-push-webdav.sh b/third_party/git/t/t5540-http-push-webdav.sh index d476c33509..a094fd5e71 100755 --- a/third_party/git/t/t5540-http-push-webdav.sh +++ b/third_party/git/t/t5540-http-push-webdav.sh @@ -134,13 +134,15 @@ test_expect_success 'MKCOL sends directory names with trailing slashes' ' x1="[0-9a-f]" x2="$x1$x1" -xtrunc=$(echo $OID_REGEX | sed -e "s/\[0-9a-f\]\[0-9a-f\]//") +x5="$x1$x1$x1$x1$x1" +x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1" +x40="$x38$x2" test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' ' sed \ -e "s/PUT /OP /" \ -e "s/MOVE /OP /" \ - -e "s|/objects/$x2/${xtrunc}_$OID_REGEX|WANTED_PATH_REQUEST|" \ + -e "s|/objects/$x2/${x38}_$x40|WANTED_PATH_REQUEST|" \ "$HTTPD_ROOT_PATH"/access.log | grep -e "\"OP .*WANTED_PATH_REQUEST HTTP/[.0-9]*\" 20[0-9] " diff --git a/third_party/git/t/t5541-http-push-smart.sh b/third_party/git/t/t5541-http-push-smart.sh index 23be8ce92d..b86ddb60f2 100755 --- a/third_party/git/t/t5541-http-push-smart.sh +++ b/third_party/git/t/t5541-http-push-smart.sh @@ -49,7 +49,7 @@ test_expect_success 'no empty path components' ' # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 + if test -z "$GIT_TEST_PROTOCOL_VERSION" then check_access_log exp fi @@ -135,7 +135,7 @@ EOF test_expect_success 'used receive-pack service' ' # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 + if test -z "$GIT_TEST_PROTOCOL_VERSION" then check_access_log exp fi @@ -184,12 +184,11 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat test_config -C "$d" http.receivepack true && up="$HTTPD_URL"/smart/atomic-branches.git && - # Tell "$up" about three branches for now + # Tell "$up" about two branches for now test_commit atomic1 && test_commit atomic2 && git branch collateral && - git branch other && - git push "$up" master collateral other && + git push "$up" master collateral && # collateral is a valid push, but should be failed by atomic push git checkout collateral && @@ -227,41 +226,6 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat grep "^ ! .*rejected.* collateral -> collateral .*atomic push failed" output ' -test_expect_success 'push --atomic fails on server-side errors' ' - # Use previously set up repository - d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git && - test_config -C "$d" http.receivepack true && - up="$HTTPD_URL"/smart/atomic-branches.git && - - # break ref updates for other on the remote site - mkdir "$d/refs/heads/other.lock" && - - # add the new commit to other - git branch -f other collateral && - - # --atomic should cause entire push to be rejected - test_must_fail git push --atomic "$up" atomic other 2>output && - - # the new branch should not have been created upstream - test_must_fail git -C "$d" show-ref --verify refs/heads/atomic && - - # upstream should still reflect atomic2, the last thing we pushed - # successfully - git rev-parse atomic2 >expected && - # ...to other. - git -C "$d" rev-parse refs/heads/other >actual && - test_cmp expected actual && - - # the new branch should not have been created upstream - test_must_fail git -C "$d" show-ref --verify refs/heads/atomic && - - # the failed refs should be indicated to the user - grep "^ ! .*rejected.* other -> other .*atomic transaction failed" output && - - # the collateral failure refs should be indicated to the user - grep "^ ! .*rejected.* atomic -> atomic .*atomic transaction failed" output -' - test_expect_success 'push --all can push to empty repo' ' d=$HTTPD_DOCUMENT_ROOT_PATH/empty-all.git && git init --bare "$d" && @@ -298,7 +262,7 @@ test_expect_success TTY 'push shows progress when stderr is a tty' ' cd "$ROOT_PATH"/test_repo_clone && test_commit noisy && test_terminal git push >output 2>&1 && - test_i18ngrep "^Writing objects" output + test_i18ngrep "Writing objects" output ' test_expect_success TTY 'push --quiet silences status and progress' ' @@ -313,7 +277,7 @@ test_expect_success TTY 'push --no-progress silences progress but not status' ' test_commit no-progress && test_terminal git push --no-progress >output 2>&1 && test_i18ngrep "^To http" output && - test_i18ngrep ! "^Writing objects" output + test_i18ngrep ! "Writing objects" output ' test_expect_success 'push --progress shows progress to non-tty' ' @@ -321,7 +285,7 @@ test_expect_success 'push --progress shows progress to non-tty' ' test_commit progress && git push --progress >output 2>&1 && test_i18ngrep "^To http" output && - test_i18ngrep "^Writing objects" output + test_i18ngrep "Writing objects" output ' test_expect_success 'http push gives sane defaults to reflog' ' diff --git a/third_party/git/t/t5545-push-options.sh b/third_party/git/t/t5545-push-options.sh index 38e6f7340e..6d1d59c9b1 100755 --- a/third_party/git/t/t5545-push-options.sh +++ b/third_party/git/t/t5545-push-options.sh @@ -115,7 +115,7 @@ test_expect_success 'push options and submodules' ' git -C parent submodule add ../upstream workbench && git -C parent/workbench remote add up ../../upstream && - git -C parent commit -m "add submodule" && + git -C parent commit -m "add submoule" && test_commit -C parent/workbench two && git -C parent add workbench && @@ -278,7 +278,4 @@ test_expect_success 'push options keep quoted characters intact (http)' ' test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5550-http-fetch-dumb.sh b/third_party/git/t/t5550-http-fetch-dumb.sh index ea2688bde5..b811d89cfd 100755 --- a/third_party/git/t/t5550-http-fetch-dumb.sh +++ b/third_party/git/t/t5550-http-fetch-dumb.sh @@ -321,17 +321,11 @@ test_expect_success 'git client does not send an empty Accept-Language' ' ' test_expect_success 'remote-http complains cleanly about malformed urls' ' - test_must_fail git remote-http http::/example.com/repo.git 2>stderr && - test_i18ngrep "url has no scheme" stderr -' - -# NEEDSWORK: Writing commands to git-remote-curl can race against the latter -# erroring out, producing SIGPIPE. Remove "ok=sigpipe" once transport-helper has -# learned to handle early remote helper failures more cleanly. -test_expect_success 'remote-http complains cleanly about empty scheme' ' - test_must_fail ok=sigpipe git ls-remote \ - http::${HTTPD_URL#http}/dumb/repo.git 2>stderr && - test_i18ngrep "url has no scheme" stderr + # do not actually issue "list" or other commands, as we do not + # want to rely on what curl would actually do with such a broken + # URL. This is just about making sure we do not segfault during + # initialization. + test_must_fail git remote-http http::/example.com/repo.git ' test_expect_success 'redirects can be forbidden/allowed' ' diff --git a/third_party/git/t/t5551-http-fetch-smart.sh b/third_party/git/t/t5551-http-fetch-smart.sh index 6788aeface..e38e543867 100755 --- a/third_party/git/t/t5551-http-fetch-smart.sh +++ b/third_party/git/t/t5551-http-fetch-smart.sh @@ -43,7 +43,7 @@ test_expect_success 'clone http repository' ' < Cache-Control: no-cache, max-age=0, must-revalidate < Content-Type: application/x-git-upload-pack-result EOF - GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION=0 \ + GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION= \ git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err && test_cmp file clone/file && tr '\''\015'\'' Q <err | @@ -84,7 +84,7 @@ test_expect_success 'clone http repository' ' # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 + if test -z "$GIT_TEST_PROTOCOL_VERSION" then sed -e "s/^> Accept-Encoding: .*/> Accept-Encoding: ENCODINGS/" \ actual >actual.smudged && @@ -113,7 +113,7 @@ test_expect_success 'used upload-pack service' ' # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 + if test -z "$GIT_TEST_PROTOCOL_VERSION" then check_access_log exp fi @@ -241,7 +241,7 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 + if test -z "$GIT_TEST_PROTOCOL_VERSION" then tail -3 cookies.txt | sort >cookies_tail.txt && test_cmp expect_cookies.txt cookies_tail.txt @@ -336,7 +336,7 @@ test_expect_success 'test allowreachablesha1inwant with unreachable' ' git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" ' @@ -358,7 +358,7 @@ test_expect_success 'test allowanysha1inwant with unreachable' ' git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" && git -C "$server" config uploadpack.allowanysha1inwant 1 && diff --git a/third_party/git/t/t5552-skipping-fetch-negotiator.sh b/third_party/git/t/t5552-skipping-fetch-negotiator.sh index 156c704040..8a14be51a1 100755 --- a/third_party/git/t/t5552-skipping-fetch-negotiator.sh +++ b/third_party/git/t/t5552-skipping-fetch-negotiator.sh @@ -60,6 +60,29 @@ test_expect_success 'commits with no parents are sent regardless of skip distanc have_not_sent c6 c4 c3 ' +test_expect_success 'unknown fetch.negotiationAlgorithm values error out' ' + rm -rf server client trace && + git init server && + test_commit -C server to_fetch && + + git init client && + test_commit -C client on_client && + git -C client checkout on_client && + + test_config -C client fetch.negotiationAlgorithm invalid && + test_must_fail git -C client fetch "$(pwd)/server" 2>err && + test_i18ngrep "unknown fetch negotiation algorithm" err && + + # Explicit "default" value + test_config -C client fetch.negotiationAlgorithm default && + git -C client -c fetch.negotiationAlgorithm=default fetch "$(pwd)/server" && + + # Implementation detail: If there is nothing to fetch, we will not error out + test_config -C client fetch.negotiationAlgorithm invalid && + git -C client fetch "$(pwd)/server" 2>err && + test_i18ngrep ! "unknown fetch negotiation algorithm" err +' + test_expect_success 'when two skips collide, favor the larger one' ' rm -rf server client trace && git init server && @@ -107,11 +130,7 @@ test_expect_success 'use ref advertisement to filter out commits' ' # The ref advertisement itself is filtered when protocol v2 is used, so # use v0. - ( - GIT_TEST_PROTOCOL_VERSION=0 && - export GIT_TEST_PROTOCOL_VERSION && - trace_fetch client origin to_fetch - ) && + GIT_TEST_PROTOCOL_VERSION= trace_fetch client origin to_fetch && have_sent c5 c4^ c2side && have_not_sent c4 c4^^ c4^^^ ' @@ -173,17 +192,7 @@ test_expect_success 'do not send "have" with ancestors of commits that server AC test_commit -C server commit-on-b1 && test_config -C client fetch.negotiationalgorithm skipping && - - # NEEDSWORK: The number of "have"s sent depends on whether the transport - # is stateful. If the overspecification of the result were reduced, this - # test could be used for both stateful and stateless transports. - ( - # Force protocol v0, in which local transport is stateful (in - # protocol v2 it is stateless). - GIT_TEST_PROTOCOL_VERSION=0 && - export GIT_TEST_PROTOCOL_VERSION && - trace_fetch client "$(pwd)/server" to_fetch - ) && + trace_fetch client "$(pwd)/server" to_fetch && grep " fetch" trace && # fetch-pack sends 2 requests each containing 16 "have" lines before diff --git a/third_party/git/t/t5553-set-upstream.sh b/third_party/git/t/t5553-set-upstream.sh deleted file mode 100755 index 81975ad8f9..0000000000 --- a/third_party/git/t/t5553-set-upstream.sh +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/sh - -test_description='"git fetch/pull --set-upstream" basic tests.' -. ./test-lib.sh - -check_config () { - printf "%s\n" "$2" "$3" >"expect.$1" && - { - git config "branch.$1.remote" && git config "branch.$1.merge" - } >"actual.$1" && - test_cmp "expect.$1" "actual.$1" -} - -check_config_missing () { - test_expect_code 1 git config "branch.$1.remote" && - test_expect_code 1 git config "branch.$1.merge" -} - -clear_config () { - for branch in "$@"; do - test_might_fail git config --unset-all "branch.$branch.remote" - test_might_fail git config --unset-all "branch.$branch.merge" - done -} - -ensure_fresh_upstream () { - rm -rf parent && git init --bare parent -} - -test_expect_success 'setup bare parent fetch' ' - ensure_fresh_upstream && - git remote add upstream parent -' - -test_expect_success 'setup commit on master and other fetch' ' - test_commit one && - git push upstream master && - git checkout -b other && - test_commit two && - git push upstream other -' - -# tests for fetch --set-upstream - -test_expect_success 'fetch --set-upstream does not set upstream w/o branch' ' - clear_config master other && - git checkout master && - git fetch --set-upstream upstream && - check_config_missing master && - check_config_missing other -' - -test_expect_success 'fetch --set-upstream upstream master sets branch master but not other' ' - clear_config master other && - git fetch --set-upstream upstream master && - check_config master upstream refs/heads/master && - check_config_missing other -' - -test_expect_success 'fetch --set-upstream upstream other sets branch other' ' - clear_config master other && - git fetch --set-upstream upstream other && - check_config master upstream refs/heads/other && - check_config_missing other -' - -test_expect_success 'fetch --set-upstream master:other does not set the branch other2' ' - clear_config other2 && - git fetch --set-upstream upstream master:other2 && - check_config_missing other2 -' - -test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' ' - # master 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 && - check_config master upstream refs/heads/other && - check_config_missing other && - check_config_missing other2 -' - -test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' ' - clear_config other other2 && - url="file://'"$PWD"'" && - git fetch --set-upstream "$url" && - check_config master "$url" HEAD && - check_config_missing other && - check_config_missing other2 -' - -# tests for pull --set-upstream - -test_expect_success 'setup bare parent pull' ' - git remote rm upstream && - ensure_fresh_upstream && - git remote add upstream parent -' - -test_expect_success 'setup commit on master and other pull' ' - test_commit three && - git push --tags upstream master && - test_commit four && - git push upstream other -' - -test_expect_success 'pull --set-upstream upstream master sets branch master but not other' ' - clear_config master other && - git pull --set-upstream upstream master && - check_config master upstream refs/heads/master && - check_config_missing other -' - -test_expect_success 'pull --set-upstream master:other2 does not set the branch other2' ' - clear_config other2 && - git pull --set-upstream upstream master:other2 && - check_config_missing other2 -' - -test_expect_success 'pull --set-upstream upstream other sets branch master' ' - clear_config master other && - git pull --set-upstream upstream other && - check_config master upstream refs/heads/other && - check_config_missing other -' - -test_expect_success 'pull --set-upstream upstream tag does not set the tag' ' - clear_config three && - git pull --tags --set-upstream upstream three && - check_config_missing three -' - -test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' ' - # master 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 && - check_config master upstream refs/heads/other && - check_config_missing other && - check_config_missing other2 && - check_config_missing three -' - -test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' ' - clear_config master other && - git pull --set-upstream upstream HEAD && - check_config master upstream HEAD && - git checkout other && - git pull --set-upstream upstream HEAD && - check_config other upstream HEAD -' - -test_expect_success 'pull --set-upstream upstream with more than one branch does nothing' ' - clear_config master three && - git pull --set-upstream upstream master three && - check_config_missing master && - check_config_missing three -' - -test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' ' - clear_config master other other2 && - git checkout master && - url="file://'"$PWD"'" && - git pull --set-upstream "$url" && - check_config master "$url" HEAD && - check_config_missing other && - check_config_missing other2 -' - -test_expect_success 'pull --set-upstream with valid URL and branch sets branch' ' - clear_config master other other2 && - git checkout master && - url="file://'"$PWD"'" && - git pull --set-upstream "$url" master && - check_config master "$url" refs/heads/master && - check_config_missing other && - check_config_missing other2 -' - -test_done diff --git a/third_party/git/t/t5562-http-backend-content-length.sh b/third_party/git/t/t5562-http-backend-content-length.sh index 4a110b307e..f0f425b2cf 100755 --- a/third_party/git/t/t5562-http-backend-content-length.sh +++ b/third_party/git/t/t5562-http-backend-content-length.sh @@ -59,7 +59,7 @@ test_expect_success 'setup' ' printf done | packetize >>fetch_body && test_copy_bytes 10 <fetch_body >fetch_body.trunc && hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) && - printf "%s %s refs/heads/newbranch\\0report-status\\n" "$ZERO_OID" "$hash_next" | packetize >push_body && + printf "%s %s refs/heads/newbranch\\0report-status\\n" "$_z40" "$hash_next" | packetize >push_body && printf 0000 >>push_body && echo "$hash_next" | git pack-objects --stdout >>push_body && test_copy_bytes 10 <push_body >push_body.trunc && diff --git a/third_party/git/t/t5573-pull-verify-signatures.sh b/third_party/git/t/t5573-pull-verify-signatures.sh index a53dd8550d..3e9876e197 100755 --- a/third_party/git/t/t5573-pull-verify-signatures.sh +++ b/third_party/git/t/t5573-pull-verify-signatures.sh @@ -60,27 +60,6 @@ test_expect_success GPG 'pull commit with untrusted signature with --verify-sign test_i18ngrep "has an untrusted GPG signature" pullerror ' -test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel ultimate && - test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel marginal && - test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel undefined && - git pull --ff-only --verify-signatures untrusted >pulloutput && - test_i18ngrep "has a good GPG signature" pulloutput -' - test_expect_success GPG 'pull signed commit with --verify-signatures' ' test_when_finished "git reset --hard && git checkout initial" && git pull --verify-signatures signed >pulloutput && @@ -100,53 +79,10 @@ test_expect_success GPG 'pull commit with bad signature with --no-verify-signatu ' test_expect_success GPG 'pull unsigned commit into unborn branch' ' - test_when_finished "rm -rf empty-repo" && git init empty-repo && test_must_fail \ git -C empty-repo pull --verify-signatures .. 2>pullerror && test_i18ngrep "does not have a GPG signature" pullerror ' -test_expect_success GPG 'pull commit into unborn branch with bad signature and --verify-signatures' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../bad 2>pullerror && - test_i18ngrep "has a bad GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_config_global gpg.minTrustLevel ultimate && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_config_global gpg.minTrustLevel marginal && - test_must_fail \ - git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror && - test_i18ngrep "has an untrusted GPG signature" pullerror -' - -test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined' ' - test_when_finished "rm -rf empty-repo" && - git init empty-repo && - test_config_global gpg.minTrustLevel undefined && - git -C empty-repo pull --ff-only --verify-signatures ../untrusted >pulloutput && - test_i18ngrep "has a good GPG signature" pulloutput -' - test_done diff --git a/third_party/git/t/t5580-unc-paths.sh b/third_party/git/t/t5580-clone-push-unc.sh index cf768b3a27..b3c8a92450 100755 --- a/third_party/git/t/t5580-unc-paths.sh +++ b/third_party/git/t/t5580-clone-push-unc.sh @@ -40,23 +40,11 @@ test_expect_success clone ' git clone "file://$UNCPATH" clone ' -test_expect_success 'clone without file://' ' - git clone "$UNCPATH" clone-without-file -' - test_expect_success 'clone with backslashed path' ' BACKSLASHED="$(echo "$UNCPATH" | tr / \\\\)" && git clone "$BACKSLASHED" backslashed ' -test_expect_success fetch ' - git init to-fetch && - ( - cd to-fetch && - git fetch "$UNCPATH" master - ) -' - test_expect_success push ' ( cd clone && @@ -70,7 +58,7 @@ test_expect_success push ' test_expect_success MINGW 'remote nick cannot contain backslashes' ' BACKSLASHED="$(winpwd | tr / \\\\)" && - git ls-remote "$BACKSLASHED" 2>err && + git ls-remote "$BACKSLASHED" >out 2>err && test_i18ngrep ! "unable to access" err ' diff --git a/third_party/git/t/t5601-clone.sh b/third_party/git/t/t5601-clone.sh index 84ea2a3eb7..37d76808d4 100755 --- a/third_party/git/t/t5601-clone.sh +++ b/third_party/git/t/t5601-clone.sh @@ -434,6 +434,7 @@ test_expect_success 'double quoted plink.exe in GIT_SSH_COMMAND' ' expect_ssh "-v -P 123" myhost src ' +SQ="'" test_expect_success 'single quoted plink.exe in GIT_SSH_COMMAND' ' copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink.exe" && GIT_SSH_COMMAND="$SQ$TRASH_DIRECTORY/plink.exe$SQ -v" \ @@ -635,10 +636,10 @@ partial_clone_server () { rm -rf "$SERVER" client && test_create_repo "$SERVER" && test_commit -C "$SERVER" one && - HASH1=$(git -C "$SERVER" hash-object one.t) && + HASH1=$(git hash-object "$SERVER/one.t") && git -C "$SERVER" revert HEAD && test_commit -C "$SERVER" two && - HASH2=$(git -C "$SERVER" hash-object two.t) && + HASH2=$(git hash-object "$SERVER/two.t") && test_config -C "$SERVER" uploadpack.allowfilter 1 && test_config -C "$SERVER" uploadpack.allowanysha1inwant 1 } @@ -653,8 +654,7 @@ partial_clone () { git -C client fsck && # Ensure that unneeded blobs are not inadvertently fetched. - test_config -C client remote.origin.promisor "false" && - git -C client config --unset remote.origin.partialclonefilter && + test_config -C client extensions.partialclone "not a remote" && test_must_fail git -C client cat-file -e "$HASH1" && # But this blob was fetched, because clone performs an initial checkout @@ -739,7 +739,4 @@ test_expect_success 'partial clone using HTTP' ' partial_clone "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server" ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5604-clone-reference.sh b/third_party/git/t/t5604-clone-reference.sh index 0c74b4e21a..4894237ab8 100755 --- a/third_party/git/t/t5604-clone-reference.sh +++ b/third_party/git/t/t5604-clone-reference.sh @@ -326,16 +326,15 @@ test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at obje for raw in $(ls T*.raw) do sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \ - -e "/multi-pack-index/d" <$raw >$raw.de-sha-1 && - sort $raw.de-sha-1 >$raw.de-sha || return 1 + -e "/multi-pack-index/d" <$raw >$raw.de-sha || return 1 done && cat >expected-files <<-EOF && ./Y/Z ./Y/Z - ./Y/Z ./a-loose-dir/Z ./an-object + ./Y/Z ./info/packs ./pack/pack-Z.idx ./pack/pack-Z.pack diff --git a/third_party/git/t/t5607-clone-bundle.sh b/third_party/git/t/t5607-clone-bundle.sh index 9108ff6fbd..2a0fb15cf1 100755 --- a/third_party/git/t/t5607-clone-bundle.sh +++ b/third_party/git/t/t5607-clone-bundle.sh @@ -64,7 +64,7 @@ test_expect_success 'ridiculously long subject in boundary' ' test -s heads && git fetch long-subject-bundle.bdl && sed -n "/^-/{p;q;}" long-subject-bundle.bdl >boundary && - grep "^-$OID_REGEX " boundary + grep "^-[0-9a-f]\\{40\\} " boundary ' test_expect_success 'prerequisites with an empty commit message' ' @@ -83,15 +83,4 @@ test_expect_success 'failed bundle creation does not leave cruft' ' test_path_is_missing fail.bundle.lock ' -test_expect_success 'fetch SHA-1 from bundle' ' - test_create_repo foo && - test_commit -C foo x && - git -C foo bundle create tip.bundle -1 master && - git -C foo rev-parse HEAD >hash && - - # Exercise to ensure that fetching a SHA-1 from a bundle works with no - # errors - git fetch --no-tags foo/tip.bundle "$(cat hash)" -' - test_done diff --git a/third_party/git/t/t5608-clone-2gb.sh b/third_party/git/t/t5608-clone-2gb.sh index eee0842888..2c6bc07344 100755 --- a/third_party/git/t/t5608-clone-2gb.sh +++ b/third_party/git/t/t5608-clone-2gb.sh @@ -3,7 +3,7 @@ test_description='Test cloning a repository larger than 2 gigabyte' . ./test-lib.sh -if ! test_bool_env GIT_TEST_CLONE_2GB false +if test -z "$GIT_TEST_CLONE_2GB" then say 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t' else diff --git a/third_party/git/t/t5616-partial-clone.sh b/third_party/git/t/t5616-partial-clone.sh index 77bb91e976..b91ef548f8 100755 --- a/third_party/git/t/t5616-partial-clone.sh +++ b/third_party/git/t/t5616-partial-clone.sh @@ -42,16 +42,8 @@ test_expect_success 'do partial clone 1' ' test_cmp expect_1.oids observed.oids && test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" && - test "$(git -C pc1 config --local remote.origin.promisor)" = "true" && - test "$(git -C pc1 config --local remote.origin.partialclonefilter)" = "blob:none" -' - -test_expect_success 'verify that .promisor file contains refs fetched' ' - ls pc1/.git/objects/pack/pack-*.promisor >promisorlist && - test_line_count = 1 promisorlist && - git -C srv.bare rev-list HEAD >headhash && - grep "$(cat headhash) HEAD" $(cat promisorlist) && - grep "$(cat headhash) refs/heads/master" $(cat promisorlist) + test "$(git -C pc1 config --local extensions.partialclone)" = "origin" && + test "$(git -C pc1 config --local core.partialclonefilter)" = "blob:none" ' # checkout master to force dynamic object fetch of blobs at HEAD. @@ -216,25 +208,6 @@ test_expect_success 'use fsck before and after manually fetching a missing subtr test_cmp unique_types.expected unique_types.observed ' -test_expect_success 'implicitly construct combine: filter with repeated flags' ' - GIT_TRACE=$(pwd)/trace git clone --bare \ - --filter=blob:none --filter=tree:1 \ - "file://$(pwd)/srv.bare" pc2 && - grep "trace:.* git pack-objects .*--filter=combine:blob:none+tree:1" \ - trace && - git -C pc2 rev-list --objects --missing=allow-any HEAD >objects && - - # We should have gotten some root trees. - grep " $" objects && - # Should not have gotten any non-root trees or blobs. - ! grep " ." objects && - - xargs -n 1 git -C pc2 cat-file -t <objects >types && - sort -u types >unique_types.actual && - test_write_lines commit tree >unique_types.expected && - test_cmp unique_types.expected unique_types.actual -' - test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' ' rm -rf src dst && git init src && @@ -268,153 +241,6 @@ test_expect_success 'fetch what is specified on CLI even if already promised' ' ! grep "?$(cat blob)" missing_after ' -test_expect_success 'setup src repo for sparse filter' ' - git init sparse-src && - git -C sparse-src config --local uploadpack.allowfilter 1 && - git -C sparse-src config --local uploadpack.allowanysha1inwant 1 && - test_commit -C sparse-src one && - test_commit -C sparse-src two && - echo /one.t >sparse-src/only-one && - git -C sparse-src add . && - git -C sparse-src commit -m "add sparse checkout files" -' - -test_expect_success 'partial clone with sparse filter succeeds' ' - rm -rf dst.git && - git clone --no-local --bare \ - --filter=sparse:oid=master:only-one \ - sparse-src dst.git && - ( - cd dst.git && - git rev-list --objects --missing=print HEAD >out && - grep "^$(git rev-parse HEAD:one.t)" out && - grep "^?$(git rev-parse HEAD:two.t)" out - ) -' - -test_expect_success 'partial clone with unresolvable sparse filter fails cleanly' ' - rm -rf dst.git && - test_must_fail git clone --no-local --bare \ - --filter=sparse:oid=master:no-such-name \ - sparse-src dst.git 2>err && - test_i18ngrep "unable to access sparse blob in .master:no-such-name" err && - test_must_fail git clone --no-local --bare \ - --filter=sparse:oid=master \ - sparse-src dst.git 2>err && - test_i18ngrep "unable to parse sparse filter data in" err -' - -setup_triangle () { - rm -rf big-blob.txt server client promisor-remote && - - printf "line %d\n" $(test_seq 1 100) >big-blob.txt && - - # Create a server with 2 commits: a commit with a big tree and a child - # commit with an incremental change. Also, create a partial clone - # client that only contains the first commit. - git init server && - git -C server config --local uploadpack.allowfilter 1 && - for i in $(test_seq 1 100) - do - echo "make the tree big" >server/file$i && - git -C server add file$i - done && - git -C server commit -m "initial" && - git clone --bare --filter=tree:0 "file://$(pwd)/server" client && - echo another line >>server/file1 && - git -C server commit -am "incremental change" && - - # Create a promisor remote that only contains the tree and blob from - # the first commit. - git init promisor-remote && - git -C server config --local uploadpack.allowanysha1inwant 1 && - TREE_HASH=$(git -C server rev-parse HEAD~1^{tree}) && - git -C promisor-remote fetch --keep "file://$(pwd)/server" "$TREE_HASH" && - git -C promisor-remote count-objects -v >object-count && - test_i18ngrep "count: 0" object-count && - test_i18ngrep "in-pack: 2" object-count && - - # Set it as the promisor remote of client. Thus, whenever - # the client lazy fetches, the lazy fetch will succeed only if it is - # for this tree or blob. - test_commit -C promisor-remote one && # so that ref advertisement is not empty - git -C promisor-remote config --local uploadpack.allowanysha1inwant 1 && - git -C client remote set-url origin "file://$(pwd)/promisor-remote" -} - -# NEEDSWORK: The tests beginning with "fetch lazy-fetches" below only -# test that "fetch" avoid fetching trees and blobs, but not commits or -# tags. Revisit this if Git is ever taught to support partial clones -# with commits and/or tags filtered out. - -test_expect_success 'fetch lazy-fetches only to resolve deltas' ' - setup_triangle && - - # Exercise to make sure it works. Git will not fetch anything from the - # promisor remote other than for the big tree (because it needs to - # resolve the delta). - GIT_TRACE_PACKET="$(pwd)/trace" git -C client \ - fetch "file://$(pwd)/server" master && - - # Verify the assumption that the client needed to fetch the delta base - # to resolve the delta. - git -C server rev-parse HEAD~1^{tree} >hash && - grep "want $(cat hash)" trace -' - -test_expect_success 'fetch lazy-fetches only to resolve deltas, protocol v2' ' - setup_triangle && - - git -C server config --local protocol.version 2 && - git -C client config --local protocol.version 2 && - git -C promisor-remote config --local protocol.version 2 && - - # Exercise to make sure it works. Git will not fetch anything from the - # promisor remote other than for the big blob (because it needs to - # resolve the delta). - GIT_TRACE_PACKET="$(pwd)/trace" git -C client \ - fetch "file://$(pwd)/server" master && - - # Verify that protocol version 2 was used. - grep "fetch< version 2" trace && - - # Verify the assumption that the client needed to fetch the delta base - # to resolve the delta. - git -C server rev-parse HEAD~1^{tree} >hash && - grep "want $(cat hash)" trace -' - -# The following two tests must be in this order, or else -# the first will not fail. It is important that the srv.bare -# repository did not have tags during clone, but has tags -# in the fetch. - -test_expect_failure 'verify fetch succeeds when asking for new tags' ' - git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test && - for i in I J K - do - test_commit -C src $i && - git -C src branch $i || return 1 - done && - git -C srv.bare fetch --tags origin +refs/heads/*:refs/heads/* && - git -C tag-test -c protocol.version=2 fetch --tags origin -' - -test_expect_success 'verify fetch downloads only one pack when updating refs' ' - git clone --filter=blob:none "file://$(pwd)/srv.bare" pack-test && - ls pack-test/.git/objects/pack/*pack >pack-list && - test_line_count = 2 pack-list && - for i in A B C - do - test_commit -C src $i && - git -C src branch $i || return 1 - done && - git -C srv.bare fetch origin +refs/heads/*:refs/heads/* && - git -C pack-test fetch origin && - ls pack-test/.git/objects/pack/*pack >pack-list && - test_line_count = 3 pack-list -' - . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd @@ -429,18 +255,14 @@ intersperse () { sed 's/\(..\)/'$1'\1/g' } -# Create a one-time-perl command to replace the existing packfile with $1. +# Create a one-time-sed command to replace the existing packfile with $1. replace_packfile () { # The protocol requires that the packfile be sent in sideband 1, hence # the extra \x01 byte at the beginning. - cp $1 "$HTTPD_ROOT_PATH/one-time-pack" && - echo 'if (/packfile/) { - print; - my $length = -s "one-time-pack"; - printf "%04x\x01", $length + 5; - print `cat one-time-pack` . "0000"; - last - }' >"$HTTPD_ROOT_PATH/one-time-perl" + printf "1,/packfile/!c %04x\\\\x01%s0000" \ + "$(($(wc -c <$1) + 5))" \ + "$(hex_unpack <$1 | intersperse '\\x')" \ + >"$HTTPD_ROOT_PATH/one-time-sed" } test_expect_success 'upon cloning, check that all refs point to objects' ' @@ -464,16 +286,16 @@ test_expect_success 'upon cloning, check that all refs point to objects' ' # \x01 byte at the beginning. replace_packfile incomplete.pack && - # Use protocol v2 because the perl command looks for the "packfile" + # Use protocol v2 because the sed command looks for the "packfile" # section header. test_config -C "$SERVER" protocol.version 2 && test_must_fail git -c protocol.version=2 clone \ - --filter=blob:none $HTTPD_URL/one_time_perl/server repo 2>err && + --filter=blob:none $HTTPD_URL/one_time_sed/server repo 2>err && test_i18ngrep "did not send all necessary objects" err && - # Ensure that the one-time-perl script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-perl" + # Ensure that the one-time-sed script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-sed" ' test_expect_success 'when partial cloning, tolerate server not sending target of tag' ' @@ -504,17 +326,17 @@ test_expect_success 'when partial cloning, tolerate server not sending target of # \x01 byte at the beginning. replace_packfile incomplete.pack && - # Use protocol v2 because the perl command looks for the "packfile" + # Use protocol v2 because the sed command looks for the "packfile" # section header. test_config -C "$SERVER" protocol.version 2 && # Exercise to make sure it works. git -c protocol.version=2 clone \ - --filter=blob:none $HTTPD_URL/one_time_perl/server repo 2> err && + --filter=blob:none $HTTPD_URL/one_time_sed/server repo 2> err && ! grep "missing object referenced by" err && - # Ensure that the one-time-perl script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-perl" + # Ensure that the one-time-sed script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-sed" ' test_expect_success 'tolerate server sending REF_DELTA against missing promisor objects' ' @@ -537,7 +359,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor # Clone. The client has deltabase_have but not deltabase_missing. git -c protocol.version=2 clone --no-checkout \ - --filter=blob:none $HTTPD_URL/one_time_perl/server repo && + --filter=blob:none $HTTPD_URL/one_time_sed/server repo && git -C repo hash-object -w -- "$SERVER/have.txt" && # Sanity check to ensure that the client does not have @@ -578,7 +400,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor replace_packfile thin.pack && - # Use protocol v2 because the perl command looks for the "packfile" + # Use protocol v2 because the sed command looks for the "packfile" # section header. test_config -C "$SERVER" protocol.version 2 && @@ -591,11 +413,8 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor grep "want $(cat deltabase_missing)" trace && ! grep "want $(cat deltabase_have)" trace && - # Ensure that the one-time-perl script was used. - ! test -e "$HTTPD_ROOT_PATH/one-time-perl" + # Ensure that the one-time-sed script was used. + ! test -e "$HTTPD_ROOT_PATH/one-time-sed" ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5617-clone-submodules-remote.sh b/third_party/git/t/t5617-clone-submodules-remote.sh index 1a041df10b..37fcce9c40 100755 --- a/third_party/git/t/t5617-clone-submodules-remote.sh +++ b/third_party/git/t/t5617-clone-submodules-remote.sh @@ -14,8 +14,7 @@ test_expect_success 'setup' ' cd sub && git init && test_commit subcommit1 && - git tag sub_when_added_to_super && - git branch other + git tag sub_when_added_to_super ) && git submodule add "file://$pwd/sub" sub && git commit -m "add submodule" && @@ -52,14 +51,4 @@ test_expect_success 'check the default is --no-remote-submodules' ' ) ' -test_expect_success 'clone with --single-branch' ' - test_when_finished "rm -rf super_clone" && - git clone --recurse-submodules --single-branch "file://$pwd/." super_clone && - ( - cd super_clone/sub && - git rev-parse --verify origin/master && - test_must_fail git rev-parse --verify origin/other - ) -' - test_done diff --git a/third_party/git/t/t5700-protocol-v1.sh b/third_party/git/t/t5700-protocol-v1.sh index 022901b9eb..7c9511c593 100755 --- a/third_party/git/t/t5700-protocol-v1.sh +++ b/third_party/git/t/t5700-protocol-v1.sh @@ -5,8 +5,7 @@ test_description='test git wire-protocol transition' TEST_NO_CREATE_REPO=1 # This is a protocol-specific test. -GIT_TEST_PROTOCOL_VERSION=0 -export GIT_TEST_PROTOCOL_VERSION +GIT_TEST_PROTOCOL_VERSION= . ./test-lib.sh @@ -293,7 +292,4 @@ test_expect_success 'push with http:// using protocol v1' ' grep "git< version 1" log ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5702-protocol-v2.sh b/third_party/git/t/t5702-protocol-v2.sh index 5039e66dc4..011b81d4fc 100755 --- a/third_party/git/t/t5702-protocol-v2.sh +++ b/third_party/git/t/t5702-protocol-v2.sh @@ -32,7 +32,7 @@ test_expect_success 'list refs with git:// using protocol v2' ' test_cmp expect actual ' -test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' ' +test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' ' test_when_finished "rm -f log" && GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ @@ -154,7 +154,7 @@ test_expect_success 'list refs with file:// using protocol v2' ' test_cmp expect actual ' -test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' ' +test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' ' test_when_finished "rm -f log" && GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ @@ -225,7 +225,7 @@ test_expect_success 'fetch with file:// using protocol v2' ' grep "fetch< version 2" log ' -test_expect_success 'ref advertisement is filtered during fetch using protocol v2' ' +test_expect_success 'ref advertisment is filtered during fetch using protocol v2' ' test_when_finished "rm -f log" && test_commit -C file_parent three && @@ -631,19 +631,6 @@ test_expect_success 'fetch with http:// using protocol v2' ' grep "git< version 2" log ' -test_expect_success 'fetch with http:// by hash without tag following with protocol v2 does not list refs' ' - test_when_finished "rm -f log" && - - test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two_a && - git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" rev-parse two_a >two_a_hash && - - GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \ - fetch --no-tags origin $(cat two_a_hash) && - - grep "fetch< version 2" log && - ! grep "fetch> command=ls-refs" log -' - test_expect_success 'fetch from namespaced repo respects namespaces' ' test_when_finished "rm -f log" && @@ -665,18 +652,6 @@ test_expect_success 'fetch from namespaced repo respects namespaces' ' test_cmp expect actual ' -test_expect_success 'ls-remote with v2 http sends only one POST' ' - test_when_finished "rm -f log" && - - git ls-remote "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" >expect && - GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \ - ls-remote "$HTTPD_URL/smart/http_parent" >actual && - test_cmp expect actual && - - grep "Send header: POST" log >posts && - test_line_count = 1 posts -' - test_expect_success 'push with http:// and a config of v2 does not request v2' ' test_when_finished "rm -f log" && # Till v2 for push is designed, make sure that if a client has @@ -694,9 +669,9 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' ' git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect && test_cmp expect actual && - # Client did not request to use protocol v2 + # Client didnt request to use protocol v2 ! grep "Git-Protocol: version=2" log && - # Server did not respond using protocol v2 + # Server didnt respond using protocol v2 ! grep "git< version 2" log ' @@ -712,11 +687,11 @@ test_expect_success 'when server sends "ready", expect DELIM' ' # After "ready" in the acknowledgments section, pretend that a FLUSH # (0000) was sent instead of a DELIM (0001). - printf "\$ready = 1 if /ready/; \$ready && s/0001/0000/" \ - >"$HTTPD_ROOT_PATH/one-time-perl" && + printf "/ready/,$ s/0001/0000/" \ + >"$HTTPD_ROOT_PATH/one-time-sed" && test_must_fail git -C http_child -c protocol.version=2 \ - fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err && + fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err && test_i18ngrep "expected packfile to be sent after .ready." err ' @@ -737,18 +712,15 @@ test_expect_success 'when server does not send "ready", expect FLUSH' ' # After the acknowledgments section, pretend that a DELIM # (0001) was sent instead of a FLUSH (0000). - printf "\$ack = 1 if /acknowledgments/; \$ack && s/0000/0001/" \ - >"$HTTPD_ROOT_PATH/one-time-perl" && + printf "/acknowledgments/,$ s/0000/0001/" \ + >"$HTTPD_ROOT_PATH/one-time-sed" && test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" git -C http_child \ -c protocol.version=2 \ - fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err && + fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err && grep "fetch< .*acknowledgments" log && ! grep "fetch< .*ready" log && test_i18ngrep "expected no other sections to be sent after no .ready." err ' -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5703-upload-pack-ref-in-want.sh b/third_party/git/t/t5703-upload-pack-ref-in-want.sh index 7fba3063bf..de4b6106ef 100755 --- a/third_party/git/t/t5703-upload-pack-ref-in-want.sh +++ b/third_party/git/t/t5703-upload-pack-ref-in-want.sh @@ -18,16 +18,14 @@ get_actual_commits () { p }' <out | test-tool pkt-line unpack-sideband >o.pack && git index-pack o.pack && - git verify-pack -v o.idx >objs && - grep commit objs | cut -d" " -f1 | sort >actual_commits + git verify-pack -v o.idx | grep commit | cut -c-40 | sort >actual_commits } check_output () { get_actual_refs && test_cmp expected_refs actual_refs && get_actual_commits && - sort expected_commits >sorted_commits && - test_cmp sorted_commits actual_commits + test_cmp expected_commits actual_commits } # c(o/foo) d(o/bar) @@ -37,7 +35,6 @@ check_output () { # \ | / # a test_expect_success 'setup repository' ' - test_oid_init && test_commit a && git checkout -b o/foo && test_commit b && @@ -78,19 +75,17 @@ test_expect_success 'invalid want-ref line' ' ' test_expect_success 'basic want-ref' ' - oid=$(git rev-parse f) && cat >expected_refs <<-EOF && - $oid refs/heads/master + $(git rev-parse f) refs/heads/master EOF - git rev-parse f >expected_commits && + git rev-parse f | sort >expected_commits && - oid=$(git rev-parse a) && test-tool pkt-line pack >in <<-EOF && command=fetch 0001 no-progress want-ref refs/heads/master - have $oid + have $(git rev-parse a) done 0000 EOF @@ -100,22 +95,19 @@ test_expect_success 'basic want-ref' ' ' test_expect_success 'multiple want-ref lines' ' - oid_c=$(git rev-parse c) && - oid_d=$(git rev-parse d) && cat >expected_refs <<-EOF && - $oid_c refs/heads/o/foo - $oid_d refs/heads/o/bar + $(git rev-parse c) refs/heads/o/foo + $(git rev-parse d) refs/heads/o/bar EOF - git rev-parse c d >expected_commits && + git rev-parse c d | sort >expected_commits && - oid=$(git rev-parse b) && test-tool pkt-line pack >in <<-EOF && command=fetch 0001 no-progress want-ref refs/heads/o/foo want-ref refs/heads/o/bar - have $oid + have $(git rev-parse b) done 0000 EOF @@ -125,11 +117,10 @@ test_expect_success 'multiple want-ref lines' ' ' test_expect_success 'mix want and want-ref' ' - oid=$(git rev-parse f) && cat >expected_refs <<-EOF && - $oid refs/heads/master + $(git rev-parse f) refs/heads/master EOF - git rev-parse e f >expected_commits && + git rev-parse e f | sort >expected_commits && test-tool pkt-line pack >in <<-EOF && command=fetch @@ -147,19 +138,17 @@ test_expect_success 'mix want and want-ref' ' ' test_expect_success 'want-ref with ref we already have commit for' ' - oid=$(git rev-parse c) && cat >expected_refs <<-EOF && - $oid refs/heads/o/foo + $(git rev-parse c) refs/heads/o/foo EOF >expected_commits && - oid=$(git rev-parse c) && test-tool pkt-line pack >in <<-EOF && command=fetch 0001 no-progress want-ref refs/heads/o/foo - have $oid + have $(git rev-parse c) done 0000 EOF @@ -168,6 +157,106 @@ test_expect_success 'want-ref with ref we already have commit for' ' check_output ' +. "$TEST_DIRECTORY"/lib-httpd.sh +start_httpd + +REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo" +LOCAL_PRISTINE="$(pwd)/local_pristine" + +test_expect_success 'setup repos for change-while-negotiating test' ' + ( + git init "$REPO" && + cd "$REPO" && + >.git/git-daemon-export-ok && + test_commit m1 && + git tag -d m1 && + + # Local repo with many commits (so that negotiation will take + # more than 1 request/response pair) + git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" && + cd "$LOCAL_PRISTINE" && + git checkout -b side && + test_commit_bulk --id=s 33 && + + # Add novel commits to upstream + git checkout master && + cd "$REPO" && + test_commit m2 && + test_commit m3 && + git tag -d m2 m3 + ) && + git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" && + git -C "$LOCAL_PRISTINE" config protocol.version 2 +' + +inconsistency () { + # Simulate that the server initially reports $2 as the ref + # corresponding to $1, and after that, $1 as the ref corresponding to + # $1. This corresponds to the real-life situation where the server's + # repository appears to change during negotiation, for example, when + # different servers in a load-balancing arrangement serve (stateless) + # RPCs during a single negotiation. + printf "s/%s/%s/" \ + $(git -C "$REPO" rev-parse $1 | tr -d "\n") \ + $(git -C "$REPO" rev-parse $2 | tr -d "\n") \ + >"$HTTPD_ROOT_PATH/one-time-sed" +} + +test_expect_success 'server is initially ahead - no ref in want' ' + git -C "$REPO" config uploadpack.allowRefInWant false && + rm -rf local && + cp -r "$LOCAL_PRISTINE" local && + inconsistency master 1234567890123456789012345678901234567890 && + test_must_fail git -C local fetch 2>err && + test_i18ngrep "fatal: remote error: upload-pack: not our ref" err +' + +test_expect_success 'server is initially ahead - ref in want' ' + git -C "$REPO" config uploadpack.allowRefInWant true && + rm -rf local && + cp -r "$LOCAL_PRISTINE" local && + inconsistency master 1234567890123456789012345678901234567890 && + git -C local fetch && + + git -C "$REPO" rev-parse --verify master >expected && + git -C local rev-parse --verify refs/remotes/origin/master >actual && + test_cmp expected actual +' + +test_expect_success 'server is initially behind - no ref in want' ' + git -C "$REPO" config uploadpack.allowRefInWant false && + rm -rf local && + cp -r "$LOCAL_PRISTINE" local && + inconsistency master "master^" && + git -C local fetch && + + git -C "$REPO" rev-parse --verify "master^" >expected && + git -C local rev-parse --verify refs/remotes/origin/master >actual && + test_cmp expected actual +' + +test_expect_success 'server is initially behind - ref in want' ' + git -C "$REPO" config uploadpack.allowRefInWant true && + rm -rf local && + cp -r "$LOCAL_PRISTINE" local && + inconsistency master "master^" && + git -C local fetch && + + git -C "$REPO" rev-parse --verify "master" >expected && + git -C local rev-parse --verify refs/remotes/origin/master >actual && + test_cmp expected actual +' + +test_expect_success 'server loses a ref - ref in want' ' + git -C "$REPO" config uploadpack.allowRefInWant true && + rm -rf local && + cp -r "$LOCAL_PRISTINE" local && + echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" && + test_must_fail git -C local fetch 2>err && + + test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err +' + REPO="$(pwd)/repo" LOCAL_PRISTINE="$(pwd)/local_pristine" @@ -222,14 +311,13 @@ test_expect_success 'fetching with exact OID' ' rm -rf local && cp -r "$LOCAL_PRISTINE" local && - oid=$(git -C "$REPO" rev-parse d) && GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \ - "$oid":refs/heads/actual && + $(git -C "$REPO" rev-parse d):refs/heads/actual && git -C "$REPO" rev-parse "d" >expected && git -C local rev-parse refs/heads/actual >actual && test_cmp expected actual && - grep "want $oid" log + grep "want $(git -C "$REPO" rev-parse d)" log ' test_expect_success 'fetching multiple refs' ' @@ -251,14 +339,13 @@ test_expect_success 'fetching ref and exact OID' ' rm -rf local && cp -r "$LOCAL_PRISTINE" local && - oid=$(git -C "$REPO" rev-parse b) && GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \ - master "$oid":refs/heads/actual && + master $(git -C "$REPO" rev-parse b):refs/heads/actual && git -C "$REPO" rev-parse "master" "b" >expected && git -C local rev-parse refs/remotes/origin/master refs/heads/actual >actual && test_cmp expected actual && - grep "want $oid" log && + grep "want $(git -C "$REPO" rev-parse b)" log && grep "want-ref refs/heads/master" log ' @@ -285,107 +372,4 @@ test_expect_success 'fetching with wildcard that matches multiple refs' ' grep "want-ref refs/heads/o/bar" log ' -. "$TEST_DIRECTORY"/lib-httpd.sh -start_httpd - -REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo" -LOCAL_PRISTINE="$(pwd)/local_pristine" - -test_expect_success 'setup repos for change-while-negotiating test' ' - ( - git init "$REPO" && - cd "$REPO" && - >.git/git-daemon-export-ok && - test_commit m1 && - git tag -d m1 && - - # Local repo with many commits (so that negotiation will take - # more than 1 request/response pair) - rm -rf "$LOCAL_PRISTINE" && - git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" && - cd "$LOCAL_PRISTINE" && - git checkout -b side && - test_commit_bulk --id=s 33 && - - # Add novel commits to upstream - git checkout master && - cd "$REPO" && - test_commit m2 && - test_commit m3 && - git tag -d m2 m3 - ) && - git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_perl/repo" && - git -C "$LOCAL_PRISTINE" config protocol.version 2 -' - -inconsistency () { - # Simulate that the server initially reports $2 as the ref - # corresponding to $1, and after that, $1 as the ref corresponding to - # $1. This corresponds to the real-life situation where the server's - # repository appears to change during negotiation, for example, when - # different servers in a load-balancing arrangement serve (stateless) - # RPCs during a single negotiation. - oid1=$(git -C "$REPO" rev-parse $1) && - oid2=$(git -C "$REPO" rev-parse $2) && - echo "s/$oid1/$oid2/" >"$HTTPD_ROOT_PATH/one-time-perl" -} - -test_expect_success 'server is initially ahead - no ref in want' ' - git -C "$REPO" config uploadpack.allowRefInWant false && - rm -rf local && - cp -r "$LOCAL_PRISTINE" local && - inconsistency master $(test_oid numeric) && - test_must_fail git -C local fetch 2>err && - test_i18ngrep "fatal: remote error: upload-pack: not our ref" err -' - -test_expect_success 'server is initially ahead - ref in want' ' - git -C "$REPO" config uploadpack.allowRefInWant true && - rm -rf local && - cp -r "$LOCAL_PRISTINE" local && - inconsistency master $(test_oid numeric) && - git -C local fetch && - - git -C "$REPO" rev-parse --verify master >expected && - git -C local rev-parse --verify refs/remotes/origin/master >actual && - test_cmp expected actual -' - -test_expect_success 'server is initially behind - no ref in want' ' - git -C "$REPO" config uploadpack.allowRefInWant false && - rm -rf local && - cp -r "$LOCAL_PRISTINE" local && - inconsistency master "master^" && - git -C local fetch && - - git -C "$REPO" rev-parse --verify "master^" >expected && - git -C local rev-parse --verify refs/remotes/origin/master >actual && - test_cmp expected actual -' - -test_expect_success 'server is initially behind - ref in want' ' - git -C "$REPO" config uploadpack.allowRefInWant true && - rm -rf local && - cp -r "$LOCAL_PRISTINE" local && - inconsistency master "master^" && - git -C local fetch && - - git -C "$REPO" rev-parse --verify "master" >expected && - git -C local rev-parse --verify refs/remotes/origin/master >actual && - test_cmp expected actual -' - -test_expect_success 'server loses a ref - ref in want' ' - git -C "$REPO" config uploadpack.allowRefInWant true && - rm -rf local && - cp -r "$LOCAL_PRISTINE" local && - echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" && - test_must_fail git -C local fetch 2>err && - - test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err -' - -# DO NOT add non-httpd-specific tests here, because the last part of this -# test script is only executed when httpd is available and enabled. - test_done diff --git a/third_party/git/t/t5801-remote-helpers.sh b/third_party/git/t/t5801-remote-helpers.sh index 121e5c6edb..2d6c4a281e 100755 --- a/third_party/git/t/t5801-remote-helpers.sh +++ b/third_party/git/t/t5801-remote-helpers.sh @@ -247,6 +247,7 @@ clean_mark () { test_expect_success 'proper failure checks for fetching' ' (cd local && test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error && + cat error && test_i18ngrep -q "error while running fast-import" error ) ' diff --git a/third_party/git/t/t6000-rev-list-misc.sh b/third_party/git/t/t6000-rev-list-misc.sh index 3dc1ad8f71..52a9e38d66 100755 --- a/third_party/git/t/t6000-rev-list-misc.sh +++ b/third_party/git/t/t6000-rev-list-misc.sh @@ -104,16 +104,13 @@ test_expect_success 'rev-list can show index objects' ' # - we do not show the root tree; since we updated the index, it # does not have a valid cache tree # + cat >expect <<-\EOF && + 8e4020bb5a8d8c873b25de15933e75cc0fc275df one + d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index + 9200b628cf9dc883a85a7abc8d6e6730baee589c two + EOF echo only-in-index >only-in-index && test_when_finished "git reset --hard" && - rev1=$(git rev-parse HEAD:one) && - rev2=$(git rev-parse HEAD:two) && - revi=$(git hash-object only-in-index) && - cat >expect <<-EOF && - $rev1 one - $revi only-in-index - $rev2 two - EOF git add only-in-index && git rev-list --objects --indexed-objects >actual && test_cmp expect actual @@ -143,24 +140,4 @@ test_expect_success '--header shows a NUL after each commit' ' test_cmp expect actual ' -test_expect_success 'rev-list --end-of-options' ' - git update-ref refs/heads/--output=yikes HEAD && - git rev-list --end-of-options --output=yikes >actual && - test_path_is_missing yikes && - git rev-list HEAD >expect && - test_cmp expect actual -' - -test_expect_success 'rev-list --count' ' - count=$(git rev-list --count HEAD) && - git rev-list HEAD >actual && - test_line_count = $count actual -' - -test_expect_success 'rev-list --count --objects' ' - count=$(git rev-list --count --objects HEAD) && - git rev-list --objects HEAD >actual && - test_line_count = $count actual -' - test_done diff --git a/third_party/git/t/t6006-rev-list-format.sh b/third_party/git/t/t6006-rev-list-format.sh index 7e82e43a63..da113d975b 100755 --- a/third_party/git/t/t6006-rev-list-format.sh +++ b/third_party/git/t/t6006-rev-list-format.sh @@ -32,7 +32,6 @@ changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t $test_encoding) truncate_count=20 test_expect_success 'setup' ' - test_oid_init && : >foo && git add foo && git config i18n.commitEncoding $test_encoding && @@ -110,35 +109,31 @@ commit $head1 EOF # we don't test relative here -test_format author %an%n%ae%n%al%n%ad%n%aD%n%at <<EOF +test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF commit $head2 -$GIT_AUTHOR_NAME -$GIT_AUTHOR_EMAIL -$TEST_AUTHOR_LOCALNAME +A U Thor +author@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 commit $head1 -$GIT_AUTHOR_NAME -$GIT_AUTHOR_EMAIL -$TEST_AUTHOR_LOCALNAME +A U Thor +author@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 EOF -test_format committer %cn%n%ce%n%cl%n%cd%n%cD%n%ct <<EOF +test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<EOF commit $head2 -$GIT_COMMITTER_NAME -$GIT_COMMITTER_EMAIL -$TEST_COMMITTER_LOCALNAME +C O Mitter +committer@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 commit $head1 -$GIT_COMMITTER_NAME -$GIT_COMMITTER_EMAIL -$TEST_COMMITTER_LOCALNAME +C O Mitter +committer@example.com Thu Apr 7 15:13:13 2005 -0700 Thu, 7 Apr 2005 15:13:13 -0700 1112911993 @@ -415,7 +410,7 @@ test_expect_success 'empty email' ' test_tick && C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) && A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) && - verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700" + verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" ' test_expect_success 'del LF before empty (1)' ' @@ -464,10 +459,9 @@ test_expect_success '--abbrev' ' ' test_expect_success '%H is not affected by --abbrev-commit' ' - expected=$(($(test_oid hexsz) + 1)) && git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual && len=$(wc -c <actual) && - test $len = $expected + test $len = 41 ' test_expect_success '%h is not affected by --abbrev-commit' ' @@ -501,14 +495,15 @@ test_expect_success '%gd shortens ref name' ' ' test_expect_success 'reflog identity' ' - echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect && + echo "C O Mitter:committer@example.com" >expect && git log -g -1 --format="%gn:%ge" >actual && test_cmp expect actual ' test_expect_success 'oneline with empty message' ' - git commit --allow-empty --cleanup=verbatim -m "$LF" && - git commit --allow-empty --allow-empty-message && + git commit -m "dummy" --allow-empty && + git commit -m "dummy" --allow-empty && + git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. && git rev-list --oneline HEAD >test.txt && test_line_count = 5 test.txt && git rev-list --oneline --graph HEAD >testg.txt && diff --git a/third_party/git/t/t6011-rev-list-with-bad-commit.sh b/third_party/git/t/t6011-rev-list-with-bad-commit.sh index bad02cf5b8..545b461e51 100755 --- a/third_party/git/t/t6011-rev-list-with-bad-commit.sh +++ b/third_party/git/t/t6011-rev-list-with-bad-commit.sh @@ -42,7 +42,7 @@ test_expect_success 'corrupt second commit object' \ ' test_expect_success 'rev-list should fail' ' - test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --all > /dev/null + test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git rev-list --all > /dev/null ' test_expect_success 'git repack _MUST_ fail' \ diff --git a/third_party/git/t/t6016-rev-list-graph-simplify-history.sh b/third_party/git/t/t6016-rev-list-graph-simplify-history.sh index f5e6e92f5b..f7181d1d6a 100755 --- a/third_party/git/t/t6016-rev-list-graph-simplify-history.sh +++ b/third_party/git/t/t6016-rev-list-graph-simplify-history.sh @@ -67,10 +67,11 @@ test_expect_success '--graph --all' ' echo "| * $C4" >> expected && echo "| * $C3" >> expected && echo "* | $A5" >> expected && - echo "| | " >> expected && - echo "| \\ " >> expected && - echo "*-. | $A4" >> expected && - echo "|\\ \\| " >> expected && + echo "| | " >> expected && + echo "| \\ " >> expected && + echo "*-. \\ $A4" >> expected && + echo "|\\ \\ \\ " >> expected && + echo "| | |/ " >> expected && echo "| | * $C2" >> expected && echo "| | * $C1" >> expected && echo "| * | $B2" >> expected && @@ -96,10 +97,11 @@ test_expect_success '--graph --simplify-by-decoration' ' echo "| * $C4" >> expected && echo "| * $C3" >> expected && echo "* | $A5" >> expected && - echo "| | " >> expected && - echo "| \\ " >> expected && - echo "*-. | $A4" >> expected && - echo "|\\ \\| " >> expected && + echo "| | " >> expected && + echo "| \\ " >> expected && + echo "*-. \\ $A4" >> expected && + echo "|\\ \\ \\ " >> expected && + echo "| | |/ " >> expected && echo "| | * $C2" >> expected && echo "| | * $C1" >> expected && echo "| * | $B2" >> expected && @@ -129,8 +131,9 @@ test_expect_success '--graph --simplify-by-decoration prune branch B' ' echo "| * $C4" >> expected && echo "| * $C3" >> expected && echo "* | $A5" >> expected && - echo "* | $A4" >> expected && - echo "|\\| " >> expected && + echo "* | $A4" >> expected && + echo "|\\ \\ " >> expected && + echo "| |/ " >> expected && echo "| * $C2" >> expected && echo "| * $C1" >> expected && echo "* | $A3" >> expected && @@ -148,8 +151,9 @@ test_expect_success '--graph --full-history -- bar.txt' ' echo "|\\ " >> expected && echo "| * $C4" >> expected && echo "* | $A5" >> expected && - echo "* | $A4" >> expected && - echo "|\\| " >> expected && + echo "* | $A4" >> expected && + echo "|\\ \\ " >> expected && + echo "| |/ " >> expected && echo "* | $A3" >> expected && echo "|/ " >> expected && echo "* $A2" >> expected && @@ -251,7 +255,7 @@ test_expect_success '--graph --boundary ^C3' ' echo "* | | | $A3" >> expected && echo "o | | | $A2" >> expected && echo "|/ / / " >> expected && - echo "o / / $A1" >> expected && + echo "o | | $A1" >> expected && echo " / / " >> expected && echo "| o $C3" >> expected && echo "|/ " >> expected && diff --git a/third_party/git/t/t6019-rev-list-ancestry-path.sh b/third_party/git/t/t6019-rev-list-ancestry-path.sh index 353f84313f..beadaf6cca 100755 --- a/third_party/git/t/t6019-rev-list-ancestry-path.sh +++ b/third_party/git/t/t6019-rev-list-ancestry-path.sh @@ -143,14 +143,14 @@ test_expect_success 'setup criss-cross' ' test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' ' (cd criss-cross && git rev-list --ancestry-path xcb..xbc > actual && - test_must_be_empty actual) + test -z "$(cat actual)") ' # no commits in repository descend from cb test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' ' (cd criss-cross && git rev-list --ancestry-path --all ^xcb > actual && - test_must_be_empty actual) + test -z "$(cat actual)") ' test_done diff --git a/third_party/git/t/t6020-merge-df.sh b/third_party/git/t/t6020-merge-df.sh index 400a4cd139..46b506b3b7 100755 --- a/third_party/git/t/t6020-merge-df.sh +++ b/third_party/git/t/t6020-merge-df.sh @@ -83,9 +83,9 @@ test_expect_success 'modify/delete + directory/file conflict' ' test 4 -eq $(git ls-files -u | wc -l) && test 1 -eq $(git ls-files -o | wc -l) && - test_path_is_file letters/file && - test_path_is_file letters.txt && - test_path_is_file letters~modify + test -f letters/file && + test -f letters.txt && + test -f letters~modify ' test_expect_success 'modify/delete + directory/file conflict; other way' ' @@ -99,52 +99,9 @@ test_expect_success 'modify/delete + directory/file conflict; other way' ' test 4 -eq $(git ls-files -u | wc -l) && test 1 -eq $(git ls-files -o | wc -l) && - test_path_is_file letters/file && - test_path_is_file letters.txt && - test_path_is_file letters~HEAD -' - -test_expect_success 'Simple merge in repo with interesting pathnames' ' - # Simple lexicographic ordering of files and directories would be: - # foo - # foo/bar - # foo/bar-2 - # foo/bar/baz - # foo/bar-2/baz - # The fact that foo/bar-2 appears between foo/bar and foo/bar/baz - # can trip up some codepaths, and is the point of this test. - test_create_repo name-ordering && - ( - cd name-ordering && - - mkdir -p foo/bar && - mkdir -p foo/bar-2 && - >foo/bar/baz && - >foo/bar-2/baz && - git add . && - git commit -m initial && - - git branch main && - git branch other && - - git checkout other && - echo other >foo/bar-2/baz && - git add -u && - git commit -m other && - - git checkout main && - echo main >foo/bar/baz && - git add -u && - git commit -m main && - - git merge other && - git ls-files -s >out && - test_line_count = 2 out && - git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual && - git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect && - test_cmp expect actual - ) - + test -f letters/file && + test -f letters.txt && + test -f letters~HEAD ' test_done diff --git a/third_party/git/t/t6021-merge-criss-cross.sh b/third_party/git/t/t6021-merge-criss-cross.sh index 9d5e992878..213deecab1 100755 --- a/third_party/git/t/t6021-merge-criss-cross.sh +++ b/third_party/git/t/t6021-merge-criss-cross.sh @@ -3,65 +3,94 @@ # Copyright (c) 2005 Fredrik Kuivinen # -# See https://lore.kernel.org/git/Pine.LNX.4.44.0504271254120.4678-100000@wax.eds.org/ for a +# See http://marc.info/?l=git&m=111463358500362&w=2 for a # nice description of what this is about. test_description='Test criss-cross merge' . ./test-lib.sh -test_expect_success 'prepare repository' ' - test_write_lines 1 2 3 4 5 6 7 8 9 >file && - git add file && - git commit -m "Initial commit" file && - - git branch A && - git branch B && - git checkout A && - - test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file && - git commit -m "B8" file && - git checkout B && - - test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file && - git commit -m "C3" file && - git branch C3 && - - git merge -m "pre E3 merge" A && - - test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file && - git commit -m "E3" file && - - git checkout A && - git merge -m "pre D8 merge" C3 && - test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file && - - git commit -m D8 file -' - -test_expect_success 'Criss-cross merge' ' - git merge -m "final merge" B -' - -test_expect_success 'Criss-cross merge result' ' - cat <<-\EOF >file-expect && - 1 - 2 - 3 changed in E3, branch B. New file size - 4 - 5 - 6 - 7 - 8 changed in D8, branch A. New file size 2 - 9 - EOF - - test_cmp file-expect file -' - -test_expect_success 'Criss-cross merge fails (-s resolve)' ' - git reset --hard A^ && - test_must_fail git merge -s resolve -m "final merge" B -' +test_expect_success 'prepare repository' \ +'echo "1 +2 +3 +4 +5 +6 +7 +8 +9" > file && +git add file && +git commit -m "Initial commit" file && +git branch A && +git branch B && +git checkout A && +echo "1 +2 +3 +4 +5 +6 +7 +8 changed in B8, branch A +9" > file && +git commit -m "B8" file && +git checkout B && +echo "1 +2 +3 changed in C3, branch B +4 +5 +6 +7 +8 +9 +" > file && +git commit -m "C3" file && +git branch C3 && +git merge -m "pre E3 merge" A && +echo "1 +2 +3 changed in E3, branch B. New file size +4 +5 +6 +7 +8 changed in B8, branch A +9 +" > file && +git commit -m "E3" file && +git checkout A && +git merge -m "pre D8 merge" C3 && +echo "1 +2 +3 changed in C3, branch B +4 +5 +6 +7 +8 changed in D8, branch A. New file size 2 +9" > file && +git commit -m D8 file' + +test_expect_success 'Criss-cross merge' 'git merge -m "final merge" B' + +cat > file-expect <<EOF +1 +2 +3 changed in E3, branch B. New file size +4 +5 +6 +7 +8 changed in D8, branch A. New file size 2 +9 +EOF + +test_expect_success 'Criss-cross merge result' 'cmp file file-expect' + +test_expect_success 'Criss-cross merge fails (-s resolve)' \ +'git reset --hard A^ && +test_must_fail git merge -s resolve -m "final merge" B' test_done diff --git a/third_party/git/t/t6022-merge-rename.sh b/third_party/git/t/t6022-merge-rename.sh index bbbba3dcbf..53cc9b2ffb 100755 --- a/third_party/git/t/t6022-merge-rename.sh +++ b/third_party/git/t/t6022-merge-rename.sh @@ -8,94 +8,94 @@ modify () { mv "$2.x" "$2" } -test_expect_success 'setup' ' - cat >A <<-\EOF && - a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - c cccccccccccccccccccccccccccccccccccccccccccccccc - d dddddddddddddddddddddddddddddddddddddddddddddddd - e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee - f ffffffffffffffffffffffffffffffffffffffffffffffff - g gggggggggggggggggggggggggggggggggggggggggggggggg - h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh - i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii - j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj - k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk - l llllllllllllllllllllllllllllllllllllllllllllllll - m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn - o oooooooooooooooooooooooooooooooooooooooooooooooo - EOF - - cat >M <<-\EOF && - A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB - C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC - D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD - E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE - F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG - H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH - I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII - J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ - K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK - L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL - M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM - N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN - O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO - EOF - - git add A M && - git commit -m "initial has A and M" && - git branch white && - git branch red && - git branch blue && - git branch yellow && - git branch change && - git branch change+rename && - - sed -e "/^g /s/.*/g : master changes a line/" <A >A+ && - mv A+ A && - git commit -a -m "master updates A" && - - git checkout yellow && - rm -f M && - git commit -a -m "yellow removes M" && - - git checkout white && - sed -e "/^g /s/.*/g : white changes a line/" <A >B && - sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && - rm -f A M && - git update-index --add --remove A B M N && - git commit -m "white renames A->B, M->N" && - - git checkout red && - sed -e "/^g /s/.*/g : red changes a line/" <A >B && - sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && - rm -f A M && - git update-index --add --remove A B M N && - git commit -m "red renames A->B, M->N" && - - git checkout blue && - sed -e "/^g /s/.*/g : blue changes a line/" <A >C && - sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && - rm -f A M && - git update-index --add --remove A C M N && - git commit -m "blue renames A->C, M->N" && - - git checkout change && - sed -e "/^g /s/.*/g : changed line/" <A >A+ && - mv A+ A && - git commit -q -a -m "changed" && - - git checkout change+rename && - sed -e "/^g /s/.*/g : changed line/" <A >B && - rm A && - git update-index --add B && - git commit -q -a -m "changed and renamed" && - - git checkout master -' +test_expect_success setup \ +' +cat >A <<\EOF && +a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +c cccccccccccccccccccccccccccccccccccccccccccccccc +d dddddddddddddddddddddddddddddddddddddddddddddddd +e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee +f ffffffffffffffffffffffffffffffffffffffffffffffff +g gggggggggggggggggggggggggggggggggggggggggggggggg +h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh +i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii +j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj +k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk +l llllllllllllllllllllllllllllllllllllllllllllllll +m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm +n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn +o oooooooooooooooooooooooooooooooooooooooooooooooo +EOF + +cat >M <<\EOF && +A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB +C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC +D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD +E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE +F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG +H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH +I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII +J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ +K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK +L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL +M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN +O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO +EOF + +git add A M && +git commit -m "initial has A and M" && +git branch white && +git branch red && +git branch blue && +git branch yellow && +git branch change && +git branch change+rename && + +sed -e "/^g /s/.*/g : master changes a line/" <A >A+ && +mv A+ A && +git commit -a -m "master updates A" && + +git checkout yellow && +rm -f M && +git commit -a -m "yellow removes M" && + +git checkout white && +sed -e "/^g /s/.*/g : white changes a line/" <A >B && +sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && +rm -f A M && +git update-index --add --remove A B M N && +git commit -m "white renames A->B, M->N" && + +git checkout red && +sed -e "/^g /s/.*/g : red changes a line/" <A >B && +sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && +rm -f A M && +git update-index --add --remove A B M N && +git commit -m "red renames A->B, M->N" && + +git checkout blue && +sed -e "/^g /s/.*/g : blue changes a line/" <A >C && +sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && +rm -f A M && +git update-index --add --remove A C M N && +git commit -m "blue renames A->C, M->N" && + +git checkout change && +sed -e "/^g /s/.*/g : changed line/" <A >A+ && +mv A+ A && +git commit -q -a -m "changed" && + +git checkout change+rename && +sed -e "/^g /s/.*/g : changed line/" <A >B && +rm A && +git update-index --add B && +git commit -q -a -m "changed and renamed" && + +git checkout master' test_expect_success 'pull renaming branch into unrenaming one' \ ' @@ -242,24 +242,12 @@ test_expect_success 'merge of identical changes in a renamed file' ' rm -f A M N && git reset --hard && git checkout change+rename && - - test-tool chmtime --get -3600 B >old-mtime && GIT_MERGE_VERBOSITY=3 git merge change >out && - - test-tool chmtime --get B >new-mtime && - test_cmp old-mtime new-mtime && - + test_i18ngrep "^Skipped B" out && git reset --hard HEAD^ && git checkout change && - - # A will be renamed to B; we check mtimes and file presence - test_path_is_missing B && - test-tool chmtime --get -3600 A >old-mtime && GIT_MERGE_VERBOSITY=3 git merge change+rename >out && - - test_path_is_missing A && - test-tool chmtime --get B >new-mtime && - test $(cat old-mtime) -lt $(cat new-mtime) + test_i18ngrep ! "^Skipped B" out ' test_expect_success 'setup for rename + d/f conflicts' ' @@ -300,15 +288,14 @@ test_expect_success 'setup for rename + d/f conflicts' ' git commit -m "Conflicting change" ' +printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n11\n" >expected + test_expect_success 'Rename+D/F conflict; renamed file merges + dir not in way' ' git reset --hard && git checkout -q renamed-file-has-no-conflicts^0 && - git merge --strategy=recursive dir-not-in-way && - git diff --quiet && - test_path_is_file dir && - test_write_lines 1 2 3 4 5555 6 7 8 9 10 11 >expected && + test -f dir && test_cmp expected dir ' @@ -328,8 +315,8 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' ' test_must_fail git diff --quiet && test_must_fail git diff --cached --quiet && - test_path_is_file dir/file-in-the-way && - test_path_is_file dir~HEAD && + test -f dir/file-in-the-way && + test -f dir~HEAD && test_cmp expected dir~HEAD ' @@ -350,11 +337,29 @@ test_expect_success 'Same as previous, but merged other way' ' test_must_fail git diff --quiet && test_must_fail git diff --cached --quiet && - test_path_is_file dir/file-in-the-way && - test_path_is_file dir~renamed-file-has-no-conflicts && + test -f dir/file-in-the-way && + test -f dir~renamed-file-has-no-conflicts && test_cmp expected dir~renamed-file-has-no-conflicts ' +cat >expected <<\EOF && +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +<<<<<<< HEAD:dir +12 +======= +11 +>>>>>>> dir-not-in-way:sub/file +EOF + test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in way' ' git reset --hard && rm -rf dir~* && @@ -367,24 +372,7 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in test_must_fail git diff --quiet && test_must_fail git diff --cached --quiet && - test_path_is_file dir && - cat >expected <<-\EOF && - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - <<<<<<< HEAD:dir - 12 - ======= - 11 - >>>>>>> dir-not-in-way:sub/file - EOF + test -f dir && test_cmp expected dir ' @@ -403,11 +391,29 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in t test_must_fail git diff --quiet && test_must_fail git diff --cached --quiet && - test_path_is_file dir/file-in-the-way && - test_path_is_file dir~HEAD && + test -f dir/file-in-the-way && + test -f dir~HEAD && test_cmp expected dir~HEAD ' +cat >expected <<\EOF && +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +<<<<<<< HEAD:sub/file +11 +======= +12 +>>>>>>> renamed-file-has-conflicts:dir +EOF + test_expect_success 'Same as previous, but merged other way' ' git reset --hard && rm -rf dir~* && @@ -421,25 +427,8 @@ test_expect_success 'Same as previous, but merged other way' ' test_must_fail git diff --quiet && test_must_fail git diff --cached --quiet && - test_path_is_file dir/file-in-the-way && - test_path_is_file dir~renamed-file-has-conflicts && - cat >expected <<-\EOF && - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - <<<<<<< HEAD:sub/file - 11 - ======= - 12 - >>>>>>> renamed-file-has-conflicts:dir - EOF + test -f dir/file-in-the-way && + test -f dir~renamed-file-has-conflicts && test_cmp expected dir~renamed-file-has-conflicts ' @@ -475,9 +464,9 @@ test_expect_success 'both rename source and destination involved in D/F conflict test_must_fail git diff --quiet && - test_path_is_file destdir/foo && - test_path_is_file one && - test_path_is_file destdir~HEAD && + test -f destdir/foo && + test -f one && + test -f destdir~HEAD && test "stuff" = "$(cat destdir~HEAD)" ' @@ -518,9 +507,9 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked test 4 -eq $(find . | grep -v .git | wc -l) && - test_path_is_dir one && - test_path_is_file one~rename-two && - test_path_is_file two && + test -d one && + test -f one~rename-two && + test -f two && test "other" = $(cat one~rename-two) && test "stuff" = $(cat two) ' @@ -538,8 +527,8 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean sta test 3 -eq $(find . | grep -v .git | wc -l) && - test_path_is_file one && - test_path_is_file two && + test -f one && + test -f two && test "other" = $(cat one) && test "stuff" = $(cat two) ' @@ -579,11 +568,11 @@ test_expect_success 'check handling of differently renamed file with D/F conflic test 1 -eq "$(git ls-files -u original | wc -l)" && test 2 -eq "$(git ls-files -o | wc -l)" && - test_path_is_file one/file && - test_path_is_file two/file && - test_path_is_file one~HEAD && - test_path_is_file two~second-rename && - test_path_is_missing original + test -f one/file && + test -f two/file && + test -f one~HEAD && + test -f two~second-rename && + ! test -f original ' test_expect_success 'setup rename one file to two; directories moving out of the way' ' @@ -618,9 +607,9 @@ test_expect_success 'check handling of differently renamed file with D/F conflic test 1 -eq "$(git ls-files -u original | wc -l)" && test 0 -eq "$(git ls-files -o | wc -l)" && - test_path_is_file one && - test_path_is_file two && - test_path_is_missing original + test -f one && + test -f two && + ! test -f original ' test_expect_success 'setup avoid unnecessary update, normal rename' ' @@ -646,7 +635,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' ' test_expect_success 'avoid unnecessary update, normal rename' ' git checkout -q avoid-unnecessary-update-1^0 && - test-tool chmtime --get -3600 rename >expect && + test-tool chmtime --get =1000000000 rename >expect && git merge merge-branch-1 && test-tool chmtime --get rename >actual && test_cmp expect actual # "rename" should have stayed intact @@ -678,7 +667,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic test_expect_success 'avoid unnecessary update, with D/F conflict' ' git checkout -q avoid-unnecessary-update-2^0 && - test-tool chmtime --get -3600 df >expect && + test-tool chmtime --get =1000000000 df >expect && git merge merge-branch-2 && test-tool chmtime --get df >actual && test_cmp expect actual # "df" should have stayed intact @@ -709,7 +698,7 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' ' test_expect_success 'avoid unnecessary update, dir->(file,nothing)' ' git checkout -q master^0 && - test-tool chmtime --get -3600 df >expect && + test-tool chmtime --get =1000000000 df >expect && git merge side && test-tool chmtime --get df >actual && test_cmp expect actual # "df" should have stayed intact @@ -738,7 +727,7 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' ' test_expect_success 'avoid unnecessary update, modify/delete' ' git checkout -q master^0 && - test-tool chmtime --get -3600 file >expect && + test-tool chmtime --get =1000000000 file >expect && test_must_fail git merge side && test-tool chmtime --get file >actual && test_cmp expect actual # "file" should have stayed intact @@ -766,7 +755,7 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' ' test_expect_success 'avoid unnecessary update, rename/add-dest' ' git checkout -q master^0 && - test-tool chmtime --get -3600 newfile >expect && + test-tool chmtime --get =1000000000 newfile >expect && git merge side && test-tool chmtime --get newfile >actual && test_cmp expect actual # "file" should have stayed intact @@ -821,48 +810,48 @@ test_expect_success 'setup for use of extended merge markers' ' git commit -mC ' +cat >expected <<\EOF && +1 +2 +3 +4 +5 +6 +7 +8 +<<<<<<< HEAD:renamed_file +9 +======= +8.5 +>>>>>>> master^0:original_file +EOF + test_expect_success 'merge master into rename has correct extended markers' ' git checkout rename^0 && test_must_fail git merge -s recursive master^0 && - - cat >expected <<-\EOF && - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - <<<<<<< HEAD:renamed_file - 9 - ======= - 8.5 - >>>>>>> master^0:original_file - EOF test_cmp expected renamed_file ' +cat >expected <<\EOF && +1 +2 +3 +4 +5 +6 +7 +8 +<<<<<<< HEAD:original_file +8.5 +======= +9 +>>>>>>> rename^0:renamed_file +EOF + test_expect_success 'merge rename into master has correct extended markers' ' git reset --hard && git checkout master^0 && test_must_fail git merge -s recursive rename^0 && - - cat >expected <<-\EOF && - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - <<<<<<< HEAD:original_file - 8.5 - ======= - 9 - >>>>>>> rename^0:renamed_file - EOF test_cmp expected renamed_file ' diff --git a/third_party/git/t/t6023-merge-file.sh b/third_party/git/t/t6023-merge-file.sh index 2f421d967a..51ee887a77 100755 --- a/third_party/git/t/t6023-merge-file.sh +++ b/third_party/git/t/t6023-merge-file.sh @@ -3,59 +3,56 @@ test_description='RCS merge replacement: merge-file' . ./test-lib.sh -test_expect_success 'setup' ' - cat >orig.txt <<-\EOF && - Dominus regit me, - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - EOF - - cat >new1.txt <<-\EOF && - Dominus regit me, - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam tu mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF - - cat >new2.txt <<-\EOF && - Dominus regit me, et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - EOF - - cat >new3.txt <<-\EOF && - DOMINUS regit me, - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - EOF - - cat >new4.txt <<-\EOF && - Dominus regit me, et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - EOF - - printf "propter nomen suum." >>new4.txt -' +cat > orig.txt << EOF +Dominus regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +EOF + +cat > new1.txt << EOF +Dominus regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam tu mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF + +cat > new2.txt << EOF +Dominus regit me, et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +EOF + +cat > new3.txt << EOF +DOMINUS regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +EOF + +cat > new4.txt << EOF +Dominus regit me, et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +EOF +printf "propter nomen suum." >> new4.txt test_expect_success 'merge with no changes' ' cp orig.txt test.txt && @@ -63,10 +60,9 @@ test_expect_success 'merge with no changes' ' test_cmp test.txt orig.txt ' -test_expect_success "merge without conflict" ' - cp new1.txt test.txt && - git merge-file test.txt orig.txt new2.txt -' +cp new1.txt test.txt +test_expect_success "merge without conflict" \ + "git merge-file test.txt orig.txt new2.txt" test_expect_success 'works in subdirectory' ' mkdir dir && @@ -77,176 +73,151 @@ test_expect_success 'works in subdirectory' ' test_path_is_missing a.txt ' -test_expect_success "merge without conflict (--quiet)" ' - cp new1.txt test.txt && - git merge-file --quiet test.txt orig.txt new2.txt -' - -test_expect_failure "merge without conflict (missing LF at EOF)" ' - cp new1.txt test2.txt && - git merge-file test2.txt orig.txt new4.txt -' - -test_expect_failure "merge result added missing LF" ' - test_cmp test.txt test2.txt -' - -test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" ' - cp new4.txt test3.txt && - git merge-file --quiet test3.txt new2.txt new3.txt -' - -test_expect_success "merge does not add LF away of change" ' - cat >expect.txt <<-\EOF && - DOMINUS regit me, - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - EOF - printf "propter nomen suum." >>expect.txt && - - test_cmp expect.txt test3.txt -' - -test_expect_success "merge with conflicts" ' - cp test.txt backup.txt && - test_must_fail git merge-file test.txt orig.txt new3.txt -' - -test_expect_success "expected conflict markers" ' - cat >expect.txt <<-\EOF && - <<<<<<< test.txt - Dominus regit me, et nihil mihi deerit. - ======= - DOMINUS regit me, - et nihil mihi deerit. - >>>>>>> new3.txt - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam tu mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF - - test_cmp expect.txt test.txt -' - -test_expect_success "merge conflicting with --ours" ' - cp backup.txt test.txt && - - cat >expect.txt <<-\EOF && - Dominus regit me, et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam tu mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF - - git merge-file --ours test.txt orig.txt new3.txt && - test_cmp expect.txt test.txt -' - -test_expect_success "merge conflicting with --theirs" ' - cp backup.txt test.txt && - - cat >expect.txt <<-\EOF && - DOMINUS regit me, - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam tu mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF - - git merge-file --theirs test.txt orig.txt new3.txt && - test_cmp expect.txt test.txt -' - -test_expect_success "merge conflicting with --union" ' - cp backup.txt test.txt && - - cat >expect.txt <<-\EOF && - Dominus regit me, et nihil mihi deerit. - DOMINUS regit me, - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam tu mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF - - git merge-file --union test.txt orig.txt new3.txt && - test_cmp expect.txt test.txt -' - -test_expect_success "merge with conflicts, using -L" ' - cp backup.txt test.txt && - - test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt -' - -test_expect_success "expected conflict markers, with -L" ' - cat >expect.txt <<-\EOF && - <<<<<<< 1 - Dominus regit me, et nihil mihi deerit. - ======= - DOMINUS regit me, - et nihil mihi deerit. - >>>>>>> new3.txt - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam tu mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF - - test_cmp expect.txt test.txt -' - -test_expect_success "conflict in removed tail" ' - sed "s/ tu / TU /" <new1.txt >new5.txt && - test_must_fail git merge-file -p orig.txt new1.txt new5.txt >out -' - -test_expect_success "expected conflict markers" ' - cat >expect <<-\EOF && - Dominus regit me, - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - <<<<<<< orig.txt - ======= - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam TU mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - >>>>>>> new5.txt - EOF - - test_cmp expect out -' +cp new1.txt test.txt +test_expect_success "merge without conflict (--quiet)" \ + "git merge-file --quiet test.txt orig.txt new2.txt" + +cp new1.txt test2.txt +test_expect_failure "merge without conflict (missing LF at EOF)" \ + "git merge-file test2.txt orig.txt new4.txt" + +test_expect_failure "merge result added missing LF" \ + "test_cmp test.txt test2.txt" + +cp new4.txt test3.txt +test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" \ + "git merge-file --quiet test3.txt new2.txt new3.txt" + +cat > expect.txt << EOF +DOMINUS regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +EOF +printf "propter nomen suum." >> expect.txt + +test_expect_success "merge does not add LF away of change" \ + "test_cmp expect.txt test3.txt" + +cp test.txt backup.txt +test_expect_success "merge with conflicts" \ + "test_must_fail git merge-file test.txt orig.txt new3.txt" + +cat > expect.txt << EOF +<<<<<<< test.txt +Dominus regit me, et nihil mihi deerit. +======= +DOMINUS regit me, +et nihil mihi deerit. +>>>>>>> new3.txt +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam tu mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF + +test_expect_success "expected conflict markers" "test_cmp expect.txt test.txt" + +cp backup.txt test.txt + +cat > expect.txt << EOF +Dominus regit me, et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam tu mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF +test_expect_success "merge conflicting with --ours" \ + "git merge-file --ours test.txt orig.txt new3.txt && test_cmp expect.txt test.txt" +cp backup.txt test.txt + +cat > expect.txt << EOF +DOMINUS regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam tu mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF +test_expect_success "merge conflicting with --theirs" \ + "git merge-file --theirs test.txt orig.txt new3.txt && test_cmp expect.txt test.txt" +cp backup.txt test.txt + +cat > expect.txt << EOF +Dominus regit me, et nihil mihi deerit. +DOMINUS regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam tu mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF +test_expect_success "merge conflicting with --union" \ + "git merge-file --union test.txt orig.txt new3.txt && test_cmp expect.txt test.txt" +cp backup.txt test.txt + +test_expect_success "merge with conflicts, using -L" \ + "test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt" + +cat > expect.txt << EOF +<<<<<<< 1 +Dominus regit me, et nihil mihi deerit. +======= +DOMINUS regit me, +et nihil mihi deerit. +>>>>>>> new3.txt +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam tu mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF + +test_expect_success "expected conflict markers, with -L" \ + "test_cmp expect.txt test.txt" + +sed "s/ tu / TU /" < new1.txt > new5.txt +test_expect_success "conflict in removed tail" \ + "test_must_fail git merge-file -p orig.txt new1.txt new5.txt > out" + +cat > expect << EOF +Dominus regit me, +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +<<<<<<< orig.txt +======= +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam TU mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +>>>>>>> new5.txt +EOF + +test_expect_success "expected conflict markers" "test_cmp expect out" test_expect_success 'binary files cannot be merged' ' test_must_fail git merge-file -p \ @@ -254,55 +225,59 @@ test_expect_success 'binary files cannot be merged' ' grep "Cannot merge binary files" merge.err ' +sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" < new5.txt > new6.txt +sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" < new5.txt > new7.txt + test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' ' - sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" <new5.txt >new6.txt && - sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" <new5.txt >new7.txt && test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output && - test 1 = $(grep ======= <output | wc -l) + test 1 = $(grep ======= < output | wc -l) + ' +sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit;/"< new6.txt | tr '%' '\012' > new8.txt +sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit --/" < new7.txt | tr '%' '\012' > new9.txt + test_expect_success 'ZEALOUS_ALNUM' ' - sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit;/" <new6.txt | tr % "\012" >new8.txt && - sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit --/" <new7.txt | tr % "\012" >new9.txt && test_must_fail git merge-file -p \ - new8.txt new5.txt new9.txt >merge.out && - test 1 = $(grep ======= <merge.out | wc -l) + new8.txt new5.txt new9.txt > merge.out && + test 1 = $(grep ======= < merge.out | wc -l) + ' -test_expect_success '"diff3 -m" style output (1)' ' - cat >expect <<-\EOF && - Dominus regit me, - <<<<<<< new8.txt - et nihil mihi deerit; +cat >expect <<\EOF +Dominus regit me, +<<<<<<< new8.txt +et nihil mihi deerit; - In loco pascuae ibi me collocavit; - super aquam refectionis educavit me. - ||||||| new5.txt - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - ======= - et nihil mihi deerit, +In loco pascuae ibi me collocavit; +super aquam refectionis educavit me. +||||||| new5.txt +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +======= +et nihil mihi deerit, - In loco pascuae ibi me collocavit -- - super aquam refectionis educavit me, - >>>>>>> new9.txt - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam TU mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF +In loco pascuae ibi me collocavit -- +super aquam refectionis educavit me, +>>>>>>> new9.txt +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam TU mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF +test_expect_success '"diff3 -m" style output (1)' ' test_must_fail git merge-file -p --diff3 \ new8.txt new5.txt new9.txt >actual && test_cmp expect actual @@ -315,64 +290,61 @@ test_expect_success '"diff3 -m" style output (2)' ' test_cmp expect actual ' -test_expect_success 'marker size' ' - cat >expect <<-\EOF && - Dominus regit me, - <<<<<<<<<< new8.txt - et nihil mihi deerit; +cat >expect <<\EOF +Dominus regit me, +<<<<<<<<<< new8.txt +et nihil mihi deerit; - In loco pascuae ibi me collocavit; - super aquam refectionis educavit me. - |||||||||| new5.txt - et nihil mihi deerit. - In loco pascuae ibi me collocavit, - super aquam refectionis educavit me; - ========== - et nihil mihi deerit, +In loco pascuae ibi me collocavit; +super aquam refectionis educavit me. +|||||||||| new5.txt +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +========== +et nihil mihi deerit, - In loco pascuae ibi me collocavit -- - super aquam refectionis educavit me, - >>>>>>>>>> new9.txt - animam meam convertit, - deduxit me super semitas jusitiae, - propter nomen suum. - Nam et si ambulavero in medio umbrae mortis, - non timebo mala, quoniam TU mecum es: - virga tua et baculus tuus ipsa me consolata sunt. - EOF +In loco pascuae ibi me collocavit -- +super aquam refectionis educavit me, +>>>>>>>>>> new9.txt +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam TU mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF +test_expect_success 'marker size' ' test_must_fail git merge-file -p --marker-size=10 \ new8.txt new5.txt new9.txt >actual && test_cmp expect actual ' -test_expect_success 'conflict at EOF without LF resolved by --ours' ' - printf "line1\nline2\nline3" >nolf-orig.txt && - printf "line1\nline2\nline3x" >nolf-diff1.txt && - printf "line1\nline2\nline3y" >nolf-diff2.txt && +printf "line1\nline2\nline3" >nolf-orig.txt +printf "line1\nline2\nline3x" >nolf-diff1.txt +printf "line1\nline2\nline3y" >nolf-diff2.txt - git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt && - printf "line1\nline2\nline3x" >expect.txt && - test_cmp expect.txt output.txt -' +test_expect_success 'conflict at EOF without LF resolved by --ours' \ + 'git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt && + printf "line1\nline2\nline3x" >expect.txt && + test_cmp expect.txt output.txt' -test_expect_success 'conflict at EOF without LF resolved by --theirs' ' - git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt && - printf "line1\nline2\nline3y" >expect.txt && - test_cmp expect.txt output.txt -' +test_expect_success 'conflict at EOF without LF resolved by --theirs' \ + 'git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt && + printf "line1\nline2\nline3y" >expect.txt && + test_cmp expect.txt output.txt' -test_expect_success 'conflict at EOF without LF resolved by --union' ' - git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt && - printf "line1\nline2\nline3x\nline3y" >expect.txt && - test_cmp expect.txt output.txt -' +test_expect_success 'conflict at EOF without LF resolved by --union' \ + 'git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt && + printf "line1\nline2\nline3x\nline3y" >expect.txt && + test_cmp expect.txt output.txt' test_expect_success 'conflict sections match existing line endings' ' printf "1\\r\\n2\\r\\n3" >crlf-orig.txt && diff --git a/third_party/git/t/t6024-recursive-merge.sh b/third_party/git/t/t6024-recursive-merge.sh index 332cfc53fd..27c7de90ce 100755 --- a/third_party/git/t/t6024-recursive-merge.sh +++ b/third_party/git/t/t6024-recursive-merge.sh @@ -14,95 +14,85 @@ test_description='Test merge without common ancestors' GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100" export GIT_COMMITTER_DATE -test_expect_success 'setup tests' ' - echo 1 >a1 && - git add a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 && - - git checkout -b A master && - echo A >a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 && - - git checkout -b B master && - echo B >a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 && - - git checkout -b D A && - git rev-parse B >.git/MERGE_HEAD && - echo D >a1 && - git update-index a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D && - - git symbolic-ref HEAD refs/heads/other && - echo 2 >a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 && - - git checkout -b C && - echo C >a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 && - - git checkout -b E C && - git rev-parse B >.git/MERGE_HEAD && - echo E >a1 && - git update-index a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E && - - git checkout -b G E && - git rev-parse A >.git/MERGE_HEAD && - echo G >a1 && - git update-index a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G && - - git checkout -b F D && - git rev-parse C >.git/MERGE_HEAD && - echo F >a1 && - git update-index a1 && - GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F && - - test_oid_cache <<-EOF - idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e - idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f - EOF +test_expect_success "setup tests" ' +echo 1 > a1 && +git add a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 && + +git checkout -b A master && +echo A > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 && + +git checkout -b B master && +echo B > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 && + +git checkout -b D A && +git rev-parse B > .git/MERGE_HEAD && +echo D > a1 && +git update-index a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D && + +git symbolic-ref HEAD refs/heads/other && +echo 2 > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 && + +git checkout -b C && +echo C > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 && + +git checkout -b E C && +git rev-parse B > .git/MERGE_HEAD && +echo E > a1 && +git update-index a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E && + +git checkout -b G E && +git rev-parse A > .git/MERGE_HEAD && +echo G > a1 && +git update-index a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G && + +git checkout -b F D && +git rev-parse C > .git/MERGE_HEAD && +echo F > a1 && +git update-index a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F ' test_expect_success 'combined merge conflicts' ' test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G ' -test_expect_success 'result contains a conflict' ' - cat >expect <<-\EOF && - <<<<<<< HEAD - F - ======= - G - >>>>>>> G - EOF +cat > expect << EOF +<<<<<<< HEAD +F +======= +G +>>>>>>> G +EOF - test_cmp expect a1 -' - -test_expect_success 'virtual trees were processed' ' - git ls-files --stage >out && +test_expect_success "result contains a conflict" "test_cmp expect a1" - cat >expect <<-EOF && - 100644 $(test_oid idxstage1) 1 a1 - 100644 $(git rev-parse F:a1) 2 a1 - 100644 $(git rev-parse G:a1) 3 a1 - EOF +git ls-files --stage > out +cat > expect << EOF +100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1 a1 +100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1 +100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 +EOF - test_cmp expect out -' +test_expect_success "virtual trees were processed" "test_cmp expect out" test_expect_success 'refuse to merge binary files' ' git reset --hard && - printf "\0" >binary-file && + printf "\0" > binary-file && git add binary-file && git commit -m binary && git checkout G && - printf "\0\0" >binary-file && + printf "\0\0" > binary-file && git add binary-file && git commit -m binary2 && - test_must_fail git merge F >merge.out 2>merge.err && + test_must_fail git merge F > merge.out 2> merge.err && grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge.err ' @@ -126,6 +116,7 @@ test_expect_success 'mark rename/delete as unmerged' ' test 1 = $(git ls-files --unmerged | wc -l) && test_must_fail git rev-parse --verify :2:a2 && git rev-parse --verify :3:a2 + ' test_done diff --git a/third_party/git/t/t6025-merge-symlinks.sh b/third_party/git/t/t6025-merge-symlinks.sh index 6c0a90d044..433c4de08f 100755 --- a/third_party/git/t/t6025-merge-symlinks.sh +++ b/third_party/git/t/t6025-merge-symlinks.sh @@ -10,53 +10,52 @@ if core.symlinks is false.' . ./test-lib.sh -test_expect_success 'setup' ' - git config core.symlinks false && - >file && - git add file && - git commit -m initial && - git branch b-symlink && - git branch b-file && - l=$(printf file | git hash-object -t blob -w --stdin) && - echo "120000 $l symlink" | git update-index --index-info && - git commit -m master && - git checkout b-symlink && - l=$(printf file-different | git hash-object -t blob -w --stdin) && - echo "120000 $l symlink" | git update-index --index-info && - git commit -m b-symlink && - git checkout b-file && - echo plain-file >symlink && - git add symlink && - git commit -m b-file -' - -test_expect_success 'merge master into b-symlink, which has a different symbolic link' ' - git checkout b-symlink && - test_must_fail git merge master -' - -test_expect_success 'the merge result must be a file' ' - test_path_is_file symlink -' - -test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' ' - git reset --hard && - git checkout b-file && - test_must_fail git merge master -' - -test_expect_success 'the merge result must be a file' ' - test_path_is_file symlink -' - -test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' ' - git reset --hard && - git checkout master && - test_must_fail git merge b-file -' - -test_expect_success 'the merge result must be a file' ' - test_path_is_file symlink -' +test_expect_success \ +'setup' ' +git config core.symlinks false && +> file && +git add file && +git commit -m initial && +git branch b-symlink && +git branch b-file && +l=$(printf file | git hash-object -t blob -w --stdin) && +echo "120000 $l symlink" | git update-index --index-info && +git commit -m master && +git checkout b-symlink && +l=$(printf file-different | git hash-object -t blob -w --stdin) && +echo "120000 $l symlink" | git update-index --index-info && +git commit -m b-symlink && +git checkout b-file && +echo plain-file > symlink && +git add symlink && +git commit -m b-file' + +test_expect_success \ +'merge master into b-symlink, which has a different symbolic link' ' +git checkout b-symlink && +test_must_fail git merge master' + +test_expect_success \ +'the merge result must be a file' ' +test -f symlink' + +test_expect_success \ +'merge master into b-file, which has a file instead of a symbolic link' ' +git reset --hard && git checkout b-file && +test_must_fail git merge master' + +test_expect_success \ +'the merge result must be a file' ' +test -f symlink' + +test_expect_success \ +'merge b-file, which has a file instead of a symbolic link, into master' ' +git reset --hard && +git checkout master && +test_must_fail git merge b-file' + +test_expect_success \ +'the merge result must be a file' ' +test -f symlink' test_done diff --git a/third_party/git/t/t6026-merge-attr.sh b/third_party/git/t/t6026-merge-attr.sh index 5900358ce9..8f9b48a493 100755 --- a/third_party/git/t/t6026-merge-attr.sh +++ b/third_party/git/t/t6026-merge-attr.sh @@ -32,29 +32,7 @@ test_expect_success setup ' test_tick && git commit -m Side && - git tag anchor && - - cat >./custom-merge <<-\EOF && - #!/bin/sh - - orig="$1" ours="$2" theirs="$3" exit="$4" path=$5 - ( - echo "orig is $orig" - echo "ours is $ours" - echo "theirs is $theirs" - echo "path is $path" - echo "=== orig ===" - cat "$orig" - echo "=== ours ===" - cat "$ours" - echo "=== theirs ===" - cat "$theirs" - ) >"$ours+" - cat "$ours+" >"$ours" - rm -f "$ours+" - exit "$exit" - EOF - chmod +x ./custom-merge + git tag anchor ' test_expect_success merge ' @@ -104,6 +82,28 @@ test_expect_success 'retry the merge with longer context' ' grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual ' +cat >./custom-merge <<\EOF +#!/bin/sh + +orig="$1" ours="$2" theirs="$3" exit="$4" path=$5 +( + echo "orig is $orig" + echo "ours is $ours" + echo "theirs is $theirs" + echo "path is $path" + echo "=== orig ===" + cat "$orig" + echo "=== ours ===" + cat "$ours" + echo "=== theirs ===" + cat "$theirs" +) >"$ours+" +cat "$ours+" >"$ours" +rm -f "$ours+" +exit "$exit" +EOF +chmod +x ./custom-merge + test_expect_success 'custom merge backend' ' echo "* merge=union" >.gitattributes && diff --git a/third_party/git/t/t6030-bisect-porcelain.sh b/third_party/git/t/t6030-bisect-porcelain.sh index 821a0c88cf..bdc42e9440 100755 --- a/third_party/git/t/t6030-bisect-porcelain.sh +++ b/third_party/git/t/t6030-bisect-porcelain.sh @@ -482,7 +482,7 @@ test_expect_success 'optimized merge base checks' ' git bisect good > my_bisect_log2.txt && test -f ".git/BISECT_ANCESTORS_OK" && test "$HASH6" = $(git rev-parse --verify HEAD) && - git bisect bad && + git bisect bad > my_bisect_log3.txt && git bisect good "$A_HASH" > my_bisect_log4.txt && test_i18ngrep "merge base must be tested" my_bisect_log4.txt && test_must_fail test -f ".git/BISECT_ANCESTORS_OK" diff --git a/third_party/git/t/t6034-merge-rename-nocruft.sh b/third_party/git/t/t6034-merge-rename-nocruft.sh index a25e730460..89871aa5b0 100755 --- a/third_party/git/t/t6034-merge-rename-nocruft.sh +++ b/third_party/git/t/t6034-merge-rename-nocruft.sh @@ -3,73 +3,74 @@ test_description='Merge-recursive merging renames' . ./test-lib.sh -test_expect_success 'setup' ' - cat >A <<-\EOF && - a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - c cccccccccccccccccccccccccccccccccccccccccccccccc - d dddddddddddddddddddddddddddddddddddddddddddddddd - e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee - f ffffffffffffffffffffffffffffffffffffffffffffffff - g gggggggggggggggggggggggggggggggggggggggggggggggg - h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh - i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii - j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj - k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk - l llllllllllllllllllllllllllllllllllllllllllllllll - m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm - n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn - o oooooooooooooooooooooooooooooooooooooooooooooooo - EOF +test_expect_success setup \ +' +cat >A <<\EOF && +a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb +c cccccccccccccccccccccccccccccccccccccccccccccccc +d dddddddddddddddddddddddddddddddddddddddddddddddd +e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee +f ffffffffffffffffffffffffffffffffffffffffffffffff +g gggggggggggggggggggggggggggggggggggggggggggggggg +h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh +i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii +j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj +k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk +l llllllllllllllllllllllllllllllllllllllllllllllll +m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm +n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn +o oooooooooooooooooooooooooooooooooooooooooooooooo +EOF - cat >M <<-\EOF && - A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB - C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC - D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD - E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE - F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG - H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH - I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII - J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ - K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK - L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL - M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM - N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN - O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO - EOF +cat >M <<\EOF && +A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB +C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC +D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD +E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE +F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF +G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG +H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH +I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII +J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ +K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK +L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL +M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN +O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO +EOF - git add A M && - git commit -m "initial has A and M" && - git branch white && - git branch red && - git branch blue && +git add A M && +git commit -m "initial has A and M" && +git branch white && +git branch red && +git branch blue && - git checkout white && - sed -e "/^g /s/.*/g : white changes a line/" <A >B && - sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && - rm -f A M && - git update-index --add --remove A B M N && - git commit -m "white renames A->B, M->N" && +git checkout white && +sed -e "/^g /s/.*/g : white changes a line/" <A >B && +sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N && +rm -f A M && +git update-index --add --remove A B M N && +git commit -m "white renames A->B, M->N" && - git checkout red && - echo created by red >R && - git update-index --add R && - git commit -m "red creates R" && +git checkout red && +echo created by red >R && +git update-index --add R && +git commit -m "red creates R" && - git checkout blue && - sed -e "/^o /s/.*/g : blue changes a line/" <A >B && - rm -f A && - mv B A && - git update-index A && - git commit -m "blue modify A" && +git checkout blue && +sed -e "/^o /s/.*/g : blue changes a line/" <A >B && +rm -f A && +mv B A && +git update-index A && +git commit -m "blue modify A" && - git checkout master -' +git checkout master' # This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae -test_expect_success 'merge white into red (A->B,M->N)' ' +test_expect_success 'merge white into red (A->B,M->N)' \ +' git checkout -b red-white red && git merge white && git write-tree && @@ -81,7 +82,8 @@ test_expect_success 'merge white into red (A->B,M->N)' ' ' # This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9 -test_expect_success 'merge blue into white (A->B, mod A, A untracked)' ' +test_expect_success 'merge blue into white (A->B, mod A, A untracked)' \ +' git checkout -b white-blue white && echo dirty >A && git merge blue && diff --git a/third_party/git/t/t6035-merge-dir-to-symlink.sh b/third_party/git/t/t6035-merge-dir-to-symlink.sh index 2eddcc7664..9324ea4416 100755 --- a/third_party/git/t/t6035-merge-dir-to-symlink.sh +++ b/third_party/git/t/t6035-merge-dir-to-symlink.sh @@ -31,19 +31,19 @@ test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' ' git rm --cached a/b && git commit -m "untracked symlink remains" && git checkout -f start^0 && - test_path_is_file a/b-2/c/d + test -f a/b-2/c/d ' test_expect_success 'checkout should not have deleted a/b-2/c/d' ' git checkout HEAD^0 && git reset --hard master && git checkout start^0 && - test_path_is_file a/b-2/c/d + test -f a/b-2/c/d ' test_expect_success 'setup for merge test' ' git reset --hard && - test_path_is_file a/b-2/c/d && + test -f a/b-2/c/d && echo x > a/x && git add a/x && git commit -m x && @@ -54,7 +54,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolv git reset --hard && git checkout baseline^0 && git merge -s resolve master && - test_path_is_file a/b-2/c/d + test -f a/b-2/c/d ' test_expect_success SYMLINKS 'a/b was resolved as symlink' ' @@ -65,7 +65,7 @@ test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recurs git reset --hard && git checkout baseline^0 && git merge -s recursive master && - test_path_is_file a/b-2/c/d + test -f a/b-2/c/d ' test_expect_success SYMLINKS 'a/b was resolved as symlink' ' @@ -76,7 +76,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv git reset --hard && git checkout master^0 && git merge -s resolve baseline^0 && - test_path_is_file a/b-2/c/d + test -f a/b-2/c/d ' test_expect_success SYMLINKS 'a/b was resolved as symlink' ' @@ -87,7 +87,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recurs git reset --hard && git checkout master^0 && git merge -s recursive baseline^0 && - test_path_is_file a/b-2/c/d + test -f a/b-2/c/d ' test_expect_success SYMLINKS 'a/b was resolved as symlink' ' @@ -99,8 +99,8 @@ test_expect_failure 'do not lose untracked in merge (resolve)' ' git checkout baseline^0 && >a/b/c/e && test_must_fail git merge -s resolve master && - test_path_is_file a/b/c/e && - test_path_is_file a/b-2/c/d + test -f a/b/c/e && + test -f a/b-2/c/d ' test_expect_success 'do not lose untracked in merge (recursive)' ' @@ -108,8 +108,8 @@ test_expect_success 'do not lose untracked in merge (recursive)' ' git checkout baseline^0 && >a/b/c/e && test_must_fail git merge -s recursive master && - test_path_is_file a/b/c/e && - test_path_is_file a/b-2/c/d + test -f a/b/c/e && + test -f a/b-2/c/d ' test_expect_success 'do not lose modifications in merge (resolve)' ' @@ -140,7 +140,7 @@ test_expect_success 'merge should not have D/F conflicts (resolve)' ' git reset --hard && git checkout baseline^0 && git merge -s resolve test2 && - test_path_is_file a/b/c/d + test -f a/b/c/d ' test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' ' @@ -151,7 +151,7 @@ test_expect_success 'merge should not have D/F conflicts (recursive)' ' git reset --hard && git checkout baseline^0 && git merge -s recursive test2 && - test_path_is_file a/b/c/d + test -f a/b/c/d ' test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' ' @@ -162,7 +162,7 @@ test_expect_success 'merge should not have F/D conflicts (recursive)' ' git reset --hard && git checkout -b foo test2 && git merge -s recursive baseline^0 && - test_path_is_file a/b/c/d + test -f a/b/c/d ' test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' ' diff --git a/third_party/git/t/t6036-recursive-corner-cases.sh b/third_party/git/t/t6036-recursive-corner-cases.sh index b3bf462617..d23b948f27 100755 --- a/third_party/git/t/t6036-recursive-corner-cases.sh +++ b/third_party/git/t/t6036-recursive-corner-cases.sh @@ -60,9 +60,9 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' ' test_must_fail git merge -s recursive R2^0 && git ls-files -s >out && - test_line_count = 5 out && + test_line_count = 2 out && git ls-files -u >out && - test_line_count = 3 out && + test_line_count = 2 out && git ls-files -o >out && test_line_count = 1 out && @@ -133,9 +133,9 @@ test_expect_success 'merge criss-cross + rename merges with basic modification' test_must_fail git merge -s recursive R2^0 && git ls-files -s >out && - test_line_count = 5 out && + test_line_count = 2 out && git ls-files -u >out && - test_line_count = 3 out && + test_line_count = 2 out && git ls-files -o >out && test_line_count = 1 out && @@ -218,18 +218,8 @@ test_expect_success 'git detects differently handled merges conflict' ' git ls-files -o >out && test_line_count = 1 out && - git cat-file -p C:new_a >ours && - git cat-file -p C:a >theirs && - >empty && - test_must_fail git merge-file \ - -L "Temporary merge branch 1" \ - -L "" \ - -L "Temporary merge branch 2" \ - ours empty theirs && - sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked && - git hash-object ours-tweaked >expect && - git rev-parse >>expect \ - D:new_a E:new_a && + git rev-parse >expect \ + C:new_a D:new_a E:new_a && git rev-parse >actual \ :1:new_a :2:new_a :3:new_a && test_cmp expect actual && @@ -267,8 +257,7 @@ test_expect_success 'git detects differently handled merges conflict, swapped' ' ctime=$(git log --no-walk --date=raw --format=%cd C | awk "{print \$1}") && newctime=$(($btime+1)) && git fast-export --no-data --all | sed -e s/$ctime/$newctime/ | git fast-import --force --quiet && - # End of most differences; rest is copy-paste of last test, - # other than swapping C:a and C:new_a due to order switch + # End of differences; rest is copy-paste of last test git checkout D^0 && test_must_fail git merge -s recursive E^0 && @@ -280,18 +269,8 @@ test_expect_success 'git detects differently handled merges conflict, swapped' ' git ls-files -o >out && test_line_count = 1 out && - git cat-file -p C:a >ours && - git cat-file -p C:new_a >theirs && - >empty && - test_must_fail git merge-file \ - -L "Temporary merge branch 1" \ - -L "" \ - -L "Temporary merge branch 2" \ - ours empty theirs && - sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked && - git hash-object ours-tweaked >expect && - git rev-parse >>expect \ - D:new_a E:new_a && + git rev-parse >expect \ + C:new_a D:new_a E:new_a && git rev-parse >actual \ :1:new_a :2:new_a :3:new_a && test_cmp expect actual && @@ -1553,7 +1532,7 @@ test_expect_success 'setup nested conflicts' ' mv -f b_R1 b && mv -f a_R1 a && git add b a && - test_tick && git commit -m "version R1 of files" && + test_tick && git commit -m "verson R1 of files" && git tag R1 && # Create first merge on left side @@ -1583,7 +1562,6 @@ test_expect_success 'check nested conflicts' ' cd nested_conflicts && git clean -f && - MASTER=$(git rev-parse --short master) && git checkout L2^0 && # Merge must fail; there is a conflict @@ -1604,7 +1582,7 @@ test_expect_success 'check nested conflicts' ' git cat-file -p R1:a >theirs && test_must_fail git merge-file --diff3 \ -L "Temporary merge branch 1" \ - -L "$MASTER" \ + -L "merged common ancestors" \ -L "Temporary merge branch 2" \ ours \ base \ @@ -1616,7 +1594,7 @@ test_expect_success 'check nested conflicts' ' git cat-file -p R1:b >theirs && test_must_fail git merge-file --diff3 \ -L "Temporary merge branch 1" \ - -L "$MASTER" \ + -L "merged common ancestors" \ -L "Temporary merge branch 2" \ ours \ base \ @@ -1717,7 +1695,7 @@ test_expect_success 'setup virtual merge base with nested conflicts' ' git checkout R && echo right >>content && git add content && - test_tick && git commit -m "version R1 of content" && + test_tick && git commit -m "verson R1 of content" && git tag R1 && # Create L2 @@ -1754,7 +1732,6 @@ test_expect_success 'check virtual merge base with nested conflicts' ' ( cd virtual_merge_base_has_nested_conflicts && - MASTER=$(git rev-parse --short master) && git checkout L3^0 && # Merge must fail; there is a conflict @@ -1783,7 +1760,7 @@ test_expect_success 'check virtual merge base with nested conflicts' ' cp left merged-once && test_must_fail git merge-file --diff3 \ -L "Temporary merge branch 1" \ - -L "$MASTER" \ + -L "merged common ancestors" \ -L "Temporary merge branch 2" \ merged-once \ base \ diff --git a/third_party/git/t/t6042-merge-rename-corner-cases.sh b/third_party/git/t/t6042-merge-rename-corner-cases.sh index b047cf1c1c..c5b57f40c3 100755 --- a/third_party/git/t/t6042-merge-rename-corner-cases.sh +++ b/third_party/git/t/t6042-merge-rename-corner-cases.sh @@ -5,7 +5,7 @@ test_description="recursive merge corner cases w/ renames but not criss-crosses" . ./test-lib.sh -test_setup_rename_delete_untracked () { +test_expect_success 'setup rename/delete + untracked file' ' test_create_repo rename-delete-untracked && ( cd rename-delete-untracked && @@ -29,10 +29,9 @@ test_setup_rename_delete_untracked () { git commit -m track-people-instead-of-objects && echo "Myyy PRECIOUSSS" >ring ) -} +' test_expect_success "Does git preserve Gollum's precious artifact?" ' - test_setup_rename_delete_untracked && ( cd rename-delete-untracked && @@ -50,7 +49,7 @@ test_expect_success "Does git preserve Gollum's precious artifact?" ' # # We should be able to merge B & C cleanly -test_setup_rename_modify_add_source () { +test_expect_success 'setup rename/modify/add-source conflict' ' test_create_repo rename-modify-add-source && ( cd rename-modify-add-source && @@ -71,10 +70,9 @@ test_setup_rename_modify_add_source () { git add a && git commit -m C ) -} +' test_expect_failure 'rename/modify/add-source conflict resolvable' ' - test_setup_rename_modify_add_source && ( cd rename-modify-add-source && @@ -90,7 +88,7 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' ' ) ' -test_setup_break_detection_1 () { +test_expect_success 'setup resolvable conflict missed if rename missed' ' test_create_repo break-detection-1 && ( cd break-detection-1 && @@ -112,10 +110,9 @@ test_setup_break_detection_1 () { git add a && git commit -m C ) -} +' test_expect_failure 'conflict caused if rename not detected' ' - test_setup_break_detection_1 && ( cd break-detection-1 && @@ -138,7 +135,7 @@ test_expect_failure 'conflict caused if rename not detected' ' ) ' -test_setup_break_detection_2 () { +test_expect_success 'setup conflict resolved wrong if rename missed' ' test_create_repo break-detection-2 && ( cd break-detection-2 && @@ -163,10 +160,9 @@ test_setup_break_detection_2 () { git add a && git commit -m E ) -} +' test_expect_failure 'missed conflict if rename not detected' ' - test_setup_break_detection_2 && ( cd break-detection-2 && @@ -186,7 +182,7 @@ test_expect_failure 'missed conflict if rename not detected' ' # Commit B: rename a->b # Commit C: rename a->b, add unrelated a -test_setup_break_detection_3 () { +test_expect_success 'setup undetected rename/add-source causes data loss' ' test_create_repo break-detection-3 && ( cd break-detection-3 && @@ -206,10 +202,9 @@ test_setup_break_detection_3 () { git add a && git commit -m C ) -} +' test_expect_failure 'detect rename/add-source and preserve all data' ' - test_setup_break_detection_3 && ( cd break-detection-3 && @@ -236,7 +231,6 @@ test_expect_failure 'detect rename/add-source and preserve all data' ' ' test_expect_failure 'detect rename/add-source and preserve all data, merge other way' ' - test_setup_break_detection_3 && ( cd break-detection-3 && @@ -262,10 +256,10 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other ) ' -test_setup_rename_directory () { - test_create_repo rename-directory-$1 && +test_expect_success 'setup content merge + rename/directory conflict' ' + test_create_repo rename-directory-1 && ( - cd rename-directory-$1 && + cd rename-directory-1 && printf "1\n2\n3\n4\n5\n6\n" >file && git add file && @@ -296,12 +290,11 @@ test_setup_rename_directory () { test_tick && git commit -m left ) -} +' test_expect_success 'rename/directory conflict + clean content merge' ' - test_setup_rename_directory 1a && ( - cd rename-directory-1a && + cd rename-directory-1 && git checkout left-clean^0 && @@ -327,9 +320,8 @@ test_expect_success 'rename/directory conflict + clean content merge' ' ' test_expect_success 'rename/directory conflict + content merge conflict' ' - test_setup_rename_directory 1b && ( - cd rename-directory-1b && + cd rename-directory-1 && git reset --hard && git clean -fdqx && @@ -366,7 +358,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' ' ) ' -test_setup_rename_directory_2 () { +test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' ' test_create_repo rename-directory-2 && ( cd rename-directory-2 && @@ -393,10 +385,9 @@ test_setup_rename_directory_2 () { test_tick && git commit -m left ) -} +' test_expect_success 'disappearing dir in rename/directory conflict handled' ' - test_setup_rename_directory_2 && ( cd rename-directory-2 && @@ -425,10 +416,10 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' ' # Commit A: rename a->b, modifying b too # Commit B: modify a, add different b -test_setup_rename_with_content_merge_and_add () { - test_create_repo rename-with-content-merge-and-add-$1 && +test_expect_success 'setup rename-with-content-merge vs. add' ' + test_create_repo rename-with-content-merge-and-add && ( - cd rename-with-content-merge-and-add-$1 && + cd rename-with-content-merge-and-add && test_seq 1 5 >a && git add a && @@ -447,12 +438,11 @@ test_setup_rename_with_content_merge_and_add () { git add a b && git commit -m B ) -} +' test_expect_success 'handle rename-with-content-merge vs. add' ' - test_setup_rename_with_content_merge_and_add AB && ( - cd rename-with-content-merge-and-add-AB && + cd rename-with-content-merge-and-add && git checkout A^0 && @@ -493,9 +483,8 @@ test_expect_success 'handle rename-with-content-merge vs. add' ' ' test_expect_success 'handle rename-with-content-merge vs. add, merge other way' ' - test_setup_rename_with_content_merge_and_add BA && ( - cd rename-with-content-merge-and-add-BA && + cd rename-with-content-merge-and-add && git reset --hard && git clean -fdx && @@ -550,7 +539,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way' # * The working copy should have two files, both of form c~<unique>; does it? # * Nothing else should be present. Is anything? -test_setup_rename_rename_2to1 () { +test_expect_success 'setup rename/rename (2to1) + modify/modify' ' test_create_repo rename-rename-2to1 && ( cd rename-rename-2to1 && @@ -573,10 +562,9 @@ test_setup_rename_rename_2to1 () { git add a && git commit -m C ) -} +' test_expect_success 'handle rename/rename (2to1) conflict correctly' ' - test_setup_rename_rename_2to1 && ( cd rename-rename-2to1 && @@ -622,7 +610,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' ' # Commit A: new file: a # Commit B: rename a->b # Commit C: rename a->c -test_setup_rename_rename_1to2 () { +test_expect_success 'setup simple rename/rename (1to2) conflict' ' test_create_repo rename-rename-1to2 && ( cd rename-rename-1to2 && @@ -643,10 +631,9 @@ test_setup_rename_rename_1to2 () { test_tick && git commit -m C ) -} +' test_expect_success 'merge has correct working tree contents' ' - test_setup_rename_rename_1to2 && ( cd rename-rename-1to2 && @@ -680,7 +667,7 @@ test_expect_success 'merge has correct working tree contents' ' # # Merging of B & C should NOT be clean; there's a rename/rename conflict -test_setup_rename_rename_1to2_add_source_1 () { +test_expect_success 'setup rename/rename(1to2)/add-source conflict' ' test_create_repo rename-rename-1to2-add-source-1 && ( cd rename-rename-1to2-add-source-1 && @@ -700,10 +687,9 @@ test_setup_rename_rename_1to2_add_source_1 () { git add a && git commit -m C ) -} +' test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' ' - test_setup_rename_rename_1to2_add_source_1 && ( cd rename-rename-1to2-add-source-1 && @@ -728,7 +714,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' ) ' -test_setup_rename_rename_1to2_add_source_2 () { +test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' ' test_create_repo rename-rename-1to2-add-source-2 && ( cd rename-rename-1to2-add-source-2 && @@ -751,10 +737,9 @@ test_setup_rename_rename_1to2_add_source_2 () { test_tick && git commit -m two ) -} +' test_expect_failure 'rename/rename/add-source still tracks new a file' ' - test_setup_rename_rename_1to2_add_source_2 && ( cd rename-rename-1to2-add-source-2 && @@ -774,7 +759,7 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' ' ) ' -test_setup_rename_rename_1to2_add_dest () { +test_expect_success 'setup rename/rename(1to2)/add-dest conflict' ' test_create_repo rename-rename-1to2-add-dest && ( cd rename-rename-1to2-add-dest && @@ -799,10 +784,9 @@ test_setup_rename_rename_1to2_add_dest () { test_tick && git commit -m two ) -} +' test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' ' - test_setup_rename_rename_1to2_add_dest && ( cd rename-rename-1to2-add-dest && @@ -854,7 +838,7 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting # Commit B: rename foo->bar # Expected: CONFLICT (rename/add/delete), two-way merged bar -test_setup_rad () { +test_expect_success 'rad-setup: rename/add/delete conflict' ' test_create_repo rad && ( cd rad && @@ -876,10 +860,9 @@ test_setup_rad () { git mv foo bar && git commit -m "rename foo to bar" ) -} +' test_expect_failure 'rad-check: rename/add/delete conflict' ' - test_setup_rad && ( cd rad && @@ -921,7 +904,7 @@ test_expect_failure 'rad-check: rename/add/delete conflict' ' # Commit B: rename bar->baz, rm foo # Expected: CONFLICT (rename/rename/delete/delete), two-way merged baz -test_setup_rrdd () { +test_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' ' test_create_repo rrdd && ( cd rrdd && @@ -944,10 +927,9 @@ test_setup_rrdd () { git rm foo && git commit -m "Rename bar, remove foo" ) -} +' test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' ' - test_setup_rrdd && ( cd rrdd && @@ -991,7 +973,7 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' ' # Expected: six CONFLICT(rename/rename) messages, each path in two of the # multi-way merged contents found in two, four, six -test_setup_mod6 () { +test_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename(2to1)' ' test_create_repo mod6 && ( cd mod6 && @@ -1027,10 +1009,9 @@ test_setup_mod6 () { test_tick && git commit -m "B" ) -} +' test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename(2to1)' ' - test_setup_mod6 && ( cd mod6 && @@ -1127,8 +1108,7 @@ test_conflicts_with_adds_and_renames() { # files. Is it present? # 4) There should not be any three~* files in the working # tree - test_setup_collision_conflict () { - #test_expect_success "setup simple $sideL/$sideR conflict" ' + test_expect_success "setup simple $sideL/$sideR conflict" ' test_create_repo simple_${sideL}_${sideR} && ( cd simple_${sideL}_${sideR} && @@ -1205,11 +1185,9 @@ test_conflicts_with_adds_and_renames() { fi && test_tick && git commit -m R ) - #' - } + ' test_expect_success "check simple $sideL/$sideR conflict" ' - test_setup_collision_conflict && ( cd simple_${sideL}_${sideR} && @@ -1276,7 +1254,7 @@ test_conflicts_with_adds_and_renames add add # # So, we have four different conflicting files that all end up at path # 'three'. -test_setup_nested_conflicts_from_rename_rename () { +test_expect_success 'setup nested conflicts from rename/rename(2to1)' ' test_create_repo nested_conflicts_from_rename_rename && ( cd nested_conflicts_from_rename_rename && @@ -1327,10 +1305,9 @@ test_setup_nested_conflicts_from_rename_rename () { git add one three && test_tick && git commit -m german ) -} +' test_expect_success 'check nested conflicts from rename/rename(2to1)' ' - test_setup_nested_conflicts_from_rename_rename && ( cd nested_conflicts_from_rename_rename && diff --git a/third_party/git/t/t6043-merge-rename-directories.sh b/third_party/git/t/t6043-merge-rename-directories.sh index 83792c5ef1..c966147d5d 100755 --- a/third_party/git/t/t6043-merge-rename-directories.sh +++ b/third_party/git/t/t6043-merge-rename-directories.sh @@ -38,7 +38,7 @@ test_description="recursive merge with directory renames" # Commit B: z/{b,c,d,e/f} # Expected: y/{b,c,d,e/f} -test_setup_1a () { +test_expect_success '1a-setup: Simple directory rename detection' ' test_create_repo 1a && ( cd 1a && @@ -67,10 +67,9 @@ test_setup_1a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '1a: Simple directory rename detection' ' - test_setup_1a && +test_expect_success '1a-check: Simple directory rename detection' ' ( cd 1a && @@ -104,7 +103,7 @@ test_expect_success '1a: Simple directory rename detection' ' # Commit B: y/{b,c,d} # Expected: y/{b,c,d,e} -test_setup_1b () { +test_expect_success '1b-setup: Merge a directory with another' ' test_create_repo 1b && ( cd 1b && @@ -135,10 +134,9 @@ test_setup_1b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '1b: Merge a directory with another' ' - test_setup_1b && +test_expect_success '1b-check: Merge a directory with another' ' ( cd 1b && @@ -167,7 +165,7 @@ test_expect_success '1b: Merge a directory with another' ' # Commit B: z/{b,c,d} # Expected: y/{b,c,d} (because x/d -> z/d -> y/d) -test_setup_1c () { +test_expect_success '1c-setup: Transitive renaming' ' test_create_repo 1c && ( cd 1c && @@ -195,10 +193,9 @@ test_setup_1c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '1c: Transitive renaming' ' - test_setup_1c && +test_expect_success '1c-check: Transitive renaming' ' ( cd 1c && @@ -230,7 +227,7 @@ test_expect_success '1c: Transitive renaming' ' # Note: y/m & z/n should definitely move into x. By the same token, both # y/wham_1 & z/wham_2 should too...giving us a conflict. -test_setup_1d () { +test_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) conflict' ' test_create_repo 1d && ( cd 1d && @@ -265,10 +262,9 @@ test_setup_1d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict' ' - test_setup_1d && +test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) conflict' ' ( cd 1d && @@ -317,7 +313,7 @@ test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict' # Commit B: z/{oldb,oldc,d} # Expected: y/{newb,newc,d} -test_setup_1e () { +test_expect_success '1e-setup: Renamed directory, with all files being renamed too' ' test_create_repo 1e && ( cd 1e && @@ -346,10 +342,9 @@ test_setup_1e () { test_tick && git commit -m "B" ) -} +' -test_expect_success '1e: Renamed directory, with all files being renamed too' ' - test_setup_1e && +test_expect_success '1e-check: Renamed directory, with all files being renamed too' ' ( cd 1e && @@ -376,7 +371,7 @@ test_expect_success '1e: Renamed directory, with all files being renamed too' ' # Commit B: y/{b,c}, x/{d,e,f} # Expected: y/{b,c}, x/{d,e,f,g} -test_setup_1f () { +test_expect_success '1f-setup: Split a directory into two other directories' ' test_create_repo 1f && ( cd 1f && @@ -413,10 +408,9 @@ test_setup_1f () { test_tick && git commit -m "B" ) -} +' -test_expect_success '1f: Split a directory into two other directories' ' - test_setup_1f && +test_expect_success '1f-check: Split a directory into two other directories' ' ( cd 1f && @@ -465,7 +459,7 @@ test_expect_success '1f: Split a directory into two other directories' ' # Commit A: y/b, w/c # Commit B: z/{b,c,d} # Expected: y/b, w/c, z/d, with warning about z/ -> (y/ vs. w/) conflict -test_setup_2a () { +test_expect_success '2a-setup: Directory split into two on one side, with equal numbers of paths' ' test_create_repo 2a && ( cd 2a && @@ -495,10 +489,9 @@ test_setup_2a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '2a: Directory split into two on one side, with equal numbers of paths' ' - test_setup_2a && +test_expect_success '2a-check: Directory split into two on one side, with equal numbers of paths' ' ( cd 2a && @@ -527,7 +520,7 @@ test_expect_success '2a: Directory split into two on one side, with equal number # Commit A: y/b, w/c # Commit B: z/{b,c}, x/d # Expected: y/b, w/c, x/d; No warning about z/ -> (y/ vs. w/) conflict -test_setup_2b () { +test_expect_success '2b-setup: Directory split into two on one side, with equal numbers of paths' ' test_create_repo 2b && ( cd 2b && @@ -558,10 +551,9 @@ test_setup_2b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '2b: Directory split into two on one side, with equal numbers of paths' ' - test_setup_2b && +test_expect_success '2b-check: Directory split into two on one side, with equal numbers of paths' ' ( cd 2b && @@ -609,7 +601,7 @@ test_expect_success '2b: Directory split into two on one side, with equal number # Commit A: z/{b,c,d} (no change) # Commit B: y/{b,c}, x/d # Expected: y/{b,c}, x/d -test_setup_3a () { +test_expect_success '3a-setup: Avoid implicit rename if involved as source on other side' ' test_create_repo 3a && ( cd 3a && @@ -640,10 +632,9 @@ test_setup_3a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '3a: Avoid implicit rename if involved as source on other side' ' - test_setup_3a && +test_expect_success '3a-check: Avoid implicit rename if involved as source on other side' ' ( cd 3a && @@ -673,7 +664,7 @@ test_expect_success '3a: Avoid implicit rename if involved as source on other si # get it involved in directory rename detection. If it were, we might # end up with CONFLICT:(z/d -> y/d vs. x/d vs. w/d), i.e. a # rename/rename/rename(1to3) conflict, which is just weird. -test_setup_3b () { +test_expect_success '3b-setup: Avoid implicit rename if involved as source on current side' ' test_create_repo 3b && ( cd 3b && @@ -706,10 +697,9 @@ test_setup_3b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '3b: Avoid implicit rename if involved as source on current side' ' - test_setup_3b && +test_expect_success '3b-check: Avoid implicit rename if involved as source on current side' ' ( cd 3b && @@ -754,7 +744,7 @@ test_expect_success '3b: Avoid implicit rename if involved as source on current # # What if we were to attempt to do directory rename detection when someone # "mostly" moved a directory but still left some files around, or, -# equivalently, fully renamed a directory in one commit and then recreated +# equivalently, fully renamed a directory in one commmit and then recreated # that directory in a later commit adding some new files and then tried to # merge? # @@ -796,7 +786,7 @@ test_expect_success '3b: Avoid implicit rename if involved as source on current # Expected: y/{b,c,d}, z/{e,f} # NOTE: Even though most files from z moved to y, we don't want f to follow. -test_setup_4a () { +test_expect_success '4a-setup: Directory split, with original directory still present' ' test_create_repo 4a && ( cd 4a && @@ -828,10 +818,9 @@ test_setup_4a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '4a: Directory split, with original directory still present' ' - test_setup_4a && +test_expect_success '4a-check: Directory split, with original directory still present' ' ( cd 4a && @@ -885,7 +874,7 @@ test_expect_success '4a: Directory split, with original directory still present' # of history, giving us no way to represent this conflict in the # index. -test_setup_5a () { +test_expect_success '5a-setup: Merge directories, other side adds files to original and target' ' test_create_repo 5a && ( cd 5a && @@ -918,10 +907,9 @@ test_setup_5a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '5a: Merge directories, other side adds files to original and target' ' - test_setup_5a && +test_expect_success '5a-check: Merge directories, other side adds files to original and target' ' ( cd 5a && @@ -953,14 +941,14 @@ test_expect_success '5a: Merge directories, other side adds files to original an # Commit B: z/{b,c,d_1,e}, y/d_3 # Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3) # NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as -# we normally would since z/ is being renamed to y/, then this would be +# we normaly would since z/ is being renamed to y/, then this would be # a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add # conflict of y/d_1 vs. y/d_2 vs. y/d_3. Add/add/add is not # representable in the index, so the existence of y/d_3 needs to # cause us to bail on directory rename detection for that path, falling # back to git behavior without the directory rename detection. -test_setup_5b () { +test_expect_success '5b-setup: Rename/delete in order to get add/add/add conflict' ' test_create_repo 5b && ( cd 5b && @@ -993,10 +981,9 @@ test_setup_5b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '5b: Rename/delete in order to get add/add/add conflict' ' - test_setup_5b && +test_expect_success '5b-check: Rename/delete in order to get add/add/add conflict' ' ( cd 5b && @@ -1037,7 +1024,7 @@ test_expect_success '5b: Rename/delete in order to get add/add/add conflict' ' # y/d are y/d_2 and y/d_4. We still do the move from z/e to y/e, # though, because it doesn't have anything in the way. -test_setup_5c () { +test_expect_success '5c-setup: Transitive rename would cause rename/rename/rename/add/add/add' ' test_create_repo 5c && ( cd 5c && @@ -1074,10 +1061,9 @@ test_setup_5c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/add/add' ' - test_setup_5c && +test_expect_success '5c-check: Transitive rename would cause rename/rename/rename/add/add/add' ' ( cd 5c && @@ -1127,7 +1113,7 @@ test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/ # detection for z/d_2, but that doesn't prevent us from applying the # directory rename detection for z/f -> y/f. -test_setup_5d () { +test_expect_success '5d-setup: Directory/file/file conflict due to directory rename' ' test_create_repo 5d && ( cd 5d && @@ -1159,10 +1145,9 @@ test_setup_5d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '5d: Directory/file/file conflict due to directory rename' ' - test_setup_5d && +test_expect_success '5d-check: Directory/file/file conflict due to directory rename' ' ( cd 5d && @@ -1220,7 +1205,7 @@ test_expect_success '5d: Directory/file/file conflict due to directory rename' ' # them under y/ doesn't accidentally catch z/d and make it look like # it is also involved in a rename/delete conflict. -test_setup_6a () { +test_expect_success '6a-setup: Tricky rename/delete' ' test_create_repo 6a && ( cd 6a && @@ -1250,10 +1235,9 @@ test_setup_6a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '6a: Tricky rename/delete' ' - test_setup_6a && +test_expect_success '6a-check: Tricky rename/delete' ' ( cd 6a && @@ -1287,7 +1271,7 @@ test_expect_success '6a: Tricky rename/delete' ' # but B did that rename and still decided to put the file into z/, # so we probably shouldn't apply directory rename detection for it. -test_setup_6b () { +test_expect_success '6b-setup: Same rename done on both sides' ' test_create_repo 6b && ( cd 6b && @@ -1316,10 +1300,9 @@ test_setup_6b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '6b: Same rename done on both sides' ' - test_setup_6b && +test_expect_success '6b-check: Same rename done on both sides' ' ( cd 6b && @@ -1351,7 +1334,7 @@ test_expect_success '6b: Same rename done on both sides' ' # NOTE: Seems obvious, but just checking that the implementation doesn't # "accidentally detect a rename" and give us y/{b,c,d}. -test_setup_6c () { +test_expect_success '6c-setup: Rename only done on same side' ' test_create_repo 6c && ( cd 6c && @@ -1379,10 +1362,9 @@ test_setup_6c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '6c: Rename only done on same side' ' - test_setup_6c && +test_expect_success '6c-check: Rename only done on same side' ' ( cd 6c && @@ -1414,7 +1396,7 @@ test_expect_success '6c: Rename only done on same side' ' # NOTE: Again, this seems obvious but just checking that the implementation # doesn't "accidentally detect a rename" and give us y/{b,c,d}. -test_setup_6d () { +test_expect_success '6d-setup: We do not always want transitive renaming' ' test_create_repo 6d && ( cd 6d && @@ -1442,10 +1424,9 @@ test_setup_6d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '6d: We do not always want transitive renaming' ' - test_setup_6d && +test_expect_success '6d-check: We do not always want transitive renaming' ' ( cd 6d && @@ -1477,7 +1458,7 @@ test_expect_success '6d: We do not always want transitive renaming' ' # doesn't "accidentally detect a rename" and give us y/{b,c} + # add/add conflict on y/d_1 vs y/d_2. -test_setup_6e () { +test_expect_success '6e-setup: Add/add from one side' ' test_create_repo 6e && ( cd 6e && @@ -1506,10 +1487,9 @@ test_setup_6e () { test_tick && git commit -m "B" ) -} +' -test_expect_success '6e: Add/add from one side' ' - test_setup_6e && +test_expect_success '6e-check: Add/add from one side' ' ( cd 6e && @@ -1572,7 +1552,7 @@ test_expect_success '6e: Add/add from one side' ' # Expected: y/d, CONFLICT(rename/rename for both z/b and z/c) # NOTE: There's a rename of z/ here, y/ has more renames, so z/d -> y/d. -test_setup_7a () { +test_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' ' test_create_repo 7a && ( cd 7a && @@ -1603,10 +1583,9 @@ test_setup_7a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' ' - test_setup_7a && +test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' ' ( cd 7a && @@ -1644,7 +1623,7 @@ test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-o # Commit B: z/{b,c,d_1}, w/d_2 # Expected: y/{b,c}, CONFLICT(rename/rename(2to1): x/d_1, w/d_2 -> y_d) -test_setup_7b () { +test_expect_success '7b-setup: rename/rename(2to1), but only due to transitive rename' ' test_create_repo 7b && ( cd 7b && @@ -1676,10 +1655,9 @@ test_setup_7b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '7b: rename/rename(2to1), but only due to transitive rename' ' - test_setup_7b && +test_expect_success '7b-check: rename/rename(2to1), but only due to transitive rename' ' ( cd 7b && @@ -1724,7 +1702,7 @@ test_expect_success '7b: rename/rename(2to1), but only due to transitive rename' # neither CONFLICT(x/d -> w/d vs. z/d) # nor CONFLiCT x/d -> w/d vs. y/d vs. z/d) -test_setup_7c () { +test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may add complexity' ' test_create_repo 7c && ( cd 7c && @@ -1754,10 +1732,9 @@ test_setup_7c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add complexity' ' - test_setup_7c && +test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may add complexity' ' ( cd 7c && @@ -1789,7 +1766,7 @@ test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add co # Expected: y/{b,c}, CONFLICT(delete x/d vs rename to y/d) # NOTE: z->y so NOT CONFLICT(delete x/d vs rename to z/d) -test_setup_7d () { +test_expect_success '7d-setup: transitive rename involved in rename/delete; how is it reported?' ' test_create_repo 7d && ( cd 7d && @@ -1819,10 +1796,9 @@ test_setup_7d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '7d: transitive rename involved in rename/delete; how is it reported?' ' - test_setup_7d && +test_expect_success '7d-check: transitive rename involved in rename/delete; how is it reported?' ' ( cd 7d && @@ -1875,7 +1851,7 @@ test_expect_success '7d: transitive rename involved in rename/delete; how is it # see testcases 9c and 9d for further discussion of this issue and # how it's resolved. -test_setup_7e () { +test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in the way' ' test_create_repo 7e && ( cd 7e && @@ -1910,10 +1886,9 @@ test_setup_7e () { test_tick && git commit -m "B" ) -} +' -test_expect_success '7e: transitive rename in rename/delete AND dirs in the way' ' - test_setup_7e && +test_expect_success '7e-check: transitive rename in rename/delete AND dirs in the way' ' ( cd 7e && @@ -1970,7 +1945,7 @@ test_expect_success '7e: transitive rename in rename/delete AND dirs in the way' # simple rule from section 5 prevents me from handling this as optimally as # we potentially could. -test_setup_8a () { +test_expect_success '8a-setup: Dual-directory rename, one into the others way' ' test_create_repo 8a && ( cd 8a && @@ -2002,10 +1977,9 @@ test_setup_8a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '8a: Dual-directory rename, one into the others way' ' - test_setup_8a && +test_expect_success '8a-check: Dual-directory rename, one into the others way' ' ( cd 8a && @@ -2049,7 +2023,7 @@ test_expect_success '8a: Dual-directory rename, one into the others way' ' # making us fall back to pre-directory-rename-detection behavior for both # e_1 and e_2. -test_setup_8b () { +test_expect_success '8b-setup: Dual-directory rename, one into the others way, with conflicting filenames' ' test_create_repo 8b && ( cd 8b && @@ -2081,10 +2055,9 @@ test_setup_8b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '8b: Dual-directory rename, one into the others way, with conflicting filenames' ' - test_setup_8b && +test_expect_success '8b-check: Dual-directory rename, one into the others way, with conflicting filenames' ' ( cd 8b && @@ -2116,14 +2089,14 @@ test_expect_success '8b: Dual-directory rename, one into the others way, with co # # Note: It could easily be argued that the correct resolution here is # y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted) -# and that the modified version of d should be present in y/ after +# and that the modifed version of d should be present in y/ after # the merge, just marked as conflicted. Indeed, I previously did # argue that. But applying directory renames to the side of # history where a file is merely modified results in spurious # rename/rename(1to2) conflicts -- see testcase 9h. See also # notes in 8d. -test_setup_8c () { +test_expect_success '8c-setup: modify/delete or rename+modify/delete?' ' test_create_repo 8c && ( cd 8c && @@ -2154,10 +2127,9 @@ test_setup_8c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '8c: modify/delete or rename+modify/delete' ' - test_setup_8c && +test_expect_success '8c-check: modify/delete or rename+modify/delete' ' ( cd 8c && @@ -2203,7 +2175,7 @@ test_expect_success '8c: modify/delete or rename+modify/delete' ' # during merging are supposed to be about opposite sides doing things # differently. -test_setup_8d () { +test_expect_success '8d-setup: rename/delete...or not?' ' test_create_repo 8d && ( cd 8d && @@ -2232,10 +2204,9 @@ test_setup_8d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '8d: rename/delete...or not?' ' - test_setup_8d && +test_expect_success '8d-check: rename/delete...or not?' ' ( cd 8d && @@ -2279,7 +2250,7 @@ test_expect_success '8d: rename/delete...or not?' ' # about the ramifications of doing that, I didn't know how to rule out # that opening other weird edge and corner cases so I just punted. -test_setup_8e () { +test_expect_success '8e-setup: Both sides rename, one side adds to original directory' ' test_create_repo 8e && ( cd 8e && @@ -2308,10 +2279,9 @@ test_setup_8e () { test_tick && git commit -m "B" ) -} +' -test_expect_success '8e: Both sides rename, one side adds to original directory' ' - test_setup_8e && +test_expect_success '8e-check: Both sides rename, one side adds to original directory' ' ( cd 8e && @@ -2363,7 +2333,7 @@ test_expect_success '8e: Both sides rename, one side adds to original directory' # of which one had the most paths going to it. A naive implementation # of that could take the new file in commit B at z/i to x/w/i or x/i. -test_setup_9a () { +test_expect_success '9a-setup: Inner renamed directory within outer renamed directory' ' test_create_repo 9a && ( cd 9a && @@ -2396,10 +2366,9 @@ test_setup_9a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '9a: Inner renamed directory within outer renamed directory' ' - test_setup_9a && +test_expect_success '9a-check: Inner renamed directory within outer renamed directory' ' ( cd 9a && @@ -2435,7 +2404,7 @@ test_expect_success '9a: Inner renamed directory within outer renamed directory' # Commit B: z/{b,c,d_3} # Expected: y/{b,c,d_merged} -test_setup_9b () { +test_expect_success '9b-setup: Transitive rename with content merge' ' test_create_repo 9b && ( cd 9b && @@ -2467,10 +2436,9 @@ test_setup_9b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '9b: Transitive rename with content merge' ' - test_setup_9b && +test_expect_success '9b-check: Transitive rename with content merge' ' ( cd 9b && @@ -2523,7 +2491,7 @@ test_expect_success '9b: Transitive rename with content merge' ' # away, then ignore that particular rename from the other side of # history for any implicit directory renames. -test_setup_9c () { +test_expect_success '9c-setup: Doubly transitive rename?' ' test_create_repo 9c && ( cd 9c && @@ -2558,10 +2526,9 @@ test_setup_9c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '9c: Doubly transitive rename?' ' - test_setup_9c && +test_expect_success '9c-check: Doubly transitive rename?' ' ( cd 9c && @@ -2612,7 +2579,7 @@ test_expect_success '9c: Doubly transitive rename?' ' # simple rules that are consistent with what we need for all the other # testcases and simplifies things for the user. -test_setup_9d () { +test_expect_success '9d-setup: N-way transitive rename?' ' test_create_repo 9d && ( cd 9d && @@ -2647,10 +2614,9 @@ test_setup_9d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '9d: N-way transitive rename?' ' - test_setup_9d && +test_expect_success '9d-check: N-way transitive rename?' ' ( cd 9d && @@ -2687,7 +2653,7 @@ test_expect_success '9d: N-way transitive rename?' ' # Expected: combined/{a,b,c,d,e,f,g,h,i,j,k,l}, CONFLICT(Nto1) warnings, # dir1/yo, dir2/yo, dir3/yo, dirN/yo -test_setup_9e () { +test_expect_success '9e-setup: N-to-1 whammo' ' test_create_repo 9e && ( cd 9e && @@ -2730,10 +2696,9 @@ test_setup_9e () { test_tick && git commit -m "B" ) -} +' -test_expect_success C_LOCALE_OUTPUT '9e: N-to-1 whammo' ' - test_setup_9e && +test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' ' ( cd 9e && @@ -2780,7 +2745,7 @@ test_expect_success C_LOCALE_OUTPUT '9e: N-to-1 whammo' ' # Commit B: goal/{a,b}/$more_files, goal/c # Expected: priority/{a,b}/$more_files, priority/c -test_setup_9f () { +test_expect_success '9f-setup: Renamed directory that only contained immediate subdirs' ' test_create_repo 9f && ( cd 9f && @@ -2809,10 +2774,9 @@ test_setup_9f () { test_tick && git commit -m "B" ) -} +' -test_expect_success '9f: Renamed directory that only contained immediate subdirs' ' - test_setup_9f && +test_expect_success '9f-check: Renamed directory that only contained immediate subdirs' ' ( cd 9f && @@ -2845,7 +2809,7 @@ test_expect_success '9f: Renamed directory that only contained immediate subdirs # Commit B: goal/{a,b}/$more_files, goal/c # Expected: priority/{alpha,bravo}/$more_files, priority/c -test_setup_9g () { +test_expect_success '9g-setup: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' ' test_create_repo 9g && ( cd 9g && @@ -2877,9 +2841,9 @@ test_setup_9g () { test_tick && git commit -m "B" ) -} +' -test_expect_failure '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' ' +test_expect_failure '9g-check: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' ' ( cd 9g && @@ -2913,7 +2877,7 @@ test_expect_failure '9g: Renamed directory that only contained immediate subdirs # Expected: y/{b,c}, x/d_2 # NOTE: If we applied the z/ -> y/ rename to z/d, then we'd end up with # a rename/rename(1to2) conflict (z/d -> y/d vs. x/d) -test_setup_9h () { +test_expect_success '9h-setup: Avoid dir rename on merely modified path' ' test_create_repo 9h && ( cd 9h && @@ -2946,10 +2910,9 @@ test_setup_9h () { test_tick && git commit -m "B" ) -} +' -test_expect_success '9h: Avoid dir rename on merely modified path' ' - test_setup_9h && +test_expect_success '9h-check: Avoid dir rename on merely modified path' ' ( cd 9h && @@ -2994,7 +2957,7 @@ test_expect_success '9h: Avoid dir rename on merely modified path' ' # Expected: Aborted Merge + # ERROR_MSG(untracked working tree files would be overwritten by merge) -test_setup_10a () { +test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' ' test_create_repo 10a && ( cd 10a && @@ -3020,10 +2983,9 @@ test_setup_10a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '10a: Overwrite untracked with normal rename/delete' ' - test_setup_10a && +test_expect_success '10a-check: Overwrite untracked with normal rename/delete' ' ( cd 10a && @@ -3059,7 +3021,7 @@ test_expect_success '10a: Overwrite untracked with normal rename/delete' ' # z/c_1 -> z/d_1 rename recorded at stage 3 for y/d + # ERROR_MSG(refusing to lose untracked file at 'y/d') -test_setup_10b () { +test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' ' test_create_repo 10b && ( cd 10b && @@ -3088,10 +3050,9 @@ test_setup_10b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '10b: Overwrite untracked with dir rename + delete' ' - test_setup_10b && +test_expect_success '10b-check: Overwrite untracked with dir rename + delete' ' ( cd 10b && @@ -3137,10 +3098,10 @@ test_expect_success '10b: Overwrite untracked with dir rename + delete' ' # y/c~B^0 + # ERROR_MSG(Refusing to lose untracked file at y/c) -test_setup_10c () { - test_create_repo 10c_$1 && +test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)' ' + test_create_repo 10c && ( - cd 10c_$1 && + cd 10c && mkdir z x && echo a >z/a && @@ -3167,12 +3128,11 @@ test_setup_10c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '10c1: Overwrite untracked with dir rename/rename(1to2)' ' - test_setup_10c 1 && +test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)' ' ( - cd 10c_1 && + cd 10c && git checkout A^0 && echo important >y/c && @@ -3203,10 +3163,9 @@ test_expect_success '10c1: Overwrite untracked with dir rename/rename(1to2)' ' ) ' -test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), other direction' ' - test_setup_10c 2 && +test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2), other direction' ' ( - cd 10c_2 && + cd 10c && git reset --hard && git clean -fdqx && @@ -3249,7 +3208,7 @@ test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), oth # CONFLICT(rename/rename) z/c_1 vs x/f_2 -> y/wham # ERROR_MSG(Refusing to lose untracked file at y/wham) -test_setup_10d () { +test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' ' test_create_repo 10d && ( cd 10d && @@ -3281,10 +3240,9 @@ test_setup_10d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' ' - test_setup_10d && +test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' ' ( cd 10d && @@ -3332,7 +3290,7 @@ test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' ' # Commit B: z/{a,b,c} # Expected: y/{a,b,c} + untracked z/c -test_setup_10e () { +test_expect_success '10e-setup: Does git complain about untracked file that is not really in the way?' ' test_create_repo 10e && ( cd 10e && @@ -3359,9 +3317,9 @@ test_setup_10e () { test_tick && git commit -m "B" ) -} +' -test_expect_failure '10e: Does git complain about untracked file that is not really in the way?' ' +test_expect_failure '10e-check: Does git complain about untracked file that is not really in the way?' ' ( cd 10e && @@ -3413,7 +3371,7 @@ test_expect_failure '10e: Does git complain about untracked file that is not rea # z/c~HEAD with contents of B:z/b_v2, # z/c with uncommitted mods on top of A:z/c_v1 -test_setup_11a () { +test_expect_success '11a-setup: Avoid losing dirty contents with simple rename' ' test_create_repo 11a && ( cd 11a && @@ -3440,10 +3398,9 @@ test_setup_11a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '11a: Avoid losing dirty contents with simple rename' ' - test_setup_11a && +test_expect_success '11a-check: Avoid losing dirty contents with simple rename' ' ( cd 11a && @@ -3484,7 +3441,7 @@ test_expect_success '11a: Avoid losing dirty contents with simple rename' ' # ERROR_MSG(Refusing to lose dirty file at z/c) -test_setup_11b () { +test_expect_success '11b-setup: Avoid losing dirty file involved in directory rename' ' test_create_repo 11b && ( cd 11b && @@ -3513,10 +3470,9 @@ test_setup_11b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '11b: Avoid losing dirty file involved in directory rename' ' - test_setup_11b && +test_expect_success '11b-check: Avoid losing dirty file involved in directory rename' ' ( cd 11b && @@ -3559,7 +3515,7 @@ test_expect_success '11b: Avoid losing dirty file involved in directory rename' # Expected: Abort_msg("following files would be overwritten by merge") + # y/c left untouched (still has uncommitted mods) -test_setup_11c () { +test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conflict' ' test_create_repo 11c && ( cd 11c && @@ -3589,10 +3545,9 @@ test_setup_11c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict' ' - test_setup_11c && +test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conflict' ' ( cd 11c && @@ -3626,7 +3581,7 @@ test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict' # Warning_Msg("Refusing to lose dirty file at z/c) + # y/{a,c~HEAD,c/d}, x/b, now-untracked z/c_v1 with uncommitted mods -test_setup_11d () { +test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conflict' ' test_create_repo 11d && ( cd 11d && @@ -3657,10 +3612,9 @@ test_setup_11d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict' ' - test_setup_11d && +test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conflict' ' ( cd 11d && @@ -3705,7 +3659,7 @@ test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict' # y/c~HEAD has A:y/c_2 contents # y/c has dirty file from before merge -test_setup_11e () { +test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' ' test_create_repo 11e && ( cd 11e && @@ -3737,10 +3691,9 @@ test_setup_11e () { test_tick && git commit -m "B" ) -} +' -test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' ' - test_setup_11e && +test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' ' ( cd 11e && @@ -3791,7 +3744,7 @@ test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to # CONFLICT(rename/rename) x/c vs x/d -> y/wham # ERROR_MSG(Refusing to lose dirty file at y/wham) -test_setup_11f () { +test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rename(2to1)' ' test_create_repo 11f && ( cd 11f && @@ -3820,10 +3773,9 @@ test_setup_11f () { test_tick && git commit -m "B" ) -} +' -test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to1)' ' - test_setup_11f && +test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)' ' ( cd 11f && @@ -3880,7 +3832,7 @@ test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to # Commit B: node1/{leaf1,leaf2,leaf5}, node2/{leaf3,leaf4,leaf6} # Expected: node1/{leaf1,leaf2,leaf5,node2/{leaf3,leaf4,leaf6}} -test_setup_12a () { +test_expect_success '12a-setup: Moving one directory hierarchy into another' ' test_create_repo 12a && ( cd 12a && @@ -3910,10 +3862,9 @@ test_setup_12a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '12a: Moving one directory hierarchy into another' ' - test_setup_12a && +test_expect_success '12a-check: Moving one directory hierarchy into another' ' ( cd 12a && @@ -3959,7 +3910,7 @@ test_expect_success '12a: Moving one directory hierarchy into another' ' # To which, I can do no more than shrug my shoulders and say that # even simple rules give weird results when given weird inputs. -test_setup_12b () { +test_expect_success '12b-setup: Moving two directory hierarchies into each other' ' test_create_repo 12b && ( cd 12b && @@ -3987,10 +3938,9 @@ test_setup_12b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '12b: Moving two directory hierarchies into each other' ' - test_setup_12b && +test_expect_success '12b-check: Moving two directory hierarchies into each other' ' ( cd 12b && @@ -4026,7 +3976,7 @@ test_expect_success '12b: Moving two directory hierarchies into each other' ' # NOTE: This is *exactly* like 12c, except that every path is modified on # each side of the merge. -test_setup_12c () { +test_expect_success '12c-setup: Moving one directory hierarchy into another w/ content merge' ' test_create_repo 12c && ( cd 12c && @@ -4058,10 +4008,9 @@ test_setup_12c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '12c: Moving one directory hierarchy into another w/ content merge' ' - test_setup_12c && +test_expect_success '12c-check: Moving one directory hierarchy into another w/ content merge' ' ( cd 12c && @@ -4102,122 +4051,6 @@ test_expect_success '12c: Moving one directory hierarchy into another w/ content ) ' -# Testcase 12d, Rename/merge of subdirectory into the root -# Commit O: a/b/subdir/foo -# Commit A: subdir/foo -# Commit B: a/b/subdir/foo, a/b/bar -# Expected: subdir/foo, bar - -test_setup_12d () { - test_create_repo 12d && - ( - cd 12d && - - mkdir -p a/b/subdir && - test_commit a/b/subdir/foo && - - git branch O && - git branch A && - git branch B && - - git checkout A && - mkdir subdir && - git mv a/b/subdir/foo.t subdir/foo.t && - test_tick && - git commit -m "A" && - - git checkout B && - test_commit a/b/bar - ) -} - -test_expect_success '12d: Rename/merge subdir into the root, variant 1' ' - test_setup_12d && - ( - cd 12d && - - git checkout A^0 && - - git -c merge.directoryRenames=true merge -s recursive B^0 && - - git ls-files -s >out && - test_line_count = 2 out && - - git rev-parse >actual \ - HEAD:subdir/foo.t HEAD:bar.t && - git rev-parse >expect \ - O:a/b/subdir/foo.t B:a/b/bar.t && - test_cmp expect actual && - - git hash-object bar.t >actual && - git rev-parse B:a/b/bar.t >expect && - test_cmp expect actual && - - test_must_fail git rev-parse HEAD:a/b/subdir/foo.t && - test_must_fail git rev-parse HEAD:a/b/bar.t && - test_path_is_missing a/ && - test_path_is_file bar.t - ) -' - -# Testcase 12e, Rename/merge of subdirectory into the root -# Commit O: a/b/foo -# Commit A: foo -# Commit B: a/b/foo, a/b/bar -# Expected: foo, bar - -test_setup_12e () { - test_create_repo 12e && - ( - cd 12e && - - mkdir -p a/b && - test_commit a/b/foo && - - git branch O && - git branch A && - git branch B && - - git checkout A && - mkdir subdir && - git mv a/b/foo.t foo.t && - test_tick && - git commit -m "A" && - - git checkout B && - test_commit a/b/bar - ) -} - -test_expect_success '12e: Rename/merge subdir into the root, variant 2' ' - test_setup_12e && - ( - cd 12e && - - git checkout A^0 && - - git -c merge.directoryRenames=true merge -s recursive B^0 && - - git ls-files -s >out && - test_line_count = 2 out && - - git rev-parse >actual \ - HEAD:foo.t HEAD:bar.t && - git rev-parse >expect \ - O:a/b/foo.t B:a/b/bar.t && - test_cmp expect actual && - - git hash-object bar.t >actual && - git rev-parse B:a/b/bar.t >expect && - test_cmp expect actual && - - test_must_fail git rev-parse HEAD:a/b/foo.t && - test_must_fail git rev-parse HEAD:a/b/bar.t && - test_path_is_missing a/ && - test_path_is_file bar.t - ) -' - ########################################################################### # SECTION 13: Checking informational and conflict messages # @@ -4235,10 +4068,10 @@ test_expect_success '12e: Rename/merge subdir into the root, variant 2' ' # Commit B: z/{b,c,d,e/f} # Expected: y/{b,c,d,e/f}, with notices/conflicts for both y/d and y/e/f -test_setup_13a () { - test_create_repo 13a_$1 && +test_expect_success '13a-setup: messages for newly added files' ' + test_create_repo 13a && ( - cd 13a_$1 && + cd 13a && mkdir z && echo b >z/b && @@ -4264,12 +4097,11 @@ test_setup_13a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '13a(conflict): messages for newly added files' ' - test_setup_13a conflict && +test_expect_success '13a-check(conflict): messages for newly added files' ' ( - cd 13a_conflict && + cd 13a && git checkout A^0 && @@ -4289,10 +4121,9 @@ test_expect_success '13a(conflict): messages for newly added files' ' ) ' -test_expect_success '13a(info): messages for newly added files' ' - test_setup_13a info && +test_expect_success '13a-check(info): messages for newly added files' ' ( - cd 13a_info && + cd 13a && git reset --hard && git checkout A^0 && @@ -4322,10 +4153,10 @@ test_expect_success '13a(info): messages for newly added files' ' # Expected: y/{b,c,d_merged}, with two conflict messages for y/d, # one about content, and one about file location -test_setup_13b () { - test_create_repo 13b_$1 && +test_expect_success '13b-setup: messages for transitive rename with conflicted content' ' + test_create_repo 13b && ( - cd 13b_$1 && + cd 13b && mkdir x && mkdir z && @@ -4354,12 +4185,11 @@ test_setup_13b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '13b(conflict): messages for transitive rename with conflicted content' ' - test_setup_13b conflict && +test_expect_success '13b-check(conflict): messages for transitive rename with conflicted content' ' ( - cd 13b_conflict && + cd 13b && git checkout A^0 && @@ -4377,10 +4207,9 @@ test_expect_success '13b(conflict): messages for transitive rename with conflict ) ' -test_expect_success '13b(info): messages for transitive rename with conflicted content' ' - test_setup_13b info && +test_expect_success '13b-check(info): messages for transitive rename with conflicted content' ' ( - cd 13b_info && + cd 13b && git reset --hard && git checkout A^0 && @@ -4409,10 +4238,10 @@ test_expect_success '13b(info): messages for transitive rename with conflicted c # d and B had full knowledge, but that's a slippery slope as # shown in testcase 13d. -test_setup_13c () { - test_create_repo 13c_$1 && +test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive rename' ' + test_create_repo 13c && ( - cd 13c_$1 && + cd 13c && mkdir x && mkdir z && @@ -4440,12 +4269,11 @@ test_setup_13c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '13c(conflict): messages for rename/rename(1to1) via transitive rename' ' - test_setup_13c conflict && +test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via transitive rename' ' ( - cd 13c_conflict && + cd 13c && git checkout A^0 && @@ -4462,10 +4290,9 @@ test_expect_success '13c(conflict): messages for rename/rename(1to1) via transit ) ' -test_expect_success '13c(info): messages for rename/rename(1to1) via transitive rename' ' - test_setup_13c info && +test_expect_success '13c-check(info): messages for rename/rename(1to1) via transitive rename' ' ( - cd 13c_info && + cd 13c && git reset --hard && git checkout A^0 && @@ -4497,10 +4324,10 @@ test_expect_success '13c(info): messages for rename/rename(1to1) via transitive # * B renames a/y to c/y, and A renames c/->d/ => a/y -> d/y # No conflict in where a/y ends up, so put it in d/y. -test_setup_13d () { - test_create_repo 13d_$1 && +test_expect_success '13d-setup: messages for rename/rename(1to1) via dual transitive rename' ' + test_create_repo 13d && ( - cd 13d_$1 && + cd 13d && mkdir a && mkdir b && @@ -4529,12 +4356,11 @@ test_setup_13d () { test_tick && git commit -m "B" ) -} +' -test_expect_success '13d(conflict): messages for rename/rename(1to1) via dual transitive rename' ' - test_setup_13d conflict && +test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via dual transitive rename' ' ( - cd 13d_conflict && + cd 13d && git checkout A^0 && @@ -4554,10 +4380,9 @@ test_expect_success '13d(conflict): messages for rename/rename(1to1) via dual tr ) ' -test_expect_success '13d(info): messages for rename/rename(1to1) via dual transitive rename' ' - test_setup_13d info && +test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual transitive rename' ' ( - cd 13d_info && + cd 13d && git reset --hard && git checkout A^0 && @@ -4623,7 +4448,7 @@ test_expect_success '13d(info): messages for rename/rename(1to1) via dual transi # in the outer merge for this special kind of setup, but it at # least avoids hitting a BUG(). # -test_setup_13e () { +test_expect_success '13e-setup: directory rename detection in recursive case' ' test_create_repo 13e && ( cd 13e && @@ -4668,10 +4493,9 @@ test_setup_13e () { test_tick && git commit -m "D" ) -} +' -test_expect_success '13e: directory rename detection in recursive case' ' - test_setup_13e && +test_expect_success '13e-check: directory rename detection in recursive case' ' ( cd 13e && diff --git a/third_party/git/t/t6046-merge-skip-unneeded-updates.sh b/third_party/git/t/t6046-merge-skip-unneeded-updates.sh index 1ddc9e6626..3a47623ed3 100755 --- a/third_party/git/t/t6046-merge-skip-unneeded-updates.sh +++ b/third_party/git/t/t6046-merge-skip-unneeded-updates.sh @@ -36,10 +36,10 @@ test_description="merge cases" # Commit B: b_3 # Expected: b_2 -test_setup_1a () { - test_create_repo 1a_$1 && +test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' ' + test_create_repo 1a && ( - cd 1a_$1 && + cd 1a && test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && @@ -62,24 +62,26 @@ test_setup_1a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '1a-L: Modify(A)/Modify(B), change on B subset of A' ' - test_setup_1a L && +test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' ' + test_when_finished "git -C 1a reset --hard" && + test_when_finished "git -C 1a clean -fd" && ( - cd 1a_L && + cd 1a && git checkout A^0 && - test-tool chmtime --get -3600 b >old-mtime && + test-tool chmtime =31337 b && + test-tool chmtime -v +0 b >expected-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && + test_i18ngrep "Skipped b" out && test_must_be_empty err && - # Make sure b was NOT updated - test-tool chmtime --get b >new-mtime && - test_cmp old-mtime new-mtime && + test-tool chmtime -v +0 b >actual-mtime && + test_cmp expected-mtime actual-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -94,20 +96,17 @@ test_expect_success '1a-L: Modify(A)/Modify(B), change on B subset of A' ' ) ' -test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' ' - test_setup_1a R && +test_expect_success '1a-check-R: Modify(A)/Modify(B), change on B subset of A' ' + test_when_finished "git -C 1a reset --hard" && + test_when_finished "git -C 1a clean -fd" && ( - cd 1a_R && + cd 1a && git checkout B^0 && - test-tool chmtime --get -3600 b >old-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err && - # Make sure b WAS updated - test-tool chmtime --get b >new-mtime && - test $(cat old-mtime) -lt $(cat new-mtime) && - + test_i18ngrep "Auto-merging b" out && test_must_be_empty err && git ls-files -s >index_files && @@ -134,10 +133,10 @@ test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' ' # Commit B: c_1 # Expected: c_2 -test_setup_2a () { - test_create_repo 2a_$1 && +test_expect_success '2a-setup: Modify(A)/rename(B)' ' + test_create_repo 2a && ( - cd 2a_$1 && + cd 2a && test_seq 1 10 >b && git add b && @@ -159,19 +158,20 @@ test_setup_2a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '2a-L: Modify/rename, merge into modify side' ' - test_setup_2a L && +test_expect_success '2a-check-L: Modify/rename, merge into modify side' ' + test_when_finished "git -C 2a reset --hard" && + test_when_finished "git -C 2a clean -fd" && ( - cd 2a_L && + cd 2a && git checkout A^0 && - test_path_is_missing c && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && - test_path_is_file c && + test_i18ngrep ! "Skipped c" out && + test_must_be_empty err && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -189,20 +189,17 @@ test_expect_success '2a-L: Modify/rename, merge into modify side' ' ) ' -test_expect_success '2a-R: Modify/rename, merge into rename side' ' - test_setup_2a R && +test_expect_success '2a-check-R: Modify/rename, merge into rename side' ' + test_when_finished "git -C 2a reset --hard" && + test_when_finished "git -C 2a clean -fd" && ( - cd 2a_R && + cd 2a && git checkout B^0 && - test-tool chmtime --get -3600 c >old-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err && - # Make sure c WAS updated - test-tool chmtime --get c >new-mtime && - test $(cat old-mtime) -lt $(cat new-mtime) && - + test_i18ngrep ! "Skipped c" out && test_must_be_empty err && git ls-files -s >index_files && @@ -227,10 +224,10 @@ test_expect_success '2a-R: Modify/rename, merge into rename side' ' # Commit B: b_3 # Expected: c_2 -test_setup_2b () { - test_create_repo 2b_$1 && +test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' ' + test_create_repo 2b && ( - cd 2b_$1 && + cd 2b && test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && @@ -254,23 +251,26 @@ test_setup_2b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A' ' - test_setup_2b L && +test_expect_success '2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A' ' + test_when_finished "git -C 2b reset --hard" && + test_when_finished "git -C 2b clean -fd" && ( - cd 2b_L && + cd 2b && git checkout A^0 && - test-tool chmtime --get -3600 c >old-mtime && + test-tool chmtime =31337 c && + test-tool chmtime -v +0 c >expected-mtime && + GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && + test_i18ngrep "Skipped c" out && test_must_be_empty err && - # Make sure c WAS updated - test-tool chmtime --get c >new-mtime && - test_cmp old-mtime new-mtime && + test-tool chmtime -v +0 c >actual-mtime && + test_cmp expected-mtime actual-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -288,19 +288,17 @@ test_expect_success '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A' ' ) ' -test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' ' - test_setup_2b R && +test_expect_success '2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A' ' + test_when_finished "git -C 2b reset --hard" && + test_when_finished "git -C 2b clean -fd" && ( - cd 2b_R && + cd 2b && git checkout B^0 && - test_path_is_missing c && GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err && - # Make sure c now present (and thus was updated) - test_path_is_file c && - + test_i18ngrep "Auto-merging c" out && test_must_be_empty err && git ls-files -s >index_files && @@ -334,7 +332,7 @@ test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' ' # skip the update, then we're in trouble. This test verifies we do # not make that particular mistake. -test_setup_2c () { +test_expect_success '2c-setup: Modify b & add c VS rename b->c' ' test_create_repo 2c && ( cd 2c && @@ -360,26 +358,21 @@ test_setup_2c () { test_tick && git commit -m "B" ) -} +' -test_expect_success '2c: Modify b & add c VS rename b->c' ' - test_setup_2c && +test_expect_success '2c-check: Modify b & add c VS rename b->c' ' ( cd 2c && git checkout A^0 && - test-tool chmtime --get -3600 c >old-mtime && GIT_MERGE_VERBOSITY=3 && export GIT_MERGE_VERBOSITY && test_must_fail git merge -s recursive B^0 >out 2>err && test_i18ngrep "CONFLICT (rename/add): Rename b->c" out && - test_must_be_empty err && - - # Make sure c WAS updated - test-tool chmtime --get c >new-mtime && - test $(cat old-mtime) -lt $(cat new-mtime) + test_i18ngrep ! "Skipped c" out && + test_must_be_empty err # FIXME: rename/add conflicts are horribly broken right now; # when I get back to my patch series fixing it and @@ -435,10 +428,10 @@ test_expect_success '2c: Modify b & add c VS rename b->c' ' # Commit B: bq_1, bar/whatever # Expected: bar/{bq_2, whatever} -test_setup_3a () { - test_create_repo 3a_$1 && +test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_create_repo 3a && ( - cd 3a_$1 && + cd 3a && mkdir foo && test_seq 1 10 >bq && @@ -463,22 +456,21 @@ test_setup_3a () { test_tick && git commit -m "B" ) -} +' -test_expect_success '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' - test_setup_3a L && +test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_when_finished "git -C 3a reset --hard" && + test_when_finished "git -C 3a clean -fd" && ( - cd 3a_L && + cd 3a && git checkout A^0 && - test_path_is_missing bar/bq && GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err && + test_i18ngrep ! "Skipped bar/bq" out && test_must_be_empty err && - test_path_is_file bar/bq && - git ls-files -s >index_files && test_line_count = 2 index_files && @@ -495,20 +487,19 @@ test_expect_success '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' ) ' -test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' - test_setup_3a R && +test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_when_finished "git -C 3a reset --hard" && + test_when_finished "git -C 3a clean -fd" && ( - cd 3a_R && + cd 3a && git checkout B^0 && - test_path_is_missing bar/bq && GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err && + test_i18ngrep ! "Skipped bar/bq" out && test_must_be_empty err && - test_path_is_file bar/bq && - git ls-files -s >index_files && test_line_count = 2 index_files && @@ -531,10 +522,10 @@ test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' # Commit B: bq_2, bar/whatever # Expected: bar/{bq_2, whatever} -test_setup_3b () { - test_create_repo 3b_$1 && +test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_create_repo 3b && ( - cd 3b_$1 && + cd 3b && mkdir foo && test_seq 1 10 >bq && @@ -559,22 +550,21 @@ test_setup_3b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' - test_setup_3b L && +test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_when_finished "git -C 3b reset --hard" && + test_when_finished "git -C 3b clean -fd" && ( - cd 3b_L && + cd 3b && git checkout A^0 && - test_path_is_missing bar/bq && GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err && + test_i18ngrep ! "Skipped bar/bq" out && test_must_be_empty err && - test_path_is_file bar/bq && - git ls-files -s >index_files && test_line_count = 2 index_files && @@ -591,20 +581,19 @@ test_expect_success '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' ) ' -test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' - test_setup_3b R && +test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' + test_when_finished "git -C 3b reset --hard" && + test_when_finished "git -C 3b clean -fd" && ( - cd 3b_R && + cd 3b && git checkout B^0 && - test_path_is_missing bar/bq && GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err && + test_i18ngrep ! "Skipped bar/bq" out && test_must_be_empty err && - test_path_is_file bar/bq && - git ls-files -s >index_files && test_line_count = 2 index_files && @@ -632,7 +621,7 @@ test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' # Working copy: b_4 # Expected: b_2 for merge, b_4 in working copy -test_setup_4a () { +test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods present' ' test_create_repo 4a && ( cd 4a && @@ -658,7 +647,7 @@ test_setup_4a () { test_tick && git commit -m "B" ) -} +' # NOTE: For as long as we continue using unpack_trees() without index_only # set to true, it will error out on a case like this claiming the the locally @@ -666,23 +655,25 @@ test_setup_4a () { # correct requires doing the merge in-memory first, then realizing that no # updates to the file are necessary, and thus that we can just leave the path # alone. -test_expect_failure '4a: Change on A, change on B subset of A, dirty mods present' ' - test_setup_4a && +test_expect_failure '4a-check: Change on A, change on B subset of A, dirty mods present' ' + test_when_finished "git -C 4a reset --hard" && + test_when_finished "git -C 4a clean -fd" && ( cd 4a && git checkout A^0 && echo "File rewritten" >b && - test-tool chmtime --get -3600 b >old-mtime && + test-tool chmtime =31337 b && + test-tool chmtime -v +0 b >expected-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && + test_i18ngrep "Skipped b" out && test_must_be_empty err && - # Make sure b was NOT updated - test-tool chmtime --get b >new-mtime && - test_cmp old-mtime new-mtime && + test-tool chmtime -v +0 b >actual-mtime && + test_cmp expected-mtime actual-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && @@ -704,7 +695,7 @@ test_expect_failure '4a: Change on A, change on B subset of A, dirty mods presen # Working copy: c_4 # Expected: c_2 -test_setup_4b () { +test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' ' test_create_repo 4b && ( cd 4b && @@ -731,25 +722,27 @@ test_setup_4b () { test_tick && git commit -m "B" ) -} +' -test_expect_success '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' ' - test_setup_4b && +test_expect_success '4b-check: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' ' + test_when_finished "git -C 4b reset --hard" && + test_when_finished "git -C 4b clean -fd" && ( cd 4b && git checkout A^0 && echo "File rewritten" >c && - test-tool chmtime --get -3600 c >old-mtime && + test-tool chmtime =31337 c && + test-tool chmtime -v +0 c >expected-mtime && GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err && + test_i18ngrep "Skipped c" out && test_must_be_empty err && - # Make sure c was NOT updated - test-tool chmtime --get c >new-mtime && - test_cmp old-mtime new-mtime && + test-tool chmtime -v +0 c >actual-mtime && + test_cmp expected-mtime actual-mtime && git ls-files -s >index_files && test_line_count = 1 index_files && diff --git a/third_party/git/t/t6047-diff3-conflict-markers.sh b/third_party/git/t/t6047-diff3-conflict-markers.sh deleted file mode 100755 index f4655bb358..0000000000 --- a/third_party/git/t/t6047-diff3-conflict-markers.sh +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/sh - -test_description='recursive merge diff3 style conflict markers' - -. ./test-lib.sh - -# Setup: -# L1 -# \ -# ? -# / -# R1 -# -# Where: -# L1 and R1 both have a file named 'content' but have no common history -# - -test_expect_success 'setup no merge base' ' - test_create_repo no_merge_base && - ( - cd no_merge_base && - - git checkout -b L && - test_commit A content A && - - git checkout --orphan R && - test_commit B content B - ) -' - -test_expect_success 'check no merge base' ' - ( - cd no_merge_base && - - git checkout L^0 && - - test_must_fail git -c merge.conflictstyle=diff3 merge --allow-unrelated-histories -s recursive R^0 && - - grep "|||||| empty tree" content - ) -' - -# Setup: -# L1 -# / \ -# master ? -# \ / -# R1 -# -# Where: -# L1 and R1 have modified the same file ('content') in conflicting ways -# - -test_expect_success 'setup unique merge base' ' - test_create_repo unique_merge_base && - ( - cd unique_merge_base && - - test_commit base content "1 -2 -3 -4 -5 -" && - - git branch L && - git branch R && - - git checkout L && - test_commit L content "1 -2 -3 -4 -5 -7" && - - git checkout R && - git rm content && - test_commit R renamed "1 -2 -3 -4 -5 -six" - ) -' - -test_expect_success 'check unique merge base' ' - ( - cd unique_merge_base && - - git checkout L^0 && - MASTER=$(git rev-parse --short master) && - - test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 && - - grep "|||||| $MASTER:content" renamed - ) -' - -# Setup: -# L1---L2--L3 -# / \ / \ -# master X1 ? -# \ / \ / -# R1---R2--R3 -# -# Where: -# commits L1 and R1 have modified the same file in non-conflicting ways -# X1 is an auto-generated merge-base used when merging L1 and R1 -# commits L2 and R2 are merges of R1 and L1 into L1 and R1, respectively -# commits L3 and R3 both modify 'content' in conflicting ways -# - -test_expect_success 'setup multiple merge bases' ' - test_create_repo multiple_merge_bases && - ( - cd multiple_merge_bases && - - test_commit initial content "1 -2 -3 -4 -5" && - - git branch L && - git branch R && - - # Create L1 - git checkout L && - test_commit L1 content "0 -1 -2 -3 -4 -5" && - - # Create R1 - git checkout R && - test_commit R1 content "1 -2 -3 -4 -5 -6" && - - # Create L2 - git checkout L && - git merge R1 && - - # Create R2 - git checkout R && - git merge L1 && - - # Create L3 - git checkout L && - test_commit L3 content "0 -1 -2 -3 -4 -5 -A" && - - # Create R3 - git checkout R && - git rm content && - test_commit R3 renamed "0 -2 -3 -4 -5 -six" - ) -' - -test_expect_success 'check multiple merge bases' ' - ( - cd multiple_merge_bases && - - git checkout L^0 && - - test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 && - - grep "|||||| merged common ancestors:content" renamed - ) -' - -test_expect_success 'rebase --merge describes parent of commit being picked' ' - test_create_repo rebase && - ( - cd rebase && - test_commit base file && - test_commit master file && - git checkout -b side HEAD^ && - test_commit side file && - test_must_fail git -c merge.conflictstyle=diff3 rebase --merge master && - grep "||||||| parent of" file - ) -' - -test_expect_success 'rebase --apply describes fake ancestor base' ' - ( - cd rebase && - git rebase --abort && - test_must_fail git -c merge.conflictstyle=diff3 rebase --apply master && - grep "||||||| constructed merge base" file - ) -' - -test_done diff --git a/third_party/git/t/t6102-rev-list-unexpected-objects.sh b/third_party/git/t/t6102-rev-list-unexpected-objects.sh index 52cde097dd..28611c978e 100755 --- a/third_party/git/t/t6102-rev-list-unexpected-objects.sh +++ b/third_party/git/t/t6102-rev-list-unexpected-objects.sh @@ -52,7 +52,7 @@ test_expect_success 'traverse unexpected non-commit parent (lone)' ' ' test_expect_success 'traverse unexpected non-commit parent (seen)' ' - test_must_fail git rev-list --objects $blob $broken_commit \ + test_must_fail git rev-list --objects $commit $broken_commit \ >output 2>&1 && test_i18ngrep "not a commit" output ' diff --git a/third_party/git/t/t6112-rev-list-filters-objects.sh b/third_party/git/t/t6112-rev-list-filters-objects.sh index de0e5a5d36..acd7f5ab80 100755 --- a/third_party/git/t/t6112-rev-list-filters-objects.sh +++ b/third_party/git/t/t6112-rev-list-filters-objects.sh @@ -278,19 +278,7 @@ test_expect_success 'verify skipping tree iteration when not collecting omits' ' test_line_count = 2 actual && # Make sure no other trees were considered besides the root. - ! grep "Skipping contents of tree [^.]" filter_trace && - - # Try this again with "combine:". If both sub-filters are skipping - # trees, the composite filter should also skip trees. This is not - # important unless the user does combine:tree:X+tree:Y or another filter - # besides "tree:" is implemented in the future which can skip trees. - GIT_TRACE=1 git -C r3 rev-list \ - --objects --filter=combine:tree:1+tree:3 HEAD 2>filter_trace && - - # Only skip the dir1/ tree, which is shared between the two commits. - grep "Skipping contents of tree " filter_trace >actual && - test_write_lines "Skipping contents of tree dir1/..." >expected && - test_cmp expected actual + ! grep "Skipping contents of tree [^.]" filter_trace ' # Test tree:# filters. @@ -342,148 +330,6 @@ test_expect_success 'verify tree:3 includes everything expected' ' test_line_count = 10 actual ' -test_expect_success 'combine:... for a simple combination' ' - git -C r3 rev-list --objects --filter=combine:tree:2+blob:none HEAD \ - >actual && - - expect_has HEAD "" && - expect_has HEAD~1 "" && - expect_has HEAD dir1 && - - # There are also 2 commit objects - test_line_count = 5 actual && - - cp actual expected && - - # Try again using repeated --filter - this is equivalent to a manual - # combine with "combine:...+..." - git -C r3 rev-list --objects --filter=combine:tree:2 \ - --filter=blob:none HEAD >actual && - - test_cmp expected actual -' - -test_expect_success 'combine:... with URL encoding' ' - git -C r3 rev-list --objects \ - --filter=combine:tree%3a2+blob:%6Eon%65 HEAD >actual && - - expect_has HEAD "" && - expect_has HEAD~1 "" && - expect_has HEAD dir1 && - - # There are also 2 commit objects - test_line_count = 5 actual -' - -expect_invalid_filter_spec () { - spec="$1" && - err="$2" && - - test_must_fail git -C r3 rev-list --objects --filter="$spec" HEAD \ - >actual 2>actual_stderr && - test_must_be_empty actual && - test_i18ngrep "$err" actual_stderr -} - -test_expect_success 'combine:... while URL-encoding things that should not be' ' - expect_invalid_filter_spec combine%3Atree:2+blob:none \ - "invalid filter-spec" -' - -test_expect_success 'combine: with nothing after the :' ' - expect_invalid_filter_spec combine: "expected something after combine:" -' - -test_expect_success 'parse error in first sub-filter in combine:' ' - expect_invalid_filter_spec combine:tree:asdf+blob:none \ - "expected .tree:<depth>." -' - -test_expect_success 'combine:... with non-encoded reserved chars' ' - expect_invalid_filter_spec combine:tree:2+sparse:@xyz \ - "must escape char in sub-filter-spec: .@." && - expect_invalid_filter_spec combine:tree:2+sparse:\` \ - "must escape char in sub-filter-spec: .\`." && - expect_invalid_filter_spec combine:tree:2+sparse:~abc \ - "must escape char in sub-filter-spec: .\~." -' - -test_expect_success 'validate err msg for "combine:<valid-filter>+"' ' - expect_invalid_filter_spec combine:tree:2+ "expected .tree:<depth>." -' - -test_expect_success 'combine:... with edge-case hex digits: Ff Aa 0 9' ' - git -C r3 rev-list --objects --filter="combine:tree:2+bl%6Fb:n%6fne" \ - HEAD >actual && - test_line_count = 5 actual && - git -C r3 rev-list --objects --filter="combine:tree%3A2+blob%3anone" \ - HEAD >actual && - test_line_count = 5 actual && - git -C r3 rev-list --objects --filter="combine:tree:%30" HEAD >actual && - test_line_count = 2 actual && - git -C r3 rev-list --objects --filter="combine:tree:%39+blob:none" \ - HEAD >actual && - test_line_count = 5 actual -' - -test_expect_success 'add sparse pattern blobs whose paths have reserved chars' ' - cp r3/pattern r3/pattern1+renamed% && - cp r3/pattern "r3/p;at%ter+n" && - cp r3/pattern r3/^~pattern && - git -C r3 add pattern1+renamed% "p;at%ter+n" ^~pattern && - git -C r3 commit -m "add sparse pattern files with reserved chars" -' - -test_expect_success 'combine:... with more than two sub-filters' ' - git -C r3 rev-list --objects \ - --filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern \ - HEAD >actual && - - expect_has HEAD "" && - expect_has HEAD~1 "" && - expect_has HEAD~2 "" && - expect_has HEAD dir1 && - expect_has HEAD dir1/sparse1 && - expect_has HEAD dir1/sparse2 && - - # Should also have 3 commits - test_line_count = 9 actual && - - # Try again, this time making sure the last sub-filter is only - # URL-decoded once. - cp actual expect && - - git -C r3 rev-list --objects \ - --filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern1%2brenamed%25 \ - HEAD >actual && - test_cmp expect actual && - - # Use the same composite filter again, but with a pattern file name that - # requires encoding multiple characters, and use implicit filter - # combining. - test_when_finished "rm -f trace1" && - GIT_TRACE=$(pwd)/trace1 git -C r3 rev-list --objects \ - --filter=tree:3 --filter=blob:limit=40 \ - --filter=sparse:oid="master:p;at%ter+n" \ - HEAD >actual && - - test_cmp expect actual && - grep "Add to combine filter-spec: sparse:oid=master:p%3bat%25ter%2bn" \ - trace1 && - - # Repeat the above test, but this time, the characters to encode are in - # the LHS of the combined filter. - test_when_finished "rm -f trace2" && - GIT_TRACE=$(pwd)/trace2 git -C r3 rev-list --objects \ - --filter=sparse:oid=master:^~pattern \ - --filter=tree:3 --filter=blob:limit=40 \ - HEAD >actual && - - test_cmp expect actual && - grep "Add to combine filter-spec: sparse:oid=master:%5e%7epattern" \ - trace2 -' - # Test provisional omit collection logic with a repo that has objects appearing # at multiple depths - first deeper than the filter's threshold, then shallow. @@ -527,37 +373,6 @@ test_expect_success 'verify skipping tree iteration when collecting omits' ' test_cmp expect actual ' -test_expect_success 'setup r5' ' - git init r5 && - mkdir -p r5/subdir && - - echo 1 >r5/short-root && - echo 12345 >r5/long-root && - echo a >r5/subdir/short-subdir && - echo abcde >r5/subdir/long-subdir && - - git -C r5 add short-root long-root subdir && - git -C r5 commit -m "commit msg" -' - -test_expect_success 'verify collecting omits in combined: filter' ' - # Note that this test guards against the naive implementation of simply - # giving both filters the same "omits" set and expecting it to - # automatically merge them. - git -C r5 rev-list --objects --quiet --filter-print-omitted \ - --filter=combine:tree:2+blob:limit=3 HEAD >actual && - - # Expect 0 trees/commits, 3 blobs omitted (all blobs except short-root) - omitted_1=$(echo 12345 | git hash-object --stdin) && - omitted_2=$(echo a | git hash-object --stdin) && - omitted_3=$(echo abcde | git hash-object --stdin) && - - grep ~$omitted_1 actual && - grep ~$omitted_2 actual && - grep ~$omitted_3 actual && - test_line_count = 3 actual -' - # Test tree:<depth> where a tree is iterated to twice - once where a subentry is # too deep to be included, and again where the blob inside it is shallow enough # to be included. This makes sure we don't use LOFR_MARK_SEEN incorrectly (we @@ -626,4 +441,11 @@ test_expect_success 'expand blob limit in protocol' ' grep "blob:limit=1024" trace ' +test_expect_success 'expand tree depth limit in protocol' ' + GIT_TRACE_PACKET="$(pwd)/tree_trace" git -c protocol.version=2 clone \ + --filter=tree:0k "file://$(pwd)/r2" tree && + ! grep "tree:0k" tree_trace && + grep "tree:0" tree_trace +' + test_done diff --git a/third_party/git/t/t6113-rev-list-bitmap-filters.sh b/third_party/git/t/t6113-rev-list-bitmap-filters.sh deleted file mode 100755 index 145603f124..0000000000 --- a/third_party/git/t/t6113-rev-list-bitmap-filters.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -test_description='rev-list combining bitmaps and filters' -. ./test-lib.sh - -test_expect_success 'set up bitmapped repo' ' - # one commit will have bitmaps, the other will not - test_commit one && - test_commit much-larger-blob-one && - git repack -adb && - test_commit two && - test_commit much-larger-blob-two -' - -test_expect_success 'filters fallback to non-bitmap traversal' ' - # use a path-based filter, since they are inherently incompatible with - # bitmaps (i.e., this test will never get confused by later code to - # combine the features) - filter=$(echo "!one" | git hash-object -w --stdin) && - git rev-list --objects --filter=sparse:oid=$filter HEAD >expect && - git rev-list --use-bitmap-index \ - --objects --filter=sparse:oid=$filter HEAD >actual && - test_cmp expect actual -' - -test_expect_success 'blob:none filter' ' - git rev-list --objects --filter=blob:none HEAD >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:none HEAD >actual && - test_bitmap_traversal expect actual -' - -test_expect_success 'blob:none filter with specified blob' ' - git rev-list --objects --filter=blob:none HEAD HEAD:two.t >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:none HEAD HEAD:two.t >actual && - test_bitmap_traversal expect actual -' - -test_expect_success 'blob:limit filter' ' - git rev-list --objects --filter=blob:limit=5 HEAD >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:limit=5 HEAD >actual && - test_bitmap_traversal expect actual -' - -test_expect_success 'blob:limit filter with specified blob' ' - git rev-list --objects --filter=blob:limit=5 \ - HEAD HEAD:much-larger-blob-two.t >expect && - git rev-list --use-bitmap-index \ - --objects --filter=blob:limit=5 \ - HEAD HEAD:much-larger-blob-two.t >actual && - test_bitmap_traversal expect actual -' - -test_done diff --git a/third_party/git/t/t6120-describe.sh b/third_party/git/t/t6120-describe.sh index 34502e3a50..2b883d8174 100755 --- a/third_party/git/t/t6120-describe.sh +++ b/third_party/git/t/t6120-describe.sh @@ -1,27 +1,28 @@ #!/bin/sh -test_description='test describe' - -# o---o-----o----o----o-------o----x -# \ D,R e / -# \---o-------------o-' -# \ B / -# `-o----o----o-' -# A c -# -# First parent of a merge commit is on the same line, second parent below. +test_description='test describe + B + .--------------o----o----o----x + / / / + o----o----o----o----o----. / + \ A c / + .------------o---o---o + D,R e +' . ./test-lib.sh check_describe () { expect="$1" shift - describe_opts="$@" - test_expect_success "describe $describe_opts" ' - R=$(git describe $describe_opts 2>err.actual) && + R=$(git describe "$@" 2>err.actual) + S=$? + cat err.actual >&3 + test_expect_success "describe $*" ' + test $S = 0 && case "$R" in $expect) echo happy ;; - *) echo "Oops - $R is not $expect" && + *) echo "Oops - $R is not $expect"; false ;; esac ' @@ -381,7 +382,7 @@ test_expect_success 'describe tag object' ' test_i18ngrep "fatal: test-blob-1 is neither a commit nor blob" actual ' -test_expect_success ULIMIT_STACK_SIZE 'name-rev works in a deep repo' ' +test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' ' i=1 && while test $i -lt 8000 do @@ -423,111 +424,4 @@ test_expect_success 'describe complains about missing object' ' test_must_fail git describe $ZERO_OID ' -test_expect_success 'name-rev a rev shortly after epoch' ' - test_when_finished "git checkout master" && - - git checkout --orphan no-timestamp-underflow && - # Any date closer to epoch than the CUTOFF_DATE_SLOP constant - # in builtin/name-rev.c. - GIT_COMMITTER_DATE="@1234 +0000" \ - git commit -m "committer date shortly after epoch" && - old_commit_oid=$(git rev-parse HEAD) && - - echo "$old_commit_oid no-timestamp-underflow" >expect && - git name-rev $old_commit_oid >actual && - test_cmp expect actual -' - -# A--------------master -# \ / -# \----------M2 -# \ / -# \---M1-C -# \ / -# B -test_expect_success 'name-rev covers all conditions while looking at parents' ' - git init repo && - ( - cd repo && - - echo A >file && - git add file && - git commit -m A && - A=$(git rev-parse HEAD) && - - git checkout --detach && - echo B >file && - git commit -m B file && - B=$(git rev-parse HEAD) && - - git checkout $A && - git merge --no-ff $B && # M1 - - echo C >file && - git commit -m C file && - - git checkout $A && - git merge --no-ff HEAD@{1} && # M2 - - git checkout master && - git merge --no-ff HEAD@{1} && - - echo "$B master^2^2~1^2" >expect && - git name-rev $B >actual && - - test_cmp expect actual - ) -' - -# B -# o -# \ -# o-----o---o----x -# A -# -test_expect_success 'describe commits with disjoint bases' ' - git init disjoint1 && - ( - cd disjoint1 && - - echo o >> file && git add file && git commit -m o && - echo A >> file && git add file && git commit -m A && - git tag A -a -m A && - echo o >> file && git add file && git commit -m o && - - git checkout --orphan branch && rm file && - echo B > file2 && git add file2 && git commit -m B && - git tag B -a -m B && - git merge --no-ff --allow-unrelated-histories master -m x && - - check_describe "A-3-*" HEAD - ) -' - -# B -# o---o---o------------. -# \ -# o---o---x -# A -# -test_expect_success 'describe commits with disjoint bases 2' ' - git init disjoint2 && - ( - cd disjoint2 && - - echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A && - git tag A -a -m A && - echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o && - - git checkout --orphan branch && - echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o && - echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o && - echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B && - git tag B -a -m B && - git merge --no-ff --allow-unrelated-histories master -m x && - - check_describe "B-3-*" HEAD - ) -' - test_done diff --git a/third_party/git/t/t6130-pathspec-noglob.sh b/third_party/git/t/t6130-pathspec-noglob.sh index ba7902c9cd..37760233a5 100755 --- a/third_party/git/t/t6130-pathspec-noglob.sh +++ b/third_party/git/t/t6130-pathspec-noglob.sh @@ -10,7 +10,6 @@ test_expect_success 'create commits with glob characters' ' # the name "f*" in the worktree, because it is not allowed # on Windows (the tests below do not depend on the presence # of the file in the worktree) - git config core.protectNTFS false && git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" && test_tick && git commit -m star && diff --git a/third_party/git/t/t6136-pathspec-in-bare.sh b/third_party/git/t/t6136-pathspec-in-bare.sh deleted file mode 100755 index b117251366..0000000000 --- a/third_party/git/t/t6136-pathspec-in-bare.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -test_description='diagnosing out-of-scope pathspec' - -. ./test-lib.sh - -test_expect_success 'setup a bare and non-bare repository' ' - test_commit file1 && - git clone --bare . bare -' - -test_expect_success 'log and ls-files in a bare repository' ' - ( - cd bare && - test_must_fail git log -- .. >out 2>err && - test_must_be_empty out && - test_i18ngrep "outside repository" err && - - test_must_fail git ls-files -- .. >out 2>err && - test_must_be_empty out && - test_i18ngrep "outside repository" err - ) -' - -test_expect_success 'log and ls-files in .git directory' ' - ( - cd .git && - test_must_fail git log -- .. >out 2>err && - test_must_be_empty out && - test_i18ngrep "outside repository" err && - - test_must_fail git ls-files -- .. >out 2>err && - test_must_be_empty out && - test_i18ngrep "outside repository" err - ) -' - -test_done diff --git a/third_party/git/t/t6300-for-each-ref.sh b/third_party/git/t/t6300-for-each-ref.sh index 9c910ce746..ab69aa176d 100755 --- a/third_party/git/t/t6300-for-each-ref.sh +++ b/third_party/git/t/t6300-for-each-ref.sh @@ -526,25 +526,6 @@ test_expect_success 'Check ambiguous head and tag refs II (loose)' ' test_cmp expected actual ' -test_expect_success 'create tag without tagger' ' - git tag -a -m "Broken tag" taggerless && - git tag -f taggerless $(git cat-file tag taggerless | - sed -e "/^tagger /d" | - git hash-object --stdin -w -t tag) -' - -test_atom refs/tags/taggerless type 'commit' -test_atom refs/tags/taggerless tag 'taggerless' -test_atom refs/tags/taggerless tagger '' -test_atom refs/tags/taggerless taggername '' -test_atom refs/tags/taggerless taggeremail '' -test_atom refs/tags/taggerless taggerdate '' -test_atom refs/tags/taggerless committer '' -test_atom refs/tags/taggerless committername '' -test_atom refs/tags/taggerless committeremail '' -test_atom refs/tags/taggerless committerdate '' -test_atom refs/tags/taggerless subject 'Broken tag' - test_expect_success 'an unusual tag with an incomplete line' ' git tag -m "bogo" bogo && diff --git a/third_party/git/t/t6500-gc.sh b/third_party/git/t/t6500-gc.sh index 0a69a67117..c0f04dc6b0 100755 --- a/third_party/git/t/t6500-gc.sh +++ b/third_party/git/t/t6500-gc.sh @@ -103,14 +103,14 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre ' test_expect_success 'gc --no-quiet' ' - GIT_PROGRESS_DELAY=0 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && + git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && test_must_be_empty stdout && + test_line_count = 1 stderr && test_i18ngrep "Computing commit graph generation numbers" stderr ' test_expect_success TTY 'with TTY: gc --no-quiet' ' - test_terminal env GIT_PROGRESS_DELAY=0 \ - git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && + test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr && test_must_be_empty stdout && test_i18ngrep "Enumerating objects" stderr && test_i18ngrep "Computing commit graph generation numbers" stderr diff --git a/third_party/git/t/t6501-freshen-objects.sh b/third_party/git/t/t6501-freshen-objects.sh index f30b4849b6..033871ee5f 100755 --- a/third_party/git/t/t6501-freshen-objects.sh +++ b/third_party/git/t/t6501-freshen-objects.sh @@ -137,7 +137,7 @@ test_expect_success 'do not complain about existing broken links (commit)' ' some message EOF commit=$(git hash-object -t commit -w broken-commit) && - git gc -q 2>stderr && + git gc 2>stderr && verbose git cat-file -e $commit && test_must_be_empty stderr ' @@ -147,7 +147,7 @@ test_expect_success 'do not complain about existing broken links (tree)' ' 100644 blob 0000000000000000000000000000000000000003 foo EOF tree=$(git mktree --missing <broken-tree) && - git gc -q 2>stderr && + git gc 2>stderr && git cat-file -e $tree && test_must_be_empty stderr ' @@ -162,7 +162,7 @@ test_expect_success 'do not complain about existing broken links (tag)' ' this is a broken tag EOF tag=$(git hash-object -t tag -w broken-tag) && - git gc -q 2>stderr && + git gc 2>stderr && git cat-file -e $tag && test_must_be_empty stderr ' diff --git a/third_party/git/t/t7004-tag.sh b/third_party/git/t/t7004-tag.sh index 6db92bd3ba..80eb13d94e 100755 --- a/third_party/git/t/t7004-tag.sh +++ b/third_party/git/t/t7004-tag.sh @@ -227,10 +227,10 @@ test_expect_success \ test_expect_success \ 'trying to delete two tags, existing and not, should fail in the 2nd' ' tag_exists mytag && - ! tag_exists nonexistingtag && - test_must_fail git tag -d mytag nonexistingtag && + ! tag_exists myhead && + test_must_fail git tag -d mytag anothertag && ! tag_exists mytag && - ! tag_exists nonexistingtag + ! tag_exists myhead ' test_expect_success 'trying to delete an already deleted tag should fail' \ @@ -517,6 +517,7 @@ test_expect_success \ test_expect_success \ 'trying to create tags giving both -m or -F options should fail' ' echo "message file 1" >msgfile1 && + echo "message file 2" >msgfile2 && ! tag_exists msgtag && test_must_fail git tag -m "message 1" -F msgfile1 msgtag && ! tag_exists msgtag && @@ -1419,7 +1420,7 @@ test_expect_success \ get_tag_header reuse $commit commit $time >expect echo "An annotation to be reused" >> expect test_expect_success \ - 'overwriting an annotated tag should use its previous body' ' + 'overwriting an annoted tag should use its previous body' ' git tag -a -m "An annotation to be reused" reuse && GIT_EDITOR=true git tag -f -a reuse && get_tag_msg reuse >actual && diff --git a/third_party/git/t/t7815-grep-binary.sh b/third_party/git/t/t7008-grep-binary.sh index 90ebb64f46..2d87c49b75 100755 --- a/third_party/git/t/t7815-grep-binary.sh +++ b/third_party/git/t/t7008-grep-binary.sh @@ -4,6 +4,41 @@ test_description='git grep in binary files' . ./test-lib.sh +nul_match () { + matches=$1 + flags=$2 + pattern=$3 + pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g') + + if test "$matches" = 1 + then + test_expect_success "git grep -f f $flags '$pattern_human' a" " + printf '$pattern' | q_to_nul >f && + git grep -f f $flags a + " + elif test "$matches" = 0 + then + test_expect_success "git grep -f f $flags '$pattern_human' a" " + printf '$pattern' | q_to_nul >f && + test_must_fail git grep -f f $flags a + " + elif test "$matches" = T1 + then + test_expect_failure "git grep -f f $flags '$pattern_human' a" " + printf '$pattern' | q_to_nul >f && + git grep -f f $flags a + " + elif test "$matches" = T0 + then + test_expect_failure "git grep -f f $flags '$pattern_human' a" " + printf '$pattern' | q_to_nul >f && + test_must_fail git grep -f f $flags a + " + else + test_expect_success "PANIC: Test framework error. Unknown matches value $matches" 'false' + fi +} + test_expect_success 'setup' " echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a && git add a && @@ -67,6 +102,72 @@ test_expect_failure 'git grep .fi a' ' git grep .fi a ' +nul_match 1 '-F' 'yQf' +nul_match 0 '-F' 'yQx' +nul_match 1 '-Fi' 'YQf' +nul_match 0 '-Fi' 'YQx' +nul_match 1 '' 'yQf' +nul_match 0 '' 'yQx' +nul_match 1 '' 'æQð' +nul_match 1 '-F' 'eQm[*]c' +nul_match 1 '-Fi' 'EQM[*]C' + +# Regex patterns that would match but shouldn't with -F +nul_match 0 '-F' 'yQ[f]' +nul_match 0 '-F' '[y]Qf' +nul_match 0 '-Fi' 'YQ[F]' +nul_match 0 '-Fi' '[Y]QF' +nul_match 0 '-F' 'æQ[ð]' +nul_match 0 '-F' '[æ]Qð' +nul_match 0 '-Fi' 'ÆQ[Ð]' +nul_match 0 '-Fi' '[Æ]QÐ' + +# kwset is disabled on -i & non-ASCII. No way to match non-ASCII \0 +# patterns case-insensitively. +nul_match T1 '-i' 'ÆQÐ' + +# \0 implicitly disables regexes. This is an undocumented internal +# limitation. +nul_match T1 '' 'yQ[f]' +nul_match T1 '' '[y]Qf' +nul_match T1 '-i' 'YQ[F]' +nul_match T1 '-i' '[Y]Qf' +nul_match T1 '' 'æQ[ð]' +nul_match T1 '' '[æ]Qð' +nul_match T1 '-i' 'ÆQ[Ð]' + +# ... because of \0 implicitly disabling regexes regexes that +# should/shouldn't match don't do the right thing. +nul_match T1 '' 'eQm.*cQ' +nul_match T1 '-i' 'EQM.*cQ' +nul_match T0 '' 'eQm[*]c' +nul_match T0 '-i' 'EQM[*]C' + +# Due to the REG_STARTEND extension when kwset() is disabled on -i & +# non-ASCII the string will be matched in its entirety, but the +# pattern will be cut off at the first \0. +nul_match 0 '-i' 'NOMATCHQð' +nul_match T0 '-i' '[Æ]QNOMATCH' +nul_match T0 '-i' '[æ]QNOMATCH' +# Matches, but for the wrong reasons, just stops at [æ] +nul_match 1 '-i' '[Æ]Qð' +nul_match 1 '-i' '[æ]Qð' + +# Ensure that the matcher doesn't regress to something that stops at +# \0 +nul_match 0 '-F' 'yQ[f]' +nul_match 0 '-Fi' 'YQ[F]' +nul_match 0 '' 'yQNOMATCH' +nul_match 0 '' 'QNOMATCH' +nul_match 0 '-i' 'YQNOMATCH' +nul_match 0 '-i' 'QNOMATCH' +nul_match 0 '-F' 'æQ[ð]' +nul_match 0 '-Fi' 'ÆQ[Ð]' +nul_match 0 '' 'yQNÓMATCH' +nul_match 0 '' 'QNÓMATCH' +nul_match 0 '-i' 'YQNÓMATCH' +nul_match 0 '-i' 'QNÓMATCH' + test_expect_success 'grep respects binary diff attribute' ' echo text >t && git add t && diff --git a/third_party/git/t/t7008-filter-branch-null-sha1.sh b/third_party/git/t/t7009-filter-branch-null-sha1.sh index 9ba9f24ad2..9ba9f24ad2 100755 --- a/third_party/git/t/t7008-filter-branch-null-sha1.sh +++ b/third_party/git/t/t7009-filter-branch-null-sha1.sh diff --git a/third_party/git/t/t7012-skip-worktree-writing.sh b/third_party/git/t/t7012-skip-worktree-writing.sh index 7476781979..9d1abe50ef 100755 --- a/third_party/git/t/t7012-skip-worktree-writing.sh +++ b/third_party/git/t/t7012-skip-worktree-writing.sh @@ -134,21 +134,6 @@ test_expect_success 'git-clean, dirty case' ' test_i18ncmp expected result ' -test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' ' - test_commit keep-me && - git update-index --skip-worktree keep-me.t && - rm keep-me.t && - - : ignoring the worktree && - git update-index --remove --ignore-skip-worktree-entries keep-me.t && - git diff-index --cached --exit-code HEAD && - - : not ignoring the worktree, a deletion is staged && - git update-index --remove keep-me.t && - test_must_fail git diff-index --cached --exit-code HEAD \ - --diff-filter=D -- keep-me.t -' - #TODO test_expect_failure 'git-apply adds file' false #TODO test_expect_failure 'git-apply updates file' false #TODO test_expect_failure 'git-apply removes file' false diff --git a/third_party/git/t/t7030-verify-tag.sh b/third_party/git/t/t7030-verify-tag.sh index 5c5bc32ccb..041e319e79 100755 --- a/third_party/git/t/t7030-verify-tag.sh +++ b/third_party/git/t/t7030-verify-tag.sh @@ -44,8 +44,8 @@ test_expect_success GPG 'create signed tags' ' test_expect_success GPGSM 'create signed tags x509 ' ' test_config gpg.format x509 && test_config user.signingkey $GIT_COMMITTER_EMAIL && - echo 9 >file && test_tick && git commit -a -m "ninth gpgsm-signed" && - git tag -s -m ninth ninth-signed-x509 + echo 9 >file && test_tick && git commit -a -m "nineth gpgsm-signed" && + git tag -s -m nineth nineth-signed-x509 ' test_expect_success GPG 'verify and show signatures' ' @@ -80,34 +80,10 @@ test_expect_success GPG 'verify and show signatures' ' ' test_expect_success GPGSM 'verify and show signatures x509' ' - git verify-tag ninth-signed-x509 2>actual && + git verify-tag nineth-signed-x509 2>actual && grep "Good signature from" actual && ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK -' - -test_expect_success GPGSM 'verify and show signatures x509 with low minTrustLevel' ' - test_config gpg.minTrustLevel undefined && - git verify-tag ninth-signed-x509 2>actual && - grep "Good signature from" actual && - ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK -' - -test_expect_success GPGSM 'verify and show signatures x509 with matching minTrustLevel' ' - test_config gpg.minTrustLevel fully && - git verify-tag ninth-signed-x509 2>actual && - grep "Good signature from" actual && - ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK -' - -test_expect_success GPGSM 'verify and show signatures x509 with high minTrustLevel' ' - test_config gpg.minTrustLevel ultimate && - test_must_fail git verify-tag ninth-signed-x509 2>actual && - grep "Good signature from" actual && - ! grep "BAD signature from" actual && - echo ninth-signed-x509 OK + echo nineth-signed-x509 OK ' test_expect_success GPG 'detect fudged signature' ' @@ -151,10 +127,10 @@ test_expect_success GPG 'verify signatures with --raw' ' ' test_expect_success GPGSM 'verify signatures with --raw x509' ' - git verify-tag --raw ninth-signed-x509 2>actual && + git verify-tag --raw nineth-signed-x509 2>actual && grep "GOODSIG" actual && ! grep "BADSIG" actual && - echo ninth-signed-x509 OK + echo nineth-signed-x509 OK ' test_expect_success GPG 'verify multiple tags' ' @@ -171,7 +147,7 @@ test_expect_success GPG 'verify multiple tags' ' ' test_expect_success GPGSM 'verify multiple tags x509' ' - tags="seventh-signed ninth-signed-x509" && + tags="seventh-signed nineth-signed-x509" && for i in $tags do git verify-tag -v --raw $i || return 1 diff --git a/third_party/git/t/t7061-wtstatus-ignore.sh b/third_party/git/t/t7061-wtstatus-ignore.sh index e4cf5484f9..0c394cf995 100755 --- a/third_party/git/t/t7061-wtstatus-ignore.sh +++ b/third_party/git/t/t7061-wtstatus-ignore.sh @@ -43,16 +43,11 @@ test_expect_success 'status untracked directory with --ignored -u' ' test_cmp expected actual ' cat >expected <<\EOF -?? untracked/ +?? untracked/uncommitted !! untracked/ignored EOF -test_expect_success 'status of untracked directory with --ignored works with or without prefix' ' - git status --porcelain --ignored >tmp && - grep untracked/ tmp >actual && - rm tmp && - test_cmp expected actual && - +test_expect_success 'status prefixed untracked directory with --ignored' ' git status --porcelain --ignored untracked/ >actual && test_cmp expected actual ' diff --git a/third_party/git/t/t7105-reset-patch.sh b/third_party/git/t/t7105-reset-patch.sh index fc2a6cf5c7..bd10a96727 100755 --- a/third_party/git/t/t7105-reset-patch.sh +++ b/third_party/git/t/t7105-reset-patch.sh @@ -38,27 +38,6 @@ test_expect_success PERL 'git reset -p HEAD^' ' test_i18ngrep "Apply" output ' -test_expect_success PERL 'git reset -p HEAD^^{tree}' ' - test_write_lines n y | git reset -p HEAD^^{tree} >output && - verify_state dir/foo work parent && - verify_saved_state bar && - test_i18ngrep "Apply" output -' - -test_expect_success PERL 'git reset -p HEAD^:dir/foo (blob fails)' ' - set_and_save_state dir/foo work work && - test_must_fail git reset -p HEAD^:dir/foo && - verify_saved_state dir/foo && - verify_saved_state bar -' - -test_expect_success PERL 'git reset -p aaaaaaaa (unknown fails)' ' - set_and_save_state dir/foo work work && - test_must_fail git reset -p aaaaaaaa && - verify_saved_state dir/foo && - verify_saved_state bar -' - # The idea in the rest is that bar sorts first, so we always say 'y' # first and if the path limiter fails it'll apply to bar instead of # dir/foo. There's always an extra 'n' to reject edits to dir/foo in diff --git a/third_party/git/t/t7107-reset-pathspec-file.sh b/third_party/git/t/t7107-reset-pathspec-file.sh deleted file mode 100755 index cad3a9de9e..0000000000 --- a/third_party/git/t/t7107-reset-pathspec-file.sh +++ /dev/null @@ -1,173 +0,0 @@ -#!/bin/sh - -test_description='reset --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - git add . && - git commit --include . -m "Commit" && - git tag checkpoint -' - -restore_checkpoint () { - git reset --hard checkpoint -} - -verify_expect () { - git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual && - test_cmp expect actual -} - -test_expect_success '--pathspec-from-file from stdin' ' - restore_checkpoint && - - git rm fileA.t && - echo fileA.t | git reset --pathspec-from-file=- && - - cat >expect <<-\EOF && - D fileA.t - EOF - verify_expect -' - -test_expect_success '--pathspec-from-file from file' ' - restore_checkpoint && - - git rm fileA.t && - echo fileA.t >list && - git reset --pathspec-from-file=list && - - cat >expect <<-\EOF && - D fileA.t - EOF - verify_expect -' - -test_expect_success 'NUL delimiters' ' - restore_checkpoint && - - git rm fileA.t fileB.t && - printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul && - - cat >expect <<-\EOF && - D fileA.t - D fileB.t - EOF - verify_expect -' - -test_expect_success 'LF delimiters' ' - restore_checkpoint && - - git rm fileA.t fileB.t && - printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- && - - cat >expect <<-\EOF && - D fileA.t - D fileB.t - EOF - verify_expect -' - -test_expect_success 'no trailing delimiter' ' - restore_checkpoint && - - git rm fileA.t fileB.t && - printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- && - - cat >expect <<-\EOF && - D fileA.t - D fileB.t - EOF - verify_expect -' - -test_expect_success 'CRLF delimiters' ' - restore_checkpoint && - - git rm fileA.t fileB.t && - printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- && - - cat >expect <<-\EOF && - D fileA.t - D fileB.t - EOF - verify_expect -' - -test_expect_success 'quotes' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - git rm fileA.t && - git reset --pathspec-from-file=list && - - cat >expect <<-\EOF && - D fileA.t - EOF - verify_expect -' - -test_expect_success 'quotes not compatible with --pathspec-file-nul' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - # Note: "git reset" has not yet learned to fail on wrong pathspecs - git reset --pathspec-from-file=list --pathspec-file-nul && - - cat >expect <<-\EOF && - D fileA.t - EOF - test_must_fail verify_expect -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - git rm fileA.t fileB.t fileC.t fileD.t && - printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- && - - cat >expect <<-\EOF && - D fileA.t - D fileB.t - D fileC.t - D fileD.t - EOF - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo fileA.t >list && - git rm fileA.t && - - test_must_fail git reset --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err && - - test_must_fail git reset --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git reset --pathspec-file-nul 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err && - - test_must_fail git reset --soft --pathspec-from-file=list 2>err && - test_i18ngrep -e "fatal: Cannot do soft reset with paths" err && - - test_must_fail git reset --hard --pathspec-from-file=list 2>err && - test_i18ngrep -e "fatal: Cannot do hard reset with paths" err -' - -test_done diff --git a/third_party/git/t/t7300-clean.sh b/third_party/git/t/t7300-clean.sh index cb5e34d94c..a2c45d1902 100755 --- a/third_party/git/t/t7300-clean.sh +++ b/third_party/git/t/t7300-clean.sh @@ -117,7 +117,6 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' ' would_clean=$( cd docs && git clean -n ../src | - grep part3 | sed -n -e "s|^Would remove ||p" ) && verbose test "$would_clean" = ../src/part3.c @@ -130,7 +129,6 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' ' would_clean=$( cd docs && git clean -n "$(pwd)/../src" | - grep part3 | sed -n -e "s|^Would remove ||p" ) && verbose test "$would_clean" = ../src/part3.c @@ -549,7 +547,7 @@ test_expect_failure 'nested (non-empty) bare repositories should be cleaned even test_path_is_missing strange_bare ' -test_expect_success 'giving path in nested git work tree will NOT remove it' ' +test_expect_success 'giving path in nested git work tree will remove it' ' rm -fr repo && mkdir repo && ( @@ -561,7 +559,7 @@ test_expect_success 'giving path in nested git work tree will NOT remove it' ' git clean -f -d repo/bar/baz && test_path_is_file repo/.git/HEAD && test_path_is_dir repo/bar/ && - test_path_is_file repo/bar/baz/hello.world + test_path_is_missing repo/bar/baz ' test_expect_success 'giving path to nested .git will not remove it' ' @@ -579,7 +577,7 @@ test_expect_success 'giving path to nested .git will not remove it' ' test_path_is_dir untracked/ ' -test_expect_success 'giving path to nested .git/ will NOT remove contents' ' +test_expect_success 'giving path to nested .git/ will remove contents' ' rm -fr repo untracked && mkdir repo untracked && ( @@ -589,7 +587,7 @@ test_expect_success 'giving path to nested .git/ will NOT remove contents' ' ) && git clean -f -d repo/.git/ && test_path_is_dir repo/.git && - test_path_is_file repo/.git/HEAD && + test_dir_is_empty repo/.git && test_path_is_dir untracked/ ' @@ -671,60 +669,6 @@ test_expect_success 'git clean -d skips untracked dirs containing ignored files' test_path_is_missing foo/b/bb ' -test_expect_success 'git clean -d skips nested repo containing ignored files' ' - test_when_finished "rm -rf nested-repo-with-ignored-file" && - - git init nested-repo-with-ignored-file && - ( - cd nested-repo-with-ignored-file && - >file && - git add file && - git commit -m Initial && - - # This file is ignored by a .gitignore rule in the outer repo - # added in the previous test. - >ignoreme - ) && - - git clean -fd && - - test_path_is_file nested-repo-with-ignored-file/.git/index && - test_path_is_file nested-repo-with-ignored-file/ignoreme && - test_path_is_file nested-repo-with-ignored-file/file -' - -test_expect_success 'git clean handles being told what to clean' ' - mkdir -p d1 d2 && - touch d1/ut d2/ut && - git clean -f */ut && - test_path_is_missing d1/ut && - test_path_is_missing d2/ut -' - -test_expect_success 'git clean handles being told what to clean, with -d' ' - mkdir -p d1 d2 && - touch d1/ut d2/ut && - git clean -ffd */ut && - test_path_is_missing d1/ut && - test_path_is_missing d2/ut -' - -test_expect_success 'git clean works if a glob is passed without -d' ' - mkdir -p d1 d2 && - touch d1/ut d2/ut && - git clean -f "*ut" && - test_path_is_missing d1/ut && - test_path_is_missing d2/ut -' - -test_expect_success 'git clean works if a glob is passed with -d' ' - mkdir -p d1 d2 && - touch d1/ut d2/ut && - git clean -ffd "*ut" && - test_path_is_missing d1/ut && - test_path_is_missing d2/ut -' - test_expect_success MINGW 'handle clean & core.longpaths = false nicely' ' test_config core.longpaths false && a50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa && @@ -737,13 +681,4 @@ test_expect_success MINGW 'handle clean & core.longpaths = false nicely' ' test_i18ngrep "too long" .git/err ' -test_expect_success 'clean untracked paths by pathspec' ' - git init untracked && - mkdir untracked/dir && - echo >untracked/dir/file.txt && - git -C untracked clean -f dir/file.txt && - ls untracked/dir >actual && - test_must_be_empty actual -' - test_done diff --git a/third_party/git/t/t7400-submodule-basic.sh b/third_party/git/t/t7400-submodule-basic.sh index e3e2aab3b0..a208cb26e1 100755 --- a/third_party/git/t/t7400-submodule-basic.sh +++ b/third_party/git/t/t7400-submodule-basic.sh @@ -55,21 +55,6 @@ test_expect_success 'add aborts on repository with no commits' ' test_i18ncmp expect actual ' -test_expect_success 'status should ignore inner git repo when not added' ' - rm -fr inner && - mkdir inner && - ( - cd inner && - git init && - >t && - git add t && - git commit -m "initial" - ) && - test_must_fail git submodule status inner 2>output.err && - rm -fr inner && - test_i18ngrep "^error: .*did not match any file(s) known to git" output.err -' - test_expect_success 'setup - repository in init subdirectory' ' mkdir init && ( @@ -171,11 +156,9 @@ test_expect_success 'submodule add to .gitignored path fails' ' ( cd addtest-ignore && cat <<-\EOF >expect && - The following paths are ignored by one of your .gitignore files: + The following path is ignored by one of your .gitignore files: submod - hint: Use -f if you really want to add them. - hint: Turn this message off by running - hint: "git config advice.addIgnoredFile false" + Use -f if you really want to add it. EOF # Does not use test_commit due to the ignore echo "*" > .gitignore && @@ -208,17 +191,6 @@ test_expect_success 'submodule add to reconfigure existing submodule with --forc ) ' -test_expect_success 'submodule add relays add --dry-run stderr' ' - test_when_finished "rm -rf addtest/.git/index.lock" && - ( - cd addtest && - : >.git/index.lock && - ! git submodule add "$submodurl" sub-while-locked 2>output.err && - test_i18ngrep "^fatal: .*index\.lock" output.err && - test_path_is_missing sub-while-locked - ) -' - test_expect_success 'submodule add --branch' ' echo "refs/heads/initial" >expect-head && cat <<-\EOF >expect-heads && @@ -384,28 +356,6 @@ test_expect_success 'status should only print one line' ' test_line_count = 1 lines ' -test_expect_success 'status from subdirectory should have the same SHA1' ' - test_when_finished "rmdir addtest/subdir" && - ( - cd addtest && - mkdir subdir && - git submodule status >output && - awk "{print \$1}" <output >expect && - cd subdir && - git submodule status >../output && - awk "{print \$1}" <../output >../actual && - test_cmp ../expect ../actual && - git -C ../submod checkout HEAD^ && - git submodule status >../output && - awk "{print \$1}" <../output >../actual2 && - cd .. && - git submodule status >output && - awk "{print \$1}" <output >expect2 && - test_cmp expect2 actual2 && - ! test_cmp actual actual2 - ) -' - test_expect_success 'setup - fetch commit name from submodule' ' rev1=$(cd .subrepo && git rev-parse HEAD) && printf "rev1: %s\n" "$rev1" && @@ -427,14 +377,6 @@ test_expect_success 'init should register submodule url in .git/config' ' test_cmp expect url ' -test_expect_success 'status should still be "missing" after initializing' ' - rm -fr init && - mkdir init && - git submodule status >lines && - rm -fr init && - grep "^-$rev1" lines -' - test_failure_with_unknown_submodule () { test_must_fail git submodule $1 no-such-submodule 2>output.err && test_i18ngrep "^error: .*no-such-submodule" output.err @@ -585,6 +527,7 @@ test_expect_success 'update --init' ' test_must_fail git config submodule.example.url && git submodule update init 2> update.out && + cat update.out && test_i18ngrep "not initialized" update.out && test_must_fail git rev-parse --resolve-git-dir init/.git && @@ -602,6 +545,7 @@ test_expect_success 'update --init from subdirectory' ' ( cd sub && git submodule update ../init 2>update.out && + cat update.out && test_i18ngrep "not initialized" update.out && test_must_fail git rev-parse --resolve-git-dir ../init/.git && diff --git a/third_party/git/t/t7406-submodule-update.sh b/third_party/git/t/t7406-submodule-update.sh index 4fb447a143..c973278300 100755 --- a/third_party/git/t/t7406-submodule-update.sh +++ b/third_party/git/t/t7406-submodule-update.sh @@ -158,6 +158,7 @@ test_expect_success 'submodule update --init from and of subdirectory' ' test_i18ncmp expect2 actual2 ' +apos="'"; test_expect_success 'submodule update does not fetch already present commits' ' (cd submodule && echo line3 >> file && @@ -167,7 +168,7 @@ test_expect_success 'submodule update does not fetch already present commits' ' ) && (cd super/submodule && head=$(git rev-parse --verify HEAD) && - echo "Submodule path ${SQ}submodule$SQ: checked out $SQ$head$SQ" > ../../expected && + echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected && git reset --hard HEAD~1 ) && (cd super && @@ -406,26 +407,12 @@ test_expect_success 'submodule update - command in .git/config' ' ) ' -test_expect_success 'submodule update - command in .gitmodules is rejected' ' +test_expect_success 'submodule update - command in .gitmodules is ignored' ' test_when_finished "git -C super reset --hard HEAD^" && git -C super config -f .gitmodules submodule.submodule.update "!false" && git -C super commit -a -m "add command to .gitmodules file" && git -C super/submodule reset --hard $submodulesha1^ && - test_must_fail git -C super submodule update submodule -' - -test_expect_success 'fsck detects command in .gitmodules' ' - git init command-in-gitmodules && - ( - cd command-in-gitmodules && - git submodule add ../submodule submodule && - test_commit adding-submodule && - - git config -f .gitmodules submodule.submodule.update "!false" && - git add .gitmodules && - test_commit configuring-update && - test_must_fail git fsck - ) + git -C super submodule update submodule ' cat << EOF >expect @@ -494,9 +481,6 @@ test_expect_success 'recursive submodule update - command in .git/config catches ' test_expect_success 'submodule init does not copy command into .git/config' ' - test_when_finished "git -C super update-index --force-remove submodule1" && - test_when_finished git config -f super/.gitmodules \ - --remove-section submodule.submodule1 && (cd super && git ls-files -s submodule >out && H=$(cut -d" " -f2 out) && @@ -505,9 +489,10 @@ test_expect_success 'submodule init does not copy command into .git/config' ' git config -f .gitmodules submodule.submodule1.path submodule1 && git config -f .gitmodules submodule.submodule1.url ../submodule && git config -f .gitmodules submodule.submodule1.update !false && - test_must_fail git submodule init submodule1 && - test_expect_code 1 git config submodule.submodule1.update >actual && - test_must_be_empty actual + git submodule init submodule1 && + echo "none" >expect && + git config submodule.submodule1.update >actual && + test_cmp expect actual ) ' @@ -960,7 +945,7 @@ test_expect_success 'submodule update clone shallow submodule outside of depth' mv -f .gitmodules.tmp .gitmodules && # Some protocol versions (e.g. 2) support fetching # unadvertised objects, so restrict this test to v0. - test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \ + test_must_fail env GIT_TEST_PROTOCOL_VERSION= \ git submodule update --init --depth=1 2>actual && test_i18ngrep "Direct fetching of that commit failed." actual && git -C ../submodule config uploadpack.allowReachableSHA1InWant true && diff --git a/third_party/git/t/t7410-submodule-checkout-to.sh b/third_party/git/t/t7410-submodule-checkout-to.sh new file mode 100755 index 0000000000..f1b492ebc4 --- /dev/null +++ b/third_party/git/t/t7410-submodule-checkout-to.sh @@ -0,0 +1,77 @@ +#!/bin/sh + +test_description='Combination of submodules and multiple workdirs' + +. ./test-lib.sh + +base_path=$(pwd -P) + +test_expect_success 'setup: make origin' ' + mkdir -p origin/sub && + ( + cd origin/sub && git init && + echo file1 >file1 && + git add file1 && + git commit -m file1 + ) && + mkdir -p origin/main && + ( + cd origin/main && git init && + git submodule add ../sub && + git commit -m "add sub" + ) && + ( + cd origin/sub && + echo file1updated >file1 && + git add file1 && + git commit -m "file1 updated" + ) && + git -C origin/main/sub pull && + ( + cd origin/main && + git add sub && + git commit -m "sub updated" + ) +' + +test_expect_success 'setup: clone' ' + mkdir clone && + git -C clone clone --recursive "$base_path/origin/main" +' + +rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1") +rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1") + +test_expect_success 'checkout main' ' + mkdir default_checkout && + git -C clone/main worktree add "$base_path/default_checkout/main" "$rev1_hash_main" +' + +test_expect_failure 'can see submodule diffs just after checkout' ' + git -C default_checkout/main diff --submodule master"^!" >out && + grep "file1 updated" out +' + +test_expect_success 'checkout main and initialize independent clones' ' + mkdir fully_cloned_submodule && + git -C clone/main worktree add "$base_path/fully_cloned_submodule/main" "$rev1_hash_main" && + git -C fully_cloned_submodule/main submodule update +' + +test_expect_success 'can see submodule diffs after independent cloning' ' + git -C fully_cloned_submodule/main diff --submodule master"^!" >out && + grep "file1 updated" out +' + +test_expect_success 'checkout sub manually' ' + mkdir linked_submodule && + git -C clone/main worktree add "$base_path/linked_submodule/main" "$rev1_hash_main" && + git -C clone/main/sub worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub" +' + +test_expect_success 'can see submodule diffs after manual checkout of linked submodule' ' + git -C linked_submodule/main diff --submodule master"^!" >out && + grep "file1 updated" out +' + +test_done diff --git a/third_party/git/t/t7415-submodule-names.sh b/third_party/git/t/t7415-submodule-names.sh index f70368bc2e..49a37efe9c 100755 --- a/third_party/git/t/t7415-submodule-names.sh +++ b/third_party/git/t/t7415-submodule-names.sh @@ -191,61 +191,4 @@ test_expect_success 'fsck detects corrupt .gitmodules' ' ) ' -test_expect_success MINGW 'prevent git~1 squatting on Windows' ' - git init squatting && - ( - cd squatting && - mkdir a && - touch a/..git && - git add a/..git && - test_tick && - git commit -m initial && - - modules="$(test_write_lines \ - "[submodule \"b.\"]" "url = ." "path = c" \ - "[submodule \"b\"]" "url = ." "path = d\\\\a" | - git hash-object -w --stdin)" && - rev="$(git rev-parse --verify HEAD)" && - hash="$(echo x | git hash-object -w --stdin)" && - test_must_fail git update-index --add \ - --cacheinfo 160000,$rev,d\\a 2>err && - test_i18ngrep "Invalid path" err && - git -c core.protectNTFS=false update-index --add \ - --cacheinfo 100644,$modules,.gitmodules \ - --cacheinfo 160000,$rev,c \ - --cacheinfo 160000,$rev,d\\a \ - --cacheinfo 100644,$hash,d./a/x \ - --cacheinfo 100644,$hash,d./a/..git && - test_tick && - git -c core.protectNTFS=false commit -m "module" - ) && - test_must_fail git -c core.protectNTFS=false \ - clone --recurse-submodules squatting squatting-clone 2>err && - test_i18ngrep -e "directory not empty" -e "not an empty directory" err && - ! grep gitdir squatting-clone/d/a/git~2 -' - -test_expect_success 'git dirs of sibling submodules must not be nested' ' - git init nested && - test_commit -C nested nested && - ( - cd nested && - cat >.gitmodules <<-EOF && - [submodule "hippo"] - url = . - path = thing1 - [submodule "hippo/hooks"] - url = . - path = thing2 - EOF - git clone . thing1 && - git clone . thing2 && - git add .gitmodules thing1 thing2 && - test_tick && - git commit -m nested - ) && - test_must_fail git clone --recurse-submodules nested clone 2>err && - test_i18ngrep "is inside git dir" err -' - test_done diff --git a/third_party/git/t/t7416-submodule-dash-url.sh b/third_party/git/t/t7416-submodule-dash-url.sh index eec96e0ba9..1cd2c1c1ea 100755 --- a/third_party/git/t/t7416-submodule-dash-url.sh +++ b/third_party/git/t/t7416-submodule-dash-url.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='check handling of disallowed .gitmodule urls' +test_description='check handling of .gitmodule url with dash' . ./test-lib.sh test_expect_success 'create submodule with protected dash in url' ' @@ -46,159 +46,4 @@ test_expect_success 'fsck rejects unprotected dash' ' grep gitmodulesUrl err ' -test_expect_success 'trailing backslash is handled correctly' ' - git init testmodule && - test_commit -C testmodule c && - git submodule add ./testmodule && - : ensure that the name ends in a double backslash && - sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \ - -e "s|url = .*|url = \" --should-not-be-an-option\"|" \ - <.gitmodules >.new && - mv .new .gitmodules && - git commit -am "Add testmodule" && - test_must_fail git clone --verbose --recurse-submodules . dolly 2>err && - test_i18ngrep ! "unknown option" err -' - -test_expect_success 'fsck rejects missing URL scheme' ' - git checkout --orphan missing-scheme && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = http::one.example.com/foo.git - EOF - git add .gitmodules && - test_tick && - git commit -m "gitmodules with missing URL scheme" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - -test_expect_success 'fsck rejects relative URL resolving to missing scheme' ' - git checkout --orphan relative-missing-scheme && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = "..\\../.\\../:one.example.com/foo.git" - EOF - git add .gitmodules && - test_tick && - git commit -m "gitmodules with relative URL that strips off scheme" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - -test_expect_success 'fsck rejects empty URL scheme' ' - git checkout --orphan empty-scheme && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = http::://one.example.com/foo.git - EOF - git add .gitmodules && - test_tick && - git commit -m "gitmodules with empty URL scheme" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - -test_expect_success 'fsck rejects relative URL resolving to empty scheme' ' - git checkout --orphan relative-empty-scheme && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = ../../../:://one.example.com/foo.git - EOF - git add .gitmodules && - test_tick && - git commit -m "relative gitmodules URL resolving to empty scheme" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - -test_expect_success 'fsck rejects empty hostname' ' - git checkout --orphan empty-host && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = http:///one.example.com/foo.git - EOF - git add .gitmodules && - test_tick && - git commit -m "gitmodules with extra slashes" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - -test_expect_success 'fsck rejects relative url that produced empty hostname' ' - git checkout --orphan messy-relative && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = ../../..//one.example.com/foo.git - EOF - git add .gitmodules && - test_tick && - git commit -m "gitmodules abusing relative_path" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - -test_expect_success 'fsck permits embedded newline with unrecognized scheme' ' - git checkout --orphan newscheme && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = "data://acjbkd%0akajfdickajkd" - EOF - git add .gitmodules && - git commit -m "gitmodules with unrecognized scheme" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - git push dst HEAD -' - -test_expect_success 'fsck rejects embedded newline in url' ' - # create an orphan branch to avoid existing .gitmodules objects - git checkout --orphan newline && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = "https://one.example.com?%0ahost=two.example.com/foo.git" - EOF - git add .gitmodules && - git commit -m "gitmodules with newline" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - -test_expect_success 'fsck rejects embedded newline in relative url' ' - git checkout --orphan relative-newline && - cat >.gitmodules <<-\EOF && - [submodule "foo"] - url = "./%0ahost=two.example.com/foo.git" - EOF - git add .gitmodules && - git commit -m "relative url with newline" && - test_when_finished "rm -rf dst" && - git init --bare dst && - git -C dst config transfer.fsckObjects true && - test_must_fail git push dst HEAD 2>err && - grep gitmodulesUrl err -' - test_done diff --git a/third_party/git/t/t7417-submodule-path-url.sh b/third_party/git/t/t7417-submodule-path-url.sh index f7e7e94d7b..756af8c4d6 100755 --- a/third_party/git/t/t7417-submodule-path-url.sh +++ b/third_party/git/t/t7417-submodule-path-url.sh @@ -25,21 +25,4 @@ test_expect_success 'fsck rejects unprotected dash' ' grep gitmodulesPath err ' -test_expect_success MINGW 'submodule paths disallows trailing spaces' ' - git init super && - test_must_fail git -C super submodule add ../upstream "sub " && - - : add "sub", then rename "sub" to "sub ", the hard way && - git -C super submodule add ../upstream sub && - tree=$(git -C super write-tree) && - git -C super ls-tree $tree >tree && - sed "s/sub/sub /" <tree >tree.new && - tree=$(git -C super mktree <tree.new) && - commit=$(echo with space | git -C super commit-tree $tree) && - git -C super update-ref refs/heads/master $commit && - - test_must_fail git clone --recurse-submodules super dst 2>err && - test_i18ngrep "sub " err -' - test_done diff --git a/third_party/git/t/t7419-submodule-set-branch.sh b/third_party/git/t/t7419-submodule-set-branch.sh index fd25f786a3..c4b370ea85 100755 --- a/third_party/git/t/t7419-submodule-set-branch.sh +++ b/third_party/git/t/t7419-submodule-set-branch.sh @@ -34,7 +34,7 @@ test_expect_success 'submodule config cache setup' ' test_expect_success 'ensure submodule branch is unset' ' (cd super && - ! grep branch .gitmodules + test_must_fail grep branch .gitmodules ) ' @@ -54,7 +54,7 @@ test_expect_success 'test submodule set-branch --branch' ' test_expect_success 'test submodule set-branch --default' ' (cd super && git submodule set-branch --default submodule && - ! grep branch .gitmodules && + test_must_fail grep branch .gitmodules && git submodule update --remote && cat <<-\EOF >expect && a @@ -80,7 +80,7 @@ test_expect_success 'test submodule set-branch -b' ' test_expect_success 'test submodule set-branch -d' ' (cd super && git submodule set-branch -d submodule && - ! grep branch .gitmodules && + test_must_fail grep branch .gitmodules && git submodule update --remote && cat <<-\EOF >expect && a diff --git a/third_party/git/t/t7420-submodule-set-url.sh b/third_party/git/t/t7420-submodule-set-url.sh deleted file mode 100755 index ef0cb6e8e1..0000000000 --- a/third_party/git/t/t7420-submodule-set-url.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 Denton Liu -# - -test_description='Test submodules set-url subcommand - -This test verifies that the set-url subcommand of git-submodule is working -as expected. -' - -TEST_NO_CREATE_REPO=1 -. ./test-lib.sh - -test_expect_success 'submodule config cache setup' ' - mkdir submodule && - ( - cd submodule && - git init && - echo a >file && - git add file && - git commit -ma - ) && - mkdir super && - ( - cd super && - git init && - git submodule add ../submodule && - git commit -m "add submodule" - ) -' - -test_expect_success 'test submodule set-url' ' - # add a commit and move the submodule (change the url) - ( - cd submodule && - echo b >>file && - git add file && - git commit -mb - ) && - mv submodule newsubmodule && - - git -C newsubmodule show >expect && - ( - cd super && - test_must_fail git submodule update --remote && - git submodule set-url submodule ../newsubmodule && - grep -F "url = ../newsubmodule" .gitmodules && - git submodule update --remote - ) && - git -C super/submodule show >actual && - test_cmp expect actual -' - -test_done diff --git a/third_party/git/t/t7500-commit-template-squash-signoff.sh b/third_party/git/t/t7500-commit-template-squash-signoff.sh index 6d19ece05d..46a5cd4b73 100755 --- a/third_party/git/t/t7500-commit-template-squash-signoff.sh +++ b/third_party/git/t/t7500-commit-template-squash-signoff.sh @@ -382,13 +382,4 @@ test_expect_success 'check commit with unstaged rename and copy' ' ) ' -test_expect_success 'commit without staging files fails and displays hints' ' - echo "initial" >file && - git add file && - git commit -m initial && - echo "changes" >>file && - test_must_fail git commit -m update >actual && - test_i18ngrep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual -' - test_done diff --git a/third_party/git/t/t7501-commit-basic-functionality.sh b/third_party/git/t/t7501-commit-basic-functionality.sh index 110b4bf459..f1349af56e 100755 --- a/third_party/git/t/t7501-commit-basic-functionality.sh +++ b/third_party/git/t/t7501-commit-basic-functionality.sh @@ -150,7 +150,7 @@ test_expect_success 'setup: commit message from file' ' test_expect_success 'amend commit' ' cat >editor <<-\EOF && #!/bin/sh - sed -e "s/a file/an amend commit/g" <"$1" >"$1-" + sed -e "s/a file/an amend commit/g" < "$1" > "$1-" mv "$1-" "$1" EOF chmod 755 editor && @@ -263,7 +263,7 @@ test_expect_success 'using message from other commit' ' test_expect_success 'editing message from other commit' ' cat >editor <<-\EOF && #!/bin/sh - sed -e "s/amend/older/g" <"$1" >"$1-" + sed -e "s/amend/older/g" < "$1" > "$1-" mv "$1-" "$1" EOF chmod 755 editor && @@ -285,8 +285,9 @@ test_expect_success 'overriding author from command line' ' ' test_expect_success PERL 'interactive add' ' - echo 7 | test_must_fail git commit --interactive >out && - grep "What now" out + echo 7 | + git commit --interactive | + grep "What now" ' test_expect_success PERL "commit --interactive doesn't change index if editor aborts" ' @@ -361,12 +362,12 @@ test_expect_success 'amend commit to fix author' ' oldtick=$GIT_AUTHOR_DATE && test_tick && git reset --hard && - git cat-file -p HEAD >commit && + git cat-file -p HEAD | sed -e "s/author.*/author $author $oldtick/" \ - -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ - commit >expected && + -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ + expected && git commit --amend --author="$author" && - git cat-file -p HEAD >current && + git cat-file -p HEAD > current && test_cmp expected current ' @@ -376,12 +377,12 @@ test_expect_success 'amend commit to fix date' ' test_tick && newtick=$GIT_AUTHOR_DATE && git reset --hard && - git cat-file -p HEAD >commit && + git cat-file -p HEAD | sed -e "s/author.*/author $author $newtick/" \ - -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ - commit >expected && + -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ + expected && git commit --amend --date="$newtick" && - git cat-file -p HEAD >current && + git cat-file -p HEAD > current && test_cmp expected current ' @@ -408,13 +409,12 @@ test_expect_success 'sign off (1)' ' echo 1 >positive && git add positive && git commit -s -m "thank you" && - git cat-file commit HEAD >commit && - sed -e "1,/^\$/d" commit >actual && + git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && ( echo thank you && echo && - git var GIT_COMMITTER_IDENT >ident && - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident + git var GIT_COMMITTER_IDENT | + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ) >expected && test_cmp expected actual @@ -428,14 +428,13 @@ test_expect_success 'sign off (2)' ' git commit -s -m "thank you $existing" && - git cat-file commit HEAD >commit && - sed -e "1,/^\$/d" commit >actual && + git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && ( echo thank you && echo && echo $existing && - git var GIT_COMMITTER_IDENT >ident && - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident + git var GIT_COMMITTER_IDENT | + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ) >expected && test_cmp expected actual @@ -449,14 +448,13 @@ test_expect_success 'signoff gap' ' git commit -s -m "welcome $alt" && - git cat-file commit HEAD >commit && - sed -e "1,/^\$/d" commit >actual && + git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && ( echo welcome && echo && echo $alt && - git var GIT_COMMITTER_IDENT >ident && - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident + git var GIT_COMMITTER_IDENT | + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ) >expected && test_cmp expected actual ' @@ -470,16 +468,15 @@ test_expect_success 'signoff gap 2' ' We have now $alt" && - git cat-file commit HEAD >commit && - sed -e "1,/^\$/d" commit >actual && + git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && ( echo welcome && echo && echo We have now && echo $alt && echo && - git var GIT_COMMITTER_IDENT >ident && - sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident + git var GIT_COMMITTER_IDENT | + sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ) >expected && test_cmp expected actual ' @@ -492,8 +489,7 @@ test_expect_success 'signoff respects trailer config' ' non-trailer line Myfooter: x" && - git cat-file commit HEAD >commit && - sed -e "1,/^\$/d" commit >actual && + git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && ( echo subject && echo && @@ -510,8 +506,7 @@ Myfooter: x" && non-trailer line Myfooter: x" && - git cat-file commit HEAD >commit && - sed -e "1,/^\$/d" commit >actual && + git cat-file commit HEAD | sed -e "1,/^\$/d" > actual && ( echo subject && echo && @@ -543,8 +538,7 @@ test_expect_success 'multiple -m' ' >negative && git add negative && git commit -m "one" -m "two" -m "three" && - git cat-file commit HEAD >commit && - sed -e "1,/^\$/d" commit >actual && + git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && ( echo one && echo && @@ -561,25 +555,23 @@ test_expect_success 'amend commit to fix author' ' oldtick=$GIT_AUTHOR_DATE && test_tick && git reset --hard && - git cat-file -p HEAD >commit && + git cat-file -p HEAD | sed -e "s/author.*/author $author $oldtick/" \ - -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \ - commit >expected && + -e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \ + expected && git commit --amend --author="$author" && - git cat-file -p HEAD >current && + git cat-file -p HEAD > current && test_cmp expected current ' test_expect_success 'git commit <file> with dirty index' ' - echo tacocat >elif && - echo tehlulz >chz && + echo tacocat > elif && + echo tehlulz > chz && git add chz && git commit elif -m "tacocat is a palindrome" && - git show --stat >stat && - grep elif stat && - git diff --cached >diff && - grep chz diff + git show --stat | grep elif && + git diff --cached | grep chz ' test_expect_success 'same tree (single parent)' ' @@ -592,8 +584,7 @@ test_expect_success 'same tree (single parent)' ' test_expect_success 'same tree (single parent) --allow-empty' ' git commit --allow-empty -m "forced empty" && - git cat-file commit HEAD >commit && - grep forced commit + git cat-file commit HEAD | grep forced ' diff --git a/third_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh b/third_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh deleted file mode 100755 index b3485450a2..0000000000 --- a/third_party/git/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh +++ /dev/null @@ -1,281 +0,0 @@ -#!/bin/sh - -test_description='pre-commit and pre-merge-commit hooks' - -. ./test-lib.sh - -HOOKDIR="$(git rev-parse --git-dir)/hooks" -PRECOMMIT="$HOOKDIR/pre-commit" -PREMERGE="$HOOKDIR/pre-merge-commit" - -# Prepare sample scripts that write their $0 to actual_hooks -test_expect_success 'sample script setup' ' - mkdir -p "$HOOKDIR" && - write_script "$HOOKDIR/success.sample" <<-\EOF && - echo $0 >>actual_hooks - exit 0 - EOF - write_script "$HOOKDIR/fail.sample" <<-\EOF && - echo $0 >>actual_hooks - exit 1 - EOF - write_script "$HOOKDIR/non-exec.sample" <<-\EOF && - echo $0 >>actual_hooks - exit 1 - EOF - chmod -x "$HOOKDIR/non-exec.sample" && - write_script "$HOOKDIR/require-prefix.sample" <<-\EOF && - echo $0 >>actual_hooks - test $GIT_PREFIX = "success/" - EOF - write_script "$HOOKDIR/check-author.sample" <<-\EOF - echo $0 >>actual_hooks - test "$GIT_AUTHOR_NAME" = "New Author" && - test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com" - EOF -' - -test_expect_success 'root commit' ' - echo "root" >file && - git add file && - git commit -m "zeroth" && - git checkout -b side && - echo "foo" >foo && - git add foo && - git commit -m "make it non-ff" && - git branch side-orig side && - git checkout master -' - -test_expect_success 'setup conflicting branches' ' - test_when_finished "git checkout master" && - git checkout -b conflicting-a master && - echo a >conflicting && - git add conflicting && - git commit -m conflicting-a && - git checkout -b conflicting-b master && - echo b >conflicting && - git add conflicting && - git commit -m conflicting-b -' - -test_expect_success 'with no hook' ' - test_when_finished "rm -f actual_hooks" && - echo "foo" >file && - git add file && - git commit -m "first" && - test_path_is_missing actual_hooks -' - -test_expect_success 'with no hook (merge)' ' - test_when_finished "rm -f actual_hooks" && - git branch -f side side-orig && - git checkout side && - git merge -m "merge master" master && - git checkout master && - test_path_is_missing actual_hooks -' - -test_expect_success '--no-verify with no hook' ' - test_when_finished "rm -f actual_hooks" && - echo "bar" >file && - git add file && - git commit --no-verify -m "bar" && - test_path_is_missing actual_hooks -' - -test_expect_success '--no-verify with no hook (merge)' ' - test_when_finished "rm -f actual_hooks" && - git branch -f side side-orig && - git checkout side && - git merge --no-verify -m "merge master" master && - git checkout master && - test_path_is_missing actual_hooks -' - -test_expect_success 'with succeeding hook' ' - test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" && - cp "$HOOKDIR/success.sample" "$PRECOMMIT" && - echo "$PRECOMMIT" >expected_hooks && - echo "more" >>file && - git add file && - git commit -m "more" && - test_cmp expected_hooks actual_hooks -' - -test_expect_success 'with succeeding hook (merge)' ' - test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" && - cp "$HOOKDIR/success.sample" "$PREMERGE" && - echo "$PREMERGE" >expected_hooks && - git checkout side && - git merge -m "merge master" master && - git checkout master && - test_cmp expected_hooks actual_hooks -' - -test_expect_success 'automatic merge fails; both hooks are available' ' - test_when_finished "rm -f \"$PREMERGE\" \"$PRECOMMIT\"" && - test_when_finished "rm -f expected_hooks actual_hooks" && - test_when_finished "git checkout master" && - cp "$HOOKDIR/success.sample" "$PREMERGE" && - cp "$HOOKDIR/success.sample" "$PRECOMMIT" && - - git checkout conflicting-a && - test_must_fail git merge -m "merge conflicting-b" conflicting-b && - test_path_is_missing actual_hooks && - - echo "$PRECOMMIT" >expected_hooks && - echo a+b >conflicting && - git add conflicting && - git commit -m "resolve conflict" && - test_cmp expected_hooks actual_hooks -' - -test_expect_success '--no-verify with succeeding hook' ' - test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" && - cp "$HOOKDIR/success.sample" "$PRECOMMIT" && - echo "even more" >>file && - git add file && - git commit --no-verify -m "even more" && - test_path_is_missing actual_hooks -' - -test_expect_success '--no-verify with succeeding hook (merge)' ' - test_when_finished "rm -f \"$PREMERGE\" actual_hooks" && - cp "$HOOKDIR/success.sample" "$PREMERGE" && - git branch -f side side-orig && - git checkout side && - git merge --no-verify -m "merge master" master && - git checkout master && - test_path_is_missing actual_hooks -' - -test_expect_success 'with failing hook' ' - test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" && - cp "$HOOKDIR/fail.sample" "$PRECOMMIT" && - echo "$PRECOMMIT" >expected_hooks && - echo "another" >>file && - git add file && - test_must_fail git commit -m "another" && - test_cmp expected_hooks actual_hooks -' - -test_expect_success '--no-verify with failing hook' ' - test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" && - cp "$HOOKDIR/fail.sample" "$PRECOMMIT" && - echo "stuff" >>file && - git add file && - git commit --no-verify -m "stuff" && - test_path_is_missing actual_hooks -' - -test_expect_success 'with failing hook (merge)' ' - test_when_finished "rm -f \"$PREMERGE\" expected_hooks actual_hooks" && - cp "$HOOKDIR/fail.sample" "$PREMERGE" && - echo "$PREMERGE" >expected_hooks && - git checkout side && - test_must_fail git merge -m "merge master" master && - git checkout master && - test_cmp expected_hooks actual_hooks -' - -test_expect_success '--no-verify with failing hook (merge)' ' - test_when_finished "rm -f \"$PREMERGE\" actual_hooks" && - cp "$HOOKDIR/fail.sample" "$PREMERGE" && - git branch -f side side-orig && - git checkout side && - git merge --no-verify -m "merge master" master && - git checkout master && - test_path_is_missing actual_hooks -' - -test_expect_success POSIXPERM 'with non-executable hook' ' - test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" && - cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" && - echo "content" >>file && - git add file && - git commit -m "content" && - test_path_is_missing actual_hooks -' - -test_expect_success POSIXPERM '--no-verify with non-executable hook' ' - test_when_finished "rm -f \"$PRECOMMIT\" actual_hooks" && - cp "$HOOKDIR/non-exec.sample" "$PRECOMMIT" && - echo "more content" >>file && - git add file && - git commit --no-verify -m "more content" && - test_path_is_missing actual_hooks -' - -test_expect_success POSIXPERM 'with non-executable hook (merge)' ' - test_when_finished "rm -f \"$PREMERGE\" actual_hooks" && - cp "$HOOKDIR/non-exec.sample" "$PREMERGE" && - git branch -f side side-orig && - git checkout side && - git merge -m "merge master" master && - git checkout master && - test_path_is_missing actual_hooks -' - -test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' ' - test_when_finished "rm -f \"$PREMERGE\" actual_hooks" && - cp "$HOOKDIR/non-exec.sample" "$PREMERGE" && - git branch -f side side-orig && - git checkout side && - git merge --no-verify -m "merge master" master && - git checkout master && - test_path_is_missing actual_hooks -' - -test_expect_success 'with hook requiring GIT_PREFIX' ' - test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks success" && - cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" && - echo "$PRECOMMIT" >expected_hooks && - echo "more content" >>file && - git add file && - mkdir success && - ( - cd success && - git commit -m "hook requires GIT_PREFIX = success/" - ) && - test_cmp expected_hooks actual_hooks -' - -test_expect_success 'with failing hook requiring GIT_PREFIX' ' - test_when_finished "rm -rf \"$PRECOMMIT\" expected_hooks actual_hooks fail" && - cp "$HOOKDIR/require-prefix.sample" "$PRECOMMIT" && - echo "$PRECOMMIT" >expected_hooks && - echo "more content" >>file && - git add file && - mkdir fail && - ( - cd fail && - test_must_fail git commit -m "hook must fail" - ) && - git checkout -- file && - test_cmp expected_hooks actual_hooks -' - -test_expect_success 'check the author in hook' ' - test_when_finished "rm -f \"$PRECOMMIT\" expected_hooks actual_hooks" && - cp "$HOOKDIR/check-author.sample" "$PRECOMMIT" && - cat >expected_hooks <<-EOF && - $PRECOMMIT - $PRECOMMIT - $PRECOMMIT - EOF - test_must_fail git commit --allow-empty -m "by a.u.thor" && - ( - GIT_AUTHOR_NAME="New Author" && - GIT_AUTHOR_EMAIL="newauthor@example.com" && - export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL && - git commit --allow-empty -m "by new.author via env" && - git show -s - ) && - git commit --author="New Author <newauthor@example.com>" \ - --allow-empty -m "by new.author via command line" && - git show -s && - test_cmp expected_hooks actual_hooks -' - -test_done diff --git a/third_party/git/t/t7503-pre-commit-hook.sh b/third_party/git/t/t7503-pre-commit-hook.sh new file mode 100755 index 0000000000..984889b39d --- /dev/null +++ b/third_party/git/t/t7503-pre-commit-hook.sh @@ -0,0 +1,139 @@ +#!/bin/sh + +test_description='pre-commit hook' + +. ./test-lib.sh + +test_expect_success 'with no hook' ' + + echo "foo" > file && + git add file && + git commit -m "first" + +' + +test_expect_success '--no-verify with no hook' ' + + echo "bar" > file && + git add file && + git commit --no-verify -m "bar" + +' + +# now install hook that always succeeds +HOOKDIR="$(git rev-parse --git-dir)/hooks" +HOOK="$HOOKDIR/pre-commit" +mkdir -p "$HOOKDIR" +cat > "$HOOK" <<EOF +#!/bin/sh +exit 0 +EOF +chmod +x "$HOOK" + +test_expect_success 'with succeeding hook' ' + + echo "more" >> file && + git add file && + git commit -m "more" + +' + +test_expect_success '--no-verify with succeeding hook' ' + + echo "even more" >> file && + git add file && + git commit --no-verify -m "even more" + +' + +# now a hook that fails +cat > "$HOOK" <<EOF +#!/bin/sh +exit 1 +EOF + +test_expect_success 'with failing hook' ' + + echo "another" >> file && + git add file && + test_must_fail git commit -m "another" + +' + +test_expect_success '--no-verify with failing hook' ' + + echo "stuff" >> file && + git add file && + git commit --no-verify -m "stuff" + +' + +chmod -x "$HOOK" +test_expect_success POSIXPERM 'with non-executable hook' ' + + echo "content" >> file && + git add file && + git commit -m "content" + +' + +test_expect_success POSIXPERM '--no-verify with non-executable hook' ' + + echo "more content" >> file && + git add file && + git commit --no-verify -m "more content" + +' +chmod +x "$HOOK" + +# a hook that checks $GIT_PREFIX and succeeds inside the +# success/ subdirectory only +cat > "$HOOK" <<EOF +#!/bin/sh +test \$GIT_PREFIX = success/ +EOF + +test_expect_success 'with hook requiring GIT_PREFIX' ' + + echo "more content" >> file && + git add file && + mkdir success && + ( + cd success && + git commit -m "hook requires GIT_PREFIX = success/" + ) && + rmdir success +' + +test_expect_success 'with failing hook requiring GIT_PREFIX' ' + + echo "more content" >> file && + git add file && + mkdir fail && + ( + cd fail && + test_must_fail git commit -m "hook must fail" + ) && + rmdir fail && + git checkout -- file +' + +test_expect_success 'check the author in hook' ' + write_script "$HOOK" <<-\EOF && + test "$GIT_AUTHOR_NAME" = "New Author" && + test "$GIT_AUTHOR_EMAIL" = "newauthor@example.com" + EOF + test_must_fail git commit --allow-empty -m "by a.u.thor" && + ( + GIT_AUTHOR_NAME="New Author" && + GIT_AUTHOR_EMAIL="newauthor@example.com" && + export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL && + git commit --allow-empty -m "by new.author via env" && + git show -s + ) && + git commit --author="New Author <newauthor@example.com>" \ + --allow-empty -m "by new.author via command line" && + git show -s +' + +test_done diff --git a/third_party/git/t/t7505-prepare-commit-msg-hook.sh b/third_party/git/t/t7505-prepare-commit-msg-hook.sh index 94f85cdf83..ba8bd1b514 100755 --- a/third_party/git/t/t7505-prepare-commit-msg-hook.sh +++ b/third_party/git/t/t7505-prepare-commit-msg-hook.sh @@ -241,7 +241,13 @@ test_rebase () { git add b && git rebase --continue ) && - git log --pretty=%s -g -n18 HEAD@{1} >actual && + if test "$mode" = -p # reword amended after pick + then + n=18 + else + n=17 + fi && + git log --pretty=%s -g -n$n HEAD@{1} >actual && test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual ' } diff --git a/third_party/git/t/t7505/expected-rebase-i b/third_party/git/t/t7505/expected-rebase-i index 93bada596e..c514bdbb94 100644 --- a/third_party/git/t/t7505/expected-rebase-i +++ b/third_party/git/t/t7505/expected-rebase-i @@ -7,8 +7,7 @@ message (no editor) [edit rebase-10] message [fixup rebase-9] message (no editor) [fixup rebase-8] message (no editor) [squash rebase-7] -HEAD [reword rebase-6] -message (no editor) [reword rebase-6] +message [reword rebase-6] message [squash rebase-5] message (no editor) [fixup rebase-4] message (no editor) [pick rebase-3] diff --git a/third_party/git/t/t7508-status.sh b/third_party/git/t/t7508-status.sh index 482ce3510e..4e676cdce8 100755 --- a/third_party/git/t/t7508-status.sh +++ b/third_party/git/t/t7508-status.sh @@ -1571,7 +1571,7 @@ test_expect_success '"status.showStash=true" weaker than "--no-show-stash"' ' test_cmp expected_without_stash actual ' -test_expect_success 'no additional info if no stash entries' ' +test_expect_success 'no additionnal info if no stash entries' ' git stash clear && git -c status.showStash=true status >actual && test_cmp expected_without_stash actual diff --git a/third_party/git/t/t7510-signed-commit.sh b/third_party/git/t/t7510-signed-commit.sh index 0c06d22a00..682b23a068 100755 --- a/third_party/git/t/t7510-signed-commit.sh +++ b/third_party/git/t/t7510-signed-commit.sh @@ -109,21 +109,6 @@ test_expect_success GPG 'verify-commit exits success on untrusted signature' ' grep "not certified" actual ' -test_expect_success GPG 'verify-commit exits success with matching minTrustLevel' ' - test_config gpg.minTrustLevel ultimate && - git verify-commit sixth-signed -' - -test_expect_success GPG 'verify-commit exits success with low minTrustLevel' ' - test_config gpg.minTrustLevel fully && - git verify-commit sixth-signed -' - -test_expect_success GPG 'verify-commit exits failure with high minTrustLevel' ' - test_config gpg.minTrustLevel ultimate && - test_must_fail git verify-commit eighth-signed-alt -' - test_expect_success GPG 'verify signatures with --raw' ' ( for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed @@ -234,30 +219,6 @@ test_expect_success GPG 'show untrusted signature with custom format' ' test_cmp expect actual ' -test_expect_success GPG 'show untrusted signature with undefined trust level' ' - cat >expect <<-\EOF && - undefined - 65A0EEA02E30CAD7 - Eris Discordia <discord@example.net> - F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7 - D4BE22311AD3131E5EDA29A461092E85B7227189 - EOF - git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual && - test_cmp expect actual -' - -test_expect_success GPG 'show untrusted signature with ultimate trust level' ' - cat >expect <<-\EOF && - ultimate - 13B6F51ECDDE430D - C O Mitter <committer@example.com> - 73D758744BE721698EC54E8713B6F51ECDDE430D - 73D758744BE721698EC54E8713B6F51ECDDE430D - EOF - git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual && - test_cmp expect actual -' - test_expect_success GPG 'show unknown signature with custom format' ' cat >expect <<-\EOF && E diff --git a/third_party/git/t/t7512-status-help.sh b/third_party/git/t/t7512-status-help.sh index 29518e0949..e01c285cbf 100755 --- a/third_party/git/t/t7512-status-help.sh +++ b/third_party/git/t/t7512-status-help.sh @@ -71,10 +71,10 @@ test_expect_success 'prepare for rebase conflicts' ' ' -test_expect_success 'status when rebase --apply in progress before resolving conflicts' ' +test_expect_success 'status when rebase in progress before resolving conflicts' ' test_when_finished "git rebase --abort" && ONTO=$(git rev-parse --short HEAD^^) && - test_must_fail git rebase --apply HEAD^ --onto HEAD^^ && + test_must_fail git rebase HEAD^ --onto HEAD^^ && cat >expected <<EOF && rebase in progress; onto $ONTO You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''. @@ -94,11 +94,11 @@ EOF ' -test_expect_success 'status when rebase --apply in progress before rebase --continue' ' +test_expect_success 'status when rebase in progress before rebase --continue' ' git reset --hard rebase_conflicts && test_when_finished "git rebase --abort" && ONTO=$(git rev-parse --short HEAD^^) && - test_must_fail git rebase --apply HEAD^ --onto HEAD^^ && + test_must_fail git rebase HEAD^ --onto HEAD^^ && echo three >main.txt && git add main.txt && cat >expected <<EOF && @@ -688,7 +688,7 @@ EOF ' -test_expect_success 'status when rebase --apply conflicts with statushints disabled' ' +test_expect_success 'status when rebase conflicts with statushints disabled' ' git reset --hard master && git checkout -b statushints_disabled && test_when_finished "git config --local advice.statushints true" && @@ -698,7 +698,7 @@ test_expect_success 'status when rebase --apply conflicts with statushints disab test_commit three_statushints main.txt three && test_when_finished "git rebase --abort" && ONTO=$(git rev-parse --short HEAD^^) && - test_must_fail git rebase --apply HEAD^ --onto HEAD^^ && + test_must_fail git rebase HEAD^ --onto HEAD^^ && cat >expected <<EOF && rebase in progress; onto $ONTO You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''. @@ -733,7 +733,6 @@ test_expect_success 'status when cherry-picking before resolving conflicts' ' On branch cherry_branch You are currently cherry-picking commit $TO_CHERRY_PICK. (fix conflicts and run "git cherry-pick --continue") - (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: @@ -758,7 +757,6 @@ test_expect_success 'status when cherry-picking after resolving conflicts' ' On branch cherry_branch You are currently cherry-picking commit $TO_CHERRY_PICK. (all conflicts fixed: run "git cherry-pick --continue") - (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: @@ -780,7 +778,6 @@ test_expect_success 'status when cherry-picking after committing conflict resolu On branch cherry_branch Cherry-pick currently in progress. (run "git cherry-pick --continue" to continue) - (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation) nothing to commit (use -u to show untracked files) @@ -838,7 +835,6 @@ test_expect_success 'status while reverting commit (conflicts)' ' On branch master You are currently reverting commit $TO_REVERT. (fix conflicts and run "git revert --continue") - (use "git revert --skip" to skip this patch) (use "git revert --abort" to cancel the revert operation) Unmerged paths: @@ -859,7 +855,6 @@ test_expect_success 'status while reverting commit (conflicts resolved)' ' On branch master You are currently reverting commit $TO_REVERT. (all conflicts fixed: run "git revert --continue") - (use "git revert --skip" to skip this patch) (use "git revert --abort" to cancel the revert operation) Changes to be committed: @@ -892,7 +887,6 @@ test_expect_success 'status while reverting after committing conflict resolution On branch master Revert currently in progress. (run "git revert --continue" to continue) - (use "git revert --skip" to skip this patch) (use "git revert --abort" to cancel the revert operation) nothing to commit (use -u to show untracked files) diff --git a/third_party/git/t/t7513-interpret-trailers.sh b/third_party/git/t/t7513-interpret-trailers.sh index 6602790b5f..f19202b509 100755 --- a/third_party/git/t/t7513-interpret-trailers.sh +++ b/third_party/git/t/t7513-interpret-trailers.sh @@ -1234,7 +1234,7 @@ test_expect_success 'with simple command' ' test_cmp expected actual ' -test_expect_success 'with command using committer information' ' +test_expect_success 'with command using commiter information' ' git config trailer.sign.ifExists "addIfDifferent" && git config trailer.sign.command "echo \"\$GIT_COMMITTER_NAME <\$GIT_COMMITTER_EMAIL>\"" && cat complex_message_body >expected && diff --git a/third_party/git/t/t7519-status-fsmonitor.sh b/third_party/git/t/t7519-status-fsmonitor.sh index fbfdcca000..81a375fa0f 100755 --- a/third_party/git/t/t7519-status-fsmonitor.sh +++ b/third_party/git/t/t7519-status-fsmonitor.sh @@ -32,12 +32,11 @@ write_integration_script () { echo "$0: exactly 2 arguments expected" exit 2 fi - if test "$1" != 2 + if test "$1" != 1 then echo "Unsupported core.fsmonitor hook version." >&2 exit 1 fi - printf "last_update_token\0" printf "untracked\0" printf "dir1/untracked\0" printf "dir2/untracked\0" @@ -107,9 +106,6 @@ EOF # test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor valid bit' ' - write_script .git/hooks/fsmonitor-test<<-\EOF && - printf "last_update_token\0" - EOF git update-index --fsmonitor && git update-index --fsmonitor-valid dir1/modified && git update-index --fsmonitor-valid dir2/modified && @@ -168,9 +164,6 @@ EOF # test that newly added files are marked valid test_expect_success 'newly added files are marked valid' ' - write_script .git/hooks/fsmonitor-test<<-\EOF && - printf "last_update_token\0" - EOF git add new && git add dir1/new && git add dir2/new && @@ -210,7 +203,6 @@ EOF # test that *only* files returned by the integration script get flagged as invalid test_expect_success '*only* files returned by the integration script get flagged as invalid' ' write_script .git/hooks/fsmonitor-test<<-\EOF && - printf "last_update_token\0" printf "dir1/modified\0" EOF clean_repo && @@ -226,12 +218,11 @@ test_expect_success '*only* files returned by the integration script get flagged # Ensure commands that call refresh_index() to move the index back in time # properly invalidate the fsmonitor cache test_expect_success 'refresh_index() invalidates fsmonitor cache' ' + write_script .git/hooks/fsmonitor-test<<-\EOF && + EOF clean_repo && dirty_repo && - write_integration_script && git add . && - write_script .git/hooks/fsmonitor-test<<-\EOF && - EOF git commit -m "to reset" && git reset HEAD~1 && git status >actual && @@ -280,7 +271,6 @@ do # (if enabled) files unless it is told about them. test_expect_success "status doesn't detect unreported modifications" ' write_script .git/hooks/fsmonitor-test<<-\EOF && - printf "last_update_token\0" :>marker EOF clean_repo && @@ -304,7 +294,7 @@ do done done -# test that splitting the index doesn't interfere +# test that splitting the index dosn't interfere test_expect_success 'splitting the index results in the same state' ' write_integration_script && dirty_repo && @@ -364,23 +354,4 @@ test_expect_success 'discard_index() also discards fsmonitor info' ' test_cmp expect actual ' -# Test unstaging entries that: -# - Are not flagged with CE_FSMONITOR_VALID -# - Have a position in the index >= the number of entries present in the index -# after unstaging. -test_expect_success 'status succeeds after staging/unstaging' ' - test_create_repo fsmonitor-stage-unstage && - ( - cd fsmonitor-stage-unstage && - test_commit initial && - git update-index --fsmonitor && - removed=$(test_seq 1 100 | sed "s/^/z/") && - touch $removed && - git add $removed && - git config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-env" && - FSMONITOR_LIST="$removed" git restore -S $removed && - FSMONITOR_LIST="$removed" git status - ) -' - test_done diff --git a/third_party/git/t/t7519/fsmonitor-all b/third_party/git/t/t7519/fsmonitor-all index 94ab66bd3d..691bc94dc2 100755 --- a/third_party/git/t/t7519/fsmonitor-all +++ b/third_party/git/t/t7519/fsmonitor-all @@ -17,6 +17,7 @@ fi if test "$1" != 1 then + echo "Unsupported core.fsmonitor hook version." >&2 exit 1 fi diff --git a/third_party/git/t/t7519/fsmonitor-all-v2 b/third_party/git/t/t7519/fsmonitor-all-v2 deleted file mode 100755 index 061907e88b..0000000000 --- a/third_party/git/t/t7519/fsmonitor-all-v2 +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -# -# An test hook script to integrate with git to test fsmonitor. -# -# The hook is passed a version (currently 2) and since token -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -#echo "$0 $*" >&2 -my ($version, $last_update_token) = @ARGV; - -if ($version ne 2) { - print "Unsupported query-fsmonitor hook version '$version'.\n"; - exit 1; -} - -print "last_update_token\0/\0" diff --git a/third_party/git/t/t7519/fsmonitor-env b/third_party/git/t/t7519/fsmonitor-env deleted file mode 100755 index 8f1f7ab164..0000000000 --- a/third_party/git/t/t7519/fsmonitor-env +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An test hook script to integrate with git to test fsmonitor. -# -# The hook is passed a version (currently 1) and a time in nanoseconds -# formatted as a string and outputs to stdout all files that have been -# modified since the given time. Paths must be relative to the root of -# the working tree and separated by a single NUL. -# -#echo "$0 $*" >&2 - -if test "$#" -ne 2 -then - echo "$0: exactly 2 arguments expected" >&2 - exit 2 -fi - -if test "$1" != 1 -then - echo "Unsupported core.fsmonitor hook version." >&2 - exit 1 -fi - -printf '%s\n' $FSMONITOR_LIST diff --git a/third_party/git/t/t7519/fsmonitor-watchman b/third_party/git/t/t7519/fsmonitor-watchman index 264b9daf83..5514edcf68 100755 --- a/third_party/git/t/t7519/fsmonitor-watchman +++ b/third_party/git/t/t7519/fsmonitor-watchman @@ -23,10 +23,10 @@ my ($version, $time) = @ARGV; if ($version == 1) { # convert nanoseconds to seconds - # subtract one second to make sure watchman will return all changes - $time = int ($time / 1000000000) - 1; + $time = int $time / 1000000000; } else { - exit 1; + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; } my $git_work_tree; @@ -54,12 +54,18 @@ sub launch_watchman { # # To accomplish this, we're using the "since" generator to use the # recency index to select candidate nodes and "fields" to limit the - # output to file names only. + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. my $query = <<" END"; ["query", "$git_work_tree", { "since": $time, - "fields": ["name"] + "fields": ["name"], + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] }] END diff --git a/third_party/git/t/t7519/fsmonitor-watchman-v2 b/third_party/git/t/t7519/fsmonitor-watchman-v2 deleted file mode 100755 index 14ed0aa42d..0000000000 --- a/third_party/git/t/t7519/fsmonitor-watchman-v2 +++ /dev/null @@ -1,173 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; - -# Check the hook interface version -if ($version ne 2) { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree = get_working_dir(); - -my $retry = 1; - -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - -launch_watchman(); - -sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - } - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $last_update_token, - "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] - }] - END - - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; <CHLD_OUT>}; - - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - return $json_pkg->new->utf8->decode($response); -} - -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { - $retry--; - my $response = qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - - eval { launch_watchman() }; - return 0; - } - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} - -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } - - return $working_dir; -} diff --git a/third_party/git/t/t7526-commit-pathspec-file.sh b/third_party/git/t/t7526-commit-pathspec-file.sh deleted file mode 100755 index 5fbe47ebcd..0000000000 --- a/third_party/git/t/t7526-commit-pathspec-file.sh +++ /dev/null @@ -1,164 +0,0 @@ -#!/bin/sh - -test_description='commit --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - test_commit file0 && - git tag checkpoint && - - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t -' - -restore_checkpoint () { - git reset --soft checkpoint -} - -verify_expect () { - git diff-tree --no-commit-id --name-status -r HEAD >actual && - test_cmp expect actual -} - -test_expect_success '--pathspec-from-file from stdin' ' - restore_checkpoint && - - echo fileA.t | git commit --pathspec-from-file=- -m "Commit" && - - cat >expect <<-\EOF && - A fileA.t - EOF - verify_expect -' - -test_expect_success '--pathspec-from-file from file' ' - restore_checkpoint && - - echo fileA.t >list && - git commit --pathspec-from-file=list -m "Commit" && - - cat >expect <<-\EOF && - A fileA.t - EOF - verify_expect -' - -test_expect_success 'NUL delimiters' ' - restore_checkpoint && - - printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'LF delimiters' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'no trailing delimiter' ' - restore_checkpoint && - - printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'CRLF delimiters' ' - restore_checkpoint && - - printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" && - - cat >expect <<-\EOF && - A fileA.t - A fileB.t - EOF - verify_expect -' - -test_expect_success 'quotes' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - git commit --pathspec-from-file=list -m "Commit" && - - cat >expect <<-\EOF && - A fileA.t - EOF - verify_expect expect -' - -test_expect_success 'quotes not compatible with --pathspec-file-nul' ' - restore_checkpoint && - - cat >list <<-\EOF && - "file\101.t" - EOF - - test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit" -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" && - - cat >expect <<-\EOF && - A fileB.t - A fileC.t - EOF - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo fileA.t >list && - >empty_list && - - test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err && - - test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" err && - - test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err && - test_i18ngrep -e "--pathspec-from-file with -a does not make sense" err && - - test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err && - - test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err && - test_i18ngrep -e "No paths with --include/--only does not make sense." err && - - test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err && - test_i18ngrep -e "No paths with --include/--only does not make sense." err -' - -test_done diff --git a/third_party/git/t/t7612-merge-verify-signatures.sh b/third_party/git/t/t7612-merge-verify-signatures.sh index a426f3a89a..d99218a725 100755 --- a/third_party/git/t/t7612-merge-verify-signatures.sh +++ b/third_party/git/t/t7612-merge-verify-signatures.sh @@ -66,20 +66,6 @@ test_expect_success GPG 'merge commit with untrusted signature with verification test_i18ngrep "has an untrusted GPG signature" mergeerror ' -test_expect_success GPG 'merge commit with untrusted signature with verification and high minTrustLevel' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel marginal && - test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror && - test_i18ngrep "has an untrusted GPG signature" mergeerror -' - -test_expect_success GPG 'merge commit with untrusted signature with verification and low minTrustLevel' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config gpg.minTrustLevel undefined && - git merge --ff-only --verify-signatures side-untrusted >mergeoutput && - test_i18ngrep "has a good GPG signature" mergeoutput -' - test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' ' test_when_finished "git reset --hard && git checkout initial" && test_config merge.verifySignatures true && @@ -87,14 +73,6 @@ test_expect_success GPG 'merge commit with untrusted signature with merge.verify test_i18ngrep "has an untrusted GPG signature" mergeerror ' -test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel' ' - test_when_finished "git reset --hard && git checkout initial" && - test_config merge.verifySignatures true && - test_config gpg.minTrustLevel marginal && - test_must_fail git merge --ff-only side-untrusted 2>mergeerror && - test_i18ngrep "has an untrusted GPG signature" mergeerror -' - test_expect_success GPG 'merge signed commit with verification' ' test_when_finished "git reset --hard && git checkout initial" && git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput && diff --git a/third_party/git/t/t7700-repack.sh b/third_party/git/t/t7700-repack.sh index 25b235c063..4e855bc21b 100755 --- a/third_party/git/t/t7700-repack.sh +++ b/third_party/git/t/t7700-repack.sh @@ -4,104 +4,129 @@ test_description='git repack works correctly' . ./test-lib.sh -commit_and_pack () { - test_commit "$@" 1>&2 && - incrpackid=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) && - echo pack-${incrpackid}.pack -} - -test_no_missing_in_packs () { - myidx=$(ls -1 .git/objects/pack/*.idx) && - test_path_is_file "$myidx" && - git verify-pack -v alt_objects/pack/*.idx >orig.raw && - sed -n -e "s/^\($OID_REGEX\).*/\1/p" orig.raw | sort >orig && - git verify-pack -v $myidx >dest.raw && - cut -d" " -f1 dest.raw | sort >dest && - comm -23 orig dest >missing && - test_must_be_empty missing -} - -# we expect $packid and $oid to be defined -test_has_duplicate_object () { - want_duplicate_object="$1" - found_duplicate_object=false - for p in .git/objects/pack/*.idx - do - idx=$(basename $p) - test "pack-$packid.idx" = "$idx" && continue - git verify-pack -v $p >packlist || return $? - if grep "^$oid" packlist - then - found_duplicate_object=true - echo "DUPLICATE OBJECT FOUND" - break - fi - done && - test "$want_duplicate_object" = "$found_duplicate_object" +commit_and_pack() { + test_commit "$@" >/dev/null && + SHA1=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) && + echo pack-${SHA1}.pack } test_expect_success 'objects in packs marked .keep are not repacked' ' - echo content1 >file1 && - echo content2 >file2 && + echo content1 > file1 && + echo content2 > file2 && git add . && test_tick && git commit -m initial_commit && # Create two packs # The first pack will contain all of the objects except one - git rev-list --objects --all >objs && - grep -v file2 objs | git pack-objects pack && + git rev-list --objects --all | grep -v file2 | + git pack-objects pack > /dev/null && # The second pack will contain the excluded object - packid=$(grep file2 objs | git pack-objects pack) && - >pack-$packid.keep && - git verify-pack -v pack-$packid.idx >packlist && - oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") && + packsha1=$(git rev-list --objects --all | grep file2 | + git pack-objects pack) && + >pack-$packsha1.keep && + objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 | + sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") && mv pack-* .git/objects/pack/ && git repack -A -d -l && git prune-packed && - test_has_duplicate_object false + for p in .git/objects/pack/*.idx; do + idx=$(basename $p) + test "pack-$packsha1.idx" = "$idx" && continue + if git verify-pack -v $p | egrep "^$objsha1"; then + found_duplicate_object=1 + echo "DUPLICATE OBJECT FOUND" + break + fi + done && + test -z "$found_duplicate_object" ' test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' ' - # build on $oid, $packid, and .keep state from previous + # build on $objsha1, $packsha1, and .keep state from previous git repack -Adbl && - test_has_duplicate_object true + test_when_finished "found_duplicate_object=" && + for p in .git/objects/pack/*.idx; do + idx=$(basename $p) + test "pack-$packsha1.idx" = "$idx" && continue + if git verify-pack -v $p | egrep "^$objsha1"; then + found_duplicate_object=1 + echo "DUPLICATE OBJECT FOUND" + break + fi + done && + test "$found_duplicate_object" = 1 ' test_expect_success 'writing bitmaps via config can duplicate .keep objects' ' - # build on $oid, $packid, and .keep state from previous + # build on $objsha1, $packsha1, and .keep state from previous git -c repack.writebitmaps=true repack -Adl && - test_has_duplicate_object true + test_when_finished "found_duplicate_object=" && + for p in .git/objects/pack/*.idx; do + idx=$(basename $p) + test "pack-$packsha1.idx" = "$idx" && continue + if git verify-pack -v $p | egrep "^$objsha1"; then + found_duplicate_object=1 + echo "DUPLICATE OBJECT FOUND" + break + fi + done && + test "$found_duplicate_object" = 1 ' test_expect_success 'loose objects in alternate ODB are not repacked' ' mkdir alt_objects && - echo $(pwd)/alt_objects >.git/objects/info/alternates && - echo content3 >file3 && - oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) && + echo $(pwd)/alt_objects > .git/objects/info/alternates && + echo content3 > file3 && + objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) && git add file3 && test_tick && git commit -m commit_file3 && git repack -a -d -l && git prune-packed && - test_has_duplicate_object false + for p in .git/objects/pack/*.idx; do + if git verify-pack -v $p | egrep "^$objsha1"; then + found_duplicate_object=1 + echo "DUPLICATE OBJECT FOUND" + break + fi + done && + test -z "$found_duplicate_object" ' test_expect_success 'packed obs in alt ODB are repacked even when local repo is packless' ' mkdir alt_objects/pack && mv .git/objects/pack/* alt_objects/pack && git repack -a && - test_no_missing_in_packs + myidx=$(ls -1 .git/objects/pack/*.idx) && + test -f "$myidx" && + for p in alt_objects/pack/*.idx; do + git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" + done | while read sha1 rest; do + if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then + echo "Missing object in local pack: $sha1" + return 1 + fi + done ' test_expect_success 'packed obs in alt ODB are repacked when local repo has packs' ' rm -f .git/objects/pack/* && - echo new_content >>file1 && + echo new_content >> file1 && git add file1 && test_tick && git commit -m more_content && git repack && git repack -a -d && - test_no_missing_in_packs + myidx=$(ls -1 .git/objects/pack/*.idx) && + test -f "$myidx" && + for p in alt_objects/pack/*.idx; do + git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" + done | while read sha1 rest; do + if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then + echo "Missing object in local pack: $sha1" + return 1 + fi + done ' test_expect_success 'packed obs in alternate ODB kept pack are repacked' ' @@ -109,7 +134,7 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' ' for p in alt_objects/pack/*.pack do base_name=$(basename $p .pack) && - if test_path_is_file alt_objects/pack/$base_name.keep + if test -f alt_objects/pack/$base_name.keep then rm alt_objects/pack/$base_name.keep else @@ -117,13 +142,22 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' ' fi done && git repack -a -d && - test_no_missing_in_packs + myidx=$(ls -1 .git/objects/pack/*.idx) && + test -f "$myidx" && + for p in alt_objects/pack/*.idx; do + git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p" + done | while read sha1 rest; do + if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then + echo "Missing object in local pack: $sha1" + return 1 + fi + done ' test_expect_success 'packed unreachable obs in alternate ODB are not loosened' ' rm -f alt_objects/pack/*.keep && mv .git/objects/pack/* alt_objects/pack/ && - coid=$(git rev-parse HEAD^{commit}) && + csha1=$(git rev-parse HEAD^{commit}) && git reset --hard HEAD^ && test_tick && git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all && @@ -133,15 +167,15 @@ test_expect_success 'packed unreachable obs in alternate ODB are not loosened' ' --unpack-unreachable </dev/null pack && rm -f .git/objects/pack/* && mv pack-* .git/objects/pack/ && - git verify-pack -v -- .git/objects/pack/*.idx >packlist && - ! grep "^$coid " packlist && - echo >.git/objects/info/alternates && - test_must_fail git show $coid + test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx | + egrep "^$csha1 " | sort | uniq | wc -l) && + echo > .git/objects/info/alternates && + test_must_fail git show $csha1 ' test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' ' - echo $(pwd)/alt_objects >.git/objects/info/alternates && - echo "$coid" | git pack-objects --non-empty --all --reflog pack && + echo $(pwd)/alt_objects > .git/objects/info/alternates && + echo "$csha1" | git pack-objects --non-empty --all --reflog pack && rm -f .git/objects/pack/* && mv pack-* .git/objects/pack/ && # The pack-objects call on the next line is equivalent to @@ -150,10 +184,10 @@ test_expect_success 'local packed unreachable obs that exist in alternate ODB ar --unpack-unreachable </dev/null pack && rm -f .git/objects/pack/* && mv pack-* .git/objects/pack/ && - git verify-pack -v -- .git/objects/pack/*.idx >packlist && - ! grep "^$coid " && - echo >.git/objects/info/alternates && - test_must_fail git show $coid + test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx | + egrep "^$csha1 " | sort | uniq | wc -l) && + echo > .git/objects/info/alternates && + test_must_fail git show $csha1 ' test_expect_success 'objects made unreachable by grafts only are kept' ' @@ -162,7 +196,7 @@ test_expect_success 'objects made unreachable by grafts only are kept' ' H0=$(git rev-parse HEAD) && H1=$(git rev-parse HEAD^) && H2=$(git rev-parse HEAD^^) && - echo "$H0 $H2" >.git/info/grafts && + echo "$H0 $H2" > .git/info/grafts && git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all && git repack -a -d && git cat-file -t $H1 @@ -201,7 +235,7 @@ test_expect_success 'incremental repack does not complain' ' test_expect_success 'bitmaps can be disabled on bare repos' ' git -c repack.writeBitmaps=false -C bare.git repack -ad && - bitmap=$(ls bare.git/objects/pack/*.bitmap || :) && + bitmap=$(ls bare.git/objects/pack/*.bitmap 2>/dev/null || :) && test -z "$bitmap" ' diff --git a/third_party/git/t/t7800-difftool.sh b/third_party/git/t/t7800-difftool.sh index 29b92907e2..6bac9ed180 100755 --- a/third_party/git/t/t7800-difftool.sh +++ b/third_party/git/t/t7800-difftool.sh @@ -125,14 +125,15 @@ test_expect_success 'difftool stops on error with --trust-exit-code' ' test_when_finished "rm -f for-diff .git/fail-right-file" && test_when_finished "git reset -- for-diff" && write_script .git/fail-right-file <<-\EOF && - echo failed + echo "$2" exit 1 EOF >for-diff && git add for-diff && + echo file >expect && test_must_fail git difftool -y --trust-exit-code \ --extcmd .git/fail-right-file branch >actual && - test_line_count = 1 actual + test_cmp expect actual ' test_expect_success 'difftool honors exit status if command not found' ' diff --git a/third_party/git/t/t7811-grep-open.sh b/third_party/git/t/t7811-grep-open.sh index a98785da79..d1ebfd88c7 100755 --- a/third_party/git/t/t7811-grep-open.sh +++ b/third_party/git/t/t7811-grep-open.sh @@ -113,6 +113,7 @@ test_expect_success 'modified file' ' subdir/grep.c unrelated EOF + >empty && echo "enum grep_pat_token" >unrelated && test_when_finished "git checkout HEAD unrelated" && diff --git a/third_party/git/t/t7812-grep-icase-non-ascii.sh b/third_party/git/t/t7812-grep-icase-non-ascii.sh index 03dba6685a..0c685d3598 100755 --- a/third_party/git/t/t7812-grep-icase-non-ascii.sh +++ b/third_party/git/t/t7812-grep-icase-non-ascii.sh @@ -53,35 +53,4 @@ test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' ' test_cmp expected actual ' -test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: setup invalid UTF-8 data' ' - printf "\\200\\n" >invalid-0x80 && - echo "ævar" >expected && - cat expected >>invalid-0x80 && - git add invalid-0x80 -' - -test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data' ' - git grep -h "var" invalid-0x80 >actual && - test_cmp expected actual && - git grep -h "(*NO_JIT)var" invalid-0x80 >actual && - test_cmp expected actual -' - -test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' ' - git grep -h "æ" invalid-0x80 >actual && - test_cmp expected actual && - git grep -h "(*NO_JIT)æ" invalid-0x80 >actual && - test_cmp expected actual -' - -test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' ' - test_might_fail git grep -hi "Æ" invalid-0x80 >actual && - if test -s actual - then - test_cmp expected actual - fi && - test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual && - ! test_cmp expected actual -' - test_done diff --git a/third_party/git/t/t7814-grep-recurse-submodules.sh b/third_party/git/t/t7814-grep-recurse-submodules.sh index 828cb3ba58..a11366b4ce 100755 --- a/third_party/git/t/t7814-grep-recurse-submodules.sh +++ b/third_party/git/t/t7814-grep-recurse-submodules.sh @@ -345,16 +345,7 @@ test_incompatible_with_recurse_submodules () } test_incompatible_with_recurse_submodules --untracked - -test_expect_success 'grep --recurse-submodules --no-index ignores --recurse-submodules' ' - git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual && - cat >expect <<-\EOF && - a:(1|2)d(3|4) - submodule/a:(1|2)d(3|4) - submodule/sub/a:(1|2)d(3|4) - EOF - test_cmp expect actual -' +test_incompatible_with_recurse_submodules --no-index test_expect_success 'grep --recurse-submodules should pass the pattern type along' ' # Fixed @@ -417,25 +408,4 @@ test_expect_success 'grep --recurse-submodules with submodules without .gitmodul test_cmp expect actual ' -reset_and_clean () { - git reset --hard && - git clean -fd && - git submodule foreach --recursive 'git reset --hard' && - git submodule foreach --recursive 'git clean -fd' -} - -test_expect_success 'grep --recurse-submodules without --cached considers worktree modifications' ' - reset_and_clean && - echo "A modified line in submodule" >>submodule/a && - echo "submodule/a:A modified line in submodule" >expect && - git grep --recurse-submodules "A modified line in submodule" >actual && - test_cmp expect actual -' - -test_expect_success 'grep --recurse-submodules with --cached ignores worktree modifications' ' - reset_and_clean && - echo "A modified line in submodule" >>submodule/a && - test_must_fail git grep --recurse-submodules --cached "A modified line in submodule" >actual 2>&1 && - test_must_be_empty actual -' test_done diff --git a/third_party/git/t/t7816-grep-binary-pattern.sh b/third_party/git/t/t7816-grep-binary-pattern.sh deleted file mode 100755 index 60bab291e4..0000000000 --- a/third_party/git/t/t7816-grep-binary-pattern.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh - -test_description='git grep with a binary pattern files' - -. ./lib-gettext.sh - -nul_match_internal () { - matches=$1 - prereqs=$2 - lc_all=$3 - extra_flags=$4 - flags=$5 - pattern=$6 - pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g') - - if test "$matches" = 1 - then - test_expect_success $prereqs "LC_ALL='$lc_all' git grep $extra_flags -f f $flags '$pattern_human' a" " - printf '$pattern' | q_to_nul >f && - LC_ALL='$lc_all' git grep $extra_flags -f f $flags a - " - elif test "$matches" = 0 - then - test_expect_success $prereqs "LC_ALL='$lc_all' git grep $extra_flags -f f $flags '$pattern_human' a" " - >stderr && - printf '$pattern' | q_to_nul >f && - test_must_fail env LC_ALL=\"$lc_all\" git grep $extra_flags -f f $flags a 2>stderr && - test_i18ngrep ! 'This is only supported with -P under PCRE v2' stderr - " - elif test "$matches" = P - then - test_expect_success $prereqs "error, PCRE v2 only: LC_ALL='$lc_all' git grep -f f $flags '$pattern_human' a" " - >stderr && - printf '$pattern' | q_to_nul >f && - test_must_fail env LC_ALL=\"$lc_all\" git grep -f f $flags a 2>stderr && - test_i18ngrep 'This is only supported with -P under PCRE v2' stderr - " - else - test_expect_success "PANIC: Test framework error. Unknown matches value $matches" 'false' - fi -} - -nul_match () { - matches=$1 - matches_pcre2=$2 - matches_pcre2_locale=$3 - flags=$4 - pattern=$5 - pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g') - - nul_match_internal "$matches" "" "C" "" "$flags" "$pattern" - nul_match_internal "$matches_pcre2" "LIBPCRE2" "C" "-P" "$flags" "$pattern" - nul_match_internal "$matches_pcre2_locale" "LIBPCRE2,GETTEXT_LOCALE" "$is_IS_locale" "-P" "$flags" "$pattern" -} - -test_expect_success 'setup' " - echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a && - git add a && - git commit -m. -" - -# Simple fixed-string matching that can use kwset (no -i && non-ASCII) -nul_match P P P '-F' 'yQf' -nul_match P P P '-F' 'yQx' -nul_match P P P '-Fi' 'YQf' -nul_match P P P '-Fi' 'YQx' -nul_match P P 1 '' 'yQf' -nul_match P P 0 '' 'yQx' -nul_match P P 1 '' 'æQð' -nul_match P P P '-F' 'eQm[*]c' -nul_match P P P '-Fi' 'EQM[*]C' - -# Regex patterns that would match but shouldn't with -F -nul_match P P P '-F' 'yQ[f]' -nul_match P P P '-F' '[y]Qf' -nul_match P P P '-Fi' 'YQ[F]' -nul_match P P P '-Fi' '[Y]QF' -nul_match P P P '-F' 'æQ[ð]' -nul_match P P P '-F' '[æ]Qð' - -# The -F kwset codepath can't handle -i && non-ASCII... -nul_match P 1 1 '-i' '[æ]Qð' - -# ...PCRE v2 only matches non-ASCII with -i casefolding under UTF-8 -# semantics -nul_match P P P '-Fi' 'ÆQ[Ð]' -nul_match P 0 1 '-i' 'ÆQ[Ð]' -nul_match P 0 1 '-i' '[Æ]QÐ' -nul_match P 0 1 '-i' '[Æ]Qð' -nul_match P 0 1 '-i' 'ÆQÐ' - -# \0 in regexes can only work with -P & PCRE v2 -nul_match P P 1 '' 'yQ[f]' -nul_match P P 1 '' '[y]Qf' -nul_match P P 1 '-i' 'YQ[F]' -nul_match P P 1 '-i' '[Y]Qf' -nul_match P P 1 '' 'æQ[ð]' -nul_match P P 1 '' '[æ]Qð' -nul_match P P 1 '-i' 'ÆQ[Ð]' -nul_match P P 1 '' 'eQm.*cQ' -nul_match P P 1 '-i' 'EQM.*cQ' -nul_match P P 0 '' 'eQm[*]c' -nul_match P P 0 '-i' 'EQM[*]C' - -# Assert that we're using REG_STARTEND and the pattern doesn't match -# just because it's cut off at the first \0. -nul_match P P 0 '-i' 'NOMATCHQð' -nul_match P P 0 '-i' '[Æ]QNOMATCH' -nul_match P P 0 '-i' '[æ]QNOMATCH' - -# Ensure that the matcher doesn't regress to something that stops at -# \0 -nul_match P P P '-F' 'yQ[f]' -nul_match P P P '-Fi' 'YQ[F]' -nul_match P P 0 '' 'yQNOMATCH' -nul_match P P 0 '' 'QNOMATCH' -nul_match P P 0 '-i' 'YQNOMATCH' -nul_match P P 0 '-i' 'QNOMATCH' -nul_match P P P '-F' 'æQ[ð]' -nul_match P P P '-Fi' 'ÆQ[Ð]' -nul_match P P 1 '-i' 'ÆQ[Ð]' -nul_match P P 0 '' 'yQNÓMATCH' -nul_match P P 0 '' 'QNÓMATCH' -nul_match P P 0 '-i' 'YQNÓMATCH' -nul_match P P 0 '-i' 'QNÓMATCH' - -test_done diff --git a/third_party/git/t/t8003-blame-corner-cases.sh b/third_party/git/t/t8003-blame-corner-cases.sh index 9130b887d2..1c5fb1d1f8 100755 --- a/third_party/git/t/t8003-blame-corner-cases.sh +++ b/third_party/git/t/t8003-blame-corner-cases.sh @@ -173,6 +173,7 @@ test_expect_success 'blame during cherry-pick with file rename conflict' ' git show HEAD@{1}:rodent > rodent && git add rodent && git blame -f -C -C1 rodent | sed -e "$pick_fc" >current && + cat current && cat >expected <<-\EOF && mouse-Initial mouse-Second diff --git a/third_party/git/t/t9001-send-email.sh b/third_party/git/t/t9001-send-email.sh index 90f61c3400..997f90b42b 100755 --- a/third_party/git/t/t9001-send-email.sh +++ b/third_party/git/t/t9001-send-email.sh @@ -1194,8 +1194,8 @@ test_expect_success $PREREQ 'in-reply-to but no threading' ' --to=nobody@example.com \ --in-reply-to="<in-reply-id@example.com>" \ --no-thread \ - $patches >out && - grep "In-Reply-To: <in-reply-id@example.com>" out + $patches | + grep "In-Reply-To: <in-reply-id@example.com>" ' test_expect_success $PREREQ 'no in-reply-to and no threading' ' @@ -1260,7 +1260,7 @@ test_expect_success $PREREQ 'sendemail.identity: --no-identity clears previous i grep "To: default@example.com" stdout ' -test_expect_success $PREREQ 'sendemail.identity: bool identity variable existence overrides' ' +test_expect_success $PREREQ 'sendemail.identity: bool identity variable existance overrides' ' git -c sendemail.identity=cloud \ -c sendemail.xmailer=true \ -c sendemail.cloud.xmailer=false \ @@ -2066,7 +2066,7 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' ' TO1=$(echo "QTo 1 <to1@example.com>" | q_to_tab) && TO2=$(echo "QZto2" | qz_to_tab_space) && CC1=$(echo "cc1" | append_cr) && - BCC1=$(echo " bcc1@example.com Q" | q_to_nul) && + BCC1=$(echo "Q bcc1@example.com Q" | q_to_nul) && git send-email \ --dry-run \ --from=" Example <from@example.com>" \ diff --git a/third_party/git/t/t9010-svn-fe.sh b/third_party/git/t/t9010-svn-fe.sh index c90fdc5c89..0b20b07e68 100755 --- a/third_party/git/t/t9010-svn-fe.sh +++ b/third_party/git/t/t9010-svn-fe.sh @@ -53,6 +53,8 @@ text_no_props () { printf "%s\n" "$text" } +>empty + test_expect_success 'empty dump' ' reinit_git && echo "SVN-fs-dump-format-version: 2" >input && @@ -206,7 +208,7 @@ test_expect_failure 'timestamp and empty file' ' test_cmp expect.date actual.date && test_cmp expect.files actual.files && git checkout HEAD empty-file && - test_must_be_empty file + test_cmp empty file ' test_expect_success 'directory with files' ' diff --git a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh b/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh index aec45bca3b..dbe8deac0d 100755 --- a/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh +++ b/third_party/git/t/t9106-git-svn-commit-diff-clobber.sh @@ -92,8 +92,7 @@ test_expect_success 'multiple dcommit from git svn will not clobber svn' " test_expect_success 'check that rebase really failed' ' - git status >output && - grep currently.rebasing output + test -d .git/rebase-apply ' test_expect_success 'resolve, continue the rebase and dcommit' " diff --git a/third_party/git/t/t9116-git-svn-log.sh b/third_party/git/t/t9116-git-svn-log.sh index 0a9f1ef366..45773ee560 100755 --- a/third_party/git/t/t9116-git-svn-log.sh +++ b/third_party/git/t/t9116-git-svn-log.sh @@ -43,18 +43,14 @@ test_expect_success 'setup repository and import' ' test_expect_success 'run log' " git reset --hard origin/a && - git svn log -r2 origin/trunk >out && - grep ^r2 out && - git svn log -r4 origin/trunk >out && - grep ^r4 out && - git svn log -r3 >out && - grep ^r3 out + git svn log -r2 origin/trunk | grep ^r2 && + git svn log -r4 origin/trunk | grep ^r4 && + git svn log -r3 | grep ^r3 " test_expect_success 'run log against a from trunk' " git reset --hard origin/trunk && - git svn log -r3 origin/a >out && - grep ^r3 out + git svn log -r3 origin/a | grep ^r3 " printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4 diff --git a/third_party/git/t/t9300-fast-import.sh b/third_party/git/t/t9300-fast-import.sh index 3e41c58a13..141b7fa35e 100755 --- a/third_party/git/t/t9300-fast-import.sh +++ b/third_party/git/t/t9300-fast-import.sh @@ -85,36 +85,6 @@ test_expect_success 'A: create pack from stdin' ' An annotated tag that annotates a blob. EOF - tag to-be-deleted - from :3 - data <<EOF - Another annotated tag that annotates a blob. - EOF - - reset refs/tags/to-be-deleted - from 0000000000000000000000000000000000000000 - - tag nested - mark :6 - from :4 - data <<EOF - Tag of our lovely commit - EOF - - reset refs/tags/nested - from 0000000000000000000000000000000000000000 - - tag nested - mark :7 - from :6 - data <<EOF - Tag of tag of our lovely commit - EOF - - alias - mark :8 - to :5 - INPUT_END git fast-import --export-marks=marks.out <input && git whatchanged master @@ -187,19 +157,12 @@ test_expect_success 'A: verify tag/series-A-blob' ' test_cmp expect actual ' -test_expect_success 'A: verify tag deletion is successful' ' - test_must_fail git rev-parse --verify refs/tags/to-be-deleted -' - test_expect_success 'A: verify marks output' ' cat >expect <<-EOF && :2 $(git rev-parse --verify master:file2) :3 $(git rev-parse --verify master:file3) :4 $(git rev-parse --verify master:file4) :5 $(git rev-parse --verify master^0) - :6 $(git cat-file tag nested | grep object | cut -d" " -f 2) - :7 $(git rev-parse --verify nested) - :8 $(git rev-parse --verify master^0) EOF test_cmp expect marks.out ' @@ -1047,6 +1010,7 @@ test_expect_success 'M: rename root to subdirectory' ' EOF git fast-import <input && git diff-tree -M -r M4^ M4 >actual && + cat actual && compare_diff_raw expect actual ' @@ -2142,27 +2106,12 @@ test_expect_success 'R: abort on receiving feature after data command' ' test_must_fail git fast-import <input ' -test_expect_success 'R: import-marks features forbidden by default' ' - >git.marks && - echo "feature import-marks=git.marks" >input && - test_must_fail git fast-import <input && - echo "feature import-marks-if-exists=git.marks" >input && - test_must_fail git fast-import <input -' - test_expect_success 'R: only one import-marks feature allowed per stream' ' - >git.marks && - >git2.marks && cat >input <<-EOF && feature import-marks=git.marks feature import-marks=git2.marks EOF - test_must_fail git fast-import --allow-unsafe-features <input -' - -test_expect_success 'R: export-marks feature forbidden by default' ' - echo "feature export-marks=git.marks" >input && test_must_fail git fast-import <input ' @@ -2176,29 +2125,19 @@ test_expect_success 'R: export-marks feature results in a marks file being creat EOF - git fast-import --allow-unsafe-features <input && + cat input | git fast-import && grep :1 git.marks ' test_expect_success 'R: export-marks options can be overridden by commandline options' ' - cat >input <<-\EOF && - feature export-marks=feature-sub/git.marks - blob - mark :1 - data 3 - hi - - EOF - git fast-import --allow-unsafe-features \ - --export-marks=cmdline-sub/other.marks <input && - grep :1 cmdline-sub/other.marks && - test_path_is_missing feature-sub + cat input | git fast-import --export-marks=other.marks && + grep :1 other.marks ' test_expect_success 'R: catch typo in marks file name' ' test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null && echo "feature import-marks=nonexistent.marks" | - test_must_fail git fast-import --allow-unsafe-features + test_must_fail git fast-import ' test_expect_success 'R: import and output marks can be the same file' ' @@ -2253,8 +2192,7 @@ test_expect_success 'R: --import-marks-if-exists' ' test_expect_success 'R: feature import-marks-if-exists' ' rm -f io.marks && - git fast-import --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && + git fast-import --export-marks=io.marks <<-\EOF && feature import-marks-if-exists=not_io.marks EOF test_must_be_empty io.marks && @@ -2265,8 +2203,7 @@ test_expect_success 'R: feature import-marks-if-exists' ' echo ":1 $blob" >expect && echo ":2 $blob" >>expect && - git fast-import --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && + git fast-import --export-marks=io.marks <<-\EOF && feature import-marks-if-exists=io.marks blob mark :2 @@ -2279,8 +2216,7 @@ test_expect_success 'R: feature import-marks-if-exists' ' echo ":3 $blob" >>expect && git fast-import --import-marks=io.marks \ - --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && + --export-marks=io.marks <<-\EOF && feature import-marks-if-exists=not_io.marks blob mark :3 @@ -2291,8 +2227,7 @@ test_expect_success 'R: feature import-marks-if-exists' ' test_cmp expect io.marks && git fast-import --import-marks-if-exists=not_io.marks \ - --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && + --export-marks=io.marks <<-\EOF && feature import-marks-if-exists=io.marks EOF test_must_be_empty io.marks @@ -2304,7 +2239,7 @@ test_expect_success 'R: import to output marks works without any content' ' feature export-marks=marks.new EOF - git fast-import --allow-unsafe-features <input && + cat input | git fast-import && test_cmp marks.out marks.new ' @@ -2314,7 +2249,7 @@ test_expect_success 'R: import marks prefers commandline marks file over the str feature export-marks=marks.new EOF - git fast-import --import-marks=marks.out --allow-unsafe-features <input && + cat input | git fast-import --import-marks=marks.out && test_cmp marks.out marks.new ' @@ -2327,8 +2262,7 @@ test_expect_success 'R: multiple --import-marks= should be honoured' ' head -n2 marks.out > one.marks && tail -n +3 marks.out > two.marks && - git fast-import --import-marks=one.marks --import-marks=two.marks \ - --allow-unsafe-features <input && + git fast-import --import-marks=one.marks --import-marks=two.marks <input && test_cmp marks.out combined.marks ' @@ -2341,7 +2275,7 @@ test_expect_success 'R: feature relative-marks should be honoured' ' mkdir -p .git/info/fast-import/ && cp marks.new .git/info/fast-import/relative.in && - git fast-import --allow-unsafe-features <input && + git fast-import <input && test_cmp marks.new .git/info/fast-import/relative.out ' @@ -2353,7 +2287,7 @@ test_expect_success 'R: feature no-relative-marks should be honoured' ' feature export-marks=non-relative.out EOF - git fast-import --allow-unsafe-features <input && + git fast-import <input && test_cmp marks.new non-relative.out ' @@ -2506,6 +2440,9 @@ test_expect_success PIPE 'R: copy using cat-file' ' echo $expect_id blob $expect_len >expect.response && rm -f blobs && + cat >frontend <<-\FRONTEND_END && + #!/bin/sh + FRONTEND_END mkfifo blobs && ( @@ -2620,7 +2557,7 @@ test_expect_success 'R: quiet option results in no stats being output' ' EOF - git fast-import 2>output <input && + cat input | git fast-import 2> output && test_must_be_empty output ' @@ -2844,6 +2781,7 @@ test_expect_success 'S: filemodify with garbage after mark must fail' ' COMMIT M 100644 :403x hello.c EOF + cat err && test_i18ngrep "space after mark" err ' @@ -2860,6 +2798,7 @@ test_expect_success 'S: filemodify with garbage after inline must fail' ' inline BLOB EOF + cat err && test_i18ngrep "nvalid dataref" err ' @@ -2873,6 +2812,7 @@ test_expect_success 'S: filemodify with garbage after sha1 must fail' ' COMMIT M 100644 ${sha1}x hello.c EOF + cat err && test_i18ngrep "space after SHA1" err ' @@ -2888,6 +2828,7 @@ test_expect_success 'S: notemodify with garbage after mark dataref must fail' ' COMMIT N :202x :302 EOF + cat err && test_i18ngrep "space after mark" err ' @@ -2903,6 +2844,7 @@ test_expect_success 'S: notemodify with garbage after inline dataref must fail' note blob BLOB EOF + cat err && test_i18ngrep "nvalid dataref" err ' @@ -2916,6 +2858,7 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' ' COMMIT N ${sha1}x :302 EOF + cat err && test_i18ngrep "space after SHA1" err ' @@ -2931,6 +2874,7 @@ test_expect_success 'S: notemodify with garbage after mark commit-ish must fail' COMMIT N :202 :302x EOF + cat err && test_i18ngrep "after mark" err ' @@ -2964,6 +2908,7 @@ test_expect_success 'S: from with garbage after mark must fail' ' EOF # now evaluate the error + cat err && test_i18ngrep "after mark" err ' @@ -2983,6 +2928,7 @@ test_expect_success 'S: merge with garbage after mark must fail' ' merge :303x M 100644 :403 hello.c EOF + cat err && test_i18ngrep "after mark" err ' @@ -2998,6 +2944,7 @@ test_expect_success 'S: tag with garbage after mark must fail' ' tag S TAG EOF + cat err && test_i18ngrep "after mark" err ' @@ -3008,6 +2955,7 @@ test_expect_success 'S: cat-blob with garbage after mark must fail' ' test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && cat-blob :403x EOF + cat err && test_i18ngrep "after mark" err ' @@ -3018,6 +2966,7 @@ test_expect_success 'S: ls with garbage after mark must fail' ' test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && ls :302x hello.c EOF + cat err && test_i18ngrep "space after mark" err ' @@ -3026,6 +2975,7 @@ test_expect_success 'S: ls with garbage after sha1 must fail' ' test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && ls ${sha1}x hello.c EOF + cat err && test_i18ngrep "space after tree-ish" err ' @@ -3190,22 +3140,13 @@ background_import_then_checkpoint () { exec 9<>V.output rm V.output - ( - git fast-import $options <&8 >&9 & - echo $! >&9 - wait $! - echo >&2 "background fast-import terminated too early with exit code $?" - # Un-block the read loop in the main shell process. - echo >&9 UNEXPECTED - ) & - sh_pid=$! - read fi_pid <&9 + git fast-import $options <&8 >&9 & + echo $! >V.pid # We don't mind if fast-import has already died by the time the test # ends. test_when_finished " exec 8>&-; exec 9>&-; - kill $sh_pid && wait $sh_pid - kill $fi_pid && wait $fi_pid + kill $(cat V.pid) && wait $(cat V.pid) true" # Start in the background to ensure we adhere strictly to (blocking) @@ -3225,9 +3166,6 @@ background_import_then_checkpoint () { then error=0 break - elif test "$output" = "UNEXPECTED" - then - break fi # otherwise ignore cruft echo >&2 "cruft: $output" @@ -3240,7 +3178,7 @@ background_import_then_checkpoint () { } background_import_still_running () { - if ! kill -0 "$fi_pid" + if ! kill -0 "$(cat V.pid)" then echo >&2 "background fast-import terminated too early" false diff --git a/third_party/git/t/t9301-fast-import-notes.sh b/third_party/git/t/t9301-fast-import-notes.sh index ca223dca98..dadc70b7d5 100755 --- a/third_party/git/t/t9301-fast-import-notes.sh +++ b/third_party/git/t/t9301-fast-import-notes.sh @@ -275,7 +275,7 @@ $whitespace third note for first commit EXPECT_END -test_expect_success 'add concatenation notes with M command' ' +test_expect_success 'add concatentation notes with M command' ' git fast-import <input && GIT_NOTES_REF=refs/notes/test git log | grep "^ " > actual && diff --git a/third_party/git/t/t9350-fast-export.sh b/third_party/git/t/t9350-fast-export.sh index 690c90fb82..b4004e05c2 100755 --- a/third_party/git/t/t9350-fast-export.sh +++ b/third_party/git/t/t9350-fast-export.sh @@ -53,33 +53,6 @@ test_expect_success 'fast-export | fast-import' ' ' -test_expect_success 'fast-export ^muss^{commit} muss' ' - git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual && - cat >expected <<-EOF && - tag muss - from $(git rev-parse --verify muss^{commit}) - $(git cat-file tag muss | grep tagger) - data 9 - valentin - - EOF - test_cmp expected actual -' - -test_expect_success 'fast-export --mark-tags ^muss^{commit} muss' ' - git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual && - cat >expected <<-EOF && - tag muss - mark :1 - from $(git rev-parse --verify muss^{commit}) - $(git cat-file tag muss | grep tagger) - data 9 - valentin - - EOF - test_cmp expected actual -' - test_expect_success 'fast-export master~2..master' ' git fast-export master~2..master >actual && @@ -540,41 +513,10 @@ test_expect_success 'tree_tag' ' ' # NEEDSWORK: not just check return status, but validate the output -# Note that these tests DO NOTHING other than print a warning that -# they are omitting the one tag we asked them to export (because the -# tags resolve to a tree). They exist just to make sure we do not -# abort but instead just warn. test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag' test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj' -test_expect_success 'handling tags of blobs' ' - git tag -a -m "Tag of a blob" blobtag $(git rev-parse master:file) && - git fast-export blobtag >actual && - cat >expect <<-EOF && - blob - mark :1 - data 9 - die Luft - - tag blobtag - from :1 - tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 14 - Tag of a blob - - EOF - test_cmp expect actual -' - -test_expect_success 'handling nested tags' ' - git tag -a -m "This is a nested tag" nested muss && - git fast-export --mark-tags nested >output && - grep "^from $ZERO_OID$" output && - grep "^tag nested$" output >tag_lines && - test_line_count = 2 tag_lines -' - test_expect_success 'directory becomes symlink' ' git init dirtosymlink && git init result && @@ -600,10 +542,9 @@ test_expect_success 'directory becomes symlink' ' test_expect_success 'fast-export quotes pathnames' ' git init crazy-paths && - test_config -C crazy-paths core.protectNTFS false && (cd crazy-paths && blob=$(echo foo | git hash-object -w --stdin) && - git -c core.protectNTFS=false update-index --add \ + git update-index --add \ --cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \ --cacheinfo 100644 $blob "path with \"quote\"" \ --cacheinfo 100644 $blob "path with \\backslash" \ @@ -626,15 +567,17 @@ test_expect_success 'fast-export quotes pathnames' ' ' test_expect_success 'test bidirectionality' ' + >marks-cur && + >marks-new && git init marks-test && - git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \ - git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new && + git fast-export --export-marks=marks-cur --import-marks=marks-cur --branches | \ + git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks=marks-new && (cd marks-test && git reset --hard && echo Wohlauf > file && git commit -a -m "back in time") && - git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \ - git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur + git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks=marks-new --branches | \ + git fast-import --export-marks=marks-cur --import-marks=marks-cur ' cat > expected << EOF diff --git a/third_party/git/t/t9502-gitweb-standalone-parse-output.sh b/third_party/git/t/t9502-gitweb-standalone-parse-output.sh index e38cbc97d3..0796a438bc 100755 --- a/third_party/git/t/t9502-gitweb-standalone-parse-output.sh +++ b/third_party/git/t/t9502-gitweb-standalone-parse-output.sh @@ -188,8 +188,8 @@ test_expect_success 'forks: project_index lists all projects (incl. forks)' ' ' xss() { - echo >&2 "Checking $*..." && - gitweb_run "$@" && + echo >&2 "Checking $1..." && + gitweb_run "$1" && if grep "$TAG" gitweb.body; then echo >&2 "xss: $TAG should have been quoted in output" return 1 @@ -200,8 +200,7 @@ xss() { test_expect_success 'xss checks' ' TAG="<magic-xss-tag>" && xss "a=rss&p=$TAG" && - xss "a=rss&p=foo.git&f=$TAG" && - xss "" "$TAG+" + xss "a=rss&p=foo.git&f=$TAG" ' test_done diff --git a/third_party/git/t/t9800-git-p4-basic.sh b/third_party/git/t/t9800-git-p4-basic.sh index c98c1dfc23..5856563068 100755 --- a/third_party/git/t/t9800-git-p4-basic.sh +++ b/third_party/git/t/t9800-git-p4-basic.sh @@ -202,6 +202,7 @@ test_expect_success 'exit when p4 fails to produce marshaled output' ' export PATH && test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1 ) && + cat errs && test_i18ngrep ! Traceback errs ' diff --git a/third_party/git/t/t9809-git-p4-client-view.sh b/third_party/git/t/t9809-git-p4-client-view.sh index 9c9710d8c7..3cff1fce1b 100755 --- a/third_party/git/t/t9809-git-p4-client-view.sh +++ b/third_party/git/t/t9809-git-p4-client-view.sh @@ -407,7 +407,7 @@ test_expect_success 'reinit depot' ' ' # -# What happens when two files of the same name are overlaid together? +# What happens when two files of the same name are overlayed together? # The last-listed file should take preference. # # //depot diff --git a/third_party/git/t/t9810-git-p4-rcs.sh b/third_party/git/t/t9810-git-p4-rcs.sh index e3836888ec..57b533dc6f 100755 --- a/third_party/git/t/t9810-git-p4-rcs.sh +++ b/third_party/git/t/t9810-git-p4-rcs.sh @@ -294,6 +294,7 @@ test_expect_success 'cope with rcs keyword file deletion' ' echo "\$Revision\$" >kwdelfile.c && p4 add -t ktext kwdelfile.c && p4 submit -d "Add file to be deleted" && + cat kwdelfile.c && grep 1 kwdelfile.c ) && git p4 clone --dest="$git" //depot && diff --git a/third_party/git/t/t9902-completion.sh b/third_party/git/t/t9902-completion.sh index 5505e5aa24..75512c3403 100755 --- a/third_party/git/t/t9902-completion.sh +++ b/third_party/git/t/t9902-completion.sh @@ -28,10 +28,10 @@ complete () # # (2) A test makes sure that common subcommands are included in the # completion for "git <TAB>", and a plumbing is excluded. "add", -# "rebase" and "ls-files" are listed for this. +# "filter-branch" and "ls-files" are listed for this. -GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr rebase ls-files' -GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout rebase' +GIT_TESTING_ALL_COMMAND_LIST='add checkout check-attr filter-branch ls-files' +GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout filter-branch' . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" @@ -378,7 +378,7 @@ test_expect_success '__gitdir - finds repo' ' ' -test_expect_success '__gitdir - returns error when cannot find repo' ' +test_expect_success '__gitdir - returns error when cant find repo' ' ( __git_dir="non-existing" && test_must_fail __gitdir >"$actual" @@ -945,7 +945,7 @@ test_expect_success 'setup for filtering matching refs' ' rm -f .git/FETCH_HEAD ' -test_expect_success '__git_refs - do not filter refs unless told so' ' +test_expect_success '__git_refs - dont filter refs unless told so' ' cat >expected <<-EOF && HEAD master @@ -1257,7 +1257,7 @@ test_path_completion () # In the following tests calling this function we only # care about how __git_complete_index_file() deals with # unusual characters in path names. By requesting only - # untracked files we do not have to bother adding any + # untracked files we dont have to bother adding any # paths to the index in those tests. __git_complete_index_file --others && print_comp @@ -1363,63 +1363,6 @@ test_expect_success 'teardown after path completion tests' ' BS\\dir '$'separators\034in\035dir'' ' -test_expect_success '__git_find_on_cmdline - single match' ' - echo list >expect && - ( - words=(git command --opt list) && - cword=${#words[@]} && - __git_find_on_cmdline "add list remove" >actual - ) && - test_cmp expect actual -' - -test_expect_success '__git_find_on_cmdline - multiple matches' ' - echo remove >expect && - ( - words=(git command -o --opt remove list add) && - cword=${#words[@]} && - __git_find_on_cmdline "add list remove" >actual - ) && - test_cmp expect actual -' - -test_expect_success '__git_find_on_cmdline - no match' ' - ( - words=(git command --opt branch) && - cword=${#words[@]} && - __git_find_on_cmdline "add list remove" >actual - ) && - test_must_be_empty actual -' - -test_expect_success '__git_find_on_cmdline - single match with index' ' - echo "3 list" >expect && - ( - words=(git command --opt list) && - cword=${#words[@]} && - __git_find_on_cmdline --show-idx "add list remove" >actual - ) && - test_cmp expect actual -' - -test_expect_success '__git_find_on_cmdline - multiple matches with index' ' - echo "4 remove" >expect && - ( - words=(git command -o --opt remove list add) && - cword=${#words[@]} && - __git_find_on_cmdline --show-idx "add list remove" >actual - ) && - test_cmp expect actual -' - -test_expect_success '__git_find_on_cmdline - no match with index' ' - ( - words=(git command --opt branch) && - cword=${#words[@]} && - __git_find_on_cmdline --show-idx "add list remove" >actual - ) && - test_must_be_empty actual -' test_expect_success '__git_get_config_variables' ' cat >expect <<-EOF && @@ -1449,12 +1392,12 @@ test_expect_success 'basic' ' # built-in grep -q "^add \$" out && # script - grep -q "^rebase \$" out && + grep -q "^filter-branch \$" out && # plumbing ! grep -q "^ls-files \$" out && - run_completion "git r" && - ! grep -q -v "^r" out + run_completion "git f" && + ! grep -q -v "^f" out ' test_expect_success 'double dash "git" itself' ' @@ -1495,8 +1438,6 @@ test_expect_success 'double dash "git checkout"' ' --no-guess Z --no-... Z --overlay Z - --pathspec-file-nul Z - --pathspec-from-file=Z EOF ' @@ -1607,10 +1548,7 @@ test_expect_success 'complete tree filename with metacharacters' ' ' test_expect_success PERL 'send-email' ' - test_completion "git send-email --cov" <<-\EOF && - --cover-from-description=Z - --cover-letter Z - EOF + test_completion "git send-email --cov" "--cover-letter " && test_completion "git send-email ma" "master " ' @@ -1760,69 +1698,6 @@ do ' done -test_expect_success 'git config - section' ' - test_completion "git config br" <<-\EOF - branch.Z - browser.Z - EOF -' - -test_expect_success 'git config - variable name' ' - test_completion "git config log.d" <<-\EOF - log.date Z - log.decorate Z - EOF -' - -test_expect_success 'git config - value' ' - test_completion "git config color.pager " <<-\EOF - false Z - true Z - EOF -' - -test_expect_success 'git -c - section' ' - test_completion "git -c br" <<-\EOF - branch.Z - browser.Z - EOF -' - -test_expect_success 'git -c - variable name' ' - test_completion "git -c log.d" <<-\EOF - log.date=Z - log.decorate=Z - EOF -' - -test_expect_success 'git -c - value' ' - test_completion "git -c color.pager=" <<-\EOF - false Z - true Z - EOF -' - -test_expect_success 'git clone --config= - section' ' - test_completion "git clone --config=br" <<-\EOF - branch.Z - browser.Z - EOF -' - -test_expect_success 'git clone --config= - variable name' ' - test_completion "git clone --config=log.d" <<-\EOF - log.date=Z - log.decorate=Z - EOF -' - -test_expect_success 'git clone --config= - value' ' - test_completion "git clone --config=color.pager=" <<-\EOF - false Z - true Z - EOF -' - test_expect_success 'sourcing the completion script clears cached commands' ' __git_compute_all_commands && verbose test -n "$__git_all_commands" && diff --git a/third_party/git/t/t9903-bash-prompt.sh b/third_party/git/t/t9903-bash-prompt.sh index ab5da2cabc..88bc733ad6 100755 --- a/third_party/git/t/t9903-bash-prompt.sh +++ b/third_party/git/t/t9903-bash-prompt.sh @@ -163,7 +163,7 @@ test_expect_success 'prompt - inside bare repository' ' ' test_expect_success 'prompt - interactive rebase' ' - printf " (b1|REBASE 2/3)" >expected && + printf " (b1|REBASE-i 2/3)" >expected && write_script fake_editor.sh <<-\EOF && echo "exec echo" >"$1" echo "edit $(git log -1 --format="%h")" >>"$1" @@ -180,7 +180,7 @@ test_expect_success 'prompt - interactive rebase' ' ' test_expect_success 'prompt - rebase merge' ' - printf " (b2|REBASE 1/3)" >expected && + printf " (b2|REBASE-i 1/3)" >expected && git checkout b2 && test_when_finished "git checkout master" && test_must_fail git rebase --merge b1 b2 && @@ -189,11 +189,11 @@ test_expect_success 'prompt - rebase merge' ' test_cmp expected "$actual" ' -test_expect_success 'prompt - rebase am' ' +test_expect_success 'prompt - rebase' ' printf " (b2|REBASE 1/3)" >expected && git checkout b2 && test_when_finished "git checkout master" && - test_must_fail git rebase --apply b1 b2 && + test_must_fail git rebase b1 b2 && test_when_finished "git rebase --abort" && __git_ps1 >"$actual" && test_cmp expected "$actual" diff --git a/third_party/git/t/test-lib-functions.sh b/third_party/git/t/test-lib-functions.sh index 352c213d52..e0b3f28d3a 100644 --- a/third_party/git/t/test-lib-functions.sh +++ b/third_party/git/t/test-lib-functions.sh @@ -228,11 +228,9 @@ test_commit () { # can be a tag pointing to the commit-to-merge. test_merge () { - label="$1" && - shift && test_tick && - git merge -m "$label" "$@" && - git tag "$label" + git merge -m "$1" "$2" && + git tag "$1" } # Efficiently create <nr> commits, each with a unique number (from 1 to <nr> @@ -308,7 +306,7 @@ test_commit_bulk () { total=$1 add_from= - if git -C "$indir" rev-parse --quiet --verify "$ref" + if git -C "$indir" rev-parse --verify "$ref" then add_from=t fi @@ -582,7 +580,7 @@ test_expect_failure () { export test_prereq if ! test_skip "$@" then - say >&3 "checking known breakage of $TEST_NUMBER.$test_count '$1': $2" + say >&3 "checking known breakage: $2" if test_run_ "$2" expecting_failure then test_known_broken_ok_ "$1" @@ -602,7 +600,7 @@ test_expect_success () { export test_prereq if ! test_skip "$@" then - say >&3 "expecting success of $TEST_NUMBER.$test_count '$1': $2" + say >&3 "expecting success: $2" if test_run_ "$2" then test_ok_ "$1" @@ -1012,30 +1010,19 @@ test_must_be_empty () { fi } -# Tests that its two parameters refer to the same revision, or if '!' is -# provided first, that its other two parameters refer to different -# revisions. +# Tests that its two parameters refer to the same revision test_cmp_rev () { - local op='=' wrong_result=different - - if test $# -ge 1 && test "x$1" = 'x!' - then - op='!=' - wrong_result='the same' - shift - fi if test $# != 2 then error "bug in the test script: test_cmp_rev requires two revisions, but got $#" else local r1 r2 r1=$(git rev-parse --verify "$1") && - r2=$(git rev-parse --verify "$2") || return 1 - - if ! test "$r1" "$op" "$r2" + r2=$(git rev-parse --verify "$2") && + if test "$r1" != "$r2" then cat >&4 <<-EOF - error: two revisions point to $wrong_result objects: + error: two revisions point to different objects: '$1': $r1 '$2': $r2 EOF @@ -1186,34 +1173,6 @@ perl () { command "$PERL_PATH" "$@" 2>&7 } 7>&2 2>&4 -# Given the name of an environment variable with a bool value, normalize -# its value to a 0 (true) or 1 (false or empty string) return code. -# -# test_bool_env GIT_TEST_HTTPD <default-value> -# -# Return with code corresponding to the given default value if the variable -# is unset. -# Abort the test script if either the value of the variable or the default -# are not valid bool values. - -test_bool_env () { - if test $# != 2 - then - BUG "test_bool_env requires two parameters (variable name and default value)" - fi - - git env--helper --type=bool --default="$2" --exit-code "$1" - ret=$? - case $ret in - 0|1) # unset or valid bool value - ;; - *) # invalid bool value or something unexpected - error >&7 "test_bool_env requires bool values both for \$$1 and for the default fallback" - ;; - esac - return $ret -} - # Exit the test suite, either by skipping all remaining tests or by # exiting with an error. If our prerequisite variable $1 falls back # on a default assume we were opportunistically trying to set up some @@ -1222,7 +1181,7 @@ test_bool_env () { # The error/skip message should be given by $2. # test_skip_or_die () { - if ! test_bool_env "$1" false + if ! git env--helper --type=bool --default=false --exit-code $1 then skip_all=$2 test_done @@ -1516,30 +1475,3 @@ test_set_port () { port=$(($port + ${GIT_TEST_STRESS_JOB_NR:-0})) eval $var=$port } - -# Compare a file containing rev-list bitmap traversal output to its non-bitmap -# counterpart. You can't just use test_cmp for this, because the two produce -# subtly different output: -# -# - regular output is in traversal order, whereas bitmap is split by type, -# with non-packed objects at the end -# -# - regular output has a space and the pathname appended to non-commit -# objects; bitmap output omits this -# -# This function normalizes and compares the two. The second file should -# always be the bitmap output. -test_bitmap_traversal () { - if test "$1" = "--no-confirm-bitmaps" - then - shift - elif cmp "$1" "$2" - then - echo >&2 "identical raw outputs; are you sure bitmaps were used?" - return 1 - fi && - cut -d' ' -f1 "$1" | sort >"$1.normalized" && - sort "$2" >"$2.normalized" && - test_cmp "$1.normalized" "$2.normalized" && - rm -f "$1.normalized" "$2.normalized" -} diff --git a/third_party/git/t/test-lib.sh b/third_party/git/t/test-lib.sh index 0ea1e5a05e..30b07e310f 100644 --- a/third_party/git/t/test-lib.sh +++ b/third_party/git/t/test-lib.sh @@ -212,8 +212,6 @@ fi TEST_STRESS_JOB_SFX="${GIT_TEST_STRESS_JOB_NR:+.stress-$GIT_TEST_STRESS_JOB_NR}" TEST_NAME="$(basename "$0" .sh)" -TEST_NUMBER="${TEST_NAME%%-*}" -TEST_NUMBER="${TEST_NUMBER#t}" TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/test-results" TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME$TEST_STRESS_JOB_SFX" TRASH_DIRECTORY="trash directory.$TEST_NAME$TEST_STRESS_JOB_SFX" @@ -404,13 +402,9 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' unset XDG_CACHE_HOME unset XDG_CONFIG_HOME unset GITPERLLIB -TEST_AUTHOR_LOCALNAME=author -TEST_AUTHOR_DOMAIN=example.com -GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN} +GIT_AUTHOR_EMAIL=author@example.com GIT_AUTHOR_NAME='A U Thor' -TEST_COMMITTER_LOCALNAME=committer -TEST_COMMITTER_DOMAIN=example.com -GIT_COMMITTER_EMAIL=${TEST_COMMITTER_LOCALNAME}@${TEST_COMMITTER_DOMAIN} +GIT_COMMITTER_EMAIL=committer@example.com GIT_COMMITTER_NAME='C O Mitter' GIT_MERGE_VERBOSITY=5 GIT_MERGE_AUTOEDIT=no @@ -513,9 +507,6 @@ EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 LF=' ' -# Single quote -SQ=\' - # UTF-8 ZERO WIDTH NON-JOINER, which HFS+ ignores # when case-folding filenames u200c=$(printf '\342\200\214') @@ -576,7 +567,6 @@ export TERM error () { say_color error "error: $*" - finalize_junit_xml GIT_EXIT_OK=t exit 1 } @@ -705,7 +695,7 @@ test_failure_ () { say_color error "not ok $test_count - $1" shift printf '%s\n' "$*" | sed -e 's/^/# /' - test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; } + test "$immediate" = "" || { GIT_EXIT_OK=t; exit 1; } } test_known_broken_ok_ () { @@ -1004,12 +994,6 @@ test_skip () { to_skip=t skipped_reason="GIT_SKIP_TESTS" fi - if test -z "$to_skip" && test -n "$run_list" && - ! match_test_selector_list '--run' $test_count "$run_list" - then - to_skip=t - skipped_reason="--run" - fi if test -z "$to_skip" && test -n "$test_prereq" && ! test_have_prereq "$test_prereq" then @@ -1022,6 +1006,12 @@ test_skip () { fi skipped_reason="missing $missing_prereq${of_prereq}" fi + if test -z "$to_skip" && test -n "$run_list" && + ! match_test_selector_list '--run' $test_count "$run_list" + then + to_skip=t + skipped_reason="--run" + fi case "$to_skip" in t) @@ -1073,26 +1063,6 @@ write_junit_xml_testcase () { junit_have_testcase=t } -finalize_junit_xml () { - if test -n "$write_junit_xml" && test -n "$junit_xml_path" - then - test -n "$junit_have_testcase" || { - junit_start=$(test-tool date getnanos) - write_junit_xml_testcase "all tests skipped" - } - - # adjust the overall time - junit_time=$(test-tool date getnanos $junit_suite_start) - sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \ - -e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \ - <"$junit_xml_path" >"$junit_xml_path.new" - mv "$junit_xml_path.new" "$junit_xml_path" - - write_junit_xml " </testsuite>" "</testsuites>" - write_junit_xml= - fi -} - test_atexit_cleanup=: test_atexit_handler () { # In a succeeding test script 'test_atexit_handler' is invoked @@ -1115,7 +1085,21 @@ test_done () { # removed, so the commands can access pidfiles and socket files. test_atexit_handler - finalize_junit_xml + if test -n "$write_junit_xml" && test -n "$junit_xml_path" + then + test -n "$junit_have_testcase" || { + junit_start=$(test-tool date getnanos) + write_junit_xml_testcase "all tests skipped" + } + + # adjust the overall time + junit_time=$(test-tool date getnanos $junit_suite_start) + sed "s/<testsuite [^>]*/& time=\"$junit_time\"/" \ + <"$junit_xml_path" >"$junit_xml_path.new" + mv "$junit_xml_path.new" "$junit_xml_path" + + write_junit_xml " </testsuite>" "</testsuites>" + fi if test -z "$HARNESS_ACTIVE" then @@ -1407,23 +1391,23 @@ yes () { # The GIT_TEST_FAIL_PREREQS code hooks into test_set_prereq(), and # thus needs to be set up really early, and set an internal variable # for convenience so the hot test_set_prereq() codepath doesn't need -# to call "git env--helper" (via test_bool_env). Only do that work -# if needed by seeing if GIT_TEST_FAIL_PREREQS is set at all. +# to call "git env--helper". Only do that work if needed by seeing if +# GIT_TEST_FAIL_PREREQS is set at all. GIT_TEST_FAIL_PREREQS_INTERNAL= if test -n "$GIT_TEST_FAIL_PREREQS" then - if test_bool_env GIT_TEST_FAIL_PREREQS false + if git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS then GIT_TEST_FAIL_PREREQS_INTERNAL=true test_set_prereq FAIL_PREREQS fi else test_lazy_prereq FAIL_PREREQS ' - test_bool_env GIT_TEST_FAIL_PREREQS false + git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS ' fi -# Fix some commands on Windows, and other OS-specific things +# Fix some commands on Windows uname_s=$(uname -s) case $uname_s in *MINGW*) @@ -1454,12 +1438,6 @@ case $uname_s in test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR ;; -FreeBSD) - test_set_prereq REGEX_ILLSEQ - test_set_prereq POSIXPERM - test_set_prereq BSLASHPSPEC - test_set_prereq EXECKEEPSPID - ;; *) test_set_prereq POSIXPERM test_set_prereq BSLASHPSPEC @@ -1484,7 +1462,7 @@ then fi test_lazy_prereq C_LOCALE_OUTPUT ' - ! test_bool_env GIT_TEST_GETTEXT_POISON false + ! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON ' if test -z "$GIT_TEST_CHECK_CACHE_TREE" diff --git a/third_party/git/tag.c b/third_party/git/tag.c index 71b544467e..5db870edb9 100644 --- a/third_party/git/tag.c +++ b/third_party/git/tag.c @@ -141,16 +141,7 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u if (item->object.parsed) return 0; - - if (item->tag) { - /* - * Presumably left over from a previous failed parse; - * clear it out in preparation for re-parsing (we'll probably - * hit the same error, which lets us tell our current caller - * about the problem). - */ - FREE_AND_NULL(item->tag); - } + item->object.parsed = 1; if (size < the_hash_algo->hexsz + 24) return -1; @@ -176,15 +167,10 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u } else if (!strcmp(type, tag_type)) { item->tagged = (struct object *)lookup_tag(r, &oid); } else { - return error("unknown tag type '%s' in %s", - type, oid_to_hex(&item->object.oid)); + error("Unknown type %s", type); + item->tagged = NULL; } - if (!item->tagged) - return error("bad tag pointer to %s in %s", - oid_to_hex(&oid), - oid_to_hex(&item->object.oid)); - if (bufptr + 4 < tail && starts_with(bufptr, "tag ")) ; /* good */ else @@ -201,7 +187,6 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u else item->date = 0; - item->object.parsed = 1; return 0; } @@ -227,10 +212,3 @@ int parse_tag(struct tag *item) free(data); return ret; } - -struct object_id *get_tagged_oid(struct tag *tag) -{ - if (!tag->tagged) - die("bad tag"); - return &tag->tagged->oid; -} diff --git a/third_party/git/tag.h b/third_party/git/tag.h index 3ce8e72192..03265fbfe2 100644 --- a/third_party/git/tag.h +++ b/third_party/git/tag.h @@ -19,6 +19,5 @@ struct object *deref_tag(struct repository *r, struct object *, const char *, in struct object *deref_tag_noverify(struct object *); int gpg_verify_tag(const struct object_id *oid, const char *name_to_report, unsigned flags); -struct object_id *get_tagged_oid(struct tag *tag); #endif /* TAG_H */ diff --git a/third_party/git/tar.h b/third_party/git/tar.h index 6b258c4d4a..3467705e9b 100644 --- a/third_party/git/tar.h +++ b/third_party/git/tar.h @@ -1,6 +1,3 @@ -#ifndef TAR_H -#define TAR_H - #define TYPEFLAG_AUTO '\0' #define TYPEFLAG_REG '0' #define TYPEFLAG_LNK '2' @@ -26,5 +23,3 @@ struct ustar_header { char devminor[8]; /* 337 */ char prefix[155]; /* 345 */ }; - -#endif /* TAR_H */ diff --git a/third_party/git/templates/hooks--fsmonitor-watchman.sample b/third_party/git/templates/hooks--fsmonitor-watchman.sample index 14ed0aa42d..e673bb3980 100755 --- a/third_party/git/templates/hooks--fsmonitor-watchman.sample +++ b/third_party/git/templates/hooks--fsmonitor-watchman.sample @@ -8,166 +8,107 @@ use IPC::Open2; # (https://facebook.github.io/watchman/) with git to speed up detecting # new and modified files. # -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. # # To enable this hook, rename this file to "query-watchman" and set # 'git config core.fsmonitor .git/hooks/query-watchman' # -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; +my ($version, $time) = @ARGV; # Check the hook interface version -if ($version ne 2) { + +if ($version == 1) { + # convert nanoseconds to seconds + $time = int $time / 1000000000; +} else { die "Unsupported query-fsmonitor hook version '$version'.\n" . "Falling back to scanning...\n"; } -my $git_work_tree = get_working_dir(); +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} my $retry = 1; -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - launch_watchman(); sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. + # changed since $time but were not transient (ie created after + # $time but no longer exist). # # To accomplish this, we're using the "since" generator to use the # recency index to select candidate nodes and "fields" to limit the # output to file names only. Then we're using the "expression" term to # further constrain the results. - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - } + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. + my $query = <<" END"; ["query", "$git_work_tree", { - "since": $last_update_token, + "since": $time, "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] }] END - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - print CHLD_IN $query; close CHLD_IN; my $response = do {local $/; <CHLD_OUT>}; - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; + "Falling back to scanning...\n" if $response eq ""; die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - return $json_pkg->new->utf8->decode($response); -} - -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + "Falling back to scanning...\n" unless $response =~ /^\{/; + + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); + + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; $retry--; - my $response = qx/watchman watch "$git_work_tree"/; + qx/watchman watch "$git_work_tree"/; die "Failed to make watchman watch '$git_work_tree'.\n" . "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; # Watchman will always return all files on the first query so # return the fast "everything is dirty" flag to git and do the # Watchman query just to get it over with now so we won't pay # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - + print "/\0"; eval { launch_watchman() }; - return 0; + exit 0; } - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} - -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; - return $working_dir; + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; } diff --git a/third_party/git/templates/hooks--pre-commit.sample b/third_party/git/templates/hooks--pre-commit.sample index e144712c85..6a75641638 100755 --- a/third_party/git/templates/hooks--pre-commit.sample +++ b/third_party/git/templates/hooks--pre-commit.sample @@ -16,7 +16,7 @@ else fi # If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) +allownonascii=$(git config --bool hooks.allownonascii) # Redirect output to stderr. exec 1>&2 diff --git a/third_party/git/templates/hooks--pre-merge-commit.sample b/third_party/git/templates/hooks--pre-merge-commit.sample deleted file mode 100755 index 399eab1924..0000000000 --- a/third_party/git/templates/hooks--pre-merge-commit.sample +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git merge" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message to -# stderr if it wants to stop the merge commit. -# -# To enable this hook, rename this file to "pre-merge-commit". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" -: diff --git a/third_party/git/templates/hooks--update.sample b/third_party/git/templates/hooks--update.sample index 5014c4b31c..80ba94135c 100755 --- a/third_party/git/templates/hooks--update.sample +++ b/third_party/git/templates/hooks--update.sample @@ -43,11 +43,11 @@ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then fi # --- Config -allowunannotated=$(git config --type=bool hooks.allowunannotated) -allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) -denycreatebranch=$(git config --type=bool hooks.denycreatebranch) -allowdeletetag=$(git config --type=bool hooks.allowdeletetag) -allowmodifytag=$(git config --type=bool hooks.allowmodifytag) +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) # check for no description projectdesc=$(sed -e '1q' "$GIT_DIR/description") diff --git a/third_party/git/trace.c b/third_party/git/trace.c index b3ef0e627f..fa4a2e7120 100644 --- a/third_party/git/trace.c +++ b/third_party/git/trace.c @@ -88,6 +88,8 @@ static int prepare_trace_line(const char *file, int line, if (!trace_want(key)) return 0; + set_try_to_free_routine(NULL); /* is never reset */ + /* unit tests may want to disable additional trace output */ if (trace_want(&trace_bare)) return 1; diff --git a/third_party/git/trace.h b/third_party/git/trace.h index 9826618b33..9fa3e7a594 100644 --- a/third_party/git/trace.h +++ b/third_party/git/trace.h @@ -4,82 +4,6 @@ #include "git-compat-util.h" #include "strbuf.h" -/** - * The trace API can be used to print debug messages to stderr or a file. Trace - * code is inactive unless explicitly enabled by setting `GIT_TRACE*` environment - * variables. - * - * The trace implementation automatically adds `timestamp file:line ... \n` to - * all trace messages. E.g.: - * - * ------------ - * 23:59:59.123456 git.c:312 trace: built-in: git 'foo' - * 00:00:00.000001 builtin/foo.c:99 foo: some message - * ------------ - * - * Bugs & Caveats - * -------------- - * - * GIT_TRACE_* environment variables can be used to tell Git to show - * trace output to its standard error stream. Git can often spawn a pager - * internally to run its subcommand and send its standard output and - * standard error to it. - * - * Because GIT_TRACE_PERFORMANCE trace is generated only at the very end - * of the program with atexit(), which happens after the pager exits, it - * would not work well if you send its log to the standard error output - * and let Git spawn the pager at the same time. - * - * As a work around, you can for example use '--no-pager', or set - * GIT_TRACE_PERFORMANCE to another file descriptor which is redirected - * to stderr, or set GIT_TRACE_PERFORMANCE to a file specified by its - * absolute path. - * - * For example instead of the following command which by default may not - * print any performance information: - * - * ------------ - * GIT_TRACE_PERFORMANCE=2 git log -1 - * ------------ - * - * you may want to use: - * - * ------------ - * GIT_TRACE_PERFORMANCE=2 git --no-pager log -1 - * ------------ - * - * or: - * - * ------------ - * GIT_TRACE_PERFORMANCE=3 3>&2 git log -1 - * ------------ - * - * or: - * - * ------------ - * GIT_TRACE_PERFORMANCE=/path/to/log/file git log -1 - * ------------ - * - */ - -/** - * Defines a trace key (or category). The default (for API functions that - * don't take a key) is `GIT_TRACE`. - * - * E.g. to define a trace key controlled by environment variable `GIT_TRACE_FOO`: - * - * ------------ - * static struct trace_key trace_foo = TRACE_KEY_INIT(FOO); - * - * static void trace_print_foo(const char *message) - * { - * trace_printf_key(&trace_foo, "%s", message); - * } - * ------------ - * - * Note: don't use `const` as the trace implementation stores internal state in - * the `trace_key` structure. - */ struct trace_key { const char * const key; int fd; @@ -94,84 +18,31 @@ extern struct trace_key trace_perf_key; extern struct trace_key trace_setup_key; void trace_repo_setup(const char *prefix); - -/** - * Checks whether the trace key is enabled. Used to prevent expensive - * string formatting before calling one of the printing APIs. - */ int trace_want(struct trace_key *key); - -/** - * Disables tracing for the specified key, even if the environment variable - * was set. - */ void trace_disable(struct trace_key *key); - -/** - * Returns nanoseconds since the epoch (01/01/1970), typically used - * for performance measurements. - * Currently there are high precision timer implementations for Linux (using - * `clock_gettime(CLOCK_MONOTONIC)`) and Windows (`QueryPerformanceCounter`). - * Other platforms use `gettimeofday` as time source. - */ uint64_t getnanotime(void); - void trace_command_performance(const char **argv); void trace_verbatim(struct trace_key *key, const void *buf, unsigned len); uint64_t trace_performance_enter(void); #ifndef HAVE_VARIADIC_MACROS -/** - * Prints a formatted message, similar to printf. - */ __attribute__((format (printf, 1, 2))) void trace_printf(const char *format, ...); __attribute__((format (printf, 2, 3))) void trace_printf_key(struct trace_key *key, const char *format, ...); -/** - * Prints a formatted message, followed by a quoted list of arguments. - */ __attribute__((format (printf, 2, 3))) void trace_argv_printf(const char **argv, const char *format, ...); -/** - * Prints the strbuf, without additional formatting (i.e. doesn't - * choke on `%` or even `\0`). - */ void trace_strbuf(struct trace_key *key, const struct strbuf *data); -/** - * Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled. - * - * Example: - * ------------ - * uint64_t t = 0; - * for (;;) { - * // ignore - * t -= getnanotime(); - * // code section to measure - * t += getnanotime(); - * // ignore - * } - * trace_performance(t, "frotz"); - * ------------ - */ +/* Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled. */ __attribute__((format (printf, 2, 3))) void trace_performance(uint64_t nanos, const char *format, ...); -/** - * Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled. - * - * Example: - * ------------ - * uint64_t start = getnanotime(); - * // code section to measure - * trace_performance_since(start, "foobar"); - * ------------ - */ +/* Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled. */ __attribute__((format (printf, 2, 3))) void trace_performance_since(uint64_t start, const char *format, ...); diff --git a/third_party/git/trace2.h b/third_party/git/trace2.h index e5e81c0533..050bf3c8c1 100644 --- a/third_party/git/trace2.h +++ b/third_party/git/trace2.h @@ -1,40 +1,6 @@ #ifndef TRACE2_H #define TRACE2_H -/** - * The Trace2 API can be used to print debug, performance, and telemetry - * information to stderr or a file. The Trace2 feature is inactive unless - * explicitly enabled by enabling one or more Trace2 Targets. - * - * The Trace2 API is intended to replace the existing (Trace1) - * printf-style tracing provided by the existing `GIT_TRACE` and - * `GIT_TRACE_PERFORMANCE` facilities. During initial implementation, - * Trace2 and Trace1 may operate in parallel. - * - * The Trace2 API defines a set of high-level messages with known fields, - * such as (`start`: `argv`) and (`exit`: {`exit-code`, `elapsed-time`}). - * - * Trace2 instrumentation throughout the Git code base sends Trace2 - * messages to the enabled Trace2 Targets. Targets transform these - * messages content into purpose-specific formats and write events to - * their data streams. In this manner, the Trace2 API can drive - * many different types of analysis. - * - * Targets are defined using a VTable allowing easy extension to other - * formats in the future. This might be used to define a binary format, - * for example. - * - * Trace2 is controlled using `trace2.*` config values in the system and - * global config files and `GIT_TRACE2*` environment variables. Trace2 does - * not read from repo local or worktree config files or respect `-c` - * command line config settings. - * - * For more info about: trace2 targets, conventions for public functions and - * macros, trace2 target formats and examples on trace2 API usage refer to - * Documentation/technical/api-trace2.txt - * - */ - struct child_process; struct repository; struct json_writer; @@ -73,12 +39,7 @@ void trace2_initialize_clock(void); /* * Initialize TRACE2 tracing facility if any of the builtin TRACE2 * targets are enabled in the system config or the environment. - * This includes setting up the Trace2 thread local storage (TLS). - * Emits a 'version' message containing the version of git - * and the Trace2 protocol. - * - * This function should be called from `main()` as early as possible in - * the life of the process after essential process initialization. + * Emits a 'version' event. * * Cleanup/Termination is handled automatically by a registered * atexit() routine. @@ -88,7 +49,7 @@ void trace2_initialize_fl(const char *file, int line); #define trace2_initialize() trace2_initialize_fl(__FILE__, __LINE__) /* - * Return 1 if trace2 is enabled (at least one target is active). + * Return true if trace2 is enabled. */ int trace2_is_enabled(void); @@ -153,8 +114,7 @@ void trace2_cmd_mode_fl(const char *file, int line, const char *mode); #define trace2_cmd_mode(sv) trace2_cmd_mode_fl(__FILE__, __LINE__, (sv)) /* - * Emits an "alias" message containing the alias used and the argument - * expansion. + * Emit an 'alias' expansion event. */ void trace2_cmd_alias_fl(const char *file, int line, const char *alias, const char **argv); @@ -163,7 +123,7 @@ void trace2_cmd_alias_fl(const char *file, int line, const char *alias, trace2_cmd_alias_fl(__FILE__, __LINE__, (alias), (argv)) /* - * Emit one or more 'def_param' events for "important" configuration + * Emit one or more 'def_param' events for "interesting" configuration * settings. * * Use the TR2_SYSENV_CFG_PARAM setting to register a comma-separated @@ -184,7 +144,7 @@ void trace2_cmd_list_config_fl(const char *file, int line); /* * Emit a "def_param" event for the given config key/value pair IF - * we consider the key to be "important". + * we consider the key to be "interesting". * * Use this for new/updated config settings created/updated after * trace2_cmd_list_config() is called. @@ -195,34 +155,20 @@ void trace2_cmd_set_config_fl(const char *file, int line, const char *key, #define trace2_cmd_set_config(k, v) \ trace2_cmd_set_config_fl(__FILE__, __LINE__, (k), (v)) -/** - * Emits a "child_start" message containing the "child-id", - * "child-argv", and "child-classification". +/* + * Emit a 'child_start' event prior to spawning a child process. * * Before calling optionally set "cmd->trace2_child_class" to a string * describing the type of the child process. For example, "editor" or * "pager". - * - * This function assigns a unique "child-id" to `cmd->trace2_child_id`. - * This field is used later during the "child_exit" message to associate - * it with the "child_start" message. - * - * This function should be called before spawning the child process. */ void trace2_child_start_fl(const char *file, int line, struct child_process *cmd); #define trace2_child_start(cmd) trace2_child_start_fl(__FILE__, __LINE__, (cmd)) -/** - * Emits a "child_exit" message containing the "child-id", - * the child's elapsed time and exit-code. - * - * The reported elapsed time includes the process creation overhead and - * time spend waiting for it to exit, so it may be slightly longer than - * the time reported by the child itself. - * - * This function should be called after reaping the child process. +/* + * Emit a 'child_exit' event after the child process completes. */ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd, int child_exit_code); @@ -230,22 +176,21 @@ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd, #define trace2_child_exit(cmd, code) \ trace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code)) -/** +/* * Emit an 'exec' event prior to calling one of exec(), execv(), * execvp(), and etc. On Unix-derived systems, this will be the * last event emitted for the current process, unless the exec * fails. On Windows, exec() behaves like 'child_start' and a * waitpid(), so additional events may be emitted. * - * Returns a unique "exec-id". This value is used later - * if the exec() fails and a "exec-result" message is necessary. + * Returns the "exec_id". */ int trace2_exec_fl(const char *file, int line, const char *exe, const char **argv); #define trace2_exec(exe, argv) trace2_exec_fl(__FILE__, __LINE__, (exe), (argv)) -/** +/* * Emit an 'exec_result' when possible. On Unix-derived systems, * this should be called after exec() returns (which only happens * when there is an error starting the new process). On Windows, @@ -281,12 +226,11 @@ void trace2_thread_exit_fl(const char *file, int line); #define trace2_thread_exit() trace2_thread_exit_fl(__FILE__, __LINE__) /* - * Emits a "def_param" message containing a key/value pair. + * Emit a 'param' event. * - * This message is intended to report some global aspect of the current - * command, such as a configuration setting or command line switch that - * significantly affects program performance or behavior, such as - * `core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`. + * Write a "<param> = <value>" pair describing some aspect of the + * run such as an important configuration setting or command line + * option that significantly changes command behavior. */ void trace2_def_param_fl(const char *file, int line, const char *param, const char *value); @@ -299,35 +243,18 @@ void trace2_def_param_fl(const char *file, int line, const char *param, * a trace2-repo-id to be used in subsequent activity events. * * Emits a 'worktree' event for this repo instance. - * - * Region and data messages may refer to this repo-id. - * - * The main/top-level repository will have repo-id value 1 (aka "r1"). - * - * The repo-id field is in anticipation of future in-proc submodule - * repositories. */ void trace2_def_repo_fl(const char *file, int line, struct repository *repo); #define trace2_def_repo(repo) trace2_def_repo_fl(__FILE__, __LINE__, repo) -/** +/* * Emit a 'region_enter' event for <category>.<label> with optional * repo-id and printf message. * - * This function pushes a new region nesting stack level on the current - * thread and starts a clock for the new stack frame. - * - * The `category` field is an arbitrary category name used to classify - * regions by feature area, such as "status" or "index". At this time - * it is only just printed along with the rest of the message. It may - * be used in the future to filter messages. - * - * The `label` field is an arbitrary label used to describe the activity - * being started, such as "read_recursive" or "do_read_index". - * - * The `repo` field, if set, will be used to get the "repo-id", so that - * recursive oerations can be attributed to the correct repository. + * Enter a new nesting level on the current thread and remember the + * current time. This controls the indenting of all subsequent events + * on this thread. */ void trace2_region_enter_fl(const char *file, int line, const char *category, const char *label, const struct repository *repo, ...); @@ -362,17 +289,12 @@ void trace2_region_enter_printf(const char *category, const char *label, /* clang-format on */ #endif -/** +/* * Emit a 'region_leave' event for <category>.<label> with optional * repo-id and printf message. * * Leave current nesting level and report the elapsed time spent * in this nesting level. - * - * The `category`, `label`, and `repo` fields are the same as - * trace2_region_enter_fl. The `category` and `label` do not - * need to match the corresponding "region_enter" message, - * but it makes the data stream easier to understand. */ void trace2_region_leave_fl(const char *file, int line, const char *category, const char *label, const struct repository *repo, ...); @@ -407,12 +329,10 @@ void trace2_region_leave_printf(const char *category, const char *label, /* clang-format on */ #endif -/** +/* * Emit a key-value pair 'data' event of the form <category>.<key> = <value>. * This event implicitly contains information about thread, nesting region, * and optional repo-id. - * This could be used to print the number of files in a directory during - * a multi-threaded recursive tree walk. * * On event-based TRACE2 targets, this generates a 'data' event suitable * for post-processing. On printf-based TRACE2 targets, this is converted diff --git a/third_party/git/trace2/tr2_dst.c b/third_party/git/trace2/tr2_dst.c index ae052a07fe..5dda0ca1cd 100644 --- a/third_party/git/trace2/tr2_dst.c +++ b/third_party/git/trace2/tr2_dst.c @@ -8,19 +8,6 @@ */ #define MAX_AUTO_ATTEMPTS 10 -/* - * Sentinel file used to detect when we should discard new traces to avoid - * writing too many trace files to a directory. - */ -#define DISCARD_SENTINEL_NAME "git-trace2-discard" - -/* - * When set to zero, disables directory file count checks. Otherwise, controls - * how many files we can write to a directory before entering discard mode. - * This can be overridden via the TR2_SYSENV_MAX_FILES setting. - */ -static int tr2env_max_files = 0; - static int tr2_dst_want_warning(void) { static int tr2env_dst_debug = -1; @@ -45,75 +32,9 @@ void tr2_dst_trace_disable(struct tr2_dst *dst) dst->need_close = 0; } -/* - * Check to make sure we're not overloading the target directory with too many - * files. First get the threshold (if present) from the config or envvar. If - * it's zero or unset, disable this check. Next check for the presence of a - * sentinel file, then check file count. - * - * Returns 0 if tracing should proceed as normal. Returns 1 if the sentinel file - * already exists, which means tracing should be disabled. Returns -1 if there - * are too many files but there was no sentinel file, which means we have - * created and should write traces to the sentinel file. - * - * We expect that some trace processing system is gradually collecting files - * from the target directory; after it removes the sentinel file we'll start - * writing traces again. - */ -static int tr2_dst_too_many_files(struct tr2_dst *dst, const char *tgt_prefix) -{ - int file_count = 0, max_files = 0, ret = 0; - const char *max_files_var; - DIR *dirp; - struct strbuf path = STRBUF_INIT, sentinel_path = STRBUF_INIT; - struct stat statbuf; - - /* Get the config or envvar and decide if we should continue this check */ - max_files_var = tr2_sysenv_get(TR2_SYSENV_MAX_FILES); - if (max_files_var && *max_files_var && ((max_files = atoi(max_files_var)) >= 0)) - tr2env_max_files = max_files; - - if (!tr2env_max_files) { - ret = 0; - goto cleanup; - } - - strbuf_addstr(&path, tgt_prefix); - if (!is_dir_sep(path.buf[path.len - 1])) { - strbuf_addch(&path, '/'); - } - - /* check sentinel */ - strbuf_addbuf(&sentinel_path, &path); - strbuf_addstr(&sentinel_path, DISCARD_SENTINEL_NAME); - if (!stat(sentinel_path.buf, &statbuf)) { - ret = 1; - goto cleanup; - } - - /* check file count */ - dirp = opendir(path.buf); - while (file_count < tr2env_max_files && dirp && readdir(dirp)) - file_count++; - if (dirp) - closedir(dirp); - - if (file_count >= tr2env_max_files) { - dst->too_many_files = 1; - dst->fd = open(sentinel_path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666); - ret = -1; - goto cleanup; - } - -cleanup: - strbuf_release(&path); - strbuf_release(&sentinel_path); - return ret; -} - static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix) { - int too_many_files; + int fd; const char *last_slash, *sid = tr2_sid_get(); struct strbuf path = STRBUF_INIT; size_t base_path_len; @@ -129,29 +50,18 @@ static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix) strbuf_addstr(&path, sid); base_path_len = path.len; - too_many_files = tr2_dst_too_many_files(dst, tgt_prefix); - if (!too_many_files) { - for (attempt_count = 0; attempt_count < MAX_AUTO_ATTEMPTS; attempt_count++) { - if (attempt_count > 0) { - strbuf_setlen(&path, base_path_len); - strbuf_addf(&path, ".%d", attempt_count); - } - - dst->fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666); - if (dst->fd != -1) - break; + for (attempt_count = 0; attempt_count < MAX_AUTO_ATTEMPTS; attempt_count++) { + if (attempt_count > 0) { + strbuf_setlen(&path, base_path_len); + strbuf_addf(&path, ".%d", attempt_count); } - } else if (too_many_files == 1) { - strbuf_release(&path); - if (tr2_dst_want_warning()) - warning("trace2: not opening %s trace file due to too " - "many files in target directory %s", - tr2_sysenv_display_name(dst->sysenv_var), - tgt_prefix); - return 0; + + fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, 0666); + if (fd != -1) + break; } - if (dst->fd == -1) { + if (fd == -1) { if (tr2_dst_want_warning()) warning("trace2: could not open '%.*s' for '%s' tracing: %s", (int) base_path_len, path.buf, @@ -165,6 +75,7 @@ static int tr2_dst_try_auto_path(struct tr2_dst *dst, const char *tgt_prefix) strbuf_release(&path); + dst->fd = fd; dst->need_close = 1; dst->initialized = 1; @@ -304,8 +215,13 @@ connected: static void tr2_dst_malformed_warning(struct tr2_dst *dst, const char *tgt_value) { - warning("trace2: unknown value for '%s': '%s'", - tr2_sysenv_display_name(dst->sysenv_var), tgt_value); + struct strbuf buf = STRBUF_INIT; + + strbuf_addf(&buf, "trace2: unknown value for '%s': '%s'", + tr2_sysenv_display_name(dst->sysenv_var), tgt_value); + warning("%s", buf.buf); + + strbuf_release(&buf); } int tr2_dst_get_trace_fd(struct tr2_dst *dst) diff --git a/third_party/git/trace2/tr2_dst.h b/third_party/git/trace2/tr2_dst.h index b1a8c144e0..3adf3bac13 100644 --- a/third_party/git/trace2/tr2_dst.h +++ b/third_party/git/trace2/tr2_dst.h @@ -9,7 +9,6 @@ struct tr2_dst { int fd; unsigned int initialized : 1; unsigned int need_close : 1; - unsigned int too_many_files : 1; }; /* diff --git a/third_party/git/trace2/tr2_sid.c b/third_party/git/trace2/tr2_sid.c index dc6e75ef13..6948fd4108 100644 --- a/third_party/git/trace2/tr2_sid.c +++ b/third_party/git/trace2/tr2_sid.c @@ -19,7 +19,7 @@ static int tr2sid_nr_git_parents; * "H<first_8_chars_of_sha1_of_hostname>" * "Localhost" when no hostname. * - * where <process> is a 9 character string containing the least significant + * where <process> is a 9 character string containing the least signifcant * 32 bits in the process-id. * "P<pid>" * (This is an abribrary choice. On most systems pid_t is a 32 bit value, diff --git a/third_party/git/trace2/tr2_sysenv.c b/third_party/git/trace2/tr2_sysenv.c index 3c3792eca2..5958cfc424 100644 --- a/third_party/git/trace2/tr2_sysenv.c +++ b/third_party/git/trace2/tr2_sysenv.c @@ -49,9 +49,6 @@ static struct tr2_sysenv_entry tr2_sysenv_settings[] = { "trace2.perftarget" }, [TR2_SYSENV_PERF_BRIEF] = { "GIT_TRACE2_PERF_BRIEF", "trace2.perfbrief" }, - - [TR2_SYSENV_MAX_FILES] = { "GIT_TRACE2_MAX_FILES", - "trace2.maxfiles" }, }; /* clang-format on */ diff --git a/third_party/git/trace2/tr2_sysenv.h b/third_party/git/trace2/tr2_sysenv.h index d4364a7b85..8dd82a7a56 100644 --- a/third_party/git/trace2/tr2_sysenv.h +++ b/third_party/git/trace2/tr2_sysenv.h @@ -24,8 +24,6 @@ enum tr2_sysenv_variable { TR2_SYSENV_PERF, TR2_SYSENV_PERF_BRIEF, - TR2_SYSENV_MAX_FILES, - TR2_SYSENV_MUST_BE_LAST }; diff --git a/third_party/git/trace2/tr2_tgt_event.c b/third_party/git/trace2/tr2_tgt_event.c index 6353e8ad91..c2852d1bd2 100644 --- a/third_party/git/trace2/tr2_tgt_event.c +++ b/third_party/git/trace2/tr2_tgt_event.c @@ -10,17 +10,16 @@ #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" -static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0, 0 }; +static struct tr2_dst tr2dst_event = { TR2_SYSENV_EVENT, 0, 0, 0 }; /* - * The version number of the JSON data generated by the EVENT target in this - * source file. The version should be incremented if new event types are added, - * if existing fields are removed, or if there are significant changes in - * interpretation of existing events or fields. Smaller changes, such as adding - * a new field to an existing event, do not require an increment to the EVENT - * format version. + * The version number of the JSON data generated by the EVENT target + * in this source file. Update this if you make a significant change + * to the JSON fields or message structure. You probably do not need + * to update this if you just add another call to one of the existing + * TRACE2 API methods. */ -#define TR2_EVENT_VERSION "2" +#define TR2_EVENT_VERSION "1" /* * Region nesting limit for messages written to the event target. @@ -108,19 +107,6 @@ static void event_fmt_prepare(const char *event_name, const char *file, jw_object_intmax(jw, "repo", repo->trace2_repo_id); } -static void fn_too_many_files_fl(const char *file, int line) -{ - const char *event_name = "too_many_files"; - struct json_writer jw = JSON_WRITER_INIT; - - jw_object_begin(&jw, 0); - event_fmt_prepare(event_name, file, line, NULL, &jw); - jw_end(&jw); - - tr2_dst_write_line(&tr2dst_event, &jw.json); - jw_release(&jw); -} - static void fn_version_fl(const char *file, int line) { const char *event_name = "version"; @@ -134,9 +120,6 @@ static void fn_version_fl(const char *file, int line) tr2_dst_write_line(&tr2dst_event, &jw.json); jw_release(&jw); - - if (tr2dst_event.too_many_files) - fn_too_many_files_fl(file, line); } static void fn_start_fl(const char *file, int line, @@ -222,6 +205,11 @@ static void maybe_add_string_va(struct json_writer *jw, const char *field_name, strbuf_release(&buf); return; } + + if (fmt && *fmt) { + jw_object_string(jw, field_name, fmt); + return; + } } static void fn_error_va_fl(const char *file, int line, const char *fmt, diff --git a/third_party/git/trace2/tr2_tgt_normal.c b/third_party/git/trace2/tr2_tgt_normal.c index 31b602c171..00b116d797 100644 --- a/third_party/git/trace2/tr2_tgt_normal.c +++ b/third_party/git/trace2/tr2_tgt_normal.c @@ -9,7 +9,7 @@ #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" -static struct tr2_dst tr2dst_normal = { TR2_SYSENV_NORMAL, 0, 0, 0, 0 }; +static struct tr2_dst tr2dst_normal = { TR2_SYSENV_NORMAL, 0, 0, 0 }; /* * Use the TR2_SYSENV_NORMAL_BRIEF setting to omit the "<time> <file>:<line>" @@ -87,7 +87,7 @@ static void fn_start_fl(const char *file, int line, struct strbuf buf_payload = STRBUF_INIT; strbuf_addstr(&buf_payload, "start "); - sq_append_quote_argv_pretty(&buf_payload, argv); + sq_quote_argv_pretty(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -135,6 +135,11 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt, va_end(copy_ap); return; } + + if (fmt && *fmt) { + strbuf_addstr(buf, fmt); + return; + } } static void fn_error_va_fl(const char *file, int line, const char *fmt, @@ -142,11 +147,8 @@ static void fn_error_va_fl(const char *file, int line, const char *fmt, { struct strbuf buf_payload = STRBUF_INIT; - strbuf_addstr(&buf_payload, "error"); - if (fmt && *fmt) { - strbuf_addch(&buf_payload, ' '); - maybe_append_string_va(&buf_payload, fmt, ap); - } + strbuf_addstr(&buf_payload, "error "); + maybe_append_string_va(&buf_payload, fmt, ap); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -186,8 +188,8 @@ static void fn_alias_fl(const char *file, int line, const char *alias, { struct strbuf buf_payload = STRBUF_INIT; - strbuf_addf(&buf_payload, "alias %s -> ", alias); - sq_append_quote_argv_pretty(&buf_payload, argv); + strbuf_addf(&buf_payload, "alias %s ->", alias); + sq_quote_argv_pretty(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } @@ -198,12 +200,12 @@ static void fn_child_start_fl(const char *file, int line, { struct strbuf buf_payload = STRBUF_INIT; - strbuf_addf(&buf_payload, "child_start[%d]", cmd->trace2_child_id); + strbuf_addf(&buf_payload, "child_start[%d] ", cmd->trace2_child_id); if (cmd->dir) { - strbuf_addstr(&buf_payload, " cd "); + strbuf_addstr(&buf_payload, " cd"); sq_quote_buf_pretty(&buf_payload, cmd->dir); - strbuf_addstr(&buf_payload, ";"); + strbuf_addstr(&buf_payload, "; "); } /* @@ -211,10 +213,9 @@ static void fn_child_start_fl(const char *file, int line, * See trace_add_env() in run-command.c as used by original trace.c */ - strbuf_addch(&buf_payload, ' '); if (cmd->git_cmd) - strbuf_addstr(&buf_payload, "git "); - sq_append_quote_argv_pretty(&buf_payload, cmd->argv); + strbuf_addstr(&buf_payload, "git"); + sq_quote_argv_pretty(&buf_payload, cmd->argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); @@ -239,11 +240,9 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute, struct strbuf buf_payload = STRBUF_INIT; strbuf_addf(&buf_payload, "exec[%d] ", exec_id); - if (exe) { + if (exe) strbuf_addstr(&buf_payload, exe); - strbuf_addch(&buf_payload, ' '); - } - sq_append_quote_argv_pretty(&buf_payload, argv); + sq_quote_argv_pretty(&buf_payload, argv); normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); } diff --git a/third_party/git/trace2/tr2_tgt_perf.c b/third_party/git/trace2/tr2_tgt_perf.c index a8018f18cc..ea0cbbe13e 100644 --- a/third_party/git/trace2/tr2_tgt_perf.c +++ b/third_party/git/trace2/tr2_tgt_perf.c @@ -11,7 +11,7 @@ #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" -static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0, 0 }; +static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0 }; /* * Use TR2_SYSENV_PERF_BRIEF to omit the "<time> <file>:<line>" @@ -21,14 +21,17 @@ static struct tr2_dst tr2dst_perf = { TR2_SYSENV_PERF, 0, 0, 0, 0 }; */ static int tr2env_perf_be_brief; -#define TR2FMT_PERF_FL_WIDTH (28) +#define TR2FMT_PERF_FL_WIDTH (50) #define TR2FMT_PERF_MAX_EVENT_NAME (12) -#define TR2FMT_PERF_REPO_WIDTH (3) -#define TR2FMT_PERF_CATEGORY_WIDTH (12) +#define TR2FMT_PERF_REPO_WIDTH (4) +#define TR2FMT_PERF_CATEGORY_WIDTH (10) +#define TR2_DOTS_BUFFER_SIZE (100) #define TR2_INDENT (2) #define TR2_INDENT_LENGTH(ctx) (((ctx)->nr_open_regions - 1) * TR2_INDENT) +static struct strbuf dots = STRBUF_INIT; + static int fn_init(void) { int want = tr2_dst_trace_want(&tr2dst_perf); @@ -38,6 +41,8 @@ static int fn_init(void) if (!want) return want; + strbuf_addchars(&dots, '.', TR2_DOTS_BUFFER_SIZE); + brief = tr2_sysenv_get(TR2_SYSENV_PERF_BRIEF); if (brief && *brief && ((want_brief = git_parse_maybe_bool(brief)) != -1)) @@ -49,6 +54,8 @@ static int fn_init(void) static void fn_term(void) { tr2_dst_trace_disable(&tr2dst_perf); + + strbuf_release(&dots); } /* @@ -72,36 +79,17 @@ static void perf_fmt_prepare(const char *event_name, if (!tr2env_perf_be_brief) { struct tr2_tbuf tb_now; - size_t fl_end_col; tr2_tbuf_local_time(&tb_now); strbuf_addstr(buf, tb_now.buf); strbuf_addch(buf, ' '); - fl_end_col = buf->len + TR2FMT_PERF_FL_WIDTH; - - if (file && *file) { - struct strbuf buf_fl = STRBUF_INIT; - - strbuf_addf(&buf_fl, "%s:%d", file, line); - - if (buf_fl.len <= TR2FMT_PERF_FL_WIDTH) - strbuf_addbuf(buf, &buf_fl); - else { - size_t avail = TR2FMT_PERF_FL_WIDTH - 3; - strbuf_addstr(buf, "..."); - strbuf_add(buf, - &buf_fl.buf[buf_fl.len - avail], - avail); - } - - strbuf_release(&buf_fl); - } - - while (buf->len < fl_end_col) + if (file && *file) + strbuf_addf(buf, "%s:%d ", file, line); + while (buf->len < TR2FMT_PERF_FL_WIDTH) strbuf_addch(buf, ' '); - strbuf_addstr(buf, " | "); + strbuf_addstr(buf, "| "); } strbuf_addf(buf, "d%d | ", tr2_sid_depth()); @@ -114,7 +102,7 @@ static void perf_fmt_prepare(const char *event_name, strbuf_addf(buf, "r%d ", repo->trace2_repo_id); while (buf->len < len) strbuf_addch(buf, ' '); - strbuf_addstr(buf, " | "); + strbuf_addstr(buf, "| "); if (p_us_elapsed_absolute) strbuf_addf(buf, "%9.6f | ", @@ -128,11 +116,17 @@ static void perf_fmt_prepare(const char *event_name, else strbuf_addf(buf, "%9s | ", " "); - strbuf_addf(buf, "%-*.*s | ", TR2FMT_PERF_CATEGORY_WIDTH, - TR2FMT_PERF_CATEGORY_WIDTH, (category ? category : "")); + strbuf_addf(buf, "%-*s | ", TR2FMT_PERF_CATEGORY_WIDTH, + (category ? category : "")); - if (ctx->nr_open_regions > 0) - strbuf_addchars(buf, '.', TR2_INDENT_LENGTH(ctx)); + if (ctx->nr_open_regions > 0) { + int len_indent = TR2_INDENT_LENGTH(ctx); + while (len_indent > dots.len) { + strbuf_addbuf(buf, &dots); + len_indent -= dots.len; + } + strbuf_addf(buf, "%.*s", len_indent, dots.buf); + } } static void perf_io_write_fl(const char *file, int line, const char *event_name, @@ -171,7 +165,7 @@ static void fn_start_fl(const char *file, int line, const char *event_name = "start"; struct strbuf buf_payload = STRBUF_INIT; - sq_append_quote_argv_pretty(&buf_payload, argv); + sq_quote_argv_pretty(&buf_payload, argv); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -226,6 +220,11 @@ static void maybe_append_string_va(struct strbuf *buf, const char *fmt, va_end(copy_ap); return; } + + if (fmt && *fmt) { + strbuf_addstr(buf, fmt); + return; + } } static void fn_error_va_fl(const char *file, int line, const char *fmt, @@ -286,9 +285,8 @@ static void fn_alias_fl(const char *file, int line, const char *alias, const char *event_name = "alias"; struct strbuf buf_payload = STRBUF_INIT; - strbuf_addf(&buf_payload, "alias:%s argv:[", alias); - sq_append_quote_argv_pretty(&buf_payload, argv); - strbuf_addch(&buf_payload, ']'); + strbuf_addf(&buf_payload, "alias:%s argv:", alias); + sq_quote_argv_pretty(&buf_payload, argv); perf_io_write_fl(file, line, event_name, NULL, NULL, NULL, NULL, &buf_payload); @@ -317,14 +315,10 @@ static void fn_child_start_fl(const char *file, int line, sq_quote_buf_pretty(&buf_payload, cmd->dir); } - strbuf_addstr(&buf_payload, " argv:["); - if (cmd->git_cmd) { - strbuf_addstr(&buf_payload, "git"); - if (cmd->argv[0]) - strbuf_addch(&buf_payload, ' '); - } - sq_append_quote_argv_pretty(&buf_payload, cmd->argv); - strbuf_addch(&buf_payload, ']'); + strbuf_addstr(&buf_payload, " argv:"); + if (cmd->git_cmd) + strbuf_addstr(&buf_payload, " git"); + sq_quote_argv_pretty(&buf_payload, cmd->argv); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -375,14 +369,10 @@ static void fn_exec_fl(const char *file, int line, uint64_t us_elapsed_absolute, struct strbuf buf_payload = STRBUF_INIT; strbuf_addf(&buf_payload, "id:%d ", exec_id); - strbuf_addstr(&buf_payload, "argv:["); - if (exe) { - strbuf_addstr(&buf_payload, exe); - if (argv[0]) - strbuf_addch(&buf_payload, ' '); - } - sq_append_quote_argv_pretty(&buf_payload, argv); - strbuf_addch(&buf_payload, ']'); + strbuf_addstr(&buf_payload, "argv:"); + if (exe) + strbuf_addf(&buf_payload, " %s", exe); + sq_quote_argv_pretty(&buf_payload, argv); perf_io_write_fl(file, line, event_name, NULL, &us_elapsed_absolute, NULL, NULL, &buf_payload); @@ -443,11 +433,8 @@ static void fn_region_enter_printf_va_fl(const char *file, int line, struct strbuf buf_payload = STRBUF_INIT; if (label) - strbuf_addf(&buf_payload, "label:%s", label); - if (fmt && *fmt) { - strbuf_addch(&buf_payload, ' '); - maybe_append_string_va(&buf_payload, fmt, ap); - } + strbuf_addf(&buf_payload, "label:%s ", label); + maybe_append_string_va(&buf_payload, fmt, ap); perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute, NULL, category, &buf_payload); @@ -463,11 +450,8 @@ static void fn_region_leave_printf_va_fl( struct strbuf buf_payload = STRBUF_INIT; if (label) - strbuf_addf(&buf_payload, "label:%s", label); - if (fmt && *fmt) { - strbuf_addch(&buf_payload, ' ' ); - maybe_append_string_va(&buf_payload, fmt, ap); - } + strbuf_addf(&buf_payload, "label:%s ", label); + maybe_append_string_va(&buf_payload, fmt, ap); perf_io_write_fl(file, line, event_name, repo, &us_elapsed_absolute, &us_elapsed_region, category, &buf_payload); diff --git a/third_party/git/transport-helper.c b/third_party/git/transport-helper.c index 20a7185ec4..6b05a88faf 100644 --- a/third_party/git/transport-helper.c +++ b/third_party/git/transport-helper.c @@ -33,16 +33,6 @@ struct helper_data { check_connectivity : 1, no_disconnect_req : 1, no_private_update : 1; - - /* - * As an optimization, the transport code may invoke fetch before - * get_refs_list. If this happens, and if the transport helper doesn't - * support connect or stateless_connect, we need to invoke - * get_refs_list ourselves if we haven't already done so. Keep track of - * whether we have invoked get_refs_list. - */ - unsigned get_refs_list_called : 1; - char *export_marks; char *import_marks; /* These go from remote name (as in "list") to private name */ @@ -404,12 +394,11 @@ static int fetch_with_fetch(struct transport *transport, sendline(data, &buf); while (1) { - const char *name; - if (recvline(data, &buf)) exit(128); - if (skip_prefix(buf.buf, "lock ", &name)) { + if (starts_with(buf.buf, "lock ")) { + const char *name = buf.buf + 5; if (transport->pack_lockfile) warning(_("%s also locked %s"), data->name, name); else @@ -436,7 +425,6 @@ static int get_importer(struct transport *transport, struct child_process *fasti child_process_init(fastimport); fastimport->in = xdup(helper->out); argv_array_push(&fastimport->args, "fast-import"); - argv_array_push(&fastimport->args, "--allow-unsafe-features"); argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet"); if (data->bidi_import) { @@ -664,25 +652,17 @@ static int connect_helper(struct transport *transport, const char *name, return 0; } -static struct ref *get_refs_list_using_list(struct transport *transport, - int for_push); - static int fetch(struct transport *transport, int nr_heads, struct ref **to_fetch) { struct helper_data *data = transport->data; int i, count; - get_helper(transport); - if (process_connect(transport, 0)) { do_take_over(transport); return transport->vtable->fetch(transport, nr_heads, to_fetch); } - if (!data->get_refs_list_called) - get_refs_list_using_list(transport, 0); - count = 0; for (i = 0; i < nr_heads; i++) if (!(to_fetch[i]->status & REF_STATUS_UPTODATE)) @@ -702,9 +682,13 @@ static int fetch(struct transport *transport, set_helper_option(transport, "update-shallow", "true"); if (data->transport_options.filter_options.choice) { - const char *spec = expand_list_objects_filter_spec( - &data->transport_options.filter_options); - set_helper_option(transport, "filter", spec); + struct strbuf expanded_filter_spec = STRBUF_INIT; + expand_list_objects_filter_spec( + &data->transport_options.filter_options, + &expanded_filter_spec); + set_helper_option(transport, "filter", + expanded_filter_spec.buf); + strbuf_release(&expanded_filter_spec); } if (data->transport_options.negotiation_tips) @@ -856,10 +840,6 @@ static void set_common_push_options(struct transport *transport, die(_("helper %s does not support --signed=if-asked"), name); } - if (flags & TRANSPORT_PUSH_ATOMIC) - if (set_helper_option(transport, TRANS_OPT_ATOMIC, "true") != 0) - die(_("helper %s does not support --atomic"), name); - if (flags & TRANSPORT_PUSH_OPTIONS) { struct string_list_item *item; for_each_string_list_item(item, transport->push_options) @@ -1079,19 +1059,6 @@ static int has_attribute(const char *attrs, const char *attr) static struct ref *get_refs_list(struct transport *transport, int for_push, const struct argv_array *ref_prefixes) { - get_helper(transport); - - if (process_connect(transport, for_push)) { - do_take_over(transport); - return transport->vtable->get_refs_list(transport, for_push, ref_prefixes); - } - - return get_refs_list_using_list(transport, for_push); -} - -static struct ref *get_refs_list_using_list(struct transport *transport, - int for_push) -{ struct helper_data *data = transport->data; struct child_process *helper; struct ref *ret = NULL; @@ -1099,9 +1066,13 @@ static struct ref *get_refs_list_using_list(struct transport *transport, struct ref *posn; struct strbuf buf = STRBUF_INIT; - data->get_refs_list_called = 1; helper = get_helper(transport); + if (process_connect(transport, for_push)) { + do_take_over(transport); + return transport->vtable->get_refs_list(transport, for_push, ref_prefixes); + } + if (data->push && for_push) write_str_in_full(helper->in, "list for-push\n"); else @@ -1148,6 +1119,7 @@ static struct ref *get_refs_list_using_list(struct transport *transport, } static struct transport_vtable vtable = { + 0, set_helper_option, get_refs_list, fetch, diff --git a/third_party/git/transport-internal.h b/third_party/git/transport-internal.h index 1cde6258a7..004bee5e36 100644 --- a/third_party/git/transport-internal.h +++ b/third_party/git/transport-internal.h @@ -7,6 +7,12 @@ struct argv_array; struct transport_vtable { /** + * This transport supports the fetch() function being called + * without get_refs_list() first being called. + */ + unsigned fetch_without_list : 1; + + /** * Returns 0 if successful, positive if the option is not * recognized or is inapplicable, and negative if the option * is applicable but the value is invalid. diff --git a/third_party/git/transport.c b/third_party/git/transport.c index 1fdc7dac1a..778c60bf57 100644 --- a/third_party/git/transport.c +++ b/third_party/git/transport.c @@ -122,7 +122,6 @@ static void set_upstreams(struct transport *transport, struct ref *refs, struct bundle_transport_data { int fd; struct bundle_header header; - unsigned get_refs_from_bundle_called : 1; }; static struct ref *get_refs_from_bundle(struct transport *transport, @@ -136,8 +135,6 @@ static struct ref *get_refs_from_bundle(struct transport *transport, if (for_push) return NULL; - data->get_refs_from_bundle_called = 1; - if (data->fd > 0) close(data->fd); data->fd = read_bundle_header(transport->url, &data->header); @@ -157,9 +154,6 @@ static int fetch_refs_from_bundle(struct transport *transport, int nr_heads, struct ref **to_fetch) { struct bundle_transport_data *data = transport->data; - - if (!data->get_refs_from_bundle_called) - get_refs_from_bundle(transport, 0, NULL); return unbundle(the_repository, &data->header, data->fd, transport->progress ? BUNDLE_VERBOSE : 0); } @@ -230,7 +224,6 @@ static int set_git_option(struct git_transport_options *opts, opts->no_dependents = !!value; return 0; } else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) { - list_objects_filter_die_if_populated(&opts->filter_options); parse_list_objects_filter(&opts->filter_options, value); return 0; } @@ -737,7 +730,7 @@ static int disconnect_git(struct transport *transport) { struct git_transport_data *data = transport->data; if (data->conn) { - if (data->got_remote_heads && !transport->stateless_rpc) + if (data->got_remote_heads) packet_flush(data->fd[1]); close(data->fd[0]); close(data->fd[1]); @@ -749,6 +742,7 @@ static int disconnect_git(struct transport *transport) } static struct transport_vtable taken_over_vtable = { + 1, NULL, get_refs_via_connect, fetch_refs_via_pack, @@ -898,6 +892,7 @@ void transport_check_allowed(const char *type) } static struct transport_vtable bundle_vtable = { + 0, NULL, get_refs_from_bundle, fetch_refs_from_bundle, @@ -907,6 +902,7 @@ static struct transport_vtable bundle_vtable = { }; static struct transport_vtable builtin_smart_vtable = { + 1, NULL, get_refs_via_connect, fetch_refs_via_pack, @@ -1145,10 +1141,8 @@ int transport_push(struct repository *r, refspec_ref_prefixes(rs, &ref_prefixes); - trace2_region_enter("transport_push", "get_refs_list", r); remote_refs = transport->vtable->get_refs_list(transport, 1, &ref_prefixes); - trace2_region_leave("transport_push", "get_refs_list", r); argv_array_clear(&ref_prefixes); @@ -1184,7 +1178,6 @@ int transport_push(struct repository *r, struct ref *ref = remote_refs; struct oid_array commits = OID_ARRAY_INIT; - trace2_region_enter("transport_push", "push_submodules", r); for (; ref; ref = ref->next) if (!is_null_oid(&ref->new_oid)) oid_array_append(&commits, @@ -1197,11 +1190,9 @@ int transport_push(struct repository *r, transport->push_options, pretend)) { oid_array_clear(&commits); - trace2_region_leave("transport_push", "push_submodules", r); die(_("failed to push all needed submodules")); } oid_array_clear(&commits); - trace2_region_leave("transport_push", "push_submodules", r); } if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) || @@ -1212,7 +1203,6 @@ int transport_push(struct repository *r, struct string_list needs_pushing = STRING_LIST_INIT_DUP; struct oid_array commits = OID_ARRAY_INIT; - trace2_region_enter("transport_push", "check_submodules", r); for (; ref; ref = ref->next) if (!is_null_oid(&ref->new_oid)) oid_array_append(&commits, @@ -1223,19 +1213,15 @@ int transport_push(struct repository *r, transport->remote->name, &needs_pushing)) { oid_array_clear(&commits); - trace2_region_leave("transport_push", "check_submodules", r); die_with_unpushed_submodules(&needs_pushing); } string_list_clear(&needs_pushing, 0); oid_array_clear(&commits); - trace2_region_leave("transport_push", "check_submodules", r); } - if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) { - trace2_region_enter("transport_push", "push_refs", r); + if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) push_ret = transport->vtable->push_refs(transport, remote_refs, flags); - trace2_region_leave("transport_push", "push_refs", r); - } else + else push_ret = 0; err = push_had_errors(remote_refs); ret = push_ret | err; @@ -1299,6 +1285,15 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs) struct ref **heads = NULL; struct ref *rm; + if (!transport->vtable->fetch_without_list) + /* + * Some transports (e.g. the built-in bundle transport and the + * transport helper interface) do not work when fetching is + * done immediately after transport creation. List the remote + * refs anyway (if not already listed) as a workaround. + */ + transport_get_remote_refs(transport, NULL); + for (rm = refs; rm; rm = rm->next) { nr_refs++; if (rm->peer_ref && diff --git a/third_party/git/transport.h b/third_party/git/transport.h index e0131daab9..0b5f7806f6 100644 --- a/third_party/git/transport.h +++ b/third_party/git/transport.h @@ -208,9 +208,6 @@ void transport_check_allowed(const char *type); /* Filter objects for partial clone and fetch */ #define TRANS_OPT_LIST_OBJECTS_FILTER "filter" -/* Request atomic (all-or-nothing) updates when pushing */ -#define TRANS_OPT_ATOMIC "atomic" - /** * Returns 0 if the option was used, non-zero otherwise. Prints a * message to stderr if the option is not used. diff --git a/third_party/git/tree-walk.c b/third_party/git/tree-walk.c index bb0ad34c54..c20b62f49e 100644 --- a/third_party/git/tree-walk.c +++ b/third_party/git/tree-walk.c @@ -1,5 +1,6 @@ #include "cache.h" #include "tree-walk.h" +#include "unpack-trees.h" #include "dir.h" #include "object-store.h" #include "tree.h" @@ -169,61 +170,40 @@ int tree_entry_gently(struct tree_desc *desc, struct name_entry *entry) void setup_traverse_info(struct traverse_info *info, const char *base) { - size_t pathlen = strlen(base); + int pathlen = strlen(base); static struct traverse_info dummy; memset(info, 0, sizeof(*info)); if (pathlen && base[pathlen-1] == '/') pathlen--; info->pathlen = pathlen ? pathlen + 1 : 0; - info->name = base; - info->namelen = pathlen; - if (pathlen) + info->name.path = base; + info->name.pathlen = pathlen; + if (pathlen) { + hashcpy(info->name.oid.hash, (const unsigned char *)base + pathlen + 1); info->prev = &dummy; + } } -char *make_traverse_path(char *path, size_t pathlen, - const struct traverse_info *info, - const char *name, size_t namelen) +char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n) { - /* Always points to the end of the name we're about to add */ - size_t pos = st_add(info->pathlen, namelen); - - if (pos >= pathlen) - BUG("too small buffer passed to make_traverse_path"); + int len = tree_entry_len(n); + int pathlen = info->pathlen; - path[pos] = 0; + path[pathlen + len] = 0; for (;;) { - if (pos < namelen) - BUG("traverse_info pathlen does not match strings"); - pos -= namelen; - memcpy(path + pos, name, namelen); - - if (!pos) + memcpy(path + pathlen, n->path, len); + if (!pathlen) break; - path[--pos] = '/'; - - if (!info) - BUG("traverse_info ran out of list items"); - name = info->name; - namelen = info->namelen; + path[--pathlen] = '/'; + n = &info->name; + len = tree_entry_len(n); info = info->prev; + pathlen -= len; } return path; } -void strbuf_make_traverse_path(struct strbuf *out, - const struct traverse_info *info, - const char *name, size_t namelen) -{ - size_t len = traverse_path_len(info, namelen); - - strbuf_grow(out, len); - make_traverse_path(out->buf + out->len, out->alloc - out->len, - info, name, namelen); - strbuf_setlen(out, out->len + len); -} - struct tree_desc_skip { struct tree_desc_skip *prev; const void *ptr; @@ -409,28 +389,24 @@ int traverse_trees(struct index_state *istate, struct traverse_info *info) { int error = 0; - struct name_entry entry[MAX_TRAVERSE_TREES]; + struct name_entry *entry = xmalloc(n*sizeof(*entry)); int i; - struct tree_desc_x tx[ARRAY_SIZE(entry)]; + struct tree_desc_x *tx = xcalloc(n, sizeof(*tx)); struct strbuf base = STRBUF_INIT; int interesting = 1; char *traverse_path; - if (n >= ARRAY_SIZE(entry)) - BUG("traverse_trees() called with too many trees (%d)", n); - - for (i = 0; i < n; i++) { + for (i = 0; i < n; i++) tx[i].d = t[i]; - tx[i].skip = NULL; - } if (info->prev) { - strbuf_make_traverse_path(&base, info->prev, - info->name, info->namelen); - strbuf_addch(&base, '/'); - traverse_path = xstrndup(base.buf, base.len); + strbuf_grow(&base, info->pathlen); + make_traverse_path(base.buf, info->prev, &info->name); + base.buf[info->pathlen-1] = '/'; + strbuf_setlen(&base, info->pathlen); + traverse_path = xstrndup(base.buf, info->pathlen); } else { - traverse_path = xstrndup(info->name, info->pathlen); + traverse_path = xstrndup(info->name.path, info->pathlen); } info->traverse_path = traverse_path; for (;;) { @@ -510,8 +486,10 @@ int traverse_trees(struct index_state *istate, if (mask & (1ul << i)) update_extended_entry(tx + i, entry + i); } + free(entry); for (i = 0; i < n; i++) free_extended_entry(tx + i); + free(tx); free(traverse_path); info->traverse_path = NULL; strbuf_release(&base); @@ -1126,7 +1104,7 @@ match_wildcards: * later on. * max_depth is ignored but we may consider support it * in future, see - * https://lore.kernel.org/git/7vmxo5l2g4.fsf@alter.siamese.dyndns.org/ + * https://public-inbox.org/git/7vmxo5l2g4.fsf@alter.siamese.dyndns.org/ */ if (ps->recursive && S_ISDIR(entry->mode)) return entry_interesting; diff --git a/third_party/git/tree-walk.h b/third_party/git/tree-walk.h index a5058469e9..2a5db29e8f 100644 --- a/third_party/git/tree-walk.h +++ b/third_party/git/tree-walk.h @@ -3,15 +3,6 @@ #include "cache.h" -#define MAX_TRAVERSE_TREES 8 - -/** - * The tree walking API is used to traverse and inspect trees. - */ - -/** - * An entry in a tree. Each entry has a sha1 identifier, pathname, and mode. - */ struct name_entry { struct object_id oid; const char *path; @@ -19,29 +10,12 @@ struct name_entry { unsigned int mode; }; -/** - * A semi-opaque data structure used to maintain the current state of the walk. - */ struct tree_desc { - /* - * pointer into the memory representation of the tree. It always - * points at the current entry being visited. - */ const void *buffer; - - /* points to the current entry being visited. */ struct name_entry entry; - - /* counts the number of bytes left in the `buffer`. */ unsigned int size; }; -/** - * Decode the entry currently being visited (the one pointed to by - * `tree_desc's` `entry` member) and return the sha1 of the entry. The - * `pathp` and `modep` arguments are set to the entry's pathname and mode - * respectively. - */ static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned short *modep) { *pathp = desc->entry.path; @@ -49,11 +23,6 @@ static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, return &desc->entry.oid; } -/** - * Calculate the length of a tree entry's pathname. This utilizes the - * memory structure of a tree entry to avoid the overhead of using a - * generic strlen(). - */ static inline int tree_entry_len(const struct name_entry *ne) { return ne->pathlen; @@ -64,145 +33,48 @@ static inline int tree_entry_len(const struct name_entry *ne) * corrupt tree entry rather than dying, */ -/** - * Walk to the next entry in a tree. This is commonly used in conjunction - * with `tree_entry_extract` to inspect the current entry. - */ void update_tree_entry(struct tree_desc *); - int update_tree_entry_gently(struct tree_desc *); - -/** - * Initialize a `tree_desc` and decode its first entry. The buffer and - * size parameters are assumed to be the same as the buffer and size - * members of `struct tree`. - */ void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size); - int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long size); /* - * Visit the next entry in a tree. Returns 1 when there are more entries - * left to visit and 0 when all entries have been visited. This is - * commonly used in the test of a while loop. + * Helper function that does both tree_entry_extract() and update_tree_entry() + * and returns true for success */ int tree_entry(struct tree_desc *, struct name_entry *); - int tree_entry_gently(struct tree_desc *, struct name_entry *); -/** - * Initialize a `tree_desc` and decode its first entry given the - * object ID of a tree. Returns the `buffer` member if the latter - * is a valid tree identifier and NULL otherwise. - */ void *fill_tree_descriptor(struct repository *r, struct tree_desc *desc, const struct object_id *oid); struct traverse_info; typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *); - -/** - * Traverse `n` number of trees in parallel. The `fn` callback member of - * `traverse_info` is called once for each tree entry. - */ int traverse_trees(struct index_state *istate, int n, struct tree_desc *t, struct traverse_info *info); enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r, struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode); -/** - * A structure used to maintain the state of a traversal. - */ struct traverse_info { const char *traverse_path; - - /* - * points to the traverse_info which was used to descend into the - * current tree. If this is the top-level tree `prev` will point to - * a dummy traverse_info. - */ struct traverse_info *prev; - - /* is the entry for the current tree (if the tree is a subtree). */ - const char *name; - - size_t namelen; - unsigned mode; - - /* is the length of the full path for the current tree. */ - size_t pathlen; - + struct name_entry name; + int pathlen; struct pathspec *pathspec; - /* can be used by callbacks to maintain directory-file conflicts. */ unsigned long df_conflicts; - - /* a callback called for each entry in the tree. - * - * The arguments passed to the traverse callback are as follows: - * - * - `n` counts the number of trees being traversed. - * - * - `mask` has its nth bit set if something exists in the nth entry. - * - * - `dirmask` has its nth bit set if the nth tree's entry is a directory. - * - * - `entry` is an array of size `n` where the nth entry is from the nth tree. - * - * - `info` maintains the state of the traversal. - * - * Returning a negative value will terminate the traversal. Otherwise the - * return value is treated as an update mask. If the nth bit is set the nth tree - * will be updated and if the bit is not set the nth tree entry will be the - * same in the next callback invocation. - */ traverse_callback_t fn; - - /* can be anything the `fn` callback would want to use. */ void *data; - - /* tells whether to stop at the first error or not. */ int show_all_errors; }; -/** - * Find an entry in a tree given a pathname and the sha1 of a tree to - * search. Returns 0 if the entry is found and -1 otherwise. The third - * and fourth parameters are set to the entry's sha1 and mode respectively. - */ int get_tree_entry(struct repository *, const struct object_id *, const char *, struct object_id *, unsigned short *); - -/** - * Generate the full pathname of a tree entry based from the root of the - * traversal. For example, if the traversal has recursed into another - * tree named "bar" the pathname of an entry "baz" in the "bar" - * tree would be "bar/baz". - */ -char *make_traverse_path(char *path, size_t pathlen, const struct traverse_info *info, - const char *name, size_t namelen); - -/** - * Convenience wrapper to `make_traverse_path` into a strbuf. - */ -void strbuf_make_traverse_path(struct strbuf *out, - const struct traverse_info *info, - const char *name, size_t namelen); - -/** - * Initialize a `traverse_info` given the pathname of the tree to start - * traversing from. - */ +char *make_traverse_path(char *path, const struct traverse_info *info, const struct name_entry *n); void setup_traverse_info(struct traverse_info *info, const char *base); -/** - * Calculate the length of a pathname returned by `make_traverse_path`. - * This utilizes the memory structure of a tree entry to avoid the - * overhead of using a generic strlen(). - */ -static inline size_t traverse_path_len(const struct traverse_info *info, - size_t namelen) +static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n) { - return st_add(info->pathlen, namelen); + return info->pathlen + tree_entry_len(n); } /* in general, positive means "kind of interesting" */ diff --git a/third_party/git/tree.c b/third_party/git/tree.c index 1466bcc6a8..4720945e6a 100644 --- a/third_party/git/tree.c +++ b/third_party/git/tree.c @@ -244,7 +244,19 @@ void free_tree_buffer(struct tree *tree) struct tree *parse_tree_indirect(const struct object_id *oid) { - struct repository *r = the_repository; - struct object *obj = parse_object(r, oid); - return (struct tree *)repo_peel_to_type(r, NULL, 0, obj, OBJ_TREE); + struct object *obj = parse_object(the_repository, oid); + do { + if (!obj) + return NULL; + if (obj->type == OBJ_TREE) + return (struct tree *) obj; + else if (obj->type == OBJ_COMMIT) + obj = &(get_commit_tree(((struct commit *)obj))->object); + else if (obj->type == OBJ_TAG) + obj = ((struct tag *) obj)->tagged; + else + return NULL; + if (!obj->parsed) + parse_object(the_repository, &obj->oid); + } while (1); } diff --git a/third_party/git/unicode-width.h b/third_party/git/unicode-width.h index b50e686bae..c9d027625d 100644 --- a/third_party/git/unicode-width.h +++ b/third_party/git/unicode-width.h @@ -59,7 +59,7 @@ static const struct interval zero_width[] = { { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B44 }, { 0x0B4D, 0x0B4D }, -{ 0x0B55, 0x0B56 }, +{ 0x0B56, 0x0B56 }, { 0x0B62, 0x0B63 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 }, @@ -82,7 +82,6 @@ static const struct interval zero_width[] = { { 0x0D41, 0x0D44 }, { 0x0D4D, 0x0D4D }, { 0x0D62, 0x0D63 }, -{ 0x0D81, 0x0D81 }, { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 }, @@ -140,7 +139,7 @@ static const struct interval zero_width[] = { { 0x1A65, 0x1A6C }, { 0x1A73, 0x1A7C }, { 0x1A7F, 0x1A7F }, -{ 0x1AB0, 0x1AC0 }, +{ 0x1AB0, 0x1ABE }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 }, { 0x1B36, 0x1B3A }, @@ -183,7 +182,6 @@ static const struct interval zero_width[] = { { 0xA806, 0xA806 }, { 0xA80B, 0xA80B }, { 0xA825, 0xA826 }, -{ 0xA82C, 0xA82C }, { 0xA8C4, 0xA8C5 }, { 0xA8E0, 0xA8F1 }, { 0xA8FF, 0xA8FF }, @@ -225,7 +223,6 @@ static const struct interval zero_width[] = { { 0x10A3F, 0x10A3F }, { 0x10AE5, 0x10AE6 }, { 0x10D24, 0x10D27 }, -{ 0x10EAB, 0x10EAC }, { 0x10F46, 0x10F50 }, { 0x11001, 0x11001 }, { 0x11038, 0x11046 }, @@ -241,7 +238,6 @@ static const struct interval zero_width[] = { { 0x11180, 0x11181 }, { 0x111B6, 0x111BE }, { 0x111C9, 0x111CC }, -{ 0x111CF, 0x111CF }, { 0x1122F, 0x11231 }, { 0x11234, 0x11234 }, { 0x11236, 0x11237 }, @@ -277,9 +273,6 @@ static const struct interval zero_width[] = { { 0x11727, 0x1172B }, { 0x1182F, 0x11837 }, { 0x11839, 0x1183A }, -{ 0x1193B, 0x1193C }, -{ 0x1193E, 0x1193E }, -{ 0x11943, 0x11943 }, { 0x119D4, 0x119D7 }, { 0x119DA, 0x119DB }, { 0x119E0, 0x119E0 }, @@ -312,7 +305,6 @@ static const struct interval zero_width[] = { { 0x16B30, 0x16B36 }, { 0x16F4F, 0x16F4F }, { 0x16F8F, 0x16F92 }, -{ 0x16FE4, 0x16FE4 }, { 0x1BC9D, 0x1BC9E }, { 0x1BCA0, 0x1BCA3 }, { 0x1D167, 0x1D169 }, @@ -384,7 +376,8 @@ static const struct interval double_width[] = { { 0x3099, 0x30FF }, { 0x3105, 0x312F }, { 0x3131, 0x318E }, -{ 0x3190, 0x31E3 }, +{ 0x3190, 0x31BA }, +{ 0x31C0, 0x31E3 }, { 0x31F0, 0x321E }, { 0x3220, 0x3247 }, { 0x3250, 0x4DBF }, @@ -399,11 +392,9 @@ static const struct interval double_width[] = { { 0xFE68, 0xFE6B }, { 0xFF01, 0xFF60 }, { 0xFFE0, 0xFFE6 }, -{ 0x16FE0, 0x16FE4 }, -{ 0x16FF0, 0x16FF1 }, +{ 0x16FE0, 0x16FE3 }, { 0x17000, 0x187F7 }, -{ 0x18800, 0x18CD5 }, -{ 0x18D00, 0x18D08 }, +{ 0x18800, 0x18AF2 }, { 0x1B000, 0x1B11E }, { 0x1B150, 0x1B152 }, { 0x1B164, 0x1B167 }, @@ -438,22 +429,20 @@ static const struct interval double_width[] = { { 0x1F680, 0x1F6C5 }, { 0x1F6CC, 0x1F6CC }, { 0x1F6D0, 0x1F6D2 }, -{ 0x1F6D5, 0x1F6D7 }, +{ 0x1F6D5, 0x1F6D5 }, { 0x1F6EB, 0x1F6EC }, -{ 0x1F6F4, 0x1F6FC }, +{ 0x1F6F4, 0x1F6FA }, { 0x1F7E0, 0x1F7EB }, -{ 0x1F90C, 0x1F93A }, -{ 0x1F93C, 0x1F945 }, -{ 0x1F947, 0x1F978 }, -{ 0x1F97A, 0x1F9CB }, +{ 0x1F90D, 0x1F971 }, +{ 0x1F973, 0x1F976 }, +{ 0x1F97A, 0x1F9A2 }, +{ 0x1F9A5, 0x1F9AA }, +{ 0x1F9AE, 0x1F9CA }, { 0x1F9CD, 0x1F9FF }, -{ 0x1FA70, 0x1FA74 }, +{ 0x1FA70, 0x1FA73 }, { 0x1FA78, 0x1FA7A }, -{ 0x1FA80, 0x1FA86 }, -{ 0x1FA90, 0x1FAA8 }, -{ 0x1FAB0, 0x1FAB6 }, -{ 0x1FAC0, 0x1FAC2 }, -{ 0x1FAD0, 0x1FAD6 }, +{ 0x1FA80, 0x1FA82 }, +{ 0x1FA90, 0x1FA95 }, { 0x20000, 0x2FFFD }, { 0x30000, 0x3FFFD } }; diff --git a/third_party/git/unpack-trees.c b/third_party/git/unpack-trees.c index 1ecdab3304..62276d4fef 100644 --- a/third_party/git/unpack-trees.c +++ b/third_party/git/unpack-trees.c @@ -11,11 +11,12 @@ #include "refs.h" #include "attr.h" #include "split-index.h" +#include "dir.h" #include "submodule.h" #include "submodule-config.h" #include "fsmonitor.h" #include "object-store.h" -#include "promisor-remote.h" +#include "fetch-object.h" /* * Error messages expected by scripts out of plumbing commands such as @@ -275,9 +276,9 @@ static int check_submodule_move_head(const struct cache_entry *ce, } /* - * Perform the loading of the repository's gitmodules file. This function is + * Preform the loading of the repository's gitmodules file. This function is * used by 'check_update()' to perform loading of the gitmodules file in two - * different situations: + * differnt situations: * (1) before removing entries from the working tree if the gitmodules file has * been marked for removal. This situation is specified by 'state' == NULL. * (2) before checking out entries to the working tree if the gitmodules file @@ -291,11 +292,11 @@ static void load_gitmodules_file(struct index_state *index, if (pos >= 0) { struct cache_entry *ce = index->cache[pos]; if (!state && ce->ce_flags & CE_WT_REMOVE) { - repo_read_gitmodules(the_repository, 0); + repo_read_gitmodules(the_repository); } else if (state && (ce->ce_flags & CE_UPDATE)) { submodule_free(the_repository); checkout_entry(ce, state, NULL, NULL); - repo_read_gitmodules(the_repository, 0); + repo_read_gitmodules(the_repository); } } } @@ -372,20 +373,15 @@ static int check_updates(struct unpack_trees_options *o) state.refresh_cache = 1; state.istate = index; - if (!o->update || o->dry_run) { - remove_marked_cache_entries(index, 0); - trace_performance_leave("check_updates"); - return 0; - } - if (o->clone) setup_collided_checkout_detection(&state, index); progress = get_progress(o); - git_attr_set_direction(GIT_ATTR_CHECKOUT); + if (o->update) + git_attr_set_direction(GIT_ATTR_CHECKOUT); - if (should_update_submodules()) + if (should_update_submodules() && o->update && !o->dry_run) load_gitmodules_file(index, NULL); for (i = 0; i < index->cache_nr; i++) { @@ -393,18 +389,18 @@ static int check_updates(struct unpack_trees_options *o) if (ce->ce_flags & CE_WT_REMOVE) { display_progress(progress, ++cnt); - unlink_entry(ce); + if (o->update && !o->dry_run) + unlink_entry(ce); } } - remove_marked_cache_entries(index, 0); remove_scheduled_dirs(); - if (should_update_submodules()) + if (should_update_submodules() && o->update && !o->dry_run) load_gitmodules_file(index, &state); enable_delayed_checkout(&state); - if (has_promisor_remote()) { + if (repository_format_partial_clone && o->update && !o->dry_run) { /* * Prefetch the objects that are to be checked out in the loop * below. @@ -423,8 +419,8 @@ static int check_updates(struct unpack_trees_options *o) oid_array_append(&to_fetch, &ce->oid); } if (to_fetch.nr) - promisor_remote_get_direct(the_repository, - to_fetch.oid, to_fetch.nr); + fetch_objects(repository_format_partial_clone, + to_fetch.oid, to_fetch.nr); oid_array_clear(&to_fetch); } for (i = 0; i < index->cache_nr; i++) { @@ -436,12 +432,15 @@ static int check_updates(struct unpack_trees_options *o) ce->name); display_progress(progress, ++cnt); ce->ce_flags &= ~CE_UPDATE; - errs |= checkout_entry(ce, &state, NULL, NULL); + if (o->update && !o->dry_run) { + errs |= checkout_entry(ce, &state, NULL, NULL); + } } } stop_progress(&progress); errs |= finish_delayed_checkout(&state, NULL); - git_attr_set_direction(GIT_ATTR_CHECKIN); + if (o->update) + git_attr_set_direction(GIT_ATTR_CHECKIN); if (o->clone) report_collided_checkout(index); @@ -633,7 +632,7 @@ static int unpack_index_entry(struct cache_entry *ce, return ret; } -static int find_cache_pos(struct traverse_info *, const char *p, size_t len); +static int find_cache_pos(struct traverse_info *, const struct name_entry *); static void restore_cache_bottom(struct traverse_info *info, int bottom) { @@ -652,7 +651,7 @@ static int switch_cache_bottom(struct traverse_info *info) if (o->diff_index_cached) return 0; ret = o->cache_bottom; - pos = find_cache_pos(info->prev, info->name, info->namelen); + pos = find_cache_pos(info->prev, &info->name); if (pos < -1) o->cache_bottom = -2 - pos; @@ -687,21 +686,21 @@ static int index_pos_by_traverse_info(struct name_entry *names, struct traverse_info *info) { struct unpack_trees_options *o = info->data; - struct strbuf name = STRBUF_INIT; + int len = traverse_path_len(info, names); + char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */); int pos; - strbuf_make_traverse_path(&name, info, names->path, names->pathlen); - strbuf_addch(&name, '/'); - pos = index_name_pos(o->src_index, name.buf, name.len); + make_traverse_path(name, info, names); + name[len++] = '/'; + name[len] = '\0'; + pos = index_name_pos(o->src_index, name, len); if (pos >= 0) BUG("This is a directory and should not exist in index"); pos = -pos - 1; - if (pos >= o->src_index->cache_nr || - !starts_with(o->src_index->cache[pos]->name, name.buf) || - (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf))) - BUG("pos %d doesn't point to the first entry of %s in index", - pos, name.buf); - strbuf_release(&name); + if (!starts_with(o->src_index->cache[pos]->name, name) || + (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name))) + BUG("pos must point at the first entry in this directory"); + free(name); return pos; } @@ -812,10 +811,8 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, newinfo = *info; newinfo.prev = info; newinfo.pathspec = info->pathspec; - newinfo.name = p->path; - newinfo.namelen = p->pathlen; - newinfo.mode = p->mode; - newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1); + newinfo.name = *p; + newinfo.pathlen += tree_entry_len(p) + 1; newinfo.df_conflicts |= df_conflicts; /* @@ -866,18 +863,14 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, * itself - the caller needs to do the final check for the cache * entry having more data at the end! */ -static int do_compare_entry_piecewise(const struct cache_entry *ce, - const struct traverse_info *info, - const char *name, size_t namelen, - unsigned mode) +static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) { - int pathlen, ce_len; + int len, pathlen, ce_len; const char *ce_name; if (info->prev) { int cmp = do_compare_entry_piecewise(ce, info->prev, - info->name, info->namelen, - info->mode); + &info->name); if (cmp) return cmp; } @@ -891,15 +884,15 @@ static int do_compare_entry_piecewise(const struct cache_entry *ce, ce_len -= pathlen; ce_name = ce->name + pathlen; - return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); + len = tree_entry_len(n); + return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); } static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, - const char *name, size_t namelen, - unsigned mode) + const struct name_entry *n) { - int pathlen, ce_len; + int len, pathlen, ce_len; const char *ce_name; int cmp; @@ -909,7 +902,7 @@ static int do_compare_entry(const struct cache_entry *ce, * it is quicker to use the precomputed version. */ if (!info->traverse_path) - return do_compare_entry_piecewise(ce, info, name, namelen, mode); + return do_compare_entry_piecewise(ce, info, n); cmp = strncmp(ce->name, info->traverse_path, info->pathlen); if (cmp) @@ -924,12 +917,13 @@ static int do_compare_entry(const struct cache_entry *ce, ce_len -= pathlen; ce_name = ce->name + pathlen; - return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); + len = tree_entry_len(n); + return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); } static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) { - int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode); + int cmp = do_compare_entry(ce, info, n); if (cmp) return cmp; @@ -937,7 +931,7 @@ static int compare_entry(const struct cache_entry *ce, const struct traverse_inf * Even if the beginning compared identically, the ce should * compare as bigger than a directory leading up to it! */ - return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n)); + return ce_namelen(ce) > traverse_path_len(info, n); } static int ce_in_traverse_path(const struct cache_entry *ce, @@ -945,8 +939,7 @@ static int ce_in_traverse_path(const struct cache_entry *ce, { if (!info->prev) return 1; - if (do_compare_entry(ce, info->prev, - info->name, info->namelen, info->mode)) + if (do_compare_entry(ce, info->prev, &info->name)) return 0; /* * If ce (blob) is the same name as the path (which is a tree @@ -961,7 +954,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, struct index_state *istate, int is_transient) { - size_t len = traverse_path_len(info, tree_entry_len(n)); + int len = traverse_path_len(info, n); struct cache_entry *ce = is_transient ? make_empty_transient_cache_entry(len) : @@ -971,8 +964,7 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info, ce->ce_flags = create_ce_flags(stage); ce->ce_namelen = len; oidcpy(&ce->oid, &n->oid); - /* len+1 because the cache_entry allocates space for NUL */ - make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen); + make_traverse_path(ce->name, info, n); return ce; } @@ -1065,12 +1057,13 @@ static int unpack_failed(struct unpack_trees_options *o, const char *message) * the directory. */ static int find_cache_pos(struct traverse_info *info, - const char *p, size_t p_len) + const struct name_entry *p) { int pos; struct unpack_trees_options *o = info->data; struct index_state *index = o->src_index; int pfxlen = info->pathlen; + int p_len = tree_entry_len(p); for (pos = o->cache_bottom; pos < index->cache_nr; pos++) { const struct cache_entry *ce = index->cache[pos]; @@ -1106,7 +1099,7 @@ static int find_cache_pos(struct traverse_info *info, ce_len = ce_slash - ce_name; else ce_len = ce_namelen(ce) - pfxlen; - cmp = name_compare(p, p_len, ce_name, ce_len); + cmp = name_compare(p->path, p_len, ce_name, ce_len); /* * Exact match; if we have a directory we need to * delay returning it. @@ -1121,7 +1114,7 @@ static int find_cache_pos(struct traverse_info *info, * E.g. ce_name == "t-i", and p->path == "t"; we may * have "t/a" in the index. */ - if (p_len < ce_len && !memcmp(ce_name, p, p_len) && + if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) && ce_name[p_len] < '/') continue; /* keep looking */ break; @@ -1132,7 +1125,7 @@ static int find_cache_pos(struct traverse_info *info, static struct cache_entry *find_cache_entry(struct traverse_info *info, const struct name_entry *p) { - int pos = find_cache_pos(info, p->path, p->pathlen); + int pos = find_cache_pos(info, p); struct unpack_trees_options *o = info->data; if (0 <= pos) @@ -1145,10 +1138,10 @@ static void debug_path(struct traverse_info *info) { if (info->prev) { debug_path(info->prev); - if (*info->prev->name) + if (*info->prev->name.path) putchar('/'); } - printf("%s", info->name); + printf("%s", info->name.path); } static void debug_name_entry(int i, struct name_entry *n) @@ -1272,9 +1265,7 @@ static int clear_ce_flags_1(struct index_state *istate, struct cache_entry **cache, int nr, struct strbuf *prefix, int select_mask, int clear_mask, - struct pattern_list *pl, - enum pattern_match_result default_match, - int progress_nr); + struct exclude_list *el, int defval); /* Whole directory matching */ static int clear_ce_flags_dir(struct index_state *istate, @@ -1282,24 +1273,19 @@ static int clear_ce_flags_dir(struct index_state *istate, struct strbuf *prefix, char *basename, int select_mask, int clear_mask, - struct pattern_list *pl, - enum pattern_match_result default_match, - int progress_nr) + struct exclude_list *el, int defval) { struct cache_entry **cache_end; int dtype = DT_DIR; + int ret = is_excluded_from_list(prefix->buf, prefix->len, + basename, &dtype, el, istate); int rc; - enum pattern_match_result ret, orig_ret; - orig_ret = path_matches_pattern_list(prefix->buf, prefix->len, - basename, &dtype, pl, istate); strbuf_addch(prefix, '/'); /* If undecided, use matching result of parent dir in defval */ - if (orig_ret == UNDECIDED) - ret = default_match; - else - ret = orig_ret; + if (ret < 0) + ret = defval; for (cache_end = cache; cache_end != cache + nr; cache_end++) { struct cache_entry *ce = *cache_end; @@ -1307,31 +1293,24 @@ static int clear_ce_flags_dir(struct index_state *istate, break; } - if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) { - struct cache_entry **ce = cache; - rc = cache_end - cache; - - while (ce < cache_end) { - (*ce)->ce_flags &= ~clear_mask; - ce++; - } - } else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) { - rc = cache_end - cache; - } else { - rc = clear_ce_flags_1(istate, cache, cache_end - cache, - prefix, - select_mask, clear_mask, - pl, ret, - progress_nr); - } - + /* + * TODO: check el, if there are no patterns that may conflict + * with ret (iow, we know in advance the incl/excl + * decision for the entire directory), clear flag here without + * calling clear_ce_flags_1(). That function will call + * the expensive is_excluded_from_list() on every entry. + */ + rc = clear_ce_flags_1(istate, cache, cache_end - cache, + prefix, + select_mask, clear_mask, + el, ret); strbuf_setlen(prefix, prefix->len - 1); return rc; } /* * Traverse the index, find every entry that matches according to - * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the + * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the * number of traversed entries. * * If select_mask is non-zero, only entries whose ce_flags has on of @@ -1348,11 +1327,9 @@ static int clear_ce_flags_1(struct index_state *istate, struct cache_entry **cache, int nr, struct strbuf *prefix, int select_mask, int clear_mask, - struct pattern_list *pl, - enum pattern_match_result default_match, - int progress_nr) + struct exclude_list *el, int defval) { - struct cache_entry **cache_end = nr ? cache + nr : cache; + struct cache_entry **cache_end = cache + nr; /* * Process all entries that have the given prefix and meet @@ -1361,14 +1338,10 @@ static int clear_ce_flags_1(struct index_state *istate, while(cache != cache_end) { struct cache_entry *ce = *cache; const char *name, *slash; - int len, dtype; - enum pattern_match_result ret; - - display_progress(istate->progress, progress_nr); + int len, dtype, ret; if (select_mask && !(ce->ce_flags & select_mask)) { cache++; - progress_nr++; continue; } @@ -1389,84 +1362,58 @@ static int clear_ce_flags_1(struct index_state *istate, prefix, prefix->buf + prefix->len - len, select_mask, clear_mask, - pl, default_match, - progress_nr); + el, defval); /* clear_c_f_dir eats a whole dir already? */ if (processed) { cache += processed; - progress_nr += processed; strbuf_setlen(prefix, prefix->len - len); continue; } strbuf_addch(prefix, '/'); - processed = clear_ce_flags_1(istate, cache, cache_end - cache, - prefix, - select_mask, clear_mask, pl, - default_match, progress_nr); - - cache += processed; - progress_nr += processed; - + cache += clear_ce_flags_1(istate, cache, cache_end - cache, + prefix, + select_mask, clear_mask, el, defval); strbuf_setlen(prefix, prefix->len - len - 1); continue; } /* Non-directory */ dtype = ce_to_dtype(ce); - ret = path_matches_pattern_list(ce->name, - ce_namelen(ce), - name, &dtype, pl, istate); - if (ret == UNDECIDED) - ret = default_match; - if (ret == MATCHED || ret == MATCHED_RECURSIVE) + ret = is_excluded_from_list(ce->name, ce_namelen(ce), + name, &dtype, el, istate); + if (ret < 0) + ret = defval; + if (ret > 0) ce->ce_flags &= ~clear_mask; cache++; - progress_nr++; } - - display_progress(istate->progress, progress_nr); return nr - (cache_end - cache); } static int clear_ce_flags(struct index_state *istate, int select_mask, int clear_mask, - struct pattern_list *pl, - int show_progress) + struct exclude_list *el) { static struct strbuf prefix = STRBUF_INIT; - char label[100]; - int rval; strbuf_reset(&prefix); - if (show_progress) - istate->progress = start_delayed_progress( - _("Updating index flags"), - istate->cache_nr); - - xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)", - (unsigned long)select_mask, (unsigned long)clear_mask); - trace2_region_enter("unpack_trees", label, the_repository); - rval = clear_ce_flags_1(istate, + + return clear_ce_flags_1(istate, istate->cache, istate->cache_nr, &prefix, select_mask, clear_mask, - pl, 0, 0); - trace2_region_leave("unpack_trees", label, the_repository); - - stop_progress(&istate->progress); - return rval; + el, 0); } /* * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout */ -static void mark_new_skip_worktree(struct pattern_list *pl, +static void mark_new_skip_worktree(struct exclude_list *el, struct index_state *istate, - int select_flag, int skip_wt_flag, - int show_progress) + int select_flag, int skip_wt_flag) { int i; @@ -1490,7 +1437,7 @@ static void mark_new_skip_worktree(struct pattern_list *pl, * 2. Widen worktree according to sparse-checkout file. * Matched entries will have skip_wt_flag cleared (i.e. "in") */ - clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress); + clear_ce_flags(istate, select_flag, skip_wt_flag, el); } static int verify_absent(const struct cache_entry *, @@ -1506,22 +1453,21 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options { int i, ret; static struct cache_entry *dfc; - struct pattern_list pl; + struct exclude_list el; if (len > MAX_UNPACK_TREES) die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); trace_performance_enter(); - memset(&pl, 0, sizeof(pl)); + memset(&el, 0, sizeof(el)); if (!core_apply_sparse_checkout || !o->update) o->skip_sparse_checkout = 1; - if (!o->skip_sparse_checkout && !o->pl) { + if (!o->skip_sparse_checkout) { char *sparse = git_pathdup("info/sparse-checkout"); - pl.use_cone_patterns = core_sparse_checkout_cone; - if (add_patterns_from_file_to_list(sparse, "", 0, &pl, NULL) < 0) + if (add_excludes_from_file_to_list(sparse, "", 0, &el, NULL) < 0) o->skip_sparse_checkout = 1; else - o->pl = &pl; + o->el = ⪙ free(sparse); } @@ -1548,15 +1494,11 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->merge_size = len; mark_all_ce_unused(o->src_index); - if (o->src_index->fsmonitor_last_update) - o->result.fsmonitor_last_update = o->src_index->fsmonitor_last_update; - /* * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries */ if (!o->skip_sparse_checkout) - mark_new_skip_worktree(o->pl, o->src_index, 0, - CE_NEW_SKIP_WORKTREE, o->verbose_update); + mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE); if (!dfc) dfc = xcalloc(1, cache_entry_size(0)); @@ -1621,9 +1563,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE * so apply_sparse_checkout() won't attempt to remove it from worktree */ - mark_new_skip_worktree(o->pl, &o->result, - CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE, - o->verbose_update); + mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); ret = 0; for (i = 0; i < o->result.cache_nr; i++) { @@ -1691,8 +1631,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options done: trace_performance_leave("unpack_trees"); - if (!o->keep_pattern_list) - clear_pattern_list(&pl); + clear_exclude_list(&el); return ret; return_failed: @@ -2111,8 +2050,7 @@ static int merged_entry(const struct cache_entry *ce, invalidate_ce_path(old, o); } - if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0) - return -1; + do_add_entry(o, merge, update, CE_STAGEMASK); return 1; } @@ -2436,8 +2374,7 @@ int oneway_merge(const struct cache_entry * const *src, if (old && same(old, a)) { int update = 0; - if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) && - !(old->ce_flags & CE_FSMONITOR_VALID)) { + if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) { struct stat st; if (lstat(old->name, &st) || ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) diff --git a/third_party/git/unpack-trees.h b/third_party/git/unpack-trees.h index ae1557fb80..d344d7d296 100644 --- a/third_party/git/unpack-trees.h +++ b/third_party/git/unpack-trees.h @@ -6,11 +6,11 @@ #include "string-list.h" #include "tree-walk.h" -#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES +#define MAX_UNPACK_TREES 8 struct cache_entry; struct unpack_trees_options; -struct pattern_list; +struct exclude_list; typedef int (*merge_fn_t)(const struct cache_entry * const *src, struct unpack_trees_options *options); @@ -59,8 +59,7 @@ struct unpack_trees_options { quiet, exiting_early, show_all_errors, - dry_run, - keep_pattern_list; + dry_run; const char *prefix; int cache_bottom; struct dir_struct *dir; @@ -84,7 +83,7 @@ struct unpack_trees_options { struct index_state *src_index; struct index_state result; - struct pattern_list *pl; /* for internal use */ + struct exclude_list *el; /* for internal use */ }; int unpack_trees(unsigned n, struct tree_desc *t, diff --git a/third_party/git/upload-pack.c b/third_party/git/upload-pack.c index c53249cac1..222cd3ad89 100644 --- a/third_party/git/upload-pack.c +++ b/third_party/git/upload-pack.c @@ -140,17 +140,18 @@ static void create_pack_file(const struct object_array *have_obj, argv_array_push(&pack_objects.args, "--delta-base-offset"); if (use_include_tag) argv_array_push(&pack_objects.args, "--include-tag"); - if (filter_options.choice) { - const char *spec = - expand_list_objects_filter_spec(&filter_options); + if (filter_options.filter_spec) { + struct strbuf expanded_filter_spec = STRBUF_INIT; + expand_list_objects_filter_spec(&filter_options, + &expanded_filter_spec); if (pack_objects.use_shell) { struct strbuf buf = STRBUF_INIT; - sq_quote_buf(&buf, spec); + sq_quote_buf(&buf, expanded_filter_spec.buf); argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf); strbuf_release(&buf); } else { argv_array_pushf(&pack_objects.args, "--filter=%s", - spec); + expanded_filter_spec.buf); } } @@ -721,7 +722,7 @@ static void deepen_by_rev_list(struct packet_writer *writer, int ac, { struct commit_list *result; - disable_commit_graph(the_repository); + close_commit_graph(the_repository->objects); result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); send_shallow(writer, result); free_commit_list(result); @@ -883,7 +884,6 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan if (skip_prefix(reader->line, "filter ", &arg)) { if (!filter_capability_requested) die("git upload-pack: filtering capability not negotiated"); - list_objects_filter_die_if_populated(&filter_options); parse_list_objects_filter(&filter_options, arg); continue; } @@ -1073,8 +1073,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused) precomposed_unicode = git_config_bool(var, value); } - if (current_config_scope() != CONFIG_SCOPE_LOCAL && - current_config_scope() != CONFIG_SCOPE_WORKTREE) { + if (current_config_scope() != CONFIG_SCOPE_REPO) { if (!strcmp("uploadpack.packobjectshook", var)) return git_config_string(&pack_objects_hook, var, value); } @@ -1306,7 +1305,6 @@ static void process_args(struct packet_reader *request, } if (allow_filter && skip_prefix(arg, "filter ", &p)) { - list_objects_filter_die_if_populated(&filter_options); parse_list_objects_filter(&filter_options, p); continue; } diff --git a/third_party/git/url.c b/third_party/git/url.c index e04bd60b6b..1b8ef78cea 100644 --- a/third_party/git/url.c +++ b/third_party/git/url.c @@ -5,7 +5,7 @@ int is_urlschemechar(int first_flag, int ch) { /* * The set of valid URL schemes, as per STD66 (RFC3986) is - * '[A-Za-z][A-Za-z0-9+.-]*'. But use slightly looser check + * '[A-Za-z][A-Za-z0-9+.-]*'. But use sightly looser check * of '[A-Za-z0-9][A-Za-z0-9+.-]*' because earlier version * of check used '[A-Za-z0-9]+' so not to break any remote * helpers. @@ -86,12 +86,6 @@ char *url_decode_mem(const char *url, int len) return url_decode_internal(&url, len, NULL, &out, 0); } -char *url_percent_decode(const char *encoded) -{ - struct strbuf out = STRBUF_INIT; - return url_decode_internal(&encoded, strlen(encoded), NULL, &out, 0); -} - char *url_decode_parameter_name(const char **query) { struct strbuf out = STRBUF_INIT; diff --git a/third_party/git/url.h b/third_party/git/url.h index 2a27c34277..00b7d58c33 100644 --- a/third_party/git/url.h +++ b/third_party/git/url.h @@ -7,14 +7,6 @@ int is_url(const char *url); int is_urlschemechar(int first_flag, int ch); char *url_decode(const char *url); char *url_decode_mem(const char *url, int len); - -/* - * Similar to the url_decode_{,mem} methods above, but doesn't assume there - * is a scheme followed by a : at the start of the string. Instead, %-sequences - * before any : are also parsed. - */ -char *url_percent_decode(const char *encoded); - char *url_decode_parameter_name(const char **query); char *url_decode_parameter_value(const char **query); diff --git a/third_party/git/urlmatch.c b/third_party/git/urlmatch.c index 29272a5c4f..3e42bd7504 100644 --- a/third_party/git/urlmatch.c +++ b/third_party/git/urlmatch.c @@ -557,8 +557,6 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb) const char *key, *dot; struct strbuf synthkey = STRBUF_INIT; int retval; - int (*select_fn)(const struct urlmatch_item *a, const struct urlmatch_item *b) = - collect->select_fn ? collect->select_fn : cmp_matches; if (!skip_prefix(var, collect->section, &key) || *(key++) != '.') { if (collect->cascade_fn) @@ -589,7 +587,7 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb) if (!item->util) { item->util = xcalloc(1, sizeof(matched)); } else { - if (select_fn(&matched, item->util) < 0) + if (cmp_matches(&matched, item->util) < 0) /* * Our match is worse than the old one, * we cannot use it. diff --git a/third_party/git/urlmatch.h b/third_party/git/urlmatch.h index 2407520731..eed5f29235 100644 --- a/third_party/git/urlmatch.h +++ b/third_party/git/urlmatch.h @@ -50,15 +50,6 @@ struct urlmatch_config { void *cb; int (*collect_fn)(const char *var, const char *value, void *cb); int (*cascade_fn)(const char *var, const char *value, void *cb); - /* - * Compare the two matches, the one just discovered and the existing - * best match and return a negative value if the found item is to be - * rejected or a non-negative value if it is to be accepted. If this - * field is set to NULL, use the default comparison technique, which - * checks to ses if found is better (according to the urlmatch - * specificity rules) than existing. - */ - int (*select_fn)(const struct urlmatch_item *found, const struct urlmatch_item *existing); }; int urlmatch_config_entry(const char *var, const char *value, void *cb); diff --git a/third_party/git/usage.c b/third_party/git/usage.c index 58fb5fff5f..2fdb20086b 100644 --- a/third_party/git/usage.c +++ b/third_party/git/usage.c @@ -9,26 +9,14 @@ void vreportf(const char *prefix, const char *err, va_list params) { char msg[4096]; - char *p, *pend = msg + sizeof(msg); - size_t prefix_len = strlen(prefix); + char *p; - if (sizeof(msg) <= prefix_len) { - fprintf(stderr, "BUG!!! too long a prefix '%s'\n", prefix); - abort(); - } - memcpy(msg, prefix, prefix_len); - p = msg + prefix_len; - if (vsnprintf(p, pend - p, err, params) < 0) - *p = '\0'; /* vsnprintf() failed, clip at prefix */ - - for (; p != pend - 1 && *p; p++) { + vsnprintf(msg, sizeof(msg), err, params); + for (p = msg; *p; p++) { if (iscntrl(*p) && *p != '\t' && *p != '\n') *p = '?'; } - - *(p++) = '\n'; /* we no longer need a NUL */ - fflush(stderr); - write_in_full(2, msg, p - msg); + fprintf(stderr, "%s%s\n", prefix, msg); } static NORETURN void usage_builtin(const char *err, va_list params) diff --git a/third_party/git/userdiff.c b/third_party/git/userdiff.c index efbe05e5a5..e74a6d4022 100644 --- a/third_party/git/userdiff.c +++ b/third_party/git/userdiff.c @@ -23,28 +23,6 @@ IPATTERN("ada", "[a-zA-Z][a-zA-Z0-9_]*" "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?" "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"), -PATTERNS("dts", - "!;\n" - "!=\n" - /* lines beginning with a word optionally preceded by '&' or the root */ - "^[ \t]*((/[ \t]*\\{|&?[a-zA-Z_]).*)", - /* -- */ - /* Property names and math operators */ - "[a-zA-Z0-9,._+?#-]+" - "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"), -PATTERNS("elixir", - "^[ \t]*((def(macro|module|impl|protocol|p)?|test)[ \t].*)$", - /* -- */ - /* Atoms, names, and module attributes */ - "[@:]?[a-zA-Z0-9@_?!]+" - /* Numbers with specific base */ - "|[-+]?0[xob][0-9a-fA-F]+" - /* Numbers */ - "|[-+]?[0-9][0-9_.]*([eE][-+]?[0-9_]+)?" - /* Operators and atoms that represent them */ - "|:?(\\+\\+|--|\\.\\.|~~~|<>|\\^\\^\\^|<?\\|>|<<<?|>?>>|<<?~|~>?>|<~>|<=|>=|===?|!==?|=~|&&&?|\\|\\|\\|?|=>|<-|\\\\\\\\|->)" - /* Not real operators, but should be grouped */ - "|:?%[A-Za-z0-9_.]\\{\\}?"), IPATTERN("fortran", "!^([C*]|[ \t]*!)\n" "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n" @@ -146,7 +124,7 @@ PATTERNS("php", "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" "|[-+*/<>%&^|=!.]=|--|\\+\\+|<<=?|>>=?|===|&&|\\|\\||::|->"), -PATTERNS("python", "^[ \t]*((class|(async[ \t]+)?def)[ \t].*)$", +PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?" diff --git a/third_party/git/utf8.c b/third_party/git/utf8.c index 5b39361ada..3b42fadffd 100644 --- a/third_party/git/utf8.c +++ b/third_party/git/utf8.c @@ -95,11 +95,13 @@ static int git_wcwidth(ucs_char_t ch) return -1; /* binary search in table of non-spacing characters */ - if (bisearch(ch, zero_width, ARRAY_SIZE(zero_width) - 1)) + if (bisearch(ch, zero_width, sizeof(zero_width) + / sizeof(struct interval) - 1)) return 0; /* binary search in table of double width characters */ - if (bisearch(ch, double_width, ARRAY_SIZE(double_width) - 1)) + if (bisearch(ch, double_width, sizeof(double_width) + / sizeof(struct interval) - 1)) return 2; return 1; @@ -411,10 +413,11 @@ out: */ static int same_utf_encoding(const char *src, const char *dst) { - if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) { - skip_prefix(src, "-", &src); - skip_prefix(dst, "-", &dst); - return !strcasecmp(src, dst); + if (istarts_with(src, "utf") && istarts_with(dst, "utf")) { + /* src[3] or dst[3] might be '\0' */ + int i = (src[3] == '-' ? 4 : 3); + int j = (dst[3] == '-' ? 4 : 3); + return !strcasecmp(src+i, dst+j); } return 0; } diff --git a/third_party/git/walker.c b/third_party/git/walker.c index 4984bf8b3d..06cd2bd569 100644 --- a/third_party/git/walker.c +++ b/third_party/git/walker.c @@ -8,7 +8,6 @@ #include "tag.h" #include "blob.h" #include "refs.h" -#include "progress.h" static struct object_id current_commit_oid; @@ -163,11 +162,6 @@ static int process(struct walker *walker, struct object *obj) static int loop(struct walker *walker) { struct object_list *elem; - struct progress *progress = NULL; - uint64_t nr = 0; - - if (walker->get_progress) - progress = start_delayed_progress(_("Fetching objects"), 0); while (process_queue) { struct object *obj = process_queue->item; @@ -182,20 +176,15 @@ static int loop(struct walker *walker) */ if (! (obj->flags & TO_SCAN)) { if (walker->fetch(walker, obj->oid.hash)) { - stop_progress(&progress); report_missing(obj); return -1; } } if (!obj->type) parse_object(the_repository, &obj->oid); - if (process_object(walker, obj)) { - stop_progress(&progress); + if (process_object(walker, obj)) return -1; - } - display_progress(progress, ++nr); } - stop_progress(&progress); return 0; } @@ -272,14 +261,12 @@ int walker_fetch(struct walker *walker, int targets, char **target, struct strbuf refname = STRBUF_INIT; struct strbuf err = STRBUF_INIT; struct ref_transaction *transaction = NULL; - struct object_id *oids; + struct object_id *oids = xmalloc(targets * sizeof(struct object_id)); char *msg = NULL; int i, ret = -1; save_commit_buffer = 0; - ALLOC_ARRAY(oids, targets); - if (write_ref) { transaction = ref_transaction_begin(&err); if (!transaction) { diff --git a/third_party/git/walker.h b/third_party/git/walker.h index d40b016bab..6d8ae00e5b 100644 --- a/third_party/git/walker.h +++ b/third_party/git/walker.h @@ -10,7 +10,6 @@ struct walker { int (*fetch)(struct walker *, unsigned char *sha1); void (*cleanup)(struct walker *); int get_verbosely; - int get_progress; int get_recover; int corrupt_object_found; diff --git a/third_party/git/worktree.c b/third_party/git/worktree.c index eba4fd3a03..5b4793caa3 100644 --- a/third_party/git/worktree.c +++ b/third_party/git/worktree.c @@ -47,13 +47,15 @@ static void add_head_info(struct worktree *wt) static struct worktree *get_main_worktree(void) { struct worktree *worktree = NULL; + struct strbuf path = STRBUF_INIT; struct strbuf worktree_path = STRBUF_INIT; strbuf_add_absolute_path(&worktree_path, get_git_common_dir()); - strbuf_strip_suffix(&worktree_path, "/."); if (!strbuf_strip_suffix(&worktree_path, "/.git")) strbuf_strip_suffix(&worktree_path, "/."); + strbuf_addf(&path, "%s/HEAD", get_git_common_dir()); + worktree = xcalloc(1, sizeof(*worktree)); worktree->path = strbuf_detach(&worktree_path, NULL); /* @@ -67,6 +69,7 @@ static struct worktree *get_main_worktree(void) is_bare_repository(); add_head_info(worktree); + strbuf_release(&path); strbuf_release(&worktree_path); return worktree; } @@ -212,6 +215,7 @@ struct worktree *find_worktree(struct worktree **list, const char *arg) { struct worktree *wt; + char *path; char *to_free = NULL; if ((wt = find_worktree_by_suffix(list, arg))) @@ -219,17 +223,11 @@ struct worktree *find_worktree(struct worktree **list, if (prefix) arg = to_free = prefix_filename(prefix, arg); - wt = find_worktree_by_path(list, arg); - free(to_free); - return wt; -} - -struct worktree *find_worktree_by_path(struct worktree **list, const char *p) -{ - char *path = real_pathdup(p, 0); - - if (!path) + path = real_pathdup(arg, 0); + if (!path) { + free(to_free); return NULL; + } for (; *list; list++) { const char *wt_path = real_path_if_valid((*list)->path); @@ -237,6 +235,7 @@ struct worktree *find_worktree_by_path(struct worktree **list, const char *p) break; } free(path); + free(to_free); return *list; } diff --git a/third_party/git/worktree.h b/third_party/git/worktree.h index d242a6e71c..caecc7a281 100644 --- a/third_party/git/worktree.h +++ b/third_party/git/worktree.h @@ -44,30 +44,14 @@ int submodule_uses_worktrees(const char *path); const char *get_worktree_git_dir(const struct worktree *wt); /* - * Search for the worktree identified unambiguously by `arg` -- typically - * supplied by the user via the command-line -- which may be a pathname or some - * shorthand uniquely identifying a worktree, thus making it convenient for the - * user to specify a worktree with minimal typing. For instance, if the last - * component (say, "foo") of a worktree's pathname is unique among worktrees - * (say, "work/foo" and "work/bar"), it can be used to identify the worktree - * unambiguously. - * - * `prefix` should be the `prefix` handed to top-level Git commands along with - * `argc` and `argv`. - * - * Return the worktree identified by `arg`, or NULL if not found. + * Search a worktree that can be unambiguously identified by + * "arg". "prefix" must not be NULL. */ struct worktree *find_worktree(struct worktree **list, const char *prefix, const char *arg); /* - * Return the worktree corresponding to `path`, or NULL if no such worktree - * exists. - */ -struct worktree *find_worktree_by_path(struct worktree **, const char *path); - -/* * Return true if the given worktree is the main one. */ int is_main_worktree(const struct worktree *wt); diff --git a/third_party/git/wrapper.c b/third_party/git/wrapper.c index e1eaef2e16..1e45ab7b92 100644 --- a/third_party/git/wrapper.c +++ b/third_party/git/wrapper.c @@ -4,6 +4,12 @@ #include "cache.h" #include "config.h" +static void do_nothing(size_t size) +{ +} + +static void (*try_to_free_routine)(size_t size) = do_nothing; + static int memory_limit_check(size_t size, int gentle) { static size_t limit = 0; @@ -24,11 +30,24 @@ static int memory_limit_check(size_t size, int gentle) return 0; } +try_to_free_t set_try_to_free_routine(try_to_free_t routine) +{ + try_to_free_t old = try_to_free_routine; + if (!routine) + routine = do_nothing; + try_to_free_routine = routine; + return old; +} + char *xstrdup(const char *str) { char *ret = strdup(str); - if (!ret) - die("Out of memory, strdup failed"); + if (!ret) { + try_to_free_routine(strlen(str) + 1); + ret = strdup(str); + if (!ret) + die("Out of memory, strdup failed"); + } return ret; } @@ -42,13 +61,19 @@ static void *do_xmalloc(size_t size, int gentle) if (!ret && !size) ret = malloc(1); if (!ret) { - if (!gentle) - die("Out of memory, malloc failed (tried to allocate %lu bytes)", - (unsigned long)size); - else { - error("Out of memory, malloc failed (tried to allocate %lu bytes)", - (unsigned long)size); - return NULL; + try_to_free_routine(size); + ret = malloc(size); + if (!ret && !size) + ret = malloc(1); + if (!ret) { + if (!gentle) + die("Out of memory, malloc failed (tried to allocate %lu bytes)", + (unsigned long)size); + else { + error("Out of memory, malloc failed (tried to allocate %lu bytes)", + (unsigned long)size); + return NULL; + } } } #ifdef XMALLOC_POISON @@ -113,8 +138,14 @@ void *xrealloc(void *ptr, size_t size) ret = realloc(ptr, size); if (!ret && !size) ret = realloc(ptr, 1); - if (!ret) - die("Out of memory, realloc failed"); + if (!ret) { + try_to_free_routine(size); + ret = realloc(ptr, size); + if (!ret && !size) + ret = realloc(ptr, 1); + if (!ret) + die("Out of memory, realloc failed"); + } return ret; } @@ -129,8 +160,14 @@ void *xcalloc(size_t nmemb, size_t size) ret = calloc(nmemb, size); if (!ret && (!nmemb || !size)) ret = calloc(1, 1); - if (!ret) - die("Out of memory, calloc failed"); + if (!ret) { + try_to_free_routine(nmemb * size); + ret = calloc(nmemb, size); + if (!ret && (!nmemb || !size)) + ret = calloc(1, 1); + if (!ret) + die("Out of memory, calloc failed"); + } return ret; } @@ -441,9 +478,7 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode) "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789"; - static const int num_letters = ARRAY_SIZE(letters) - 1; - static const char x_pattern[] = "XXXXXX"; - static const int num_x = ARRAY_SIZE(x_pattern) - 1; + static const int num_letters = 62; uint64_t value; struct timeval tv; char *filename_template; @@ -452,12 +487,12 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode) len = strlen(pattern); - if (len < num_x + suffix_len) { + if (len < 6 + suffix_len) { errno = EINVAL; return -1; } - if (strncmp(&pattern[len - num_x - suffix_len], x_pattern, num_x)) { + if (strncmp(&pattern[len - 6 - suffix_len], "XXXXXX", 6)) { errno = EINVAL; return -1; } @@ -468,15 +503,16 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode) */ gettimeofday(&tv, NULL); value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid(); - filename_template = &pattern[len - num_x - suffix_len]; + filename_template = &pattern[len - 6 - suffix_len]; for (count = 0; count < TMP_MAX; ++count) { uint64_t v = value; - int i; /* Fill in the random bits. */ - for (i = 0; i < num_x; i++) { - filename_template[i] = letters[v % num_letters]; - v /= num_letters; - } + filename_template[0] = letters[v % num_letters]; v /= num_letters; + filename_template[1] = letters[v % num_letters]; v /= num_letters; + filename_template[2] = letters[v % num_letters]; v /= num_letters; + filename_template[3] = letters[v % num_letters]; v /= num_letters; + filename_template[4] = letters[v % num_letters]; v /= num_letters; + filename_template[5] = letters[v % num_letters]; v /= num_letters; fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode); if (fd >= 0) diff --git a/third_party/git/wt-status.c b/third_party/git/wt-status.c index cc6f94504d..9f6c65a580 100644 --- a/third_party/git/wt-status.c +++ b/third_party/git/wt-status.c @@ -1434,8 +1434,6 @@ static void show_cherry_pick_in_progress(struct wt_status *s, status_printf_ln(s, color, _(" (all conflicts fixed: run \"git cherry-pick --continue\")")); status_printf_ln(s, color, - _(" (use \"git cherry-pick --skip\" to skip this patch)")); - status_printf_ln(s, color, _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)")); } wt_longstatus_print_trailer(s); @@ -1463,8 +1461,6 @@ static void show_revert_in_progress(struct wt_status *s, status_printf_ln(s, color, _(" (all conflicts fixed: run \"git revert --continue\")")); status_printf_ln(s, color, - _(" (use \"git revert --skip\" to skip this patch)")); - status_printf_ln(s, color, _(" (use \"git revert --abort\" to cancel the revert operation)")); } wt_longstatus_print_trailer(s); @@ -2029,7 +2025,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s) char eol = s->null_termination ? '\0' : '\n'; fprintf(s->fp, "# branch.oid %s%c", - (s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)), + (s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)), eol); if (!s->branch) diff --git a/third_party/git/wt-status.h b/third_party/git/wt-status.h index 71c3f25f43..77dad5b920 100644 --- a/third_party/git/wt-status.h +++ b/third_party/git/wt-status.h @@ -116,7 +116,7 @@ struct wt_status { int rename_limit; enum wt_status_format status_format; struct wt_status_state state; - struct object_id oid_commit; /* when not Initial */ + unsigned char sha1_commit[GIT_MAX_RAWSZ]; /* when not Initial */ /* These are computed during processing of the individual sections */ int committable; diff --git a/third_party/git/xdiff-interface.c b/third_party/git/xdiff-interface.c index 4d20069302..8509f9ea22 100644 --- a/third_party/git/xdiff-interface.c +++ b/third_party/git/xdiff-interface.c @@ -84,8 +84,8 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b) { const int blk = 1024; long trimmed = 0, recovered = 0; - char *ap = a->size ? a->ptr + a->size : a->ptr; - char *bp = b->size ? b->ptr + b->size : b->ptr; + char *ap = a->ptr + a->size; + char *bp = b->ptr + b->size; long smaller = (a->size < b->size) ? a->size : b->size; while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) { @@ -250,13 +250,9 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags) ALLOC_ARRAY(regs->array, regs->nr); for (i = 0; i < regs->nr; i++) { struct ff_reg *reg = regs->array + i; - const char *ep, *expression; + const char *ep = strchr(value, '\n'), *expression; char *buffer = NULL; - if (!value) - BUG("mismatch between line count and parsing"); - ep = strchr(value, '\n'); - reg->negate = (*value == '!'); if (reg->negate && i == regs->nr - 1) die("Last expression must not be negated: %s", value); @@ -269,7 +265,7 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags) if (regcomp(®->re, expression, cflags)) die("Invalid regexp to look for hunk header: %s", expression); free(buffer); - value = ep ? ep + 1 : NULL; + value = ep + 1; } } diff --git a/third_party/git/xdiff-interface.h b/third_party/git/xdiff-interface.h index 93df26900c..ede4246bbd 100644 --- a/third_party/git/xdiff-interface.h +++ b/third_party/git/xdiff-interface.h @@ -44,7 +44,7 @@ void discard_hunk_line(void *priv, * Compare the strings l1 with l2 which are of size s1 and s2 respectively. * Returns 1 if the strings are deemed equal, 0 otherwise. * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces - * are treated for the comparison. + * are treated for the comparision. */ int xdiff_compare_lines(const char *l1, long s1, const char *l2, long s2, long flags); diff --git a/third_party/git/xdiff/xdiffi.c b/third_party/git/xdiff/xdiffi.c index bd035139f9..1f1f4a3c78 100644 --- a/third_party/git/xdiff/xdiffi.c +++ b/third_party/git/xdiff/xdiffi.c @@ -38,9 +38,9 @@ typedef struct s_xdpsplit { * Basically considers a "box" (off1, off2, lim1, lim2) and scan from both * the forward diagonal starting from (off1, off2) and the backward diagonal * starting from (lim1, lim2). If the K values on the same diagonal crosses - * returns the furthest point of reach. We might encounter expensive edge cases - * using this algorithm, so a little bit of heuristic is needed to cut the - * search and to return a suboptimal point. + * returns the furthest point of reach. We might end up having to expensive + * cases using this algorithm is full, so a little bit of heuristic is needed + * to cut the search and to return a suboptimal point. */ static long xdl_split(unsigned long const *ha1, long off1, long lim1, unsigned long const *ha2, long off2, long lim2, @@ -63,13 +63,11 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, int got_snake = 0; /* - * We need to extend the diagonal "domain" by one. If the next + * We need to extent the diagonal "domain" by one. If the next * values exits the box boundaries we need to change it in the - * opposite direction because (max - min) must be a power of - * two. - * + * opposite direction because (max - min) must be a power of two. * Also we initialize the external K value to -1 so that we can - * avoid extra conditions in the check inside the core loop. + * avoid extra conditions check inside the core loop. */ if (fmin > dmin) kvdf[--fmin - 1] = -1; @@ -100,13 +98,11 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, } /* - * We need to extend the diagonal "domain" by one. If the next + * We need to extent the diagonal "domain" by one. If the next * values exits the box boundaries we need to change it in the - * opposite direction because (max - min) must be a power of - * two. - * + * opposite direction because (max - min) must be a power of two. * Also we initialize the external K value to -1 so that we can - * avoid extra conditions in the check inside the core loop. + * avoid extra conditions check inside the core loop. */ if (bmin > dmin) kvdb[--bmin - 1] = XDL_LINE_MAX; @@ -142,7 +138,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, /* * If the edit cost is above the heuristic trigger and if * we got a good snake, we sample current diagonals to see - * if some of them have reached an "interesting" path. Our + * if some of the, have reached an "interesting" path. Our * measure is a function of the distance from the diagonal * corner (i1 + i2) penalized with the distance from the * mid diagonal itself. If this value is above the current @@ -200,9 +196,8 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, } /* - * Enough is enough. We spent too much time here and now we - * collect the furthest reaching path using the (i1 + i2) - * measure. + * Enough is enough. We spent too much time here and now we collect + * the furthest reaching path using the (i1 + i2) measure. */ if (ec >= xenv->mxcost) { long fbest, fbest1, bbest, bbest1; @@ -249,9 +244,9 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1, /* - * Rule: "Divide et Impera" (divide & conquer). Recursively split the box in - * sub-boxes by calling the box splitting function. Note that the real job - * (marking changed lines) is done in the two boundary reaching checks. + * Rule: "Divide et Impera". Recursively split the box in sub-boxes by calling + * the box splitting function. Note that the real job (marking changed lines) + * is done in the two boundary reaching checks. */ int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1, diffdata_t *dd2, long off2, long lim2, @@ -328,9 +323,7 @@ int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, } /* - * Allocate and setup K vectors to be used by the differential - * algorithm. - * + * Allocate and setup K vectors to be used by the differential algorithm. * One is to store the forward path and one to store the backward path. */ ndiags = xe->xdf1.nreff + xe->xdf2.nreff + 3; @@ -401,8 +394,8 @@ static int recs_match(xrecord_t *rec1, xrecord_t *rec2, long flags) /* * If a line is indented more than this, get_indent() just returns this value. * This avoids having to do absurd amounts of work for data that are not - * human-readable text, and also ensures that the output of get_indent fits - * within an int. + * human-readable text, and also ensures that the output of get_indent fits within + * an int. */ #define MAX_INDENT 200 @@ -436,9 +429,9 @@ static int get_indent(xrecord_t *rec) } /* - * If more than this number of consecutive blank rows are found, just return - * this value. This avoids requiring O(N^2) work for pathological cases, and - * also ensures that the output of score_split fits in an int. + * If more than this number of consecutive blank rows are found, just return this + * value. This avoids requiring O(N^2) work for pathological cases, and also + * ensures that the output of score_split fits in an int. */ #define MAX_BLANKS 20 @@ -450,8 +443,8 @@ struct split_measurement { int end_of_file; /* - * How much is the line immediately following the split indented (or -1 - * if the line is blank): + * How much is the line immediately following the split indented (or -1 if + * the line is blank): */ int indent; @@ -461,8 +454,8 @@ struct split_measurement { int pre_blank; /* - * How much is the nearest non-blank line above the split indented (or - * -1 if there is no such line)? + * How much is the nearest non-blank line above the split indented (or -1 + * if there is no such line)? */ int pre_indent; @@ -588,13 +581,13 @@ static void measure_split(const xdfile_t *xdf, long split, /* * Compute a badness score for the hypothetical split whose measurements are - * stored in m. The weight factors were determined empirically using the tools - * and corpus described in + * stored in m. The weight factors were determined empirically using the tools and + * corpus described in * * https://github.com/mhagger/diff-slider-tools * - * Also see that project if you want to improve the weights based on, for - * example, a larger or more diverse corpus. + * Also see that project if you want to improve the weights based on, for example, + * a larger or more diverse corpus. */ static void score_add_split(const struct split_measurement *m, struct split_score *s) { @@ -816,16 +809,13 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { group_init(xdfo, &go); while (1) { - /* - * If the group is empty in the to-be-compacted file, skip it: - */ + /* If the group is empty in the to-be-compacted file, skip it: */ if (g.end == g.start) goto next; /* * Now shift the change up and then down as far as possible in - * each direction. If it bumps into any other changes, merge - * them. + * each direction. If it bumps into any other changes, merge them. */ do { groupsize = g.end - g.start; @@ -868,17 +858,17 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { * If the group can be shifted, then we can possibly use this * freedom to produce a more intuitive diff. * - * The group is currently shifted as far down as possible, so - * the heuristics below only have to handle upwards shifts. + * The group is currently shifted as far down as possible, so the + * heuristics below only have to handle upwards shifts. */ if (g.end == earliest_end) { /* no shifting was possible */ } else if (end_matching_other != -1) { /* - * Move the possibly merged group of changes back to - * line up with the last group of changes from the - * other file that it can align with. + * Move the possibly merged group of changes back to line + * up with the last group of changes from the other file + * that it can align with. */ while (go.end == go.start) { if (group_slide_up(xdf, &g, flags)) @@ -889,15 +879,14 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { } else if (flags & XDF_INDENT_HEURISTIC) { /* * Indent heuristic: a group of pure add/delete lines - * implies two splits, one between the end of the - * "before" context and the start of the group, and - * another between the end of the group and the - * beginning of the "after" context. Some splits are - * aesthetically better and some are worse. We compute - * a badness "score" for each split, and add the scores - * for the two splits to define a "score" for each - * position that the group can be shifted to. Then we - * pick the shift with the lowest score. + * implies two splits, one between the end of the "before" + * context and the start of the group, and another between + * the end of the group and the beginning of the "after" + * context. Some splits are aesthetically better and some + * are worse. We compute a badness "score" for each split, + * and add the scores for the two splits to define a + * "score" for each position that the group can be shifted + * to. Then we pick the shift with the lowest score. */ long shift, best_shift = -1; struct split_score best_score; diff --git a/third_party/git/xdiff/xemit.c b/third_party/git/xdiff/xemit.c index 9d7d6c5087..30713ae9a9 100644 --- a/third_party/git/xdiff/xemit.c +++ b/third_party/git/xdiff/xemit.c @@ -172,12 +172,10 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, struct func_line func_line = { 0 }; for (xch = xscr; xch; xch = xche->next) { - xdchange_t *xchp = xch; xche = xdl_get_hunk(&xch, xecfg); if (!xch) break; -pre_context_calculation: s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0); s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0); @@ -214,21 +212,6 @@ pre_context_calculation: if (fs1 < s1) { s2 = XDL_MAX(s2 - (s1 - fs1), 0); s1 = fs1; - - /* - * Did we extend context upwards into an - * ignored change? - */ - while (xchp != xch && - xchp->i1 + xchp->chg1 <= s1 && - xchp->i2 + xchp->chg2 <= s2) - xchp = xchp->next; - - /* If so, show it after all. */ - if (xchp != xch) { - xch = xchp; - goto pre_context_calculation; - } } } |